Author: arekm Date: Tue Jan 3 17:48:09 2012 GMT Module: packages Tag: HEAD ---- Log message: - up to 1.4.12.2
---- Files affected: packages/iptables: iptables.spec (1.308 -> 1.309) , no-libiptc.patch (1.1 -> 1.2) , iptables-1.4.12.1-lm.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: packages/iptables/iptables.spec diff -u packages/iptables/iptables.spec:1.308 packages/iptables/iptables.spec:1.309 --- packages/iptables/iptables.spec:1.308 Sat Nov 26 12:48:09 2011 +++ packages/iptables/iptables.spec Tue Jan 3 18:48:03 2012 @@ -33,12 +33,12 @@ Summary(uk.UTF-8): Утиліти для керування пакетними фільтрами ядра Linux Summary(zh_CN.UTF-8): Linux内核包过滤管理工具 Name: iptables -Version: 1.4.12.1 -Release: 2 +Version: 1.4.12.2 +Release: 1 License: GPL v2 Group: Networking/Admin Source0: ftp://ftp.netfilter.org/pub/iptables/%{name}-%{version}.tar.bz2 -# Source0-md5: b08a1195ec2c1ebeaf072db3c55fdf43 +# Source0-md5: 212112389c7f10c72efb31a4ed193a4c Source1: cvs://cvs.samba.org/netfilter/%{name}-howtos.tar.bz2 # Source1-md5: 2ed2b452daefe70ededd75dc0061fd07 Source2: %{name}.init @@ -50,7 +50,6 @@ # additional utils; off by default Patch1: %{name}-batch.patch Patch2: no-libiptc.patch -Patch3: %{name}-%{version}-lm.patch # --- ADDITIONAL/CHANGED EXTENSIONS: # just ipt_IPV4OPTSSTRIP now Patch10: %{name}-20070806.patch @@ -187,7 +186,7 @@ %patch1 -p1 %endif %patch2 -p1 -%patch3 -p1 + %{?with_ipt_IPV4OPTSSTRIP:%patch10 -p1} %{?with_xt_layer7:%patch11 -p1} %{?with_ipt_rpc:%patch12 -p1} @@ -404,6 +403,8 @@ %{_includedir}/libipq.h %{_includedir}/xtables.h %{_includedir}/libiptc +%{_pkgconfigdir}/libip4tc.pc +%{_pkgconfigdir}/libip6tc.pc %{_pkgconfigdir}/libipq.pc %{_pkgconfigdir}/libiptc.pc %{_pkgconfigdir}/xtables.pc @@ -432,6 +433,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.309 2012/01/03 17:48:03 arekm +- up to 1.4.12.2 + Revision 1.308 2011/11/26 11:48:09 gotar - upstream fix for xt_statistic, restored C: xtables-addons < 1.25 (arekm!), rel. 2 ================================================================ Index: packages/iptables/no-libiptc.patch diff -u packages/iptables/no-libiptc.patch:1.1 packages/iptables/no-libiptc.patch:1.2 --- packages/iptables/no-libiptc.patch:1.1 Mon Aug 15 21:10:13 2011 +++ packages/iptables/no-libiptc.patch Tue Jan 3 18:48:03 2012 @@ -12,13 +12,4 @@ libip4tc_la_SOURCES = libip4tc.c libip4tc_la_LDFLAGS = -version-info 0:0:0 libip6tc_la_SOURCES = libip6tc.c ---- iptables-1.4.12/libiptc/libiptc.pc.in.wiget 2011-08-15 20:43:05.416843686 +0200 -+++ iptables-1.4.12/libiptc/libiptc.pc.in 2011-08-15 20:44:35.062684328 +0200 -@@ -7,6 +7,5 @@ includedir=@includedir@ - Name: libiptc - Description: iptables ruleset ADT and kernel interface - Version: @PACKAGE_VERSION@ --Libs: -L${libdir} -liptc --Libs.private: -lip4tc -lip6tc -+Libs: -L${libdir} -lip4tc -lip6tc - Cflags: -I${includedir} + ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iptables/iptables.spec?r1=1.308&r2=1.309&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iptables/no-libiptc.patch?r1=1.1&r2=1.2&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
