added patch for f18 gcc for undeclared null

This commit is contained in:
Paul Wouters 2012-05-07 22:53:56 -04:00
parent fe8bf31236
commit 019b0cc717
2 changed files with 16 additions and 0 deletions

View File

@ -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 <stddef.h>
+
#include "network.h"
#include <libnetfilter_conntrack/libnetfilter_conntrack.h>

View File

@ -8,6 +8,7 @@ URL: http://netfilter.org
Source0: http://netfilter.org/projects/%{name}/files/%{name}-%{version}.tar.bz2 Source0: http://netfilter.org/projects/%{name}/files/%{name}-%{version}.tar.bz2
Source1: conntrackd.service Source1: conntrackd.service
Source2: conntrackd.conf Source2: conntrackd.conf
Patch1: conntrack-tools-NULL.patch
BuildRequires: libnfnetlink-devel >= 1.0.0, libnetfilter_conntrack-devel >= 0.9.1 BuildRequires: libnfnetlink-devel >= 1.0.0, libnetfilter_conntrack-devel >= 0.9.1
BuildRequires: pkgconfig bison flex BuildRequires: pkgconfig bison flex
Provides: conntrack = 1.0-1 Provides: conntrack = 1.0-1
@ -39,6 +40,7 @@ show an event message (one line) per newly established connection.
%prep %prep
%setup -q %setup -q
%patch1 -p1
%build %build
%configure --disable-static %configure --disable-static
@ -80,6 +82,7 @@ fi
- Updated to 1.0.1 - Updated to 1.0.1
- Added daemon using systemd and configuration file - Added daemon using systemd and configuration file
- Removed legacy spec requirements - Removed legacy spec requirements
- Patch for: parse.c:240:34: error: 'NULL' undeclared
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.0-2 * Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild