- new version 1.4.7 with support for all new features of 2.6.33

(rhbz#570767)
- libip4tc: Add static qualifier to dump_entry()
- libipq: build as shared library
- recent: reorder cases in code (cosmetic cleanup)
- several man page and documentation fixes
- policy: fix error message showing wrong option
- includes: header updates
- Lift restrictions on interface names
- fixed licensea and moved iptables-xml into base package according to
    review
This commit is contained in:
Thomas Woerner 2010-03-05 14:01:22 +00:00
parent c5f8c6ac2d
commit 0e146f1051
3 changed files with 21 additions and 9 deletions

View File

@ -8,3 +8,4 @@ iptables-1.4.3.2.tar.bz2
iptables-1.4.4.tar.bz2 iptables-1.4.4.tar.bz2
iptables-1.4.5.tar.bz2 iptables-1.4.5.tar.bz2
iptables-1.4.6.tar.bz2 iptables-1.4.6.tar.bz2
iptables-1.4.7.tar.bz2

View File

@ -1,7 +1,7 @@
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.6 Version: 1.4.7
Release: 2%{?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
Source2: iptables-config Source2: iptables-config
@ -9,7 +9,7 @@ Patch5: iptables-1.4.5-cloexec.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)
License: GPL+ License: GPLv2
BuildRequires: libselinux-devel BuildRequires: libselinux-devel
BuildRequires: kernel-headers BuildRequires: kernel-headers
Conflicts: kernel < 2.4.20 Conflicts: kernel < 2.4.20
@ -81,13 +81,10 @@ install -m 644 include/libipulog/*.h %{buildroot}%{_includedir}/libipulog/
# create symlinks for devel so libs # create symlinks for devel so libs
install -d -m 755 %{buildroot}%{_libdir} install -d -m 755 %{buildroot}%{_libdir}
for i in %{buildroot}/%{_lib}/libip*tc.so %{buildroot}/%{_lib}/libxtables.so; do for i in %{buildroot}/%{_lib}/*.so; do
ln -s ../../%{_lib}/${i##*/} %{buildroot}%{_libdir}/${i##*/} ln -s ../../%{_lib}/${i##*/} %{buildroot}%{_libdir}/${i##*/}
done done
# move static libipq to %{_libdir}
mv %{buildroot}/%{_lib}/libipq.a %{buildroot}/%{_libdir}/
# move pkgconfig to %{_libdir} # move pkgconfig to %{_libdir}
mv %{buildroot}/%{_lib}/pkgconfig %{buildroot}/%{_libdir}/ mv %{buildroot}/%{_lib}/pkgconfig %{buildroot}/%{_libdir}/
@ -129,11 +126,13 @@ fi
%attr(0755,root,root) /etc/rc.d/init.d/iptables %attr(0755,root,root) /etc/rc.d/init.d/iptables
%config(noreplace) %attr(0600,root,root) /etc/sysconfig/iptables-config %config(noreplace) %attr(0600,root,root) /etc/sysconfig/iptables-config
/sbin/iptables* /sbin/iptables*
/bin/iptables-xml
%{_mandir}/man8/iptables* %{_mandir}/man8/iptables*
%dir /%{_lib}/xtables %dir /%{_lib}/xtables
/%{_lib}/xtables/libipt* /%{_lib}/xtables/libipt*
/%{_lib}/xtables/libxt* /%{_lib}/xtables/libxt*
/%{_lib}/libip*tc.so.* /%{_lib}/libip*tc.so.*
/%{_lib}/libipq.so.*
/%{_lib}/libxtables.so.* /%{_lib}/libxtables.so.*
%files ipv6 %files ipv6
@ -141,7 +140,6 @@ fi
%attr(0755,root,root) /etc/rc.d/init.d/ip6tables %attr(0755,root,root) /etc/rc.d/init.d/ip6tables
%config(noreplace) %attr(0600,root,root) /etc/sysconfig/ip6tables-config %config(noreplace) %attr(0600,root,root) /etc/sysconfig/ip6tables-config
/sbin/ip6tables* /sbin/ip6tables*
/bin/iptables-xml
%{_mandir}/man8/ip6tables* %{_mandir}/man8/ip6tables*
/%{_lib}/xtables/libip6t* /%{_lib}/xtables/libip6t*
@ -154,16 +152,28 @@ fi
%{_includedir}/libiptc/*.h %{_includedir}/libiptc/*.h
%dir %{_includedir}/libipulog %dir %{_includedir}/libipulog
%{_includedir}/libipulog/*.h %{_includedir}/libipulog/*.h
%{_libdir}/libipq.a
%{_mandir}/man3/* %{_mandir}/man3/*
/%{_lib}/libip*tc.so /%{_lib}/libip*tc.so
/%{_lib}/libipq.so
/%{_lib}/libxtables.so /%{_lib}/libxtables.so
%{_libdir}/libip*tc.so %{_libdir}/libip*tc.so
%{_libdir}/libipq.so
%{_libdir}/libxtables.so %{_libdir}/libxtables.so
%{_libdir}/pkgconfig/libiptc.pc %{_libdir}/pkgconfig/libiptc.pc
%{_libdir}/pkgconfig/xtables.pc %{_libdir}/pkgconfig/xtables.pc
%changelog %changelog
* Fri Mar 5 2010 Thomas Woerner <twoerner@redhat.com> 1.4.7-1
- new version 1.4.7 with support for all new features of 2.6.33 (rhbz#570767)
- libip4tc: Add static qualifier to dump_entry()
- libipq: build as shared library
- recent: reorder cases in code (cosmetic cleanup)
- several man page and documentation fixes
- policy: fix error message showing wrong option
- includes: header updates
- Lift restrictions on interface names
- fixed licensea and moved iptables-xml into base package according to review
* Wed Jan 27 2010 Thomas Woerner <twoerner@redhat.com> 1.4.6-2 * Wed Jan 27 2010 Thomas Woerner <twoerner@redhat.com> 1.4.6-2
- moved libip*tc and libxtables libs to /lib[64], added symlinks for .so libs - moved libip*tc and libxtables libs to /lib[64], added symlinks for .so libs
to /usr/lib[64] for compatibility (rhbz#558796) to /usr/lib[64] for compatibility (rhbz#558796)

View File

@ -1 +1,2 @@
c67cf30e281a924def6426be0973df56 iptables-1.4.6.tar.bz2 c67cf30e281a924def6426be0973df56 iptables-1.4.6.tar.bz2
645941dd1f9e0ec1f74c61918d70d52f iptables-1.4.7.tar.bz2