Bump changelog to 5.5.2-1.

[pkg-collectd.git] / debian / patches / CVE-2016-6254.dpatch

diff --git a/debian/patches/CVE-2016-6254.dpatch b/debian/patches/CVE-2016-6254.dpatch
index 44cdc01b7e6d2070cb343cacca494f4752a585a4..b46639357123ff911ecaded4e3abbaca0489f636 100644 (file)
--- a/debian/patches/CVE-2016-6254.dpatch
+++ b/debian/patches/CVE-2016-6254.dpatch
@@ -16,10 +16,12 @@
 ## DP: Upstream commit:
 ## DP: https://github.com/collectd/collectd/commit/b589096
 
+@DPATCH@
+
 diff a/src/network.c b/src/network.c
 --- a/src/network.c
 +++ b/src/network.c
-@@ -1392,6 +1392,7 @@
+@@ -1430,6 +1430,7 @@
                                printed_ignore_warning = 1;
                        }
                        buffer = ((char *) buffer) + pkg_length;
@@ -27,7 +29,7 @@ diff a/src/network.c b/src/network.c
                        continue;
                }
  #endif /* HAVE_LIBGCRYPT */
-@@ -1419,6 +1420,7 @@
+@@ -1457,6 +1458,7 @@
                                printed_ignore_warning = 1;
                        }
                        buffer = ((char *) buffer) + pkg_length;
@@ -35,7 +37,7 @@ diff a/src/network.c b/src/network.c
                        continue;
                }
  #endif /* HAVE_LIBGCRYPT */
-@@ -1560,6 +1562,7 @@
+@@ -1598,6 +1600,7 @@
                        DEBUG ("network plugin: parse_packet: Unknown part"
                                        " type: 0x%04hx", pkg_type);
                        buffer = ((char *) buffer) + pkg_length;