Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ipset for openSUSE:Factory checked in at 2025-05-23 14:28:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ipset (Old) and /work/SRC/openSUSE:Factory/.ipset.new.2732 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ipset" Fri May 23 14:28:18 2025 rev:52 rq:1278213 version:7.24 Changes: -------- --- /work/SRC/openSUSE:Factory/ipset/ipset.changes 2024-12-18 20:08:40.513608492 +0100 +++ /work/SRC/openSUSE:Factory/.ipset.new.2732/ipset.changes 2025-05-23 14:28:28.911323928 +0200 @@ -1,0 +2,7 @@ +Sun May 18 04:19:17 UTC 2025 - Jan Engelhardt <jeng...@inai.de> + +- Update to release 7.24 + * JSON output: fix extra quota, extraneous commas and unquoted + port ranges + +------------------------------------------------------------------- Old: ---- ipset-7.23.tar.bz2 New: ---- ipset-7.24.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ipset.spec ++++++ --- /var/tmp/diff_new_pack.PfbQcU/_old 2025-05-23 14:28:29.491348592 +0200 +++ /var/tmp/diff_new_pack.PfbQcU/_new 2025-05-23 14:28:29.491348592 +0200 @@ -1,7 +1,7 @@ # # spec file for package ipset # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,7 +25,7 @@ %define ipset_build_kmp 0 %endif Name: ipset -Version: 7.23 +Version: 7.24 Release: 0 Summary: Netfilter ipset administration utility License: GPL-2.0-only ++++++ _scmsync.obsinfo ++++++ --- /var/tmp/diff_new_pack.PfbQcU/_old 2025-05-23 14:28:29.523349953 +0200 +++ /var/tmp/diff_new_pack.PfbQcU/_new 2025-05-23 14:28:29.527350123 +0200 @@ -1,5 +1,5 @@ -mtime: 1734377449 -commit: ad956f33283bcdf470c977cbd34e6e78cc30ec43df6810b94ae3242e16f22fb6 +mtime: 1747542115 +commit: d8ad35dc05d4f0e17cb6f7494adc6f4952d3f676fb534db90b864b6570277b62 url: https://src.opensuse.org/jengelh/ipset revision: master ++++++ build.specials.obscpio ++++++ ++++++ ipset-7.23.tar.bz2 -> ipset-7.24.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.23/ChangeLog new/ipset-7.24/ChangeLog --- old/ipset-7.23/ChangeLog 2024-12-16 19:12:56.000000000 +0100 +++ new/ipset-7.24/ChangeLog 2025-05-17 15:50:19.000000000 +0200 @@ -1,3 +1,14 @@ +7.24 + - Improve fixing commas in sorted json output + - Fix extra quotes around elements in json output + (bugzilla #1793, issue 3.) + - Fix commas in sorted json output (bugzilla #1793, issue 4) + - Fix unquoted port range in json output (bugzilla #1793, issue 1) + - Fix extraneous comma in terse list json output (Joachim, + bugzilla #1793, issue 2) + - bash-completion: restore fix for syntax error (Jeremy Sowden) + - Correct typo in man-page (Jeremy Sowden) + 7.23 - tests: runtest.sh: Keep running, print summary of failed tests (Phil Sutter) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.23/Makefile.in new/ipset-7.24/Makefile.in --- old/ipset-7.23/Makefile.in 2024-12-16 19:47:21.000000000 +0100 +++ new/ipset-7.24/Makefile.in 2025-05-17 15:52:29.000000000 +0200 @@ -337,6 +337,7 @@ HAVE_LIST_LAST_ENTRY = @HAVE_LIST_LAST_ENTRY@ HAVE_LIST_NEXT_ENTRY = @HAVE_LIST_NEXT_ENTRY@ HAVE_LOCKDEP_NFNL_IS_HELD = @HAVE_LOCKDEP_NFNL_IS_HELD@ +HAVE_LOCKDEP_SET_CLASS = @HAVE_LOCKDEP_SET_CLASS@ HAVE_NETLINK_DUMP_START_ARGS = @HAVE_NETLINK_DUMP_START_ARGS@ HAVE_NETLINK_EXTENDED_ACK = @HAVE_NETLINK_EXTENDED_ACK@ HAVE_NET_IN_NFNL_CALLBACK_FN = @HAVE_NET_IN_NFNL_CALLBACK_FN@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.23/configure new/ipset-7.24/configure --- old/ipset-7.23/configure 2024-12-16 19:47:21.000000000 +0100 +++ new/ipset-7.24/configure 2025-05-17 15:52:29.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for ipset 7.23. +# Generated by GNU Autoconf 2.71 for ipset 7.24. # # Report bugs to <kad...@netfilter.org>. # @@ -625,8 +625,8 @@ # Identity of this package. PACKAGE_NAME='ipset' PACKAGE_TARNAME='ipset' -PACKAGE_VERSION='7.23' -PACKAGE_STRING='ipset 7.23' +PACKAGE_VERSION='7.24' +PACKAGE_STRING='ipset 7.24' PACKAGE_BUGREPORT='kad...@netfilter.org' PACKAGE_URL='' @@ -668,6 +668,7 @@ am__EXEEXT_TRUE LTLIBOBJS LIBOBJS +HAVE_LOCKDEP_SET_CLASS HAVE_RCUPDATE_WAIT_H HAVE_NF_BRIDGE_GET_PYSINDEV_NET HAVE_GFP_KERNEL_ACCOUNT @@ -1485,7 +1486,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 7.23 to adapt to many kinds of systems. +\`configure' configures ipset 7.24 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1556,7 +1557,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ipset 7.23:";; + short | recursive ) echo "Configuration of ipset 7.24:";; esac cat <<\_ACEOF @@ -1696,7 +1697,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ipset configure 7.23 +ipset configure 7.24 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -2023,7 +2024,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 7.23, which was +It was created by ipset $as_me 7.24, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -3371,7 +3372,7 @@ # Define the identity of the package. PACKAGE='ipset' - VERSION='7.23' + VERSION='7.24' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -16809,6 +16810,21 @@ fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking kernel source for lockdep_set_class in lockdep.h" >&5 +printf %s "checking kernel source for lockdep_set_class in lockdep.h... " >&6; } +if test -f $ksourcedir/include/linux/lockdep.h && \ + $GREP -q 'define lockdep_set_class' $ksourcedir/include/linux/lockdep.h; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + HAVE_LOCKDEP_SET_CLASS=define + +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + HAVE_LOCKDEP_SET_CLASS=undef + +fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking kernel source for struct net_generic" >&5 printf %s "checking kernel source for struct net_generic... " >&6; } if test -f $ksourcedir/include/net/netns/generic.h && \ @@ -19454,7 +19470,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 7.23, which was +This file was extended by ipset $as_me 7.24, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -19522,7 +19538,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -ipset config.status 7.23 +ipset config.status 7.24 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.23/configure.ac new/ipset-7.24/configure.ac --- old/ipset-7.23/configure.ac 2024-12-16 19:12:56.000000000 +0100 +++ new/ipset-7.24/configure.ac 2025-05-17 15:50:19.000000000 +0200 @@ -1,5 +1,5 @@ dnl Boilerplate -AC_INIT([ipset],[7.23],[kad...@netfilter.org]) +AC_INIT([ipset],[7.24],[kad...@netfilter.org]) AC_CONFIG_AUX_DIR([build-aux]) AC_CANONICAL_HOST AC_CONFIG_MACRO_DIR([m4]) @@ -909,6 +909,16 @@ AC_SUBST(HAVE_RCUPDATE_WAIT_H, undef) fi +AC_MSG_CHECKING([kernel source for lockdep_set_class in lockdep.h]) +if test -f $ksourcedir/include/linux/lockdep.h && \ + $GREP -q 'define lockdep_set_class' $ksourcedir/include/linux/lockdep.h; then + AC_MSG_RESULT(yes) + AC_SUBST(HAVE_LOCKDEP_SET_CLASS, define) +else + AC_MSG_RESULT(no) + AC_SUBST(HAVE_LOCKDEP_SET_CLASS, undef) +fi + AC_MSG_CHECKING([kernel source for struct net_generic]) if test -f $ksourcedir/include/net/netns/generic.h && \ $GREP -q 'struct net_generic' $ksourcedir/include/net/netns/generic.h; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.23/include/libipset/Makefile.in new/ipset-7.24/include/libipset/Makefile.in --- old/ipset-7.23/include/libipset/Makefile.in 2024-12-16 19:47:21.000000000 +0100 +++ new/ipset-7.24/include/libipset/Makefile.in 2025-05-17 15:52:29.000000000 +0200 @@ -219,6 +219,7 @@ HAVE_LIST_LAST_ENTRY = @HAVE_LIST_LAST_ENTRY@ HAVE_LIST_NEXT_ENTRY = @HAVE_LIST_NEXT_ENTRY@ HAVE_LOCKDEP_NFNL_IS_HELD = @HAVE_LOCKDEP_NFNL_IS_HELD@ +HAVE_LOCKDEP_SET_CLASS = @HAVE_LOCKDEP_SET_CLASS@ HAVE_NETLINK_DUMP_START_ARGS = @HAVE_NETLINK_DUMP_START_ARGS@ HAVE_NETLINK_EXTENDED_ACK = @HAVE_NETLINK_EXTENDED_ACK@ HAVE_NET_IN_NFNL_CALLBACK_FN = @HAVE_NET_IN_NFNL_CALLBACK_FN@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.23/kernel/ChangeLog new/ipset-7.24/kernel/ChangeLog --- old/ipset-7.23/kernel/ChangeLog 2024-12-16 19:12:56.000000000 +0100 +++ new/ipset-7.24/kernel/ChangeLog 2025-05-17 15:50:19.000000000 +0200 @@ -1,3 +1,9 @@ +7.24 + - netfilter: ipset: fix region locking in hash types + - Handle "netfilter: ipset: Fix for recursive locking warning" + patch for backward compatibility + - netfilter: ipset: Fix for recursive locking warning + 7.23 - netfilter: ipset: Hold module reference while requesting a module (Phil Sutter) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.23/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in new/ipset-7.24/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in --- old/ipset-7.23/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in 2024-12-16 19:12:56.000000000 +0100 +++ new/ipset-7.24/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in 2025-05-17 15:50:19.000000000 +0200 @@ -71,6 +71,7 @@ #@HAVE_NLMSG_UNICAST@ HAVE_NLMSG_UNICAST #@HAVE_NF_BRIDGE_GET_PYSINDEV_NET@ HAVE_NF_BRIDGE_GET_PYSINDEV_NET #@HAVE_RCUPDATE_WAIT_H@ HAVE_RCUPDATE_WAIT_H +#@HAVE_LOCKDEP_SET_CLASS@ HAVE_LOCKDEP_SET_CLASS #ifdef HAVE_EXPORT_SYMBOL_GPL_IN_MODULE_H #include <linux/module.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.23/kernel/net/netfilter/ipset/ip_set_hash_gen.h new/ipset-7.24/kernel/net/netfilter/ipset/ip_set_hash_gen.h --- old/ipset-7.23/kernel/net/netfilter/ipset/ip_set_hash_gen.h 2024-12-16 19:12:56.000000000 +0100 +++ new/ipset-7.24/kernel/net/netfilter/ipset/ip_set_hash_gen.h 2025-05-17 15:50:19.000000000 +0200 @@ -67,7 +67,7 @@ #define ahash_sizeof_regions(htable_bits) \ (ahash_numof_locks(htable_bits) * sizeof(struct ip_set_region)) #define ahash_region(n, htable_bits) \ - ((n) % ahash_numof_locks(htable_bits)) + ((n) / jhash_size(HTABLE_REGION_BITS)) #define ahash_bucket_start(h, htable_bits) \ ((htable_bits) < HTABLE_REGION_BITS ? 0 \ : (h) * jhash_size(HTABLE_REGION_BITS)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.23/kernel/net/netfilter/ipset/ip_set_list_set.c new/ipset-7.24/kernel/net/netfilter/ipset/ip_set_list_set.c --- old/ipset-7.23/kernel/net/netfilter/ipset/ip_set_list_set.c 2024-12-16 19:12:56.000000000 +0100 +++ new/ipset-7.24/kernel/net/netfilter/ipset/ip_set_list_set.c 2025-05-17 15:50:19.000000000 +0200 @@ -615,6 +615,10 @@ return true; } +#ifdef HAVE_LOCKDEP_SET_CLASS +static struct lock_class_key list_set_lockdep_key; +#endif + static int list_set_create(struct net *net, struct ip_set *set, struct nlattr *tb[], u32 flags) @@ -631,6 +635,9 @@ if (size < IP_SET_LIST_MIN_SIZE) size = IP_SET_LIST_MIN_SIZE; +#ifdef HAVE_LOCKDEP_SET_CLASS + lockdep_set_class(&set->lock, &list_set_lockdep_key); +#endif set->variant = &set_variant; set->dsize = ip_set_elem_len(set, tb, sizeof(struct set_elem), __alignof__(struct set_elem)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.23/lib/Makefile.in new/ipset-7.24/lib/Makefile.in --- old/ipset-7.23/lib/Makefile.in 2024-12-16 19:47:21.000000000 +0100 +++ new/ipset-7.24/lib/Makefile.in 2025-05-17 15:52:29.000000000 +0200 @@ -345,6 +345,7 @@ HAVE_LIST_LAST_ENTRY = @HAVE_LIST_LAST_ENTRY@ HAVE_LIST_NEXT_ENTRY = @HAVE_LIST_NEXT_ENTRY@ HAVE_LOCKDEP_NFNL_IS_HELD = @HAVE_LOCKDEP_NFNL_IS_HELD@ +HAVE_LOCKDEP_SET_CLASS = @HAVE_LOCKDEP_SET_CLASS@ HAVE_NETLINK_DUMP_START_ARGS = @HAVE_NETLINK_DUMP_START_ARGS@ HAVE_NETLINK_EXTENDED_ACK = @HAVE_NETLINK_EXTENDED_ACK@ HAVE_NET_IN_NFNL_CALLBACK_FN = @HAVE_NET_IN_NFNL_CALLBACK_FN@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.23/lib/print.c new/ipset-7.24/lib/print.c --- old/ipset-7.23/lib/print.c 2024-12-16 19:12:56.000000000 +0100 +++ new/ipset-7.24/lib/print.c 2025-05-17 15:50:19.000000000 +0200 @@ -518,10 +518,12 @@ ipset_print_port(char *buf, unsigned int len, const struct ipset_data *data, enum ipset_opt opt ASSERT_UNUSED, - uint8_t env UNUSED) + uint8_t env) { const uint16_t *port; int size, offset = 0; + const char *quoted = ipset_data_test(data, IPSET_OPT_PORT_TO) && + env & IPSET_ENV_QUOTED ? "\"" : ""; assert(buf); assert(len > 0); @@ -533,14 +535,14 @@ port = ipset_data_get(data, IPSET_OPT_PORT); assert(port); - size = snprintf(buf, len, "%u", *port); + size = snprintf(buf, len, "%s%u", quoted, *port); SNPRINTF_FAILURE(size, len, offset); if (ipset_data_test(data, IPSET_OPT_PORT_TO)) { port = ipset_data_get(data, IPSET_OPT_PORT_TO); size = snprintf(buf + offset, len, - "%s%u", - IPSET_RANGE_SEPARATOR, *port); + "%s%u%s", + IPSET_RANGE_SEPARATOR, *port, quoted); SNPRINTF_FAILURE(size, len, offset); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.23/lib/session.c new/ipset-7.24/lib/session.c --- old/ipset-7.23/lib/session.c 2024-12-16 19:12:56.000000000 +0100 +++ new/ipset-7.24/lib/session.c 2025-05-17 15:50:19.000000000 +0200 @@ -897,7 +897,7 @@ break; case IPSET_LIST_JSON: /* print separator if a member for this set was printed before */ - if (STREQ(ipset_data_setname(data), last_setname)) + if (!session->sort && STREQ(ipset_data_setname(data), last_setname)) safe_snprintf(session, ","); strcpy(last_setname, ipset_data_setname(data)); safe_snprintf(session, "\n {\n \"elem\" : \""); @@ -944,9 +944,14 @@ safe_snprintf(session, ",\n \"%s\" : true", arg->name[0]); break; + } else if (arg->opt == IPSET_OPT_ADT_COMMENT) { + safe_snprintf(session, ",\n \"%s\" : ", arg->name[0]); + safe_dprintf(session, arg->print, arg->opt); + break; } - safe_snprintf(session, ",\n \"%s\" : ", arg->name[0]); + safe_snprintf(session, ",\n \"%s\" : \"", arg->name[0]); safe_dprintf(session, arg->print, arg->opt); + safe_snprintf(session, "\""); break; default: break; @@ -1030,6 +1035,7 @@ type->name, type->revision); break; case IPSET_LIST_JSON: + ipset_envopt_set(session, IPSET_ENV_QUOTED); if (!firstipset) safe_snprintf(session, ",\n"); firstipset = false; @@ -1142,8 +1148,9 @@ safe_snprintf(session, "\n"); safe_snprintf(session, session->envopts & IPSET_ENV_LIST_HEADER ? - " },\n" : + " }\n" : " },\n \"members\" : ["); + ipset_envopt_unset(session, IPSET_ENV_QUOTED); break; default: break; @@ -1247,7 +1254,8 @@ D("called for %s", session->saved_setname[0] == '\0' ? "NONE" : session->saved_setname); if (session->sort) { - struct ipset_sorted *pos; + struct ipset_sorted *pos, *next; + const char *comma = session->mode == IPSET_LIST_JSON ? "," : ""; int ret; /* Print set header */ @@ -1259,9 +1267,15 @@ list_sort(session, &session->sorted, bystrcmp); list_for_each_entry(pos, &session->sorted, list) { + /* In JSON output we must not emit the last comma */ + if (session->mode == IPSET_LIST_JSON) { + next = list_entry(pos->list.next, typeof(*pos), list); + if (&next->list == &session->sorted) + comma = ""; + } ret = session->print_outfn(session, session->p, - "%s", - session->outbuf + pos->offset); + "%s%s", + session->outbuf + pos->offset, comma); if (ret < 0) return MNL_CB_ERROR; } @@ -1285,7 +1299,7 @@ break; if (session->envopts & IPSET_ENV_LIST_HEADER) { if (session->saved_setname[0] != '\0') - safe_snprintf(session, " }"); + safe_snprintf(session, " }"); break; } if (session->saved_setname[0] != '\0') @@ -2286,8 +2300,6 @@ if (session->mode == IPSET_LIST_NONE) session->mode = cmd == IPSET_CMD_LIST ? IPSET_LIST_PLAIN : IPSET_LIST_SAVE; - /* Reset just in case there are multiple modes in a session */ - ipset_envopt_unset(session, IPSET_ENV_QUOTED); switch (session->mode) { case IPSET_LIST_XML: /* Start the root element in XML mode */ @@ -2295,7 +2307,6 @@ break; case IPSET_LIST_JSON: /* Start the root element in json mode */ - ipset_envopt_set(session, IPSET_ENV_QUOTED); safe_snprintf(session, "[\n"); break; default: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.23/src/Makefile.in new/ipset-7.24/src/Makefile.in --- old/ipset-7.23/src/Makefile.in 2024-12-16 19:47:21.000000000 +0100 +++ new/ipset-7.24/src/Makefile.in 2025-05-17 15:52:29.000000000 +0200 @@ -325,6 +325,7 @@ HAVE_LIST_LAST_ENTRY = @HAVE_LIST_LAST_ENTRY@ HAVE_LIST_NEXT_ENTRY = @HAVE_LIST_NEXT_ENTRY@ HAVE_LOCKDEP_NFNL_IS_HELD = @HAVE_LOCKDEP_NFNL_IS_HELD@ +HAVE_LOCKDEP_SET_CLASS = @HAVE_LOCKDEP_SET_CLASS@ HAVE_NETLINK_DUMP_START_ARGS = @HAVE_NETLINK_DUMP_START_ARGS@ HAVE_NETLINK_EXTENDED_ACK = @HAVE_NETLINK_EXTENDED_ACK@ HAVE_NET_IN_NFNL_CALLBACK_FN = @HAVE_NET_IN_NFNL_CALLBACK_FN@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.23/src/ipset.8 new/ipset-7.24/src/ipset.8 --- old/ipset-7.23/src/ipset.8 2024-12-16 19:12:56.000000000 +0100 +++ new/ipset-7.24/src/ipset.8 2025-05-17 15:50:19.000000000 +0200 @@ -925,7 +925,7 @@ Optional \fBcreate\fR options: .TP \fBmarkmask\fR \fIvalue\fR -Allows you to set bits you are interested in the packet mark. This values is then used to perform bitwise AND operation for every mark added. +Allows you to set bits you are interested in the packet mark. This value is then used to perform bitwise AND operation for every mark added. markmask can be any value between 1 and 4294967295, by default all 32 bits are set. .PP The diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.23/utils/Makefile.in new/ipset-7.24/utils/Makefile.in --- old/ipset-7.23/utils/Makefile.in 2024-12-16 19:47:21.000000000 +0100 +++ new/ipset-7.24/utils/Makefile.in 2025-05-17 15:52:29.000000000 +0200 @@ -275,6 +275,7 @@ HAVE_LIST_LAST_ENTRY = @HAVE_LIST_LAST_ENTRY@ HAVE_LIST_NEXT_ENTRY = @HAVE_LIST_NEXT_ENTRY@ HAVE_LOCKDEP_NFNL_IS_HELD = @HAVE_LOCKDEP_NFNL_IS_HELD@ +HAVE_LOCKDEP_SET_CLASS = @HAVE_LOCKDEP_SET_CLASS@ HAVE_NETLINK_DUMP_START_ARGS = @HAVE_NETLINK_DUMP_START_ARGS@ HAVE_NETLINK_EXTENDED_ACK = @HAVE_NETLINK_EXTENDED_ACK@ HAVE_NET_IN_NFNL_CALLBACK_FN = @HAVE_NET_IN_NFNL_CALLBACK_FN@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipset-7.23/utils/ipset_bash_completion/ipset new/ipset-7.24/utils/ipset_bash_completion/ipset --- old/ipset-7.23/utils/ipset_bash_completion/ipset 2024-12-16 19:12:56.000000000 +0100 +++ new/ipset-7.24/utils/ipset_bash_completion/ipset 2025-05-17 15:50:19.000000000 +0200 @@ -362,7 +362,7 @@ while read -r; do REPLY="${REPLY#*: }" printf "%s\n" ${REPLY%%:*} -done < <(PATH=${PATH}:/sbin ( command ip -o link show ) 2>/dev/null) +done < <(( PATH=${PATH}:/sbin command ip -o link show ) 2>/dev/null) } _ipset_get_iplist() {
