diff options
| -rw-r--r-- | ftp/proftpd-devel/Makefile | 5 | ||||
| -rw-r--r-- | ftp/proftpd-devel/distinfo | 12 | ||||
| -rw-r--r-- | ftp/proftpd-devel/files/patch-src__wtmp.c | 47 |
3 files changed, 52 insertions, 12 deletions
diff --git a/ftp/proftpd-devel/Makefile b/ftp/proftpd-devel/Makefile index ff369343613b..7a7a587846ba 100644 --- a/ftp/proftpd-devel/Makefile +++ b/ftp/proftpd-devel/Makefile @@ -6,8 +6,7 @@ # PORTNAME= proftpd -DISTVERSION= 1.3.3rc2 -PORTREVISION= 1 +DISTVERSION= 1.3.3rc4 PORTEPOCH= 1 CATEGORIES= ftp MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \ @@ -23,7 +22,7 @@ PKGNAMESUFFIX= -devel DISTFILES= ${DISTNAME}${EXTRACT_SUFX} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= guzik@anka.net.pl COMMENT= Highly configurable ftp daemon MAN1= ftpcount.1 ftpwho.1 ftptop.1 diff --git a/ftp/proftpd-devel/distinfo b/ftp/proftpd-devel/distinfo index e0fc33d911bc..00cbf5fad748 100644 --- a/ftp/proftpd-devel/distinfo +++ b/ftp/proftpd-devel/distinfo @@ -1,9 +1,3 @@ -MD5 (proftpd-1.3.3rc2.tar.gz) = e0bae299772c9405d79306936fc981a5 -SHA256 (proftpd-1.3.3rc2.tar.gz) = 5052461f8c2c509ce28d9197988ffe09fd6e197ffcaae49e011db2f4269af9b5 -SIZE (proftpd-1.3.3rc2.tar.gz) = 4869722 -MD5 (mod_clamav-0.11rc.tar.gz) = 42e560ec0bd5964e13fad1b2bb7afe21 -SHA256 (mod_clamav-0.11rc.tar.gz) = 87630eb1866066d6320ee711897d8998b8f4915c0498b2e78cc0464abd34855a -SIZE (mod_clamav-0.11rc.tar.gz) = 5115 -MD5 (mod_digest.c) = e706e66fa4d82cf7875a1a5d6767fe00 -SHA256 (mod_digest.c) = 18174e3d3c1d61367d78c228e6510b0a21c11458f389630df281bb84d467d399 -SIZE (mod_digest.c) = 39073 +MD5 (proftpd-1.3.3rc4.tar.gz) = 73a7062239d6b3f0c437bdadd2b10add +SHA256 (proftpd-1.3.3rc4.tar.gz) = eb6737962bcda077488efde49b16e81466d8d6fad1f4cd7dd4409b58342a8619 +SIZE (proftpd-1.3.3rc4.tar.gz) = 4842078 diff --git a/ftp/proftpd-devel/files/patch-src__wtmp.c b/ftp/proftpd-devel/files/patch-src__wtmp.c new file mode 100644 index 000000000000..9d16455f7ebd --- /dev/null +++ b/ftp/proftpd-devel/files/patch-src__wtmp.c @@ -0,0 +1,47 @@ +Index: src/wtmp.c +=================================================================== +RCS file: /cvsroot/proftp/proftpd/src/wtmp.c,v +retrieving revision 1.2 +diff -u -r1.2 wtmp.c +--- src/wtmp.c 18 Feb 2009 18:24:50 -0000 1.2 ++++ src/wtmp.c 13 Mar 2010 17:06:33 -0000 +@@ -37,7 +37,8 @@ + int res = 0; + + #if ((defined(SVR4) || defined(__SVR4)) || \ +- (defined(__NetBSD__) && defined(HAVE_UTMPX_H))) && \ ++ (defined(__NetBSD__) && defined(HAVE_UTMPX_H)) || \ ++ (defined(__FreeBSD_version) && __FreeBSD_version >= 900007 && defined(HAVE_UTMPX_H))) && \ + !(defined(LINUX) || defined(__hpux) || defined (_AIX)) + /* This "auxilliary" utmp doesn't exist under linux. */ + +@@ -51,8 +52,17 @@ + + static int fdx = -1; + +-#if !defined(WTMPX_FILE) && defined(_PATH_WTMPX) +-# define WTMPX_FILE _PATH_WTMPX ++#if !defined(WTMPX_FILE) ++# if defined(_PATH_WTMPX) ++# define WTMPX_FILE _PATH_WTMPX ++# elif defined(_PATH_UTMPX) ++# define WTMPX_FILE _PATH_UTMPX ++# else ++/* This path works for FreeBSD; not sure what to do for other platforms which ++ * don't define _PATH_WTMPX or _PATH_UTMPX. ++ */ ++# define WTMPX_FILE "/var/log/utx.log" ++# endif + #endif + + if (fdx < 0 && +@@ -81,6 +91,9 @@ + memcpy(&utx.ut_ss, pr_netaddr_get_inaddr(ip), sizeof(utx.ut_ss)); + gettimeofday(&utx.ut_tv, NULL); + ++#elif defined(__FreeBSD_version) && __FreeBSD_version >= 900007 && defined(HAVE_UTMPX_H) ++ gettimeofday(&utx.ut_tv, NULL); ++ + #else /* SVR4 */ + utx.ut_syslen = strlen(utx.ut_host)+1; + |