Drop patches which have been merged upstream.

4 files changed, 1 insertions, 57 deletions

diff --git a/debian/changelog b/debian/changelog
index 1348436..d8260f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ rsyslog (8.4.1-1) UNRELEASED; urgency=medium
   * New upstream release.
    - CVE-2014-3634: Fix remote syslog vulnerability due to improper
      handling of invalid PRI values.
+  * Drop patches which have been merged upstream.
 
  -- Michael Biebl <biebl@debian.org>  Fri, 26 Sep 2014 23:42:26 +0200
 
diff --git a/debian/patches/0002-systemd-service-file-tweaks.patch b/debian/patches/0002-systemd-service-file-tweaks.patch
deleted file mode 100644
index 761a9a1..0000000
--- a/debian/patches/0002-systemd-service-file-tweaks.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Michael Biebl <biebl@debian.org>
-Date: Wed, 20 Aug 2014 19:28:41 +0200
-Subject: systemd service file tweaks
-
-- Add Documentation field, pointing to the rsyslogd(8) man page and the
-  rsyslog website [1].
-- Restart rsyslogd daemon on failures [2].
-
-[1] http://www.freedesktop.org/software/systemd/man/systemd.unit.html#Documentation=
-[2] http://www.freedesktop.org/software/systemd/man/systemd.service.html#Restart=
----
- rsyslog.service.in | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/rsyslog.service.in b/rsyslog.service.in
-index 8e2d64c..cb629ee 100644
---- a/rsyslog.service.in
-+++ b/rsyslog.service.in
-@@ -1,11 +1,14 @@
- [Unit]
- Description=System Logging Service
- Requires=syslog.socket
-+Documentation=man:rsyslogd(8)
-+Documentation=http://www.rsyslog.com/doc/
- 
- [Service]
- Type=notify
- ExecStart=@sbindir@/rsyslogd -n
- StandardOutput=null
-+Restart=on-failure
- 
- [Install]
- WantedBy=multi-user.target
diff --git a/debian/patches/0003-fix-build-problem-on-platforms-without-atomic-instru.patch b/debian/patches/0003-fix-build-problem-on-platforms-without-atomic-instru.patch
deleted file mode 100644
index ed5efd1..0000000
--- a/debian/patches/0003-fix-build-problem-on-platforms-without-atomic-instru.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Rainer Gerhards <rgerhards@adiscon.com>
-Date: Tue, 19 Aug 2014 16:04:52 +0200
-Subject: fix build problem on platforms without atomic instructions
-
-Thanks to Michael Biebl for his very helpful analysis of the bug.
----
- runtime/atomic.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/runtime/atomic.h b/runtime/atomic.h
-index 49c17d8..d59858a 100644
---- a/runtime/atomic.h
-+++ b/runtime/atomic.h
-@@ -221,7 +221,7 @@
- 		return(val);
- 	}
- 
--#	define DEF_ATOMIC_HELPER_MUT64(x)  pthread_mutex_t x
-+#	define DEF_ATOMIC_HELPER_MUT64(x)  pthread_mutex_t x;
- #	define INIT_ATOMIC_HELPER_MUT64(x) pthread_mutex_init(&(x), NULL)
- #	define DESTROY_ATOMIC_HELPER_MUT64(x) pthread_mutex_destroy(&(x))
- #endif /* #ifdef HAVE_ATOMIC_BUILTINS64 */
diff --git a/debian/patches/series b/debian/patches/series
index 2c8eb87..a8e093a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
 0001-Don-t-create-a-database.patch
-0002-systemd-service-file-tweaks.patch
-0003-fix-build-problem-on-platforms-without-atomic-instru.patch