Author: wiget Date: Mon Aug 15 19:10:18 2011 GMT Module: packages Tag: HEAD ---- Log message: - up to 1.4.12 - added no-libiptc.patch (with --as-needed libiptc is empty and useles, do not build it at all and hack libiptc.pc to link with real libraries)
---- Files affected: packages/iptables: iptables.spec (1.303 -> 1.304) , no-libiptc.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/iptables/iptables.spec diff -u packages/iptables/iptables.spec:1.303 packages/iptables/iptables.spec:1.304 --- packages/iptables/iptables.spec:1.303 Fri Aug 12 22:03:44 2011 +++ packages/iptables/iptables.spec Mon Aug 15 21:10:13 2011 @@ -33,12 +33,12 @@ Summary(uk.UTF-8): Утиліти для керування пакетними фільтрами ядра Linux Summary(zh_CN.UTF-8): Linux内核包过滤管理工具 Name: iptables -Version: 1.4.11.1 -Release: 3 +Version: 1.4.12 +Release: 1 License: GPL v2 Group: Networking/Admin Source0: ftp://ftp.netfilter.org/pub/iptables/%{name}-%{version}.tar.bz2 -# Source0-md5: 7de6e1ae7ed8a2025f184763a6a24b9a +# Source0-md5: d3f145c2c91daecbb4251bc79390b46c Source1: cvs://cvs.samba.org/netfilter/%{name}-howtos.tar.bz2 # Source1-md5: 2ed2b452daefe70ededd75dc0061fd07 Source2: %{name}.init @@ -49,6 +49,7 @@ Patch0: %{name}-man.patch # additional utils; off by default Patch1: %{name}-batch.patch +Patch2: no-libiptc.patch # --- ADDITIONAL/CHANGED EXTENSIONS: # just ipt_IPV4OPTSSTRIP now Patch10: %{name}-20070806.patch @@ -184,6 +185,7 @@ %if %{with batch} %patch1 -p1 %endif +%patch2 -p1 %{?with_ipt_IPV4OPTSSTRIP:%patch10 -p1} %{?with_xt_layer7:%patch11 -p1} %{?with_ipt_rpc:%patch12 -p1} @@ -383,10 +385,8 @@ %attr(755,root,root) %ghost %{_libdir}/libip6tc.so.0 %attr(755,root,root) %{_libdir}/libipq.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libipq.so.0 -%attr(755,root,root) %{_libdir}/libiptc.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libiptc.so.0 %attr(755,root,root) %{_libdir}/libxtables.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libxtables.so.6 +%attr(755,root,root) %ghost %{_libdir}/libxtables.so.7 %files devel %defattr(644,root,root,755) @@ -394,12 +394,10 @@ %attr(755,root,root) %{_libdir}/libip4tc.so %attr(755,root,root) %{_libdir}/libip6tc.so %attr(755,root,root) %{_libdir}/libipq.so -%attr(755,root,root) %{_libdir}/libiptc.so %attr(755,root,root) %{_libdir}/libxtables.so %{_libdir}/libip4tc.la %{_libdir}/libip6tc.la %{_libdir}/libipq.la -%{_libdir}/libiptc.la %{_libdir}/libxtables.la %{_includedir}/libipq.h %{_includedir}/xtables.h @@ -415,7 +413,6 @@ %{_libdir}/libip4tc.a %{_libdir}/libip6tc.a %{_libdir}/libipq.a -%{_libdir}/libiptc.a %{_libdir}/libxtables.a %endif @@ -432,6 +429,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.304 2011/08/15 19:10:13 wiget +- up to 1.4.12 +- added no-libiptc.patch (with --as-needed libiptc is empty and useles, do not build it at all and hack libiptc.pc to link with real libraries) + Revision 1.303 2011/08/12 20:03:44 glen - install upstart scripts ================================================================ Index: packages/iptables/no-libiptc.patch diff -u /dev/null packages/iptables/no-libiptc.patch:1.1 --- /dev/null Mon Aug 15 21:10:18 2011 +++ packages/iptables/no-libiptc.patch Mon Aug 15 21:10:13 2011 @@ -0,0 +1,24 @@ +--- iptables-1.4.12/libiptc/Makefile.am.wiget 2011-08-15 20:42:49.617576861 +0200 ++++ iptables-1.4.12/libiptc/Makefile.am 2011-08-15 20:44:08.393921572 +0200 +@@ -5,10 +5,7 @@ AM_CPPFLAGS = ${regular_CPPFLAGS} - + + pkgconfig_DATA = libiptc.pc + +-lib_LTLIBRARIES = libip4tc.la libip6tc.la libiptc.la +-libiptc_la_SOURCES = +-libiptc_la_LIBADD = libip4tc.la libip6tc.la +-libiptc_la_LDFLAGS = -version-info 0:0:0 ${libiptc_LDFLAGS2} ++lib_LTLIBRARIES = libip4tc.la libip6tc.la + 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.303&r2=1.304&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
