Xtables-addons 1.5.4.1

The prototype of ip_route_me_harder changed in 2.6.18.5, so I think
Xtables-addons should account for it. This renders compilation on
anything below it impossible. (2.6.17 is not supported in general.)

INSTALL

@@ -12,9 +12,13 @@ in combination with the kernel's Kbuild system.
 Prerequirements
 ===============
 
-	* xtables(-devel) 1.5.2
+	* a recent iptables snapshot
+	  - from the "xtables" git repository at dev.medozas.de
+	    (minimum as per git-describe: v1.4.0-77)
+	  - or the subversion repository at netfilter.org (minimum: r7502)
+	  - or the xtables-combined tarball that is currently distributed
 
-	* kernel-source >= 2.6.18 with prepared build/output directory
+	* kernel-source >= 2.6.18.5 with prepared build/output directory
 
 
 Selecting extensions
@@ -36,15 +40,6 @@ Configuring and compiling
 	/lib/modules/$(running version)/build, which usually points to
 	the right directory. (If not, you need to install something.)
 
---with-ksource=
-
-	Specifies the path to the kernel source directory. This is
-	currently needed for building the userspace extensions because
-	we use unsanitized kernel headers, but the option MAY
-	DISAPPEAR IN FUTURE.
-
-		--with-ksource=/usr/src/linux
-
 --with-xtables=
 
 	Specifies the path to the directory where we may find
@@ -77,5 +72,5 @@ Note to distribution packagers
 Except for --with-kbuild, distributions should not have a need to
 supply any other flags (besides --prefix=/usr and perhaps
 --libdir=/usr/lib64, etc.) to configure when all prerequired packages
-are installed. If xtables-devel is installed, necessary headers should
+are installed. If iptables-devel is installed, necessary headers should
 be in /usr/include, so --with-xtables is not needed.

configure.ac

@@ -1,5 +1,5 @@
 
-AC_INIT([xtables-addons], [1.5.4])
+AC_INIT([xtables-addons], [1.5.4.1])
 AC_CONFIG_HEADERS([config.h])
 AC_PROG_INSTALL
 AM_INIT_AUTOMAKE
@@ -59,7 +59,9 @@ if [[ -n "$ksourcedir" ]]; then
 	kinclude_CFLAGS="$kinclude_CFLAGS -I $ksourcedir/include";
 fi;
 
-AC_SUBST([regular_CFLAGS xtables_CFLAGS kinclude_CFLAGS])
+AC_SUBST([regular_CFLAGS])
+AC_SUBST([xtables_CFLAGS])
+AC_SUBST([kinclude_CFLAGS])
 AC_SUBST([kbuilddir])
 AC_SUBST([ksourcedir])
 AC_SUBST([xtlibdir])

extensions/.gitignore

@@ -1,13 +1,13 @@
-.*.cmd
-.*.d
-.manpages.lst
-.tmp_versions
-*.ko
-*.mod.c
-*.so
-*.oo
-GNUmakefile
-Module.symvers
-modules.order
-matches.man
-targets.man
+/.*.cmd
+/.*.d
+/.manpages.lst
+/.tmp_versions
+/*.ko
+/*.mod.c
+/*.so
+/*.oo
+/GNUmakefile
+/Module.symvers
+/modules.order
+/matches.man
+/targets.man

extensions/compat_xtables.c

@@ -299,7 +299,8 @@ int xtnu_ip_route_me_harder(struct sk_buff *skb, unsigned int addr_type)
 	struct sk_buff *nskb = skb;
 	int ret;
 
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 18)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 17)
+	/* Actually this one is valid up to 2.6.18.4, but changed in 2.6.18.5 */
 	ret = ip_route_me_harder(&skb);
 #elif LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 23)
 	ret = ip_route_me_harder(&nskb, addr_type);

extensions/libxt_condition.c

@@ -68,10 +68,10 @@ static void condition_save(const void *ip, const struct xt_entry_match *match)
 	printf("--condition %s\"%s\" ", (info->invert) ? "! " : "", info->name);
 }
 
-static struct xtables_match condition_mt4_reg = {
+static struct xtables_match condition_mt_reg = {
 	.name 		= "condition",
 	.revision	= 0,
-	.family		= PF_INET,
+	.family		= PF_UNSPEC,
 	.version 	= XTABLES_VERSION,
 	.size 		= XT_ALIGN(sizeof(struct xt_condition_mtinfo)),
 	.userspacesize 	= XT_ALIGN(sizeof(struct xt_condition_mtinfo)),
@@ -83,23 +83,7 @@ static struct xtables_match condition_mt4_reg = {
 	.extra_opts 	= condition_opts,
 };
 
-static struct xtables_match condition_mt6_reg = {
-	.name 		= "condition",
-	.revision	= 0,
-	.family		= PF_INET6,
-	.version 	= XTABLES_VERSION,
-	.size 		= XT_ALIGN(sizeof(struct xt_condition_mtinfo)),
-	.userspacesize 	= offsetof(struct xt_condition_mtinfo, condvar),
-	.help 		= condition_help,
-	.parse 		= condition_parse,
-	.final_check	= condition_check,
-	.print 		= condition_print,
-	.save 		= condition_save,
-	.extra_opts 	= condition_opts,
-};
-
 static void _init(void)
 {
-	xtables_register_match(&condition_mt4_reg);
-	xtables_register_match(&condition_mt6_reg);
+	xtables_register_match(&condition_mt_reg);
 }