Your message dated Sat, 06 Jun 2015 13:11:11 +0100
with message-id <1433592671.2987.12.ca...@adam-barratt.org.uk>
and subject line Fix released with 8.1 point release
has caused the Debian Bug report #784998,
regarding jessie-pu: package ulogd2/2.0.4-2+deb8u1
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)
--
784998: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=784998
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: release.debian.org
Severity: normal
Tags: jessie
User: release.debian....@packages.debian.org
Usertags: pu
Hi release team folks,
I would like to do an upload to stable (jessie) to correct an important
bug in ulogd2, a package I maintain. The bug is an endianness issue that
prevents the JSON output plugin in ulogd2 from working correctly on
big-endian systems.
The bug has been reported to BTS as 784935:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=784935
The issue is fixed in upstream version 2.0.5, which I have uploaded to
sid today as 2.0.5-1. My upstream was kind enough to report the bug and
isolate the necessary patch for stable.
I have prepared an upload in a new Git branch on Alioth:
http://anonscm.debian.org/cgit/collab-maint/ulogd2.git/log/?h=debian-jessie
Here is the debdiff from 2.0.4-2 (current version in jessie) to 2.0.4-2+deb8u1:
diff -Nru ulogd2-2.0.4/debian/changelog ulogd2-2.0.4/debian/changelog
--- ulogd2-2.0.4/debian/changelog 2015-03-08 15:22:46.000000000 +0000
+++ ulogd2-2.0.4/debian/changelog 2015-05-11 13:32:43.000000000 +0100
@@ -1,3 +1,12 @@
+ulogd2 (2.0.4-2+deb8u1) stable; urgency=medium
+
+ * Begin a new debian-jessie branch: update debian/gbp.conf.
+ * Add upstream patch Fix-JSON-output-on-big-endian-systems.patch:
+ - Corrects JSON output of integer types on big-endian systems.
+ (Closes: #784935)
+
+ -- Chris Boot <deb...@bootc.net> Mon, 11 May 2015 13:32:13 +0100
+
ulogd2 (2.0.4-2) unstable; urgency=medium
[ Andreas Beckmann ]
diff -Nru ulogd2-2.0.4/debian/gbp.conf ulogd2-2.0.4/debian/gbp.conf
--- ulogd2-2.0.4/debian/gbp.conf 2014-07-27 09:51:25.000000000 +0100
+++ ulogd2-2.0.4/debian/gbp.conf 2015-05-11 13:23:11.000000000 +0100
@@ -1,4 +1,5 @@
[DEFAULT]
-debian-branch = debian
+debian-branch = debian-jessie
+dist = jessie
pristine-tar = True
diff -Nru
ulogd2-2.0.4/debian/patches/Fix-JSON-output-on-big-endian-systems.patch
ulogd2-2.0.4/debian/patches/Fix-JSON-output-on-big-endian-systems.patch
--- ulogd2-2.0.4/debian/patches/Fix-JSON-output-on-big-endian-systems.patch
1970-01-01 01:00:00.000000000 +0100
+++ ulogd2-2.0.4/debian/patches/Fix-JSON-output-on-big-endian-systems.patch
2015-05-11 13:23:11.000000000 +0100
@@ -0,0 +1,52 @@
+From: Jimmy Jones <jimmyjon...@gmx.co.uk>
+Subject: Fix JSON output on big endian systems
+Acked-by: Eric Leblond <e...@regit.org>
+Acked-by: Chris Boot <deb...@bootc.net>
+Origin: upstream, commit:4f267553aede76dc91133ba88c69f8b8faf00b72
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=784935
+Forwarded: not-needed
+Last-Update: 2015-05-11
+
+Corrects the output of JSON integers on big-endian systems.
+
+---
+ output/ulogd_output_JSON.c | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/output/ulogd_output_JSON.c b/output/ulogd_output_JSON.c
+index e7ac642..3ad2620 100644
+--- a/output/ulogd_output_JSON.c
++++ b/output/ulogd_output_JSON.c
+@@ -158,7 +158,11 @@ static int json_interp(struct ulogd_pluginstance *upi)
+ break;
+ case ULOGD_RET_BOOL:
+ case ULOGD_RET_INT8:
++ json_object_set_new(msg, field_name,
json_integer(key->u.value.i8));
++ break;
+ case ULOGD_RET_INT16:
++ json_object_set_new(msg, field_name,
json_integer(key->u.value.i16));
++ break;
+ case ULOGD_RET_INT32:
+ json_object_set_new(msg, field_name,
json_integer(key->u.value.i32));
+ break;
+@@ -171,10 +175,17 @@ static int json_interp(struct ulogd_pluginstance *upi)
+ json_object_set_new(msg, "action",
json_string("blocked"));
+ break;
+ }
++ json_object_set_new(msg, field_name,
json_integer(key->u.value.ui8));
++ break;
+ case ULOGD_RET_UINT16:
++ json_object_set_new(msg, field_name,
json_integer(key->u.value.ui16));
++ break;
+ case ULOGD_RET_UINT32:
++ json_object_set_new(msg, field_name,
json_integer(key->u.value.ui32));
++ break;
+ case ULOGD_RET_UINT64:
+ json_object_set_new(msg, field_name,
json_integer(key->u.value.ui64));
++ break;
+ default:
+ /* don't know how to interpret this key. */
+ break;
+--
+2.1.4
+
diff -Nru ulogd2-2.0.4/debian/patches/series ulogd2-2.0.4/debian/patches/series
--- ulogd2-2.0.4/debian/patches/series 2014-04-13 11:42:32.000000000 +0100
+++ ulogd2-2.0.4/debian/patches/series 2015-05-11 13:23:11.000000000 +0100
@@ -2,3 +2,4 @@
enable-nflog-by-default.patch
put-logfiles-in-var-log-ulog.patch
ulogd8-ulogd2.patch
+Fix-JSON-output-on-big-endian-systems.patch
-- System Information:
Debian Release: 8.0
APT prefers stable
APT policy: (990, 'stable'), (500, 'stable-updates')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
--- End Message ---
--- Begin Message ---
Version: 8.1
Hi,
The fix discussed in this bug was released to stable as part of the 8.1
point release earlier today.
Regards,
Adam
--- End Message ---
