Hello community, here is the log from the commit of package xtables-addons for openSUSE:Factory checked in at 2013-04-03 13:09:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xtables-addons (Old) and /work/SRC/openSUSE:Factory/.xtables-addons.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xtables-addons", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/xtables-addons/xtables-addons.changes 2013-03-21 22:16:16.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xtables-addons.new/xtables-addons.changes 2013-04-03 13:09:47.000000000 +0200 @@ -1,0 +2,7 @@ +Sun Mar 31 19:15:44 UTC 2013 - jeng...@inai.de + +- Update to new upstream release 2.2 +* support for Linux 3.9 +* avoid iptaccount being optimized away (bnc#807155) + +------------------------------------------------------------------- Old: ---- xtables-addons-2.1.tar.xz xtables-addons-2.1.tar.xz.asc New: ---- xtables-addons-2.2.tar.xz xtables-addons-2.2.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xtables-addons.spec ++++++ --- /var/tmp/diff_new_pack.dAcyz7/_old 2013-04-03 13:09:49.000000000 +0200 +++ /var/tmp/diff_new_pack.dAcyz7/_new 2013-04-03 13:09:49.000000000 +0200 @@ -21,7 +21,7 @@ %define kernel37 1 %endif %if 0%{?kernel37} -Version: 2.1 +Version: 2.2 Release: 0 %else Version: 1.47.1 @@ -40,8 +40,8 @@ Source4: %name.keyring Source5: %name-1.47.1.tar.xz Source6: %name-1.47.1.tar.xz.asc -Source7: %name-2.1.tar.xz -Source8: %name-2.1.tar.xz.asc +Source7: %name-2.2.tar.xz +Source8: %name-2.2.tar.xz.asc BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} >= 1230 @@ -113,7 +113,7 @@ cp -a "%name-%version" "%name-$flavor-%version"; pushd "%name-$flavor-%version/"; %configure --with-kbuild="/usr/src/linux-obj/%_target_cpu/$flavor"; - make %{?_smp_mflags}; + make %{?_smp_mflags} V=1; popd; done; ++++++ xtables-addons-2.1.tar.xz -> xtables-addons-2.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xtables-addons-2.1/aclocal.m4 new/xtables-addons-2.2/aclocal.m4 --- old/xtables-addons-2.1/aclocal.m4 2012-12-27 08:01:49.000000000 +0100 +++ new/xtables-addons-2.2/aclocal.m4 2013-03-31 21:14:56.000000000 +0200 @@ -47,7 +47,8 @@ # ---------------------------------- AC_DEFUN([PKG_PROG_PKG_CONFIG], [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) +m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) +m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) @@ -93,7 +94,8 @@ pkg_cv_[]$1="$$1" elif test -n "$PKG_CONFIG"; then PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes]) else pkg_failed=untried @@ -141,9 +143,9 @@ AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD @@ -177,6 +179,46 @@ fi[]dnl ])# PKG_CHECK_MODULES + +# PKG_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable pkgconfigdir as the location where a module +# should install pkg-config .pc files. By default the directory is +# $libdir/pkgconfig, but the default can be changed by passing +# DIRECTORY. The user can override through the --with-pkgconfigdir +# parameter. +AC_DEFUN([PKG_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([pkgconfigdir], + [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, + [with_pkgconfigdir=]pkg_default) +AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_INSTALLDIR + + +# PKG_NOARCH_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable noarch_pkgconfigdir as the location where a +# module should install arch-independent pkg-config .pc files. By +# default the directory is $datadir/pkgconfig, but the default can be +# changed by passing DIRECTORY. The user can override through the +# --with-noarch-pkgconfigdir parameter. +AC_DEFUN([PKG_NOARCH_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([noarch-pkgconfigdir], + [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, + [with_noarch_pkgconfigdir=]pkg_default) +AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_NOARCH_INSTALLDIR + # Copyright (C) 2002-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xtables-addons-2.1/configure new/xtables-addons-2.2/configure --- old/xtables-addons-2.1/configure 2012-12-27 08:01:50.000000000 +0100 +++ new/xtables-addons-2.2/configure 2013-03-31 21:14:56.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for xtables-addons 2.1. +# Generated by GNU Autoconf 2.69 for xtables-addons 2.2. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -587,8 +587,8 @@ # Identity of this package. PACKAGE_NAME='xtables-addons' PACKAGE_TARNAME='xtables-addons' -PACKAGE_VERSION='2.1' -PACKAGE_STRING='xtables-addons 2.1' +PACKAGE_VERSION='2.2' +PACKAGE_STRING='xtables-addons 2.2' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1322,7 +1322,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 2.1 to adapt to many kinds of systems. +\`configure' configures xtables-addons 2.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1392,7 +1392,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xtables-addons 2.1:";; + short | recursive ) echo "Configuration of xtables-addons 2.2:";; esac cat <<\_ACEOF @@ -1511,7 +1511,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xtables-addons configure 2.1 +xtables-addons configure 2.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1876,7 +1876,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 2.1, which was +It was created by xtables-addons $as_me 2.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2703,7 +2703,7 @@ # Define the identity of the package. PACKAGE='xtables-addons' - VERSION='2.1' + VERSION='2.2' cat >>confdefs.h <<_ACEOF @@ -11668,6 +11668,7 @@ + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. @@ -11796,6 +11797,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_libxtables_CFLAGS=`$PKG_CONFIG --cflags "xtables >= 1.4.5" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -11812,6 +11814,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_libxtables_LIBS=`$PKG_CONFIG --libs "xtables >= 1.4.5" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -11831,9 +11834,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - libxtables_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xtables >= 1.4.5" 2>&1` + libxtables_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "xtables >= 1.4.5" 2>&1` else - libxtables_PKG_ERRORS=`$PKG_CONFIG --print-errors "xtables >= 1.4.5" 2>&1` + libxtables_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xtables >= 1.4.5" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$libxtables_PKG_ERRORS" >&5 @@ -11911,8 +11914,8 @@ echo "WARNING: Version detection did not succeed. Continue at own luck."; else echo "$kmajor.$kminor.$kmicro.$kstable in $kbuilddir"; - if test "$kmajor" -gt 3 -o "$kmajor" -eq 3 -a "$kminor" -gt 8; then - echo "WARNING: That kernel version is not officially supported."; + if test "$kmajor" -gt 3 -o "$kmajor" -eq 3 -a "$kminor" -gt 9; then + echo "WARNING: That kernel version is not officially supported yet. Continue at own luck."; elif test "$kmajor" -eq 3 -a "$kminor" -ge 7; then :; else @@ -12457,7 +12460,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 2.1, which was +This file was extended by xtables-addons $as_me 2.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12523,7 +12526,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -xtables-addons config.status 2.1 +xtables-addons config.status 2.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xtables-addons-2.1/configure.ac new/xtables-addons-2.2/configure.ac --- old/xtables-addons-2.1/configure.ac 2012-12-27 08:01:00.000000000 +0100 +++ new/xtables-addons-2.2/configure.ac 2013-03-31 21:14:37.000000000 +0200 @@ -1,4 +1,4 @@ -AC_INIT([xtables-addons], [2.1]) +AC_INIT([xtables-addons], [2.2]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([m4]) @@ -63,8 +63,8 @@ echo "WARNING: Version detection did not succeed. Continue at own luck."; else echo "$kmajor.$kminor.$kmicro.$kstable in $kbuilddir"; - if test "$kmajor" -gt 3 -o "$kmajor" -eq 3 -a "$kminor" -gt 8; then - echo "WARNING: That kernel version is not officially supported."; + if test "$kmajor" -gt 3 -o "$kmajor" -eq 3 -a "$kminor" -gt 9; then + echo "WARNING: That kernel version is not officially supported yet. Continue at own luck."; elif test "$kmajor" -eq 3 -a "$kminor" -ge 7; then :; else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xtables-addons-2.1/doc/changelog.txt new/xtables-addons-2.2/doc/changelog.txt --- old/xtables-addons-2.1/doc/changelog.txt 2012-12-27 08:01:00.000000000 +0100 +++ new/xtables-addons-2.2/doc/changelog.txt 2013-03-31 21:14:37.000000000 +0200 @@ -3,6 +3,13 @@ ==== +v2.2 (2013-03-31) +================= +Enhancements: +- Support for Linux 3.9 +- iptaccount: fix entire program being erroneously optimized away on PPC + + v2.1 (2012-11-27) ================= Fixes: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xtables-addons-2.1/extensions/ACCOUNT/iptaccount.c new/xtables-addons-2.2/extensions/ACCOUNT/iptaccount.c --- old/xtables-addons-2.1/extensions/ACCOUNT/iptaccount.c 2012-12-27 08:01:00.000000000 +0100 +++ new/xtables-addons-2.2/extensions/ACCOUNT/iptaccount.c 2013-03-31 21:14:37.000000000 +0200 @@ -64,7 +64,7 @@ struct ipt_ACCOUNT_context ctx; struct ipt_acc_handle_ip *entry; int i; - char optchar; + int optchar; bool doHandleUsage = false, doHandleFree = false, doTableNames = false; bool doFlush = false, doContinue = false, doCSV = false; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xtables-addons-2.1/extensions/xt_DELUDE.c new/xtables-addons-2.2/extensions/xt_DELUDE.c --- old/xtables-addons-2.1/extensions/xt_DELUDE.c 2012-12-27 08:01:00.000000000 +0100 +++ new/xtables-addons-2.2/extensions/xt_DELUDE.c 2013-03-31 21:14:37.000000000 +0200 @@ -140,9 +140,11 @@ static unsigned int delude_tg(struct sk_buff **pskb, const struct xt_action_param *par) { - /* WARNING: This code causes reentry within iptables. - This means that the iptables jump stack is now crap. We - must return an absolute verdict. --RR */ + /* + * Sending the reset causes reentrancy within iptables - and should not pose + * a problem, as that is supported since Linux 2.6.35. But since we do not + * actually want to have a connection open, we are still going to drop it. + */ delude_send_reset(*pskb, par->hooknum); return NF_DROP; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xtables-addons-2.1/extensions/xt_DNETMAP.c new/xtables-addons-2.2/extensions/xt_DNETMAP.c --- old/xtables-addons-2.1/extensions/xt_DNETMAP.c 2012-12-27 08:01:00.000000000 +0100 +++ new/xtables-addons-2.2/extensions/xt_DNETMAP.c 2013-03-31 21:14:37.000000000 +0200 @@ -835,7 +835,7 @@ static void __net_exit dnetmap_proc_net_exit(struct net *net) { - proc_net_remove(net, "xt_DNETMAP"); + remove_proc_entry("xt_DNETMAP", net->proc_net); } #else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xtables-addons-2.1/xtables-addons.8.in new/xtables-addons-2.2/xtables-addons.8.in --- old/xtables-addons-2.1/xtables-addons.8.in 2012-12-27 08:01:00.000000000 +0100 +++ new/xtables-addons-2.2/xtables-addons.8.in 2013-03-31 21:14:37.000000000 +0200 @@ -1,4 +1,4 @@ -.TH xtables-addons 8 "v2.1 (2012-11-27)" "" "v2.1 (2012-11-27)" +.TH xtables-addons 8 "Continuous Snow Edition" "" "v2.2 (2013-03-31)" .SH Name Xtables-addons \(em additional extensions for iptables, ip6tables, etc. .SH Targets -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org