diff -Nru iptables-1.4.12/debian/changelog iptables-1.4.12/debian/changelog --- iptables-1.4.12/debian/changelog 2011-12-09 15:03:39.000000000 -0600 +++ iptables-1.4.12/debian/changelog 2013-02-16 16:55:57.000000000 -0600 @@ -1,3 +1,9 @@ +iptables (1.4.12-1ubuntu5) precise; urgency=low + + * libxt_string: fix space around arguments. (LP: #1074923) + + -- Chris J Arges Sat, 16 Feb 2013 16:55:12 -0600 + iptables (1.4.12-1ubuntu4) precise; urgency=low * Update to use reap patch which was accepted upstream in slightly different form. diff -Nru iptables-1.4.12/debian/patches/libxt-string-fix-space-around-arguments.patch iptables-1.4.12/debian/patches/libxt-string-fix-space-around-arguments.patch --- iptables-1.4.12/debian/patches/libxt-string-fix-space-around-arguments.patch 1969-12-31 18:00:00.000000000 -0600 +++ iptables-1.4.12/debian/patches/libxt-string-fix-space-around-arguments.patch 2013-02-18 18:23:30.000000000 -0600 @@ -0,0 +1,38 @@ +Description: libxt_string: fix space around arguments + . + * libxt_string: fix space around arguments. (LP: #1074923) +Author: Chris J Arges +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1074923 +Bug-Debian: http://bugs.debian.org/637499 +Origin: upstream, http://git.netfilter.org/cgi-bin/gitweb.cgi?p=iptables.git;h=3716dfd7eac3afa7fb3098952550e510c8df0220 + +--- iptables-1.4.12.orig/extensions/libxt_string.c ++++ iptables-1.4.12/extensions/libxt_string.c +@@ -228,7 +228,7 @@ print_hex_string(const char *str, const + { + unsigned int i; + /* start hex block */ +- printf("\"|"); ++ printf(" \"|"); + for (i=0; i < len; i++) { + /* see if we need to prepend a zero */ + if ((unsigned char) str[i] <= 0x0F) +@@ -237,7 +237,7 @@ print_hex_string(const char *str, const + printf("%x", (unsigned char) str[i]); + } + /* close hex block */ +- printf("|\" "); ++ printf("|\""); + } + + static void +--- iptables-1.4.12.orig/tests/options-most.rules ++++ iptables-1.4.12/tests/options-most.rules +@@ -37,6 +37,7 @@ + -A INPUT -p tcp -m recent --rcheck --name DEFAULT --rsource + -A INPUT -p tcp -m socket --transparent + -A INPUT -p tcp -m string --string "foobar" --algo kmp --from 1 --to 2 --icase ++-A INPUT -p tcp -m string --hex-string "|00|" --algo kmp --from 1 --to 2 --icase + -A INPUT -p tcp -m tcp ! --tcp-flags FIN,SYN,RST,ACK SYN + -A INPUT -p tcp -m tcp --tcp-flags FIN,SYN,RST,ACK SYN + -A INPUT -p tcp -m tos --tos 0xff/0x01 diff -Nru iptables-1.4.12/debian/patches/series iptables-1.4.12/debian/patches/series --- iptables-1.4.12/debian/patches/series 2011-12-09 15:04:29.000000000 -0600 +++ iptables-1.4.12/debian/patches/series 2013-02-16 16:56:48.000000000 -0600 @@ -4,3 +4,4 @@ 0001-Fixed-FTBS-by-copying-linux-types.h-from-linux-3.2.patch 0001-libxt_recent-Add-support-for-reap-option.patch debian-changes-1.4.12-1ubuntu4 +libxt-string-fix-space-around-arguments.patch