diff options
Diffstat (limited to 'net/vsftpd/patches/patch-ae')
| -rw-r--r-- | net/vsftpd/patches/patch-ae | 37 |
1 files changed, 29 insertions, 8 deletions
diff --git a/net/vsftpd/patches/patch-ae b/net/vsftpd/patches/patch-ae index a85d8941173..48da54cbe19 100644 --- a/net/vsftpd/patches/patch-ae +++ b/net/vsftpd/patches/patch-ae @@ -1,6 +1,8 @@ -$NetBSD: patch-ae,v 1.4 2006/01/13 18:12:46 wiz Exp $ +$NetBSD: patch-ae,v 1.5 2010/11/08 17:10:55 abs Exp $ ---- vsftpd.8.orig 2003-08-29 00:34:54.000000000 +0200 +Use PKG_SYSCONFDIR instead of hardcoding /etc + +--- vsftpd.8.orig 2009-07-17 20:56:23.000000000 +0000 +++ vsftpd.8 @@ -21,7 +21,7 @@ itself will listen on the network. This recommended. It is activated by setting @@ -11,11 +13,30 @@ $NetBSD: patch-ae,v 1.4 2006/01/13 18:12:46 wiz Exp $ Direct execution of the .Nm vsftpd binary will then launch the FTP service ready for immediate client connections. -@@ -29,6 +29,6 @@ binary will then launch the FTP service - An optional - .Op configuration file - may be given on the command line. The default configuration file is --.Pa /etc/vsftpd.conf . -+.Pa @PKG_SYSCONFDIR@/vsftpd.conf . +@@ -33,7 +33,7 @@ as root. Any command line option not sta + as a config file that will be loaded. Note that config files are loaded in the + 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.conf + will be loaded, after all other command line options are processed. + .Pp + Supported options are: +@@ -47,14 +47,14 @@ their appearance on the command line, in + config files. + .El + .Sh EXAMPLES +-vsftpd -olisten=NO /etc/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.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.conf .Sh SEE ALSO .Xr vsftpd.conf 5 + .end |