[Git][debian-proftpd-team/proftpd-mod-msg][master] Remove to patches, normalize debain/* files.

[Hilmar Preuße]

Hilmar Preuße pushed to branch master at Debian ProFTPD Team / proftpd-mod-msg


Commits:
a91f9be3 by Hilmar Preuße at 2018-05-03T19:38:40+02:00
Remove to patches, normalize debain/* files.

- - - - -


7 changed files:

- debian/changelog
- debian/copyright
- − debian/patches/error-format-security.patch
- − debian/patches/proftpd-1.3.6_rc4-msg-refresh-api.patch
- debian/patches/series
- debian/rules
- debian/watch


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+proftpd-mod-msg (0.5-2) UNRELEASED; urgency=medium
+
+  * Remove two surplus/old patches
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Thu, 03 May 2018 19:36:48 +0200
+
 proftpd-mod-msg (0.5-1) unstable; urgency=medium
 
   [ Hilmar Preuße ]


=====================================
debian/copyright
=====================================
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@ Upstream-Contact: TJ Saunders
 Source: http://www.castaglia.org/proftpd/modules/mod_msg.html
 
 Files: *
-Copyright: 	2007-2010, TJ Saunders
+Copyright: 2007-2010, TJ Saunders
 License: GPL-2+
 
 License: GPL-2+


=====================================
debian/patches/error-format-security.patch deleted
=====================================
--- a/debian/patches/error-format-security.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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);


=====================================
debian/patches/proftpd-1.3.6_rc4-msg-refresh-api.patch deleted
=====================================
--- a/debian/patches/proftpd-1.3.6_rc4-msg-refresh-api.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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


=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-#error-format-security.patch
-#proftpd-1.3.6_rc4-msg-refresh-api.patch
 01c862d404df2e6c9c06c6229efc113a6623d215.patch


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -2,23 +2,22 @@
 # -*- makefile -*-
 
 export DH_VERBOSE=1
-VERSION=$(shell grep PROFTPD_VERSION_TEXT /usr/include/proftpd/version.h|cut -d\" -f2)
 MODULE_NAME=mod_msg
 DEBNAME=proftpd-mod-msg
 
 %:
-	dh $@ --without python-support
+	dh $@
 
 override_dh_auto_build:
 	DESTDIR=$(CURDIR)/debian/$(DEBNAME) prxs -c $(MODULE_NAME).c
-	
+
 override_dh_auto_install:
 	DESTDIR=$(CURDIR)/debian/$(DEBNAME) prxs -i -c $(MODULE_NAME).c
 	rm -f $(CURDIR)/debian/$(DEBNAME)/usr/lib/proftpd/*.la \
 		$(CURDIR)/debian/$(DEBNAME)/usr/lib/proftpd/*.a
 
 override_dh_gencontrol:
-	cat /usr/share/proftpd/proftpd-substvars >>$(CURDIR)/debian/$(DEBNAME).substvars
+	cat /usr/share/proftpd/proftpd-substvars >> $(CURDIR)/debian/$(DEBNAME).substvars
 	dh_gencontrol
 
 override_dh_auto_clean:


=====================================
debian/watch
=====================================
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
 opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/proftpd-mod_msg-$1\.tar\.gz/ \
-  https://github.com/Castaglia/proftpd-mod_msg/tags .*/v?(\d\S*)\.tar\.gz
\ No newline at end of file
+  https://github.com/Castaglia/proftpd-mod_msg/tags .*/v?(\d\S*)\.tar\.gz



View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd-mod-msg/commit/a91f9be39512e3cc73e773c5455dd16fccbdc410

---
View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd-mod-msg/commit/a91f9be39512e3cc73e773c5455dd16fccbdc410
You're receiving this email because of your account on salsa.debian.org.