Package: release.debian.org
Severity: normal
Tags: jessie
User: release.debian....@packages.debian.org
Usertags: pu
Hi,
I would like to upload torrus 2.08-1+deb8u1 (which basically is 2.08-2) to
Jessie fixing an important Bug (Bug #774851). The diff looks intrusive
for a point release, but it is merely a revert of a broken patch refresh
during the Jessie release cycle. The patch had been included since before
Squeeze and is also in 2.08-2 in testing/unstable.
Broken commit:
http://anonscm.debian.org/cgit/pkg-torrus/pkg-torrus.git/commit/?id=bd8a1baa721d11be8059723ba8d33083486f4baa
Fix:
http://anonscm.debian.org/cgit/pkg-torrus/pkg-torrus.git/commit/?id=52283794b0d772d19b9b25ad4667f96403e94a00
Debdiff attached ...
Thanks,
Bernhard
diffstat for torrus-2.08 torrus-2.08
changelog | 10 ++++++++++
gbp.conf | 2 ++
patches/10_rrdup_notify.patch | 29 ++++++++++++++++++++++-------
3 files changed, 34 insertions(+), 7 deletions(-)
diff -Nru torrus-2.08/debian/changelog torrus-2.08/debian/changelog
--- torrus-2.08/debian/changelog 2015-07-14 23:28:06.000000000 +0200
+++ torrus-2.08/debian/changelog 2015-07-14 23:06:51.000000000 +0200
@@ -1,3 +1,13 @@
+torrus (2.08-1+deb8u1) jessie; urgency=medium
+
+ * Revert broken patch refresh in commit 486f4baa (Closes: #774851)
+ This bug was introduced in the Jessie development cycle and
+ breaks functionality of rrdup_notify due to looking in the wrong
+ path
+ * debian/gbp.conf: Point to jessie branch
+
+ -- Bernhard Schmidt <berni+...@birkenwald.de> Tue, 14 Jul 2015 23:00:49 +0200
+
torrus (2.08-1) unstable; urgency=medium
* Upload to unstable
diff -Nru torrus-2.08/debian/gbp.conf torrus-2.08/debian/gbp.conf
--- torrus-2.08/debian/gbp.conf 1970-01-01 01:00:00.000000000 +0100
+++ torrus-2.08/debian/gbp.conf 2015-07-14 23:00:27.000000000 +0200
@@ -0,0 +1,2 @@
+[DEFAULT]
+debian-branch = jessie
diff -Nru torrus-2.08/debian/patches/10_rrdup_notify.patch torrus-2.08/debian/patches/10_rrdup_notify.patch
--- torrus-2.08/debian/patches/10_rrdup_notify.patch 2015-07-14 23:28:06.000000000 +0200
+++ torrus-2.08/debian/patches/10_rrdup_notify.patch 2015-07-14 22:58:20.000000000 +0200
@@ -1,15 +1,30 @@
Author: Marc Haber <mh+debian-packa...@zugschlus.de>
Description: Allow rrdup_notify to be configured from /etc/default/torrus-common
-Index: pkg-torrus/scripts/rrdup_notify.sh
-===================================================================
---- pkg-torrus.orig/scripts/rrdup_notify.sh 2013-06-05 17:22:19.000000000 +0200
-+++ pkg-torrus/scripts/rrdup_notify.sh 2013-06-05 17:22:55.510714918 +0200
-@@ -8,7 +8,7 @@
+--- a/scripts/rrdup_notify.sh
++++ b/scripts/rrdup_notify.sh
+@@ -7,14 +7,22 @@
+ # Stanislav Sinyagin <ssinya...@yahoo.com>
#
++# pull in configuration variables
++test -f /etc/default/torrus-common && . /etc/default/torrus-common
++
++if [ -z "$RRDUP_N_NOTIFY" ]; then
++ # nothing to do
++ exit 0
++fi
++
# Where the RRD files are located. Separate multiple paths with space
-RRDSTORAGE=/var/lib/torrus/collector_rrd
-+RRDSTORAGE=/srv/torrus/collector_rrd
++RRDSTORAGE=${RRDUP_N_RRDSTORAGE:-/var/lib/torrus/collector_rrd}
# Maximum allowed age of an RRD file, in minutes.
- MAXAGE=60
+-MAXAGE=60
++MAXAGE=${RRDUP_N_MAXAGE:-60}
+
+ # Where to send complaints
+-NOTIFY=root
++NOTIFY=$RRDUP_N_NOTIFY
+
+ TMPFILE=/tmp/rrdup_notify.$$
+
