From 019b0cc7177c15bdcf8b8e08c35f1962731ad707 Mon Sep 17 00:00:00 2001 From: Paul Wouters Date: May 08 2012 02:53:56 +0000 Subject: added patch for f18 gcc for undeclared null --- diff --git a/conntrack-tools-NULL.patch b/conntrack-tools-NULL.patch new file mode 100644 index 0000000..1c5d927 --- /dev/null +++ b/conntrack-tools-NULL.patch @@ -0,0 +1,13 @@ +diff -Naur conntrack-tools-1.0.1-orig/src/parse.c conntrack-tools-1.0.1/src/parse.c +--- conntrack-tools-1.0.1-orig/src/parse.c 2012-01-04 11:48:15.490258748 -0500 ++++ conntrack-tools-1.0.1/src/parse.c 2012-05-07 22:49:51.590626617 -0400 +@@ -16,6 +16,9 @@ + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++/* for NULL :P */ ++#include ++ + #include "network.h" + + #include diff --git a/conntrack-tools.spec b/conntrack-tools.spec index 3eb9914..246f4ed 100644 --- a/conntrack-tools.spec +++ b/conntrack-tools.spec @@ -8,6 +8,7 @@ URL: http://netfilter.org Source0: http://netfilter.org/projects/%{name}/files/%{name}-%{version}.tar.bz2 Source1: conntrackd.service Source2: conntrackd.conf +Patch1: conntrack-tools-NULL.patch BuildRequires: libnfnetlink-devel >= 1.0.0, libnetfilter_conntrack-devel >= 0.9.1 BuildRequires: pkgconfig bison flex Provides: conntrack = 1.0-1 @@ -39,6 +40,7 @@ show an event message (one line) per newly established connection. %prep %setup -q +%patch1 -p1 %build %configure --disable-static @@ -80,6 +82,7 @@ fi - Updated to 1.0.1 - Added daemon using systemd and configuration file - Removed legacy spec requirements +- Patch for: parse.c:240:34: error: 'NULL' undeclared * Thu Jan 12 2012 Fedora Release Engineering - 1.0.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild