From 4cb815189227bb2619d7400420351451868d52c6 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 5 Oct 2021 08:19:05 +0200 Subject: [PATCH] package/ndisc6: bump to version 1.0.5 - Drop patch (already in version) - Update indentation in hash file (two spaces) https://git.remlab.net/gitweb/?p=ndisc6.git;a=blob;f=NEWS;h=e0281e4f98149f25bf6d91fbf790bf8371c9f875;hb=b706f5f01aa82aa0db678fffd15a1527f330c507 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/ndisc6/0001-Fix-musl-build.patch | 34 ------------------------ package/ndisc6/ndisc6.hash | 4 +-- package/ndisc6/ndisc6.mk | 2 +- 3 files changed, 3 insertions(+), 37 deletions(-) delete mode 100644 package/ndisc6/0001-Fix-musl-build.patch diff --git a/package/ndisc6/0001-Fix-musl-build.patch b/package/ndisc6/0001-Fix-musl-build.patch deleted file mode 100644 index 6a13a435c5..0000000000 --- a/package/ndisc6/0001-Fix-musl-build.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 12787f5936c79b56b24ffe0a92f4370804070223 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Thu, 7 Nov 2019 21:41:34 +0100 -Subject: [PATCH] Fix musl build - -Fixes -src/trace-tcp.c:67:24: error: 'TH_SYN' undeclared (first use in this function); did you mean 'TH_CWR'? - packet->th.th_flags = TH_SYN | (ecn ? (TH_ECE | TH_CWR) : 0); - -Musl guards TH_SYN with if defined(_GNU_SOURCE): -https://git.musl-libc.org/cgit/musl/tree/include/netinet/tcp.h#n82 - -Patch sent via email to upstream. - -Signed-off-by: Bernd Kuhls ---- - src/trace-tcp.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/trace-tcp.c b/src/trace-tcp.c -index 5aba9d4..1b367ae 100644 ---- a/src/trace-tcp.c -+++ b/src/trace-tcp.c -@@ -21,7 +21,6 @@ - # include - #endif - --#undef _GNU_SOURCE - #define _DEFAULT_SOURCE 1 - - #include --- -2.20.1 - diff --git a/package/ndisc6/ndisc6.hash b/package/ndisc6/ndisc6.hash index 381667c2cf..d76e831208 100644 --- a/package/ndisc6/ndisc6.hash +++ b/package/ndisc6/ndisc6.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 abb1da4a98d94e5abe1dd7b1c975de540306b0581cbbd36aff035118b2f25c1f ndisc6-1.0.4.tar.bz2 +sha256 36932f9fc47e2844abcda7550fa1343b3af4b4208dfb61e0c9d9224aad5df351 ndisc6-1.0.5.tar.bz2 # Locally computed -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/ndisc6/ndisc6.mk b/package/ndisc6/ndisc6.mk index 9845aa2c9a..ff6439e310 100644 --- a/package/ndisc6/ndisc6.mk +++ b/package/ndisc6/ndisc6.mk @@ -4,7 +4,7 @@ # ################################################################################ -NDISC6_VERSION = 1.0.4 +NDISC6_VERSION = 1.0.5 NDISC6_SOURCE = ndisc6-$(NDISC6_VERSION).tar.bz2 NDISC6_SITE = http://www.remlab.net/files/ndisc6 NDISC6_CONF_ENV = CC="$(TARGET_CC) -std=c11" LIBS=$(TARGET_NLS_LIBS)