summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-networking/recipes-filter/ipset/ipset/0001-ipset-Define-portable-basename-function.patch6
-rw-r--r--meta-networking/recipes-filter/ipset/ipset_7.24.bb (renamed from meta-networking/recipes-filter/ipset/ipset_7.22.bb)4
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
19index 162f477..7b5d580 100644 19index 162f477..7b5d580 100644
20--- a/src/ipset.c 20--- a/src/ipset.c
21+++ b/src/ipset.c 21+++ b/src/ipset.c
22@@ -16,6 +16,16 @@ 22@@ -17,6 +17,16 @@
23 #include <libipset/ipset.h> /* ipset library */
24 #include <libipset/xlate.h> /* translate to nftables */ 23 #include <libipset/xlate.h> /* translate to nftables */
24 #include <libgen.h>
25 25
26+/* basename is implemented differently across different C libraries. This 26+/* basename is implemented differently across different C libraries. This
27+ * implementation matches the one provided by the GNU libc, and does not 27+ * implementation matches the one provided by the GNU libc, and does not
@@ -36,7 +36,7 @@ index 162f477..7b5d580 100644
36 int 36 int
37 main(int argc, char *argv[]) 37 main(int argc, char *argv[])
38 { 38 {
39@@ -32,7 +42,7 @@ main(int argc, char *argv[]) 39@@ -33,7 +43,7 @@ main(int argc, char *argv[])
40 exit(1); 40 exit(1);
41 } 41 }
42 42
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"
9 9
10DEPENDS = "libtool libmnl" 10DEPENDS = "libtool libmnl"
11 11
12SRC_URI = "http://ftp.netfilter.org/pub/ipset/${BP}.tar.bz2 \ 12SRC_URI = "https://ipset.netfilter.org/${BP}.tar.bz2 \
13 file://0001-ipset-Define-portable-basename-function.patch" 13 file://0001-ipset-Define-portable-basename-function.patch"
14SRC_URI[sha256sum] = "f6ac5a47c3ef9f4c67fcbdf55e791cbfe38eb0a4aa1baacd12646a140abacdd9" 14SRC_URI[sha256sum] = "fbe3424dff222c1cb5e5c34d38b64524b2217ce80226c14fdcbb13b29ea36112"
15 15
16inherit autotools pkgconfig module-base 16inherit autotools pkgconfig module-base
17 17