Accepting request 123055 from security:netfilter

- Resolve compilation failure due to missing #include

OBS-URL: https://build.opensuse.org/request/show/123055
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/conntrack-tools?expand=0&rev=14

conntrack-tools.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu May 31 12:03:49 UTC 2012 - jengelh@inai.de
+
+- Resolve compilation failure due to missing #include
+
 -------------------------------------------------------------------
 Sat May 26 18:38:34 UTC 2012 - jengelh@inai.de
 

conntrack-tools.spec

@@ -24,6 +24,7 @@ Url:            http://conntrack-tools.netfilter.org/
 #Git-Clone:	git://git.netfilter.org/conntrack-tools
 Source:         http://netfilter.org/projects/conntrack-tools/files/%name-%version.tar.bz2
 Source2:        http://netfilter.org/projects/conntrack-tools/files/%name-%version.tar.bz2.sig
+Patch1:         ct-null.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  bison
 BuildRequires:  flex >= 2.5.33
@@ -49,6 +50,7 @@ collector as well.
 
 %prep
 %setup -q
+%patch -P 1 -p1
 
 %build
 %configure --disable-static

ct-null.diff

@@ -0,0 +1,25 @@
+
+[...]
+  CC     parse.o
+parse.c: In function 'msg2ct':
+parse.c:258:34: error: 'NULL' undeclared (first use in this function)
+parse.c:258:34: note: each undeclared identifier is reported only once for each function it appears in
+parse.c: In function 'msg2exp':
+parse.c:438:16: error: 'NULL' undeclared (first use in this function)
+
+---
+ src/parse.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+Index: conntrack-tools/src/parse.c
+===================================================================
+--- conntrack-tools.orig/src/parse.c
++++ conntrack-tools/src/parse.c
+@@ -17,6 +17,7 @@
+  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+  */
+ 
++#include <stdio.h>
+ #include "network.h"
+ 
+ #include <libnetfilter_conntrack/libnetfilter_conntrack.h>