From c899c3f43f71fdd3c109f93726e832aa7474cd4e Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Sun, 23 Nov 2014 15:23:20 +0100 Subject: [PATCH] Document upstream commits for each patch. --- debian/patches/bts747093_lvm_segfault.dpatch | 5 ++++- debian/patches/bts750440_config_segfault.dpatch | 3 +++ debian/patches/bts770681_riemann_ack.dpatch | 3 +++ debian/patches/bts770683_curl_init.dpatch | 4 ++++ debian/patches/bts770688_snmp_memleak.dpatch | 10 +++++----- debian/patches/bts770694_loglevel.dpatch | 4 ++++ 6 files changed, 23 insertions(+), 6 deletions(-) diff --git a/debian/patches/bts747093_lvm_segfault.dpatch b/debian/patches/bts747093_lvm_segfault.dpatch index d9b9650..63ff71a 100755 --- a/debian/patches/bts747093_lvm_segfault.dpatch +++ b/debian/patches/bts747093_lvm_segfault.dpatch @@ -5,7 +5,10 @@ ## DP: lvm: Fix segfault when there are no logical volumes. ## DP: ## DP: Upstream bug report: -## DP: https://github.com/collectd/collectd/pull/425 +## DP: https://github.com/collectd/collectd/issues/558 +## DP: +## DP: Upstream commit: +## DP: https://github.com/jktjkt/collectd/commit/40dde67 @DPATCH@ diff --git a/debian/patches/bts750440_config_segfault.dpatch b/debian/patches/bts750440_config_segfault.dpatch index 6a97fac..ff1d07a 100755 --- a/debian/patches/bts750440_config_segfault.dpatch +++ b/debian/patches/bts750440_config_segfault.dpatch @@ -7,6 +7,9 @@ ## DP: ## DP: Upstream bug report: ## DP: https://github.com/collectd/collectd/issues/638 +## DP: +## DP: Upstream commit: +## DP: https://github.com/dothebart/collectd/commit/2923883 @DPATCH@ diff --git a/debian/patches/bts770681_riemann_ack.dpatch b/debian/patches/bts770681_riemann_ack.dpatch index c48dd2a..7475259 100755 --- a/debian/patches/bts770681_riemann_ack.dpatch +++ b/debian/patches/bts770681_riemann_ack.dpatch @@ -9,6 +9,9 @@ ## DP: ## DP: Upstream bug report: ## DP: https://github.com/collectd/collectd/pull/425 +## DP: +## DP: Upstream commit: +## DP: https://github.com/spotify/collectd/commit/78c0678 @DPATCH@ diff --git a/debian/patches/bts770683_curl_init.dpatch b/debian/patches/bts770683_curl_init.dpatch index 80b4044..b1f1c42 100755 --- a/debian/patches/bts770683_curl_init.dpatch +++ b/debian/patches/bts770683_curl_init.dpatch @@ -10,6 +10,10 @@ ## DP: ## DP: Upstream bug report: ## DP: https://github.com/collectd/collectd/issues/526 +## DP: +## DP: Upstream commits: +## DP: https://github.com/katzj/collectd/commit/401fa6e +## DP: https://github.com/katzj/collectd/commit/50dbebf @DPATCH@ diff --git a/debian/patches/bts770688_snmp_memleak.dpatch b/debian/patches/bts770688_snmp_memleak.dpatch index 6cdaa1c..b64e105 100755 --- a/debian/patches/bts770688_snmp_memleak.dpatch +++ b/debian/patches/bts770688_snmp_memleak.dpatch @@ -2,20 +2,20 @@ ## bts770688_snmp_memleak.dpatch by Pierre-Yves Ritschard ## and Marc Fournier ## -## DP: Let snmp_synch_response deal with PDU freeing -## DP: +## DP: Let snmp_synch_response deal with PDU freeing +## DP: ## DP: When reading from tables, upon errors the PDUs sent are already ## DP: freed by snmp_synch_response since they are right after ## DP: snmp_send is called. -## DP: +## DP: ## DP: This commit syncs collectd's approach with other occurences of ## DP: snmp_synch_response calls. -## DP: +## DP: ## DP: There might be a few corner cases where we leak PDUs, but it ## DP: is unclear how to check for those since we would need to ## DP: have an indication that snmp_send was never called, which ## DP: as far as I can tell is not possible. -## DP: +## DP: ## DP: The potential for failure in snmp_send is rather low and will ## DP: be easily spotted though, since when crafting invalid PDUs ## DP: snmp send will constantly fail and since valid configurations diff --git a/debian/patches/bts770694_loglevel.dpatch b/debian/patches/bts770694_loglevel.dpatch index 9fb659e..9a69591 100755 --- a/debian/patches/bts770694_loglevel.dpatch +++ b/debian/patches/bts770694_loglevel.dpatch @@ -9,6 +9,10 @@ ## DP: ## DP: Upstream bug report: ## DP: https://github.com/collectd/collectd/issues/636 +## DP: +## DP: Upstream commits: +## DP: https://github.com/dothebart/collectd/commit/84c3805 +## DP: https://github.com/collectd/collectd/commit/cb4ea71 @DPATCH@ -- 2.30.2