Control: tags 775062 + patch Control: tags 775062 + pending Dear maintainer,
I've prepared an NMU for grok (versioned as 1.20110708.1-4.1) and I plan to upload it to unstable whilst at the Debian-UK BSP: https://wiki.debian.org/BSP/2015/01/gb/Alcester#Bugs Regards.
diff -Nru grok-1.20110708.1/debian/changelog grok-1.20110708.1/debian/changelog --- grok-1.20110708.1/debian/changelog 2012-10-14 10:08:33.000000000 +0100 +++ grok-1.20110708.1/debian/changelog 2015-01-16 22:03:19.000000000 +0000 @@ -1,3 +1,11 @@ +grok (1.20110708.1-4.1) unstable; urgency=medium + + * Non-maintainer upload. + * Apply fix from upstream to working with PCRE >= 8.34 + (Closes: #775062) + + -- Neil Williams <codeh...@debian.org> Fri, 16 Jan 2015 22:03:17 +0000 + grok (1.20110708.1-4) unstable; urgency=low * Add GNU/Hurd patch which disappeared from -3 (Closes: #675104) diff -Nru grok-1.20110708.1/debian/patches/pcre-group-name.patch grok-1.20110708.1/debian/patches/pcre-group-name.patch --- grok-1.20110708.1/debian/patches/pcre-group-name.patch 1970-01-01 01:00:00.000000000 +0100 +++ grok-1.20110708.1/debian/patches/pcre-group-name.patch 2015-01-16 22:07:11.000000000 +0000 @@ -0,0 +1,33 @@ +Description: [fix] grok is not working anymore with PCRE >= 8.34 + From 44ce9372a29319c01d4ac7f24287fb36315e0e34 Mon Sep 17 00:00:00 2001 + From: Guillaume Bour <gb...@orange-vallee.net> + Subject: [PATCH] [fix] grok is not working anymore with PCRE >= 8.34 because + the latter does not allow anymore a group name to start with digits (PCRE + Changelog version 8.34, point 36) + . + this commit fix the issue by prepending a '_' at the start of group + name. + . + grok (1.20110708.1-4.1) unstable; urgency=medium + . + * Non-maintainer upload. + * Apply fix from upstream to working with PCRE >= 8.34 + (Closes: #775062) +Author: Neil Williams <codeh...@debian.org> +Bug-Debian: https://bugs.debian.org/775062 +Origin: upstream, https://github.com/jordansissel/grok/commit/44ce9372a29319c01d4ac7f24287fb36315e0e34.patch +--- + +--- grok-1.20110708.1.orig/grokre.c ++++ grok-1.20110708.1/grokre.c +@@ -12,8 +12,8 @@ + + /* global, static variables */ + +-#define CAPTURE_ID_LEN 4 +-#define CAPTURE_FORMAT "%04x" ++#define CAPTURE_ID_LEN 5 ++#define CAPTURE_FORMAT "_%04x" + + /* internal functions */ + static char *grok_pattern_expand(grok_t *grok); //, int offset, int length); diff -Nru grok-1.20110708.1/debian/patches/series grok-1.20110708.1/debian/patches/series --- grok-1.20110708.1/debian/patches/series 2012-10-14 10:08:43.000000000 +0100 +++ grok-1.20110708.1/debian/patches/series 2015-01-16 22:04:43.000000000 +0000 @@ -1,3 +1,4 @@ # debian/source/git-patches exported from git by quilt-patches-deb-export-hook 0001-Support-GNU-kFreeBSD-add-necessary-linker-flag.patch 0002-Support-GNU-Hurd-add-necessary-linker-flag.patch +pcre-group-name.patch
