rpms/xtables-addons/devel .cvsignore, 1.1, 1.2 sources, 1.2, 1.3 xtables-addons-userspace.patch, 1.1, 1.2 xtables-addons.spec, 1.1, 1.2

[Chen Lei]

Author: supercyper

Update of /cvs/free/rpms/xtables-addons/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv2119

Modified Files:
	.cvsignore sources xtables-addons-userspace.patch 
	xtables-addons.spec 
Log Message:
Update to 1.28


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/xtables-addons/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Apr 2010 20:53:12 -0000	1.1
+++ .cvsignore	30 Aug 2010 03:49:00 -0000	1.2
@@ -0,0 +1 @@
+xtables-addons-1.28.tar.xz


Index: sources
===================================================================
RCS file: /cvs/free/rpms/xtables-addons/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 Jun 2010 09:40:00 -0000	1.2
+++ sources	30 Aug 2010 03:49:00 -0000	1.3
@@ -1 +1 @@
-f4f65ce5361d7f8c0908ca3db37fa8ee  xtables-addons-1.27.tar.xz
+b94fe23370a1294b985e9a06a0f9d129  xtables-addons-1.28.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/devel/xtables-addons-userspace.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xtables-addons-userspace.patch	28 Jun 2010 09:40:23 -0000	1.1
+++ xtables-addons-userspace.patch	30 Aug 2010 03:49:00 -0000	1.2
@@ -61,8 +61,9 @@
  AC_SUBST([regular_CFLAGS])
 -AC_SUBST([kbuilddir])
  AC_SUBST([xtlibdir])
- AC_CONFIG_FILES([Makefile Makefile.iptrules Makefile.mans
- 	extensions/Makefile extensions/ACCOUNT/Makefile
+ 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


Index: xtables-addons.spec
===================================================================
RCS file: /cvs/free/rpms/xtables-addons/devel/xtables-addons.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xtables-addons.spec	28 Jun 2010 09:40:23 -0000	1.1
+++ xtables-addons.spec	30 Aug 2010 03:49:00 -0000	1.2
@@ -1,7 +1,7 @@
 Name:		xtables-addons
 Summary:	Extensions targets and matches for iptables
-Version:	1.27
-Release:	2%{?dist}
+Version:	1.28
+Release:	1%{?dist}
 # The entire source code is GPLv2 except ACCOUNT/libxt_ACCOUNT_cl.* which is LGPLv2
 License:	GPLv2 and LGPLv2
 Group:		System Environment/Base
@@ -37,19 +37,28 @@
 %prep
 %setup -q 
 %patch0 -p1
-if [ -e /%{_lib}/xtables/libxt_TEE.so ]; then
-	sed -i 's/build_TEE=m/build_TEE=/' mconfig
-fi
+
 
 %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
+fi
+if [ -e /%{_lib}/xtables/libxt_TEE.so ]; then
+	sed -i 's/build_TEE=m/build_TEE=/' mconfig
+fi
 make V=1 %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
 
+# We add xt_geoip database scripts manually
+rm -rf %{buildroot}%{_libexecdir}
+rm -f geoip/{Makefile*,.gitignore}
+chmod 0644 geoip/*
+
 # move ipset to /sbin
 install -d %{buildroot}/sbin
 mv %{buildroot}/%{_sbindir}/ipset %{buildroot}/sbin
@@ -82,7 +91,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE README doc/* 
+%doc LICENSE README doc/* geoip
 %attr(0755,root,root) %{_initddir}/*
 %config(noreplace) %{_sysconfdir}/sysconfig/*
 /%{_lib}/xtables/*.so
@@ -92,6 +101,9 @@
 %{_mandir}/man?/*
 
 %changelog
+* Sun Jul 25 2010 Chen Lei <supercyper at 163.com> - 1.28-1
+- update to 1.28
+
 * Mon Jun 28 2010 Chen Lei <supercyper at 163.com> - 1.27-2
 - rebuild for kernel 2.6.35