Updated net/proftpd to 1.3.1rc2

+ Fixed mod_sql's handling of WHERE clauses

+ Fixed segfaults ocurring after SIGHUP when shared modules are used

+ Fixed copying of symlinks in skeleton directory for CreateHome

6 files changed, 26 insertions, 167 deletions

diff --git a/net/proftpd/Makefile b/net/proftpd/Makefile
index 276549061a8..356517e463b 100644
--- a/net/proftpd/Makefile
+++ b/net/proftpd/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.38 2006/12/14 11:19:46 martti Exp $
+# $NetBSD: Makefile,v 1.39 2007/01/13 09:47:38 martti Exp $
 
-DISTNAME=	proftpd-1.3.1rc1
+DISTNAME=	proftpd-1.3.1rc2
 #PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.proftpd.org/distrib/source/ \
diff --git a/net/proftpd/PLIST b/net/proftpd/PLIST
index db59e2bad58..a2d97c72c30 100644
--- a/net/proftpd/PLIST
+++ b/net/proftpd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2006/12/14 11:19:46 martti Exp $
+@comment $NetBSD: PLIST,v 1.12 2007/01/13 09:47:38 martti Exp $
 bin/ftpcount
 bin/ftpdctl
 bin/ftptop
@@ -16,6 +16,7 @@ include/proftpd/data.h
 include/proftpd/default_paths.h
 include/proftpd/dirtree.h
 include/proftpd/display.h
+include/proftpd/env.h
 include/proftpd/event.h
 include/proftpd/feat.h
 include/proftpd/fsio.h
@@ -35,9 +36,11 @@ include/proftpd/netaddr.h
 include/proftpd/netio.h
 include/proftpd/options.h
 include/proftpd/parser.h
+include/proftpd/pidfile.h
 include/proftpd/pool.h
 include/proftpd/pr-syslog.h
 include/proftpd/privs.h
+include/proftpd/proctitle.h
 include/proftpd/proftpd.h
 include/proftpd/regexp.h
 include/proftpd/response.h
diff --git a/net/proftpd/distinfo b/net/proftpd/distinfo
index adeb39fd307..44a3bc69914 100644
--- a/net/proftpd/distinfo
+++ b/net/proftpd/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.21 2006/12/14 11:19:46 martti Exp $
+$NetBSD: distinfo,v 1.22 2007/01/13 09:47:38 martti Exp $
 
-SHA1 (proftpd-1.3.1rc1.tar.bz2) = 39c9804a76c8a2c75421a7d2896eae45ee0ca1cf
-RMD160 (proftpd-1.3.1rc1.tar.bz2) = 5d27844da7483973f273db6abf3947f99096b2b4
-Size (proftpd-1.3.1rc1.tar.bz2) = 1484138 bytes
-SHA1 (patch-aa) = d76f49defd39b7dcdc01c972afcf4ee7ac02c090
-SHA1 (patch-ab) = b5e12b5b730a58e77d98721f16efe8b85b95735c
-SHA1 (patch-ac) = e665c96f95726afe0bf8598e2d8622474f911814
+SHA1 (proftpd-1.3.1rc2.tar.bz2) = 7db6435707983fe8e865064661cedb159ebc1cf6
+RMD160 (proftpd-1.3.1rc2.tar.bz2) = aa928315880cf1e9d1980850ce2bb07193d2ac46
+Size (proftpd-1.3.1rc2.tar.bz2) = 1516464 bytes
+SHA1 (patch-aa) = d7ad034e763a2bf729c9af669c3094402bdd03b7
+SHA1 (patch-ab) = 2b6921efa11884286c022a1da7691fc971d65cca
+SHA1 (patch-ac) = a73ceb99485ea16a4b008971cba58204b8d3f90d
diff --git a/net/proftpd/patches/patch-aa b/net/proftpd/patches/patch-aa
index df85f59ed0f..e80cec155c6 100644
--- a/net/proftpd/patches/patch-aa
+++ b/net/proftpd/patches/patch-aa
@@ -1,21 +1,8 @@
-$NetBSD: patch-aa,v 1.8 2006/12/14 11:19:46 martti Exp $
+$NetBSD: patch-aa,v 1.9 2007/01/13 09:47:38 martti Exp $
 
---- Makefile.in.orig	2006-12-01 23:46:50.000000000 +0000
-+++ Makefile.in	2006-12-14 11:23:26.000000000 +0000
-@@ -63,10 +63,10 @@
- 	$(CC) $(LDFLAGS) -o $@ $(BUILD_FTPSHUT_OBJS)
- 
- ftptop$(EXEEXT): lib utils
--	$(CC) $(LDFLAGS) -o $@ $(BUILD_FTPTOP_OBJS) $(CURSES_LIBS) -lsupp
-+	$(CC) $(LDFLAGS) -o $@ $(BUILD_FTPTOP_OBJS) $(CURSES_LIBS) -lsupp -lintl
- 
- ftpwho$(EXEEXT): lib utils
--	$(CC) $(LDFLAGS) -o $@ $(BUILD_FTPWHO_OBJS) -lsupp
-+	$(CC) $(LDFLAGS) -o $@ $(BUILD_FTPWHO_OBJS) -lsupp -lintl
- 
- 
- # BSD install -d doesn't work, so ...
-@@ -121,7 +121,7 @@
+--- Makefile.in.orig	2007-01-10 02:19:02.000000000 +0000
++++ Makefile.in	2007-01-13 11:40:16.000000000 +0000
+@@ -122,7 +122,7 @@
  	$(INSTALL_MAN) $(top_srcdir)/utils/ftpwho.1   $(DESTDIR)$(mandir)/man1
  	$(INSTALL_MAN) $(top_srcdir)/src/xferlog.5    $(DESTDIR)$(mandir)/man5
  
diff --git a/net/proftpd/patches/patch-ab b/net/proftpd/patches/patch-ab
index 6478ae72bca..5a3917d03b1 100644
--- a/net/proftpd/patches/patch-ab
+++ b/net/proftpd/patches/patch-ab
@@ -1,106 +1,8 @@
-$NetBSD: patch-ab,v 1.5 2006/12/14 11:19:46 martti Exp $
+$NetBSD: patch-ab,v 1.6 2007/01/13 09:47:38 martti Exp $
 
---- configure.orig	2006-12-06 18:56:47.000000000 +0000
-+++ configure	2006-12-14 10:29:56.000000000 +0000
-@@ -20399,16 +20399,95 @@
- _ACEOF
- 
- 
-+cat >>confdefs.h <<\_ACEOF
-+#define PR_USE_NLS 1
-+_ACEOF
- 
--fi
-+         ENABLE_NLS="1"
- 
-+else
-+  echo "$as_me:$LINENO: checking for bindtextdomain in -lc" >&5
-+echo $ECHO_N "checking for bindtextdomain in -lc... $ECHO_C" >&6
-+if test "${ac_cv_lib_c_bindtextdomain+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lc  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- 
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+   builtin and then its argument prototype would still apply.  */
-+char bindtextdomain ();
-+int
-+main ()
-+{
-+bindtextdomain ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_lib_c_bindtextdomain=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_c_bindtextdomain=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_c_bindtextdomain" >&5
-+echo "${ECHO_T}$ac_cv_lib_c_bindtextdomain" >&6
-+if test $ac_cv_lib_c_bindtextdomain = yes; then
- 
- cat >>confdefs.h <<\_ACEOF
- #define PR_USE_NLS 1
- _ACEOF
- 
--      ENABLE_NLS="1"
-+           ENABLE_NLS="1"
-+
-+else
-+  { { echo "$as_me:$LINENO: error: libintl support, required for NLS, not present -- aborting" >&5
-+echo "$as_me: error: libintl support, required for NLS, not present -- aborting" >&2;}
-+   { (exit 1); exit 1; }; }
-+
-+fi
-+
-+
-+fi
-+
-     fi
- 
- fi;
-@@ -36608,7 +36687,7 @@
+--- configure.orig	2007-01-10 04:55:21.000000000 +0000
++++ configure	2007-01-13 11:42:19.000000000 +0000
+@@ -36772,7 +36772,7 @@
  _ACEOF
  
  cat >>confdefs.h <<_ACEOF
@@ -109,7 +11,7 @@ $NetBSD: patch-ab,v 1.5 2006/12/14 11:19:46 martti Exp $
  _ACEOF
  
  cat >>confdefs.h <<_ACEOF
-@@ -36616,7 +36695,7 @@
+@@ -36780,7 +36780,7 @@
  _ACEOF
  
  cat >>confdefs.h <<_ACEOF
diff --git a/net/proftpd/patches/patch-ac b/net/proftpd/patches/patch-ac
index 89e38a0b2a4..f5c1f47c794 100644
--- a/net/proftpd/patches/patch-ac
+++ b/net/proftpd/patches/patch-ac
@@ -1,41 +1,8 @@
-$NetBSD: patch-ac,v 1.7 2006/12/14 11:19:46 martti Exp $
+$NetBSD: patch-ac,v 1.8 2007/01/13 09:47:38 martti Exp $
 
---- configure.in.orig	2006-12-06 18:55:14.000000000 +0000
-+++ configure.in	2006-12-14 10:28:37.000000000 +0000
-@@ -486,19 +486,22 @@
-   [ if test x"$enableval" = x"yes" ; then
- 
-       dnl The libintl library is only needed on non-GNU systems.  If it
--      dnl is not installed, and the admin enables NLS support, the linker
--      dnl will complain.
-+      dnl is not installed, and the admin enables NLS support, then we
-+      dnl should abort.
- 
-       AC_CHECK_LIB(intl, bindtextdomain,
--        ac_build_addl_libs="-lintl $ac_build_addl_libs"
--        AC_DEFINE(HAVE_LIBINTL, 1, [Define if libintl is present.])
--
--        dnl Will it be problem that LIBS is not automatically updated
--        dnl to include -lintl here, since we are defining our own actions?
-+        [ac_build_addl_libs="-lintl $ac_build_addl_libs"
-+         AC_DEFINE(HAVE_LIBINTL, 1, [Define if libintl is present.])
-+         AC_DEFINE(PR_USE_NLS, 1, [Define if using NLS support.])
-+         ENABLE_NLS="1"
-+        ],
-+        [AC_CHECK_LIB(c, bindtextdomain,
-+          [AC_DEFINE(PR_USE_NLS, 1, [Define if using NLS support.])
-+           ENABLE_NLS="1"
-+          ],
-+          [AC_MSG_ERROR([libintl support, required for NLS, not present -- aborting])]
-+        ])
-       )
--
--      AC_DEFINE(PR_USE_NLS, 1, [Define if using NLS support.])
--      ENABLE_NLS="1"
-     fi
-   ])
- 
-@@ -1927,9 +1930,9 @@
+--- configure.in.orig	2007-01-10 03:45:08.000000000 +0000
++++ configure.in	2007-01-13 11:43:20.000000000 +0000
+@@ -2009,9 +2009,9 @@
  AC_DEFINE_UNQUOTED(PR_CONFIG_DIR, "`eval echo "${sysconfdir}"`")
  AC_DEFINE_UNQUOTED(PR_LIBEXEC_DIR, "`eval echo "${libexecdir}"`")
  AC_DEFINE_UNQUOTED(PR_LOCALE_DIR, "`eval echo "${datadir}/locale"`")