[Debian-ha-commits] [sbd] 09/16: debian/patches: drop patches applied upstream

[Valentin Vidic]

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

vvidic-guest pushed a commit to branch master
in repository sbd.

commit d3e9b04fce378a57ee73e5d2fe43009728d97076
Author: Valentin Vidic <Valentin.Vidic at CARNet.hr>
Date:   Fri Jun 23 15:47:44 2017 +0200

    debian/patches: drop patches applied upstream
---
 debian/patches/cl_log-format-security.patch | 13 -------------
 debian/patches/ld-as-needed.patch           | 15 ---------------
 debian/patches/series                       |  2 --
 3 files changed, 30 deletions(-)

diff --git a/debian/patches/cl_log-format-security.patch b/debian/patches/cl_log-format-security.patch
deleted file mode 100644
index 745c999..0000000
--- a/debian/patches/cl_log-format-security.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/sbd-common.c b/src/sbd-common.c
-index b24f483..55e636b 100644
---- a/src/sbd-common.c
-+++ b/src/sbd-common.c
-@@ -687,7 +687,7 @@ set_servant_health(enum pcmk_health state, int level, char const *format, ...)
-         len = vasprintf (&string, format, ap);
- 
-         if(len > 0) {
--            cl_log(level, string);
-+            cl_log(level, "%s", string);
-         }
-         
-         va_end(ap);
diff --git a/debian/patches/ld-as-needed.patch b/debian/patches/ld-as-needed.patch
deleted file mode 100644
index 5854d79..0000000
--- a/debian/patches/ld-as-needed.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: use LDADD instead of LDFLAGS to fix FTBFS with ld --as-needed
-Author: Logan Rosen <logan at ubuntu.com>
-Bug: https://github.com/ClusterLabs/sbd/pull/9
-Last-Update: 2016-05-22
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -11,5 +11,5 @@
- sbd_SOURCES += sbd-md.c
- endif
- 
--sbd_LDFLAGS = $(glib_LIBS) $(libcoroipcc_LIBS)
-+sbd_LDADD = $(glib_LIBS) $(libcoroipcc_LIBS)
- 
diff --git a/debian/patches/series b/debian/patches/series
index 59a8133..451def3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
 sbd.service.in-kill-path
 sbd-service_sysconfig-vs-default.patch
-cl_log-format-security.patch
-ld-as-needed.patch
 regression_test-exit.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/sbd.git