Hello community, here is the log from the commit of package nftables for openSUSE:Factory checked in at 2020-06-18 10:36:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nftables (Old) and /work/SRC/openSUSE:Factory/.nftables.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nftables" Thu Jun 18 10:36:08 2020 rev:21 rq:815268 version:0.9.6 Changes: -------- --- /work/SRC/openSUSE:Factory/nftables/nftables.changes 2020-06-11 10:01:31.938548806 +0200 +++ /work/SRC/openSUSE:Factory/.nftables.new.3606/nftables.changes 2020-06-18 10:36:59.150520487 +0200 @@ -1,0 +2,6 @@ +Tue Jun 16 13:37:28 UTC 2020 - Jan Engelhardt <[email protected]> + +- Update to release 0.9.6 + * Fix two ASAN runtime errors + +------------------------------------------------------------------- Old: ---- nftables-0.9.5.tar.bz2 nftables-0.9.5.tar.bz2.sig New: ---- nftables-0.9.6.tar.bz2 nftables-0.9.6.tar.bz2.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nftables.spec ++++++ --- /var/tmp/diff_new_pack.bTr7Bv/_old 2020-06-18 10:37:09.178552890 +0200 +++ /var/tmp/diff_new_pack.bTr7Bv/_new 2020-06-18 10:37:09.182552903 +0200 @@ -17,7 +17,7 @@ Name: nftables -Version: 0.9.5 +Version: 0.9.6 Release: 0 Summary: Userspace utility to access the nf_tables packet filter License: GPL-2.0-only ++++++ nftables-0.9.5.tar.bz2 -> nftables-0.9.6.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nftables-0.9.5/configure new/nftables-0.9.6/configure --- old/nftables-0.9.5/configure 2020-06-06 12:00:31.927430708 +0200 +++ new/nftables-0.9.6/configure 2020-06-15 22:23:48.001452605 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for nftables 0.9.5. +# Generated by GNU Autoconf 2.69 for nftables 0.9.6. # # Report bugs to <[email protected]>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='nftables' PACKAGE_TARNAME='nftables' -PACKAGE_VERSION='0.9.5' -PACKAGE_STRING='nftables 0.9.5' +PACKAGE_VERSION='0.9.6' +PACKAGE_STRING='nftables 0.9.6' PACKAGE_BUGREPORT='[email protected]' PACKAGE_URL='' @@ -1373,7 +1373,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 nftables 0.9.5 to adapt to many kinds of systems. +\`configure' configures nftables 0.9.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1444,7 +1444,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of nftables 0.9.5:";; + short | recursive ) echo "Configuration of nftables 0.9.6:";; esac cat <<\_ACEOF @@ -1585,7 +1585,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -nftables configure 0.9.5 +nftables configure 0.9.6 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1863,7 +1863,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by nftables $as_me 0.9.5, which was +It was created by nftables $as_me 0.9.6, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2212,7 +2212,7 @@ -$as_echo "#define RELEASE_NAME \"Capital Idea\"" >>confdefs.h +$as_echo "#define RELEASE_NAME \"Capital Idea #2\"" >>confdefs.h ac_aux_dir= @@ -2731,7 +2731,7 @@ # Define the identity of the package. PACKAGE='nftables' - VERSION='0.9.5' + VERSION='0.9.6' cat >>confdefs.h <<_ACEOF @@ -14019,7 +14019,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by nftables $as_me 0.9.5, which was +This file was extended by nftables $as_me 0.9.6, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14085,7 +14085,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -nftables config.status 0.9.5 +nftables config.status 0.9.6 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/nftables-0.9.5/configure.ac new/nftables-0.9.6/configure.ac --- old/nftables-0.9.5/configure.ac 2020-06-06 12:00:22.611435558 +0200 +++ new/nftables-0.9.6/configure.ac 2020-06-15 22:23:34.853457902 +0200 @@ -1,5 +1,5 @@ -AC_INIT([nftables], [0.9.5], [[email protected]]) -AC_DEFINE([RELEASE_NAME], ["Capital Idea"], [Release name]) +AC_INIT([nftables], [0.9.6], [[email protected]]) +AC_DEFINE([RELEASE_NAME], ["Capital Idea #2"], [Release name]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nftables-0.9.5/doc/libnftables-json.5 new/nftables-0.9.6/doc/libnftables-json.5 --- old/nftables-0.9.5/doc/libnftables-json.5 2020-06-06 12:00:50.755420843 +0200 +++ new/nftables-0.9.6/doc/libnftables-json.5 2020-06-15 22:24:22.169438902 +0200 @@ -2,12 +2,12 @@ .\" Title: libnftables-json .\" Author: Phil Sutter <[email protected]> .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/> -.\" Date: 06/06/2020 +.\" Date: 06/15/2020 .\" Manual: \ \& .\" Source: \ \& .\" Language: English .\" -.TH "LIBNFTABLES\-JSON" "5" "06/06/2020" "\ \&" "\ \&" +.TH "LIBNFTABLES\-JSON" "5" "06/15/2020" "\ \&" "\ \&" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nftables-0.9.5/doc/libnftables.3 new/nftables-0.9.6/doc/libnftables.3 --- old/nftables-0.9.5/doc/libnftables.3 2020-06-06 12:00:51.563420419 +0200 +++ new/nftables-0.9.6/doc/libnftables.3 2020-06-15 22:24:23.161438505 +0200 @@ -2,12 +2,12 @@ .\" Title: libnftables .\" Author: Phil Sutter <[email protected]> .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/> -.\" Date: 06/06/2020 +.\" Date: 06/15/2020 .\" Manual: \ \& .\" Source: \ \& .\" Language: English .\" -.TH "LIBNFTABLES" "3" "06/06/2020" "\ \&" "\ \&" +.TH "LIBNFTABLES" "3" "06/15/2020" "\ \&" "\ \&" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nftables-0.9.5/doc/nft.8 new/nftables-0.9.6/doc/nft.8 --- old/nftables-0.9.5/doc/nft.8 2020-06-06 12:00:48.343422111 +0200 +++ new/nftables-0.9.6/doc/nft.8 2020-06-15 22:24:19.693439892 +0200 @@ -2,12 +2,12 @@ .\" Title: nft .\" Author: [see the "AUTHORS" section] .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/> -.\" Date: 06/06/2020 +.\" Date: 06/15/2020 .\" Manual: \ \& .\" Source: \ \& .\" Language: English .\" -.TH "NFT" "8" "06/06/2020" "\ \&" "\ \&" +.TH "NFT" "8" "06/15/2020" "\ \&" "\ \&" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nftables-0.9.5/files/Makefile new/nftables-0.9.6/files/Makefile --- old/nftables-0.9.5/files/Makefile 2020-06-06 12:00:39.707426641 +0200 +++ new/nftables-0.9.6/files/Makefile 2020-06-15 22:24:06.097445337 +0200 @@ -183,13 +183,13 @@ done; \ reldir="$$dir2" A2X = a2x -ACLOCAL = ${SHELL} /tmp/tmp.03YkljsJmW/build-aux/missing aclocal-1.16 +ACLOCAL = ${SHELL} /tmp/tmp.U1Z6Nf6fgA/build-aux/missing aclocal-1.16 AMTAR = $${TAR-tar} AM_DEFAULT_VERBOSITY = 0 AR = ar -AUTOCONF = ${SHELL} /tmp/tmp.03YkljsJmW/build-aux/missing autoconf -AUTOHEADER = ${SHELL} /tmp/tmp.03YkljsJmW/build-aux/missing autoheader -AUTOMAKE = ${SHELL} /tmp/tmp.03YkljsJmW/build-aux/missing automake-1.16 +AUTOCONF = ${SHELL} /tmp/tmp.U1Z6Nf6fgA/build-aux/missing autoconf +AUTOHEADER = ${SHELL} /tmp/tmp.U1Z6Nf6fgA/build-aux/missing autoheader +AUTOMAKE = ${SHELL} /tmp/tmp.U1Z6Nf6fgA/build-aux/missing automake-1.16 AWK = gawk CC = gcc CCDEPMODE = depmode=gcc3 @@ -231,7 +231,7 @@ LN_S = ln -s LTLIBOBJS = LT_SYS_LIBRARY_PATH = -MAKEINFO = ${SHELL} /tmp/tmp.03YkljsJmW/build-aux/missing makeinfo +MAKEINFO = ${SHELL} /tmp/tmp.U1Z6Nf6fgA/build-aux/missing makeinfo MANIFEST_TOOL = : MKDIR_P = /bin/mkdir -p NM = /usr/bin/nm -B @@ -243,10 +243,10 @@ PACKAGE = nftables PACKAGE_BUGREPORT = [email protected] PACKAGE_NAME = nftables -PACKAGE_STRING = nftables 0.9.5 +PACKAGE_STRING = nftables 0.9.6 PACKAGE_TARNAME = nftables PACKAGE_URL = -PACKAGE_VERSION = 0.9.5 +PACKAGE_VERSION = 0.9.6 PATH_SEPARATOR = : PKG_CONFIG = /usr/bin/pkg-config PKG_CONFIG_LIBDIR = @@ -257,15 +257,15 @@ SET_MAKE = SHELL = /bin/bash STRIP = strip -VERSION = 0.9.5 +VERSION = 0.9.6 XTABLES_CFLAGS = XTABLES_LIBS = YACC = bison -y YFLAGS = -abs_builddir = /tmp/tmp.03YkljsJmW/files -abs_srcdir = /tmp/tmp.03YkljsJmW/files -abs_top_builddir = /tmp/tmp.03YkljsJmW -abs_top_srcdir = /tmp/tmp.03YkljsJmW +abs_builddir = /tmp/tmp.U1Z6Nf6fgA/files +abs_srcdir = /tmp/tmp.U1Z6Nf6fgA/files +abs_top_builddir = /tmp/tmp.U1Z6Nf6fgA +abs_top_srcdir = /tmp/tmp.U1Z6Nf6fgA ac_ct_AR = ar ac_ct_CC = gcc ac_ct_DUMPBIN = @@ -294,7 +294,7 @@ htmldir = ${docdir} includedir = ${prefix}/include infodir = ${datarootdir}/info -install_sh = ${SHELL} /tmp/tmp.03YkljsJmW/build-aux/install-sh +install_sh = ${SHELL} /tmp/tmp.U1Z6Nf6fgA/build-aux/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec localedir = ${datarootdir}/locale diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nftables-0.9.5/files/examples/Makefile new/nftables-0.9.6/files/examples/Makefile --- old/nftables-0.9.5/files/examples/Makefile 2020-06-06 12:00:39.747426620 +0200 +++ new/nftables-0.9.6/files/examples/Makefile 2020-06-15 22:24:06.197445296 +0200 @@ -154,13 +154,13 @@ am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) A2X = a2x -ACLOCAL = ${SHELL} /tmp/tmp.03YkljsJmW/build-aux/missing aclocal-1.16 +ACLOCAL = ${SHELL} /tmp/tmp.U1Z6Nf6fgA/build-aux/missing aclocal-1.16 AMTAR = $${TAR-tar} AM_DEFAULT_VERBOSITY = 0 AR = ar -AUTOCONF = ${SHELL} /tmp/tmp.03YkljsJmW/build-aux/missing autoconf -AUTOHEADER = ${SHELL} /tmp/tmp.03YkljsJmW/build-aux/missing autoheader -AUTOMAKE = ${SHELL} /tmp/tmp.03YkljsJmW/build-aux/missing automake-1.16 +AUTOCONF = ${SHELL} /tmp/tmp.U1Z6Nf6fgA/build-aux/missing autoconf +AUTOHEADER = ${SHELL} /tmp/tmp.U1Z6Nf6fgA/build-aux/missing autoheader +AUTOMAKE = ${SHELL} /tmp/tmp.U1Z6Nf6fgA/build-aux/missing automake-1.16 AWK = gawk CC = gcc CCDEPMODE = depmode=gcc3 @@ -202,7 +202,7 @@ LN_S = ln -s LTLIBOBJS = LT_SYS_LIBRARY_PATH = -MAKEINFO = ${SHELL} /tmp/tmp.03YkljsJmW/build-aux/missing makeinfo +MAKEINFO = ${SHELL} /tmp/tmp.U1Z6Nf6fgA/build-aux/missing makeinfo MANIFEST_TOOL = : MKDIR_P = /bin/mkdir -p NM = /usr/bin/nm -B @@ -214,10 +214,10 @@ PACKAGE = nftables PACKAGE_BUGREPORT = [email protected] PACKAGE_NAME = nftables -PACKAGE_STRING = nftables 0.9.5 +PACKAGE_STRING = nftables 0.9.6 PACKAGE_TARNAME = nftables PACKAGE_URL = -PACKAGE_VERSION = 0.9.5 +PACKAGE_VERSION = 0.9.6 PATH_SEPARATOR = : PKG_CONFIG = /usr/bin/pkg-config PKG_CONFIG_LIBDIR = @@ -228,15 +228,15 @@ SET_MAKE = SHELL = /bin/bash STRIP = strip -VERSION = 0.9.5 +VERSION = 0.9.6 XTABLES_CFLAGS = XTABLES_LIBS = YACC = bison -y YFLAGS = -abs_builddir = /tmp/tmp.03YkljsJmW/files/examples -abs_srcdir = /tmp/tmp.03YkljsJmW/files/examples -abs_top_builddir = /tmp/tmp.03YkljsJmW -abs_top_srcdir = /tmp/tmp.03YkljsJmW +abs_builddir = /tmp/tmp.U1Z6Nf6fgA/files/examples +abs_srcdir = /tmp/tmp.U1Z6Nf6fgA/files/examples +abs_top_builddir = /tmp/tmp.U1Z6Nf6fgA +abs_top_srcdir = /tmp/tmp.U1Z6Nf6fgA ac_ct_AR = ar ac_ct_CC = gcc ac_ct_DUMPBIN = @@ -265,7 +265,7 @@ htmldir = ${docdir} includedir = ${prefix}/include infodir = ${datarootdir}/info -install_sh = ${SHELL} /tmp/tmp.03YkljsJmW/build-aux/install-sh +install_sh = ${SHELL} /tmp/tmp.U1Z6Nf6fgA/build-aux/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec localedir = ${datarootdir}/locale diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nftables-0.9.5/files/nftables/Makefile new/nftables-0.9.6/files/nftables/Makefile --- old/nftables-0.9.5/files/nftables/Makefile 2020-06-06 12:00:39.787426599 +0200 +++ new/nftables-0.9.6/files/nftables/Makefile 2020-06-15 22:24:06.301445255 +0200 @@ -154,13 +154,13 @@ am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) A2X = a2x -ACLOCAL = ${SHELL} /tmp/tmp.03YkljsJmW/build-aux/missing aclocal-1.16 +ACLOCAL = ${SHELL} /tmp/tmp.U1Z6Nf6fgA/build-aux/missing aclocal-1.16 AMTAR = $${TAR-tar} AM_DEFAULT_VERBOSITY = 0 AR = ar -AUTOCONF = ${SHELL} /tmp/tmp.03YkljsJmW/build-aux/missing autoconf -AUTOHEADER = ${SHELL} /tmp/tmp.03YkljsJmW/build-aux/missing autoheader -AUTOMAKE = ${SHELL} /tmp/tmp.03YkljsJmW/build-aux/missing automake-1.16 +AUTOCONF = ${SHELL} /tmp/tmp.U1Z6Nf6fgA/build-aux/missing autoconf +AUTOHEADER = ${SHELL} /tmp/tmp.U1Z6Nf6fgA/build-aux/missing autoheader +AUTOMAKE = ${SHELL} /tmp/tmp.U1Z6Nf6fgA/build-aux/missing automake-1.16 AWK = gawk CC = gcc CCDEPMODE = depmode=gcc3 @@ -202,7 +202,7 @@ LN_S = ln -s LTLIBOBJS = LT_SYS_LIBRARY_PATH = -MAKEINFO = ${SHELL} /tmp/tmp.03YkljsJmW/build-aux/missing makeinfo +MAKEINFO = ${SHELL} /tmp/tmp.U1Z6Nf6fgA/build-aux/missing makeinfo MANIFEST_TOOL = : MKDIR_P = /bin/mkdir -p NM = /usr/bin/nm -B @@ -214,10 +214,10 @@ PACKAGE = nftables PACKAGE_BUGREPORT = [email protected] PACKAGE_NAME = nftables -PACKAGE_STRING = nftables 0.9.5 +PACKAGE_STRING = nftables 0.9.6 PACKAGE_TARNAME = nftables PACKAGE_URL = -PACKAGE_VERSION = 0.9.5 +PACKAGE_VERSION = 0.9.6 PATH_SEPARATOR = : PKG_CONFIG = /usr/bin/pkg-config PKG_CONFIG_LIBDIR = @@ -228,15 +228,15 @@ SET_MAKE = SHELL = /bin/bash STRIP = strip -VERSION = 0.9.5 +VERSION = 0.9.6 XTABLES_CFLAGS = XTABLES_LIBS = YACC = bison -y YFLAGS = -abs_builddir = /tmp/tmp.03YkljsJmW/files/nftables -abs_srcdir = /tmp/tmp.03YkljsJmW/files/nftables -abs_top_builddir = /tmp/tmp.03YkljsJmW -abs_top_srcdir = /tmp/tmp.03YkljsJmW +abs_builddir = /tmp/tmp.U1Z6Nf6fgA/files/nftables +abs_srcdir = /tmp/tmp.U1Z6Nf6fgA/files/nftables +abs_top_builddir = /tmp/tmp.U1Z6Nf6fgA +abs_top_srcdir = /tmp/tmp.U1Z6Nf6fgA ac_ct_AR = ar ac_ct_CC = gcc ac_ct_DUMPBIN = @@ -265,7 +265,7 @@ htmldir = ${docdir} includedir = ${prefix}/include infodir = ${datarootdir}/info -install_sh = ${SHELL} /tmp/tmp.03YkljsJmW/build-aux/install-sh +install_sh = ${SHELL} /tmp/tmp.U1Z6Nf6fgA/build-aux/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec localedir = ${datarootdir}/locale diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nftables-0.9.5/files/osf/Makefile new/nftables-0.9.6/files/osf/Makefile --- old/nftables-0.9.5/files/osf/Makefile 2020-06-06 12:00:39.831426577 +0200 +++ new/nftables-0.9.6/files/osf/Makefile 2020-06-15 22:24:06.405445212 +0200 @@ -154,13 +154,13 @@ am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) A2X = a2x -ACLOCAL = ${SHELL} /tmp/tmp.03YkljsJmW/build-aux/missing aclocal-1.16 +ACLOCAL = ${SHELL} /tmp/tmp.U1Z6Nf6fgA/build-aux/missing aclocal-1.16 AMTAR = $${TAR-tar} AM_DEFAULT_VERBOSITY = 0 AR = ar -AUTOCONF = ${SHELL} /tmp/tmp.03YkljsJmW/build-aux/missing autoconf -AUTOHEADER = ${SHELL} /tmp/tmp.03YkljsJmW/build-aux/missing autoheader -AUTOMAKE = ${SHELL} /tmp/tmp.03YkljsJmW/build-aux/missing automake-1.16 +AUTOCONF = ${SHELL} /tmp/tmp.U1Z6Nf6fgA/build-aux/missing autoconf +AUTOHEADER = ${SHELL} /tmp/tmp.U1Z6Nf6fgA/build-aux/missing autoheader +AUTOMAKE = ${SHELL} /tmp/tmp.U1Z6Nf6fgA/build-aux/missing automake-1.16 AWK = gawk CC = gcc CCDEPMODE = depmode=gcc3 @@ -202,7 +202,7 @@ LN_S = ln -s LTLIBOBJS = LT_SYS_LIBRARY_PATH = -MAKEINFO = ${SHELL} /tmp/tmp.03YkljsJmW/build-aux/missing makeinfo +MAKEINFO = ${SHELL} /tmp/tmp.U1Z6Nf6fgA/build-aux/missing makeinfo MANIFEST_TOOL = : MKDIR_P = /bin/mkdir -p NM = /usr/bin/nm -B @@ -214,10 +214,10 @@ PACKAGE = nftables PACKAGE_BUGREPORT = [email protected] PACKAGE_NAME = nftables -PACKAGE_STRING = nftables 0.9.5 +PACKAGE_STRING = nftables 0.9.6 PACKAGE_TARNAME = nftables PACKAGE_URL = -PACKAGE_VERSION = 0.9.5 +PACKAGE_VERSION = 0.9.6 PATH_SEPARATOR = : PKG_CONFIG = /usr/bin/pkg-config PKG_CONFIG_LIBDIR = @@ -228,15 +228,15 @@ SET_MAKE = SHELL = /bin/bash STRIP = strip -VERSION = 0.9.5 +VERSION = 0.9.6 XTABLES_CFLAGS = XTABLES_LIBS = YACC = bison -y YFLAGS = -abs_builddir = /tmp/tmp.03YkljsJmW/files/osf -abs_srcdir = /tmp/tmp.03YkljsJmW/files/osf -abs_top_builddir = /tmp/tmp.03YkljsJmW -abs_top_srcdir = /tmp/tmp.03YkljsJmW +abs_builddir = /tmp/tmp.U1Z6Nf6fgA/files/osf +abs_srcdir = /tmp/tmp.U1Z6Nf6fgA/files/osf +abs_top_builddir = /tmp/tmp.U1Z6Nf6fgA +abs_top_srcdir = /tmp/tmp.U1Z6Nf6fgA ac_ct_AR = ar ac_ct_CC = gcc ac_ct_DUMPBIN = @@ -265,7 +265,7 @@ htmldir = ${docdir} includedir = ${prefix}/include infodir = ${datarootdir}/info -install_sh = ${SHELL} /tmp/tmp.03YkljsJmW/build-aux/install-sh +install_sh = ${SHELL} /tmp/tmp.U1Z6Nf6fgA/build-aux/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec localedir = ${datarootdir}/locale diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nftables-0.9.5/src/cmd.c new/nftables-0.9.6/src/cmd.c --- old/nftables-0.9.5/src/cmd.c 2020-06-06 12:00:22.627435550 +0200 +++ new/nftables-0.9.6/src/cmd.c 2020-06-15 22:23:34.961457858 +0200 @@ -6,6 +6,7 @@ #include <iface.h> #include <errno.h> #include <stdlib.h> +#include <cache.h> #include <string.h> static int nft_cmd_enoent_table(struct netlink_ctx *ctx, const struct cmd *cmd, @@ -40,6 +41,40 @@ return 1; } +static int nft_cmd_enoent_rule(struct netlink_ctx *ctx, const struct cmd *cmd, + struct location *loc) +{ + unsigned int flags = NFT_CACHE_TABLE | + NFT_CACHE_CHAIN; + const struct table *table; + struct chain *chain; + + if (cache_update(ctx->nft, flags, ctx->msgs) < 0) + return 0; + + table = table_lookup_fuzzy(&cmd->handle, &ctx->nft->cache); + if (table && strcmp(cmd->handle.table.name, table->handle.table.name)) { + netlink_io_error(ctx, loc, "%s; did you mean table ‘%s’ in family %s?", + strerror(ENOENT), table->handle.table.name, + family2str(table->handle.family)); + return 1; + } else if (!table) { + return 0; + } + + chain = chain_lookup_fuzzy(&cmd->handle, &ctx->nft->cache, &table); + if (chain && strcmp(cmd->handle.chain.name, chain->handle.chain.name)) { + netlink_io_error(ctx, loc, "%s; did you mean chain ‘%s’ in table %s ‘%s’?", + strerror(ENOENT), + chain->handle.chain.name, + family2str(table->handle.family), + table->handle.table.name); + return 1; + } + + return 0; +} + static int nft_cmd_enoent_set(struct netlink_ctx *ctx, const struct cmd *cmd, struct location *loc) { @@ -109,6 +144,9 @@ case CMD_OBJ_SET: ret = nft_cmd_enoent_set(ctx, cmd, loc); break; + case CMD_OBJ_RULE: + ret = nft_cmd_enoent_rule(ctx, cmd, loc); + break; case CMD_OBJ_COUNTER: case CMD_OBJ_QUOTA: case CMD_OBJ_CT_HELPER: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nftables-0.9.5/src/evaluate.c new/nftables-0.9.6/src/evaluate.c --- old/nftables-0.9.5/src/evaluate.c 2020-06-06 12:00:22.627435550 +0200 +++ new/nftables-0.9.6/src/evaluate.c 2020-06-15 22:23:34.969457855 +0200 @@ -80,6 +80,7 @@ static struct expr *implicit_set_declaration(struct eval_ctx *ctx, const char *name, struct expr *key, + struct expr *data, struct expr *expr) { struct cmd *cmd; @@ -93,6 +94,7 @@ set->flags = NFT_SET_ANONYMOUS | expr->set_flags; set->handle.set.name = xstrdup(name); set->key = key; + set->data = data; set->init = expr; set->automerge = set->flags & NFT_SET_INTERVAL; @@ -1411,7 +1413,7 @@ struct expr_ctx ectx = ctx->ectx; struct expr *map = *expr, *mappings; const struct datatype *dtype; - struct expr *key; + struct expr *key, *data; expr_set_context(&ctx->ectx, NULL, 0); if (expr_evaluate(ctx, &map->map) < 0) @@ -1430,15 +1432,14 @@ ctx->ectx.byteorder, ctx->ectx.len, NULL); + dtype = set_datatype_alloc(ectx.dtype, ectx.byteorder); + data = constant_expr_alloc(&netlink_location, dtype, + dtype->byteorder, ectx.len, NULL); + mappings = implicit_set_declaration(ctx, "__map%d", - key, + key, data, mappings); - dtype = set_datatype_alloc(ectx.dtype, ectx.byteorder); - - mappings->set->data = constant_expr_alloc(&netlink_location, - dtype, dtype->byteorder, - ectx.len, NULL); if (ectx.len && mappings->set->data->len != ectx.len) BUG("%d vs %d\n", mappings->set->data->len, ectx.len); @@ -1898,7 +1899,8 @@ case EXPR_SET: right = rel->right = implicit_set_declaration(ctx, "__set%d", - expr_get(left), right); + expr_get(left), NULL, + right); /* fall through */ case EXPR_SET_REF: /* Data for range lookups needs to be in big endian order */ @@ -2389,7 +2391,7 @@ set->set_flags |= NFT_SET_TIMEOUT; setref = implicit_set_declaration(ctx, stmt->meter.name, - expr_get(key), set); + expr_get(key), NULL, set); setref->set->desc.size = stmt->meter.size; stmt->meter.set = setref; @@ -3318,7 +3320,7 @@ ctx->ectx.len, NULL); mappings = implicit_set_declaration(ctx, "__objmap%d", - key, mappings); + key, NULL, mappings); mappings->set->objtype = stmt->objref.type; map->mappings = mappings; @@ -3530,11 +3532,6 @@ return set_key_data_error(ctx, set, set->data->dtype, type); } else if (set_is_objmap(set->flags)) { - if (set->data) { - assert(set->data->etype == EXPR_VALUE); - assert(set->data->dtype == &string_type); - } - assert(set->data == NULL); set->data = constant_expr_alloc(&netlink_location, &string_type, BYTEORDER_HOST_ENDIAN, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nftables-0.9.5/src/main.c new/nftables-0.9.6/src/main.c --- old/nftables-0.9.5/src/main.c 2020-06-06 12:00:22.631435548 +0200 +++ new/nftables-0.9.6/src/main.c 2020-06-15 22:23:34.997457844 +0200 @@ -169,6 +169,8 @@ static void show_help(const char *name) { + size_t i; + printf("Usage: %s [ options ] [ cmds... ]\n" "\n" "Options:\n", name); @@ -185,7 +187,7 @@ fputs("\n", stdout); - for (size_t i = IDX_INTERACTIVE + 1; i < NR_NFT_OPTIONS; ++i) + for (i = IDX_INTERACTIVE + 1; i < NR_NFT_OPTIONS; ++i) print_option(&nft_options[i]); fputs("\n", stdout); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nftables-0.9.5/src/meta.c new/nftables-0.9.6/src/meta.c --- old/nftables-0.9.5/src/meta.c 2020-06-06 12:00:22.631435548 +0200 +++ new/nftables-0.9.6/src/meta.c 2020-06-15 22:23:35.001457843 +0200 @@ -73,7 +73,7 @@ else if (strcmp(sym->identifier, "none") == 0) handle = TC_H_UNSPEC; else if (strchr(sym->identifier, ':')) { - uint16_t tmp; + uint32_t tmp; char *colon; str = xstrdup(sym->identifier); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nftables-0.9.5/src/netlink_delinearize.c new/nftables-0.9.6/src/netlink_delinearize.c --- old/nftables-0.9.5/src/netlink_delinearize.c 2020-06-06 12:00:22.631435548 +0200 +++ new/nftables-0.9.6/src/netlink_delinearize.c 2020-06-15 22:23:35.009457839 +0200 @@ -1682,13 +1682,19 @@ const struct nftnl_expr *nle) { struct netlink_parse_ctx ctx, *pctx = &ctx; + struct handle h = {}; - pctx->rule = rule_alloc(&netlink_location, &set->handle); + handle_merge(&h, &set->handle); + pctx->rule = rule_alloc(&netlink_location, &h); pctx->table = table_lookup(&set->handle, cache); assert(pctx->table != NULL); if (netlink_parse_expr(nle, pctx) < 0) return NULL; + + init_list_head(&pctx->rule->stmts); + rule_free(pctx->rule); + return pctx->stmt; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nftables-0.9.5/src/segtree.c new/nftables-0.9.6/src/segtree.c --- old/nftables-0.9.5/src/segtree.c 2020-06-06 12:00:22.635435547 +0200 +++ new/nftables-0.9.6/src/segtree.c 2020-06-15 22:23:35.029457831 +0200 @@ -383,8 +383,8 @@ static int set_overlap(struct list_head *msgs, const struct set *set, struct expr *init, unsigned int keylen, bool add) { - struct elementary_interval *new_intervals[init->size]; - struct elementary_interval *intervals[set->init->size]; + struct elementary_interval *new_intervals[init->size + 1]; + struct elementary_interval *intervals[set->init->size + 1]; unsigned int n, m, i, j; int ret = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nftables-0.9.5/tests/shell/testcases/maps/0009vmap_0 new/nftables-0.9.6/tests/shell/testcases/maps/0009vmap_0 --- old/nftables-0.9.5/tests/shell/testcases/maps/0009vmap_0 1970-01-01 01:00:00.000000000 +0100 +++ new/nftables-0.9.6/tests/shell/testcases/maps/0009vmap_0 2020-06-15 22:23:35.381457689 +0200 @@ -0,0 +1,19 @@ +#!/bin/bash + +set -e + +EXPECTED="table inet filter { + chain ssh_input { + } + + chain wan_input { + tcp dport vmap { 22 : jump ssh_input } + } + + chain prerouting { + type filter hook prerouting priority -300; policy accept; + iif vmap { "lo" : jump wan_input } + } +}" + +$NFT -f - <<< "$EXPECTED" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nftables-0.9.5/tests/shell/testcases/maps/dumps/0009vmap_0.nft new/nftables-0.9.6/tests/shell/testcases/maps/dumps/0009vmap_0.nft --- old/nftables-0.9.5/tests/shell/testcases/maps/dumps/0009vmap_0.nft 1970-01-01 01:00:00.000000000 +0100 +++ new/nftables-0.9.6/tests/shell/testcases/maps/dumps/0009vmap_0.nft 2020-06-15 22:23:35.385457688 +0200 @@ -0,0 +1,13 @@ +table inet filter { + chain ssh_input { + } + + chain wan_input { + tcp dport vmap { 22 : jump ssh_input } + } + + chain prerouting { + type filter hook prerouting priority raw; policy accept; + iif vmap { "lo" : jump wan_input } + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nftables-0.9.5/tests/shell/testcases/sets/0048set_counters_0 new/nftables-0.9.6/tests/shell/testcases/sets/0048set_counters_0 --- old/nftables-0.9.5/tests/shell/testcases/sets/0048set_counters_0 1970-01-01 01:00:00.000000000 +0100 +++ new/nftables-0.9.6/tests/shell/testcases/sets/0048set_counters_0 2020-06-15 22:23:35.469457653 +0200 @@ -0,0 +1,18 @@ +#!/bin/bash + +set -e + +EXPECTED="table ip x { + set y { + typeof ip saddr + counter + elements = { 192.168.10.35, 192.168.10.101, 192.168.10.135 } + } + + chain z { + type filter hook output priority filter; policy accept; + ip daddr @y + } +}" + +$NFT -f - <<< "$EXPECTED" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nftables-0.9.5/tests/shell/testcases/sets/dumps/0048set_counters_0.nft new/nftables-0.9.6/tests/shell/testcases/sets/dumps/0048set_counters_0.nft --- old/nftables-0.9.5/tests/shell/testcases/sets/dumps/0048set_counters_0.nft 1970-01-01 01:00:00.000000000 +0100 +++ new/nftables-0.9.6/tests/shell/testcases/sets/dumps/0048set_counters_0.nft 2020-06-15 22:23:35.481457649 +0200 @@ -0,0 +1,13 @@ +table ip x { + set y { + typeof ip saddr + counter + elements = { 192.168.10.35 counter packets 0 bytes 0, 192.168.10.101 counter packets 0 bytes 0, + 192.168.10.135 counter packets 0 bytes 0 } + } + + chain z { + type filter hook output priority filter; policy accept; + ip daddr @y + } +}
