2:13 a.m.
Author: supercyper
Update of /cvs/free/rpms/xtables-addons/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27944
Modified Files:
.cvsignore sources xtables-addons-userspace.patch
xtables-addons.spec
Log Message:
Update to 1.27
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/xtables-addons/F-13/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 2 May 2010 02:40:40 -0000 1.3
+++ .cvsignore 31 May 2010 02:13:29 -0000 1.4
@@ -1 +1 @@
-xtables-addons-1.26.tar.bz2
+xtables-addons-1.27.tar.xz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/xtables-addons/F-13/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 2 May 2010 02:40:40 -0000 1.4
+++ sources 31 May 2010 02:13:29 -0000 1.5
@@ -1 +1 @@
-6091032318ee7fb46d82dec9ae5ae422 xtables-addons-1.26.tar.bz2
+f4f65ce5361d7f8c0908ca3db37fa8ee xtables-addons-1.27.tar.xz
xtables-addons-userspace.patch:
Makefile.am | 1 -
configure.ac | 47 -----------------------------------------------
extensions/Makefile.am | 22 ----------------------
3 files changed, 70 deletions(-)
Index: xtables-addons-userspace.patch
===================================================================
RCS file: /cvs/free/rpms/xtables-addons/F-13/xtables-addons-userspace.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xtables-addons-userspace.patch 26 Apr 2010 15:45:28 -0000 1.2
+++ xtables-addons-userspace.patch 31 May 2010 02:13:29 -0000 1.3
@@ -1,7 +1,7 @@
-diff -urP xtables-addons-1.25.org/configure.ac xtables-addons-1.25/configure.ac
---- xtables-addons-1.25.org/configure.ac 2010-04-26 20:12:03.000000000 +0800
-+++ xtables-addons-1.25/configure.ac 2010-04-26 23:06:29.800752564 +0800
-@@ -9,17 +9,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
+@@ -9,18 +9,6 @@
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
@@ -16,10 +16,11 @@
-if [[ "$kbuilddir" == no ]]; then
- kbuilddir="";
-fi
-
+-
AC_ARG_WITH([xtlibdir],
AS_HELP_STRING([--with-xtlibdir=PATH],
-@@ -37,42 +26,8 @@
+ [Path where to install Xtables extensions [[LIBEXECDIR/xtables]]]),
+@@ -37,42 +25,7 @@
-Winline -pipe -DXTABLES_LIBDIR=\\\"\${xtlibdir}\\\" \
-I\${XA_TOPSRCDIR}/include";
@@ -48,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 34; then
+-if test "$kmajor" -gt 2 -o "$kminor" -gt 6 -o "$kmicro"
-gt 35; 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 \
@@ -56,16 +57,16 @@
- 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
extensions/Makefile extensions/ACCOUNT/Makefile
-diff -urP xtables-addons-1.25.org/extensions/Makefile.am
xtables-addons-1.25/extensions/Makefile.am
---- xtables-addons-1.25.org/extensions/Makefile.am 2010-04-26 20:12:03.000000000 +0800
-+++ xtables-addons-1.25/extensions/Makefile.am 2010-04-26 23:07:25.951752743 +0800
-@@ -1,26 +1,5 @@
+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
+@@ -1,26 +1,4 @@
# -*- Makefile -*-
# AUTOMAKE
@@ -90,11 +91,11 @@
-install-exec-local: modules_install
-
-clean-local: clean_modules
-
+-
include ../Makefile.extra
-diff -urP xtables-addons-1.25.org/Makefile.am xtables-addons-1.25/Makefile.am
---- xtables-addons-1.25.org/Makefile.am 2010-04-26 20:12:03.000000000 +0800
-+++ xtables-addons-1.25/Makefile.am 2010-04-26 23:07:43.614752996 +0800
+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
@@ -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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xtables-addons.spec 2 May 2010 02:40:40 -0000 1.4
+++ xtables-addons.spec 31 May 2010 02:13:29 -0000 1.5
@@ -1,12 +1,12 @@
Name: xtables-addons
Summary: Extensions targets and matches for iptables
-Version: 1.26
+Version: 1.27
Release: 1%{?dist}
-# The entire source code is GPLv2 except ACCOUNT/libxt_ACCOUNT_cl.c which is LGPLv2
+# The entire source code is GPLv2 except ACCOUNT/libxt_ACCOUNT_cl.* which is LGPLv2
License: GPLv2 and LGPLv2
Group: System Environment/Base
URL: http://xtables-addons.sourceforge.net
-Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
Source1: ipset.init
Source2: ipset-config
# patch to build userspace part only
@@ -21,6 +21,9 @@
# This is for /sbin/service
Requires(preun): initscripts
Requires(postun): initscripts
+Provides: ipset = 4.2
+%{?_isa:Provides: ipset%{?_isa} = 4.2}
+Obsoletes: %{name}-devel < 1.27-1
%description
Xtables-addons provides extra modules for iptables not present in the kernel,
@@ -31,15 +34,6 @@
in the %{name}-kmod package. You must also install the
%{name}-kmod package.
-%package devel
-Summary: Development files for %{name}
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description devel
-The %{name}-devel package contains libraries and header files for
-developing applications that use %{name}.
-
%prep
%setup -q
%patch0 -p1
@@ -47,8 +41,7 @@
%build
./autogen.sh
%configure -with-xtlibdir=/%{_lib}/xtables
-make %{?_smp_mflags}
-
+make V=1 %{?_smp_mflags}
%install
rm -rf %{buildroot}
@@ -58,12 +51,8 @@
install -d %{buildroot}/sbin
mv %{buildroot}/%{_sbindir}/ipset %{buildroot}/sbin
-# remove la file(s)
-find %{buildroot} -name '*.la' -exec rm -f {} ';'
-
-# install header files
-install -d %{buildroot}%{_includedir}
-install -pm 0644 extensions/ACCOUNT/*.h %{buildroot}%{_includedir}
+# There is no -devel package. So no need for these files
+rm -f %{buildroot}%{_libdir}/*.{la,so}
# install init scripts and configuration files
install -D -pm 0755 %{SOURCE1} %{buildroot}%{_initddir}/ipset
@@ -97,14 +86,12 @@
%{_libdir}/*.so.*
/sbin/ipset
%{_sbindir}/*
-%{_mandir}/man8/*
-
-%files devel
-%defattr(-,root,root,-)
-%{_libdir}/*.so
-%{_includedir}/*
+%{_mandir}/man?/*
%changelog
+* Mon May 31 2010 Chen Lei <supercyper(a)163.com> - 1.27-1
+- update to 1.27
+
* Sun May 02 2010 Chen Lei <supercyper(a)163.com> - 1.26-1
- update to 1.26