From 3d9498039247b3e29cec8ae5d65cb5dd188f31e5 Mon Sep 17 00:00:00 2001
From: Tomasz Pala <gotar@pld-linux.org>
Date: Wed, 1 Sep 2010 07:36:28 +0000
Subject: [PATCH] - added .checkentry return value patch for pre-2.6.35
 kernels, rel. 9

Changed files:
    xtables-addons-pre2.6.35-checkentry.patch -> 1.1
    xtables-addons.spec -> 1.68
---
 xtables-addons-pre2.6.35-checkentry.patch | 21 +++++++++++++++++++++
 xtables-addons.spec                       |  4 +++-
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 xtables-addons-pre2.6.35-checkentry.patch

diff --git a/xtables-addons-pre2.6.35-checkentry.patch b/xtables-addons-pre2.6.35-checkentry.patch
new file mode 100644
index 0000000..8ba7c5c
--- /dev/null
+++ b/xtables-addons-pre2.6.35-checkentry.patch
@@ -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
+ 
diff --git a/xtables-addons.spec b/xtables-addons.spec
index b958a7b..5b97cc6 100644
--- a/xtables-addons.spec
+++ b/xtables-addons.spec
@@ -18,7 +18,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
@@ -34,6 +34,7 @@ Source0:	http://downloads.sourceforge.net/xtables-addons/%{name}-%{version}.tar.
 # 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
@@ -97,6 +98,7 @@ Moduły jądra dla xtables addons.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %{__sed} -i -e 's#build_ipset=m#build_ipset=n#' mconfig
 
-- 
2.44.0