Hello community,
here is the log from the commit of package xtables-addons for openSUSE:Factory
checked in at Thu Apr 1 17:48:06 CEST 2010.
--------
--- xtables-addons/xtables-addons.changes 2010-02-25 01:15:34.000000000 +0100
+++ /mounts/work_src_done/STABLE/xtables-addons/xtables-addons.changes 2010-03-20 01:41:28.000000000 +0100
@@ -1,0 +2,6 @@
+Wed Mar 17 22:09:45 UTC 2010 - jengelh@medozas.de
+
+- new upstream release 1.24
+ * ipp2p: updated bittorent command recognition
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
xtables-addons-1.23.tar.bz2
New:
----
xtables-addons-1.24.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xtables-addons.spec ++++++
--- /var/tmp/diff_new_pack.FQdmKL/_old 2010-04-01 17:47:57.000000000 +0200
+++ /var/tmp/diff_new_pack.FQdmKL/_new 2010-04-01 17:47:57.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package xtables-addons (Version 1.23)
+# spec file for package xtables-addons (Version 1.24)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -18,7 +18,7 @@
Name: xtables-addons
-Version: 1.23
+Version: 1.24
Release: 1
Group: Productivity/Networking/Security
Summary: IP Packet Filter Administration Extensions
++++++ xtables-addons-1.23.tar.bz2 -> xtables-addons-1.24.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xtables-addons-1.23/configure new/xtables-addons-1.24/configure
--- old/xtables-addons-1.23/configure 2010-02-25 01:02:14.000000000 +0100
+++ new/xtables-addons-1.24/configure 2010-03-17 02:53:17.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for xtables-addons 1.23.
+# Generated by GNU Autoconf 2.63 for xtables-addons 1.24.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
@@ -743,8 +743,8 @@
# Identity of this package.
PACKAGE_NAME='xtables-addons'
PACKAGE_TARNAME='xtables-addons'
-PACKAGE_VERSION='1.23'
-PACKAGE_STRING='xtables-addons 1.23'
+PACKAGE_VERSION='1.24'
+PACKAGE_STRING='xtables-addons 1.24'
PACKAGE_BUGREPORT=''
# Factoring default headers for most tests.
@@ -1477,7 +1477,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures xtables-addons 1.23 to adapt to many kinds of systems.
+\`configure' configures xtables-addons 1.24 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1547,7 +1547,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xtables-addons 1.23:";;
+ short | recursive ) echo "Configuration of xtables-addons 1.24:";;
esac
cat <<\_ACEOF
@@ -1656,7 +1656,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xtables-addons configure 1.23
+xtables-addons configure 1.24
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1670,7 +1670,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xtables-addons $as_me 1.23, which was
+It was created by xtables-addons $as_me 1.24, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2522,7 +2522,7 @@
# Define the identity of the package.
PACKAGE='xtables-addons'
- VERSION='1.23'
+ VERSION='1.24'
cat >>confdefs.h <<_ACEOF
@@ -11626,7 +11626,8 @@
regular_CFLAGS="-D_LARGEFILE_SOURCE=1 -D_LARGE_FILES -D_FILE_OFFSET_BITS=64 \
-D_REENTRANT -Wall -Waggregate-return -Wmissing-declarations \
-Wmissing-prototypes -Wredundant-decls -Wshadow -Wstrict-prototypes \
- -Winline -pipe -DXTABLES_LIBDIR=\\\"\${xtlibdir}\\\"";
+ -Winline -pipe -DXTABLES_LIBDIR=\\\"\${xtlibdir}\\\" \
+ -I\${XA_TOPSRCDIR}/include";
#
# check kernel version
@@ -12108,7 +12109,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xtables-addons $as_me 1.23, which was
+This file was extended by xtables-addons $as_me 1.24, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -12171,7 +12172,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-xtables-addons config.status 1.23
+xtables-addons config.status 1.24
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xtables-addons-1.23/configure.ac new/xtables-addons-1.24/configure.ac
--- old/xtables-addons-1.23/configure.ac 2010-02-24 20:59:38.000000000 +0100
+++ new/xtables-addons-1.24/configure.ac 2010-03-17 02:50:23.000000000 +0100
@@ -1,5 +1,5 @@
-AC_INIT([xtables-addons], [1.23])
+AC_INIT([xtables-addons], [1.24])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_MACRO_DIR([m4])
AC_PROG_INSTALL
@@ -34,7 +34,8 @@
regular_CFLAGS="-D_LARGEFILE_SOURCE=1 -D_LARGE_FILES -D_FILE_OFFSET_BITS=64 \
-D_REENTRANT -Wall -Waggregate-return -Wmissing-declarations \
-Wmissing-prototypes -Wredundant-decls -Wshadow -Wstrict-prototypes \
- -Winline -pipe -DXTABLES_LIBDIR=\\\"\${xtlibdir}\\\"";
+ -Winline -pipe -DXTABLES_LIBDIR=\\\"\${xtlibdir}\\\" \
+ -I\${XA_TOPSRCDIR}/include";
#
# check kernel version
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xtables-addons-1.23/doc/changelog.txt new/xtables-addons-1.24/doc/changelog.txt
--- old/xtables-addons-1.23/doc/changelog.txt 2010-02-24 20:59:38.000000000 +0100
+++ new/xtables-addons-1.24/doc/changelog.txt 2010-03-17 02:50:23.000000000 +0100
@@ -3,6 +3,15 @@
====
+Xtables-addons 1.24 (March 17 2010)
+===================================
+- build: fix build of userspace modules against old (pre-2.6.25)
+ headers from linux-glibc-devel (/usr/include/linux)
+- ipp2p: updated bittorent command recognition
+- SYSRQ: let module load when crypto is unavailable
+- SYSRQ: allow processing of UDP-Lite
+
+
Xtables-addons 1.23 (February 24 2010)
======================================
- build: support for Linux 2.6.34
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xtables-addons-1.23/extensions/ACCOUNT/libxt_ACCOUNT.c new/xtables-addons-1.24/extensions/ACCOUNT/libxt_ACCOUNT.c
--- old/xtables-addons-1.23/extensions/ACCOUNT/libxt_ACCOUNT.c 2010-02-24 20:59:38.000000000 +0100
+++ new/xtables-addons-1.24/extensions/ACCOUNT/libxt_ACCOUNT.c 2010-03-17 02:50:23.000000000 +0100
@@ -142,7 +142,7 @@
static struct xtables_target account_tg_reg = {
.name = "ACCOUNT",
.revision = 1,
- .family = AF_INET,
+ .family = NFPROTO_IPV4,
.version = XTABLES_VERSION,
.size = XT_ALIGN(sizeof(struct ipt_acc_info)),
.userspacesize = offsetof(struct ipt_acc_info, table_nr),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xtables-addons-1.23/extensions/ACCOUNT/xt_ACCOUNT.c new/xtables-addons-1.24/extensions/ACCOUNT/xt_ACCOUNT.c
--- old/xtables-addons-1.23/extensions/ACCOUNT/xt_ACCOUNT.c 2010-02-24 20:59:38.000000000 +0100
+++ new/xtables-addons-1.24/extensions/ACCOUNT/xt_ACCOUNT.c 2010-03-17 02:50:23.000000000 +0100
@@ -1082,7 +1082,7 @@
static struct xt_target xt_acc_reg __read_mostly = {
.name = "ACCOUNT",
.revision = 1,
- .family = AF_INET,
+ .family = NFPROTO_IPV4,
.target = ipt_acc_target,
.targetsize = sizeof(struct ipt_acc_info),
.checkentry = ipt_acc_checkentry,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xtables-addons-1.23/extensions/compat_xtables.c new/xtables-addons-1.24/extensions/compat_xtables.c
--- old/xtables-addons-1.23/extensions/compat_xtables.c 2010-02-24 20:59:38.000000000 +0100
+++ new/xtables-addons-1.24/extensions/compat_xtables.c 2010-03-17 02:50:23.000000000 +0100
@@ -509,4 +509,18 @@
EXPORT_SYMBOL_GPL(xtnu_skb_linearize);
#endif
+void *HX_memmem(const void *space, size_t spacesize,
+ const void *point, size_t pointsize)
+{
+ size_t i;
+
+ if (pointsize > spacesize)
+ return NULL;
+ for (i = 0; i <= spacesize - pointsize; ++i)
+ if (memcmp(space + i, point, pointsize) == 0)
+ return (void *)space + i;
+ return NULL;
+}
+EXPORT_SYMBOL_GPL(HX_memmem);
+
MODULE_LICENSE("GPL");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xtables-addons-1.23/extensions/compat_xtnu.h new/xtables-addons-1.24/extensions/compat_xtnu.h
--- old/xtables-addons-1.23/extensions/compat_xtnu.h 2010-02-24 20:59:38.000000000 +0100
+++ new/xtables-addons-1.24/extensions/compat_xtnu.h 2010-03-17 02:50:23.000000000 +0100
@@ -154,4 +154,6 @@
__be32, __be32, bool);
extern int xtnu_skb_linearize(struct sk_buff *);
+extern void *HX_memmem(const void *, size_t, const void *, size_t);
+
#endif /* _COMPAT_XTNU_H */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xtables-addons-1.23/extensions/libxt_CHAOS.c new/xtables-addons-1.24/extensions/libxt_CHAOS.c
--- old/xtables-addons-1.23/extensions/libxt_CHAOS.c 2010-02-24 20:59:38.000000000 +0100
+++ new/xtables-addons-1.24/extensions/libxt_CHAOS.c 2010-03-17 02:50:23.000000000 +0100
@@ -95,7 +95,7 @@
static struct xtables_target chaos_tg_reg = {
.version = XTABLES_VERSION,
.name = "CHAOS",
- .family = AF_INET,
+ .family = NFPROTO_IPV4,
.size = XT_ALIGN(sizeof(struct xt_chaos_tginfo)),
.userspacesize = XT_ALIGN(sizeof(struct xt_chaos_tginfo)),
.help = chaos_tg_help,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xtables-addons-1.23/extensions/libxt_DELUDE.c new/xtables-addons-1.24/extensions/libxt_DELUDE.c
--- old/xtables-addons-1.23/extensions/libxt_DELUDE.c 2010-02-24 20:59:38.000000000 +0100
+++ new/xtables-addons-1.24/extensions/libxt_DELUDE.c 2010-03-17 02:50:23.000000000 +0100
@@ -33,9 +33,7 @@
.version = XTABLES_VERSION,
.name = "DELUDE",
.revision = 0,
- .family = AF_INET,
- .size = XT_ALIGN(0),
- .userspacesize = XT_ALIGN(0),
+ .family = NFPROTO_IPV4,
.help = delude_tg_help,
.parse = delude_tg_parse,
.final_check = delude_tg_check,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xtables-addons-1.23/extensions/libxt_DHCPMAC.c new/xtables-addons-1.24/extensions/libxt_DHCPMAC.c
--- old/xtables-addons-1.23/extensions/libxt_DHCPMAC.c 2010-02-24 20:59:38.000000000 +0100
+++ new/xtables-addons-1.24/extensions/libxt_DHCPMAC.c 2010-03-17 02:50:23.000000000 +0100
@@ -84,7 +84,7 @@
.version = XTABLES_VERSION,
.name = "DHCPMAC",
.revision = 0,
- .family = PF_INET,
+ .family = NFPROTO_IPV4,
.size = XT_ALIGN(sizeof(struct dhcpmac_info)),
.userspacesize = XT_ALIGN(sizeof(struct dhcpmac_info)),
.help = dhcpmac_tg_help,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xtables-addons-1.23/extensions/libxt_ECHO.c new/xtables-addons-1.24/extensions/libxt_ECHO.c
--- old/xtables-addons-1.23/extensions/libxt_ECHO.c 2010-02-24 20:59:38.000000000 +0100
+++ new/xtables-addons-1.24/extensions/libxt_ECHO.c 2010-03-17 02:50:23.000000000 +0100
@@ -29,9 +29,7 @@
static struct xtables_target echo_tg_reg = {
.version = XTABLES_VERSION,
.name = "ECHO",
- .family = AF_UNSPEC,
- .size = XT_ALIGN(0),
- .userspacesize = XT_ALIGN(0),
+ .family = NFPROTO_UNSPEC,
.help = echo_tg_help,
.parse = echo_tg_parse,
.final_check = echo_tg_check,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xtables-addons-1.23/extensions/libxt_IPMARK.c new/xtables-addons-1.24/extensions/libxt_IPMARK.c
--- old/xtables-addons-1.23/extensions/libxt_IPMARK.c 2010-02-24 20:59:38.000000000 +0100
+++ new/xtables-addons-1.24/extensions/libxt_IPMARK.c 2010-03-17 02:50:23.000000000 +0100
@@ -151,7 +151,7 @@
static struct xtables_target ipmark_tg_reg = {
.version = XTABLES_VERSION,
.name = "IPMARK",
- .family = PF_UNSPEC,
+ .family = NFPROTO_UNSPEC,
.revision = 1,
.size = XT_ALIGN(sizeof(struct xt_ipmark_tginfo)),
.userspacesize = XT_ALIGN(sizeof(struct xt_ipmark_tginfo)),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xtables-addons-1.23/extensions/libxt_LOGMARK.c new/xtables-addons-1.24/extensions/libxt_LOGMARK.c
--- old/xtables-addons-1.23/extensions/libxt_LOGMARK.c 2010-02-24 20:59:38.000000000 +0100
+++ new/xtables-addons-1.24/extensions/libxt_LOGMARK.c 2010-03-17 02:50:23.000000000 +0100
@@ -100,7 +100,7 @@
.version = XTABLES_VERSION,
.name = "LOGMARK",
.revision = 0,
- .family = AF_UNSPEC,
+ .family = NFPROTO_UNSPEC,
.size = XT_ALIGN(sizeof(struct xt_logmark_tginfo)),
.userspacesize = XT_ALIGN(sizeof(struct xt_logmark_tginfo)),
.help = logmark_tg_help,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xtables-addons-1.23/extensions/libxt_RAWDNAT.c new/xtables-addons-1.24/extensions/libxt_RAWDNAT.c
--- old/xtables-addons-1.23/extensions/libxt_RAWDNAT.c 2010-02-24 20:59:38.000000000 +0100
+++ new/xtables-addons-1.24/extensions/libxt_RAWDNAT.c 2010-03-17 02:50:23.000000000 +0100
@@ -154,7 +154,7 @@
.version = XTABLES_VERSION,
.name = "RAWDNAT",
.revision = 0,
- .family = PF_INET,
+ .family = NFPROTO_IPV4,
.size = XT_ALIGN(sizeof(struct xt_rawnat_tginfo)),
.userspacesize = XT_ALIGN(sizeof(struct xt_rawnat_tginfo)),
.help = rawdnat_tg_help,
@@ -169,7 +169,7 @@
.version = XTABLES_VERSION,
.name = "RAWDNAT",
.revision = 0,
- .family = PF_INET6,
+ .family = NFPROTO_IPV6,
.size = XT_ALIGN(sizeof(struct xt_rawnat_tginfo)),
.userspacesize = XT_ALIGN(sizeof(struct xt_rawnat_tginfo)),
.help = rawdnat_tg_help,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xtables-addons-1.23/extensions/libxt_RAWSNAT.c new/xtables-addons-1.24/extensions/libxt_RAWSNAT.c
--- old/xtables-addons-1.23/extensions/libxt_RAWSNAT.c 2010-02-24 20:59:38.000000000 +0100
+++ new/xtables-addons-1.24/extensions/libxt_RAWSNAT.c 2010-03-17 02:50:23.000000000 +0100
@@ -154,7 +154,7 @@
.version = XTABLES_VERSION,
.name = "RAWSNAT",
.revision = 0,
- .family = PF_INET,
+ .family = NFPROTO_IPV4,
.size = XT_ALIGN(sizeof(struct xt_rawnat_tginfo)),
.userspacesize = XT_ALIGN(sizeof(struct xt_rawnat_tginfo)),
.help = rawsnat_tg_help,
@@ -169,7 +169,7 @@
.version = XTABLES_VERSION,
.name = "RAWSNAT",
.revision = 0,
- .family = PF_INET6,
+ .family = NFPROTO_IPV6,
.size = XT_ALIGN(sizeof(struct xt_rawnat_tginfo)),
.userspacesize = XT_ALIGN(sizeof(struct xt_rawnat_tginfo)),
.help = rawsnat_tg_help,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xtables-addons-1.23/extensions/libxt_STEAL.c new/xtables-addons-1.24/extensions/libxt_STEAL.c
--- old/xtables-addons-1.23/extensions/libxt_STEAL.c 2010-02-24 20:59:38.000000000 +0100
+++ new/xtables-addons-1.24/extensions/libxt_STEAL.c 2010-03-17 02:50:23.000000000 +0100
@@ -19,9 +19,7 @@
static struct xtables_target steal_tg_reg = {
.version = XTABLES_VERSION,
.name = "STEAL",
- .family = AF_UNSPEC,
- .size = XT_ALIGN(0),
- .userspacesize = XT_ALIGN(0),
+ .family = NFPROTO_UNSPEC,
.help = steal_tg_help,
.parse = steal_tg_parse,
.final_check = steal_tg_check,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xtables-addons-1.23/extensions/libxt_SYSRQ.c new/xtables-addons-1.24/extensions/libxt_SYSRQ.c
--- old/xtables-addons-1.23/extensions/libxt_SYSRQ.c 2010-02-24 20:59:38.000000000 +0100
+++ new/xtables-addons-1.24/extensions/libxt_SYSRQ.c 2010-03-17 02:50:23.000000000 +0100
@@ -25,9 +25,7 @@
.version = XTABLES_VERSION,
.name = "SYSRQ",
.revision = 1,
- .family = PF_UNSPEC,
- .size = XT_ALIGN(0),
- .userspacesize = XT_ALIGN(0),
+ .family = NFPROTO_UNSPEC,
.help = sysrq_tg_help,
.parse = sysrq_tg_parse,
.final_check = sysrq_tg_check,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xtables-addons-1.23/extensions/libxt_TARPIT.c new/xtables-addons-1.24/extensions/libxt_TARPIT.c
--- old/xtables-addons-1.23/extensions/libxt_TARPIT.c 2010-02-24 20:59:38.000000000 +0100
+++ new/xtables-addons-1.24/extensions/libxt_TARPIT.c 2010-03-17 02:50:23.000000000 +0100
@@ -24,9 +24,7 @@
static struct xtables_target tarpit_tg_reg = {
.version = XTABLES_VERSION,
.name = "TARPIT",
- .family = AF_INET,
- .size = XT_ALIGN(0),
- .userspacesize = XT_ALIGN(0),
+ .family = NFPROTO_IPV4,
.help = tarpit_tg_help,
.parse = tarpit_tg_parse,
.final_check = tarpit_tg_check,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xtables-addons-1.23/extensions/libxt_TEE.c new/xtables-addons-1.24/extensions/libxt_TEE.c
--- old/xtables-addons-1.23/extensions/libxt_TEE.c 2010-02-24 20:59:38.000000000 +0100
+++ new/xtables-addons-1.24/extensions/libxt_TEE.c 2010-03-17 02:50:23.000000000 +0100
@@ -138,7 +138,7 @@
.name = "TEE",
.version = XTABLES_VERSION,
.revision = 0,
- .family = PF_INET,
+ .family = NFPROTO_IPV4,
.size = XT_ALIGN(sizeof(struct xt_tee_tginfo)),
.userspacesize = XT_ALIGN(sizeof(struct xt_tee_tginfo)),
.help = tee_tg_help,
@@ -153,7 +153,7 @@
.name = "TEE",
.version = XTABLES_VERSION,
.revision = 0,
- .family = PF_INET6,
+ .family = NFPROTO_IPV6,
.size = XT_ALIGN(sizeof(struct xt_tee_tginfo)),
.userspacesize = XT_ALIGN(sizeof(struct xt_tee_tginfo)),
.help = tee_tg_help,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xtables-addons-1.23/extensions/libxt_condition.c new/xtables-addons-1.24/extensions/libxt_condition.c
--- old/xtables-addons-1.23/extensions/libxt_condition.c 2010-02-24 20:59:38.000000000 +0100
+++ new/xtables-addons-1.24/extensions/libxt_condition.c 2010-03-17 02:50:23.000000000 +0100
@@ -80,7 +80,7 @@
static struct xtables_match condition_mt_reg = {
.name = "condition",
.revision = 1,
- .family = PF_UNSPEC,
+ .family = NFPROTO_UNSPEC,
.version = XTABLES_VERSION,
.size = XT_ALIGN(sizeof(struct xt_condition_mtinfo)),
.userspacesize = XT_ALIGN(sizeof(struct xt_condition_mtinfo)),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xtables-addons-1.23/extensions/libxt_dhcpmac.c new/xtables-addons-1.24/extensions/libxt_dhcpmac.c
--- old/xtables-addons-1.23/extensions/libxt_dhcpmac.c 2010-02-24 20:59:38.000000000 +0100
+++ new/xtables-addons-1.24/extensions/libxt_dhcpmac.c 2010-03-17 02:50:23.000000000 +0100
@@ -85,7 +85,7 @@
.version = XTABLES_VERSION,
.name = "dhcpmac",
.revision = 0,
- .family = PF_INET,
+ .family = NFPROTO_IPV4,
.size = XT_ALIGN(sizeof(struct dhcpmac_info)),
.userspacesize = XT_ALIGN(sizeof(struct dhcpmac_info)),
.help = dhcpmac_mt_help,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xtables-addons-1.23/extensions/libxt_fuzzy.c new/xtables-addons-1.24/extensions/libxt_fuzzy.c
--- old/xtables-addons-1.23/extensions/libxt_fuzzy.c 2010-02-24 20:59:38.000000000 +0100
+++ new/xtables-addons-1.24/extensions/libxt_fuzzy.c 2010-03-17 02:50:23.000000000 +0100
@@ -103,6 +103,7 @@
.name = "fuzzy",
.revision = 1,
.version = XTABLES_VERSION,
+ .family = NFPROTO_UNSPEC,
.size = XT_ALIGN(sizeof(struct xt_fuzzy_mtinfo)),
.userspacesize = offsetof(struct xt_fuzzy_mtinfo, packets_total),
.help = fuzzy_mt_help,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xtables-addons-1.23/extensions/libxt_geoip.c new/xtables-addons-1.24/extensions/libxt_geoip.c
--- old/xtables-addons-1.23/extensions/libxt_geoip.c 2010-02-24 20:59:38.000000000 +0100
+++ new/xtables-addons-1.24/extensions/libxt_geoip.c 2010-03-17 02:50:23.000000000 +0100
@@ -259,7 +259,7 @@
}
static struct xtables_match geoip_match = {
- .family = AF_INET,
+ .family = NFPROTO_IPV4,
.name = "geoip",
.revision = 1,
.version = XTABLES_VERSION,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xtables-addons-1.23/extensions/libxt_iface.c new/xtables-addons-1.24/extensions/libxt_iface.c
--- old/xtables-addons-1.23/extensions/libxt_iface.c 2010-02-24 20:59:38.000000000 +0100
+++ new/xtables-addons-1.24/extensions/libxt_iface.c 2010-03-17 02:50:23.000000000 +0100
@@ -200,7 +200,7 @@
.version = XTABLES_VERSION,
.name = "iface",
.revision = 0,
- .family = AF_UNSPEC,
+ .family = NFPROTO_UNSPEC,
.size = XT_ALIGN(sizeof(struct xt_iface_mtinfo)),
.userspacesize = XT_ALIGN(sizeof(struct xt_iface_mtinfo)),
.help = iface_mt_help,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xtables-addons-1.23/extensions/libxt_ipp2p.c new/xtables-addons-1.24/extensions/libxt_ipp2p.c
--- old/xtables-addons-1.23/extensions/libxt_ipp2p.c 2010-02-24 20:59:38.000000000 +0100
+++ new/xtables-addons-1.24/extensions/libxt_ipp2p.c 2010-03-17 02:50:23.000000000 +0100
@@ -229,7 +229,7 @@
.version = XTABLES_VERSION,
.name = "ipp2p",
.revision = 1,
- .family = AF_INET,
+ .family = NFPROTO_IPV4,
.size = XT_ALIGN(sizeof(struct ipt_p2p_info)),
.userspacesize = XT_ALIGN(sizeof(struct ipt_p2p_info)),
.help = ipp2p_mt_help,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xtables-addons-1.23/extensions/libxt_ipv4options.c new/xtables-addons-1.24/extensions/libxt_ipv4options.c
--- old/xtables-addons-1.23/extensions/libxt_ipv4options.c 2010-02-24 20:59:38.000000000 +0100
+++ new/xtables-addons-1.24/extensions/libxt_ipv4options.c 2010-03-17 02:50:23.000000000 +0100
@@ -161,7 +161,7 @@
.version = XTABLES_VERSION,
.name = "ipv4options",
.revision = 1,
- .family = PF_INET,
+ .family = NFPROTO_IPV4,
.size = XT_ALIGN(sizeof(struct xt_ipv4options_mtinfo1)),
.userspacesize = XT_ALIGN(sizeof(struct xt_ipv4options_mtinfo1)),
.help = ipv4options_mt_help,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xtables-addons-1.23/extensions/libxt_length2.c new/xtables-addons-1.24/extensions/libxt_length2.c
--- old/xtables-addons-1.23/extensions/libxt_length2.c 2010-02-24 20:59:38.000000000 +0100
+++ new/xtables-addons-1.24/extensions/libxt_length2.c 2010-03-17 02:50:23.000000000 +0100
@@ -155,7 +155,7 @@
.version = XTABLES_VERSION,
.name = "length2",
.revision = 2,
- .family = PF_UNSPEC,
+ .family = NFPROTO_UNSPEC,
.size = XT_ALIGN(sizeof(struct xt_length_mtinfo2)),
.userspacesize = XT_ALIGN(sizeof(struct xt_length_mtinfo2)),
.init = length_mt_init,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xtables-addons-1.23/extensions/libxt_lscan.c new/xtables-addons-1.24/extensions/libxt_lscan.c
--- old/xtables-addons-1.23/extensions/libxt_lscan.c 2010-02-24 20:59:38.000000000 +0100
+++ new/xtables-addons-1.24/extensions/libxt_lscan.c 2010-03-17 02:50:23.000000000 +0100
@@ -105,7 +105,7 @@
.version = XTABLES_VERSION,
.name = "lscan",
.revision = 0,
- .family = AF_INET,
+ .family = NFPROTO_IPV4,
.size = XT_ALIGN(sizeof(struct xt_lscan_mtinfo)),
.userspacesize = XT_ALIGN(sizeof(struct xt_lscan_mtinfo)),
.help = lscan_mt_help,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xtables-addons-1.23/extensions/libxt_psd.c new/xtables-addons-1.24/extensions/libxt_psd.c
--- old/xtables-addons-1.23/extensions/libxt_psd.c 2010-02-24 20:59:38.000000000 +0100
+++ new/xtables-addons-1.24/extensions/libxt_psd.c 2010-03-17 02:50:23.000000000 +0100
@@ -139,7 +139,7 @@
.name = "psd",
.version = XTABLES_VERSION,
.revision = 1,
- .family = PF_INET,
+ .family = NFPROTO_IPV4,
.size = XT_ALIGN(sizeof(struct xt_psd_info)),
.userspacesize = XT_ALIGN(sizeof(struct xt_psd_info)),
.help = psd_mt_help,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xtables-addons-1.23/extensions/libxt_quota2.c new/xtables-addons-1.24/extensions/libxt_quota2.c
--- old/xtables-addons-1.23/extensions/libxt_quota2.c 2010-02-24 20:59:38.000000000 +0100
+++ new/xtables-addons-1.24/extensions/libxt_quota2.c 2010-03-17 02:50:23.000000000 +0100
@@ -133,7 +133,7 @@
}
static struct xtables_match quota_mt2_reg = {
- .family = AF_UNSPEC,
+ .family = NFPROTO_UNSPEC,
.revision = 3,
.name = "quota2",
.version = XTABLES_VERSION,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xtables-addons-1.23/extensions/pknock/libxt_pknock.c new/xtables-addons-1.24/extensions/pknock/libxt_pknock.c
--- old/xtables-addons-1.23/extensions/pknock/libxt_pknock.c 2010-02-24 20:59:38.000000000 +0100
+++ new/xtables-addons-1.24/extensions/pknock/libxt_pknock.c 2010-03-17 02:50:23.000000000 +0100
@@ -326,7 +326,7 @@
.name = "pknock",
.version = XTABLES_VERSION,
.revision = 1,
- .family = AF_INET,
+ .family = NFPROTO_IPV4,
.size = XT_ALIGN(sizeof(struct xt_pknock_mtinfo)),
.userspacesize = XT_ALIGN(sizeof(struct xt_pknock_mtinfo)),
.help = pknock_mt_help,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xtables-addons-1.23/extensions/xt_DHCPMAC.c new/xtables-addons-1.24/extensions/xt_DHCPMAC.c
--- old/xtables-addons-1.23/extensions/xt_DHCPMAC.c 2010-02-24 20:59:38.000000000 +0100
+++ new/xtables-addons-1.24/extensions/xt_DHCPMAC.c 2010-03-17 02:50:23.000000000 +0100
@@ -139,7 +139,7 @@
.family = NFPROTO_IPV4,
.proto = IPPROTO_UDP,
.match = dhcpmac_mt,
- .matchsize = XT_ALIGN(sizeof(struct dhcpmac_info)),
+ .matchsize = sizeof(struct dhcpmac_info),
.me = THIS_MODULE,
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xtables-addons-1.23/extensions/xt_ECHO.c new/xtables-addons-1.24/extensions/xt_ECHO.c
--- old/xtables-addons-1.23/extensions/xt_ECHO.c 2010-02-24 20:59:38.000000000 +0100
+++ new/xtables-addons-1.24/extensions/xt_ECHO.c 2010-03-17 02:50:23.000000000 +0100
@@ -113,7 +113,6 @@
.proto = IPPROTO_UDP,
.table = "filter",
.target = echo_tg4,
- .targetsize = XT_ALIGN(0),
.me = THIS_MODULE,
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xtables-addons-1.23/extensions/xt_IPMARK.c new/xtables-addons-1.24/extensions/xt_IPMARK.c
--- old/xtables-addons-1.23/extensions/xt_IPMARK.c 2010-02-24 20:59:38.000000000 +0100
+++ new/xtables-addons-1.24/extensions/xt_IPMARK.c 2010-03-17 02:50:23.000000000 +0100
@@ -86,7 +86,7 @@
.family = NFPROTO_IPV4,
.table = "mangle",
.target = ipmark_tg4,
- .targetsize = XT_ALIGN(sizeof(struct xt_ipmark_tginfo)),
+ .targetsize = sizeof(struct xt_ipmark_tginfo),
.me = THIS_MODULE,
},
{
@@ -95,7 +95,7 @@
.family = NFPROTO_IPV6,
.table = "mangle",
.target = ipmark_tg6,
- .targetsize = XT_ALIGN(sizeof(struct xt_ipmark_tginfo)),
+ .targetsize = sizeof(struct xt_ipmark_tginfo),
.me = THIS_MODULE,
},
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xtables-addons-1.23/extensions/xt_SYSRQ.c new/xtables-addons-1.24/extensions/xt_SYSRQ.c
--- old/xtables-addons-1.23/extensions/xt_SYSRQ.c 2010-02-24 20:59:38.000000000 +0100
+++ new/xtables-addons-1.24/extensions/xt_SYSRQ.c 2010-03-17 02:50:23.000000000 +0100
@@ -1,6 +1,6 @@
/*
* "SYSRQ" target extension for Netfilter
- * Copyright © Jan Engelhardt