diff options
| author | maya <maya@pkgsrc.org> | 2018-10-18 07:51:40 +0000 |
|---|---|---|
| committer | maya <maya@pkgsrc.org> | 2018-10-18 07:51:40 +0000 |
| commit | bb350db0724fcb8502a5930864ae2e64ac2fd2fe (patch) | |
| tree | 0dbb9560e1eaafc1938bca6d7a50f7083caeaafa /net | |
| parent | fa5b4294fb102a5fdeed9f4e357fd02641f5320d (diff) | |
| download | pkgsrc-bb350db0724fcb8502a5930864ae2e64ac2fd2fe.tar.gz | |
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@
Diffstat (limited to 'net')
| -rw-r--r-- | net/vsftpd/Makefile | 6 | ||||
| -rw-r--r-- | net/vsftpd/distinfo | 4 | ||||
| -rw-r--r-- | net/vsftpd/patches/patch-af | 11 |
3 files changed, 15 insertions, 6 deletions
diff --git a/net/vsftpd/Makefile b/net/vsftpd/Makefile index 193329829a6..60b32704e52 100644 --- a/net/vsftpd/Makefile +++ b/net/vsftpd/Makefile @@ -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}/man5 ${PKGMANDIR}/man8 \ 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} diff --git a/net/vsftpd/distinfo b/net/vsftpd/distinfo index 47d6a60b23e..a72e1d4ed37 100644 --- a/net/vsftpd/distinfo +++ b/net/vsftpd/distinfo @@ -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) = df9252f99d06a4742713c36ce6bff8908da171f7 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 diff --git a/net/vsftpd/patches/patch-af b/net/vsftpd/patches/patch-af index 0fd227dc359..2651413ec28 100644 --- a/net/vsftpd/patches/patch-af +++ b/net/vsftpd/patches/patch-af @@ -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 /etc .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. |