Author: supercyper Update of /cvs/free/rpms/xtables-addons/F-13 In directory se02.es.rpmfusion.net:/tmp/cvs-serv20689 Modified Files: .cvsignore sources xtables-addons-userspace.patch xtables-addons.spec Log Message: Sync with devel Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/xtables-addons/F-13/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 30 Aug 2010 03:49:40 -0000 1.5 +++ .cvsignore 27 Oct 2010 10:32:38 -0000 1.6 @@ -1 +1 @@ -xtables-addons-1.28.tar.xz +xtables-addons-1.30.tar.xz Index: sources =================================================================== RCS file: /cvs/free/rpms/xtables-addons/F-13/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 30 Aug 2010 03:49:40 -0000 1.6 +++ sources 27 Oct 2010 10:32:38 -0000 1.7 @@ -1 +1 @@ -b94fe23370a1294b985e9a06a0f9d129 xtables-addons-1.28.tar.xz +38d369a29fdd1ea86fe83df262e03064 xtables-addons-1.30.tar.xz xtables-addons-userspace.patch: Makefile.am | 1 - configure.ac | 46 ---------------------------------------------- extensions/Makefile.am | 22 ---------------------- 3 files changed, 69 deletions(-) Index: xtables-addons-userspace.patch =================================================================== RCS file: /cvs/free/rpms/xtables-addons/F-13/xtables-addons-userspace.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- xtables-addons-userspace.patch 30 Aug 2010 03:49:40 -0000 1.4 +++ xtables-addons-userspace.patch 27 Oct 2010 10:32:38 -0000 1.5 @@ -1,6 +1,6 @@ -diff -urP xtables-addons-1.27.org/configure.ac xtables-addons-1.27/configure.ac ---- xtables-addons-1.27.org/configure.ac 2010-05-31 09:47:58.385362271 +0800 -+++ xtables-addons-1.27/configure.ac 2010-05-31 10:01:32.727112933 +0800 +diff -Naur xtables-addons-1.30.orig/configure.ac xtables-addons-1.30/configure.ac +--- xtables-addons-1.30.orig/configure.ac 2010-10-02 06:41:47.000000000 +0800 ++++ xtables-addons-1.30/configure.ac 2010-10-27 17:54:14.962186249 +0800 @@ -9,18 +9,6 @@ AC_DISABLE_STATIC AC_PROG_LIBTOOL @@ -20,7 +20,7 @@ AC_ARG_WITH([xtlibdir], AS_HELP_STRING([--with-xtlibdir=PATH], [Path where to install Xtables extensions [[LIBEXECDIR/xtables]]]), -@@ -37,42 +25,7 @@ +@@ -37,42 +25,8 @@ -Winline -pipe -DXTABLES_LIBDIR=\\\"\${xtlibdir}\\\" \ -I\${XA_TOPSRCDIR}/include"; @@ -49,7 +49,7 @@ - fi; -fi; -echo "Found kernel version $kmajor.$kminor.$kmicro.$kstable in $kbuilddir"; --if test "$kmajor" -gt 2 -o "$kminor" -gt 6 -o "$kmicro" -gt 35; then +-if test "$kmajor" -gt 2 -o "$kminor" -gt 6 -o "$kmicro" -gt 36; then - echo "WARNING: You are trying a newer kernel. Results may vary. :-)"; -elif test \( "$kmajor" -lt 2 -o "$kminor" -lt 6 -o "$kmicro" -lt 17 \) -o \ - \( "$kmajor" -eq 2 -a "$kminor" -eq 6 -a "$kmicro" -eq 18 -a \ @@ -57,16 +57,15 @@ - echo "ERROR: That kernel version is not supported. Please see INSTALL for minimum configuration."; - exit 1; -fi; -- + AC_SUBST([regular_CFLAGS]) -AC_SUBST([kbuilddir]) AC_SUBST([xtlibdir]) AC_CONFIG_FILES([Makefile Makefile.iptrules Makefile.mans geoip/Makefile - extensions/Makefile extensions/ACCOUNT/Makefile - extensions/ipset/Makefile extensions/pknock/Makefile]) -diff -urP xtables-addons-1.27.org/extensions/Makefile.am xtables-addons-1.27/extensions/Makefile.am ---- xtables-addons-1.27.org/extensions/Makefile.am 2010-05-31 09:47:58.363361712 +0800 -+++ xtables-addons-1.27/extensions/Makefile.am 2010-05-31 10:02:08.845363738 +0800 + extensions/Makefile extensions/ACCOUNT/Makefile +diff -Naur xtables-addons-1.30.orig/extensions/Makefile.am xtables-addons-1.30/extensions/Makefile.am +--- xtables-addons-1.30.orig/extensions/Makefile.am 2010-10-02 06:41:47.000000000 +0800 ++++ xtables-addons-1.30/extensions/Makefile.am 2010-10-27 17:54:53.010183177 +0800 @@ -1,26 +1,4 @@ # -*- Makefile -*- # AUTOMAKE @@ -94,9 +93,9 @@ -clean-local: clean_modules - include ../Makefile.extra -diff -urP xtables-addons-1.27.org/Makefile.am xtables-addons-1.27/Makefile.am ---- xtables-addons-1.27.org/Makefile.am 2010-05-31 09:47:58.385362271 +0800 -+++ xtables-addons-1.27/Makefile.am 2010-05-31 09:52:19.632360246 +0800 +diff -Naur xtables-addons-1.30.orig/Makefile.am xtables-addons-1.30/Makefile.am +--- xtables-addons-1.30.orig/Makefile.am 2010-10-02 06:41:47.000000000 +0800 ++++ xtables-addons-1.30/Makefile.am 2010-10-27 17:55:29.350434539 +0800 @@ -12,7 +12,6 @@ ${MAKE} -f Makefile.mans all; Index: xtables-addons.spec =================================================================== RCS file: /cvs/free/rpms/xtables-addons/F-13/xtables-addons.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- xtables-addons.spec 30 Aug 2010 03:49:40 -0000 1.6 +++ xtables-addons.spec 27 Oct 2010 10:32:38 -0000 1.7 @@ -1,6 +1,6 @@ Name: xtables-addons Summary: Extensions targets and matches for iptables -Version: 1.28 +Version: 1.30 Release: 1%{?dist} # The entire source code is GPLv2 except ACCOUNT/libxt_ACCOUNT_cl.* which is LGPLv2 License: GPLv2 and LGPLv2 @@ -11,7 +11,6 @@ Source2: ipset-config # patch to build userspace part only Patch0: %{name}-userspace.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: iptables-devel BuildRequires: autoconf automake libtool Provides: %{name}-kmod-common = %{version} @@ -21,8 +20,8 @@ # This is for /sbin/service Requires(preun): initscripts Requires(postun): initscripts -Provides: ipset = 4.2 -%{?_isa:Provides: ipset%{?_isa} = 4.2} +Provides: ipset = 4.4 +%{?_isa:Provides: ipset%{?_isa} = 4.4} Obsoletes: %{name}-devel < 1.27-1 %description @@ -42,16 +41,15 @@ %build ./autogen.sh %configure -with-xtlibdir=/%{_lib}/xtables -if [ -e /%{_lib}/xtables/libxt_CHECKSUM.so ]; then - sed -i 's/build_CHECKSUM=m/build_CHECKSUM=/' mconfig +if [ ! -e /%{_lib}/xtables/libxt_CHECKSUM.so ]; then + sed -i 's/build_CHECKSUM=/build_CHECKSUM=m/' mconfig fi -if [ -e /%{_lib}/xtables/libxt_TEE.so ]; then - sed -i 's/build_TEE=m/build_TEE=/' mconfig +if [ ! -e /%{_lib}/xtables/libxt_TEE.so ]; then + sed -i 's/build_TEE=/build_TEE=m/' mconfig fi make V=1 %{?_smp_mflags} %install -rm -rf %{buildroot} make DESTDIR=%{buildroot} install # We add xt_geoip database scripts manually @@ -101,6 +99,9 @@ %{_mandir}/man?/* %changelog +* Wed Oct 27 2010 Chen Lei <supercyper(a)163.com&gt; - 1.30-1 +- update to 1.30 + * Sun Jul 25 2010 Chen Lei <supercyper(a)163.com&gt; - 1.28-1 - update to 1.28