diff options
author | martti <martti@pkgsrc.org> | 2006-12-14 11:19:46 +0000 |
---|---|---|
committer | martti <martti@pkgsrc.org> | 2006-12-14 11:19:46 +0000 |
commit | 6994027e26579658f5a68587afa15859cc8521c2 (patch) | |
tree | a28f13a2e5944a1683181811f80b92355e0a67f1 /net/proftpd | |
parent | 37062bb43e572486964ff946a1582e4c207b95ce (diff) | |
download | pkgsrc-6994027e26579658f5a68587afa15859cc8521c2.tar.gz |
Updated net/proftpd to 1.3.1rc1
The 1.3.1rc1 release includes major new features and numerous bugfixes,
including:
+ Support for UTF8 and translated response messages (NLS support)
+ New configuration directives:
DisplayChdir
DisplayFileTransfer
UseIPv6
UseUTF8
+ Deprecated configuration directives:
DisplayFirstChdir
The DisplayFirstChdir directive is deprecated; sites should use
the new DisplayChdir directive (which allows for files to
be displayed on every directory change, rather than just the
first time for a directory change).
HiddenStor
The HiddenStor directive is deprecated; simply use HiddenStores
instead.
SQLHomedirOnDemand
The SQLHomedirOnDemand directive will be removed in future
releases; use the CreateHome directive instead.
+ New modules:
mod_ban, a module handling dynamic client "black lists"
See doc/contrib/mod_ban.html
+ Enhanced modules:
The mod_tls module can now make use of cryptographic accelerator
cards with the new TLSCryptoDevice directive. It can also use
a program for obtaining certificate passphrases via the new
TLSPassPhraseProvider directive.
+ Documentation
Diffstat (limited to 'net/proftpd')
-rw-r--r-- | net/proftpd/Makefile | 17 | ||||
-rw-r--r-- | net/proftpd/PLIST | 51 | ||||
-rw-r--r-- | net/proftpd/distinfo | 14 | ||||
-rw-r--r-- | net/proftpd/patches/patch-aa | 25 | ||||
-rw-r--r-- | net/proftpd/patches/patch-ab | 108 | ||||
-rw-r--r-- | net/proftpd/patches/patch-ac | 86 |
6 files changed, 233 insertions, 68 deletions
diff --git a/net/proftpd/Makefile b/net/proftpd/Makefile index 30b6769c157..276549061a8 100644 --- a/net/proftpd/Makefile +++ b/net/proftpd/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.37 2006/11/23 11:57:07 adrianp Exp $ +# $NetBSD: Makefile,v 1.38 2006/12/14 11:19:46 martti Exp $ -DISTNAME= proftpd-1.3.0 -PKGREVISION= 2 +DISTNAME= proftpd-1.3.1rc1 +#PKGREVISION= 1 CATEGORIES= net MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \ ftp://ftp.servus.at/ProFTPD/distrib/source/ \ @@ -16,15 +16,18 @@ COMMENT= FTP server with Apache like configuration WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} GNU_CONFIGURE= yes -USE_TOOLS+= gmake +USE_TOOLS+= gmake intltool CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} CONFIGURE_ARGS+= --disable-sendfile CONFIGURE_ARGS+= --enable-ctrls +CONFIGURE_ARGS+= --enable-nls CONFIGURE_ENV+= install_user=${ROOT_USER} install_group=${ROOT_GROUP} +BUILD_DEFS+= VARBASE + RCD_SCRIPTS= proftpd CONF_FILES= ${PREFIX:Q}/share/examples/proftpd/basic.conf \ @@ -36,10 +39,12 @@ SUBST_STAGE.man= pre-configure SUBST_FILES.man= utils/ftpcount.1.in utils/ftptop.1.in utils/ftpwho.1.in SUBST_SED.man= -e s,@LOCALSTATEDIR@/run/proftpd,${VARBASE:Q}/run, +INSTALLATION_DIRS+= share/doc/proftpd +INSTALLATION_DIRS+= share/examples/proftpd + .include "options.mk" 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:Q} ${PREFIX:Q}/share/doc/proftpd @@ -47,8 +52,8 @@ post-install: .for i in Configuration.html faq.html license.txt ${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 \ ${PREFIX:Q}/share/examples/proftpd +.include "../../devel/gettext-lib/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/proftpd/PLIST b/net/proftpd/PLIST index df682301a59..db59e2bad58 100644 --- a/net/proftpd/PLIST +++ b/net/proftpd/PLIST @@ -1,8 +1,56 @@ -@comment $NetBSD: PLIST,v 1.10 2005/11/03 19:09:46 martti Exp $ +@comment $NetBSD: PLIST,v 1.11 2006/12/14 11:19:46 martti Exp $ bin/ftpcount bin/ftpdctl bin/ftptop bin/ftpwho +include/proftpd/auth.h +include/proftpd/bindings.h +include/proftpd/buildstamp.h +include/proftpd/child.h +include/proftpd/class.h +include/proftpd/compat.h +include/proftpd/conf.h +include/proftpd/config.h +include/proftpd/ctrls.h +include/proftpd/data.h +include/proftpd/default_paths.h +include/proftpd/dirtree.h +include/proftpd/display.h +include/proftpd/event.h +include/proftpd/feat.h +include/proftpd/fsio.h +include/proftpd/ftp.h +include/proftpd/glibc-glob.h +include/proftpd/help.h +include/proftpd/ident.h +include/proftpd/inet.h +include/proftpd/lastlog.h +include/proftpd/libsupp.h +include/proftpd/log.h +include/proftpd/mkhome.h +include/proftpd/mod_ctrls.h +include/proftpd/modules.h +include/proftpd/netacl.h +include/proftpd/netaddr.h +include/proftpd/netio.h +include/proftpd/options.h +include/proftpd/parser.h +include/proftpd/pool.h +include/proftpd/pr-syslog.h +include/proftpd/privs.h +include/proftpd/proftpd.h +include/proftpd/regexp.h +include/proftpd/response.h +include/proftpd/scoreboard.h +include/proftpd/sets.h +include/proftpd/support.h +include/proftpd/table.h +include/proftpd/timers.h +include/proftpd/trace.h +include/proftpd/utf8.h +include/proftpd/var.h +include/proftpd/version.h +include/proftpd/xferlog.h man/man1/ftpcount.1 man/man1/ftptop.1 man/man1/ftpwho.1 @@ -34,3 +82,4 @@ share/examples/proftpd/virtual.conf share/examples/rc.d/proftpd @dirrm share/doc/proftpd @dirrm share/examples/proftpd +@dirrm include/proftpd diff --git a/net/proftpd/distinfo b/net/proftpd/distinfo index 0ace3b69be7..adeb39fd307 100644 --- a/net/proftpd/distinfo +++ b/net/proftpd/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.20 2006/11/23 11:57:07 adrianp Exp $ +$NetBSD: distinfo,v 1.21 2006/12/14 11:19:46 martti Exp $ -SHA1 (proftpd-1.3.0.tar.bz2) = d117134035a3d8d130c5aa44d6b1788683a33410 -RMD160 (proftpd-1.3.0.tar.bz2) = 46cdd29a6c6ce4c3dd8f1a972df0a52b90a6d2ec -Size (proftpd-1.3.0.tar.bz2) = 1386086 bytes -SHA1 (patch-aa) = 5ebfe97a0edb8ecee7495fd5d487eff3cf32d1fe -SHA1 (patch-ab) = 8886177b90089c8a2fa580aceb7a0514fe0ea6a7 -SHA1 (patch-ac) = 4cdfd0cff027524c38785a5a45bae747e3b151f7 +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 diff --git a/net/proftpd/patches/patch-aa b/net/proftpd/patches/patch-aa index ae5c6fecc3d..df85f59ed0f 100644 --- a/net/proftpd/patches/patch-aa +++ b/net/proftpd/patches/patch-aa @@ -1,13 +1,26 @@ -$NetBSD: patch-aa,v 1.7 2005/11/03 19:09:46 martti Exp $ +$NetBSD: patch-aa,v 1.8 2006/12/14 11:19:46 martti Exp $ ---- Makefile.in.orig 2005-05-07 22:19:49.000000000 +0300 -+++ Makefile.in 2005-11-03 18:43:25.000000000 +0200 -@@ -112,7 +112,7 @@ +--- 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 @@ $(INSTALL_MAN) $(top_srcdir)/utils/ftpwho.1 $(DESTDIR)$(mandir)/man1 $(INSTALL_MAN) $(top_srcdir)/src/xferlog.5 $(DESTDIR)$(mandir)/man5 --install-all: install-proftpd install-modules install-utils install-conf install-man $(INSTALL_DEPS) -+install-all: install-proftpd install-modules install-utils install-man $(INSTALL_DEPS) +-install-all: install-proftpd install-modules install-utils install-conf install-man install-headers install-locales $(INSTALL_DEPS) ++install-all: install-proftpd install-modules install-utils install-man install-headers install-locales $(INSTALL_DEPS) install: all install-all diff --git a/net/proftpd/patches/patch-ab b/net/proftpd/patches/patch-ab index bc601c0cc70..6478ae72bca 100644 --- a/net/proftpd/patches/patch-ab +++ b/net/proftpd/patches/patch-ab @@ -1,8 +1,106 @@ -$NetBSD: patch-ab,v 1.4 2006/04/17 05:33:10 martti Exp $ +$NetBSD: patch-ab,v 1.5 2006/12/14 11:19:46 martti Exp $ ---- configure.orig 2006-03-09 20:20:04.000000000 +0200 -+++ configure 2006-04-17 05:23:46.000000000 +0300 -@@ -35825,7 +35825,7 @@ +--- 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 @@ _ACEOF cat >>confdefs.h <<_ACEOF @@ -11,7 +109,7 @@ $NetBSD: patch-ab,v 1.4 2006/04/17 05:33:10 martti Exp $ _ACEOF cat >>confdefs.h <<_ACEOF -@@ -35833,7 +35833,7 @@ +@@ -36616,7 +36695,7 @@ _ACEOF cat >>confdefs.h <<_ACEOF diff --git a/net/proftpd/patches/patch-ac b/net/proftpd/patches/patch-ac index 2f8048a29df..89e38a0b2a4 100644 --- a/net/proftpd/patches/patch-ac +++ b/net/proftpd/patches/patch-ac @@ -1,49 +1,49 @@ -$NetBSD: patch-ac,v 1.6 2006/11/23 11:57:07 adrianp Exp $ +$NetBSD: patch-ac,v 1.7 2006/12/14 11:19:46 martti Exp $ ---- src/main.c.orig 2006-03-15 19:41:01.000000000 +0000 -+++ src/main.c -@@ -116,6 +116,8 @@ static unsigned char have_dead_child = F +--- 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 - static char sbuf[PR_TUNABLE_BUFFER_SIZE] = {'\0'}; + 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. -+#define PR_DEFAULT_CMD_BUFSZ 512 -+ - static char **Argv = NULL; - static char *LastArgv = NULL; - static const char *PidPath = PR_PID_FILE_PATH; -@@ -820,17 +822,24 @@ static void cmd_loop(server_rec *server, - pr_timer_reset(TIMER_IDLE, NULL); - - if (cmd_buf_size == -1) { -- long *buf_size = get_param_ptr(main_server->conf, -- "CommandBufferSize", FALSE); + AC_CHECK_LIB(intl, bindtextdomain, +- ac_build_addl_libs="-lintl $ac_build_addl_libs" +- AC_DEFINE(HAVE_LIBINTL, 1, [Define if libintl is present.]) - -- if (buf_size == NULL || *buf_size <= 0) -- cmd_buf_size = 512; +- 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])] ++ ]) + ) - -- else if (*buf_size + 1 > sizeof(buf)) { -- pr_log_pri(PR_LOG_WARNING, "Invalid CommandBufferSize size given. " -- "Resetting to 512."); -- cmd_buf_size = 512; -- } -+ int *bufsz = get_param_ptr(main_server->conf, "CommandBufferSize", FALSE); -+ if (bufsz == NULL) { -+ cmd_buf_size = PR_DEFAULT_CMD_BUFSZ; -+ } -+ else if ( bufsz <= 0 ) { -+ pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%d) " -+ "given, resetting to default buffer size (%u)", -+ *bufsz, (unsigned int) PR_DEFAULT_CMD_BUFSZ); -+ cmd_buf_size = PR_DEFAULT_CMD_BUFSZ; -+ } else if (*bufsz + 1 > sizeof(buf)) { -+ pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%d) " -+ "given, using default buffer size (%u) instead", -+ *bufsz, (unsigned int) PR_DEFAULT_CMD_BUFSZ); -+ cmd_buf_size = PR_DEFAULT_CMD_BUFSZ; -+ } else { -+ pr_log_debug(DEBUG1, "setting CommandBufferSize to %d", *bufsz); -+ cmd_buf_size = (long) *bufsz; -+ } - } +- AC_DEFINE(PR_USE_NLS, 1, [Define if using NLS support.]) +- ENABLE_NLS="1" + fi + ]) + +@@ -1927,9 +1930,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"`") +-AC_DEFINE_UNQUOTED(PR_RUN_DIR, "`eval echo "${localstatedir}/proftpd"`") ++AC_DEFINE_UNQUOTED(PR_RUN_DIR, "`eval echo "${localstatedir}/run"`") + AC_DEFINE_UNQUOTED(PR_CONFIG_FILE_PATH, "`eval echo "${sysconfdir}/proftpd.conf"`") +-AC_DEFINE_UNQUOTED(PR_PID_FILE_PATH, "`eval echo "${localstatedir}/proftpd.pid"`") ++AC_DEFINE_UNQUOTED(PR_PID_FILE_PATH, "`eval echo "${localstatedir}/run/proftpd.pid"`") - buf[cmd_buf_size - 1] = '\0'; + prefix="$pr_saved_prefix" + exec_prefix="$pr_saved_exec_prefix" |