[108323] trunk/dports/net/vsftpd

[pmq at macports.org]

Revision: 108323
          https://trac.macports.org/changeset/108323
Author:   pmq at macports.org
Date:     2013-07-19 07:34:13 -0700 (Fri, 19 Jul 2013)
Log Message:
-----------
Update to 3.0.2.

Modified Paths:
--------------
    trunk/dports/net/vsftpd/Portfile
    trunk/dports/net/vsftpd/files/patch-Makefile.diff
    trunk/dports/net/vsftpd/files/patch-sysdeputil.c.diff
    trunk/dports/net/vsftpd/files/patch-vsftpd.conf.diff

Modified: trunk/dports/net/vsftpd/Portfile
===================================================================
--- trunk/dports/net/vsftpd/Portfile	2013-07-19 14:07:24 UTC (rev 108322)
+++ trunk/dports/net/vsftpd/Portfile	2013-07-19 14:34:13 UTC (rev 108323)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 
 name			vsftpd
-version			2.3.4
+version			3.0.2
 categories		net
 license			{GPL-2 OpenSSLException}
 platforms		darwin
@@ -18,9 +18,9 @@
 homepage		https://security.appspot.com/vsftpd.html
 master_sites		https://security.appspot.com/downloads/
 
-checksums           md5     2ea5d19978710527bb7444d93b67767a \
-                    sha1    b774cc6b4c50e20f4fe9ca7f6aa74169ce7fe5ea \
-                    rmd160  4097b495b5b03833e18b1639931939c3176e498b
+checksums           md5     8b00c749719089401315bd3c44dddbb2 \
+                    sha1    f36976bb1c5df25ac236d8a29e965ba2b825ccd0 \
+                    rmd160  35005dcc03537259338b5ea199df679221df362f
                     
 patchfiles		patch-sysdeputil.c.diff \
 			patch-vsf_findlibs.sh.diff \

Modified: trunk/dports/net/vsftpd/files/patch-Makefile.diff
===================================================================
--- trunk/dports/net/vsftpd/files/patch-Makefile.diff	2013-07-19 14:07:24 UTC (rev 108322)
+++ trunk/dports/net/vsftpd/files/patch-Makefile.diff	2013-07-19 14:34:13 UTC (rev 108323)
@@ -1,6 +1,15 @@
---- Makefile.orig	2008-02-15 00:42:35.000000000 +0100
-+++ Makefile	2008-02-15 00:42:48.000000000 +0100
-@@ -43,3 +43,4 @@
+--- Makefile.old	2013-07-18 17:25:19.000000000 +0200
++++ Makefile	2013-07-18 17:25:47.000000000 +0200
+@@ -10,7 +10,7 @@
+ 
+ LIBS	=	`./vsf_findlibs.sh`
+ LINK	=	-Wl,-s
+-LDFLAGS	=	-fPIE -pie -Wl,-z,relro -Wl,-z,now
++LDFLAGS	=	-fPIE -pie
+ 
+ OBJS	=	main.o utility.o prelogin.o ftpcmdio.o postlogin.o privsock.o \
+ 		tunables.o ftpdataio.o secbuf.o ls.o \
+@@ -48,3 +48,4 @@
  clean:
  	rm -f *.o *.swp vsftpd
  

Modified: trunk/dports/net/vsftpd/files/patch-sysdeputil.c.diff
===================================================================
--- trunk/dports/net/vsftpd/files/patch-sysdeputil.c.diff	2013-07-19 14:07:24 UTC (rev 108322)
+++ trunk/dports/net/vsftpd/files/patch-sysdeputil.c.diff	2013-07-19 14:34:13 UTC (rev 108323)
@@ -1,6 +1,6 @@
---- sysdeputil.c.orig	2005-04-16 17:14:08.000000000 -0400
-+++ sysdeputil.c	2005-04-16 17:15:02.000000000 -0400
-@@ -58,6 +58,10 @@
+--- sysdeputil.c.old	2013-07-18 17:12:16.000000000 +0200
++++ sysdeputil.c	2013-07-18 17:12:29.000000000 +0200
+@@ -63,6 +63,10 @@
  #define __USE_GNU
  #include <utmpx.h>
  
@@ -9,5 +9,16 @@
 +#endif
 +
  /* BEGIN config */
- #if defined(__linux__) && !defined(__ia64__) && !defined(__s390__)
-   #define VSF_SYSDEP_TRY_LINUX_SETPROCTITLE_HACK
+ #if defined(__linux__)
+   #include <errno.h>
+@@ -323,8 +327,10 @@
+                       const struct mystr* p_remote_host)
+ {
+   int retval = -1;
++#ifdef PAM_USER
+   pam_item_t item;
+   const char* pam_user_name = 0;
++#endif
+   struct pam_conv the_conv =
+   {
+     &pam_conv_func,

Modified: trunk/dports/net/vsftpd/files/patch-vsftpd.conf.diff
===================================================================
--- trunk/dports/net/vsftpd/files/patch-vsftpd.conf.diff	2013-07-19 14:07:24 UTC (rev 108322)
+++ trunk/dports/net/vsftpd/files/patch-vsftpd.conf.diff	2013-07-19 14:34:13 UTC (rev 108323)
@@ -1,15 +1,15 @@
---- vsftpd.conf.old	2010-02-20 13:55:06.000000000 -0800
-+++ vsftpd.conf	2010-02-20 13:56:58.000000000 -0800
-@@ -92,7 +92,7 @@
- # 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
- # users to NOT chroot().
+--- vsftpd.conf.old	2013-07-18 16:57:30.000000000 +0200
++++ vsftpd.conf	2013-07-18 16:58:25.000000000 +0200
+@@ -95,7 +95,7 @@
+ # (Warning! chroot'ing can be very dangerous. If using chroot, make sure that
+ # the user does not have write access to the top level directory within the
+ # chroot)
 -#chroot_local_user=YES
 +chroot_local_user=YES
  #chroot_list_enable=YES
  # (default follows)
  #chroot_list_file=/etc/vsftpd.chroot_list
-@@ -112,3 +112,6 @@
+@@ -115,3 +115,6 @@
  # sockets, you must run two copies of vsftpd with two configuration files.
  # Make sure, that one of the listen options is commented !!
  #listen_ipv6=YES
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130719/5699f66f/attachment.html>