[proftpd-mod-msg] 01/01: Make module compatible to ProFTP 1.3.6.

[Hilmar Preuße]

This is an automated email from the git hooks/post-receive script.

hilmar-guest pushed a commit to branch master
in repository proftpd-mod-msg.

commit 0f62fd5e290418ab88e28c5667317d5f6255b282
Author: Hilmar Preuße <hille42 at web.de>
Date:   Thu Mar 15 09:17:33 2018 +0100

    Make module compatible to ProFTP 1.3.6.
---
 debian/changelog                                   | 13 +++++++++-
 debian/compat                                      |  2 +-
 debian/control                                     |  7 +++---
 .../proftpd-1.3.6_rc4-msg-refresh-api.patch        | 29 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 5 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 177f9ca..445b399 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,24 @@
 proftpd-mod-msg (0.4.1-2) UNRELEASED; urgency=low
 
+  [ Fabrizio Regalli ]
   * Removing libacl1-dev as BD and increasing proftpd-dev to (>= 1.3.4~rc3-2~) 
 
   [Hilmar Preuße]
+  * Patch from Gentoo[1] to make module work w/ ProFTP 1.3.6:
+    proftpd-1.3.6_rc4-msg-refresh-api.patch
+    (Closes: #892372)
+
+  * Remove Fabrizio Regalli from uploaders list
   * d/control: Remove "DM-Upload-Allowed" field
   * d/rules: add --without python-support to dh call
   * d/rules: overhaul clean target to make it work
+  * raise dh compat level to 9, adapt bd version accordingly
+  * tighten BD version of proftp-dev to 1.3.6
+  * Standards Version 4.1.3, no changes needed.
+
+  [1] https://gitweb.gentoo.org/repo/gentoo.git/commit/net-ftp/proftpd/files/proftpd-1.3.6_rc4-msg-refresh-api.patch?id=fba48bedb74f80376bb3a6761a052244350f4fd8
 
- -- Fabrizio Regalli <fabreg at fabreg.it>  Thu, 13 Oct 2011 12:12:05 +0200
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Sat, 10 Mar 2018 20:16:28 +0100
 
 proftpd-mod-msg (0.4.1-1.1) unstable; urgency=low
 
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index a89dc1d..5b67a53 100644
--- a/debian/control
+++ b/debian/control
@@ -2,10 +2,9 @@ Source: proftpd-mod-msg
 Section: net
 Priority: optional
 Maintainer: ProFTPD Maintainance Team <pkg-proftpd-maintainers at lists.alioth.debian.org>
-Uploaders: Fabrizio Regalli <fabreg at fabreg.it>,
-    Francesco Paolo Lovergine <frankie at debian.org>
-Build-Depends: debhelper (>= 7.0.50~), proftpd-dev (>= 1.3.4~rc3-2~)
-Standards-Version: 3.9.2
+Uploaders: Francesco Paolo Lovergine <frankie at debian.org>
+Build-Depends: debhelper (>= 9~), proftpd-dev (>= 1.3.6)
+Standards-Version: 4.1.3
 Homepage: http://www.castaglia.org/proftpd/modules/mod_msg.html
 Vcs-Git: git://git.debian.org/pkg-proftpd/proftpd-mod-msg.git
 Vcs-Browser: http://git.debian.org/?p=pkg-proftpd/proftpd-mod-msg.git;a=summary
diff --git a/debian/patches/proftpd-1.3.6_rc4-msg-refresh-api.patch b/debian/patches/proftpd-1.3.6_rc4-msg-refresh-api.patch
new file mode 100644
index 0000000..2e90be2
--- /dev/null
+++ b/debian/patches/proftpd-1.3.6_rc4-msg-refresh-api.patch
@@ -0,0 +1,29 @@
+diff --git a/mod_msg.c b/mod_msg.c
+index 70bce69..4ce6bd7 100644
+--- a/mod_msg.c
++++ b/mod_msg.c
+@@ -52,10 +52,14 @@ extern pid_t mpid;
+ 
+ module msg_module;
+ 
+-#ifndef USE_CTRLS
++#ifndef PR_USE_CTRLS
+ # error "mod_msg requires Controls support (--enable-ctrls)"
+ #endif /* USE_CTRLS */
+ 
++#define pr_scoreboard_read_entry pr_scoreboard_entry_read
++#define DECLINED PR_DECLINED
++#define HANDLED PR_HANDLED
++
+ static ctrls_acttab_t msg_acttab[];
+ 
+ static int msg_engine = FALSE;
+@@ -709,7 +713,7 @@ static int msg_handle_msg(pr_ctrls_t *ctrl, int reqargc, char **reqargv) {
+       if (msg_send_msg(score->sce_pid, msgstr) < 0) {
+         msg_errno = errno;
+         (void) pr_log_writefile(msg_logfd, MOD_MSG_VERSION,
+-          "error sending message to all (pid %u): %s", reqargv[1],
++          "error sending message to all (pid %u): %s",
+           score->sce_pid, strerror(errno));
+ 
+       } else
diff --git a/debian/patches/series b/debian/patches/series
index b2bdce3..c043a6d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 error-format-security.patch
+proftpd-1.3.6_rc4-msg-refresh-api.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-proftpd/proftpd-mod-msg.git