ipset: upgrade 7.22 -> 7.24

Changelog:

7.24
Userspace changes
    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)
Kernel part changes
    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
Userspace changes
    tests: runtest.sh: Keep running, print summary of failed tests (Phil Sutter)
    tests: cidr.sh: Fix for quirks in RHEL's ipcalc (Phil Sutter)
    tests: cidr.sh: Respect IPSET_BIN env var (Phil Sutter)
    ipset: Fix implicit declaration of function basename (Mike Pagano)
    tests: Reduce testsuite run-time (Phil Sutter)
    lib: ipset: Avoid 'argv' array overstepping (Phil Sutter)
    lib: data: Fix for global-buffer-overflow warning by ASAN (Phil Sutter)
Kernel part changes
    netfilter: ipset: Hold module reference while requesting a module (Phil Sutter)
    netfilter: ipset: add missing range check in bitmap_ip_uadt (Jeongjun Park)
    netfilter: ipset: Fix suspicious rcu_dereference_protected()
    Replace BUG_ON() with WARN_ON_ONCE() according to usage policy.

Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>

2 files changed, 5 insertions, 5 deletions

diff --git a/meta-networking/recipes-filter/ipset/ipset/0001-ipset-Define-portable-basename-function.patch b/meta-networking/recipes-filter/ipset/ipset/0001-ipset-Define-portable-basename-function.patch
index a06bcac362..bbe0687b26 100644
--- a/meta-networking/recipes-filter/ipset/ipset/0001-ipset-Define-portable-basename-function.patch
+++ b/meta-networking/recipes-filter/ipset/ipset/0001-ipset-Define-portable-basename-function.patch
@@ -19,9 +19,9 @@ diff --git a/src/ipset.c b/src/ipset.c
 index 162f477..7b5d580 100644
 --- a/src/ipset.c
 +++ b/src/ipset.c
-@@ -16,6 +16,16 @@
- #include <libipset/ipset.h>            /* ipset library */
+@@ -17,6 +17,16 @@
  #include <libipset/xlate.h>            /* translate to nftables */
+ #include <libgen.h>
  
 +/* basename is implemented differently across different C libraries. This
 + * implementation matches the one provided by the GNU libc, and does not
@@ -36,7 +36,7 @@ index 162f477..7b5d580 100644
  int
  main(int argc, char *argv[])
  {
-@@ -32,7 +42,7 @@ main(int argc, char *argv[])
+@@ -33,7 +43,7 @@ main(int argc, char *argv[])
                 exit(1);
         }
  
diff --git a/meta-networking/recipes-filter/ipset/ipset_7.22.bb b/meta-networking/recipes-filter/ipset/ipset_7.24.bb
index 5eaf142411..15fffe6b9e 100644
--- a/meta-networking/recipes-filter/ipset/ipset_7.22.bb
+++ b/meta-networking/recipes-filter/ipset/ipset_7.24.bb
@@ -9,9 +9,9 @@ SECTION = "base"
 
 DEPENDS = "libtool libmnl"
 
-SRC_URI = "http://ftp.netfilter.org/pub/ipset/${BP}.tar.bz2 \
+SRC_URI = "https://ipset.netfilter.org/${BP}.tar.bz2 \
            file://0001-ipset-Define-portable-basename-function.patch"
-SRC_URI[sha256sum] = "f6ac5a47c3ef9f4c67fcbdf55e791cbfe38eb0a4aa1baacd12646a140abacdd9"
+SRC_URI[sha256sum] = "fbe3424dff222c1cb5e5c34d38b64524b2217ce80226c14fdcbb13b29ea36112"
 
 inherit autotools pkgconfig module-base