1
0
forked from jengelh/iptables
Jan Engelhardt 2012-10-26 00:52:14 +00:00 committed by Git OBS Bridge
parent 19464ae529
commit a739a7199d
7 changed files with 6 additions and 63 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4468ce7e1d68349a8e30f26110eb7969dbfdbf497d6c53758883123b3f2d6f6e
size 536755

Binary file not shown.

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:643ccf34099d53d5b839e1d889c05627745a51ec122648e76a9fcec3a8a9ec79
size 536872

Binary file not shown.

View File

@ -1,7 +1,7 @@
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Oct 8 12:42:37 UTC 2012 - jengelh@inai.de Mon Oct 8 12:42:37 UTC 2012 - jengelh@inai.de
- Update to new upstream release 1.4.16.2 - Update to new upstream release 1.4.16.3
* This release includes aliasing support which translates command * This release includes aliasing support which translates command
lines using obsolete extensions into new ones. The option parser lines using obsolete extensions into new ones. The option parser
now flags illegal negative numbers in some more extensions. now flags illegal negative numbers in some more extensions.

View File

@ -20,7 +20,7 @@ Name: iptables
%define lname_ipq libipq0 %define lname_ipq libipq0
%define lname_iptc libiptc0 %define lname_iptc libiptc0
%define lname_xt libxtables9 %define lname_xt libxtables9
Version: 1.4.16.2 Version: 1.4.16.3
Release: 0 Release: 0
Summary: IP Packet Filter Administration utilities Summary: IP Packet Filter Administration utilities
License: GPL-2.0+ License: GPL-2.0+
@ -34,7 +34,6 @@ Source: http://netfilter.org/projects/iptables/files/%name-%version.tar.
Source2: http://netfilter.org/projects/iptables/files/%name-%version.tar.bz2.sig Source2: http://netfilter.org/projects/iptables/files/%name-%version.tar.bz2.sig
Patch1: iptables-batch.patch Patch1: iptables-batch.patch
Patch2: iptables-apply-mktemp-fix.patch Patch2: iptables-apply-mktemp-fix.patch
Patch3: rhel5-libxt_limit.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version} %if 0%{?suse_version}
BuildRequires: sgmltool BuildRequires: sgmltool
@ -139,7 +138,7 @@ xtables --variable=xtlibdir).
tar -xf "%{S:0}" --use=bzip2; tar -xf "%{S:0}" --use=bzip2;
%setup -DTq %setup -DTq
%endif %endif
%patch -P 1 -P 2 -P 3 -p1 %patch -P 1 -P 2 -p1
%build %build
if [ ! -e configure ]; then if [ ! -e configure ]; then

View File

@ -1,56 +0,0 @@
From f525886fc628341809e9139f87eab92f3f6f31da Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Tue, 9 Oct 2012 00:14:17 +0200
Subject: [PATCH] build: resolve compile abort in libxt_limit on RHEL5
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
libxt_limit.c: In function 'print_rate':
libxt_limit.c:124: error: 'INFINITY' undeclared (first use in
this function)
The default mode of glibc-2.15's <features.h> sets
"-D_POSIX_C_SOURCE=200809L", and therefore "-D_ISOC99_SOURCE". However,
on þe olde RHEL 5's glibc-2.5, it only has "-D_POSIX_C_SOURCE=200112L".
Explicitly draw in the definition of INFINITY by always defining
_ISOC99_SOURCE. By doing this, we are moving off of the default set, so
_BSD_SOURCE also needs to be explicitly set to get at IFNAMSIZ that is
used in xt_hashlimit.h.
Signed-off-by: Jan Engelhardt <jengelh@inai.de>
---
extensions/libxt_hashlimit.c | 2 ++
extensions/libxt_limit.c | 2 ++
2 files changed, 4 insertions(+)
diff --git a/extensions/libxt_hashlimit.c b/extensions/libxt_hashlimit.c
index 831345b..c5b8d77 100644
--- a/extensions/libxt_hashlimit.c
+++ b/extensions/libxt_hashlimit.c
@@ -10,6 +10,8 @@
*
* Error corections by nmalykh@bilim.com (22.01.2005)
*/
+#define _BSD_SOURCE 1
+#define _ISOC99_SOURCE 1
#include <math.h>
#include <stdbool.h>
#include <stdint.h>
diff --git a/extensions/libxt_limit.c b/extensions/libxt_limit.c
index 023500c..f75ef2f 100644
--- a/extensions/libxt_limit.c
+++ b/extensions/libxt_limit.c
@@ -3,6 +3,8 @@
* Jérôme de Vivie <devivie@info.enserb.u-bordeaux.fr>
* Hervé Eychenne <rv@wallfire.org>
*/
+#define _BSD_SOURCE 1
+#define _ISOC99_SOURCE 1
#include <math.h>
#include <stdio.h>
#include <string.h>
--
1.7.10.4