- unbroken on pre2.6.23 kernels (upstream fix: http://xtables-addons.git.sf.net/git...

Changed files:
    xtables-addons-pre2.6.35-checkentry.patch -> 1.2
    xtables-addons.spec -> 1.70

diff --git a/xtables-addons-pre2.6.35-checkentry.patch b/xtables-addons-pre2.6.35-checkentry.patch
index 8ba7c5c14383f7824459d9835fa495691389c08c..44f642eef499204be6c15ec4e85153a34606a85a 100644 (file)
--- a/xtables-addons-pre2.6.35-checkentry.patch
+++ b/xtables-addons-pre2.6.35-checkentry.patch
@@ -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
  

diff --git a/xtables-addons.spec b/xtables-addons.spec
index 9fa424425503886c7b36fee482f33ab6ca127768..3c0c5da6109313ca6e30a9099f596e0c02942169 100644 (file)
--- a/xtables-addons.spec
+++ b/xtables-addons.spec
@@ -18,7 +18,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