CVS commit: pkgsrc/net/vsftpd

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/net/vsftpd
From: "Roland Illig" <rillig%netbsd.org@localhost>
Date: Sun, 9 Feb 2020 20:56:47 +0000

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sun Feb  9 20:56:47 UTC 2020

Modified Files:
        pkgsrc/net/vsftpd: Makefile distinfo
        pkgsrc/net/vsftpd/patches: patch-ac patch-ad patch-ae

Log Message:
net/vsftpd: fix paths in configuration file and manual pages

This fixes PR pkg/54898.


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 pkgsrc/net/vsftpd/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/net/vsftpd/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/vsftpd/patches/patch-ac
cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/vsftpd/patches/patch-ad \
    pkgsrc/net/vsftpd/patches/patch-ae

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.49 pkgsrc/net/vsftpd/Makefile:1.50
--- pkgsrc/net/vsftpd/Makefile:1.49     Sat Jan 18 21:50:28 2020
+++ pkgsrc/net/vsftpd/Makefile  Sun Feb  9 20:56:47 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.49 2020/01/18 21:50:28 jperkin Exp $
+# $NetBSD: Makefile,v 1.50 2020/02/09 20:56:47 rillig Exp $
 
 DISTNAME=      vsftpd-3.0.3
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    net
 MASTER_SITES=  http://security.appspot.com/downloads/
 

Index: pkgsrc/net/vsftpd/distinfo
diff -u pkgsrc/net/vsftpd/distinfo:1.17 pkgsrc/net/vsftpd/distinfo:1.18
--- pkgsrc/net/vsftpd/distinfo:1.17     Thu Oct 18 07:51:40 2018
+++ pkgsrc/net/vsftpd/distinfo  Sun Feb  9 20:56:47 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2018/10/18 07:51:40 maya Exp $
+$NetBSD: distinfo,v 1.18 2020/02/09 20:56:47 rillig Exp $
 
 SHA1 (vsftpd-3.0.3.tar.gz) = d5f5a180dbecd0fbcdc92bf0ba2fc001c962b55a
 RMD160 (vsftpd-3.0.3.tar.gz) = 0f0fd063661950bd466a818daae51cba3073e3cd
@@ -6,8 +6,8 @@ SHA512 (vsftpd-3.0.3.tar.gz) = 5a4410a88
 Size (vsftpd-3.0.3.tar.gz) = 196649 bytes
 SHA1 (patch-aa) = 57fdc476df4b7ada021c7fd6e8bad6db2b2e0c48
 SHA1 (patch-ab) = df9252f99d06a4742713c36ce6bff8908da171f7
-SHA1 (patch-ac) = fc1d148ea7b83df06f4fb44e20491032a159cfce
-SHA1 (patch-ad) = 738c302cd40387216d65ab1abc9ba0eb364320ff
-SHA1 (patch-ae) = 2b49d0566d69f9e30ea151c0c52ad139c4517dc8
+SHA1 (patch-ac) = dacaeae7daac73ceb014653bd8c0553aceb62516
+SHA1 (patch-ad) = 6d1143426eb6d2d0de5139160b76ebe451debd2d
+SHA1 (patch-ae) = ba770387570d202b440593d6c7cbd8d53d411a41
 SHA1 (patch-af) = 9ceb520f3137c157c7215f47db3eef62011f387e
 SHA1 (patch-sysdeputil.c) = 3efe030f66c50a31f6cb5e8565920f5b0eb4e78d

Index: pkgsrc/net/vsftpd/patches/patch-ac
diff -u pkgsrc/net/vsftpd/patches/patch-ac:1.5 pkgsrc/net/vsftpd/patches/patch-ac:1.6
--- pkgsrc/net/vsftpd/patches/patch-ac:1.5      Fri Feb  9 16:46:42 2018
+++ pkgsrc/net/vsftpd/patches/patch-ac  Sun Feb  9 20:56:47 2020
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.5 2018/02/09 16:46:42 triaxx Exp $
+$NetBSD: patch-ac,v 1.6 2020/02/09 20:56:47 rillig Exp $
 
 Use PKG_SYSCONFDIR instead of hardcoding /etc
 
@@ -6,7 +6,7 @@ Use PKG_SYSCONFDIR instead of hardcoding
 +++ vsftpd.conf
 @@ -1,4 +1,4 @@
 -# Example config file /etc/vsftpd.conf
-+# Example config file @PKG_SYSCONFDIR/vsftpd/vsftpd.conf
++# Example config file @PKG_SYSCONFDIR@/vsftpd.conf
  #
  # The default compiled in settings are fairly paranoid. This sample file
  # loosens things up a bit, to make the ftp daemon more usable.
@@ -15,7 +15,7 @@ Use PKG_SYSCONFDIR instead of hardcoding
  #deny_email_enable=YES
  # (default follows)
 -#banned_email_file=/etc/vsftpd.banned_emails
-+#banned_email_file=@PKG_SYSCONFDIR/vsftpd/vsftpd.banned_emails
++#banned_email_file=@PKG_SYSCONFDIR@/vsftpd.banned_emails
  #
  # You may specify an explicit list of local users to chroot() to their home
  # directory. If chroot_local_user is YES, then this list becomes a list of
@@ -24,7 +24,7 @@ Use PKG_SYSCONFDIR instead of hardcoding
  #chroot_list_enable=YES
  # (default follows)
 -#chroot_list_file=/etc/vsftpd.chroot_list
-+#chroot_list_file=@PKG_SYSCONFDIR/vsftpd/vsftpd.chroot_list
++#chroot_list_file=@PKG_SYSCONFDIR@/vsftpd.chroot_list
  #
  # You may activate the "-R" option to the builtin ls. This is disabled by
  # default to avoid remote users being able to cause excessive I/O on large

Index: pkgsrc/net/vsftpd/patches/patch-ad
diff -u pkgsrc/net/vsftpd/patches/patch-ad:1.6 pkgsrc/net/vsftpd/patches/patch-ad:1.7
--- pkgsrc/net/vsftpd/patches/patch-ad:1.6      Fri Feb  9 16:46:42 2018
+++ pkgsrc/net/vsftpd/patches/patch-ad  Sun Feb  9 20:56:47 2020
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.6 2018/02/09 16:46:42 triaxx Exp $
+$NetBSD: patch-ad,v 1.7 2020/02/09 20:56:47 rillig Exp $
 
-Use PKG_SYSCONFDIR instead of hardcoding /etc
+Use PKG_SYSCONFDIR and VARBASE instead of hardcoding the paths.
 
 --- tunables.c.orig    2015-07-23 04:13:07.000000000 +0000
 +++ tunables.c
Index: pkgsrc/net/vsftpd/patches/patch-ae
diff -u pkgsrc/net/vsftpd/patches/patch-ae:1.6 pkgsrc/net/vsftpd/patches/patch-ae:1.7
--- pkgsrc/net/vsftpd/patches/patch-ae:1.6      Fri Feb  9 16:46:42 2018
+++ pkgsrc/net/vsftpd/patches/patch-ae  Sun Feb  9 20:56:47 2020
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.6 2018/02/09 16:46:42 triaxx Exp $
+$NetBSD: patch-ae,v 1.7 2020/02/09 20:56:47 rillig Exp $
 
 Use PKG_SYSCONFDIR instead of hardcoding /etc
 
@@ -9,7 +9,7 @@ Use PKG_SYSCONFDIR instead of hardcoding
  .Pa listen=YES
  in
 -.Pa /etc/vsftpd.conf .
-+.Pa @PKG_SYSCONFDIR@/vsftpd/vsftpd.conf .
++.Pa @PKG_SYSCONFDIR@/vsftpd.conf .
  Direct execution of the
  .Nm vsftpd
  binary will then launch the FTP service ready for immediate client connections.
@@ -18,7 +18,7 @@ Use PKG_SYSCONFDIR instead of hardcoding
  strict order that they are encountered on the command line.
  If no config files are specified, the default configuration file of
 -.Pa /etc/vsftpd.conf
-+.Pa @PKG_SYSCONFDIR@/vsftpd/vsftpd.conf
++.Pa @PKG_SYSCONFDIR@/vsftpd.conf
  will be loaded, after all other command line options are processed.
  .Pp
  Supported options are:
@@ -27,16 +27,16 @@ Use PKG_SYSCONFDIR instead of hardcoding
  .El
  .Sh EXAMPLES
 -vsftpd -olisten=NO /etc/vsftpd.conf -oftpd_banner=blah
-+vsftpd -olisten=NO @PKG_SYSCONFDIR@/vsftpd/vsftpd.conf -oftpd_banner=blah
++vsftpd -olisten=NO @PKG_SYSCONFDIR@/vsftpd.conf -oftpd_banner=blah
  .Pp
  That example overrides vsftpd's built-in default for the "listen" option to be
 -NO, but then loads /etc/vsftpd.conf which may override that setting. Finally,
-+NO, but then loads @PKG_SYSCONFDIR@/vsftpd/vsftpd.conf which may override that setting. Finally,
++NO, but then loads @PKG_SYSCONFDIR@/vsftpd.conf which may override that setting. Finally,
  the "ftpd_banner" setting is set to "blah", which overrides any default vsftpd
  setting and any identical setting that was in the config file.
  .Sh FILES
 -.Pa /etc/vsftpd.conf
-+.Pa @PKG_SYSCONFDIR@/vsftpd/vsftpd.conf
++.Pa @PKG_SYSCONFDIR@/vsftpd.conf
  .Sh SEE ALSO
  .Xr vsftpd.conf 5
  .end

Prev by Date: CVS commit: pkgsrc/mk
Next by Date: CVS commit: pkgsrc/net/vsftpd
Previous by Thread: CVS commit: pkgsrc/mk
Next by Thread: CVS commit: pkgsrc/net/vsftpd
Indexes:

Home | Main Index | Thread Index | Old Index