- upstream bug fix release 1.4.1.1
- dropped extra patch for 1.4.1 - not needed anymore
This commit is contained in:
parent
47932511b3
commit
a3f9c4c7d9
@ -1,3 +1,4 @@
|
|||||||
iptables-1.3.8.tar.bz2
|
iptables-1.3.8.tar.bz2
|
||||||
iptables-1.4.0.tar.bz2
|
iptables-1.4.0.tar.bz2
|
||||||
iptables-1.4.1.tar.bz2
|
iptables-1.4.1.tar.bz2
|
||||||
|
iptables-1.4.1.1.tar.bz2
|
||||||
|
@ -1,30 +0,0 @@
|
|||||||
commit f52d74a1a83c4fa30fcab8b318d325bb3c9b5535
|
|
||||||
Author: Jan Engelhardt <jengelh@medozas.de>
|
|
||||||
Date: Tue Jun 10 14:05:21 2008 +0200
|
|
||||||
|
|
||||||
ip6tables: fix printing of ipv6 network masks
|
|
||||||
|
|
||||||
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
|
|
||||||
---
|
|
||||||
xtables.c | 8 ++++----
|
|
||||||
1 files changed, 4 insertions(+), 4 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/xtables.c b/xtables.c
|
|
||||||
index 8241687..a97bdaa 100644
|
|
||||||
--- a/xtables.c
|
|
||||||
+++ b/xtables.c
|
|
||||||
@@ -1011,10 +1011,10 @@ static int ip6addr_prefix_length(const struct in6_addr *k)
|
|
||||||
unsigned int bits = 0;
|
|
||||||
uint32_t a, b, c, d;
|
|
||||||
|
|
||||||
- a = k->s6_addr32[0];
|
|
||||||
- b = k->s6_addr32[1];
|
|
||||||
- c = k->s6_addr32[2];
|
|
||||||
- d = k->s6_addr32[3];
|
|
||||||
+ a = ntohl(k->s6_addr32[0]);
|
|
||||||
+ b = ntohl(k->s6_addr32[1]);
|
|
||||||
+ c = ntohl(k->s6_addr32[2]);
|
|
||||||
+ d = ntohl(k->s6_addr32[3]);
|
|
||||||
while (a & 0x80000000U) {
|
|
||||||
++bits;
|
|
||||||
a <<= 1;
|
|
@ -1,6 +1,6 @@
|
|||||||
Name: iptables
|
Name: iptables
|
||||||
Summary: Tools for managing Linux kernel packet filtering capabilities
|
Summary: Tools for managing Linux kernel packet filtering capabilities
|
||||||
Version: 1.4.1
|
Version: 1.4.1.1
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
Source: http://www.netfilter.org/projects/iptables/files/%{name}-%{version}.tar.bz2
|
Source: http://www.netfilter.org/projects/iptables/files/%{name}-%{version}.tar.bz2
|
||||||
Source1: iptables.init
|
Source1: iptables.init
|
||||||
@ -8,7 +8,6 @@ Source2: iptables-config
|
|||||||
Patch4: iptables-1.3.8-typo_latter.patch
|
Patch4: iptables-1.3.8-typo_latter.patch
|
||||||
Patch5: iptables-1.4.1-cloexec.patch
|
Patch5: iptables-1.4.1-cloexec.patch
|
||||||
Patch8: iptables-1.4.1-nf_ext_init.patch
|
Patch8: iptables-1.4.1-nf_ext_init.patch
|
||||||
Patch9: iptables-1.4.1-ipv6_network_mask.patch
|
|
||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
URL: http://www.netfilter.org/
|
URL: http://www.netfilter.org/
|
||||||
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
|
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
|
||||||
@ -56,7 +55,6 @@ stable and may change with every new version. It is therefore unsupported.
|
|||||||
%patch4 -p1 -b .typo_latter
|
%patch4 -p1 -b .typo_latter
|
||||||
%patch5 -p1 -b .cloexec
|
%patch5 -p1 -b .cloexec
|
||||||
%patch8 -p1 -b .nf_ext_init
|
%patch8 -p1 -b .nf_ext_init
|
||||||
%patch9 -p1 -b .ipv6_network_mask
|
|
||||||
|
|
||||||
# fix constructor names, see also nf_ext_init patch
|
# fix constructor names, see also nf_ext_init patch
|
||||||
perl -pi -e "s/void _init\(/void __attribute\(\(constructor\)\) nf_ext_init\(/g" extensions/*.c
|
perl -pi -e "s/void _init\(/void __attribute\(\(constructor\)\) nf_ext_init\(/g" extensions/*.c
|
||||||
@ -133,6 +131,10 @@ fi
|
|||||||
%{_mandir}/man3/*
|
%{_mandir}/man3/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Jul 1 2008 Thomas Woerner <twoerner@redhat.com> 1.4.1.1-1
|
||||||
|
- upstream bug fix release 1.4.1.1
|
||||||
|
- dropped extra patch for 1.4.1 - not needed anymore
|
||||||
|
|
||||||
* Tue Jun 10 2008 Thomas Woerner <twoerner@redhat.com> 1.4.1-1
|
* Tue Jun 10 2008 Thomas Woerner <twoerner@redhat.com> 1.4.1-1
|
||||||
- new version 1.4.1 with new build environment
|
- new version 1.4.1 with new build environment
|
||||||
- additional ipv6 network mask patch from Jan Engelhardt
|
- additional ipv6 network mask patch from Jan Engelhardt
|
||||||
|
Loading…
Reference in New Issue
Block a user