Hello community, here is the log from the commit of package ipset for openSUSE:Factory checked in at 2018-04-17 11:11:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ipset (Old) and /work/SRC/openSUSE:Factory/.ipset.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ipset" Tue Apr 17 11:11:36 2018 rev:30 rq:595384 version:6.38 Changes: -------- --- /work/SRC/openSUSE:Factory/ipset/ipset.changes 2018-03-08 10:41:36.699656549 +0100 +++ /work/SRC/openSUSE:Factory/.ipset.new/ipset.changes 2018-04-17 11:11:39.578893502 +0200 @@ -1,0 +2,6 @@ +Tue Apr 10 20:21:59 UTC 2018 - [email protected] + +- Update to new upstream release 6.38 + * Fix parsing service names for ports. + +------------------------------------------------------------------- Old: ---- ipset-6.36.tar.bz2 New: ---- ipset-6.38.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ipset.spec ++++++ --- /var/tmp/diff_new_pack.5mETks/_old 2018-04-17 11:11:41.094822391 +0200 +++ /var/tmp/diff_new_pack.5mETks/_new 2018-04-17 11:11:41.098822202 +0200 @@ -25,7 +25,7 @@ %define ipset_build_kmp 0 %endif Name: ipset -Version: 6.36 +Version: 6.38 Release: 0 Summary: Netfilter ipset administration utility License: GPL-2.0-only ++++++ ipset-6.36.tar.bz2 -> ipset-6.38.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-6.36/ChangeLog new/ipset-6.38/ChangeLog --- old/ipset-6.36/ChangeLog 2018-03-03 14:04:02.000000000 +0100 +++ new/ipset-6.38/ChangeLog 2018-04-10 23:36:27.000000000 +0200 @@ -1,3 +1,9 @@ +6.38 + - Fix API version number + +6.37 + - Fix parsing service names for ports (reported by Yuri D'Elia) + 6.36 - Use 'ss' in runtest.sh but fall back to deprecated 'net-tools' command (bugzilla id #1209) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-6.36/Make_global.am new/ipset-6.38/Make_global.am --- old/ipset-6.36/Make_global.am 2018-03-03 14:04:02.000000000 +0100 +++ new/ipset-6.38/Make_global.am 2018-04-10 23:36:27.000000000 +0200 @@ -69,7 +69,7 @@ # interface. # curr:rev:age -LIBVERSION = 11:0:0 +LIBVERSION = 12:0:1 AM_CPPFLAGS = $(kinclude_CFLAGS) $(all_includes) -I$(top_srcdir)/include diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-6.36/Makefile.in new/ipset-6.38/Makefile.in --- old/ipset-6.36/Makefile.in 2018-03-03 14:06:46.000000000 +0100 +++ new/ipset-6.38/Makefile.in 2018-04-10 23:37:29.000000000 +0200 @@ -460,7 +460,7 @@ ACLOCAL_AMFLAGS = -I m4 # curr:rev:age -LIBVERSION = 11:0:0 +LIBVERSION = 12:0:1 AM_CPPFLAGS = $(kinclude_CFLAGS) $(all_includes) -I$(top_srcdir)/include AM_CFLAGS = -std=gnu99 $(am__append_1) $(am__append_2) SPARSE = sparse diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-6.36/configure new/ipset-6.38/configure --- old/ipset-6.36/configure 2018-03-03 14:06:45.000000000 +0100 +++ new/ipset-6.38/configure 2018-04-10 23:37:28.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for ipset 6.36. +# Generated by GNU Autoconf 2.69 for ipset 6.38. # # Report bugs to <[email protected]>. # @@ -594,8 +594,8 @@ # Identity of this package. PACKAGE_NAME='ipset' PACKAGE_TARNAME='ipset' -PACKAGE_VERSION='6.36' -PACKAGE_STRING='ipset 6.36' +PACKAGE_VERSION='6.38' +PACKAGE_STRING='ipset 6.38' PACKAGE_BUGREPORT='[email protected]' PACKAGE_URL='' @@ -1415,7 +1415,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 ipset 6.36 to adapt to many kinds of systems. +\`configure' configures ipset 6.38 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1485,7 +1485,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ipset 6.36:";; + short | recursive ) echo "Configuration of ipset 6.38:";; esac cat <<\_ACEOF @@ -1618,7 +1618,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ipset configure 6.36 +ipset configure 6.38 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1996,7 +1996,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ipset $as_me 6.36, which was +It was created by ipset $as_me 6.38, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2933,7 +2933,7 @@ # Define the identity of the package. PACKAGE='ipset' - VERSION='6.36' + VERSION='6.38' cat >>confdefs.h <<_ACEOF @@ -17367,7 +17367,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by ipset $as_me 6.36, which was +This file was extended by ipset $as_me 6.38, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17433,7 +17433,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -ipset config.status 6.36 +ipset config.status 6.38 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/ipset-6.36/configure.ac new/ipset-6.38/configure.ac --- old/ipset-6.36/configure.ac 2018-03-03 14:04:02.000000000 +0100 +++ new/ipset-6.38/configure.ac 2018-04-10 23:36:27.000000000 +0200 @@ -1,5 +1,5 @@ dnl Boilerplate -AC_INIT([ipset], [6.36], [[email protected]]) +AC_INIT([ipset], [6.38], [[email protected]]) AC_CONFIG_AUX_DIR([build-aux]) AC_CANONICAL_HOST AC_CONFIG_MACRO_DIR([m4]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-6.36/include/libipset/session.h new/ipset-6.38/include/libipset/session.h --- old/ipset-6.36/include/libipset/session.h 2018-03-03 14:04:02.000000000 +0100 +++ new/ipset-6.38/include/libipset/session.h 2018-04-10 23:36:27.000000000 +0200 @@ -42,6 +42,7 @@ extern int ipset_session_report(struct ipset_session *session, enum ipset_err_type type, const char *fmt, ...); +extern int ipset_session_warning_as_error(struct ipset_session *session); #define ipset_err(session, fmt, args...) \ ipset_session_report(session, IPSET_ERROR, fmt , ## args) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-6.36/kernel/ChangeLog new/ipset-6.38/kernel/ChangeLog --- old/ipset-6.36/kernel/ChangeLog 2018-03-03 14:04:02.000000000 +0100 +++ new/ipset-6.38/kernel/ChangeLog 2018-04-10 23:36:27.000000000 +0200 @@ -1,3 +1,7 @@ +6.37 + - netfilter: ipset: Use is_zero_ether_addr instead of static and memcmp + (Joe Perches) + 6.36 - Remove duplicate module description - netfilter: remove messages print and boot/module load time diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-6.36/kernel/net/netfilter/ipset/ip_set_hash_mac.c new/ipset-6.38/kernel/net/netfilter/ipset/ip_set_hash_mac.c --- old/ipset-6.36/kernel/net/netfilter/ipset/ip_set_hash_mac.c 2018-03-03 14:04:02.000000000 +0100 +++ new/ipset-6.38/kernel/net/netfilter/ipset/ip_set_hash_mac.c 2018-04-10 23:36:27.000000000 +0200 @@ -72,9 +72,6 @@ #define IP_SET_PROTO_UNDEF #include "ip_set_hash_gen.h" -/* Zero valued element is not supported */ -static const unsigned char invalid_ether[ETH_ALEN] = { 0 }; - static int hash_mac4_kadt(struct ip_set *set, const struct sk_buff *skb, const struct xt_action_param *par, @@ -93,7 +90,7 @@ return -EINVAL; ether_addr_copy(e.ether, eth_hdr(skb)->h_source); - if (memcmp(e.ether, invalid_ether, ETH_ALEN) == 0) + if (is_zero_ether_addr(e.ether)) return -EINVAL; return adtfn(set, &e, &ext, &opt->ext, opt->cmdflags); } @@ -118,7 +115,7 @@ if (ret) return ret; ether_addr_copy(e.ether, nla_data(tb[IPSET_ATTR_ETHER])); - if (memcmp(e.ether, invalid_ether, ETH_ALEN) == 0) + if (is_zero_ether_addr(e.ether)) return -IPSET_ERR_HASH_ELEM; return adtfn(set, &e, &ext, &ext, flags); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-6.36/lib/Makefile.in new/ipset-6.38/lib/Makefile.in --- old/ipset-6.36/lib/Makefile.in 2018-03-03 14:06:46.000000000 +0100 +++ new/ipset-6.38/lib/Makefile.in 2018-04-10 23:37:29.000000000 +0200 @@ -458,7 +458,7 @@ top_srcdir = @top_srcdir@ # curr:rev:age -LIBVERSION = 11:0:0 +LIBVERSION = 12:0:1 AM_CPPFLAGS = $(kinclude_CFLAGS) $(all_includes) -I$(top_srcdir)/include AM_CFLAGS = -std=gnu99 $(am__append_1) $(am__append_2) \ ${libmnl_CFLAGS} $(am__append_3) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-6.36/lib/libipset.map new/ipset-6.38/lib/libipset.map --- old/ipset-6.36/lib/libipset.map 2018-03-03 14:04:02.000000000 +0100 +++ new/ipset-6.38/lib/libipset.map 2018-04-10 23:36:27.000000000 +0200 @@ -168,3 +168,8 @@ global: ipset_keyword; } LIBIPSET_4.5; + +LIBIPSET_4.7 { +global: + ipset_session_warning_as_error; +} LIBIPSET_4.6; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-6.36/lib/parse.c new/ipset-6.38/lib/parse.c --- old/ipset-6.36/lib/parse.c 2018-03-03 14:04:02.000000000 +0100 +++ new/ipset-6.38/lib/parse.c 2018-04-10 23:36:27.000000000 +0200 @@ -292,7 +292,8 @@ error: free(saved); - return syntax_err("cannot parse '%s' as a %s port", str, proto); + return ipset_warn(session, "cannot parse '%s' as a %s port", + str, proto); } /** @@ -313,21 +314,22 @@ const char *proto) { uint16_t port; - int err; assert(session); assert(opt == IPSET_OPT_PORT || opt == IPSET_OPT_PORT_TO); assert(str); - if ((err = string_to_u16(session, str, &port)) == 0 || - (err = parse_portname(session, str, &port, proto)) == 0) - err = ipset_session_data_set(session, opt, &port); - - if (!err) - /* No error, so reset false error messages! */ + if (parse_portname(session, str, &port, proto) == 0) { + return ipset_session_data_set(session, opt, &port); + } + /* Error is stored as warning in session report */ + if (string_to_u16(session, str, &port) == 0) { + /* No error, so reset false error messages */ ipset_session_report_reset(session); - - return err; + return ipset_session_data_set(session, opt, &port); + } + /* Restore warning as error */ + return ipset_session_warning_as_error(session); } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-6.36/lib/session.c new/ipset-6.38/lib/session.c --- old/ipset-6.36/lib/session.c 2018-03-03 14:04:02.000000000 +0100 +++ new/ipset-6.38/lib/session.c 2018-04-10 23:36:27.000000000 +0200 @@ -240,6 +240,21 @@ } /** + * ipset_session_warning_as_error - set warning as error + * @session: session structrure + * + * Returns -1. + */ +int +ipset_session_warning_as_error(struct ipset_session *session) +{ + session->errmsg = session->report; + session->warnmsg = NULL; + ipset_data_reset(ipset_session_data(session)); + return -1; +} + +/** * ipset_session_reset - reset the report buffer * @session: session structure * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-6.36/src/Makefile.in new/ipset-6.38/src/Makefile.in --- old/ipset-6.36/src/Makefile.in 2018-03-03 14:06:46.000000000 +0100 +++ new/ipset-6.38/src/Makefile.in 2018-04-10 23:37:29.000000000 +0200 @@ -449,7 +449,7 @@ top_srcdir = @top_srcdir@ # curr:rev:age -LIBVERSION = 11:0:0 +LIBVERSION = 12:0:1 AM_CPPFLAGS = $(kinclude_CFLAGS) $(all_includes) -I$(top_srcdir)/include AM_CFLAGS = -std=gnu99 $(am__append_1) $(am__append_2) SPARSE = sparse diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-6.36/tests/hash:ip,port.t new/ipset-6.38/tests/hash:ip,port.t --- old/ipset-6.36/tests/hash:ip,port.t 2018-03-03 14:04:02.000000000 +0100 +++ new/ipset-6.38/tests/hash:ip,port.t 2018-04-10 23:36:27.000000000 +0200 @@ -26,6 +26,10 @@ 0 ipset add test 2.0.0.0,5 # Try to add value after second random value 0 ipset add test 2.1.0.1,128 +# Add port by name +0 ipset add test 2.1.0.3,smtp +# Delete port by number +0 ipset del test 2.1.0.3,25 # List set 0 ipset list test | grep -v Revision: | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0 # Check listing diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-6.36/utils/Makefile.in new/ipset-6.38/utils/Makefile.in --- old/ipset-6.36/utils/Makefile.in 2018-03-03 14:06:46.000000000 +0100 +++ new/ipset-6.38/utils/Makefile.in 2018-04-10 23:37:29.000000000 +0200 @@ -397,7 +397,7 @@ top_srcdir = @top_srcdir@ # curr:rev:age -LIBVERSION = 11:0:0 +LIBVERSION = 12:0:1 AM_CPPFLAGS = $(kinclude_CFLAGS) $(all_includes) -I$(top_srcdir)/include AM_CFLAGS = -std=gnu99 $(am__append_1) $(am__append_2) SPARSE = sparse
