[proftpd-mod-msg] 01/01: Add NMU patch, various changes.

[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 3387171fb3ff7e7b0318039bcc7a46c1c3914b3d
Author: Hilmar Preuße <hille42 at web.de>
Date:   Thu Sep 29 00:26:47 2016 +0200

    Add NMU patch, various changes.
---
 debian/changelog                           | 15 +++++++++++++++
 debian/control                             |  1 -
 debian/patches/error-format-security.patch | 27 +++++++++++++++++++++++++++
 debian/patches/series                      |  1 +
 debian/rules                               | 12 +++---------
 5 files changed, 46 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 528e2a3..177f9ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,23 @@ proftpd-mod-msg (0.4.1-2) UNRELEASED; urgency=low
 
   * Removing libacl1-dev as BD and increasing proftpd-dev to (>= 1.3.4~rc3-2~) 
 
+  [Hilmar Preuße]
+  * 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
+
  -- Fabrizio Regalli <fabreg at fabreg.it>  Thu, 13 Oct 2011 12:12:05 +0200
 
+proftpd-mod-msg (0.4.1-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "FTBFS: mod_msg.c:314:5: error: format not a string literal and
+    no format arguments [-Werror=format-security]": add patch
+    error-format-security.patch (add format strings).
+    (Closes: #666283)
+
+ -- gregor herrmann <gregoa at debian.org>  Sun, 15 Apr 2012 14:06:55 +0200
+
 proftpd-mod-msg (0.4.1-1) unstable; urgency=low
 
   * Initial Release. (Closes: #623225)
diff --git a/debian/control b/debian/control
index 3bae9b8..a89dc1d 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,6 @@ 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>
-DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 7.0.50~), proftpd-dev (>= 1.3.4~rc3-2~)
 Standards-Version: 3.9.2
 Homepage: http://www.castaglia.org/proftpd/modules/mod_msg.html
diff --git a/debian/patches/error-format-security.patch b/debian/patches/error-format-security.patch
new file mode 100644
index 0000000..5dcda17
--- /dev/null
+++ b/debian/patches/error-format-security.patch
@@ -0,0 +1,27 @@
+Description: add format strings
+Origin: vendor
+Bug-Debian: http://bugs.debian.org/666283
+Forwarded: no
+Author: gregor herrmann <gregoa at debian.org>
+Last-Update: 2012-04-15
+
+--- a/mod_msg.c
++++ b/mod_msg.c
+@@ -311,7 +311,7 @@
+   /* Tack on any messages to this command. */
+   msgs = (char **) msg_pending_list->elts;
+   for (i = 0; i < msg_pending_list->nelts; i++)
+-    pr_response_add(R_DUP, msgs[i]);
++    pr_response_add(R_DUP, "%s", msgs[i]);
+ 
+   /* Clear the pending pool. */
+   destroy_pool(msg_pending_pool);
+@@ -343,7 +343,7 @@
+   /* Tack on any messages to this command. */
+   msgs = (char **) msg_pending_list->elts;
+   for (i = 0; i < msg_pending_list->nelts; i++)
+-    pr_response_add_err(R_DUP, msgs[i]);
++    pr_response_add_err(R_DUP, "%s", msgs[i]);
+ 
+   /* Clear the pending pool. */
+   destroy_pool(msg_pending_pool);
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b2bdce3
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+error-format-security.patch
diff --git a/debian/rules b/debian/rules
index 4ab3dba..879d4d4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@ MODULE_NAME=mod_msg
 DEBNAME=proftpd-mod-msg
 
 %:
-	dh $@
+	dh $@ --without python-support
 
 override_dh_auto_build:
 	DESTDIR=$(CURDIR)/debian/$(DEBNAME) prxs -c $(MODULE_NAME).c
@@ -19,11 +19,5 @@ override_dh_gencontrol:
 	cat /usr/share/proftpd/proftpd-substvars >>$(CURDIR)/debian/$(DEBNAME).substvars
 	dh_gencontrol
 
-clean:
-	dh_clean
-	$(RM) $(MODULE_NAME).a *.o *.la *.lo
-	$(LIBTOOL) --mode=clean $(RM) "$(MODULE_NAME).o"
-	$(LIBTOOL) --mode=clean $(RM) `echo "$(MODULE_NAME).la" | sed 's/\.la$\/.lo/g'`
-
-distclean: clean
-	$(RM) -r .libs/ 
+override_dh_auto_clean:
+	DESTDIR=$(CURDIR)/debian/$(DEBNAME) prxs -d $(MODULE_NAME).c

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