diff options
| -rw-r--r-- | net/vsftpd/Makefile | 9 | ||||
| -rw-r--r-- | net/vsftpd/distinfo | 11 | ||||
| -rw-r--r-- | net/vsftpd/patches/patch-ae | 17 | ||||
| -rw-r--r-- | net/vsftpd/patches/patch-af | 44 | ||||
| -rw-r--r-- | net/vsftpd/patches/patch-ah | 22 |
5 files changed, 54 insertions, 49 deletions
diff --git a/net/vsftpd/Makefile b/net/vsftpd/Makefile index 0a99c41a3bf..c7ff33b0821 100644 --- a/net/vsftpd/Makefile +++ b/net/vsftpd/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.5 2003/07/17 22:52:00 grant Exp $ +# $NetBSD: Makefile,v 1.6 2004/01/01 04:39:22 salo Exp $ # -DISTNAME= vsftpd-1.2.0 +DISTNAME= vsftpd-1.2.1 CATEGORIES= net MASTER_SITES= ftp://vsftpd.beasts.org/users/cevans/ @@ -12,9 +12,10 @@ COMMENT= FTP server that aims to be very secure USE_BUILDLINK2= YES USE_PKGINSTALL= YES -ALL_TARGET= vsftpd PKG_SYSCONFSUBDIR= vsftpd -RCD_SCRIPTS= vsftpd + +ALL_TARGET= vsftpd +RCD_SCRIPTS= vsftpd VSFTPD_USER?= vsftpd VSFTPD_GROUP?= vsftpd diff --git a/net/vsftpd/distinfo b/net/vsftpd/distinfo index 18df92ae547..93a6ec87e27 100644 --- a/net/vsftpd/distinfo +++ b/net/vsftpd/distinfo @@ -1,12 +1,11 @@ -$NetBSD: distinfo,v 1.4 2003/05/29 20:08:41 salo Exp $ +$NetBSD: distinfo,v 1.5 2004/01/01 04:39:22 salo Exp $ -SHA1 (vsftpd-1.2.0.tar.gz) = e5646be4d41e2b4e557767b9d194fcd9ee018fb6 -Size (vsftpd-1.2.0.tar.gz) = 130025 bytes +SHA1 (vsftpd-1.2.1.tar.gz) = 01b1d64c7f0f0793332f51ec9ae92d176fba57de +Size (vsftpd-1.2.1.tar.gz) = 136041 bytes SHA1 (patch-aa) = 7e42db098d0d2261d5f02b36f7cba4ec6d91c6a0 SHA1 (patch-ab) = 18431ae27f53270ad4c19b0530e55348397fe143 SHA1 (patch-ac) = 46ff47e7d8b510ccc89905726e4a63a18d678318 SHA1 (patch-ad) = d6bec600b2833acdacecd33d7d52b5ac0d918d6c -SHA1 (patch-ae) = 03121282f1854effcbb004c6a020fb6d012fd424 -SHA1 (patch-af) = 511ff199cecd1563e1c796a8a2f265c1e645cfa8 +SHA1 (patch-ae) = 993ccc36055d3c4b18534a9db2446e317c2614c2 +SHA1 (patch-af) = b9c86b53568a9a4ea1f9f3f63c086e1dc4bc8a2d SHA1 (patch-ag) = d780ab4fef3e2997d4e57c4dbb3e64be8d6768df -SHA1 (patch-ah) = b1f41ec1de6190b838b4e829fb25a7bb6dfa71de diff --git a/net/vsftpd/patches/patch-ae b/net/vsftpd/patches/patch-ae index 975a0315e4d..7f1cc5171c6 100644 --- a/net/vsftpd/patches/patch-ae +++ b/net/vsftpd/patches/patch-ae @@ -1,8 +1,17 @@ -$NetBSD: patch-ae,v 1.2 2003/05/29 20:08:42 salo Exp $ +$NetBSD: patch-ae,v 1.3 2004/01/01 04:39:22 salo Exp $ ---- vsftpd.8.orig 2002-12-20 19:14:46.000000000 +0100 -+++ vsftpd.8 2003-05-29 19:41:29.000000000 +0200 -@@ -20,6 +20,6 @@ +--- vsftpd.8.orig 2003-08-29 00:34:54.000000000 +0200 ++++ vsftpd.8 2004-01-01 05:30:02.000000000 +0100 +@@ -21,7 +21,7 @@ + recommended. It is activated by setting + .Pa listen=YES + in +-.Pa /etc/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. +@@ -29,6 +29,6 @@ An optional .Op configuration file may be given on the command line. The default configuration file is diff --git a/net/vsftpd/patches/patch-af b/net/vsftpd/patches/patch-af index 7e25224afa7..e4738214445 100644 --- a/net/vsftpd/patches/patch-af +++ b/net/vsftpd/patches/patch-af @@ -1,7 +1,7 @@ -$NetBSD: patch-af,v 1.2 2003/05/29 20:08:42 salo Exp $ +$NetBSD: patch-af,v 1.3 2004/01/01 04:39:22 salo Exp $ ---- vsftpd.conf.5.orig 2003-05-28 00:50:28.000000000 +0200 -+++ vsftpd.conf.5 2003-05-29 19:45:56.000000000 +0200 +--- vsftpd.conf.5.orig 2003-11-12 02:06:25.000000000 +0100 ++++ vsftpd.conf.5 2004-01-01 05:19:28.000000000 +0100 @@ -4,7 +4,7 @@ .SH DESCRIPTION vsftpd.conf may be used to control various aspects of vsftpd's behaviour. By @@ -29,7 +29,16 @@ $NetBSD: patch-af,v 1.2 2003/05/29 20:08:42 salo Exp $ .BR banned_email_file setting. -@@ -528,7 +528,7 @@ +@@ -306,7 +306,7 @@ + file specified by the + .BR email_password_file + setting. The file format is one password per line, no extra whitespace. The +-default filename is /etc/vsftpd.email_passwords. ++default filename is @PKG_SYSCONFDIR@/vsftpd.email_passwords. + + Default: NO + .TP +@@ -541,7 +541,7 @@ .BR deny_email_enable is enabled. @@ -38,16 +47,25 @@ $NetBSD: patch-af,v 1.2 2003/05/29 20:08:42 salo Exp $ .TP .B banner_file This option is the name of a file containing text to display when someone -@@ -556,7 +556,7 @@ - .BR chroot_local_user - is disabled. +@@ -570,7 +570,7 @@ + is enabled, then the list file becomes a list of users to NOT place in a + chroot() jail. -Default: /etc/vsftpd.chroot_list +Default: @PKG_SYSCONFDIR@/vsftpd.chroot_list .TP .B cmds_allowed This options specifies a comma separated list of allowed FTP commands (post -@@ -638,7 +638,7 @@ +@@ -606,7 +606,7 @@ + .BR secure_email_list_enable + setting. + +-Default: /etc/vsftpd.email_passwords ++Default: @PKG_SYSCONFDIR@/vsftpd.email_passwords + .TP + .B ftp_username + This is the name of the user we use for handling anonymous FTP. The home +@@ -692,7 +692,7 @@ 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. @@ -56,7 +74,7 @@ $NetBSD: patch-af,v 1.2 2003/05/29 20:08:42 salo Exp $ .TP .B user_config_dir This powerful option allows the override of any config option specified in -@@ -646,10 +646,10 @@ +@@ -700,10 +700,10 @@ with an example. If you set .BR user_config_dir to be @@ -67,14 +85,14 @@ $NetBSD: patch-af,v 1.2 2003/05/29 20:08:42 salo Exp $ -.BR /etc/vsftpd_user_conf/chris +.BR @PKG_SYSCONFDIR@/vsftpd_user_conf/chris for the duration of the session. The format of this file is as detailed in - this manual page! - -@@ -660,7 +660,7 @@ + this manual page! PLEASE NOTE that not all settings are effective on a + per-user basis. For example, many settings only prior to the user's session +@@ -739,7 +739,7 @@ .BR userlist_enable option is active. -Default: /etc/vsftpd.user_list +Default: @PKG_SYSCONFDIR@/vsftpd.user_list - .BR + .TP .B vsftpd_log_file This option is the name of the file to which we write the vsftpd style diff --git a/net/vsftpd/patches/patch-ah b/net/vsftpd/patches/patch-ah deleted file mode 100644 index 57a210435ef..00000000000 --- a/net/vsftpd/patches/patch-ah +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ah,v 1.1 2003/05/29 20:08:42 salo Exp $ - ---- sysdeputil.c.orig 2003-03-11 00:42:48.000000000 +0100 -+++ sysdeputil.c 2003-05-29 21:46:11.000000000 +0200 -@@ -70,6 +70,17 @@ - #define VSF_SYSDEP_HAVE_SETPROCTITLE - #endif - -+#if defined(__NetBSD__) -+ #include <stdlib.h> -+ #define VSF_SYSDEP_HAVE_SETPROCTITLE -+ #include <sys/param.h> -+ #if __NetBSD_Version__ >= 106070000 -+ #define WTMPX_FILE _PATH_WTMPX -+ #else -+ #undef VSF_SYSDEP_HAVE_UTMPX -+ #endif -+#endif -+ - #ifdef __hpux - #include <sys/socket.h> - #ifdef SF_DISCONNECT |