[proftpd-dfsg] 01/01: Patches refreshed and updated
Francesco Lovergine
frankie at moszumanska.debian.org
Tue Jan 31 14:55:23 GMT 2017
This is an automated email from the git hooks/post-receive script.
frankie pushed a commit to branch master
in repository proftpd-dfsg.
commit c1341ca6268815e19c5ab3ec83b9b2a5e19ecc02
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date: Tue Jan 31 11:32:33 2017 +0100
Patches refreshed and updated
---
debian/changelog | 2 +-
debian/patches/FTBS_on_Hurd | 32 ++++++------
debian/patches/bug_4277_deb_823409 | 60 -----------------------
debian/patches/github_305_handling_unclosed_files | 24 ---------
debian/patches/series | 2 -
5 files changed, 17 insertions(+), 103 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 284a879..864e743 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,7 +19,7 @@ proftpd-dfsg (1.3.5d-1) UNRELEASED; urgency=medium
files; affects only 1.3.5 line. Patch hopefully (Closes: #823409).
[ Francesco Paolo Lovergine ]
- * New upstream release.
+ * New upstream release. Patchset updated to remove already included patches.
* Makes piuparts happy by removing /srv/ftp on purge
* Removed debconf support and added a proftpd-basic.NEWS entry to warn about that.
(Closes: #820984)
diff --git a/debian/patches/FTBS_on_Hurd b/debian/patches/FTBS_on_Hurd
index 6787e5f..c49de8a 100644
--- a/debian/patches/FTBS_on_Hurd
+++ b/debian/patches/FTBS_on_Hurd
@@ -3,11 +3,11 @@ Last-Update: 2014-07-09
Forwarded: http://bugs.proftpd.org/show_bug.cgi?id=4050
Bug-Debian: http://bugs.debian.org/745493
-Index: git/contrib/mod_exec.c
+Index: proftpd-dfsg/contrib/mod_exec.c
===================================================================
---- git.orig/contrib/mod_exec.c 2016-12-10 20:53:38.884273950 +0100
-+++ git/contrib/mod_exec.c 2016-12-10 20:53:38.876273944 +0100
-@@ -742,14 +742,20 @@
+--- 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;
@@ -31,7 +31,7 @@ Index: git/contrib/mod_exec.c
if (buflen > 0) {
if (exec_opts & EXEC_OPT_SEND_STDOUT) {
-@@ -796,9 +802,9 @@
+@@ -796,9 +802,9 @@ static int exec_ssystem(cmd_rec *cmd, co
}
if (FD_ISSET(exec_stderr_pipe[0], &readfds)) {
@@ -43,7 +43,7 @@ Index: git/contrib/mod_exec.c
if (buflen > 0) {
/* Trim trailing CRs and LFs. */
-@@ -828,6 +834,7 @@
+@@ -828,6 +834,7 @@ static int exec_ssystem(cmd_rec *cmd, co
}
}
}
@@ -51,11 +51,11 @@ Index: git/contrib/mod_exec.c
}
res = waitpid(pid, &status, WNOHANG);
-Index: git/contrib/mod_sftp/keys.c
+Index: proftpd-dfsg/contrib/mod_sftp/keys.c
===================================================================
---- git.orig/contrib/mod_sftp/keys.c 2016-12-10 20:53:38.884273950 +0100
-+++ git/contrib/mod_sftp/keys.c 2016-12-10 20:53:38.876273944 +0100
-@@ -412,10 +412,15 @@
+--- 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;
@@ -74,7 +74,7 @@ Index: git/contrib/mod_sftp/keys.c
if (stderrlen > 0) {
while (stderrlen &&
(stderrbuf[stderrlen-1] == '\r' ||
-@@ -432,6 +437,7 @@
+@@ -432,6 +437,7 @@ static int exec_passphrase_provider(serv
": error reading stderr from '%s': %s",
passphrase_provider, strerror(errno));
}
@@ -82,11 +82,11 @@ Index: git/contrib/mod_sftp/keys.c
}
}
-Index: git/contrib/mod_tls.c
+Index: proftpd-dfsg/contrib/mod_tls.c
===================================================================
---- git.orig/contrib/mod_tls.c 2016-12-10 20:53:38.884273950 +0100
-+++ git/contrib/mod_tls.c 2016-12-10 20:53:38.880273947 +0100
-@@ -1800,10 +1800,15 @@
+--- 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;
@@ -105,7 +105,7 @@ Index: git/contrib/mod_tls.c
if (stderrlen > 0) {
while (stderrlen &&
(stderrbuf[stderrlen-1] == '\r' ||
-@@ -1820,6 +1825,7 @@
+@@ -1884,6 +1889,7 @@ static int tls_exec_passphrase_provider(
": error reading stderr from '%s': %s",
tls_passphrase_provider, strerror(errno));
}
diff --git a/debian/patches/bug_4277_deb_823409 b/debian/patches/bug_4277_deb_823409
deleted file mode 100644
index 3ff6c26..0000000
--- a/debian/patches/bug_4277_deb_823409
+++ /dev/null
@@ -1,60 +0,0 @@
-Index: proftpd-dfsg/src/data.c
-===================================================================
---- proftpd-dfsg.orig/src/data.c 2016-12-11 11:23:04.000000000 +0100
-+++ proftpd-dfsg/src/data.c 2016-12-23 12:27:11.000000000 +0100
-@@ -1154,6 +1154,7 @@
- if (session.xfer.direction == PR_NETIO_IO_RD) {
- char *buf = session.xfer.buf;
- pr_buffer_t *pbuf;
-+ pool *tmp_pool;
-
- if (session.sf_flags & (SF_ASCII|SF_ASCII_OVERRIDE)) {
- int adjlen, buflen;
-@@ -1186,10 +1187,13 @@
- }
-
- /* Before we process the data read from the client, generate an event
-- * for any listeners which may want to examine this data.
-+ * for any listeners which may want to examine this data. Use a
-+ * temporary pool, so that we don't exhaust the transfer pool for
-+ * long/large transfers (Bug#4277).
- */
-
-- pbuf = pcalloc(session.xfer.p, sizeof(pr_buffer_t));
-+ tmp_pool = make_sub_pool(session.xfer.p);
-+ pbuf = pcalloc(tmp_pool, sizeof(pr_buffer_t));
- pbuf->buf = buf;
- pbuf->buflen = len;
- pbuf->current = pbuf->buf;
-@@ -1200,6 +1204,7 @@
- /* The event listeners may have changed the data to write out. */
- buf = pbuf->buf;
- len = pbuf->buflen - pbuf->remaining;
-+ destroy_pool(tmp_pool);
-
- if (len > 0) {
- buflen += len;
-@@ -1289,10 +1294,13 @@
-
- if (len > 0) {
- /* Before we process the data read from the client, generate an event
-- * for any listeners which may want to examine this data.
-+ * for any listeners which may want to examine this data. Use a
-+ * temporary pool, so that we don't exhaust the transfer pool for
-+ * long/large transfers (Bug#4277).
- */
-
-- pbuf = pcalloc(session.xfer.p, sizeof(pr_buffer_t));
-+ tmp_pool = make_sub_pool(session.xfer.p);
-+ pbuf = pcalloc(tmp_pool, sizeof(pr_buffer_t));
- pbuf->buf = buf;
- pbuf->buflen = len;
- pbuf->current = pbuf->buf;
-@@ -1303,6 +1311,7 @@
- /* The event listeners may have changed the data to write out. */
- buf = pbuf->buf;
- len = pbuf->buflen - pbuf->remaining;
-+ destroy_pool(tmp_pool);
-
- /* Non-ASCII mode doesn't need to use session.xfer.buf */
- if (timeout_stalled) {
diff --git a/debian/patches/github_305_handling_unclosed_files b/debian/patches/github_305_handling_unclosed_files
deleted file mode 100644
index 3ea84f2..0000000
--- a/debian/patches/github_305_handling_unclosed_files
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: proftpd-dfsg/contrib/mod_sftp/fxp.c
-===================================================================
---- proftpd-dfsg.orig/contrib/mod_sftp/fxp.c 2016-12-20 11:01:35.000000000 +0100
-+++ proftpd-dfsg/contrib/mod_sftp/fxp.c 2016-12-20 11:07:32.000000000 +0100
-@@ -1,6 +1,6 @@
- /*
- * ProFTPD - mod_sftp sftp
-- * Copyright (c) 2008-2015 TJ Saunders
-+ * Copyright (c) 2008-2016 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
-@@ -11909,6 +11909,11 @@
- "aborting %d unclosed file %s", count,
- count != 1 ? "handles" : "handle");
-
-+ /* Make sure that any abort processing has a valid response pool to
-+ * work with.
-+ */
-+ pr_response_set_pool(sess->pool);
-+
- res = pr_table_do(sess->handle_tab, fxp_handle_abort, callback_data,
- PR_TABLE_DO_FL_ALL);
- if (res < 0) {
diff --git a/debian/patches/series b/debian/patches/series
index daa2a99..b1b7fae 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,5 +14,3 @@ contrib_hardening_flags
FTBS_on_Hurd
reproducible_build
not_read_whole_passwd_db
-github_305_handling_unclosed_files
-bug_4277_deb_823409
--
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