Updated net/proftpd to 1.3.0rc4

The 1.3.0rc4 release includes a number of minor bugfixes, including fixed
run-time detection of Unix domain sockets, portability tweaks for
Mac OSX 10.4, and logging fixes for NetBSD and Solaris.

4 files changed, 15 insertions, 66 deletions

diff --git a/net/proftpd/Makefile b/net/proftpd/Makefile
index a154086584c..35adea820d0 100644
--- a/net/proftpd/Makefile
+++ b/net/proftpd/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2006/02/17 07:46:50 martti Exp $
+# $NetBSD: Makefile,v 1.32 2006/03/02 10:46:20 martti Exp $
 
-DISTNAME=	proftpd-1.3.0rc3
-PKGREVISION=	2
+DISTNAME=	proftpd-1.3.0rc4
+#PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.proftpd.org/distrib/source/ \
 		ftp://ftp.servus.at/ProFTPD/distrib/source/ \
@@ -40,10 +40,10 @@ post-install:
 	${INSTALL_DATA_DIR} ${PREFIX:Q}/share/doc/proftpd
 .for i in NEWS README README.IPv6 README.LDAP README.PAM README.capabilities \
           README.classes README.controls README.facl README.modules
-	${INSTALL_DATA} ${WRKSRC:Q}/${i} ${PREFIX:Q}/share/doc/proftpd
+	${INSTALL_DATA} ${WRKSRC:Q}/${i:Q} ${PREFIX:Q}/share/doc/proftpd
 .endfor
 .for i in Configuration.html faq.html license.txt
-	${INSTALL_DATA} ${WRKSRC:Q}/doc/${i} ${PREFIX:Q}/share/doc/proftpd
+	${INSTALL_DATA} ${WRKSRC:Q}/doc/${i:Q} ${PREFIX:Q}/share/doc/proftpd
 .endfor
 	${INSTALL_DATA_DIR} ${PREFIX:Q}/share/examples/proftpd
 	${INSTALL_DATA} ${WRKSRC:Q}/sample-configurations/*.conf \
diff --git a/net/proftpd/distinfo b/net/proftpd/distinfo
index 1dca26058ea..71a96463b7b 100644
--- a/net/proftpd/distinfo
+++ b/net/proftpd/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.15 2005/11/04 12:36:16 martti Exp $
+$NetBSD: distinfo,v 1.16 2006/03/02 10:46:20 martti Exp $
 
-SHA1 (proftpd-1.3.0rc3.tar.bz2) = 558578f93865dd722367c70a4efdbc4bfe0f7c25
-RMD160 (proftpd-1.3.0rc3.tar.bz2) = be8acd952662f4a0d465e1d3e62a098e67ec682e
-Size (proftpd-1.3.0rc3.tar.bz2) = 1377481 bytes
+SHA1 (proftpd-1.3.0rc4.tar.bz2) = ee607912fed522e1d014a764112dfd63f6c53f71
+RMD160 (proftpd-1.3.0rc4.tar.bz2) = 0468a6aff5f92cd4e052717e44efdf7ae729e080
+Size (proftpd-1.3.0rc4.tar.bz2) = 1384880 bytes
 SHA1 (patch-aa) = 5ebfe97a0edb8ecee7495fd5d487eff3cf32d1fe
-SHA1 (patch-ab) = cda29d691e36ea590ea735ee98677e434201f74c
-SHA1 (patch-ac) = 5c57a3bfc6f900da32aaf949af4e4d9d020f9643
+SHA1 (patch-ab) = 7547e1cee007a65015902719cabc2f02f40fd8d0
diff --git a/net/proftpd/patches/patch-ab b/net/proftpd/patches/patch-ab
index 37a5bc9cb5b..a3b333574fe 100644
--- a/net/proftpd/patches/patch-ab
+++ b/net/proftpd/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2005/11/03 19:09:46 martti Exp $
+$NetBSD: patch-ab,v 1.3 2006/03/02 10:46:20 martti Exp $
 
---- configure.orig	2005-10-20 02:33:37.000000000 +0300
-+++ configure	2005-11-03 18:44:50.000000000 +0200
-@@ -35808,7 +35808,7 @@
+--- configure.orig	2005-11-08 18:13:52.000000000 +0200
++++ configure	2006-03-02 10:42:38.000000000 +0200
+@@ -35817,7 +35817,7 @@
  _ACEOF
  
  cat >>confdefs.h <<_ACEOF
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.2 2005/11/03 19:09:46 martti Exp $
  _ACEOF
  
  cat >>confdefs.h <<_ACEOF
-@@ -35816,7 +35816,7 @@
+@@ -35825,7 +35825,7 @@
  _ACEOF
  
  cat >>confdefs.h <<_ACEOF
diff --git a/net/proftpd/patches/patch-ac b/net/proftpd/patches/patch-ac
deleted file mode 100644
index 48375ccc35d..00000000000
--- a/net/proftpd/patches/patch-ac
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2005/11/04 12:36:16 martti Exp $
-
---- src/log.c	19 Sep 2005 21:35:38 -0000	1.74
-+++ src/log.c	3 Nov 2005 19:13:17 -0000
-@@ -59,7 +59,8 @@
-   int res = 0;
-   static int fd = -1;
- 
--#if (defined(SVR4) || defined(__SVR4)) && \
-+#if ((defined(SVR4) || defined(__SVR4)) || \
-+    (defined(__NetBSD__) && defined(HAVE_UTMPX_H))) && \
-     !(defined(LINUX) || defined(__hpux) || defined (_AIX))
-   /* This "auxilliary" utmp doesn't exist under linux. */
- #ifdef __sparcv9
-@@ -70,6 +71,10 @@
- #endif
-   static int fdx = -1;
- 
-+#if !defined(WTMPX_FILE) && defined(_PATH_WTMPX)
-+# define WTMPX_FILE _PATH_WTMPX
-+#endif
-+
-   if (fdx < 0 &&
-       (fdx = open(WTMPX_FILE, O_WRONLY|O_APPEND, 0)) < 0) {
-     pr_log_pri(PR_LOG_WARNING, "wtmpx %s: %s", WTMPX_FILE, strerror(errno));
-@@ -89,14 +94,20 @@
-     sstrncpy(utx.ut_id, "ftp", sizeof(utx.ut_user));
-     sstrncpy(utx.ut_line, line, sizeof(utx.ut_line));
-     sstrncpy(utx.ut_host, host, sizeof(utx.ut_host));
--    utx.ut_syslen = strlen(utx.ut_host)+1;
-     utx.ut_pid = getpid();
--#ifdef __sparcv9
-+#if defined(__NetBSD__) && defined(HAVE_UTMPX_H)
-+    memcpy(&utx.ut_ss, pr_netaddr_get_inaddr(ip), sizeof(utx.ut_ss));
-+    gettimeofday(&utx.ut_tv, NULL);
-+#else /* SVR4 */
-+    utx.ut_syslen = strlen(utx.ut_host)+1;
-+#  ifdef __sparcv9
-     time(&t);
-     utx.ut_tv.tv_sec = (time32_t)t;
--#else
-+#  else
-     time(&utx.ut_tv.tv_sec);
--#endif
-+#  endif
-+#endif /* SVR4 */
-+
-     if (*name)
-       utx.ut_type = USER_PROCESS;
-     else