Hello community, here is the log from the commit of package xtables-addons for openSUSE:Factory checked in at 2015-10-19 22:54:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xtables-addons (Old) and /work/SRC/openSUSE:Factory/.xtables-addons.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xtables-addons" Changes: -------- --- /work/SRC/openSUSE:Factory/xtables-addons/xtables-addons.changes 2015-08-21 07:41:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xtables-addons.new/xtables-addons.changes 2015-10-20 00:09:07.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Oct 12 14:42:51 UTC 2015 - [email protected] + +- Update to new upstream release 2.9 +* Support for Linux 4.3 + +------------------------------------------------------------------- Old: ---- xtables-addons-2.8.tar.asc xtables-addons-2.8.tar.xz New: ---- xtables-addons-2.9.tar.asc xtables-addons-2.9.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xtables-addons.spec ++++++ --- /var/tmp/diff_new_pack.j1PWfQ/_old 2015-10-20 00:09:08.000000000 +0200 +++ /var/tmp/diff_new_pack.j1PWfQ/_new 2015-10-20 00:09:08.000000000 +0200 @@ -17,7 +17,7 @@ Name: xtables-addons -Version: 2.8 +Version: 2.9 Release: 0 Summary: IP Packet Filter Administration Extensions License: GPL-2.0 and GPL-2.0+ ++++++ xtables-addons-2.8.tar.xz -> xtables-addons-2.9.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xtables-addons-2.8/configure new/xtables-addons-2.9/configure --- old/xtables-addons-2.8/configure 2015-08-19 12:39:07.000000000 +0200 +++ new/xtables-addons-2.9/configure 2015-10-12 16:41:15.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.8. +# Generated by GNU Autoconf 2.69 for xtables-addons 2.9. # # # 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.8' -PACKAGE_STRING='xtables-addons 2.8' +PACKAGE_VERSION='2.9' +PACKAGE_STRING='xtables-addons 2.9' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1325,7 +1325,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.8 to adapt to many kinds of systems. +\`configure' configures xtables-addons 2.9 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1395,7 +1395,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xtables-addons 2.8:";; + short | recursive ) echo "Configuration of xtables-addons 2.9:";; esac cat <<\_ACEOF @@ -1519,7 +1519,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xtables-addons configure 2.8 +xtables-addons configure 2.9 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1884,7 +1884,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.8, which was +It was created by xtables-addons $as_me 2.9, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2750,7 +2750,7 @@ # Define the identity of the package. PACKAGE='xtables-addons' - VERSION='2.8' + VERSION='2.9' cat >>confdefs.h <<_ACEOF @@ -12409,9 +12409,9 @@ echo "WARNING: Version detection did not succeed. Continue at own luck."; else echo "$kmajor.$kminor.$kmicro.$kstable in $kbuilddir"; - if test "$kmajor" -gt 4 -o "$kmajor" -eq 4 -a "$kminor" -gt 1; then + if test "$kmajor" -gt 4 -o "$kmajor" -eq 4 -a "$kminor" -gt 3; then echo "WARNING: That kernel version is not officially supported yet. Continue at own luck."; - elif test "$kmajor" -eq 4 -a "$kminor" -le 1; then + elif test "$kmajor" -eq 4 -a "$kminor" -le 3; then :; elif test "$kmajor" -eq 3 -a "$kminor" -ge 7; then :; @@ -12957,7 +12957,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.8, which was +This file was extended by xtables-addons $as_me 2.9, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13023,7 +13023,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.8 +xtables-addons config.status 2.9 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.8/configure.ac new/xtables-addons-2.9/configure.ac --- old/xtables-addons-2.8/configure.ac 2015-08-19 12:38:49.000000000 +0200 +++ new/xtables-addons-2.9/configure.ac 2015-10-12 16:27:59.000000000 +0200 @@ -1,4 +1,4 @@ -AC_INIT([xtables-addons], [2.8]) +AC_INIT([xtables-addons], [2.9]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([m4]) @@ -63,9 +63,9 @@ echo "WARNING: Version detection did not succeed. Continue at own luck."; else echo "$kmajor.$kminor.$kmicro.$kstable in $kbuilddir"; - if test "$kmajor" -gt 4 -o "$kmajor" -eq 4 -a "$kminor" -gt 1; then + if test "$kmajor" -gt 4 -o "$kmajor" -eq 4 -a "$kminor" -gt 3; then echo "WARNING: That kernel version is not officially supported yet. Continue at own luck."; - elif test "$kmajor" -eq 4 -a "$kminor" -le 1; then + elif test "$kmajor" -eq 4 -a "$kminor" -le 3; then :; elif test "$kmajor" -eq 3 -a "$kminor" -ge 7; then :; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xtables-addons-2.8/doc/changelog.txt new/xtables-addons-2.9/doc/changelog.txt --- old/xtables-addons-2.8/doc/changelog.txt 2015-08-19 12:38:49.000000000 +0200 +++ new/xtables-addons-2.9/doc/changelog.txt 2015-10-12 16:27:59.000000000 +0200 @@ -3,6 +3,12 @@ ==== +v2.9 (2015-10-12) +================= +Enhancements: +- Support for Linux 4.3 + + v2.8 (2015-08-19) ================= Enhancements: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xtables-addons-2.8/extensions/xt_DHCPMAC.c new/xtables-addons-2.9/extensions/xt_DHCPMAC.c --- old/xtables-addons-2.8/extensions/xt_DHCPMAC.c 2015-08-19 12:38:49.000000000 +0200 +++ new/xtables-addons-2.9/extensions/xt_DHCPMAC.c 2015-10-12 16:27:59.000000000 +0200 @@ -34,9 +34,9 @@ unsigned int i; for (i = 0; i < ETH_ALEN && mask > 0; ++i) { - lo_mask = mask % 8; + lo_mask = (mask >= 8) ? 8 : mask; /* FF << 4 >> 4 = 0F */ - lo_mask = ~(uint8_t)0U << lo_mask >> lo_mask; + lo_mask = (uint8_t)(~0U << lo_mask) >> lo_mask; addr[i] &= lo_mask; addr[i] |= op[i] & ~lo_mask; if (mask >= 8) @@ -55,9 +55,9 @@ #define ZMACHEX(s) s[0], s[1], s[2], s[3], s[4], s[5] for (i = 0; i < ETH_ALEN && mask > 0; ++i) { - lo_mask = mask % 8; + lo_mask = (mask >= 8) ? 8 : mask; /* ~(0xFF << 4 >> 4) = ~0x0F = 0xF0 */ - lo_mask = ~(~(uint8_t)0U << lo_mask >> lo_mask); + lo_mask = ~((uint8_t)(~0U << lo_mask) >> lo_mask); if ((lh[i] ^ rh[i]) & lo_mask) return false; if (mask >= 8) @@ -110,13 +110,12 @@ return NF_DROP; for (i = 0; i < sizeof(dh->chaddr); i += 2) - csum_replace2(&udph->check, *(const __be16 *)dh->chaddr, 0); + csum_replace2(&udph->check, *(const __be16 *)(dh->chaddr + i), 0); - memset(dh->chaddr, 0, sizeof(dh->chaddr)); ether_set(dh->chaddr, info->addr, info->mask); for (i = 0; i < sizeof(dh->chaddr); i += 2) - csum_replace2(&udph->check, 0, *(const __be16 *)dh->chaddr); + csum_replace2(&udph->check, 0, *(const __be16 *)(dh->chaddr + i)); return XT_CONTINUE; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xtables-addons-2.8/extensions/xt_condition.c new/xtables-addons-2.9/extensions/xt_condition.c --- old/xtables-addons-2.8/extensions/xt_condition.c 2015-08-19 12:38:49.000000000 +0200 +++ new/xtables-addons-2.9/extensions/xt_condition.c 2015-10-12 16:27:59.000000000 +0200 @@ -66,7 +66,8 @@ { const struct condition_variable *var = m->private; - return seq_printf(m, var->enabled ? "1\n" : "0\n"); + seq_printf(m, var->enabled ? "1\n" : "0\n"); + return 0; } static int condition_proc_open(struct inode *inode, struct file *file) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xtables-addons-2.8/extensions/xt_quota2.c new/xtables-addons-2.9/extensions/xt_quota2.c --- old/xtables-addons-2.8/extensions/xt_quota2.c 2015-08-19 12:38:49.000000000 +0200 +++ new/xtables-addons-2.9/extensions/xt_quota2.c 2015-10-12 16:27:59.000000000 +0200 @@ -67,9 +67,9 @@ int ret; spin_lock_bh(&e->lock); - ret = seq_printf(m, "%llu\n", e->quota); + seq_printf(m, "%llu\n", e->quota); spin_unlock_bh(&e->lock); - return ret; + return 0; } static int quota_proc_open(struct inode *inode, struct file *file) @@ -82,7 +82,7 @@ size_t size, loff_t *loff) { struct xt_quota_counter *e = PDE_DATA(file_inode(file)); - char buf[sizeof("18446744073709551616")]; + char buf[sizeof("+-18446744073709551616")]; if (size > sizeof(buf)) size = sizeof(buf); @@ -92,9 +92,29 @@ if (size < sizeof(buf)) buf[size] = '\0'; - spin_lock_bh(&e->lock); - e->quota = simple_strtoull(buf, NULL, 0); - spin_unlock_bh(&e->lock); + if (*buf == '+') { + int64_t temp = simple_strtoll(buf + 1, NULL, 0); + spin_lock_bh(&e->lock); + /* Do not let quota become negative if @tmp is very negative */ + if (temp > 0 || -temp < e->quota) + e->quota += temp; + else + e->quota = 0; + spin_unlock_bh(&e->lock); + } else if (*buf == '-') { + int64_t temp = simple_strtoll(buf + 1, NULL, 0); + spin_lock_bh(&e->lock); + /* Do not let quota become negative if @tmp is very big */ + if (temp < 0 || temp < e->quota) + e->quota -= temp; + else + e->quota = 0; + spin_unlock_bh(&e->lock); + } else { + spin_lock_bh(&e->lock); + e->quota = simple_strtoull(buf, NULL, 0); + spin_unlock_bh(&e->lock); + } return size; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xtables-addons-2.8/xtables-addons.8.in new/xtables-addons-2.9/xtables-addons.8.in --- old/xtables-addons-2.8/xtables-addons.8.in 2015-08-19 12:38:49.000000000 +0200 +++ new/xtables-addons-2.9/xtables-addons.8.in 2015-10-12 16:27:59.000000000 +0200 @@ -1,4 +1,4 @@ -.TH xtables-addons 8 "" "" "v2.8 (2015-08-19)" +.TH xtables-addons 8 "" "" "v2.9 (2015-10-12)" .SH Name Xtables-addons \(em additional extensions for iptables, ip6tables, etc. .SH Targets
