packages: xtables-addons/xtables-addons.spec, xtables-addons/xtables-addons...

[gotar]

Author: gotar                        Date: Wed Sep  1 07:36:33 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added .checkentry return value patch for pre-2.6.35 kernels, rel. 9

---- Files affected:
packages/xtables-addons:
   xtables-addons.spec (1.67 -> 1.68) , xtables-addons-pre2.6.35-checkentry.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/xtables-addons/xtables-addons.spec
diff -u packages/xtables-addons/xtables-addons.spec:1.67 packages/xtables-addons/xtables-addons.spec:1.68
--- packages/xtables-addons/xtables-addons.spec:1.67	Sun Aug 29 18:39:59 2010
+++ packages/xtables-addons/xtables-addons.spec	Wed Sep  1 09:36:28 2010
@@ -19,7 +19,7 @@
 %define		_enable_debug_packages	0
 %endif
 
-%define		rel	8
+%define		rel	9
 Summary:	Extensible packet filtering system && extensible NAT system
 Summary(pl.UTF-8):	System filtrowania pakietów oraz system translacji adresów (NAT)
 Summary(pt_BR.UTF-8):	Ferramenta para controlar a filtragem de pacotes no kernel-2.6.x
@@ -35,6 +35,7 @@
 # Source0-md5:	b94fe23370a1294b985e9a06a0f9d129
 URL:		http://xtables-addons.sourceforge.net/
 Patch0:		kernelrelease.patch
+Patch1:		%{name}-pre2.6.35-checkentry.patch
 BuildRequires:	autoconf
 BuildRequires:	automake >= 1.11
 BuildRequires:	iptables-devel >= 1.4.3
@@ -98,6 +99,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %{__sed} -i -e 's#build_ipset=m#build_ipset=n#' mconfig
 
@@ -186,6 +188,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.68  2010/09/01 07:36:28  gotar
+- added .checkentry return value patch for pre-2.6.35 kernels, rel. 9
+
 Revision 1.67  2010/08/29 16:39:59  gotar
 - kernel: package rawpost table, ACCOUNT target and pknock match, rel. 8
 

================================================================
Index: packages/xtables-addons/xtables-addons-pre2.6.35-checkentry.patch
diff -u /dev/null packages/xtables-addons/xtables-addons-pre2.6.35-checkentry.patch:1.1
--- /dev/null	Wed Sep  1 09:36:33 2010
+++ packages/xtables-addons/xtables-addons-pre2.6.35-checkentry.patch	Wed Sep  1 09:36:28 2010
@@ -0,0 +1,21 @@
+diff -rNpu xtables-addons-1.28-pre2.6.35-checkversion/extensions/compat_xtables.c xtables-addons-1.28/extensions/compat_xtables.c
+--- xtables-addons-1.28-pre2.6.35-checkversion/extensions/compat_xtables.c	2010-07-24 11:33:11.000000000 +0200
++++ xtables-addons-1.28/extensions/compat_xtables.c	2010-09-01 09:23:44.000000000 +0200
+@@ -105,7 +105,7 @@ static bool xtnu_match_check(const char 
+ 		return false;
+ 	if (nm->checkentry == NULL)
+ 		return true;
+-	return nm->checkentry(&local_par);
++	return nm->checkentry(&local_par) == 0 ? true : false;
+ }
+ #endif
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28) && \
+@@ -313,7 +313,7 @@ static bool xtnu_target_check(const char
+ 	if (nt->checkentry == NULL)
+ 		/* this is valid, just like if there was no function */
+ 		return true;
+-	return nt->checkentry(&local_par);
++	return nt->checkentry(&local_par) == 0 ? true : false;
+ }
+ #endif
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xtables-addons/xtables-addons.spec?r1=1.67&r2=1.68&f=u