Hello community,
here is the log from the commit of package xtables-addons for openSUSE:Factory
checked in at Tue Feb 9 22:19:45 CET 2010.
--------
--- xtables-addons/xtables-addons.changes 2009-12-31 01:56:18.000000000 +0100
+++ /mounts/work_src_done/STABLE/xtables-addons/xtables-addons.changes 2010-01-23 02:34:08.000000000 +0100
@@ -0,0 +1,9 @@
+-------------------------------------------------------------------
+Sat Jan 23 02:32:52 CET 2010 - jengelh@medozas.de
+
+- new upstream release 1.22
+ * ipset: enable build of ip_set_setlist.ko
+ * quota2: add the --no-change mode
+- remove merged patch geoip-dir.diff (use
+ /usr/share/xt_geoip instead of /var/geoip)
+
calling whatdependson for head-i586
Old:
----
geoip-dir.diff
xtables-addons-1.21.tar.bz2
New:
----
xtables-addons-1.22.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xtables-addons.spec ++++++
--- /var/tmp/diff_new_pack.Z9exJX/_old 2010-02-09 22:18:31.000000000 +0100
+++ /var/tmp/diff_new_pack.Z9exJX/_new 2010-02-09 22:18:31.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package xtables-addons (Version 1.21)
+# spec file for package xtables-addons (Version 1.22)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -18,7 +18,7 @@
Name: xtables-addons
-Version: 1.21
+Version: 1.22
Release: 1
Group: Productivity/Networking/Security
Summary: IP Packet Filter Administration Extensions
@@ -27,7 +27,6 @@
Source: %name-%version.tar.bz2
#Git-Clone: git://xtables-addons.git.sf.net/gitroot/xtables-addons/xtables-addons
#Git-Web: http://xtables-addons.git.sf.net/
-Patch1: geoip-dir.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: %kernel_module_package_buildreqs
BuildRequires: iptables-devel >= 1.4.3
@@ -48,7 +47,6 @@
%prep
%setup -q
-%patch -P 1 -p1
if [ ! -e configure ]; then
./autogen.sh;
fi;
@@ -90,4 +88,5 @@
%_sbindir/*
%_libdir/*.so.*
%_libexecdir/xtables
+
%changelog
++++++ xtables-addons-1.21.tar.bz2 -> xtables-addons-1.22.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xtables-addons-1.21/Makefile.iptrules.in new/xtables-addons-1.22/Makefile.iptrules.in
--- old/xtables-addons-1.21/Makefile.iptrules.in 2009-12-09 21:24:12.000000000 +0100
+++ new/xtables-addons-1.22/Makefile.iptrules.in 2010-01-22 20:14:37.000000000 +0100
@@ -47,7 +47,7 @@
install: ${targets}
@for i in ${subdirs_list}; do ${MAKE} -C $$i $@; done;
install -dm0755 "${DESTDIR}/${xtlibdir}";
- install -pm0755 $^ "${DESTDIR}/${xtlibdir}";
+ @for i in $^; do install -pm0755 $$i "${DESTDIR}/${xtlibdir}"; done;
clean:
@for i in ${subdirs_list}; do ${MAKE} -C $$i $@; done;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xtables-addons-1.21/configure new/xtables-addons-1.22/configure
--- old/xtables-addons-1.21/configure 2009-12-09 21:24:25.000000000 +0100
+++ new/xtables-addons-1.22/configure 2010-01-22 21:28:43.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.21.
+# Generated by GNU Autoconf 2.63 for xtables-addons 1.22.
#
# 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.21'
-PACKAGE_STRING='xtables-addons 1.21'
+PACKAGE_VERSION='1.22'
+PACKAGE_STRING='xtables-addons 1.22'
PACKAGE_BUGREPORT=''
# Factoring default headers for most tests.
@@ -1481,7 +1481,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.21 to adapt to many kinds of systems.
+\`configure' configures xtables-addons 1.22 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1551,7 +1551,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xtables-addons 1.21:";;
+ short | recursive ) echo "Configuration of xtables-addons 1.22:";;
esac
cat <<\_ACEOF
@@ -1662,7 +1662,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xtables-addons configure 1.21
+xtables-addons configure 1.22
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1676,7 +1676,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.21, which was
+It was created by xtables-addons $as_me 1.22, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2528,7 +2528,7 @@
# Define the identity of the package.
PACKAGE='xtables-addons'
- VERSION='1.21'
+ VERSION='1.22'
cat >>confdefs.h <<_ACEOF
@@ -12164,7 +12164,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.21, which was
+This file was extended by xtables-addons $as_me 1.22, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -12227,7 +12227,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-xtables-addons config.status 1.21
+xtables-addons config.status 1.22
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.21/configure.ac new/xtables-addons-1.22/configure.ac
--- old/xtables-addons-1.21/configure.ac 2009-12-09 21:24:12.000000000 +0100
+++ new/xtables-addons-1.22/configure.ac 2010-01-22 20:14:37.000000000 +0100
@@ -1,5 +1,5 @@
-AC_INIT([xtables-addons], [1.21])
+AC_INIT([xtables-addons], [1.22])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_MACRO_DIR([m4])
AC_PROG_INSTALL
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xtables-addons-1.21/doc/changelog.txt new/xtables-addons-1.22/doc/changelog.txt
--- old/xtables-addons-1.21/doc/changelog.txt 2009-12-09 21:24:12.000000000 +0100
+++ new/xtables-addons-1.22/doc/changelog.txt 2010-01-22 20:14:37.000000000 +0100
@@ -3,6 +3,14 @@
====
+Xtables-addons 1.22 (January 22 2009)
+=====================================
+- compat_xtables: support for 2.6.33 skb_iif changes
+- geoip: for FHS compliance use /usr/share/xt_geoip instead of /var/geoip
+- ipset: enable build of ip_set_setlist.ko
+- quota2: add the --no-change mode
+
+
Xtables-addons 1.21 (December 09 2009)
======================================
- ACCOUNT: avoid collision with arp_tables setsockopt numbers
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xtables-addons-1.21/extensions/compat_skbuff.h new/xtables-addons-1.22/extensions/compat_skbuff.h
--- old/xtables-addons-1.21/extensions/compat_skbuff.h 2009-12-09 21:24:12.000000000 +0100
+++ new/xtables-addons-1.22/extensions/compat_skbuff.h 2010-01-22 20:14:37.000000000 +0100
@@ -25,9 +25,12 @@
# define skb_ifindex(skb) \
(((skb)->input_dev != NULL) ? (skb)->input_dev->ifindex : 0)
# define skb_nfmark(skb) (((struct sk_buff *)(skb))->nfmark)
-#else
+#elif LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 32)
# define skb_ifindex(skb) (skb)->iif
# define skb_nfmark(skb) (((struct sk_buff *)(skb))->mark)
+#else
+# define skb_ifindex(skb) (skb)->skb_iif
+# define skb_nfmark(skb) (((struct sk_buff *)(skb))->mark)
#endif
#ifdef CONFIG_NETWORK_SECMARK
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xtables-addons-1.21/extensions/ipset/Kbuild new/xtables-addons-1.22/extensions/ipset/Kbuild
--- old/xtables-addons-1.21/extensions/ipset/Kbuild 2009-12-09 21:24:12.000000000 +0100
+++ new/xtables-addons-1.22/extensions/ipset/Kbuild 2010-01-22 20:14:37.000000000 +0100
@@ -3,4 +3,4 @@
obj-m += ipt_set.o ipt_SET.o
obj-m += ip_set.o ip_set_ipmap.o ip_set_portmap.o ip_set_macipmap.o
obj-m += ip_set_iphash.o ip_set_nethash.o ip_set_ipporthash.o
-obj-m += ip_set_iptree.o ip_set_iptreemap.o
+obj-m += ip_set_iptree.o ip_set_iptreemap.o ip_set_setlist.o
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xtables-addons-1.21/extensions/libxt_geoip.c new/xtables-addons-1.22/extensions/libxt_geoip.c
--- old/xtables-addons-1.21/extensions/libxt_geoip.c 2009-12-09 21:24:12.000000000 +0100
+++ new/xtables-addons-1.22/extensions/libxt_geoip.c 2010-01-22 20:14:37.000000000 +0100
@@ -24,7 +24,7 @@
#include