CVS commit: pkgsrc/net/vsftpd

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Thu Oct 18 07:51:40 UTC 2018

Modified Files:
        pkgsrc/net/vsftpd: Makefile distinfo
        pkgsrc/net/vsftpd/patches: patch-af

Log Message:
vsftpd: adjust another path in man page.
While here, use SUBST_VARS instead of the equivalent thing with
SUBST_SED.

>From hydrocat on netbsd-docs@


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 pkgsrc/net/vsftpd/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/net/vsftpd/distinfo
cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/vsftpd/patches/patch-af

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/vsftpd/Makefile
diff -u pkgsrc/net/vsftpd/Makefile:1.45 pkgsrc/net/vsftpd/Makefile:1.46
--- pkgsrc/net/vsftpd/Makefile:1.45     Wed Jul  4 13:40:31 2018
+++ pkgsrc/net/vsftpd/Makefile  Thu Oct 18 07:51:40 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.45 2018/07/04 13:40:31 jperkin Exp $
+# $NetBSD: Makefile,v 1.46 2018/10/18 07:51:40 maya Exp $
 
 DISTNAME=      vsftpd-3.0.3
+PKGREVISION=   1
 CATEGORIES=    net
 MASTER_SITES=  http://security.appspot.com/downloads/
 
@@ -30,8 +31,7 @@ INSTALLATION_DIRS=    libexec ${PKGMANDIR}/
 
 SUBST_CLASSES+=                paths
 SUBST_FILES.paths=     vsftpd.8 vsftpd.conf.5 vsftpd.conf
-SUBST_SED.paths+=      -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
-SUBST_SED.paths+=      -e 's,@VARBASE@,${VARBASE},g'
+SUBST_VARS.paths+=     PKG_SYSCONFDIR VARBASE
 SUBST_STAGE.paths=     pre-configure
 
 MAKE_ENV+=             LIBS=${LIBS:Q}

Index: pkgsrc/net/vsftpd/distinfo
diff -u pkgsrc/net/vsftpd/distinfo:1.16 pkgsrc/net/vsftpd/distinfo:1.17
--- pkgsrc/net/vsftpd/distinfo:1.16     Fri Feb  9 16:46:42 2018
+++ pkgsrc/net/vsftpd/distinfo  Thu Oct 18 07:51:40 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2018/02/09 16:46:42 triaxx Exp $
+$NetBSD: distinfo,v 1.17 2018/10/18 07:51:40 maya Exp $
 
 SHA1 (vsftpd-3.0.3.tar.gz) = d5f5a180dbecd0fbcdc92bf0ba2fc001c962b55a
 RMD160 (vsftpd-3.0.3.tar.gz) = 0f0fd063661950bd466a818daae51cba3073e3cd
@@ -9,5 +9,5 @@ SHA1 (patch-ab) = df9252f99d06a4742713c3
 SHA1 (patch-ac) = fc1d148ea7b83df06f4fb44e20491032a159cfce
 SHA1 (patch-ad) = 738c302cd40387216d65ab1abc9ba0eb364320ff
 SHA1 (patch-ae) = 2b49d0566d69f9e30ea151c0c52ad139c4517dc8
-SHA1 (patch-af) = 9643860c52e32150d2c6e17c5f7838bfb9df2e67
+SHA1 (patch-af) = 9ceb520f3137c157c7215f47db3eef62011f387e
 SHA1 (patch-sysdeputil.c) = 3efe030f66c50a31f6cb5e8565920f5b0eb4e78d

Index: pkgsrc/net/vsftpd/patches/patch-af
diff -u pkgsrc/net/vsftpd/patches/patch-af:1.7 pkgsrc/net/vsftpd/patches/patch-af:1.8
--- pkgsrc/net/vsftpd/patches/patch-af:1.7      Fri Feb  9 16:46:42 2018
+++ pkgsrc/net/vsftpd/patches/patch-af  Thu Oct 18 07:51:40 2018
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.7 2018/02/09 16:46:42 triaxx Exp $
+$NetBSD: patch-af,v 1.8 2018/10/18 07:51:40 maya Exp $
 
 Use PKG_SYSCONFDIR instead of hardcoding /etc
 
@@ -67,6 +67,15 @@ Use PKG_SYSCONFDIR instead of hardcoding
  .TP
  .B ftp_username
  This is the name of the user we use for handling anonymous FTP. The home
+@@ -955,7 +955,7 @@ Default: (none - the address is taken fr
+ This option specifies the location of the RSA certificate to use for SSL
+ encrypted connections.
+ 
+-Default: /usr/share/ssl/certs/vsftpd.pem
++Default: @PKG_SYSCONFDIR@/vsftpd.pem
+ .TP
+ .B rsa_private_key_file
+ This option specifies the location of the RSA private key to use for SSL
 @@ -969,7 +969,7 @@ This option should be the name of a dire
  directory should not be writable by the ftp user. This directory is used
  as a secure chroot() jail at times vsftpd does not require filesystem access.