Processed: Re: Bug#784998: jessie-pu: package ulogd2/2.0.4-2+deb8u1

2015-05-15 Thread Debian Bug Tracking System
Processing control commands:

> tags -1 + pending
Bug #784998 [release.debian.org] jessie-pu: package ulogd2/2.0.4-2+deb8u1
Added tag(s) pending.

-- 
784998: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=784998
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems


--
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: 
https://lists.debian.org/handler.s.b784998.143175600022518.transcr...@bugs.debian.org



Bug#784998: jessie-pu: package ulogd2/2.0.4-2+deb8u1

2015-05-15 Thread Adam D. Barratt
Control: tags -1 + pending

On Wed, 2015-05-13 at 08:57 +0100, Jonathan Wiltshire wrote:
> Control: tag -1 - pending
> 
> On 2015-05-13 07:45, Chris Boot wrote:
> > Control: tags -1 + pending
> 
> An SRM sets pending when the upload has been reviewed and marked for 
> acceptance.

Like this. :-)

Regards,

Adam


-- 
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/1431755992.20361.11.ca...@adam-barratt.org.uk



Processed: Re: Bug#784998: jessie-pu: package ulogd2/2.0.4-2+deb8u1

2015-05-13 Thread Debian Bug Tracking System
Processing control commands:

> tag -1 - pending
Bug #784998 [release.debian.org] jessie-pu: package ulogd2/2.0.4-2+deb8u1
Removed tag(s) pending.

-- 
784998: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=784998
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems


--
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: 
https://lists.debian.org/handler.s.b784998.143150387521782.transcr...@bugs.debian.org



Bug#784998: jessie-pu: package ulogd2/2.0.4-2+deb8u1

2015-05-13 Thread Jonathan Wiltshire

Control: tag -1 - pending

On 2015-05-13 07:45, Chris Boot wrote:

Control: tags -1 + pending


An SRM sets pending when the upload has been reviewed and marked for 
acceptance.




--
Jonathan Wiltshire  j...@debian.org
Debian Developer http://people.debian.org/~jmw

4096R: 0xD3524C51 / 0A55 B7C5 1223 3942 86EC  74C3 5394 479D D352 4C51

 i have six years of solaris sysadmin experience, from
8->10. i am well qualified to say it is made from bonghits
layered on top of bonghits


--
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: 
https://lists.debian.org/b91e6362981708de716e6fa7ae3d4...@hogwarts.powdarrmonkey.net



Processed: Re: Bug#784998: jessie-pu: package ulogd2/2.0.4-2+deb8u1

2015-05-12 Thread Debian Bug Tracking System
Processing control commands:

> tags -1 + pending
Bug #784998 [release.debian.org] jessie-pu: package ulogd2/2.0.4-2+deb8u1
Added tag(s) pending.

-- 
784998: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=784998
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems


--
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: 
https://lists.debian.org/handler.s.b784998.143150011031018.transcr...@bugs.debian.org



Bug#784998: jessie-pu: package ulogd2/2.0.4-2+deb8u1

2015-05-12 Thread Chris Boot
Control: tags -1 + pending

On 12/05/15 21:46, Adam D. Barratt wrote:
> Please go ahead, thanks.

Thanks for accepting. Uploaded.

Chris

-- 
Chris Boot
deb...@bootc.net
GPG: 8467 53CB 1921 3142 C56D  C918 F5C8 3C05 D9CE 


-- 
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/5552f310.4060...@bootc.net



Processed: Re: Bug#784998: jessie-pu: package ulogd2/2.0.4-2+deb8u1

2015-05-12 Thread Debian Bug Tracking System
Processing control commands:

> tags -1 + confirmed
Bug #784998 [release.debian.org] jessie-pu: package ulogd2/2.0.4-2+deb8u1
Added tag(s) confirmed.

-- 
784998: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=784998
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems


--
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: 
https://lists.debian.org/handler.s.b784998.14314636179711.transcr...@bugs.debian.org



Bug#784998: jessie-pu: package ulogd2/2.0.4-2+deb8u1

2015-05-12 Thread Adam D. Barratt
Control: tags -1 + confirmed

On Mon, 2015-05-11 at 13:50 +0100, Chris Boot wrote:
> 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.

Please go ahead, thanks.

Regards,

Adam


-- 
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/1431463609.31312.18.ca...@adam-barratt.org.uk



Bug#784998: jessie-pu: package ulogd2/2.0.4-2+deb8u1

2015-05-11 Thread Chris Boot
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.0 +
+++ ulogd2-2.0.4/debian/changelog   2015-05-11 13:32:43.0 +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   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.conf2014-07-27 09:51:25.0 +0100
+++ ulogd2-2.0.4/debian/gbp.conf2015-05-11 13:23:11.0 +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.0 +0100
+++ ulogd2-2.0.4/debian/patches/Fix-JSON-output-on-big-endian-systems.patch 
2015-05-11 13:23:11.0 +0100
@@ -0,0 +1,52 @@
+From: Jimmy Jones 
+Subject: Fix JSON output on big endian systems
+Acked-by: Eric Leblond 
+Acked-by: Chris Boot 
+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.0 +0100
+++ ulogd2-2.0.4/debian/patches/series  2015-05-11 13:23:11.0 +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')