packages: xtables-addons/xtables-addons-pre2.6.35-checkentry.patch, xtables...

[gotar]

Author: gotar                        Date: Wed Sep  1 16:14:07 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- unbroken on pre2.6.23 kernels (upstream fix: http://xtables-addons.git.sf.net/git/gitweb.cgi?p=xtables-addons/xtables-addons;a=commitdiff;h=fb2eea69afa1717b4e0d8edb471c0aa36b8603bb), rel. 10

---- Files affected:
packages/xtables-addons:
   xtables-addons-pre2.6.35-checkentry.patch (1.1 -> 1.2) , xtables-addons.spec (1.69 -> 1.70) 

---- Diffs:

================================================================
Index: packages/xtables-addons/xtables-addons-pre2.6.35-checkentry.patch
diff -u packages/xtables-addons/xtables-addons-pre2.6.35-checkentry.patch:1.1 packages/xtables-addons/xtables-addons-pre2.6.35-checkentry.patch:1.2
--- packages/xtables-addons/xtables-addons-pre2.6.35-checkentry.patch:1.1	Wed Sep  1 09:36:28 2010
+++ packages/xtables-addons/xtables-addons-pre2.6.35-checkentry.patch	Wed Sep  1 18:14:02 2010
@@ -1,21 +1,46 @@
-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 
+diff --git a/extensions/compat_xtables.c b/extensions/compat_xtables.c
+index 8514af8..9e96c0d 100644
+--- a/extensions/compat_xtables.c
++++ b/extensions/compat_xtables.c
+@@ -105,7 +105,11 @@ static bool xtnu_match_check(const char *table, const void *entry,
  		return false;
  	if (nm->checkentry == NULL)
  		return true;
--	return nm->checkentry(&local_par);
-+	return nm->checkentry(&local_par) == 0 ? true : false;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 23)
+ 	return nm->checkentry(&local_par);
++#else
++	return nm->checkentry(&local_par) == 0;
++#endif
  }
  #endif
  #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28) && \
-@@ -313,7 +313,7 @@ static bool xtnu_target_check(const char
+@@ -118,7 +122,7 @@ static bool xtnu_match_check(const struct xt_mtchk_param *par)
+ 		return false;
+ 	if (nm->checkentry == NULL)
+ 		return true;
+-	return nm->checkentry(par) == 0 ? true : false;
++	return nm->checkentry(par) == 0;
+ }
+ #endif
+ 
+@@ -313,7 +317,11 @@ static bool xtnu_target_check(const char *table, const void *entry,
  	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;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 23)
+ 	return nt->checkentry(&local_par);
++#else
++	return nt->checkentry(&local_par) == 0;
++#endif
+ }
+ #endif
+ 
+@@ -327,7 +335,7 @@ static bool xtnu_target_check(const struct xt_tgchk_param *par)
+ 		return false;
+ 	if (nt->checkentry == NULL)
+ 		return true;
+-	return nt->checkentry(par) == 0 ? true : false;
++	return nt->checkentry(par) == 0;
  }
  #endif
  

================================================================
Index: packages/xtables-addons/xtables-addons.spec
diff -u packages/xtables-addons/xtables-addons.spec:1.69 packages/xtables-addons/xtables-addons.spec:1.70
--- packages/xtables-addons/xtables-addons.spec:1.69	Wed Sep  1 10:00:56 2010
+++ packages/xtables-addons/xtables-addons.spec	Wed Sep  1 18:14:02 2010
@@ -19,7 +19,7 @@
 %define		_enable_debug_packages	0
 %endif
 
-%define		rel	9
+%define		rel	10
 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
@@ -188,6 +188,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.70  2010/09/01 16:14:02  gotar
+- unbroken on pre2.6.23 kernels (upstream fix: http://xtables-addons.git.sf.net/git/gitweb.cgi?p=xtables-addons/xtables-addons;a=commitdiff;h=fb2eea69afa1717b4e0d8edb471c0aa36b8603bb), rel. 10
+
 Revision 1.69  2010/09/01 08:00:56  gotar
 - fine-grained automake BR (pkglibexecdir)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xtables-addons/xtables-addons-pre2.6.35-checkentry.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xtables-addons/xtables-addons.spec?r1=1.69&r2=1.70&f=u