summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-Fix-build-errors-with-clang.patch34
-rw-r--r--meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-Fix-potential-string-truncation-in-strncpy.patch139
-rw-r--r--meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-Remove-newline-from-format-line.patch34
-rw-r--r--meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-addrdb-coord-config-parse.y-add-missing-time.h-inclu.patch46
-rw-r--r--meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-coordinator-Fix-strncpy-range-warning.patch32
-rw-r--r--meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-src-iz.c-Undef-dprintf-before-redefining.patch29
-rw-r--r--meta-networking/recipes-support/lowpan-tools/lowpan-tools/no-help2man.patch41
-rw-r--r--meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb38
8 files changed, 0 insertions, 393 deletions
diff --git a/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-Fix-build-errors-with-clang.patch b/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-Fix-build-errors-with-clang.patch
deleted file mode 100644
index 8e906f7ce0..0000000000
--- a/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-Fix-build-errors-with-clang.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1From 5f9e80acb0a1ac399839bf160e43f6120c4b5128 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 18 Oct 2016 23:49:09 +0000
4Subject: [PATCH] Fix build errors with clang
5
6| ../../../../../../../workspace/sources/lowpan-tools/src/coordinator.c:313:50: error: format specifies type 'unsigned char' but the argument has type 'int' [-Werror,-Wformat]
7| fprintf(stderr, "Opt: %c (%hhx)\n", (char)opt, opt);
8| ~~~~ ^~~
9| %x
10| 1 error generated.
11
12Upstream-Status: Pending
13
14Signed-off-by: Khem Raj <raj.khem@gmail.com>
15---
16 src/coordinator.c | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19diff --git a/src/coordinator.c b/src/coordinator.c
20index c139aae..f0de6d2 100644
21--- a/src/coordinator.c
22+++ b/src/coordinator.c
23@@ -310,7 +310,7 @@ int main(int argc, char **argv)
24 #else
25 opt = getopt(argc, argv, "l:f:d:m:n:i:s:p:c:hv");
26 #endif
27- fprintf(stderr, "Opt: %c (%hhx)\n", opt, opt);
28+ fprintf(stderr, "Opt: %c (%hhx)\n", opt, (unsigned char)opt);
29 if (opt == -1)
30 break;
31
32--
331.9.1
34
diff --git a/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-Fix-potential-string-truncation-in-strncpy.patch b/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-Fix-potential-string-truncation-in-strncpy.patch
deleted file mode 100644
index e621d8f2a8..0000000000
--- a/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-Fix-potential-string-truncation-in-strncpy.patch
+++ /dev/null
@@ -1,139 +0,0 @@
1From 58b6d9a2efe101e5b80fd708e6f84c7ca779ce93 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 31 May 2018 20:27:43 -0700
4Subject: [PATCH] Fix potential string truncation in strncpy()
5
6GCC 8 complains about the string truncation during copy
7
8error: 'strncpy' specified bound 16 equals destination size
9
10Upstream-Status: Inappropriate [depricated component]
11
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13---
14 tests/listen-packet.c | 3 ++-
15 tests/listen.c | 3 ++-
16 tests/test2.c | 4 ++--
17 tests/test3.c | 3 ++-
18 tests/test4.c | 3 ++-
19 tests/test5.c | 3 ++-
20 tests/test6.c | 3 ++-
21 tests/test7.c | 3 ++-
22 8 files changed, 16 insertions(+), 9 deletions(-)
23
24diff --git a/tests/listen-packet.c b/tests/listen-packet.c
25index e40af81..eae0c71 100644
26--- a/tests/listen-packet.c
27+++ b/tests/listen-packet.c
28@@ -50,7 +50,8 @@ int main(int argc, char **argv) {
29 return 1;
30 }
31
32- strncpy(req.ifr_name, iface, IF_NAMESIZE);
33+ strncpy(req.ifr_name, iface, IF_NAMESIZE - 1);
34+ req.ifr_name[IF_NAMESIZE - 1] = '\0';
35 ret = ioctl(sd, SIOCGIFINDEX, &req);
36 if (ret < 0)
37 perror("ioctl: SIOCGIFINDEX");
38diff --git a/tests/listen.c b/tests/listen.c
39index 75c320b..5ce1ed9 100644
40--- a/tests/listen.c
41+++ b/tests/listen.c
42@@ -47,7 +47,8 @@ int main(int argc, char **argv) {
43 return 1;
44 }
45
46- strncpy(req.ifr_name, iface, IFNAMSIZ);
47+ strncpy(req.ifr_name, iface, IFNAMSIZ - 1);
48+ req.ifr_name[IF_NAMESIZE - 1] = '\0';
49 ret = ioctl(sd, SIOCGIFHWADDR, &req);
50 if (ret < 0)
51 perror("ioctl: SIOCGIFHWADDR");
52diff --git a/tests/test2.c b/tests/test2.c
53index 58eb74b..5d02838 100644
54--- a/tests/test2.c
55+++ b/tests/test2.c
56@@ -45,8 +45,8 @@ int main(int argc, char **argv) {
57 perror("socket");
58 return 1;
59 }
60-
61- strncpy(req.ifr_name, argv[1] ?: "wpan0", IF_NAMESIZE);
62+ strncpy(req.ifr_name, argv[1] ?: "wpan0", IF_NAMESIZE - 1);
63+ req.ifr_name[IF_NAMESIZE - 1] = '\0';
64 ret = ioctl(sd, SIOCGIFHWADDR, &req);
65 if (ret < 0)
66 perror("ioctl: SIOCGIFHWADDR");
67diff --git a/tests/test3.c b/tests/test3.c
68index fb36627..2f50a5a 100644
69--- a/tests/test3.c
70+++ b/tests/test3.c
71@@ -46,7 +46,8 @@ int main(int argc, char **argv) {
72 return 1;
73 }
74
75- strncpy(req.ifr_name, argv[1] ?: "wpan0", IF_NAMESIZE);
76+ strncpy(req.ifr_name, argv[1] ?: "wpan0", IF_NAMESIZE - 1);
77+ req.ifr_name[IF_NAMESIZE - 1] = '\0';
78 ret = ioctl(sd, SIOCGIFHWADDR, &req);
79 if (ret < 0)
80 perror("ioctl: SIOCGIFHWADDR");
81diff --git a/tests/test4.c b/tests/test4.c
82index 33c274c..8737149 100644
83--- a/tests/test4.c
84+++ b/tests/test4.c
85@@ -46,7 +46,8 @@ int main(int argc, char **argv) {
86 return 1;
87 }
88
89- strncpy(req.ifr_name, argv[1] ?: "wpan0", IF_NAMESIZE);
90+ strncpy(req.ifr_name, argv[1] ?: "wpan0", IF_NAMESIZE - 1);
91+ req.ifr_name[IF_NAMESIZE - 1] = '\0';
92 ret = ioctl(sd, SIOCGIFHWADDR, &req);
93 if (ret < 0)
94 perror("ioctl: SIOCGIFHWADDR");
95diff --git a/tests/test5.c b/tests/test5.c
96index 4439dfa..28db562 100644
97--- a/tests/test5.c
98+++ b/tests/test5.c
99@@ -45,7 +45,8 @@ int main(int argc, char **argv) {
100 return 1;
101 }
102
103- strncpy(req.ifr_name, argv[1] ?: "wpan0", IF_NAMESIZE);
104+ strncpy(req.ifr_name, argv[1] ?: "wpan0", IF_NAMESIZE - 1);
105+ req.ifr_name[IF_NAMESIZE - 1] = '\0';
106 ret = ioctl(sd, SIOCGIFADDR, &req);
107 if (ret < 0) {
108 perror("ioctl: SIOCGIFADDR");
109diff --git a/tests/test6.c b/tests/test6.c
110index e375bfb..ce7de59 100644
111--- a/tests/test6.c
112+++ b/tests/test6.c
113@@ -45,7 +45,8 @@ int main(int argc, char **argv) {
114 return 1;
115 }
116
117- strncpy(req.ifr_name, argv[1] ?: "wpan0", IF_NAMESIZE);
118+ strncpy(req.ifr_name, argv[1] ?: "wpan0", IF_NAMESIZE - 1);
119+ req.ifr_name[IF_NAMESIZE - 1] = '\0';
120 ret = ioctl(sd, SIOCGIFADDR, &req);
121 if (ret < 0) {
122 perror("ioctl: SIOCGIFADDR");
123diff --git a/tests/test7.c b/tests/test7.c
124index e9a5a55..37da22d 100644
125--- a/tests/test7.c
126+++ b/tests/test7.c
127@@ -58,7 +58,8 @@ int main(int argc, char **argv) {
128 if (ret)
129 perror("setsockopt");
130
131- strncpy(req.ifr_name, argv[1] ?: "wpan0", IF_NAMESIZE);
132+ strncpy(req.ifr_name, argv[1] ?: "wpan0", IF_NAMESIZE - 1);
133+ req.ifr_name[IF_NAMESIZE - 1] = '\0';
134 ret = ioctl(sd, SIOCGIFHWADDR, &req);
135 if (ret < 0)
136 perror("ioctl: SIOCGIFHWADDR");
137--
1382.17.1
139
diff --git a/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-Remove-newline-from-format-line.patch b/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-Remove-newline-from-format-line.patch
deleted file mode 100644
index b8fe66f346..0000000000
--- a/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-Remove-newline-from-format-line.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1From a36afac485745cf980fba1809526f2025cb4d101 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 23 Apr 2017 00:16:45 -0700
4Subject: [PATCH] Remove newline from format line
5
6Fixes
7
8error: '__builtin___snprintf_chk' output truncated before the last format character [-Werror=format-truncation=]
9 "%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x\n",
10 ^
11
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13---
14Upstream-Status: Pending
15
16 addrdb/addrdb.c | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19diff --git a/addrdb/addrdb.c b/addrdb/addrdb.c
20index 4bb7f79..05d53f3 100644
21--- a/addrdb/addrdb.c
22+++ b/addrdb/addrdb.c
23@@ -178,7 +178,7 @@ int addrdb_dump_leases(const char *lease_file)
24 continue;
25 }
26 snprintf(hwaddr_buf, sizeof(hwaddr_buf),
27- "%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x\n",
28+ "%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x",
29 lease->hwaddr[0], lease->hwaddr[1],
30 lease->hwaddr[2], lease->hwaddr[3],
31 lease->hwaddr[4], lease->hwaddr[5],
32--
332.12.2
34
diff --git a/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-addrdb-coord-config-parse.y-add-missing-time.h-inclu.patch b/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-addrdb-coord-config-parse.y-add-missing-time.h-inclu.patch
deleted file mode 100644
index 81a3f52d90..0000000000
--- a/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-addrdb-coord-config-parse.y-add-missing-time.h-inclu.patch
+++ /dev/null
@@ -1,46 +0,0 @@
1From ab725a3faaeead90ae3c63cbcd370af087c413a5 Mon Sep 17 00:00:00 2001
2From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
3Date: Mon, 27 Mar 2017 17:55:06 -0700
4Subject: [PATCH] addrdb/coord-config-parse.y: add missing <time.h> include
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9The %union definition uses the time_t structure. In order to use this
10structure, the <time.h> header has to be included. Otherwise, the build
11breaks with some C libraries, such as musl:
12
13In file included from coord-config-lex.l:23:0:
14coord-config-parse.y:107:2: error: unknown type name ‘time_t’
15 time_t timestamp;
16 ^
17
18This patch includes <time.h> using the '%code requires' directive of
19Yacc.
20
21Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
22Signed-off-by: Khem Raj <raj.khem@gmail.com>
23---
24Upstream-Status: Pending
25
26 addrdb/coord-config-parse.y | 4 ++++
27 1 file changed, 4 insertions(+)
28
29diff --git a/addrdb/coord-config-parse.y b/addrdb/coord-config-parse.y
30index 2e10a88..85ee058 100644
31--- a/addrdb/coord-config-parse.y
32+++ b/addrdb/coord-config-parse.y
33@@ -102,6 +102,10 @@
34
35 %}
36
37+%code requires {
38+#include <time.h>
39+}
40+
41 %union {
42 unsigned long number;
43 time_t timestamp;
44--
452.12.1
46
diff --git a/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-coordinator-Fix-strncpy-range-warning.patch b/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-coordinator-Fix-strncpy-range-warning.patch
deleted file mode 100644
index aadfae238d..0000000000
--- a/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-coordinator-Fix-strncpy-range-warning.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From f017353b8f3170ce79e7addc127056c0142f087b Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 1 Apr 2018 14:31:05 -0700
4Subject: [PATCH] coordinator: Fix strncpy range warning
5
6Fixes
7error: 'strncpy' specified bound 4096 equals destination size [-Werror=stringop-truncation]
8
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11Upstream-Status: Pending
12
13 src/coordinator.c | 5 +++--
14 1 file changed, 3 insertions(+), 2 deletions(-)
15
16diff --git a/src/coordinator.c b/src/coordinator.c
17index c139aae..ca49418 100644
18--- a/src/coordinator.c
19+++ b/src/coordinator.c
20@@ -296,7 +296,8 @@ int main(int argc, char **argv)
21 if(!lease_file)
22 lease_file = LEASE_FILE;
23
24- strncpy(pname, argv[0], PATH_MAX);
25+ strncpy(pname, argv[0], PATH_MAX - 1);
26+ pname[PATH_MAX - 1] = '\0';
27
28 pid_file = getenv("PID_FILE");
29 if (!pid_file)
30--
312.16.3
32
diff --git a/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-src-iz.c-Undef-dprintf-before-redefining.patch b/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-src-iz.c-Undef-dprintf-before-redefining.patch
deleted file mode 100644
index fec9b5736d..0000000000
--- a/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-src-iz.c-Undef-dprintf-before-redefining.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From ad088233608ba2205511da4f270f8ba29844b84c Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 8 Apr 2017 09:02:02 -0700
4Subject: [PATCH] src/iz.c: Undef dprintf before redefining
5
6Clang is picky and warns about macros redefinition
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9---
10Upstream-Status: Pending
11
12 src/iz.c | 1 +
13 1 file changed, 1 insertion(+)
14
15diff --git a/src/iz.c b/src/iz.c
16index 32be1a8..886f0a5 100644
17--- a/src/iz.c
18+++ b/src/iz.c
19@@ -60,6 +60,7 @@ static int iz_seq = 0;
20 /* Parsed options */
21 static int iz_debug = 0;
22
23+#undef dprintf
24 #define dprintf(lvl, fmt...) \
25 do { \
26 if (iz_debug >= lvl) \
27--
282.12.2
29
diff --git a/meta-networking/recipes-support/lowpan-tools/lowpan-tools/no-help2man.patch b/meta-networking/recipes-support/lowpan-tools/lowpan-tools/no-help2man.patch
deleted file mode 100644
index 9ecd707b41..0000000000
--- a/meta-networking/recipes-support/lowpan-tools/lowpan-tools/no-help2man.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1Disable building manpages so that make install doesn't fail due to lack of help2man
2
3Upstream-Status: Inappropriate [config]
4
5Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
6
7diff --git a/src/Makefile.am b/src/Makefile.am
8index 46c4017..d6ed312 100644
9--- a/src/Makefile.am
10+++ b/src/Makefile.am
11@@ -9,11 +9,6 @@ izcoordinator_DESC = "simple coordinator for IEEE 802.15.4 network"
12 iz_DESC = "configure an IEEE 802.15.4 interface"
13 izchat_DESC = "simple chat program using IEEE 802.15.4"
14
15-if MANPAGES
16-dist_man_MANS = $(manpages)
17-endif
18-EXTRA_DIST = $(manpages)
19-
20 izattach_SOURCES = serial.c
21
22 iz_SOURCES = iz.c iz-common.c iz-mac.c iz-phy.c
23@@ -27,18 +22,6 @@ izcoordinator_LDADD = ../addrdb/libaddrdb.la $(LDADD) $(NL_LIBS) $(LEXLIB)
24 iz_CFLAGS = $(AM_CFLAGS) $(NL_CFLAGS) -D_GNU_SOURCE
25 iz_LDADD = $(LDADD) $(NL_LIBS)
26
27-izattach.8: $(izattach_SOURCES) $(top_srcdir)/configure.ac
28- -$(HELP2MAN) -o $@ -s 8 -N -n $(izattach_DESC) $(builddir)/izattach
29-
30-izcoordinator.8: $(izcoordinator_SOURCES) $(top_srcdir)/configure.ac
31- -$(HELP2MAN) -o $@ -s 8 -N -n $(izcoordinator_DESC) $(builddir)/izcoordinator
32-
33-iz.8: $(iz_SOURCES) $(top_srcdir)/configure.ac
34- -$(HELP2MAN) -o $@ -s 8 -N -n $(iz_DESC) $(builddir)/iz
35-
36-izchat.1: $(izchat_SOURCES) $(top_srcdir)/configure.ac
37- -$(HELP2MAN) -o $@ -s 1 -N -n $(izchat_DESC) $(builddir)/izchat
38-
39 install-data-hook:
40 $(mkinstalldirs) $(DESTDIR)`dirname $(leasefile)`
41 $(mkinstalldirs) $(DESTDIR)`dirname $(pidfile)`
diff --git a/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb b/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb
deleted file mode 100644
index b442fb9f56..0000000000
--- a/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb
+++ /dev/null
@@ -1,38 +0,0 @@
1SUMMARY = "Utilities for managing the Linux LoWPAN stack"
2DESCRIPTION = "This is a set of utils to manage the Linux LoWPAN stack. \
3The LoWPAN stack aims for IEEE 802.15.4-2003 (and for lesser extent IEEE 802.15.4-2006) compatibility."
4SECTION = "net"
5LICENSE = "GPL-2.0-only"
6LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
7
8DEPENDS = "flex-native bison-native libnl python"
9
10PV = "0.3.1+git"
11SRC_URI = "git://github.com/linux-wpan/lowpan-tools;branch=master;protocol=https \
12 file://no-help2man.patch \
13 file://0001-Fix-build-errors-with-clang.patch \
14 file://0001-addrdb-coord-config-parse.y-add-missing-time.h-inclu.patch \
15 file://0001-src-iz.c-Undef-dprintf-before-redefining.patch \
16 file://0001-Remove-newline-from-format-line.patch \
17 file://0001-coordinator-Fix-strncpy-range-warning.patch \
18 file://0001-Fix-potential-string-truncation-in-strncpy.patch \
19 "
20SRCREV = "1c2d8674cc6f4b1166a066e8822e295c105ae7a2"
21
22
23inherit autotools python3-dir pkgconfig
24
25CACHED_CONFIGUREVARS += "am_cv_python_pythondir=${PYTHON_SITEPACKAGES_DIR}/lowpan-tools"
26
27CFLAGS += "-Wno-initializer-overrides"
28
29do_install:append() {
30 rmdir ${D}${localstatedir}/run
31}
32
33FILES:${PN}-dbg += "${libexecdir}/lowpan-tools/.debug/"
34
35PACKAGES =+ "${PN}-python"
36FILES:${PN}-python = "${libdir}/python*"
37
38SKIP_RECIPE[lowpan-tools] ?= "WARNING these tools are deprecated! Use wpan-tools instead"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-12-03 13:15:33 +0000