[proftpd-dfsg] 03/04: Patches refreshd
Francesco Lovergine
frankie at moszumanska.debian.org
Tue Feb 6 14:22:18 GMT 2018
This is an automated email from the git hooks/post-receive script.
frankie pushed a commit to branch master
in repository proftpd-dfsg.
commit dcf153e7960fc842554567d311d1391567fca036
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date: Tue Feb 6 15:03:19 2018 +0100
Patches refreshd
---
debian/changelog | 8 +++
debian/patches/FTBS_on_Hurd | 115 ------------------------------
debian/patches/autotools | 10 +--
debian/patches/change_pam_name | 8 +--
debian/patches/ftpasswd.cracklib.location | 8 +--
debian/patches/ftpstats | 8 +--
debian/patches/mod_cap | 14 ++--
debian/patches/mod_sql_mysql.c | 8 +--
debian/patches/mod_wrap_noparanoid | 8 +--
debian/patches/not_read_whole_passwd_db | 37 ----------
debian/patches/odbc | 9 ++-
debian/patches/series | 6 --
debian/patches/silent | 19 -----
debian/patches/spelling_errors | 18 ++---
debian/patches/use_hypen_in_manpage | 22 ------
debian/patches/xferstats.holger-preiss | 94 ------------------------
16 files changed, 46 insertions(+), 346 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a33fe9d..f8ca947 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+proftpd-dfsg (1.3.6-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+ * Patches refreshed.
+ * Removed some patches noew already applied upstream or obsoleted.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org> Tue, 06 Feb 2018 14:58:35 +0100
+
proftpd-dfsg (1.3.5e-1) unstable; urgency=medium
[ Hilmar Preuße ]
diff --git a/debian/patches/FTBS_on_Hurd b/debian/patches/FTBS_on_Hurd
deleted file mode 100644
index c49de8a..0000000
--- a/debian/patches/FTBS_on_Hurd
+++ /dev/null
@@ -1,115 +0,0 @@
-Author: Svante Signell <svante.signell at gmail.com>
-Last-Update: 2014-07-09
-Forwarded: http://bugs.proftpd.org/show_bug.cgi?id=4050
-Bug-Debian: http://bugs.debian.org/745493
-
-Index: proftpd-dfsg/contrib/mod_exec.c
-===================================================================
---- proftpd-dfsg.orig/contrib/mod_exec.c
-+++ proftpd-dfsg/contrib/mod_exec.c
-@@ -742,14 +742,20 @@ static int exec_ssystem(cmd_rec *cmd, co
-
- if (fds >= 0) {
- int buflen;
-- char buf[PIPE_BUF];
-+
-+ size_t len = fpathconf(exec_stdout_pipe[0], _PC_PIPE_BUF);
-+ char *buf = malloc(len);
-+ if (buf == NULL) {
-+ exec_log("malloc failed: %s", strerror(errno));
-+ return errno;
-+ }
-
- /* The child sent us something. How thoughtful. */
-
- if (FD_ISSET(exec_stdout_pipe[0], &readfds)) {
-- memset(buf, '\0', sizeof(buf));
-+ memset(buf, '\0', len);
-
-- buflen = read(exec_stdout_pipe[0], buf, sizeof(buf)-1);
-+ buflen = read(exec_stdout_pipe[0], buf, len - 1);
- if (buflen > 0) {
- if (exec_opts & EXEC_OPT_SEND_STDOUT) {
-
-@@ -796,9 +802,9 @@ static int exec_ssystem(cmd_rec *cmd, co
- }
-
- if (FD_ISSET(exec_stderr_pipe[0], &readfds)) {
-- memset(buf, '\0', sizeof(buf));
-+ memset(buf, '\0', len);
-
-- buflen = read(exec_stderr_pipe[0], buf, sizeof(buf)-1);
-+ buflen = read(exec_stdout_pipe[0], buf, len - 1);
- if (buflen > 0) {
-
- /* Trim trailing CRs and LFs. */
-@@ -828,6 +834,7 @@ static int exec_ssystem(cmd_rec *cmd, co
- }
- }
- }
-+ free(buf);
- }
-
- res = waitpid(pid, &status, WNOHANG);
-Index: proftpd-dfsg/contrib/mod_sftp/keys.c
-===================================================================
---- proftpd-dfsg.orig/contrib/mod_sftp/keys.c
-+++ proftpd-dfsg/contrib/mod_sftp/keys.c
-@@ -412,10 +412,15 @@ static int exec_passphrase_provider(serv
-
- if (FD_ISSET(stderr_pipe[0], &readfds)) {
- int stderrlen;
-- char stderrbuf[PIPE_BUF];
-
-- memset(stderrbuf, '\0', sizeof(stderrbuf));
-- stderrlen = read(stderr_pipe[0], stderrbuf, sizeof(stderrbuf)-1);
-+ size_t len = fpathconf(stderr_pipe[0], _PC_PIPE_BUF);
-+ char *stderrbuf = malloc(len);
-+ if (stderrbuf == NULL) {
-+ pr_log_pri(PR_LOG_ALERT, MOD_SFTP_VERSION ": Out of memory!");
-+ return -1;
-+ }
-+ memset(stderrbuf, '\0', len);
-+ stderrlen = read(stderr_pipe[0], stderrbuf, len - 1);
- if (stderrlen > 0) {
- while (stderrlen &&
- (stderrbuf[stderrlen-1] == '\r' ||
-@@ -432,6 +437,7 @@ static int exec_passphrase_provider(serv
- ": error reading stderr from '%s': %s",
- passphrase_provider, strerror(errno));
- }
-+ free(stderrbuf);
- }
- }
-
-Index: proftpd-dfsg/contrib/mod_tls.c
-===================================================================
---- proftpd-dfsg.orig/contrib/mod_tls.c
-+++ proftpd-dfsg/contrib/mod_tls.c
-@@ -1864,10 +1864,15 @@ static int tls_exec_passphrase_provider(
-
- if (FD_ISSET(stderr_pipe[0], &readfds)) {
- int stderrlen;
-- char stderrbuf[PIPE_BUF];
-
-- memset(stderrbuf, '\0', sizeof(stderrbuf));
-- stderrlen = read(stderr_pipe[0], stderrbuf, sizeof(stderrbuf)-1);
-+ size_t len = fpathconf(stderr_pipe[0], _PC_PIPE_BUF);
-+ char *stderrbuf = malloc(len);
-+ if (stderrbuf == NULL) {
-+ tls_log("malloc failed: %s", strerror(errno));
-+ return -1;
-+ }
-+ memset(stderrbuf, '\0', len);
-+ stderrlen = read(stderr_pipe[0], stderrbuf, len - 1);
- if (stderrlen > 0) {
- while (stderrlen &&
- (stderrbuf[stderrlen-1] == '\r' ||
-@@ -1884,6 +1889,7 @@ static int tls_exec_passphrase_provider(
- ": error reading stderr from '%s': %s",
- tls_passphrase_provider, strerror(errno));
- }
-+ free(stderrbuf);
- }
- }
-
diff --git a/debian/patches/autotools b/debian/patches/autotools
index c40acb6..1b28246 100644
--- a/debian/patches/autotools
+++ b/debian/patches/autotools
@@ -4,7 +4,7 @@ Forwarded: not needed
--- proftpd-dfsg.orig/Makefile.in
+++ proftpd-dfsg/Makefile.in
-@@ -233,10 +233,10 @@
+@@ -235,10 +235,10 @@
chmod a+x configure config.sub install-sh modules/glue.sh
# autoheader might not change config.h.in, so touch a stamp file.
@@ -28,7 +28,7 @@ Forwarded: not needed
-LDFLAGS=@LDFLAGS@ @LIBDIRS@
+LDFLAGS=@LDFLAGS@ @LIBDIRS@ $(shell dpkg-buildflags --get LDFLAGS)
LIBEXECDIR=@LIBEXECDIR@
- LIBS=@LIBS@ @LIBRARIES@
+ LIBS=@LIBS@ @LIBRARIES@ @LIBADD_DL@
LIBTOOL=@LIBTOOL@
@@ -50,12 +50,12 @@
@@ -74,7 +74,7 @@ Forwarded: not needed
$(CC) $(CPPFLAGS) $(CFLAGS) -c $<
--- proftpd-dfsg.orig/contrib/mod_sftp/Makefile.in
+++ proftpd-dfsg/contrib/mod_sftp/Makefile.in
-@@ -24,8 +24,8 @@
+@@ -27,8 +27,8 @@
# Necessary redefinitions
INCLUDES=-I. -I../.. -I../../include @INCLUDES@
@@ -83,8 +83,8 @@ Forwarded: not needed
+CPPFLAGS= $(ADDL_CPPFLAGS) -DHAVE_CONFIG_H $(DEFAULT_PATHS) $(PLATFORM) $(INCLUDES) $(shell dpkg-buildflags --get CPPFLAGS)
+LDFLAGS=-L../../lib @LDFLAGS@ $(shell dpkg-buildflags --get LDFLAGS)
- .c.o:
- $(CC) $(CPPFLAGS) $(CFLAGS) -c $<
+ # We special-case the building of umac128.o in order to use preprocessor
+ # tricks to get the implementation, rather than making it be all in runtime.
--- proftpd-dfsg.orig/contrib/mod_snmp/Makefile.in
+++ proftpd-dfsg/contrib/mod_snmp/Makefile.in
@@ -18,8 +18,8 @@
diff --git a/debian/patches/change_pam_name b/debian/patches/change_pam_name
index cab975b..e3ed153 100644
--- a/debian/patches/change_pam_name
+++ b/debian/patches/change_pam_name
@@ -2,11 +2,9 @@ Description: Change pam name ftp -> proftpd
Author: Francesco Paolo Lovergine <frankie at debian.org>
Forwarded: not needed
-Index: proftpd-dfsg/modules/mod_auth_pam.c
-===================================================================
---- proftpd-dfsg.orig/modules/mod_auth_pam.c 2011-10-05 18:05:31.000000000 +0200
-+++ proftpd-dfsg/modules/mod_auth_pam.c 2011-10-05 18:06:02.000000000 +0200
-@@ -71,7 +71,7 @@
+--- proftpd-dfsg.orig/modules/mod_auth_pam.c
++++ proftpd-dfsg/modules/mod_auth_pam.c
+@@ -66,7 +66,7 @@
static authtable auth_pam_authtab[2];
static pam_handle_t * pamh = NULL;
diff --git a/debian/patches/ftpasswd.cracklib.location b/debian/patches/ftpasswd.cracklib.location
index 27c9ae7..e3b2d50 100644
--- a/debian/patches/ftpasswd.cracklib.location
+++ b/debian/patches/ftpasswd.cracklib.location
@@ -4,11 +4,9 @@ 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 2014-01-30 13:53:27.000000000 +0100
-+++ proftpd-dfsg/contrib/ftpasswd 2014-01-30 13:53:27.000000000 +0100
-@@ -37,7 +37,8 @@
+--- proftpd-dfsg.orig/contrib/ftpasswd
++++ proftpd-dfsg/contrib/ftpasswd
+@@ -35,7 +35,8 @@
my $default_passwd_file = "./ftpd.passwd";
my $default_group_file = "./ftpd.group";
my $shell_file = "/etc/shells";
diff --git a/debian/patches/ftpstats b/debian/patches/ftpstats
index f99f56e..7c67ea5 100644
--- a/debian/patches/ftpstats
+++ b/debian/patches/ftpstats
@@ -3,11 +3,9 @@ Author: Francesco Paolo Lovergine <frankie at debian.org>
Forwarded: not needed
Bug-Debian: http://bugs.debian.org/378826
-Index: proftpd-dfsg/contrib/xferstats.holger-preiss
-===================================================================
---- proftpd-dfsg.orig/contrib/xferstats.holger-preiss 2014-01-30 13:55:47.000000000 +0100
-+++ proftpd-dfsg/contrib/xferstats.holger-preiss 2014-01-30 13:55:47.000000000 +0100
-@@ -58,7 +58,7 @@
+--- proftpd-dfsg.orig/contrib/xferstats.holger-preiss
++++ proftpd-dfsg/contrib/xferstats.holger-preiss
+@@ -56,7 +56,7 @@
# $mydom2 = "org";
# edit the next line to customize for your default log file
diff --git a/debian/patches/mod_cap b/debian/patches/mod_cap
index 4863320..cb206c2 100644
--- a/debian/patches/mod_cap
+++ b/debian/patches/mod_cap
@@ -5,10 +5,8 @@ Author: Francesco Paolo Lovergine <frankie at debian.org>
Forwarded: not needed
Bug-Debian: http://bugs.debian.org/479893
-Index: proftpd-dfsg/lib/libcap/Makefile
-===================================================================
---- proftpd-dfsg.orig/lib/libcap/Makefile 2013-01-08 14:50:16.000000000 +0100
-+++ proftpd-dfsg/lib/libcap/Makefile 2013-01-08 15:45:56.000000000 +0100
+--- proftpd-dfsg.orig/lib/libcap/Makefile
++++ proftpd-dfsg/lib/libcap/Makefile
@@ -23,7 +23,7 @@
INCLS=libcap.h cap_names.h $(INCS)
OBJS=$(addsuffix .o, $(FILES))
@@ -18,11 +16,9 @@ Index: proftpd-dfsg/lib/libcap/Makefile
_makenames: _makenames.c cap_names.sed
$(CC) $(CFLAGS) $(LDFLAGS) $< -o $@
-Index: proftpd-dfsg/modules/mod_cap.c
-===================================================================
---- proftpd-dfsg.orig/modules/mod_cap.c 2013-01-08 15:42:19.000000000 +0100
-+++ proftpd-dfsg/modules/mod_cap.c 2013-01-08 15:45:56.000000000 +0100
-@@ -43,10 +43,8 @@
+--- proftpd-dfsg.orig/modules/mod_cap.c
++++ proftpd-dfsg/modules/mod_cap.c
+@@ -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 6fef031..3ba5366 100644
--- a/debian/patches/mod_sql_mysql.c
+++ b/debian/patches/mod_sql_mysql.c
@@ -2,11 +2,9 @@ Description: Use mysql/mysql.h instead of mysql.h
Author: Francesco Paolo Lovergine <frankie at debian.org>
Forwarded: not needed
-Index: git/contrib/mod_sql_mysql.c
-===================================================================
---- git.orig/contrib/mod_sql_mysql.c 2016-12-10 20:51:54.996366780 +0100
-+++ git/contrib/mod_sql_mysql.c 2016-12-10 20:51:54.988366803 +0100
-@@ -132,7 +132,7 @@
+--- proftpd-dfsg.orig/contrib/mod_sql_mysql.c
++++ proftpd-dfsg/contrib/mod_sql_mysql.c
+@@ -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 ae714d0..5158aca 100644
--- a/debian/patches/mod_wrap_noparanoid
+++ b/debian/patches/mod_wrap_noparanoid
@@ -3,11 +3,9 @@ Author: Francesco Paolo Lovergine <frankie at debian.org>
Forwarded: not needed
Bug-Debian: http://bugs.debian.org/366397
-Index: proftpd-dfsg/contrib/mod_wrap.c
-===================================================================
---- proftpd-dfsg.orig/contrib/mod_wrap.c 2013-03-07 10:26:21.000000000 +0100
-+++ proftpd-dfsg/contrib/mod_wrap.c 2013-03-07 10:26:21.000000000 +0100
-@@ -942,8 +942,7 @@
+--- proftpd-dfsg.orig/contrib/mod_wrap.c
++++ proftpd-dfsg/contrib/mod_wrap.c
+@@ -949,8 +949,7 @@
fromhost(&request);
diff --git a/debian/patches/not_read_whole_passwd_db b/debian/patches/not_read_whole_passwd_db
deleted file mode 100644
index 43a5642..0000000
--- a/debian/patches/not_read_whole_passwd_db
+++ /dev/null
@@ -1,37 +0,0 @@
-Author: Arthur de Jong <adejong at debian.org>
-Last-Update: 2013-08-14
-Forwarded: <unknown>. Fixed in 1.3.6rc1
-Bug-Debian: http://bugs.debian.org/717235
-Description: not request the whole passwd DB at each login.
-
-Index: proftpd-dfsg/modules/mod_auth.c
-===================================================================
---- proftpd-dfsg.orig/modules/mod_auth.c
-+++ proftpd-dfsg/modules/mod_auth.c
-@@ -883,16 +883,23 @@ static struct passwd *passwd_dup(pool *p
- }
-
- static void ensure_open_passwd(pool *p) {
-- /* Make sure pass/group is open.
-- */
-+ /* Make sure pass/group is open. */
- pr_auth_setpwent(p);
- pr_auth_setgrent(p);
-
- /* On some unices the following is necessary to ensure the files
-- * are open. (BSDI 3.1)
-+ * are open (BSDI 3.1)
- */
- pr_auth_getpwent(p);
- pr_auth_getgrent(p);
-+
-+ /* Per Debian bug report:
-+ * https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=717235
-+ * we might want to do another set{pw,gr}ent(), to play better with
-+ * some NSS modules.
-+ */
-+ pr_auth_setpwent(p);
-+ pr_auth_setgrent(p);
- }
-
- /* Next function (the biggie) handles all authentication, setting
diff --git a/debian/patches/odbc b/debian/patches/odbc
index bd263cb..3f864e5 100644
--- a/debian/patches/odbc
+++ b/debian/patches/odbc
@@ -3,14 +3,13 @@ Author: Francesco Paolo Lovergine <frankie at debian.org>
Forwarded: not needed
Bug-Debian: http://bugs.debian.org/366397
-Index: proftpd-dfsg/contrib/mod_sql_odbc.c
-===================================================================
--- proftpd-dfsg.orig/contrib/mod_sql_odbc.c
+++ proftpd-dfsg/contrib/mod_sql_odbc.c
-@@ -22,6 +22,7 @@
+@@ -19,6 +19,8 @@
+ * 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.
- *
- * $Id: mod_sql_odbc.c,v 1.15 2013-09-25 04:25:54 castaglia Exp $
++ *
+ * $Libraries: -lodbc $
*/
diff --git a/debian/patches/series b/debian/patches/series
index eb53372..a44032a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
autotools
change_pam_name
-xferstats.holger-preiss
ftpasswd.cracklib.location
quotatab_modules
mod_sql_mysql.c
@@ -8,10 +7,5 @@ mod_wrap_noparanoid
ftpstats
mod_cap
odbc
-silent
-use_hypen_in_manpage
-#contrib_hardening_flags
-FTBS_on_Hurd
reproducible_build
-not_read_whole_passwd_db
spelling_errors
diff --git a/debian/patches/silent b/debian/patches/silent
deleted file mode 100644
index 302326b..0000000
--- a/debian/patches/silent
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: silent remove excessive verbosity at startup about conf.d
- directory parsing.
-Author: Francesco Paolo Lovergine <frankie at debian.org>
-Forwarded: not needed
-
-Index: proftpd-dfsg/src/dirtree.c
-===================================================================
---- proftpd-dfsg.orig/src/dirtree.c 2014-01-30 13:55:12.000000000 +0100
-+++ proftpd-dfsg/src/dirtree.c 2014-01-30 13:55:12.000000000 +0100
-@@ -3323,9 +3323,6 @@
- }
- }
-
-- pr_log_pri(PR_LOG_INFO, "processing configuration directory '%s'",
-- dup_path);
--
- dirh = pr_fsio_opendir(dup_path);
- if (dirh == NULL) {
- pr_log_pri(PR_LOG_WARNING,
diff --git a/debian/patches/spelling_errors b/debian/patches/spelling_errors
index 6bfac29..bf0851f 100644
--- a/debian/patches/spelling_errors
+++ b/debian/patches/spelling_errors
@@ -5,7 +5,7 @@ Forwarded: https://github.com/proftpd/proftpd/pull/666
--- proftpd-dfsg.orig/contrib/mod_sftp/date.c
+++ proftpd-dfsg/contrib/mod_sftp/date.c
-@@ -126,7 +126,7 @@
+@@ -124,7 +124,7 @@
case '?':
/* Ignore unsupported options */
(void) pr_log_writefile(sftp_logfd, MOD_SFTP_VERSION,
@@ -16,7 +16,7 @@ Forwarded: https://github.com/proftpd/proftpd/pull/666
}
--- proftpd-dfsg.orig/contrib/mod_sftp/keys.c
+++ proftpd-dfsg/contrib/mod_sftp/keys.c
-@@ -938,7 +938,7 @@
+@@ -995,7 +995,7 @@
if (sftp_keys_validate_ecdsa_params(curve, point) < 0) {
(void) pr_log_writefile(sftp_logfd, MOD_SFTP_VERSION,
@@ -25,7 +25,7 @@ Forwarded: https://github.com/proftpd/proftpd/pull/666
EC_POINT_free(point);
EC_KEY_free(ec);
return NULL;
-@@ -1809,7 +1809,7 @@
+@@ -1975,7 +1975,7 @@
if (sftp_keys_validate_ecdsa_params(EC_KEY_get0_group(ec),
EC_KEY_get0_public_key(ec)) < 0) {
(void) pr_log_writefile(sftp_logfd, MOD_SFTP_VERSION,
@@ -34,7 +34,7 @@ Forwarded: https://github.com/proftpd/proftpd/pull/666
EC_KEY_free(ec);
EVP_PKEY_free(pkey);
return -1;
-@@ -1817,7 +1817,7 @@
+@@ -1983,7 +1983,7 @@
if (validate_ecdsa_private_key(ec)) {
(void) pr_log_writefile(sftp_logfd, MOD_SFTP_VERSION,
@@ -45,7 +45,7 @@ Forwarded: https://github.com/proftpd/proftpd/pull/666
return -1;
--- proftpd-dfsg.orig/contrib/mod_tls.c
+++ proftpd-dfsg/contrib/mod_tls.c
-@@ -1332,7 +1332,7 @@
+@@ -2142,7 +2142,7 @@
if (idx < 0) {
pr_trace_msg(trace_channel, 12,
"unable to check certificate CommonName against '%s': "
@@ -54,7 +54,7 @@ Forwarded: https://github.com/proftpd/proftpd/pull/666
return 0;
}
-@@ -1340,7 +1340,7 @@
+@@ -2150,7 +2150,7 @@
if (cn_entry == NULL) {
pr_trace_msg(trace_channel, 12,
"unable to check certificate CommonName against '%s': "
@@ -63,7 +63,7 @@ Forwarded: https://github.com/proftpd/proftpd/pull/666
return 0;
}
-@@ -1349,7 +1349,7 @@
+@@ -2159,7 +2159,7 @@
if (cn_asn1 == NULL) {
pr_trace_msg(trace_channel, 12,
"unable to check certificate CommonName against '%s': "
@@ -74,7 +74,7 @@ Forwarded: https://github.com/proftpd/proftpd/pull/666
}
--- proftpd-dfsg.orig/doc/utils/ftpwho.html
+++ proftpd-dfsg/doc/utils/ftpwho.html
-@@ -13,7 +13,7 @@
+@@ -14,7 +14,7 @@
The <B>ftpwho</B> command shows process information for all active proftpd
connections, and a count of all connected users off of each server. Proftpd
@@ -96,7 +96,7 @@ Forwarded: https://github.com/proftpd/proftpd/pull/666
.I standalone
--- proftpd-dfsg.orig/contrib/mod_ldap.c
+++ proftpd-dfsg/contrib/mod_ldap.c
-@@ -856,7 +856,7 @@
+@@ -930,7 +930,7 @@
cached_quota->nelts = 1;
(void) pr_log_writefile(ldap_logfd, MOD_LDAP_VERSION,
diff --git a/debian/patches/use_hypen_in_manpage b/debian/patches/use_hypen_in_manpage
deleted file mode 100644
index d9d96ee..0000000
--- a/debian/patches/use_hypen_in_manpage
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: Use hypen instead of minus-sign
-Author: Mahyuddin Susanto <udienz at ubuntu.com>
-
-Index: proftpd-dfsg/utils/ftpshut.8.in
-===================================================================
---- proftpd-dfsg.orig/utils/ftpshut.8.in 2011-03-11 13:58:00.929381734 +0700
-+++ proftpd-dfsg/utils/ftpshut.8.in 2011-03-11 13:57:56.229411963 +0700
-@@ -49,12 +49,12 @@
- .TP
- .B -l min
- Specifies the number of minutes before shutdown that new ftp access will
--be disabled. If the -l option is not specified, a default of 10 minutes
-+be disabled. If the \-l option is not specified, a default of 10 minutes
- (or immediately, if less than 10 minutes remains until shutdown) is used.
- .TP
- .B -d min
- Specifies the number of minutes before shutdown that existing ftp
--connections will be disconnected. If the -d option is not specified,
-+connections will be disconnected. If the \-d option is not specified,
- a default of 5 minutes (or immediately, if less than 5 minutes remains
- until shutdown) is used.
- .TP
diff --git a/debian/patches/xferstats.holger-preiss b/debian/patches/xferstats.holger-preiss
deleted file mode 100644
index ee33164..0000000
--- a/debian/patches/xferstats.holger-preiss
+++ /dev/null
@@ -1,94 +0,0 @@
-Description: Fixing output diplay ot xferstats
-Author: Francesco Paolo Lovergine <frankie at debian.org>
-Forwarded: not needed
-
-Index: proftpd-dfsg/contrib/xferstats.holger-preiss
-===================================================================
---- proftpd-dfsg.orig/contrib/xferstats.holger-preiss 2014-01-30 13:42:22.000000000 +0100
-+++ proftpd-dfsg/contrib/xferstats.holger-preiss 2014-01-30 13:45:32.000000000 +0100
-@@ -45,6 +45,8 @@
- # -added option A which compares the addresses end with a given pattern
- # -added option i and o which reports either incoming or outgoing traffic only
-
-+use Getopt::Std;
-+
- @mydom = split(/\./, `dnsdomainname`);
- $mydom2 = pop(@mydom); chop($mydom2);
- $mydom1 = pop(@mydom);
-@@ -66,8 +68,7 @@
- $opt_t = 1;
- $opt_l = 3;
-
--require 'getopts.pl';
--&Getopts('f:rahdD:l:s:A:iotu:e');
-+getopts('f:rahdD:l:s:A:iotu:e');
-
- if ($opt_r) { $real = 1;}
- if ($opt_a) { $anon = 1;}
-@@ -209,8 +210,8 @@
- }
- close LOG;
-
-- at syslist = keys(systemfiles);
-- at dates = sort datecompare keys(xferbytes);
-+ at syslist = keys(%systemfiles);
-+ at dates = sort datecompare keys(%xferbytes);
-
- if ($xferfiles == 0) {die "There was no data to process.\n";}
-
-@@ -244,7 +245,7 @@
-
- # sort daily traffic by bytes sendt
- #foreach $date ( sort datecompare keys(nbytes) ) {
--foreach $date ( sort datecompare keys(xferbytes) ) {
-+foreach $date ( sort datecompare keys(%xferbytes) ) {
-
- $nfiles = $xferfiles{$date};
- $nbytes = $xferbytes{$date};
-@@ -263,14 +264,14 @@
-
- Total Transfers from each Archive Section (By bytes)
-
-- ---- Percent Of ----
-- Archive Section Files Sent Bytes Sent Files Sent Bytes Sent
--------------------------- ---------- ----------- ---------- ----------
-+ ---- Percent Of ----
-+ Archive Section Files Sent Bytes Sent Files Sent Bytes Sent
-+------------------------- ---------- ------------- ---------- ----------
- .
-
- format line2 =
--@<<<<<<<<<<<<<<<<<<<<<<<< @>>>>>>>>> @>>>>>>>>>> @>>>>>>> @>>>>>>>
--$section, $files, $bytes, $pctfiles, $pctbytes
-+@<<<<<<<<<<<<<<<<<<<<<<<< @>>>>>>>>> @>>>>>>>>>>>> @>>>>>>> @>>>>>>>
-+$section, $files, $bytes, $pctfiles, $pctbytes
- .
-
- $| = 1;
-@@ -279,7 +280,7 @@
- $~ = line2;
-
- # sort total transfer for each archive by # files transfered
--foreach $section ( sort bytecompare keys(groupfiles) ) {
-+foreach $section ( sort bytecompare keys(%groupfiles) ) {
-
- $files = $groupfiles{$section};
- $bytes = $groupbytes{$section};
-@@ -311,7 +312,7 @@
- $~ = line3;
-
- # sort amount per domain by files
--foreach $domain ( sort domnamcompare keys(domainfiles) ) {
-+foreach $domain ( sort domnamcompare keys(%domainfiles) ) {
-
- $files = $domainfiles{$domain};
- $bytes = $domainbytes{$domain};
-@@ -353,7 +354,7 @@
- $~ = line8;
-
- # sort hourly transmission by sent bytes
--foreach $time ( sort keys(xfertbytes) ) {
-+foreach $time ( sort keys(%xfertbytes) ) {
-
- $nfiles = $xfertfiles{$time};
- $nbytes = $xfertbytes{$time};
--
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