patches/: Removed bts619123_mkdir_endless_loop_fix, ipvs_h_include.

Applied upstream.

diff --git a/debian/changelog b/debian/changelog
index 88cf36185bd1b20777829d07ff61bd52c19cb9db..0dd259969a2dfdc14608b7d11ee89319d0b34c3d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,10 +2,7 @@ collectd (4.10.7-1) unstable; urgency=low
 
   * New upstream release.
   * debian/patches/:
-    - Added bts619123_mkdir_endless_loop_fix, fixing an endless loop in case
-      the datadir is a symlink pointing to a non-existent target; thanks to
-      Michael Prokop for reporting this and Jonathan Nieder for providing the
-      patch (Closes: #619123).
+    - Removed ipvs_h_include.dpatch -- applied upstream.
   * debian/rules:
     - Use dpkg-buildflags to determine compiler/linker flags; this also
       enables hardening build flags; thanks to Moritz Muehlenhoff for

diff --git a/debian/patches/bts619123_mkdir_endless_loop_fix.dpatch b/debian/patches/bts619123_mkdir_endless_loop_fix.dpatch
deleted file mode 100755 (executable)
index eaddb9f..0000000
--- a/debian/patches/bts619123_mkdir_endless_loop_fix.dpatch
+++ /dev/null
@@ -1,28 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## bts619123_mkdir_endless_loop_fix.dpatch by Jonathan Nieder
-## <jrnieder@gmail.com>
-##
-## DP: common: check_create_dir(): Support symlinks as well.
-## DP:
-## DP: Previously, the following situation would cause an endless loop (as
-## DP: reported by Michael Prokop in Debian bug #619123): the (CSV or RRD)
-## DP: datadir is a symlink pointing to a non-existent target.
-## DP:
-## DP: With this patch applied, check_create_dir() fails with "<file> exists
-## DP: but is not a directory".
-
-@DPATCH@
-
-diff a/src/common.c b/src/common.c
---- a/src/common.c
-+++ b/src/common.c
-@@ -542,7 +542,8 @@ int check_create_dir (const char *file_orig)
-               }
- 
-               while (42) {
--                      if (stat (dir, &statbuf) == -1)
-+                      if ((stat (dir, &statbuf) == -1)
-+                                      && (lstat (dir, &statbuf) == -1))
-                       {
-                               if (errno == ENOENT)
-                               {

diff --git a/debian/patches/ipvs_h_include.dpatch b/debian/patches/ipvs_h_include.dpatch
deleted file mode 100755 (executable)
index b57fb9d..0000000
--- a/debian/patches/ipvs_h_include.dpatch
+++ /dev/null
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## ipvs_h_include.dpatch by Sebastian Harl <sh@tokkee.org>
-##
-## DP: Include linux/ip_vs.h.
-
-@DPATCH@
-
-diff a/src/ipvs.c b/src/ipvs.c
---- a/src/ipvs.c
-+++ b/src/ipvs.c
-@@ -45,6 +45,7 @@
- #endif /* HAVE_NETINET_IN_H */
- 
- /* this can probably only be found in the kernel sources */
-+#include <linux/ip_vs.h>
- #if HAVE_NET_IP_VS_H
- # include <net/ip_vs.h>
- #elif HAVE_IP_VS_H