[proftpd-dfsg] 03/03: updated to 1.3.5b
Francesco Lovergine
frankie at moszumanska.debian.org
Sat Dec 10 20:29:16 UTC 2016
This is an automated email from the git hooks/post-receive script.
frankie pushed a commit to branch master
in repository proftpd-dfsg.
commit 25c44315c7282cf322b1200fe9d0197d36e88566
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date: Sat Dec 10 21:29:06 2016 +0100
updated to 1.3.5b
---
debian/changelog | 10 +++++++--
debian/control | 2 +-
debian/patches/FTBS_on_Hurd | 26 +++++++++++-----------
.../{large_files_SFTP.diff => large_files_SFTP} | 0
debian/patches/mod_sql_mysql.c | 8 +++----
...ole_passwd_db.diff => not_read_whole_passwd_db} | 8 +++----
debian/patches/series | 3 +--
debian/proftpd-substvars | 2 +-
8 files changed, 32 insertions(+), 27 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 6d74634..353b6cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-proftpd-dfsg (1.3.5a-2) UNRELEASED; urgency=medium
+proftpd-dfsg (1.3.5b-1) UNRELEASED; urgency=medium
+ [ Mahyuddin Susanto ]
* Team upload.
* Fix FTBFS for missing build-indep, Thanks Santiago Vila
(Closes: #831961).
@@ -44,7 +45,12 @@ proftpd-dfsg (1.3.5a-2) UNRELEASED; urgency=medium
[1] https://lists.debian.org/debian-devel-announce/2016/11/msg00001.html
- -- Mahyuddin Susanto <udienz at gmail.com> Wed, 24 Aug 2016 15:23:38 -0700
+ [ Francesco Paolo Lovergine ]
+ * New upstream release. Merged patch for #809068.
+ * Patchset updated and uniformed for name.
+ * ABI version updated.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org> Sat, 10 Dec 2016 20:49:59 +0100
proftpd-dfsg (1.3.5a-1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index b788fc7..1df4041 100644
--- a/debian/control
+++ b/debian/control
@@ -41,7 +41,7 @@ Depends: adduser,
Conflicts: ftp-server
Breaks: proftpd (<< 1.3.2)
Replaces: proftpd (<< 1.3.2)
-Provides: ftp-server, proftpd, proftpd-abi-1.3.5a
+Provides: ftp-server, proftpd, proftpd-abi-1.3.5b
Suggests: openbsd-inetd | inet-superserver,
openssl,
proftpd-doc,
diff --git a/debian/patches/FTBS_on_Hurd b/debian/patches/FTBS_on_Hurd
index 8eb0eb7..6787e5f 100644
--- a/debian/patches/FTBS_on_Hurd
+++ b/debian/patches/FTBS_on_Hurd
@@ -3,10 +3,10 @@ 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_cp/contrib/mod_exec.c
+Index: git/contrib/mod_exec.c
===================================================================
---- proftpd-dfsg_cp.orig/contrib/mod_exec.c 2015-05-28 02:25:54.000000000 +0200
-+++ proftpd-dfsg_cp/contrib/mod_exec.c 2016-09-15 13:42:30.000000000 +0200
+--- 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 @@
if (fds >= 0) {
@@ -51,11 +51,11 @@ Index: proftpd-dfsg_cp/contrib/mod_exec.c
}
res = waitpid(pid, &status, WNOHANG);
-Index: proftpd-dfsg_cp/contrib/mod_sftp/keys.c
+Index: git/contrib/mod_sftp/keys.c
===================================================================
---- proftpd-dfsg_cp.orig/contrib/mod_sftp/keys.c 2016-09-15 13:40:43.000000000 +0200
-+++ proftpd-dfsg_cp/contrib/mod_sftp/keys.c 2016-09-15 13:42:30.000000000 +0200
-@@ -413,10 +413,15 @@
+--- 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 @@
if (FD_ISSET(stderr_pipe[0], &readfds)) {
int stderrlen;
@@ -74,7 +74,7 @@ Index: proftpd-dfsg_cp/contrib/mod_sftp/keys.c
if (stderrlen > 0) {
while (stderrlen &&
(stderrbuf[stderrlen-1] == '\r' ||
-@@ -433,6 +438,7 @@
+@@ -432,6 +437,7 @@
": error reading stderr from '%s': %s",
passphrase_provider, strerror(errno));
}
@@ -82,11 +82,11 @@ Index: proftpd-dfsg_cp/contrib/mod_sftp/keys.c
}
}
-Index: proftpd-dfsg_cp/contrib/mod_tls.c
+Index: git/contrib/mod_tls.c
===================================================================
---- proftpd-dfsg_cp.orig/contrib/mod_tls.c 2015-05-28 02:25:54.000000000 +0200
-+++ proftpd-dfsg_cp/contrib/mod_tls.c 2016-09-15 13:42:30.000000000 +0200
-@@ -1792,10 +1792,15 @@
+--- 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 @@
if (FD_ISSET(stderr_pipe[0], &readfds)) {
int stderrlen;
@@ -105,7 +105,7 @@ Index: proftpd-dfsg_cp/contrib/mod_tls.c
if (stderrlen > 0) {
while (stderrlen &&
(stderrbuf[stderrlen-1] == '\r' ||
-@@ -1812,6 +1817,7 @@
+@@ -1820,6 +1825,7 @@
": error reading stderr from '%s': %s",
tls_passphrase_provider, strerror(errno));
}
diff --git a/debian/patches/large_files_SFTP.diff b/debian/patches/large_files_SFTP
similarity index 100%
rename from debian/patches/large_files_SFTP.diff
rename to debian/patches/large_files_SFTP
diff --git a/debian/patches/mod_sql_mysql.c b/debian/patches/mod_sql_mysql.c
index 59a31a7..6fef031 100644
--- a/debian/patches/mod_sql_mysql.c
+++ b/debian/patches/mod_sql_mysql.c
@@ -2,11 +2,11 @@ Description: Use mysql/mysql.h instead of mysql.h
Author: Francesco Paolo Lovergine <frankie at debian.org>
Forwarded: not needed
-Index: proftpd-dfsg/contrib/mod_sql_mysql.c
+Index: git/contrib/mod_sql_mysql.c
===================================================================
---- proftpd-dfsg.orig/contrib/mod_sql_mysql.c 2013-06-24 17:58:16.000000000 +0200
-+++ proftpd-dfsg/contrib/mod_sql_mysql.c 2013-06-24 17:58:16.000000000 +0200
-@@ -135,7 +135,7 @@
+--- 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 @@
#include "conf.h"
#include "../contrib/mod_sql.h"
diff --git a/debian/patches/not_read_whole_passwd_db.diff b/debian/patches/not_read_whole_passwd_db
similarity index 80%
rename from debian/patches/not_read_whole_passwd_db.diff
rename to debian/patches/not_read_whole_passwd_db
index b968194..152f789 100644
--- a/debian/patches/not_read_whole_passwd_db.diff
+++ b/debian/patches/not_read_whole_passwd_db
@@ -4,11 +4,11 @@ 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-1.3.5a/modules/mod_auth.c
+Index: git/modules/mod_auth.c
===================================================================
---- proftpd-dfsg-1.3.5a.orig/modules/mod_auth.c 2015-05-28 02:25:54.000000000 +0200
-+++ proftpd-dfsg-1.3.5a/modules/mod_auth.c 2016-09-19 09:58:15.000000000 +0200
-@@ -838,16 +838,23 @@
+--- git.orig/modules/mod_auth.c 2016-12-10 20:55:51.120194113 +0100
++++ git/modules/mod_auth.c 2016-12-10 20:55:51.116194128 +0100
+@@ -836,16 +836,23 @@
}
static void ensure_open_passwd(pool *p) {
diff --git a/debian/patches/series b/debian/patches/series
index 838d6ce..b1b7fae 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,6 +12,5 @@ silent
use_hypen_in_manpage
contrib_hardening_flags
FTBS_on_Hurd
-large_files_SFTP.diff
reproducible_build
-not_read_whole_passwd_db.diff
+not_read_whole_passwd_db
diff --git a/debian/proftpd-substvars b/debian/proftpd-substvars
index a293d80..878602a 100644
--- a/debian/proftpd-substvars
+++ b/debian/proftpd-substvars
@@ -1 +1 @@
-proftpd:Depends=proftpd-abi-1.3.5a
+proftpd:Depends=proftpd-abi-1.3.5b
--
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