[proftpd-dfsg] 01/01: TL; DNR: new moduled and fixes, have a look @debian/changelog
Hilmar Preuße
hilmar-guest at moszumanska.debian.org
Tue Feb 6 19:57:51 GMT 2018
This is an automated email from the git hooks/post-receive script.
hilmar-guest pushed a commit to branch master
in repository proftpd-dfsg.
commit 0e7a774ce77b2b25321c9359c503511f01848eba
Author: Hilmar Preuße <hille42 at web.de>
Date: Tue Feb 6 20:57:03 2018 +0100
TL;DNR: new moduled and fixes, have a look @debian/changelog
---
debian/changelog | 34 +++-
debian/clean | 4 +
debian/control | 5 +-
debian/control.in | 3 +-
debian/patches/ftpasswd.cracklib.location | 2 +
debian/patches/ftpstats | 6 +-
debian/patches/mod_cap | 12 +-
debian/patches/mod_sql_mysql.c | 6 +-
debian/patches/mod_wrap_noparanoid | 6 +-
debian/patches/odbc | 9 +-
debian/patches/series | 2 +
debian/patches/spelling_errors | 36 ++--
debian/patches/upstream_4335 | 33 ++++
debian/patches/upstream_4336 | 276 ++++++++++++++++++++++++++++++
debian/proftpd-basic.install | 15 +-
debian/proftpd-substvars | 2 +-
debian/rules | 16 +-
debian/templates/geoip.conf | 101 +++++++++++
18 files changed, 523 insertions(+), 45 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f8ca947..07edec7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,36 @@
proftpd-dfsg (1.3.6-1) UNRELEASED; urgency=medium
- * New upstream release.
- * Patches refreshed.
- * Removed some patches noew already applied upstream or obsoleted.
+ [Hilmar Preuße]
+ * New upstream release (Closes: #879113)
+ - Has support for One time passwords (Closes: #94162)
+ - Improved documentation of MaxInstances (Closes: #336001)
+ - Fixes another crash bug mit mod_ssl (Closes: #839880)
+ - Restores file permissions of /etc/proftpd/passwd
+ (Closes: #796233)
+ - Has support for systemd (Closes: #740177)
+
+ * (New) modules enabled
+ - Redis: mod_redis, mod_tls_redis, mod_wrap2_redis.
+ - mod_memcache: link failure, fixed now. This hopefully
+ (Closes: #714108).
+ - mod_auth_otp.
+ All modules included in proftpd-basic.
+
+ * Patches refreshed, some are applied upstream now:
+ - xferstats.holger-preiss
+ - silent # obsolete, message severity is now "debug"
+ - use_hypen_in_manpage
+ - FTBS_on_Hurd
+ - not_read_whole_passwd_db
+
+ * New patches:
+ - upstream_4335 (upstream #4336) to build mod_auth_otp.so
+ - upstream_4336 (upstream #4336) mod_redis & mod_memache fail to link
+
+ * Include geoip sample config into proftp-basic (Closes: #872452).
+ * Add B-D on libhiredis-dev to build Redis support.
- -- Francesco Paolo Lovergine <frankie at debian.org> Tue, 06 Feb 2018 14:58:35 +0100
+ -- Francesco Paolo Lovergine <frankie at debian.org> Mon, 15 Jan 2018 21:14:17 +0100
proftpd-dfsg (1.3.5e-1) unstable; urgency=medium
diff --git a/debian/clean b/debian/clean
index 4650eb5..86d6d72 100644
--- a/debian/clean
+++ b/debian/clean
@@ -11,6 +11,10 @@ contrib/mod_load/mod_load.h
contrib/mod_load/Makefile
contrib/mod_sftp/mod_sftp.h
contrib/mod_sftp/Makefile
+contrib/mod_auth_otp/auth-otp
+contrib/mod_auth_otp/Makefile
+contrib/mod_auth_otp/mod_auth_otp.h
+contrib/mod_auth_otp/t/Makefile
src/ftpdctl.8
src/proftpd.8
src/proftpd.conf.5
diff --git a/debian/control b/debian/control
index fcba69d..fa58e02 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,8 @@ Build-Depends: debhelper (>= 9.20160114),
unixodbc-dev,
zlib1g-dev,
libgeoip-dev,
- libmemcached-dev (>= 0.41)
+ libmemcached-dev (>= 0.41),
+ libhiredis-dev
Homepage: http://www.proftpd.org/
Vcs-Git: https://anonscm.debian.org/git/pkg-proftpd/proftpd-dfsg.git
Vcs-Browser: https://anonscm.debian.org/git/pkg-proftpd/proftpd-dfsg.git
@@ -39,7 +40,7 @@ Depends: adduser,
Conflicts: ftp-server
Breaks: proftpd (<< 1.3.2)
Replaces: proftpd (<< 1.3.2)
-Provides: ftp-server, proftpd, proftpd-abi-1.3.5e
+Provides: ftp-server, proftpd, proftpd-abi-1.3.6
Suggests: openbsd-inetd | inet-superserver,
openssl,
proftpd-mod-ldap,
diff --git a/debian/control.in b/debian/control.in
index e8ff105..c7f884c 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -20,7 +20,8 @@ Build-Depends: debhelper (>= 9.20160114),
unixodbc-dev,
zlib1g-dev,
libgeoip-dev,
- libmemcached-dev (>= 0.41)
+ libmemcached-dev (>= 0.41),
+ libhiredis-dev
Homepage: http://www.proftpd.org/
Vcs-Git: https://anonscm.debian.org/git/pkg-proftpd/proftpd-dfsg.git
Vcs-Browser: https://anonscm.debian.org/git/pkg-proftpd/proftpd-dfsg.git
diff --git a/debian/patches/ftpasswd.cracklib.location b/debian/patches/ftpasswd.cracklib.location
index e3b2d50..fdae8fe 100644
--- a/debian/patches/ftpasswd.cracklib.location
+++ b/debian/patches/ftpasswd.cracklib.location
@@ -4,6 +4,8 @@ Author: Paul Martin <pm at debian.org>
Bug-Debian: http://bugs.debian.org/159365
Forwarded: not needed
+Index: proftpd-dfsg/contrib/ftpasswd
+===================================================================
--- proftpd-dfsg.orig/contrib/ftpasswd
+++ proftpd-dfsg/contrib/ftpasswd
@@ -35,7 +35,8 @@
diff --git a/debian/patches/ftpstats b/debian/patches/ftpstats
index 7c67ea5..59dc286 100644
--- a/debian/patches/ftpstats
+++ b/debian/patches/ftpstats
@@ -3,8 +3,10 @@ Author: Francesco Paolo Lovergine <frankie at debian.org>
Forwarded: not needed
Bug-Debian: http://bugs.debian.org/378826
---- proftpd-dfsg.orig/contrib/xferstats.holger-preiss
-+++ proftpd-dfsg/contrib/xferstats.holger-preiss
+Index: proftpd-dfsg/contrib/xferstats.holger-preiss
+===================================================================
+--- proftpd-dfsg.orig/contrib/xferstats.holger-preiss 2018-01-14 23:20:44.000000000 +0100
++++ proftpd-dfsg/contrib/xferstats.holger-preiss 2018-01-14 23:20:44.000000000 +0100
@@ -56,7 +56,7 @@
# $mydom2 = "org";
diff --git a/debian/patches/mod_cap b/debian/patches/mod_cap
index cb206c2..4964828 100644
--- a/debian/patches/mod_cap
+++ b/debian/patches/mod_cap
@@ -5,8 +5,10 @@ Author: Francesco Paolo Lovergine <frankie at debian.org>
Forwarded: not needed
Bug-Debian: http://bugs.debian.org/479893
---- proftpd-dfsg.orig/lib/libcap/Makefile
-+++ proftpd-dfsg/lib/libcap/Makefile
+Index: proftpd-dfsg/lib/libcap/Makefile
+===================================================================
+--- proftpd-dfsg.orig/lib/libcap/Makefile 2018-01-14 23:22:58.000000000 +0100
++++ proftpd-dfsg/lib/libcap/Makefile 2018-01-14 23:22:58.000000000 +0100
@@ -23,7 +23,7 @@
INCLS=libcap.h cap_names.h $(INCS)
OBJS=$(addsuffix .o, $(FILES))
@@ -16,8 +18,10 @@ Bug-Debian: http://bugs.debian.org/479893
_makenames: _makenames.c cap_names.sed
$(CC) $(CFLAGS) $(LDFLAGS) $< -o $@
---- proftpd-dfsg.orig/modules/mod_cap.c
-+++ proftpd-dfsg/modules/mod_cap.c
+Index: proftpd-dfsg/modules/mod_cap.c
+===================================================================
+--- proftpd-dfsg.orig/modules/mod_cap.c 2018-01-14 23:22:58.000000000 +0100
++++ proftpd-dfsg/modules/mod_cap.c 2018-01-14 23:22:58.000000000 +0100
@@ -42,10 +42,8 @@
# define _LINUX_BYTEORDER_GENERIC_H
# endif
diff --git a/debian/patches/mod_sql_mysql.c b/debian/patches/mod_sql_mysql.c
index 3ba5366..4898503 100644
--- a/debian/patches/mod_sql_mysql.c
+++ b/debian/patches/mod_sql_mysql.c
@@ -2,8 +2,10 @@ Description: Use mysql/mysql.h instead of mysql.h
Author: Francesco Paolo Lovergine <frankie at debian.org>
Forwarded: not needed
---- proftpd-dfsg.orig/contrib/mod_sql_mysql.c
-+++ proftpd-dfsg/contrib/mod_sql_mysql.c
+Index: proftpd-dfsg/contrib/mod_sql_mysql.c
+===================================================================
+--- proftpd-dfsg.orig/contrib/mod_sql_mysql.c 2018-01-14 23:18:00.000000000 +0100
++++ proftpd-dfsg/contrib/mod_sql_mysql.c 2018-01-14 23:18:00.000000000 +0100
@@ -131,7 +131,7 @@
#include "conf.h"
#include "../contrib/mod_sql.h"
diff --git a/debian/patches/mod_wrap_noparanoid b/debian/patches/mod_wrap_noparanoid
index 5158aca..5891168 100644
--- a/debian/patches/mod_wrap_noparanoid
+++ b/debian/patches/mod_wrap_noparanoid
@@ -3,8 +3,10 @@ Author: Francesco Paolo Lovergine <frankie at debian.org>
Forwarded: not needed
Bug-Debian: http://bugs.debian.org/366397
---- proftpd-dfsg.orig/contrib/mod_wrap.c
-+++ proftpd-dfsg/contrib/mod_wrap.c
+Index: proftpd-dfsg/contrib/mod_wrap.c
+===================================================================
+--- proftpd-dfsg.orig/contrib/mod_wrap.c 2018-01-14 23:18:56.000000000 +0100
++++ proftpd-dfsg/contrib/mod_wrap.c 2018-01-14 23:18:56.000000000 +0100
@@ -949,8 +949,7 @@
fromhost(&request);
diff --git a/debian/patches/odbc b/debian/patches/odbc
index 3f864e5..7a0d90d 100644
--- a/debian/patches/odbc
+++ b/debian/patches/odbc
@@ -3,13 +3,14 @@ Author: Francesco Paolo Lovergine <frankie at debian.org>
Forwarded: not needed
Bug-Debian: http://bugs.debian.org/366397
---- proftpd-dfsg.orig/contrib/mod_sql_odbc.c
-+++ proftpd-dfsg/contrib/mod_sql_odbc.c
-@@ -19,6 +19,8 @@
+Index: proftpd-dfsg/contrib/mod_sql_odbc.c
+===================================================================
+--- proftpd-dfsg.orig/contrib/mod_sql_odbc.c 2018-01-14 23:24:03.000000000 +0100
++++ proftpd-dfsg/contrib/mod_sql_odbc.c 2018-01-15 20:49:02.000000000 +0100
+@@ -19,6 +19,7 @@
* As a special exemption, TJ Saunders gives permission to link this program
* with OpenSSL, and distribute the resulting executable, without including
* the source code for OpenSSL in the source distribution.
-+ *
+ * $Libraries: -lodbc $
*/
diff --git a/debian/patches/series b/debian/patches/series
index a44032a..f1b2322 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,5 @@ mod_cap
odbc
reproducible_build
spelling_errors
+upstream_4335
+upstream_4336
diff --git a/debian/patches/spelling_errors b/debian/patches/spelling_errors
index bf0851f..04c175e 100644
--- a/debian/patches/spelling_errors
+++ b/debian/patches/spelling_errors
@@ -3,8 +3,10 @@ Author: Francesco Paolo Lovergine <frankie at debian.org>
Last-Update: 2017-01-09
Forwarded: https://github.com/proftpd/proftpd/pull/666
---- proftpd-dfsg.orig/contrib/mod_sftp/date.c
-+++ proftpd-dfsg/contrib/mod_sftp/date.c
+Index: proftpd-dfsg/contrib/mod_sftp/date.c
+===================================================================
+--- proftpd-dfsg.orig/contrib/mod_sftp/date.c 2018-01-15 21:09:11.000000000 +0100
++++ proftpd-dfsg/contrib/mod_sftp/date.c 2018-01-15 21:09:11.000000000 +0100
@@ -124,7 +124,7 @@
case '?':
/* Ignore unsupported options */
@@ -14,8 +16,10 @@ Forwarded: https://github.com/proftpd/proftpd/pull/666
break;
}
}
---- proftpd-dfsg.orig/contrib/mod_sftp/keys.c
-+++ proftpd-dfsg/contrib/mod_sftp/keys.c
+Index: proftpd-dfsg/contrib/mod_sftp/keys.c
+===================================================================
+--- proftpd-dfsg.orig/contrib/mod_sftp/keys.c 2018-01-15 21:09:11.000000000 +0100
++++ proftpd-dfsg/contrib/mod_sftp/keys.c 2018-01-15 21:09:11.000000000 +0100
@@ -995,7 +995,7 @@
if (sftp_keys_validate_ecdsa_params(curve, point) < 0) {
@@ -43,8 +47,10 @@ Forwarded: https://github.com/proftpd/proftpd/pull/666
EC_KEY_free(ec);
EVP_PKEY_free(pkey);
return -1;
---- proftpd-dfsg.orig/contrib/mod_tls.c
-+++ proftpd-dfsg/contrib/mod_tls.c
+Index: proftpd-dfsg/contrib/mod_tls.c
+===================================================================
+--- proftpd-dfsg.orig/contrib/mod_tls.c 2018-01-15 21:09:11.000000000 +0100
++++ proftpd-dfsg/contrib/mod_tls.c 2018-01-15 21:09:11.000000000 +0100
@@ -2142,7 +2142,7 @@
if (idx < 0) {
pr_trace_msg(trace_channel, 12,
@@ -72,8 +78,10 @@ Forwarded: https://github.com/proftpd/proftpd/pull/666
tls_get_errors());
return 0;
}
---- proftpd-dfsg.orig/doc/utils/ftpwho.html
-+++ proftpd-dfsg/doc/utils/ftpwho.html
+Index: proftpd-dfsg/doc/utils/ftpwho.html
+===================================================================
+--- proftpd-dfsg.orig/doc/utils/ftpwho.html 2018-01-15 21:09:11.000000000 +0100
++++ proftpd-dfsg/doc/utils/ftpwho.html 2018-01-15 21:09:11.000000000 +0100
@@ -14,7 +14,7 @@
The <B>ftpwho</B> command shows process information for all active proftpd
@@ -83,8 +91,10 @@ Forwarded: https://github.com/proftpd/proftpd/pull/666
master proftpd <I>standalone</I> server.
<H2>OPTIONS</H2>
---- proftpd-dfsg.orig/utils/ftpwho.1.in
-+++ proftpd-dfsg/utils/ftpwho.1.in
+Index: proftpd-dfsg/utils/ftpwho.1.in
+===================================================================
+--- proftpd-dfsg.orig/utils/ftpwho.1.in 2018-01-15 21:09:11.000000000 +0100
++++ proftpd-dfsg/utils/ftpwho.1.in 2018-01-15 21:09:11.000000000 +0100
@@ -10,7 +10,7 @@
The
.BI ftpwho
@@ -94,8 +104,10 @@ Forwarded: https://github.com/proftpd/proftpd/pull/666
spawned from inetd are counted separately from those created by a
master proftpd
.I standalone
---- proftpd-dfsg.orig/contrib/mod_ldap.c
-+++ proftpd-dfsg/contrib/mod_ldap.c
+Index: proftpd-dfsg/contrib/mod_ldap.c
+===================================================================
+--- proftpd-dfsg.orig/contrib/mod_ldap.c 2018-01-15 21:09:11.000000000 +0100
++++ proftpd-dfsg/contrib/mod_ldap.c 2018-01-15 21:09:11.000000000 +0100
@@ -930,7 +930,7 @@
cached_quota->nelts = 1;
diff --git a/debian/patches/upstream_4335 b/debian/patches/upstream_4335
new file mode 100644
index 0000000..b208ec5
--- /dev/null
+++ b/debian/patches/upstream_4335
@@ -0,0 +1,33 @@
+From e25f45d2dad79cb4e2f9fe8d12484cf0b81df320 Mon Sep 17 00:00:00 2001
+From: TJ Saunders <tj at castaglia.org>
+Date: Tue, 16 Jan 2018 04:55:23 -0800
+Subject: [PATCH] Bug #4335: mod_auth_otp fails to build with OpenSSL 1.1.x.
+
+---
+ contrib/mod_auth_otp/crypto.c | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/contrib/mod_auth_otp/crypto.c b/contrib/mod_auth_otp/crypto.c
+index c479d56d4..076a26693 100644
+--- a/contrib/mod_auth_otp/crypto.c
++++ b/contrib/mod_auth_otp/crypto.c
+@@ -1,6 +1,6 @@
+ /*
+ * ProFTPD - mod_auth_otp OpenSSL interface
+- * Copyright (c) 2015-2017 TJ Saunders
++ * Copyright (c) 2015-2018 TJ Saunders
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+@@ -50,10 +50,7 @@ void auth_otp_crypto_free(int flags) {
+ ERR_free_strings();
+
+ #if OPENSSL_VERSION_NUMBER >= 0x10000001L
+-# if OPENSSL_VERSION_NUMBER >= 0x10100000L && \
+- !defined(HAVE_LIBRESSL)
+- ERR_remove_thread_state();
+-# else
++# if OPENSSL_VERSION_NUMBER >= 0x10100000L
+ /* The ERR_remove_state(0) usage is deprecated due to thread ID
+ * differences among platforms; see the OpenSSL-1.0.0c CHANGES file
+ * for details. So for new enough OpenSSL installations, use the
diff --git a/debian/patches/upstream_4336 b/debian/patches/upstream_4336
new file mode 100644
index 0000000..d3d45c4
--- /dev/null
+++ b/debian/patches/upstream_4336
@@ -0,0 +1,276 @@
+From 322939023a6a92c24176b51dba0ea42b5f57849a Mon Sep 17 00:00:00 2001
+From: TJ Saunders <tj at castaglia.org>
+Date: Sun, 21 Jan 2018 13:12:47 -0800
+Subject: [PATCH] Bug #4336: Check for, and use, the necessary libraries for
+ Memcache and Redis support.
+
+---
+ configure | 217 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ configure.in | 5 ++
+ 2 files changed, 221 insertions(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index ef7d236b3..61652baa3 100755
+--- a/configure
++++ b/configure
+@@ -16933,6 +16933,149 @@ fi
+
+
+ if test x"$enable_memcache" = xyes; then
++
++{ echo "$as_me:$LINENO: checking for memcached_create in -lmemcached" >&5
++echo $ECHO_N "checking for memcached_create in -lmemcached... $ECHO_C" >&6; }
++if test "${ac_cv_lib_memcached_memcached_create+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-lmemcached $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 GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
++#ifdef __cplusplus
++extern "C"
++#endif
++char memcached_create ();
++int
++main ()
++{
++return memcached_create ();
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
++ ac_cv_lib_memcached_memcached_create=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ ac_cv_lib_memcached_memcached_create=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++ conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_memcached_memcached_create" >&5
++echo "${ECHO_T}$ac_cv_lib_memcached_memcached_create" >&6; }
++if test $ac_cv_lib_memcached_memcached_create = yes; then
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_LIBMEMCACHED 1
++_ACEOF
++
++ LIBS="-lmemcached $LIBS"
++
++fi
++
++
++{ echo "$as_me:$LINENO: checking for libmemcached_util_ping in -lmemcachedutil" >&5
++echo $ECHO_N "checking for libmemcached_util_ping in -lmemcachedutil... $ECHO_C" >&6; }
++if test "${ac_cv_lib_memcachedutil_libmemcached_util_ping+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-lmemcachedutil $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 GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
++#ifdef __cplusplus
++extern "C"
++#endif
++char libmemcached_util_ping ();
++int
++main ()
++{
++return libmemcached_util_ping ();
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
++ ac_cv_lib_memcachedutil_libmemcached_util_ping=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ ac_cv_lib_memcachedutil_libmemcached_util_ping=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++ conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_memcachedutil_libmemcached_util_ping" >&5
++echo "${ECHO_T}$ac_cv_lib_memcachedutil_libmemcached_util_ping" >&6; }
++if test $ac_cv_lib_memcachedutil_libmemcached_util_ping = yes; then
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_LIBMEMCACHEDUTIL 1
++_ACEOF
++
++ LIBS="-lmemcachedutil $LIBS"
++
++fi
++
++
+ # Yes, we DO want mod_memcache AFTER the other modules in the static
+ # module list. Otherwise, the module load ordering will be such that
+ # memcache support will not work as expected
+@@ -16941,6 +17084,78 @@ if test x"$enable_memcache" = xyes; then
+ fi
+
+ if test x"$enable_redis" = xyes; then
++
++{ echo "$as_me:$LINENO: checking for redisConnect in -lhiredis" >&5
++echo $ECHO_N "checking for redisConnect in -lhiredis... $ECHO_C" >&6; }
++if test "${ac_cv_lib_hiredis_redisConnect+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-lhiredis $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 GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
++#ifdef __cplusplus
++extern "C"
++#endif
++char redisConnect ();
++int
++main ()
++{
++return redisConnect ();
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
++ ac_cv_lib_hiredis_redisConnect=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ ac_cv_lib_hiredis_redisConnect=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++ conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_hiredis_redisConnect" >&5
++echo "${ECHO_T}$ac_cv_lib_hiredis_redisConnect" >&6; }
++if test $ac_cv_lib_hiredis_redisConnect = yes; then
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_LIBHIREDIS 1
++_ACEOF
++
++ LIBS="-lhiredis $LIBS"
++
++fi
++
++
+ # Yes, we DO want mod_redis AFTER the other modules in the static
+ # module list. Otherwise, the module load ordering will be such that
+ # Redis support will not work as expected.
+@@ -18145,7 +18360,7 @@ else
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<_LT_EOF
+-#line 18148 "configure"
++#line 18363 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+diff --git a/configure.in b/configure.in
+index f99596d49..fe3d1ab0c 100644
+--- a/configure.in
++++ b/configure.in
+@@ -411,6 +411,9 @@ AC_ARG_WITH(modules,
+
+ dnl Memcache
+ if test x"$enable_memcache" = xyes; then
++ AC_CHECK_LIB(memcached, memcached_create)
++ AC_CHECK_LIB(memcachedutil, libmemcached_util_ping)
++
+ # Yes, we DO want mod_memcache AFTER the other modules in the static
+ # module list. Otherwise, the module load ordering will be such that
+ # memcache support will not work as expected
+@@ -420,6 +423,8 @@ fi
+
+ dnl Redis
+ if test x"$enable_redis" = xyes; then
++ AC_CHECK_LIB(hiredis, redisConnect)
++
+ # Yes, we DO want mod_redis AFTER the other modules in the static
+ # module list. Otherwise, the module load ordering will be such that
+ # Redis support will not work as expected.
diff --git a/debian/proftpd-basic.install b/debian/proftpd-basic.install
index 867e8bd..a04605f 100644
--- a/debian/proftpd-basic.install
+++ b/debian/proftpd-basic.install
@@ -4,19 +4,25 @@ usr/bin/ftpdctl
usr/bin/ftptop
usr/bin/ftpwho
etc/proftpd
+usr/lib/proftpd/mod_auth_otp.so
usr/lib/proftpd/mod_ban.so
+usr/lib/proftpd/mod_copy.so
usr/lib/proftpd/mod_ctrls_admin.so
+usr/lib/proftpd/mod_deflate.so
usr/lib/proftpd/mod_dynmasq.so
usr/lib/proftpd/mod_exec.so
usr/lib/proftpd/mod_facl.so
usr/lib/proftpd/mod_ifsession.so
+usr/lib/proftpd/mod_ifversion.so
usr/lib/proftpd/mod_load.so
+usr/lib/proftpd/mod_memcache.so
usr/lib/proftpd/mod_quotatab.so
usr/lib/proftpd/mod_quotatab_file.so
usr/lib/proftpd/mod_quotatab_radius.so
usr/lib/proftpd/mod_quotatab_sql.so
usr/lib/proftpd/mod_radius.so
usr/lib/proftpd/mod_ratio.so
+usr/lib/proftpd/mod_redis.so
usr/lib/proftpd/mod_rewrite.so
usr/lib/proftpd/mod_shaper.so
usr/lib/proftpd/mod_site_misc.so
@@ -26,15 +32,14 @@ usr/lib/proftpd/mod_sftp_pam.so
usr/lib/proftpd/mod_sql.so
usr/lib/proftpd/mod_sql_passwd.so
usr/lib/proftpd/mod_tls.so
+usr/lib/proftpd/mod_tls_memcache.so
+usr/lib/proftpd/mod_tls_redis.so
+usr/lib/proftpd/mod_unique_id.so
usr/lib/proftpd/mod_wrap2.so
usr/lib/proftpd/mod_wrap2_file.so
+usr/lib/proftpd/mod_wrap2_redis.so
usr/lib/proftpd/mod_wrap2_sql.so
usr/lib/proftpd/mod_wrap.so
-usr/lib/proftpd/mod_unique_id.so
-usr/lib/proftpd/mod_copy.so
-usr/lib/proftpd/mod_deflate.so
-usr/lib/proftpd/mod_ifversion.so
-usr/lib/proftpd/mod_tls_memcache.so
usr/share/locale/*
debian/proftpd-gencert usr/sbin/
contrib/ftpasswd usr/sbin/
diff --git a/debian/proftpd-substvars b/debian/proftpd-substvars
index b17642d..30f4014 100644
--- a/debian/proftpd-substvars
+++ b/debian/proftpd-substvars
@@ -1 +1 @@
-proftpd:Depends=proftpd-abi-1.3.5e
+proftpd:Depends=proftpd-abi-1.3.6
diff --git a/debian/rules b/debian/rules
index ff0a57e..f92a7c2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,16 +34,19 @@ endif
include /usr/share/dpkg/buildflags.mk
-DSOMODS1 = mod_unique_id:mod_site_misc:mod_load:mod_ban:mod_quotatab:mod_sql:mod_sql_mysql:mod_sql_postgres:mod_sql_sqlite:mod_sql_odbc:mod_dynmasq:
-DSOMODS2 = mod_quotatab_sql:mod_ldap:mod_quotatab_ldap:mod_ratio:mod_tls:mod_rewrite:mod_radius:mod_wrap:mod_wrap2:mod_wrap2_file:
-DSOMODS3 = mod_wrap2_sql:mod_quotatab_file:mod_quotatab_radius:mod_facl:mod_ctrls_admin:mod_copy:mod_deflate:mod_ifversion:mod_tls_memcache:
-DSOMODS4 = mod_geoip:mod_exec:mod_sftp:mod_sftp_pam:mod_sftp_sql:mod_shaper:mod_sql_passwd:mod_ifsession
+DSOMODS1 = mod_unique_id:mod_site_misc:mod_load:mod_ban:mod_quotatab:mod_sql:mod_sql_mysql:mod_sql_postgres:mod_sql_sqlite:mod_sql_odbc:mod_dynmasq
+DSOMODS2 = mod_quotatab_sql:mod_ldap:mod_quotatab_ldap:mod_ratio:mod_tls:mod_rewrite:mod_radius:mod_wrap:mod_wrap2:mod_wrap2_file
+DSOMODS3 = mod_wrap2_sql:mod_quotatab_file:mod_quotatab_radius:mod_facl:mod_ctrls_admin:mod_copy:mod_deflate:mod_ifversion:mod_tls_memcache
+DSOMODS4 = mod_geoip:mod_exec:mod_sftp:mod_sftp_pam:mod_sftp_sql:mod_shaper:mod_sql_passwd:mod_ifsession:mod_auth_otp:mod_tls_redis
+DSOMODS5 = mod_wrap2_redis:mod_redis:mod_memcache
+#DSOMODS5 = mod_wrap2_redis:mod_redis:mod_memcache:mod_readme
CONF_ARGS := --prefix=/usr \
--with-includes=$(shell pg_config --includedir):$(shell mysql_config --include|sed -e 's/-I//') \
--mandir=/usr/share/man --sysconfdir=/etc/$(NAME) --localstatedir=/run --libexecdir=/usr/lib/$(NAME) \
--enable-sendfile --enable-facl --enable-dso --enable-autoshadow --enable-ctrls --with-modules=mod_readme \
--enable-ipv6 --enable-nls --enable-memcache --with-lastlog=/var/log/lastlog --enable-pcre $(DEVELOPT) \
- --disable-strip
+ --disable-strip --enable-redis
+ # --enable-sendfile --enable-facl --enable-dso --enable-autoshadow --enable-ctrls \
ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
CONF_ARGS += --build $(DEB_HOST_GNU_TYPE)
@@ -63,6 +66,7 @@ build: debian/proftpd-substvars configure-stamp build-stamp
build-stamp:
dh_testdir
dh_auto_build
+
touch $@
install: build
@@ -77,7 +81,7 @@ configure-stamp:
# Use current autotools helpers
dh_update_autotools_config
- dh_auto_configure -- $(CONF_ARGS) --with-shared=$(DSOMODS1)$(DSOMODS2)$(DSOMODS3)$(DSOMODS4)
+ dh_auto_configure -- $(CONF_ARGS) --with-shared=$(DSOMODS1):$(DSOMODS2):$(DSOMODS3):$(DSOMODS4):$(DSOMODS5)
touch $@
diff --git a/debian/templates/geoip.conf b/debian/templates/geoip.conf
new file mode 100644
index 0000000..4bb1d67
--- /dev/null
+++ b/debian/templates/geoip.conf
@@ -0,0 +1,101 @@
+#
+# Proftpd sample configuration for geoip.
+#
+<IfModule mod_geoip.c>
+
+# GeoIPEngine
+# Syntax: GeoIPEngine on|off
+# Default: off
+# The GeoIPEngine directive enables or disables the module's lookup of geographic information for a
+# connecting client, and subsequent enforcement of any configured ACLs.
+GeoIPEngine on
+
+
+# Syntax: GeoIPAllowFilter filter pattern
+# Default: none
+# The GeoIPAllowFilter directive is used to configure ACLs based on the
+# geographic data provided by the GeoIP library.
+# Multiple GeoIPAllowFilter directives in the configuration are supported;
+# if any filter matches the connecting client, the connection will be allowed.
+# The filter parameter specifies the GeoIP value to which to apply the configured
+# pattern for matching. The possible filter values are:
+# * AreaCode
+# * ASN
+# * City
+# * Continent
+# * CountryCode
+# * CountryCode3
+# * CountryName
+# * ISP
+# * Latitude
+# * Longitude
+# * NetworkSpeed
+# * Organization
+# * PostalCode
+# * Proxy
+# * RegionCode
+# * RegionName
+# * Timezone
+# The pattern parameter is case-insensitive regular expression that will be applied to the
+# specified filter value, if available.
+# Examples:
+
+# Allow clients with high-speed connections
+# GeoIPAllowFilter NetworkSpeed corporate
+
+# Reject clients connecting from North America or South America
+# GeoIPDenyFilter Continent (NA|SA)
+
+# GeoIPDenyFilter
+# Syntax: GeoIPDenyFilter filter pattern
+# Default: none
+# The GeoIPDenyFilter directive is used to configure ACLs based on the geographic data provided by
+# the GeoIP library.
+# Multiple GeoIPDenyFilter directives in the configuration are supported; if any filter matches the
+# connecting client, the connection will be rejected.
+# See GeoIPAllowFilter for a description of the directive syntax and parameters.
+
+# GeoIPLog
+# Syntax: GeoIPLog file|"none"
+# Default: None
+# The GeoIPLog directive is used to specify a log file for mod_geoip's reporting on a per-server basis.
+# The file parameter given must be the full path to the file to use for logging.
+# Note that this path must not be to a world-writable directory and, unless AllowLogSymlinks is explicitly
+# set to on (generally a bad idea), the path must not be a symbolic link.
+GeoIPLog /var/log/proftpd/geoip.log
+
+# GeoIPTable
+# Syntax: GeoIPTable path [flags]
+# Default: None
+# The GeoIPTable directive is used to a GeoIP database file for use by the GeoIP library. The path parameter given must be the full path to the database file.
+# If no GeoIPTable directive is configured, then the GeoIP library will use the default GeoIP Country database file installed with the library.
+# Otherwise, only the database files configured via GeoIPTable directives will be used.
+# Multiple GeoIPTable directives can be used to configure multiple different GeoIP database files for use at the same time.
+# The possible flags values supported are:
+# * Standard
+# Reads the database from the filesystem; uses the least memory but causes database to be read for each connection.
+# * MemoryCache
+# Loads the database into memory; faster performance but uses the most memory. Tables configured with MemoryCache are loaded into the parent process memory, avoiding
+# the need to read them for each connection.
+# * CheckCache
+# Causes the GeoIP library to check for database updates. If the database has been updated, the library will automatically reload the file and/or memory cache.
+# * IndexCache
+# Loads just the most frequently accessed index portion of the database into memory, resulting in faster lookups than Standard but less memory usage than MemoryCache.
+# This can be useful for larger databases such as GeoIP Organization and GeoIP City.
+# * MMapCache
+# Loads the database into mmap shared memory.
+# * UTF8
+# Tells the GeoIP library to return UTF8 strings for the data obtained from this database file. By default, the GeoIP library uses ISO-8859-1 encoded strings.
+# Multiple different flags can be configured.
+# Examples:
+# GeoIPTable /path/to/GeoIP.dat MemoryCache CheckCache
+# GeoIPTable /path/to/GeoISP.dat Standard
+# GeoIPTable /path/to/GeoIPCity.dat IndexCache
+# Load GeoIP city database into memory on server startup, and use
+# UTF8-encoded city names
+GeoIPTable /usr/share/GeoIP/GeoIP.dat MemoryCache UTF8
+
+# Add your GeoIPAllowFilter/GeoIPDenyFilter rules here
+</IfModule>
+
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-proftpd/proftpd-dfsg.git
More information about the Pkg-proftpd-maintainers
mailing list