diff options
Diffstat (limited to 'import-layers/meta-openembedded/meta-networking/recipes-support')
64 files changed, 735 insertions, 751 deletions
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/0001-build-error-out-correctly-if-a-submake-fails.patch b/import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/0001-build-error-out-correctly-if-a-submake-fails.patch deleted file mode 100644 index c6897b4e7..000000000 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/0001-build-error-out-correctly-if-a-submake-fails.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 5e102b453e254d16af1f95053134f58348e0f83a Mon Sep 17 00:00:00 2001 -From: root <git@andred.net> -Date: Wed, 20 Jul 2016 23:40:30 +0100 -Subject: [PATCH 1/5] build: error out correctly if a submake fails -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Due to use of a for loop, return status from submake was always -ignored. - -In the context of build-systems like OE this causes them to not -detect any errors and continue happily, resulting in a successful, -but incomplete, build. - -Fix by having a nicer Makefile.in which now has rules for the -individual targets (directories) so that make itself can -figure out all the dependencies and build those targets as -needed rather than using a for loop to iterate over the -directories in a shell and thus loosing the return status of -the command inside the loop. - -This has the added advantage that parallel builds work now. - -Upstream-Status: Pending - -Signed-off-by: André Draszik <git@andred.net> ---- - Makefile.in | 18 ++++++++++++------ - 1 file changed, 12 insertions(+), 6 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 6028513..dab88bb 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -13,11 +13,11 @@ distdir = $(PACKAGE)-$(VERSION) - - SUBDIRS=libbridge brctl doc - --all: -- for x in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$x ; done -+all: override ACTION= -+all: $(SUBDIRS) - --clean: -- for x in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$x clean ; done -+clean: override ACTION=clean -+clean: $(SUBDIRS) - - distclean: clean - rm -f config.log -@@ -30,6 +30,12 @@ maintainer-clean: distclean - rm -f libbridge/Makefile - rm -f doc/Makefile - --install: -- for x in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$x install; done -+install: override ACTION=install -+install: $(SUBDIRS) - -+ -+brctl: libbridge -+$(SUBDIRS): -+ $(MAKE) $(MFLAGS) -C $@ $(ACTION) -+ -+.PHONY: $(SUBDIRS) --- -2.8.1 - diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/0002-libbridge-fix-some-build-time-warnings-fcntl.h.patch b/import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/0002-libbridge-fix-some-build-time-warnings-fcntl.h.patch deleted file mode 100644 index 25d08ab95..000000000 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/0002-libbridge-fix-some-build-time-warnings-fcntl.h.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 68fafc4ea10365ac2e74ab7c660d097696857677 Mon Sep 17 00:00:00 2001 -From: root <git@andred.net> -Date: Wed, 20 Jul 2016 23:40:32 +0100 -Subject: [PATCH 2/5] libbridge: fix some build-time warnings (fcntl.h) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -There are build-time warnings at the moment when building -against musl, as the code here #include's the wrong file, -sys/fcntl.h instead of fcntl.h - -In file included from libbridge_devif.c:26:0: -<sysroot>/usr/include/sys/fcntl.h:1:2: warning: #warning redirecting incorrect #include <sys/fcntl.h> to <fcntl.h> [-Wcpp] - #warning redirecting incorrect #include <sys/fcntl.h> to <fcntl.h> - ^~~~~~~ -In file included from libbridge_if.c:23:0: -<sysroot>/usr/include/sys/fcntl.h:1:2: warning: #warning redirecting incorrect #include <sys/fcntl.h> to <fcntl.h> [-Wcpp] - #warning redirecting incorrect #include <sys/fcntl.h> to <fcntl.h> - ^~~~~~~ - -glibc headers silently redirect sys/fcntl.h to fcntl.h so the -issue is not seen there. - -Let's fix the #include's to so as to use the correct ones -and silence the compiler. - -Upstream-Status: Pending - -Signed-off-by: André Draszik <git@andred.net> ---- - libbridge/libbridge_devif.c | 2 +- - libbridge/libbridge_if.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libbridge/libbridge_devif.c b/libbridge/libbridge_devif.c -index 1e83925..2cf78f6 100644 ---- a/libbridge/libbridge_devif.c -+++ b/libbridge/libbridge_devif.c -@@ -23,7 +23,7 @@ - #include <errno.h> - #include <string.h> - #include <dirent.h> --#include <sys/fcntl.h> -+#include <fcntl.h> - - #include "libbridge.h" - #include "libbridge_private.h" -diff --git a/libbridge/libbridge_if.c b/libbridge/libbridge_if.c -index 77d3f8a..9cf4bac 100644 ---- a/libbridge/libbridge_if.c -+++ b/libbridge/libbridge_if.c -@@ -20,7 +20,7 @@ - #include <stdlib.h> - #include <errno.h> - #include <string.h> --#include <sys/fcntl.h> -+#include <fcntl.h> - #include <sys/ioctl.h> - - #include "libbridge.h" --- -2.8.1 - diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/0003-bridge-fix-some-build-time-warnings-errno.h.patch b/import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/0003-bridge-fix-some-build-time-warnings-errno.h.patch deleted file mode 100644 index 72f2a6292..000000000 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/0003-bridge-fix-some-build-time-warnings-errno.h.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 2b9dc245f93ab27d7da42a16ddbb9212888006e4 Mon Sep 17 00:00:00 2001 -From: root <git@andred.net> -Date: Wed, 20 Jul 2016 23:40:33 +0100 -Subject: [PATCH 3/5] bridge: fix some build-time warnings (errno.h) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -There is a build-time warning at the moment when building -against musl, as the code here #include's the wrong file, -sys/errno.h instead of errno.h - -In file included from brctl.c:22:0: -<sysroot>/usr/include/sys/errno.h:1:2: warning: #warning redirecting incorrect #include <sys/errno.h> to <errno.h> [-Wcpp] - #warning redirecting incorrect #include <sys/errno.h> to <errno.h> - ^~~~~~~ - -glibc headers silently redirect sys/errno.h to errno.h so the -issue is not seen there. - -Let's fix the #include's to so as to use the correct ones -and silence the compiler. - -Upstream-Status: Pending - -Signed-off-by: André Draszik <git@andred.net> ---- - brctl/brctl.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/brctl/brctl.c b/brctl/brctl.c -index 46ca352..8855234 100644 ---- a/brctl/brctl.c -+++ b/brctl/brctl.c -@@ -19,7 +19,7 @@ - #include <stdio.h> - #include <stdlib.h> - #include <string.h> --#include <sys/errno.h> -+#include <errno.h> - #include <getopt.h> - - #include "libbridge.h" --- -2.8.1 - diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/0004-libbridge-add-missing-include-s-fix-build-against-mu.patch b/import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/0004-libbridge-add-missing-include-s-fix-build-against-mu.patch deleted file mode 100644 index 565186e0f..000000000 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/0004-libbridge-add-missing-include-s-fix-build-against-mu.patch +++ /dev/null @@ -1,47 +0,0 @@ -From c45b73829a8b8c7924df528baa7e16498f917288 Mon Sep 17 00:00:00 2001 -From: root <git@andred.net> -Date: Wed, 20 Jul 2016 23:40:33 +0100 -Subject: [PATCH 4/5] libbridge: add missing #include's (fix build against - musl) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes error like: - -In file included from libbridge_devif.c:28:0: -libbridge.h:45:17: error: field 'max_age' has incomplete type - struct timeval max_age; - ^~~~~~~ -In file included from libbridge_devif.c:28:0: -libbridge.h:51:2: error: unknown type name 'u_int16_t' - u_int16_t root_port; - ^~~~~~~~~ - -These types are not standard C but rather Posix, -for struct timeval see: -http://pubs.opengroup.org/onlinepubs/7908799/xsh/systime.h.html - -Upstream-Status: Pending - -Signed-off-by: André Draszik <git@andred.net> ---- - libbridge/libbridge.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/libbridge/libbridge.h b/libbridge/libbridge.h -index 53ec869..b0727c1 100644 ---- a/libbridge/libbridge.h -+++ b/libbridge/libbridge.h -@@ -20,6 +20,8 @@ - #define _LIBBRIDGE_H - - #include <sys/socket.h> -+#include <sys/time.h> -+#include <sys/types.h> - #include <linux/in6.h> - #include <linux/if.h> - #include <linux/if_bridge.h> --- -2.8.1 - diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/0005-build-don-t-ignore-CFLAGS-from-environment.patch b/import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/0005-build-don-t-ignore-CFLAGS-from-environment.patch index 9f2155e9b..0a72c6b2c 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/0005-build-don-t-ignore-CFLAGS-from-environment.patch +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/0005-build-don-t-ignore-CFLAGS-from-environment.patch @@ -1,7 +1,7 @@ -From 7bc1932cabfafca8c68e18bd43e3d203c70d2dd8 Mon Sep 17 00:00:00 2001 -From: root <git@andred.net> -Date: Wed, 20 Jul 2016 23:40:33 +0100 -Subject: [PATCH 5/5] build: don't ignore CFLAGS from environment +From 9d63838d12c772dfe33371e2bb8b8191625539f2 Mon Sep 17 00:00:00 2001 +From: Joe MacDonald <joe_macdonald@mentor.com> +Date: Mon, 30 Oct 2017 13:37:48 -0400 +Subject: [PATCH] build: don't ignore CFLAGS from environment MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -17,10 +17,10 @@ used during compilation must also always be used during linking! Upstream-Status: Pending Signed-off-by: André Draszik <git@andred.net> +Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> --- - brctl/Makefile.in | 2 +- - libbridge/Makefile.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) + brctl/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/brctl/Makefile.in b/brctl/Makefile.in index e1956d6..eff260c 100644 @@ -35,19 +35,6 @@ index e1956d6..eff260c 100644 %.o: %.c brctl.h $(CC) $(CFLAGS) $(INCLUDE) -c $< -diff --git a/libbridge/Makefile.in b/libbridge/Makefile.in -index 20512c4..4e1cddc 100644 ---- a/libbridge/Makefile.in -+++ b/libbridge/Makefile.in -@@ -5,7 +5,7 @@ AR=ar - RANLIB=@RANLIB@ - - CC=@CC@ --CFLAGS = -Wall -g $(KERNEL_HEADERS) -+CFLAGS = -Wall -g $(KERNEL_HEADERS) @CFLAGS@ - - prefix=@prefix@ - exec_prefix=@exec_prefix@ -- -2.8.1 +2.7.4 diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/0006-libbridge-Modifying-the-AR-to-cross-toolchain.patch b/import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/0006-libbridge-Modifying-the-AR-to-cross-toolchain.patch new file mode 100644 index 000000000..3f65761f5 --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/0006-libbridge-Modifying-the-AR-to-cross-toolchain.patch @@ -0,0 +1,51 @@ +From c924f66743c054d7ebafef90ca1bbebc96732357 Mon Sep 17 00:00:00 2001 +From: Joe MacDonald <joe_macdonald@mentor.com> +Date: Mon, 30 Oct 2017 13:48:33 -0400 +Subject: [PATCH] libbridge: Modifying the AR to cross toolchain +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The Makefile uses the host “ar” tool when it should be using the ar from +the target toolchain. + +Upstream-Status: Pending + +Signed-off-by: Li Zhou <li.zhou@windriver.com> +Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> +--- + configure.ac | 1 + + libbridge/Makefile.in | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 8b2e2ea..8426b7c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -12,6 +12,10 @@ dnl Checks for programs. + AC_PROG_CC + AC_PROG_INSTALL + AC_PROG_RANLIB ++AN_MAKEVAR([AR], [AC_PROG_AR]) ++AN_PROGRAM([ar], [AC_PROG_AR]) ++AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL(AR, ar, :)]) ++AC_PROG_AR + + dnl Checks for header files. + AC_HEADER_STDC +diff --git a/libbridge/Makefile.in b/libbridge/Makefile.in +index 7932bfe..bd55e9b 100644 +--- a/libbridge/Makefile.in ++++ b/libbridge/Makefile.in +@@ -1,7 +1,7 @@ + + KERNEL_HEADERS=-I@KERNEL_HEADERS@ + +-AR=ar ++AR=@AR@ + RANLIB=@RANLIB@ + + CC=@CC@ +-- +2.7.4 + diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/bridge-utils-1.5-check-error-returns-from-write-to-sysfs.patch b/import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/bridge-utils-1.5-check-error-returns-from-write-to-sysfs.patch deleted file mode 100644 index d00af9c15..000000000 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/bridge-utils-1.5-check-error-returns-from-write-to-sysfs.patch +++ /dev/null @@ -1,87 +0,0 @@ -Upstream-status: BackPort [http://pkgs.fedoraproject.org/cgit/bridge-utils.git/diff/bridge-utils-1.5-check-error-returns-from-write-to-sysfs.patch?id=b0d10717fd7cebf5d85eed3f941b409fa0384f08] - -Signed-off-by: Roy.Li <rongqing.li@windriver.com> - -From bb9970a9df95837e39d680021b1f73d231e85406 Mon Sep 17 00:00:00 2001 -From: Stephen Hemminger <shemminger@vyatta.com> -Date: Tue, 3 May 2011 09:52:43 -0700 -Subject: [PATCH 3/3] Check error returns from write to sysfs - -Add helper function to check write to sysfs files. - -Signed-off-by: Petr Sabata <contyk@redhat.com> ---- - libbridge/libbridge_devif.c | 37 +++++++++++++++++++++++-------------- - 1 files changed, 23 insertions(+), 14 deletions(-) - -diff --git a/libbridge/libbridge_devif.c b/libbridge/libbridge_devif.c -index aa8bc36..1e83925 100644 ---- a/libbridge/libbridge_devif.c -+++ b/libbridge/libbridge_devif.c -@@ -280,25 +280,38 @@ fallback: - return old_get_port_info(brname, port, info); - } - -+static int set_sysfs(const char *path, unsigned long value) -+{ -+ int fd, ret = 0, cc; -+ char buf[32]; -+ -+ fd = open(path, O_WRONLY); -+ if (fd < 0) -+ return -1; -+ -+ cc = snprintf(buf, sizeof(buf), "%lu\n", value); -+ if (write(fd, buf, cc) < 0) -+ ret = -1; -+ close(fd); -+ -+ return ret; -+} -+ - - static int br_set(const char *bridge, const char *name, - unsigned long value, unsigned long oldcode) - { - int ret; - char path[SYSFS_PATH_MAX]; -- FILE *f; - -- snprintf(path, SYSFS_PATH_MAX, SYSFS_CLASS_NET "%s/%s", bridge, name); -+ snprintf(path, SYSFS_PATH_MAX, SYSFS_CLASS_NET "%s/bridge/%s", -+ bridge, name); - -- f = fopen(path, "w"); -- if (f) { -- ret = fprintf(f, "%ld\n", value); -- fclose(f); -- } else { -+ if ((ret = set_sysfs(path, value)) < 0) { - /* fallback to old ioctl */ - struct ifreq ifr; - unsigned long args[4] = { oldcode, value, 0, 0 }; -- -+ - strncpy(ifr.ifr_name, bridge, IFNAMSIZ); - ifr.ifr_data = (char *) &args; - ret = ioctl(br_socket_fd, SIOCDEVPRIVATE, &ifr); -@@ -348,14 +361,10 @@ static int port_set(const char *bridge, const char *ifname, - { - int ret; - char path[SYSFS_PATH_MAX]; -- FILE *f; - - snprintf(path, SYSFS_PATH_MAX, SYSFS_CLASS_NET "%s/brport/%s", ifname, name); -- f = fopen(path, "w"); -- if (f) { -- ret = fprintf(f, "%ld\n", value); -- fclose(f); -- } else { -+ -+ if ((ret = set_sysfs(path, value)) < 0) { - int index = get_portno(bridge, ifname); - - if (index < 0) --- -1.7.5.2 - diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/bridge-utils-1.5-fix-error-message-for-incorrect-command.patch b/import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/bridge-utils-1.5-fix-error-message-for-incorrect-command.patch deleted file mode 100644 index 2d0494e53..000000000 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/bridge-utils-1.5-fix-error-message-for-incorrect-command.patch +++ /dev/null @@ -1,33 +0,0 @@ -Upstream-status: BackPort [http://pkgs.fedoraproject.org/cgit/bridge-utils.git/diff/bridge-utils-1.5-fix-error-message-for-incorrect-command.patch?id=b0d10717fd7cebf5d85eed3f941b409fa0384f08] - -Signed-off-by: Roy.Li <rongqing.li@windriver.com> - -From c7ed0996ef58b497d3d30be802ab5ae6c37099b5 Mon Sep 17 00:00:00 2001 -From: Stephen Hemminger <shemminger@vyatta.com> -Date: Tue, 3 May 2011 09:49:57 -0700 -Subject: [PATCH 2/3] Fix error message for incorrect command - -Debian bug 406907 -Error message was refering to incorrect command argument. - -Signed-off-by: Petr Sabata <contyk@redhat.com> ---- - brctl/brctl.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/brctl/brctl.c b/brctl/brctl.c -index 454b8dd..46ca352 100644 ---- a/brctl/brctl.c -+++ b/brctl/brctl.c -@@ -69,7 +69,7 @@ int main(int argc, char *const* argv) - argc -= optind; - argv += optind; - if ((cmd = command_lookup(*argv)) == NULL) { -- fprintf(stderr, "never heard of command [%s]\n", argv[1]); -+ fprintf(stderr, "never heard of command [%s]\n", *argv); - goto help; - } - --- -1.7.5.2 - diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/bridge-utils-1.5-fix-incorrect-command-in-manual.patch b/import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/bridge-utils-1.5-fix-incorrect-command-in-manual.patch deleted file mode 100644 index 6f6d6d423..000000000 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/bridge-utils-1.5-fix-incorrect-command-in-manual.patch +++ /dev/null @@ -1,33 +0,0 @@ -Upstream-status: BackPort [http://pkgs.fedoraproject.org/cgit/bridge-utils.git/diff/bridge-utils-1.5-fix-incorrect-command-in-manual.patch?id=b0d10717fd7cebf5d85eed3f941b409fa0384f08] - -Signed-off-by: Roy.Li <rongqing.li@windriver.com> - -From 8ef7b77562b636efcbd8b759eb324d6c069200f2 Mon Sep 17 00:00:00 2001 -From: Stephen Hemminger <shemminger@vyatta.com> -Date: Tue, 3 May 2011 09:48:40 -0700 -Subject: [PATCH 1/3] Fix incorrect command in manual - -Command is "setageing" not "setageingtime"; fix man page. -Debian bug report. - -Signed-off-by: Petr Sabata <contyk@redhat.com> ---- - doc/brctl.8 | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/doc/brctl.8 b/doc/brctl.8 -index d904047..771f323 100644 ---- a/doc/brctl.8 -+++ b/doc/brctl.8 -@@ -89,7 +89,7 @@ data. Machines can move to other ports, network cards can be replaced - .B brctl showmacs <brname> - shows a list of learned MAC addresses for this bridge. - --.B brctl setageingtime <brname> <time> -+.B brctl setageing <brname> <time> - sets the ethernet (MAC) address ageing time, in seconds. After <time> - seconds of not having seen a frame coming from a certain address, the - bridge will time out (delete) that address from the Forwarding --- -1.7.5.2 - diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/kernel-headers.patch b/import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/kernel-headers.patch index de36f0598..8a23a3070 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/kernel-headers.patch +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/kernel-headers.patch @@ -1,22 +1,33 @@ -include missing kernel header +From 824f838cc9c7b8a44174358446993d61be7bbb3f Mon Sep 17 00:00:00 2001 +From: Joe MacDonald <joe_macdonald@mentor.com> +Date: Mon, 30 Oct 2017 13:18:20 -0400 +Subject: [PATCH] include missing kernel header Fixes errors like | /b/kraj/jlinux-next/poky/build/tmp-eglibc/sysroots/re-64b/usr/include/linux/if_bridge.h:172:20: error: field 'ip6' has incomplete type | In file included from ../libbridge/libbridge.h:24:0, -Signed-off-by: Khem Raj <raj.khem@gmail.com> Upstream-Status: Pending -Index: bridge-utils-1.5/libbridge/libbridge.h -=================================================================== ---- bridge-utils-1.5.orig/libbridge/libbridge.h 2011-03-28 17:52:54.000000000 -0700 -+++ bridge-utils-1.5/libbridge/libbridge.h 2013-03-04 21:16:25.781188309 -0800 -@@ -20,6 +20,7 @@ - #define _LIBBRIDGE_H +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> +--- + libbridge/libbridge.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libbridge/libbridge.h b/libbridge/libbridge.h +index c038b92..fd09306 100644 +--- a/libbridge/libbridge.h ++++ b/libbridge/libbridge.h +@@ -24,6 +24,7 @@ + #include <sys/time.h> + #include <netinet/in.h> - #include <sys/socket.h> +#include <linux/in6.h> #include <linux/if.h> #include <linux/if_bridge.h> +-- +2.7.4 + diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils_1.5.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils_1.5.bb deleted file mode 100644 index 6032ab05e..000000000 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils_1.5.bb +++ /dev/null @@ -1,16 +0,0 @@ -require bridge-utils.inc - -SRC_URI += "\ - file://kernel-headers.patch \ - file://0001-build-error-out-correctly-if-a-submake-fails.patch \ - file://0002-libbridge-fix-some-build-time-warnings-fcntl.h.patch \ - file://0003-bridge-fix-some-build-time-warnings-errno.h.patch \ - file://0004-libbridge-add-missing-include-s-fix-build-against-mu.patch \ - file://0005-build-don-t-ignore-CFLAGS-from-environment.patch \ -" - -LIC_FILES_CHKSUM = "file://COPYING;md5=f9d20a453221a1b7e32ae84694da2c37" - -SRC_URI[md5sum] = "ec7b381160b340648dede58c31bb2238" -SRC_URI[sha256sum] = "42f9e5fb8f6c52e63a98a43b81bd281c227c529f194913e1c51ec48a393b6688" - diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils.inc b/import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils_1.6.bb index 0fb18d5d6..1c87c48bf 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils.inc +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils_1.6.bb @@ -3,14 +3,21 @@ HOMEPAGE = "http://www.linuxfoundation.org/collaborate/workgroups/networking/bri SECTION = "net" LICENSE = "GPLv2" -DEPENDS = "sysfsutils" +LIC_FILES_CHKSUM = "file://COPYING;md5=f9d20a453221a1b7e32ae84694da2c37" + +SRCREV = "42c1aefc303fdf891fbb099ea51f00dca83ab606" -SRC_URI = "${SOURCEFORGE_MIRROR}/bridge/bridge-utils-${PV}.tar.gz \ - file://bridge-utils-1.5-check-error-returns-from-write-to-sysfs.patch \ - file://bridge-utils-1.5-fix-error-message-for-incorrect-command.patch \ - file://bridge-utils-1.5-fix-incorrect-command-in-manual.patch \ +SRC_URI = "\ + git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/bridge-utils.git \ + file://kernel-headers.patch \ + file://0005-build-don-t-ignore-CFLAGS-from-environment.patch \ + file://0006-libbridge-Modifying-the-AR-to-cross-toolchain.patch \ " +S = "${WORKDIR}/git" + +DEPENDS = "sysfsutils" + inherit autotools-brokensep update-alternatives ALTERNATIVE_${PN} = "brctl" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/chrony/chrony/arm_eabi.patch b/import-layers/meta-openembedded/meta-networking/recipes-support/chrony/chrony/arm_eabi.patch index d1586bba4..92a2dbd93 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/chrony/chrony/arm_eabi.patch +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/chrony/chrony/arm_eabi.patch @@ -1,48 +1,54 @@ chrony: fix build failure for arma9 - + Eliminate references to syscalls not available for ARM_EABI. Also add a dependency on libseccomp which is needed for scfilter to work. - + Set PACKAGECONFIG to not enable scfilter, since kernel CONFIG_SECCOMP is unlikely to be set. This aligns the usage of libseccomp with that of other packages. Upstream-Status: Pending - + Signed-off-by: Joe Slater <jslater@windriver.com> + Refresh patch for new upstream version. + + Signed-off-by: Robert Joslyn <robert.joslyn@redrectangle.org> + --- a/sys_linux.c +++ b/sys_linux.c -@@ -453,13 +453,12 @@ SYS_Linux_EnableSystemCallFilter(int lev +@@ -465,14 +465,14 @@ SYS_Linux_EnableSystemCallFilter(int lev const int syscalls[] = { /* Clock */ - SCMP_SYS(adjtimex), SCMP_SYS(gettimeofday), SCMP_SYS(settimeofday), -- SCMP_SYS(time), + SCMP_SYS(adjtimex), SCMP_SYS(clock_gettime), SCMP_SYS(gettimeofday), +- SCMP_SYS(settimeofday), SCMP_SYS(time), ++ SCMP_SYS(settimeofday), /* Process */ -- SCMP_SYS(clone), SCMP_SYS(exit), SCMP_SYS(exit_group), SCMP_SYS(getrlimit), -+ SCMP_SYS(clone), SCMP_SYS(exit), SCMP_SYS(exit_group), - SCMP_SYS(rt_sigaction), SCMP_SYS(rt_sigreturn), SCMP_SYS(rt_sigprocmask), - SCMP_SYS(set_tid_address), SCMP_SYS(sigreturn), SCMP_SYS(wait4), + SCMP_SYS(clone), SCMP_SYS(exit), SCMP_SYS(exit_group), SCMP_SYS(getpid), +- SCMP_SYS(getrlimit), SCMP_SYS(rt_sigaction), SCMP_SYS(rt_sigreturn), ++ SCMP_SYS(rt_sigaction), SCMP_SYS(rt_sigreturn), + SCMP_SYS(rt_sigprocmask), SCMP_SYS(set_tid_address), SCMP_SYS(sigreturn), + SCMP_SYS(wait4), /* Memory */ - SCMP_SYS(brk), SCMP_SYS(madvise), SCMP_SYS(mmap), SCMP_SYS(mmap2), + SCMP_SYS(brk), SCMP_SYS(madvise), SCMP_SYS(mmap2), SCMP_SYS(mprotect), SCMP_SYS(mremap), SCMP_SYS(munmap), SCMP_SYS(shmdt), /* Filesystem */ SCMP_SYS(access), SCMP_SYS(chmod), SCMP_SYS(chown), SCMP_SYS(chown32), -@@ -470,14 +469,21 @@ SYS_Linux_EnableSystemCallFilter(int lev +@@ -483,14 +483,21 @@ SCMP_SYS(bind), SCMP_SYS(connect), SCMP_SYS(getsockname), - SCMP_SYS(recvfrom), SCMP_SYS(recvmsg), SCMP_SYS(sendmmsg), - SCMP_SYS(sendmsg), SCMP_SYS(sendto), + SCMP_SYS(recvfrom), SCMP_SYS(recvmmsg), SCMP_SYS(recvmsg), + SCMP_SYS(sendmmsg), SCMP_SYS(sendmsg), SCMP_SYS(sendto), - /* TODO: check socketcall arguments */ - SCMP_SYS(socketcall), /* General I/O */ - SCMP_SYS(_newselect), SCMP_SYS(close), SCMP_SYS(open), SCMP_SYS(pipe), + SCMP_SYS(_newselect), SCMP_SYS(close), SCMP_SYS(open), SCMP_SYS(openat), SCMP_SYS(pipe), - SCMP_SYS(poll), SCMP_SYS(read), SCMP_SYS(futex), SCMP_SYS(select), + SCMP_SYS(poll), SCMP_SYS(read), SCMP_SYS(futex), SCMP_SYS(set_robust_list), SCMP_SYS(write), /* Miscellaneous */ - SCMP_SYS(uname), + SCMP_SYS(getrandom), SCMP_SYS(sysinfo), SCMP_SYS(uname), + /* not always available */ +#if ! defined(__ARM_EABI__) + SCMP_SYS(time), diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/chrony/chrony_2.4.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/chrony/chrony_3.2.bb index 71431f4b7..8b90a354e 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/chrony/chrony_2.4.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/chrony/chrony_3.2.bb @@ -25,7 +25,7 @@ This recipe produces two binary packages: 'chrony' which contains chronyd, \ the configuration file and the init script, and 'chronyc' which contains \ the client program only." -HOMEPAGE = "http://chrony.tuxfamily.org/" +HOMEPAGE = "https://chrony.tuxfamily.org/" SECTION = "net" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" @@ -35,8 +35,8 @@ SRC_URI = "https://download.tuxfamily.org/chrony/chrony-${PV}.tar.gz \ file://chronyd \ file://arm_eabi.patch \ " -SRC_URI[md5sum] = "d0598aa8a9be8faccef9386f6fc0d5f2" -SRC_URI[sha256sum] = "8d04e7cda2333289c2104b731d39c3c1db94816e43bae35d7ee4e7ae8af6391f" +SRC_URI[md5sum] = "f4c4eb0dc92f35ee4bb7d3dcd8029ecb" +SRC_URI[sha256sum] = "329f6718dd8c3ece3eee78be1f4821cbbeb62608e7d23f25da293cfa433c4116" DEPENDS = "pps-tools" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_git.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_git.bb index 3ca5b780b..198e3ef98 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_git.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_git.bb @@ -7,7 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" PV = "6.7" SRCREV = "8101a07871f185c7044fa2ca221b282ab4607c8b" -SRC_URI = "git://git.samba.org/cifs-utils.git" +SRC_URI = "git://git.samba.org/cifs-utils.git \ + file://0001-mount.cifs-Remove-data_blob.h-include.patch \ + " S = "${WORKDIR}/git" DEPENDS += "libtalloc" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/cifs/files/0001-mount.cifs-Remove-data_blob.h-include.patch b/import-layers/meta-openembedded/meta-networking/recipes-support/cifs/files/0001-mount.cifs-Remove-data_blob.h-include.patch new file mode 100644 index 000000000..07f2a5726 --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/cifs/files/0001-mount.cifs-Remove-data_blob.h-include.patch @@ -0,0 +1,32 @@ +Upstream-Status: Backport +Signed-off-by: S. Lockwood-Childs <sjl@vctlabs.com> + +From 272d523a57a4e8791d625a479128613be5e401f5 Mon Sep 17 00:00:00 2001 +From: Thomas Witt <pyromaniac@exherbo.org> +Date: Wed, 15 Mar 2017 20:20:44 +0000 +Subject: [PATCH] mount.cifs: Remove data_blob.h include + +data_blob.h includes talloc.h from libtalloc, but that is only marked as +a dependency for cifs.upcall. No symbols from that header are used by +cifs.mount, so remove it to avoid the libtalloc dependency + +Signed-off-by: Thomas Witt <pyromaniac@exherbo.org> +--- + mount.cifs.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/mount.cifs.c b/mount.cifs.c +index 13b71ef..2612feb 100644 +--- a/mount.cifs.c ++++ b/mount.cifs.c +@@ -61,7 +61,6 @@ + #include "mount.h" + #include "util.h" + #include "resolve_host.h" +-#include "data_blob.h" + + #ifndef MS_MOVE + #define MS_MOVE 8192 +-- +1.9.4 + diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/cim-schema/cim-schema-exper_2.39.0.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/cim-schema/cim-schema-exper_2.50.0.bb index 2b4909607..90ea882b7 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/cim-schema/cim-schema-exper_2.39.0.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/cim-schema/cim-schema-exper_2.50.0.bb @@ -4,11 +4,11 @@ LICENSE = "DMTF" RCONFLICTS_${PN} = "cim-schema-final" -SRC_URI = "http://dmtf.org/sites/default/files/cim/cim_schema_v2390/cim_schema_${PV}Experimental-MOFs.zip;subdir=${BPN}-${PV} \ +SRC_URI = "http://dmtf.org/sites/default/files/cim/cim_schema_v2500/cim_schema_${PV}Experimental-MOFs.zip;subdir=${BPN}-${PV} \ file://LICENSE \ " -SRC_URI[md5sum] = "b82b31c609c6bcc69521829409f58ccc" -SRC_URI[sha256sum] = "ed2096ef1ea25d189a02bbc6603fed7a48297f2987f254265763a6eecb7fc870" +SRC_URI[md5sum] = "ee4ad6441a2b65ca60a3abc53e3ec629" +SRC_URI[sha256sum] = "a44d67881325e267ef46b72eabe0c69f90470b1033b1ce7c26d9ba99072adb50" LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=eecc6f71a56ff3caf17f15bf7aeac7b4" do_install() { diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ctdb/ctdb/02-link-rep_snprintf-for-ltdbtool.patch b/import-layers/meta-openembedded/meta-networking/recipes-support/ctdb/ctdb/02-link-rep_snprintf-for-ltdbtool.patch index 1dd9b93a5..1294fe41b 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/ctdb/ctdb/02-link-rep_snprintf-for-ltdbtool.patch +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/ctdb/ctdb/02-link-rep_snprintf-for-ltdbtool.patch @@ -2,15 +2,16 @@ link rep_snprintf from lib/replace/snprintf.o for ltdbtool Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com> -diff -Nurp ctdb-2.5.1.orig/Makefile.in ctdb-2.5.1/Makefile.in ---- ctdb-2.5.1.orig/Makefile.in 2015-05-07 16:43:39.276000236 +0900 -+++ ctdb-2.5.1/Makefile.in 2015-05-07 16:44:09.627000237 +0900 -@@ -170,7 +170,7 @@ bin/ctdb: $(CTDB_CLIENT_OBJ) tools/ctdb. +Index: ctdb-2.5.6/Makefile.in +=================================================================== +--- ctdb-2.5.6.orig/Makefile.in ++++ ctdb-2.5.6/Makefile.in +@@ -176,7 +176,7 @@ bin/ctdb: $(CTDB_CLIENT_OBJ) tools/ctdb. @echo Linking $@ $(WRAPPER) $(CC) $(CFLAGS) -o $@ tools/ctdb.o tools/ctdb_vacuum.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS) -bin/ltdbtool: tools/ltdbtool.o $(TDB_OBJ) +bin/ltdbtool: tools/ltdbtool.o $(TDB_OBJ) lib/replace/snprintf.o @echo Linking $@ - $(WRAPPER) $(CC) $(CFLAGS) -o $@ $+ $(TDB_LIBS) $(LIB_FLAGS) + $(WRAPPER) $(CC) $(CFLAGS) -o $@ $+ $(LIB_FLAGS) diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.2.29.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.2.33.bb index 166340873..5ebda19eb 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.2.29.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.2.33.bb @@ -12,8 +12,8 @@ SRC_URI = "http://dovecot.org/releases/2.2/dovecot-${PV}.tar.gz \ file://0001-doveadm-Fix-parallel-build.patch \ " -SRC_URI[md5sum] = "ff95486a5c43025a2c3f5a712e7962b9" -SRC_URI[sha256sum] = "d939ea99126eb8a8c6955390b422b6e27ec0fa43a3b59b2b3218cb5ad67139a6" +SRC_URI[md5sum] = "d61d1e923a22f9062cc9f47696882666" +SRC_URI[sha256sum] = "e9483d68a7698d701bc06124fcf6e1b1f16380c2986c7ec0cf4e1475b9d0c218" DEPENDS = "openssl xz zlib bzip2 libcap icu" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_8.9.6.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_8.9.6.bb index 5f6c43f7e..81f1cfec5 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_8.9.6.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_8.9.6.bb @@ -8,7 +8,7 @@ SECTION = "admin" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018" -SRC_URI = "http://oss.linbit.com/drbd/${BP}.tar.gz \ +SRC_URI = "http://www.linbit.com/downloads/drbd/utils/archive/${BP}.tar.gz \ file://0001-Makefile.in-fix-permission-bits-for-drbd.service.patch \ " SRC_URI[md5sum] = "76ed6d3190cd77b00890f3365353124b" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/drbd/drbd_9.0.8-1.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/drbd/drbd_9.0.8-1.bb index e943f2464..fa4d10b4c 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/drbd/drbd_9.0.8-1.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/drbd/drbd_9.0.8-1.bb @@ -20,3 +20,5 @@ EXTRA_OEMAKE += "KDIR='${STAGING_KERNEL_DIR}'" do_install () { oe_runmake install DESTDIR="${D}" } + +PNBLACKLIST[drbd] = "implicit declaration of function 'setup_timer'; 4.15 head file issue?" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/fwknop/fwknop_2.6.9.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/fwknop/fwknop_2.6.9.bb index 49b11ad33..0fd5f6fed 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/fwknop/fwknop_2.6.9.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/fwknop/fwknop_2.6.9.bb @@ -17,6 +17,9 @@ EXTRA_OECONF = " --with-iptables=/usr/sbin/iptables \ " do_configure () { + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/config + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}/config + aclocal libtoolize --automake --copy --force autoconf diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/geoip/geoip-perl_1.50.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/geoip/geoip-perl_1.50.bb index a8c8bcf58..95147bdad 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/geoip/geoip-perl_1.50.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/geoip/geoip-perl_1.50.bb @@ -9,17 +9,12 @@ SECTION = "libdevel" LICENSE = "Artistic-1.0 | GPL-1.0+" LIC_FILES_CHKSUM = "file://LICENSE;md5=b7a36f55e8ba62aadd74e4f0886a405e" -# Note that we do not want to use the upstream file name locally. -# -SRC_URI = "http://github.com/maxmind/geoip-api-perl/archive/v${PV}.tar.gz;downloadfilename=${BPN}-${PV}.tar.gz \ +S = "${WORKDIR}/git" +SRCREV = "47f7d49bd15cfc2e5f8c0f5c4068dc8bb0e10e96" +SRC_URI = "git://github.com/maxmind/geoip-api-perl.git;protocol=https; \ file://run-ptest \ " -SRC_URI[md5sum] = "2d7f8b1b54e6ba6d9e3fefce52675815" -SRC_URI[sha256sum] = "86da0dd67f417a43dc70f15a49bd3619f668970c117b9e7f737b4ab246c240a6" - -S = "${WORKDIR}/geoip-api-perl-${PV}" - DEPENDS += "geoip" inherit cpan ptest diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/geoip/geoip_1.6.9.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/geoip/geoip_1.6.11.bb index 9e8e0714f..3527d0cba 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/geoip/geoip_1.6.9.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/geoip/geoip_1.6.11.bb @@ -15,7 +15,7 @@ SRC_URI = "git://github.com/maxmind/geoip-api-c.git \ http://geolite.maxmind.com/download/geoip/database/GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz;apply=no;name=GeoLiteCityv6-dat \ file://run-ptest \ " -SRCREV = "4f487bf95532e0bba7783d591faff178ab0aa462" +SRCREV = "3169a8a88808c8df862e0b0355f99c738cce9f7e" SRC_URI[GeoIP-dat.md5sum] = "37c84ead332dda0362a5ac7b049b72d4" SRC_URI[GeoIP-dat.sha256sum] = "79ff1099e96c2dc1c2539c9a18aaa13a9afd085cae477df60d95f1644d42bc07" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/geoip/geoipupdate-2.4.0/GeoIP.conf b/import-layers/meta-openembedded/meta-networking/recipes-support/geoip/geoipupdate-2.5.0/GeoIP.conf index 134cfed1f..134cfed1f 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/geoip/geoipupdate-2.4.0/GeoIP.conf +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/geoip/geoipupdate-2.5.0/GeoIP.conf diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/geoip/geoipupdate-2.4.0/geoipupdate.cron b/import-layers/meta-openembedded/meta-networking/recipes-support/geoip/geoipupdate-2.5.0/geoipupdate.cron index 40597a856..40597a856 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/geoip/geoipupdate-2.4.0/geoipupdate.cron +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/geoip/geoipupdate-2.5.0/geoipupdate.cron diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/geoip/geoipupdate_2.4.0.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/geoip/geoipupdate_2.5.0.bb index 3e045bb27..f4eb2b799 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/geoip/geoipupdate_2.4.0.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/geoip/geoipupdate_2.5.0.bb @@ -6,17 +6,17 @@ SECTION = "net" DEPENDS = "zlib curl" -SRC_URI = "https://github.com/maxmind/geoipupdate/releases/download/v2.4.0/geoipupdate-2.4.0.tar.gz \ +SRC_URI = "https://github.com/maxmind/geoipupdate/releases/download/v2.5.0/geoipupdate-2.5.0.tar.gz \ file://GeoIP.conf \ file://geoipupdate.cron \ " -SRC_URI[md5sum] = "02f9712fb80e8e979d3d54cda7f7704f" -SRC_URI[sha256sum] = "8b4e88ce8d84e9c75bc681704d19ec5c63c54f01e945f7669f97fb0df7e13952" +SRC_URI[md5sum] = "28f633c49ec87ab01ad3c0fb0228a696" +SRC_URI[sha256sum] = "5119fd0e338cd083e886228b26679c64bcbaade8a815be092aecf865a610ab26" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "\ -file://ChangeLog.md;md5=334337b6ecbb65093bae66b3ae21c8c2 \ +file://ChangeLog.md;md5=11d2e31df0de2be3ccc3e2286c4dafcb \ " FILES_${PN} = "/usr/share/GeoIP \ /etc/GeoIP.conf \ diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ipcalc/ipcalc/0001-Makefile-pass-extra-linker-flags.patch b/import-layers/meta-openembedded/meta-networking/recipes-support/ipcalc/ipcalc/0001-Makefile-pass-extra-linker-flags.patch new file mode 100644 index 000000000..38d306475 --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/ipcalc/ipcalc/0001-Makefile-pass-extra-linker-flags.patch @@ -0,0 +1,31 @@ +From fd80c0599083013a1b583feba5d7473f52b35938 Mon Sep 17 00:00:00 2001 +From: Mariia Movchan <mmovchan@cisco.com> +Date: Tue, 6 Mar 2018 16:03:39 +0200 +Subject: [PATCH] Makefile: pass extra linker flags + +Fixes +ERROR: QA Issue: No GNU_HASH in the elf binary + +Upstream-Status: Pending + +Signed-off-by: Mariia Movchan <mmovchan@cisco.com> +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 8beff8f..047f02a 100644 +--- a/Makefile ++++ b/Makefile +@@ -8,7 +8,7 @@ LIBS?= + VERSION=0.2.2 + CC?=gcc + CFLAGS?=-O2 -g -Wall +-LDFLAGS=$(LIBS) ++LDFLAGS+=$(LIBS) + + ifeq ($(USE_GEOIP),yes) + ifeq ($(USE_DYN_GEOIP),yes) +-- +2.15.1 + diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ipcalc/ipcalc_0.2.2.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/ipcalc/ipcalc_0.2.2.bb new file mode 100644 index 000000000..b45642404 --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/ipcalc/ipcalc_0.2.2.bb @@ -0,0 +1,21 @@ +SUMMARY = "Tool to assist in network address calculations for IPv4 and IPv6." +HOMEPAGE = "https://github.com/nmav/ipcalc" + +SECTION = "net" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +S = "${WORKDIR}/git" +SRCREV = "8348808a7869ca8f25a5b5deeaa418c2f6d52758" +SRC_URI = "\ + git://github.com/nmav/ipcalc.git;protocol=https; \ + file://0001-Makefile-pass-extra-linker-flags.patch \ +" + +export USE_GEOIP = "no" + +do_install() { + install -d ${D}/${bindir} + install -m 0755 ${S}/ipcalc ${D}/${bindir} +} diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/libldb/libldb/ldb-Add-configure-options-for-packages.patch b/import-layers/meta-openembedded/meta-networking/recipes-support/libldb/libldb/options-1.3.1.patch index 93bd4578e..ffe253b63 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/libldb/libldb/ldb-Add-configure-options-for-packages.patch +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/libldb/libldb/options-1.3.1.patch @@ -1,7 +1,7 @@ -From 49dde22e798fd7f39fd59250036c0ae1fe2b9152 Mon Sep 17 00:00:00 2001 +From a4da3ab4d76013aaa731d43d52ccca1ebd37c395 Mon Sep 17 00:00:00 2001 From: Jackie Huang <jackie.huang@windriver.com> Date: Wed, 21 Sep 2016 10:06:39 +0800 -Subject: [PATCH] ldb: Add configure options for packages +Subject: [PATCH 1/1] ldb: Add configure options for packages Add configure options for the following packages: - acl @@ -16,9 +16,9 @@ Upstream-Status: Inappropriate [oe deterministic build specific] Signed-off-by: Jackie Huang <jackie.huang@windriver.com> --- lib/replace/system/wscript_configure | 6 ++- - lib/replace/wscript | 85 ++++++++++++++++++++++++++++-------- + lib/replace/wscript | 94 +++++++++++++++++++++++++++--------- wscript | 7 +++ - 3 files changed, 80 insertions(+), 18 deletions(-) + 3 files changed, 83 insertions(+), 24 deletions(-) diff --git a/lib/replace/system/wscript_configure b/lib/replace/system/wscript_configure index 2035474..10f9ae7 100644 @@ -37,7 +37,7 @@ index 2035474..10f9ae7 100644 # solaris varients of getXXent_r diff --git a/lib/replace/wscript b/lib/replace/wscript -index 145300d..8218fa5 100644 +index 2f94d49..68b2d3a 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript @@ -23,6 +23,41 @@ def set_options(opt): @@ -124,18 +124,23 @@ index 145300d..8218fa5 100644 conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h') conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h') conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h') -@@ -248,17 +298,18 @@ def configure(conf): +@@ -266,22 +316,20 @@ def configure(conf): conf.CHECK_FUNCS('prctl dirname basename') +- strlcpy_in_bsd = False +- - # libbsd on some platforms provides strlcpy and strlcat - if not conf.CHECK_FUNCS('strlcpy strlcat'): -- conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', -- checklibc=True) +- if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', +- checklibc=True): +- strlcpy_in_bsd = True - if not conf.CHECK_FUNCS('getpeereid'): - conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') - if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): - conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h') +- if not conf.CHECK_FUNCS('setproctitle_init'): +- conf.CHECK_FUNCS_IN('setproctitle_init', 'bsd', headers='sys/types.h bsd/unistd.h') - - if not conf.CHECK_FUNCS('closefrom'): - conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') @@ -148,17 +153,28 @@ index 145300d..8218fa5 100644 + conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') + if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): + conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h') ++ if not conf.CHECK_FUNCS('setproctitle_init'): ++ conf.CHECK_FUNCS_IN('setproctitle_init', 'bsd', headers='sys/types.h bsd/unistd.h') + + if not conf.CHECK_FUNCS('closefrom'): + conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') conf.CHECK_CODE(''' struct ucred cred; +@@ -632,7 +680,7 @@ removeea setea + # look for a method of finding the list of network interfaces + for method in ['HAVE_IFACE_GETIFADDRS', 'HAVE_IFACE_AIX', 'HAVE_IFACE_IFCONF', 'HAVE_IFACE_IFREQ']: + bsd_for_strlcpy = '' +- if strlcpy_in_bsd: ++ if Options.options.enable_libbsd: + bsd_for_strlcpy = ' bsd' + if conf.CHECK_CODE(''' + #define %s 1 diff --git a/wscript b/wscript -index 2af8571..059408b 100755 +index 8ae5be3..a178cc4 100644 --- a/wscript +++ b/wscript -@@ -29,6 +29,13 @@ def set_options(opt): +@@ -31,6 +31,13 @@ def set_options(opt): opt.RECURSE('lib/replace') opt.tool_options('python') # options for disabling pyc or pyo compilation @@ -173,5 +189,5 @@ index 2af8571..059408b 100755 conf.RECURSE('lib/tdb') conf.RECURSE('lib/tevent') -- -2.8.3 +2.16.2 diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/libldb/libldb_1.1.29.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/libldb/libldb_1.3.1.bb index a90919ba4..7e14cde35 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/libldb/libldb_1.1.29.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/libldb/libldb_1.3.1.bb @@ -8,7 +8,7 @@ RDEPENDS_pyldb += "python" SRC_URI = "http://samba.org/ftp/ldb/ldb-${PV}.tar.gz \ file://do-not-import-target-module-while-cross-compile.patch \ - file://ldb-Add-configure-options-for-packages.patch \ + file://options-1.3.1.patch \ " PACKAGECONFIG ??= "\ @@ -29,8 +29,8 @@ LIC_FILES_CHKSUM = "file://pyldb.h;endline=24;md5=dfbd238cecad76957f7f860fbe9ada file://man/ldb.3.xml;beginline=261;endline=262;md5=137f9fd61040c1505d1aa1019663fd08 \ file://tools/ldbdump.c;endline=19;md5=a7d4fc5d1f75676b49df491575a86a42" -SRC_URI[md5sum] = "9c90abfb94c1e2a693399392cf4cddb9" -SRC_URI[sha256sum] = "59d84f9a5b799f519ba7b2685bb46f5a26f1bbf05b7a144b2f5e017d01d80f97" +SRC_URI[md5sum] = "e5233f202bca27f6ce8474fb8ae65983" +SRC_URI[sha256sum] = "b19f2c9f55ae0f46aa5ebaea0bf1a47ec1ac135e1d78af0f6318cf50bf62cbd2" inherit waf-samba @@ -38,7 +38,7 @@ S = "${WORKDIR}/ldb-${PV}" EXTRA_OECONF += "--disable-rpath \ --disable-rpath-install \ - --bundled-libraries=NONE \ + --bundled-libraries=cmocka \ --builtin-libraries=replace \ --with-modulesdir=${libdir}/ldb/modules \ --with-privatelibdir=${libdir}/ldb \ diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc/talloc-Add-configure-options-for-packages.patch b/import-layers/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc/options-2.1.10.patch index 46b2405cb..63f21e775 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc/talloc-Add-configure-options-for-packages.patch +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc/options-2.1.10.patch @@ -14,16 +14,21 @@ Add configure options for the following packages: Upstream-Status: Inappropriate [oe deterministic build specific] Signed-off-by: Jackie Huang <jackie.huang@windriver.com> + +Modified to apply to version 2.1.10. + +Signed-off-by: Joe Slater <joe.slater@windriver.com> + --- lib/replace/system/wscript_configure | 6 ++- lib/replace/wscript | 85 ++++++++++++++++++++++++++++-------- wscript | 7 ++- 3 files changed, 79 insertions(+), 19 deletions(-) -diff --git a/lib/replace/system/wscript_configure b/lib/replace/system/wscript_configure -index 2035474..10f9ae7 100644 ---- a/lib/replace/system/wscript_configure -+++ b/lib/replace/system/wscript_configure +Index: talloc-2.1.11/lib/replace/system/wscript_configure +=================================================================== +--- talloc-2.1.11.orig/lib/replace/system/wscript_configure ++++ talloc-2.1.11/lib/replace/system/wscript_configure @@ -1,6 +1,10 @@ #!/usr/bin/env python @@ -36,10 +41,10 @@ index 2035474..10f9ae7 100644 conf.CHECK_FUNCS('getpwnam_r getpwuid_r getpwent_r') # solaris varients of getXXent_r -diff --git a/lib/replace/wscript b/lib/replace/wscript -index fc43e1a..12d2a70 100644 ---- a/lib/replace/wscript -+++ b/lib/replace/wscript +Index: talloc-2.1.11/lib/replace/wscript +=================================================================== +--- talloc-2.1.11.orig/lib/replace/wscript ++++ talloc-2.1.11/lib/replace/wscript @@ -23,6 +23,41 @@ def set_options(opt): opt.PRIVATE_EXTENSION_DEFAULT('') opt.RECURSE('buildtools/wafsamba') @@ -124,44 +129,49 @@ index fc43e1a..12d2a70 100644 conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h') conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h') conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h') -@@ -248,17 +298,18 @@ def configure(conf): - +@@ -267,21 +317,21 @@ def configure(conf): conf.CHECK_FUNCS('prctl dirname basename') + strlcpy_in_bsd = False +- - # libbsd on some platforms provides strlcpy and strlcat - if not conf.CHECK_FUNCS('strlcpy strlcat'): -- conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', -- checklibc=True) +- if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', ++ if Options.options.enable_libbsd: ++ # libbsd on some platforms provides strlcpy and strlcat ++ if not conf.CHECK_FUNCS('strlcpy strlcat'): ++ if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', + checklibc=True): +- strlcpy_in_bsd = True - if not conf.CHECK_FUNCS('getpeereid'): - conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') - if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): - conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h') -- -- if not conf.CHECK_FUNCS('closefrom'): -- conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') -+ if Options.options.enable_libbsd: -+ # libbsd on some platforms provides strlcpy and strlcat -+ if not conf.CHECK_FUNCS('strlcpy strlcat'): -+ conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', -+ checklibc=True) +- if not conf.CHECK_FUNCS('setproctitle_init'): +- conf.CHECK_FUNCS_IN('setproctitle_init', 'bsd', headers='sys/types.h bsd/unistd.h') ++ strlcpy_in_bsd = True + if not conf.CHECK_FUNCS('getpeereid'): + conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') + if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): + conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h') -+ ++ if not conf.CHECK_FUNCS('setproctitle_init'): ++ conf.CHECK_FUNCS_IN('setproctitle_init', 'bsd', headers='sys/types.h bsd/unistd.h') + +- if not conf.CHECK_FUNCS('closefrom'): +- conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') + if not conf.CHECK_FUNCS('closefrom'): + conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') conf.CHECK_CODE(''' struct ucred cred; -diff --git a/wscript b/wscript -index 41f3be7..556c1c8 100644 ---- a/wscript -+++ b/wscript -@@ -35,7 +35,12 @@ def set_options(opt): - opt.add_option('--disable-python', - help=("disable the pytalloc module"), - action="store_true", dest='disable_python', default=False) +Index: talloc-2.1.11/wscript +=================================================================== +--- talloc-2.1.11.orig/wscript ++++ talloc-2.1.11/wscript +@@ -32,7 +32,12 @@ def set_options(opt): + opt.add_option('--enable-talloc-compat1', + help=("Build talloc 1.x.x compat library [False]"), + action="store_true", dest='TALLOC_COMPAT1', default=False) - + opt.add_option('--with-valgrind', + help=("enable use of valgrind"), @@ -172,6 +182,3 @@ index 41f3be7..556c1c8 100644 def configure(conf): conf.RECURSE('lib/replace') --- -2.8.3 - diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc_2.1.9.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc_2.1.11.bb index d80af50d2..848cf4d99 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc_2.1.9.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc_2.1.11.bb @@ -7,10 +7,10 @@ LIC_FILES_CHKSUM = "file://talloc.h;beginline=3;endline=27;md5=a301712782cad6dd6 SRC_URI = "https://samba.org/ftp/talloc/talloc-${PV}.tar.gz \ - file://talloc-Add-configure-options-for-packages.patch \ + file://options-2.1.10.patch \ " -SRC_URI[md5sum] = "19ba14eba97d79a169fa92ea824d2b9e" -SRC_URI[sha256sum] = "f0aad4cb88a3322207c82136ddc07bed48a37c2c21f82962d6c5ccb422711062" +SRC_URI[md5sum] = "452596f904ca2b10322bdaabf147a721" +SRC_URI[sha256sum] = "639eb35556a0af999123c4d883e79be05ff9f00ab4f9e4ac2e5775f9c5eeeed3" inherit waf-samba diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.3.14.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.3.15.bb index 3122b93ba..302a306b3 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.3.14.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.3.15.bb @@ -11,8 +11,8 @@ SRC_URI = "https://samba.org/ftp/tdb/tdb-${PV}.tar.gz \ file://tdb-Add-configure-options-for-packages.patch \ " -SRC_URI[md5sum] = "dd23f2ba8ca2bfdcb833bc79d5b5ac6f" -SRC_URI[sha256sum] = "3a7d4bb79229460df530c7e1c7067ba9fb9d370aa61fff537fdc2bdf918acbe9" +SRC_URI[md5sum] = "60ece3996acc8d85b6f713199da971a6" +SRC_URI[sha256sum] = "b4a1bf3833601bd9f10aff363cb750860aef9ce5b4617989239923192f946728" PACKAGECONFIG ??= "\ ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)} \ diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/avoid-attr-unless-wanted.patch b/import-layers/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/avoid-attr-unless-wanted.patch index 2fc55239c..35890335a 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/avoid-attr-unless-wanted.patch +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/avoid-attr-unless-wanted.patch @@ -1,20 +1,22 @@ ---- a/lib/replace/wscript 2015-11-18 15:40:19.000000000 +0100 -+++ b/lib/replace/wscript 2015-11-18 15:48:09.000000000 +0100 -@@ -618,8 +618,6 @@ +diff --git a/lib/replace/wscript b/lib/replace/wscript +index 079761d..07e0104 100644 +--- a/lib/replace/wscript ++++ b/lib/replace/wscript +@@ -793,8 +793,6 @@ def build(bld): if not bld.CONFIG_SET('HAVE_INET_ATON'): REPLACE_SOURCE += ' inet_aton.c' if not bld.CONFIG_SET('HAVE_INET_NTOP'): REPLACE_SOURCE += ' inet_ntop.c' if not bld.CONFIG_SET('HAVE_INET_PTON'): REPLACE_SOURCE += ' inet_pton.c' - if not bld.CONFIG_SET('HAVE_GETXATTR') or bld.CONFIG_SET('XATTR_ADDITIONAL_OPTIONS'): - REPLACE_SOURCE += ' xattr.c' - bld.SAMBA_LIBRARY('replace', - source=REPLACE_SOURCE, -@@ -630,7 +628,7 @@ + if not bld.CONFIG_SET('HAVE_CLOSEFROM'): + REPLACE_SOURCE += ' closefrom.c' +@@ -808,7 +806,7 @@ def build(bld): # at the moment: # hide_symbols=bld.BUILTIN_LIBRARY('replace'), private_library=True, - deps='crypt dl nsl socket rt attr' + extra_libs) + deps='crypt dl nsl socket rt ' + extra_libs) - bld.SAMBA_SUBSYSTEM('replace-test', - source='''test/testsuite.c test/strptime.c + replace_test_cflags="-Wno-format-zero-length" + if bld.CONFIG_SET('HAVE_WNO_FORMAT_TRUNCATION'): diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/tevent-Add-configure-options-for-packages.patch b/import-layers/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/options-0.9.36.patch index ddb8e4e23..363c5867c 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/tevent-Add-configure-options-for-packages.patch +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/options-0.9.36.patch @@ -1,7 +1,7 @@ -From c00f6d35bdc06dffb54daa815e57b44210a5de04 Mon Sep 17 00:00:00 2001 +From c3e2e4f89cf37b27609fd02ad67eb02d0015cc1e Mon Sep 17 00:00:00 2001 From: Jackie Huang <jackie.huang@windriver.com> Date: Wed, 21 Sep 2016 09:57:49 +0800 -Subject: [PATCH] tevent: Add configure options for packages +Subject: [PATCH 1/1] tevent: Add configure options for packages Add configure options for the following packages: - acl @@ -14,31 +14,17 @@ Add configure options for the following packages: Upstream-Status: Inappropriate [oe deterministic build specific] Signed-off-by: Jackie Huang <jackie.huang@windriver.com> + +Modified to apply to version 0.9.33. + +Signed-off-by: Joe Slater <joe.slater@windriver.com> --- - lib/replace/system/wscript_configure | 6 ++- - lib/replace/wscript | 85 ++++++++++++++++++++++++++++-------- - wscript | 7 ++- - 3 files changed, 79 insertions(+), 19 deletions(-) - mode change 100755 => 100644 wscript + lib/replace/wscript | 89 ++++++++++++++++++++++++++++++++++++++++------------- + wscript | 7 ++++- + 2 files changed, 73 insertions(+), 23 deletions(-) -diff --git a/lib/replace/system/wscript_configure b/lib/replace/system/wscript_configure -index 2035474..10f9ae7 100644 ---- a/lib/replace/system/wscript_configure -+++ b/lib/replace/system/wscript_configure -@@ -1,6 +1,10 @@ - #!/usr/bin/env python - --conf.CHECK_HEADERS('sys/capability.h') -+import Options -+ -+if Options.options.enable_libcap: -+ conf.CHECK_HEADERS('sys/capability.h') -+ - conf.CHECK_FUNCS('getpwnam_r getpwuid_r getpwent_r') - - # solaris varients of getXXent_r diff --git a/lib/replace/wscript b/lib/replace/wscript -index fc43e1a..12d2a70 100644 +index 2c638b7..079761d 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript @@ -23,6 +23,41 @@ def set_options(opt): @@ -114,32 +100,33 @@ index fc43e1a..12d2a70 100644 conf.CHECK_HEADERS('port.h') conf.CHECK_HEADERS('sys/fcntl.h sys/filio.h sys/filsys.h sys/fs/s5param.h sys/fs/vx/quota.h') conf.CHECK_HEADERS('sys/id.h sys/ioctl.h sys/ipc.h sys/mman.h sys/mode.h sys/ndir.h sys/priv.h') -@@ -73,7 +121,9 @@ def configure(conf): - - conf.CHECK_CODE('', headers='rpc/rpc.h rpcsvc/yp_prot.h', define='HAVE_RPCSVC_YP_PROT_H') +@@ -101,7 +149,8 @@ def configure(conf): + conf.CHECK_HEADERS('sys/fileio.h sys/filesys.h sys/dustat.h sys/sysmacros.h') + conf.CHECK_HEADERS('xfs/libxfs.h netgroup.h') - conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h valgrind/memcheck.h') + if Options.options.enable_valgrind: + conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h valgrind/memcheck.h') -+ conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h') conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h') conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h') -@@ -248,17 +298,18 @@ def configure(conf): +@@ -294,22 +343,18 @@ def configure(conf): conf.CHECK_FUNCS('prctl dirname basename') +- strlcpy_in_bsd = False +- - # libbsd on some platforms provides strlcpy and strlcat - if not conf.CHECK_FUNCS('strlcpy strlcat'): -- conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', -- checklibc=True) +- if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', +- checklibc=True): +- strlcpy_in_bsd = True - if not conf.CHECK_FUNCS('getpeereid'): - conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') - if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): - conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h') -- -- if not conf.CHECK_FUNCS('closefrom'): -- conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') +- if not conf.CHECK_FUNCS('setproctitle_init'): +- conf.CHECK_FUNCS_IN('setproctitle_init', 'bsd', headers='sys/types.h bsd/unistd.h') + if Options.options.enable_libbsd: + # libbsd on some platforms provides strlcpy and strlcat + if not conf.CHECK_FUNCS('strlcpy strlcat'): @@ -149,32 +136,41 @@ index fc43e1a..12d2a70 100644 + conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') + if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): + conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h') -+ + +- if not conf.CHECK_FUNCS('closefrom'): +- conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') + if not conf.CHECK_FUNCS('closefrom'): + conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') conf.CHECK_CODE(''' struct ucred cred; +@@ -660,7 +705,7 @@ removeea setea + # look for a method of finding the list of network interfaces + for method in ['HAVE_IFACE_GETIFADDRS', 'HAVE_IFACE_AIX', 'HAVE_IFACE_IFCONF', 'HAVE_IFACE_IFREQ']: + bsd_for_strlcpy = '' +- if strlcpy_in_bsd: ++ if Options.options.enable_libbsd: + bsd_for_strlcpy = ' bsd' + if conf.CHECK_CODE(''' + #define %s 1 diff --git a/wscript b/wscript -old mode 100755 -new mode 100644 -index 71b9475..50793db +index 94d190f..742f779 100644 --- a/wscript +++ b/wscript -@@ -26,7 +26,12 @@ def set_options(opt): - opt.add_option('--disable-python', - help=("disable the pytevent module"), - action="store_true", dest='disable_python', default=False) +@@ -22,7 +22,12 @@ def set_options(opt): + opt.PRIVATE_EXTENSION_DEFAULT('tevent', noextension='tevent') + opt.RECURSE('lib/replace') + opt.RECURSE('lib/talloc') - -+ opt.add_option('--with-valgrind', -+ help=("enable use of valgrind"), -+ action="store_true", dest='enable_valgrind') -+ opt.add_option('--without-valgrind', -+ help=("disable use of valgrind"), -+ action="store_false", dest='enable_valgrind', default=False) ++ opt.add_option('--with-valgrind', ++ help=("enable use of valgrind"), ++ action="store_true", dest='enable_valgrind') ++ opt.add_option('--without-valgrind', ++ help=("disable use of valgrind"), ++ action="store_false", dest='enable_valgrind', default=False) def configure(conf): conf.RECURSE('lib/replace') -- -2.8.3 +2.16.2 diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.9.31.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.9.36.bb index ad711e730..c91b221b1 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.9.31.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.9.36.bb @@ -3,16 +3,16 @@ HOMEPAGE = "http://tevent.samba.org" SECTION = "libs" LICENSE = "LGPLv3+" -DEPENDS += "libtalloc" +DEPENDS += "libtalloc libtirpc" RDEPENDS_python-tevent = "python" SRC_URI = "https://samba.org/ftp/tevent/tevent-${PV}.tar.gz \ - file://tevent-Add-configure-options-for-packages.patch \ + file://options-0.9.36.patch \ " LIC_FILES_CHKSUM = "file://tevent.h;endline=26;md5=4e458d658cb25e21efc16f720e78b85a" -SRC_URI[md5sum] = "5453847664ae6bc4ec0153e59ac635b9" -SRC_URI[sha256sum] = "4a13f2256ad804c860e84068258bd0f8be31cf0c79aa8f3019fa32f6928c2bfc" +SRC_URI[md5sum] = "87d67bca75b231814435c47bec0aff8a" +SRC_URI[sha256sum] = "bd2b6be3fd1601ed7f176e99111e322c57d58e425cc149ee80c7dd4fed263b4c" inherit waf-samba diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.17.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.17.bb index 11c43ff0f..121cc9945 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.17.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.17.bb @@ -8,22 +8,19 @@ LIC_FILES_CHKSUM = " \ file://COPYING;md5=0c56db0143f4f80c369ee3af7425af6e \ " -SRC_URI = "${SOURCEFORGE_MIRROR}/lksctp/${BP}.tar.gz \ +SRCREV = "736b91d340e3f2519714f2930ed63b164d363511" + +PV .= "+git${SRCPV}" +LK_REL = "1.0.17" + +SRC_URI = " \ + git://github.com/sctp/lksctp-tools.git \ file://run-ptest \ file://v4test.sh \ file://v6test.sh \ " -SRC_URI[md5sum] = "68e9b8fa4d4e331029b247b72d46d7a5" -SRC_URI[sha256sum] = "1aeb204cdb2befc94d9eb3037d1609c9d1d2cd5379d6dd2c0a8ca9b10533aa15" - -#| arm-oe-linux-gnueabi-libtool: link: arm-oe-linux-gnueabi-gcc -march=armv5te -marm -mthumb-interwork --sysroot=/home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/qemuarm -shared -fPIC -DPIC .libs/bindx.o .libs/connectx.o .libs/peeloff.o .libs/opt_info.o .libs/addrs.o .libs/sendmsg.o .libs/recvmsg.o -march=armv5te -marm -mthumb-interwork --sysroot=/home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/qemuarm -O2 -Wl,--version-script=/home/jenkins/oe/world/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/lksctp-tools/1.0.16-r0/lksctp-tools-1.0.16/src/lib/Versions.map -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -Wl,-soname -Wl,libsctp.so.1 -o .libs/libsctp.so.1.0.16 -#| /home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.9.0/ld: error: symbol sctp_connectx has undefined version -#| collect2: error: ld returned 1 exit status -#| make[4]: *** [libsctp.la] Error 1 -PNBLACKLIST[lksctp-tools] ?= "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', "BROKEN: fails to link against sctp_connectx symbol", '', d)}" - -S = "${WORKDIR}/${BP}" +S = "${WORKDIR}/git" BBCLASSEXTEND = "native" @@ -37,7 +34,7 @@ do_install_ptest () { done } -SOLIBVERSION="${PV}" +SOLIBVERSION="${LK_REL}" SOLIBMAJORVERSION="1" PACKAGES =+ "${PN}-withsctp ${PN}-utils" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-coordinator-Fix-strncpy-range-warning.patch b/import-layers/meta-openembedded/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-coordinator-Fix-strncpy-range-warning.patch new file mode 100644 index 000000000..493832bb8 --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-coordinator-Fix-strncpy-range-warning.patch @@ -0,0 +1,30 @@ +From f017353b8f3170ce79e7addc127056c0142f087b Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 1 Apr 2018 14:31:05 -0700 +Subject: [PATCH] coordinator: Fix strncpy range warning + +Fixes +error: 'strncpy' specified bound 4096 equals destination size [-Werror=stringop-truncation] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/coordinator.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/coordinator.c b/src/coordinator.c +index c139aae..ca49418 100644 +--- a/src/coordinator.c ++++ b/src/coordinator.c +@@ -296,7 +296,8 @@ int main(int argc, char **argv) + if(!lease_file) + lease_file = LEASE_FILE; + +- strncpy(pname, argv[0], PATH_MAX); ++ strncpy(pname, argv[0], PATH_MAX - 1); ++ pname[PATH_MAX - 1] = '\0'; + + pid_file = getenv("PID_FILE"); + if (!pid_file) +-- +2.16.3 + diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb index be73f8ae4..d0fe59c98 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb @@ -8,14 +8,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" DEPENDS = "flex-native bison-native libnl python" PV = "0.3.1+git${SRCPV}" -SRC_URI = "git://git.code.sf.net/p/linux-zigbee/linux-zigbee \ +SRC_URI = "git://github.com/linux-wpan/lowpan-tools \ file://no-help2man.patch \ file://0001-Fix-build-errors-with-clang.patch \ file://0001-addrdb-coord-config-parse.y-add-missing-time.h-inclu.patch \ file://0001-src-iz.c-Undef-dprintf-before-redefining.patch \ file://0001-Remove-newline-from-format-line.patch \ + file://0001-coordinator-Fix-strncpy-range-warning.patch \ " -SRCREV = "38f42dbfce9e13629263db3bd3b81f14c69bb733" +SRCREV = "1c2d8674cc6f4b1166a066e8822e295c105ae7a2" S = "${WORKDIR}/git" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6_git.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6_git.bb index 48a83b830..cebc1d9cd 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6_git.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6_git.bb @@ -20,8 +20,12 @@ inherit autotools gettext EXTRA_OECONF += "PERL=${USRBINPATH}/perl" LDFLAGS += "-fuse-ld=gold" +LDFLAGS_remove_riscv64 = "-fuse-ld=gold" + TOOLCHAIN = "gcc" +USE_NLS = "yes" + do_configure_prepend() { cp ${STAGING_DATADIR_NATIVE}/gettext/gettext.h ${S}/include ${S}/autogen.sh diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2_1.26.0.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2_1.26.0.bb new file mode 100644 index 000000000..3ccd486be --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2_1.26.0.bb @@ -0,0 +1,13 @@ +SUMMARY = "HTTP/2 C Library and tools" +HOMEPAGE = "https://nghttp2.org/" +SECTION = "libs" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=764abdf30b2eadd37ce47dcbce0ea1ec" + +SRC_URI = "https://github.com/nghttp2/nghttp2/releases/download/v${PV}/nghttp2-${PV}.tar.bz2" +SRC_URI[md5sum] = "926f07ad3b50f38f7d8935ced04716cf" +SRC_URI[sha256sum] = "0df4229f4123b5aa96e834ebcfdffe954e93d986f0252fd10123d50c6f010983" + +DEPENDS = "libxml2 openssl zlib jansson cunit c-ares" + +inherit cmake pythonnative python-dir diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/nis/nis.inc b/import-layers/meta-openembedded/meta-networking/recipes-support/nis/nis.inc index e027a1c6f..200eaf74d 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/nis/nis.inc +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/nis/nis.inc @@ -27,5 +27,5 @@ do_install() { python () { os = d.getVar("TARGET_OS", True) if os == "linux-uclibc": - raise bb.parse.SkipPackage("NIS functionality requires rpcsvc/yp.h, uClibC does not provide this") + raise bb.parse.SkipRecipe("NIS functionality requires rpcsvc/yp.h, uClibC does not provide this") } diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/nis/yp-tools/0001-ypbind3_binding_dup.c-Include-string.h-for-strdup-de.patch b/import-layers/meta-openembedded/meta-networking/recipes-support/nis/yp-tools/0001-ypbind3_binding_dup.c-Include-string.h-for-strdup-de.patch deleted file mode 100644 index 3d4d4f278..000000000 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/nis/yp-tools/0001-ypbind3_binding_dup.c-Include-string.h-for-strdup-de.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 420cb6927553bbca5b49b7681cf208e6df6e4d7c Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 8 Sep 2017 08:42:45 -0700 -Subject: [PATCH 1/2] ypbind3_binding_dup.c: Include string.h for strdup - declaration - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Submitted - - lib/ypbind3_binding_dup.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lib/ypbind3_binding_dup.c b/lib/ypbind3_binding_dup.c -index ce4aadf..8199c0b 100644 ---- a/lib/ypbind3_binding_dup.c -+++ b/lib/ypbind3_binding_dup.c -@@ -19,6 +19,7 @@ - - #if defined(HAVE_YPBIND3) - -+#include <string.h> - #include <rpcsvc/yp_prot.h> - #include "internal.h" - --- -2.14.1 - diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/nis/yp-tools/0002-yp_dump_bindings.c-Include-string.h-for-memset.patch b/import-layers/meta-openembedded/meta-networking/recipes-support/nis/yp-tools/0002-yp_dump_bindings.c-Include-string.h-for-memset.patch deleted file mode 100644 index 0562e58af..000000000 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/nis/yp-tools/0002-yp_dump_bindings.c-Include-string.h-for-memset.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 03ccabb6264c008430c4b1739351df5a63829f8e Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 8 Sep 2017 08:52:32 -0700 -Subject: [PATCH 2/2] yp_dump_bindings.c: Include string.h for memset - -Fixes -error: implicitly declaring library function 'memset' - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Submitted - - src/yp_dump_binding.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/yp_dump_binding.c b/src/yp_dump_binding.c -index a5ab920..d75e2c2 100644 ---- a/src/yp_dump_binding.c -+++ b/src/yp_dump_binding.c -@@ -26,6 +26,7 @@ - #include <libintl.h> - #include <locale.h> - #include <getopt.h> -+#include <string.h> - #include <sys/stat.h> - #include <arpa/inet.h> - #include <rpcsvc/ypclnt.h> --- -2.14.1 - diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/nis/yp-tools_4.2.2.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/nis/yp-tools_4.2.3.bb index 9ac973812..4e27e32d4 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/nis/yp-tools_4.2.2.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/nis/yp-tools_4.2.3.bb @@ -11,13 +11,14 @@ ypwhich, yppasswd, domainname, nisdomainname \ and ypdomainname. \ " -SRC_URI = "http://www.linux-nis.org/download/yp-tools/${BP}.tar.bz2 \ +# v4.2.3 +SRCREV = "1bfda29c342a81b97cb1995ffd9e8da5de63e7ab" + +SRC_URI = "git://github.com/thkukuk/yp-tools \ file://domainname.service \ - file://0001-ypbind3_binding_dup.c-Include-string.h-for-strdup-de.patch \ - file://0002-yp_dump_bindings.c-Include-string.h-for-memset.patch \ " -SRC_URI[md5sum] = "fb4a8bffb44ae5d3390351d67f320ef3" -SRC_URI[sha256sum] = "137f19a986382b275bf4a2b1a69eb26689d6f4ac056ddaa21784d6b80eb98faa" + +S = "${WORKDIR}/git" DEPENDS = "libtirpc libnsl2" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ntimed/ntimed_git.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/ntimed/ntimed_git.bb index 527ea33b5..a749b1659 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/ntimed/ntimed_git.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/ntimed/ntimed_git.bb @@ -6,7 +6,7 @@ HOMEPAGE = "https://github.com/bsdphk/Ntimed" SECTION = "net" LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://main.c;startline=2;endline=24;md5=eda11d21005319bb76cbb6f911f0f66d" +LIC_FILES_CHKSUM = "file://main.c;beginline=2;endline=24;md5=89db8e76f2951f3fad167e7aa9718a44" SRC_URI = "git://github.com/bsdphk/Ntimed \ file://use-ldflags.patch" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ntp/ntp/ntp-4.2.4_p6-nano.patch b/import-layers/meta-openembedded/meta-networking/recipes-support/ntp/ntp/ntp-4.2.4_p6-nano.patch index cb1e2f734..d45b7e38b 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/ntp/ntp/ntp-4.2.4_p6-nano.patch +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/ntp/ntp/ntp-4.2.4_p6-nano.patch @@ -1,6 +1,16 @@ ---- a/include/ntp_syscall.h.orig 2009-05-19 16:44:55.048156467 -0400 -+++ b/include/ntp_syscall.h 2009-05-19 16:46:19.293323686 -0400 -@@ -14,6 +14,14 @@ +From 2310898533f059d875dcffd26ab6cf1b280292fd Mon Sep 17 00:00:00 2001 +From: Koen Kooi <koen@dominion.thruhere.net> +Date: Wed, 12 Jan 2011 21:38:46 +0100 + +--- + include/ntp_syscall.h | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/include/ntp_syscall.h b/include/ntp_syscall.h +index d1ce03e..9e18432 100644 +--- a/include/ntp_syscall.h ++++ b/include/ntp_syscall.h +@@ -10,6 +10,14 @@ # include <sys/timex.h> #endif @@ -13,5 +23,5 @@ +#endif + #ifndef NTP_SYSCALLS_LIBC - #ifdef NTP_SYSCALLS_STD - # define ntp_adjtime(t) syscall(SYS_ntp_adjtime, (t)) + # ifdef NTP_SYSCALLS_STD + # define ntp_adjtime(t) syscall(SYS_ntp_adjtime, (t)) diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ntp/ntp_4.2.8p10.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/ntp/ntp_4.2.8p11.bb index 719c60b97..c698fa049 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/ntp/ntp_4.2.8p10.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/ntp/ntp_4.2.8p11.bb @@ -23,8 +23,8 @@ SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${PV}.tar.g file://ntpd.list \ " -SRC_URI[md5sum] = "745384ed0dedb3f66b33fe84d66466f9" -SRC_URI[sha256sum] = "ddd2366e64219b9efa0f7438e06800d0db394ac5c88e13c17b70d0dcdf99b99f" +SRC_URI[md5sum] = "00950ca2855579541896513e78295361" +SRC_URI[sha256sum] = "f14a39f753688252d683ff907035ffff106ba8d3db21309b742e09b5c3cd278e" inherit autotools update-rc.d useradd systemd pkgconfig @@ -109,6 +109,8 @@ PACKAGES += "ntpdate sntp ${PN}-tickadj ${PN}-utils" # ntp originally includes tickadj. It's split off for inclusion in small firmware images on platforms # with wonky clocks (e.g. OpenSlug) RDEPENDS_${PN} = "${PN}-tickadj" +# ntpd require libgcc for execution +RDEPENDS_${PN} += "libgcc" # Handle move from bin to utils package RPROVIDES_${PN}-utils = "${PN}-bin" RREPLACES_${PN}-utils = "${PN}-bin" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/open-isns/open-isns_0.97.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/open-isns/open-isns_0.97.bb index cc2959e2b..abfa7510e 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/open-isns/open-isns_0.97.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/open-isns/open-isns_0.97.bb @@ -11,7 +11,7 @@ LICENSE = "GPLv2+ & LGPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=321bf41f280cf805086dd5a720b37785" SECTION = "net" -DEPENDS = "openssl systemd" +DEPENDS = "openssl" SRC_URI = "git://github.com/open-iscsi/open-isns \ file://0001-util.h-endian.h-is-available-on-musl-on-linux.patch \ @@ -21,9 +21,7 @@ SRCREV ?= "09954404e948e41eb0fce8e28836018b4ce3d20d" S = "${WORKDIR}/git" -inherit systemd autotools-brokensep distro_features_check -# depends on systemd -REQUIRED_DISTRO_FEATURES = "systemd" +inherit systemd autotools-brokensep update-rc.d EXTRA_OECONF = " --prefix=${prefix} --enable-shared" EXTRA_OEMAKE += "SYSTEMDDIR=${D}${systemd_unitdir}/system" @@ -31,6 +29,12 @@ EXTRA_OEMAKE += "SYSTEMDDIR=${D}${systemd_unitdir}/system" do_install_append () { oe_runmake INCDIR=${D}${includedir}/libisns/ install_hdrs oe_runmake LIBDIR=${D}${libdir} install_lib + + install -D -m 755 ${S}/etc/openisns.init ${D}${sysconfdir}/init.d/openisns + sed -i 's|daemon isnsd|start-stop-daemon --start --quiet --oknodo --exec ${sbindir}/isnsd --|' \ + ${D}${sysconfdir}/init.d/openisns } FILES_${PN} += "${libdir} ${systemd_unitdir}" + +INITSCRIPT_NAME = "openisns" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/openipmi/files/fix-symlink-install-error-in-cmdlang.patch b/import-layers/meta-openembedded/meta-networking/recipes-support/openipmi/files/fix-symlink-install-error-in-cmdlang.patch index 9a568b2b2..449142fcf 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/openipmi/files/fix-symlink-install-error-in-cmdlang.patch +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/openipmi/files/fix-symlink-install-error-in-cmdlang.patch @@ -8,11 +8,11 @@ Date: Thu Jun 7 16:00:13 2012 -0400 Signed-off-by: Aws Ismail <aws.ismail@windriver.com> -diff --git a/cmdlang/Makefile.am b/cmdlang/Makefile.am -index 92d6e83..f6039f9 100644 ---- a/cmdlang/Makefile.am -+++ b/cmdlang/Makefile.am -@@ -36,6 +36,7 @@ CLEANFILES = libOpenIPMIcmdlang.map +Index: OpenIPMI-2.0.24/cmdlang/Makefile.am +=================================================================== +--- OpenIPMI-2.0.24.orig/cmdlang/Makefile.am ++++ OpenIPMI-2.0.24/cmdlang/Makefile.am +@@ -35,6 +35,7 @@ openipmish_LDADD = libOpenIPMIcmdlang.l # compatability. install-data-local: rm -f $(DESTDIR)$(bindir)/ipmish diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/openipmi/files/include_sys_types.patch b/import-layers/meta-openembedded/meta-networking/recipes-support/openipmi/files/include_sys_types.patch index 58ec5d883..082511a67 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/openipmi/files/include_sys_types.patch +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/openipmi/files/include_sys_types.patch @@ -3,10 +3,10 @@ include sys/types.h for u_int32_t ui.c:340:5: error: unknown type name 'u_int32_t'; did you mean 'uint32_t'? u_int32_t addr; ^~~~~~~~~ -Index: OpenIPMI-2.0.22/ui/ui.c +Index: OpenIPMI-2.0.24/ui/ui.c =================================================================== ---- OpenIPMI-2.0.22.orig/ui/ui.c -+++ OpenIPMI-2.0.22/ui/ui.c +--- OpenIPMI-2.0.24.orig/ui/ui.c ++++ OpenIPMI-2.0.24/ui/ui.c @@ -42,6 +42,7 @@ #include <fcntl.h> #include <time.h> @@ -14,4 +14,4 @@ Index: OpenIPMI-2.0.22/ui/ui.c +#include <sys/types.h> #include <ctype.h> - #include <OpenIPMI/selector.h> + #include <OpenIPMI/ipmi_err.h> diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.4.3.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.4.4.bb index 90097f32a..4cad99869 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.4.3.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.4.4.bb @@ -12,8 +12,8 @@ SRC_URI = "http://swupdate.openvpn.org/community/releases/${BP}.tar.gz \ file://openvpn@.service \ file://openvpn-volatile.conf" -SRC_URI[md5sum] = "e1929f82aff40f3d105e5f72aacff9c1" -SRC_URI[sha256sum] = "cee3d3ca462960a50a67c0ebd186e01b6d13db70275205663695152c9aca8579" +SRC_URI[md5sum] = "705a79d005558d94fa1e2b74e4413e97" +SRC_URI[sha256sum] = "1ae883d9522c9fa6d189e5e4aaa058a93edd3d0b897e3c2664107c4785099fc3" SYSTEMD_SERVICE_${PN} += "openvpn@loopback-server.service openvpn@loopback-client.service" SYSTEMD_AUTO_ENABLE = "disable" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ssmtp/ssmtp/ssmtp-bug584162-fix.patch b/import-layers/meta-openembedded/meta-networking/recipes-support/ssmtp/ssmtp/ssmtp-bug584162-fix.patch new file mode 100644 index 000000000..e087bc752 --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/ssmtp/ssmtp/ssmtp-bug584162-fix.patch @@ -0,0 +1,126 @@ +Bug-Debian: http://bugs.debian.org/584162 +Reported-By: Christoph Biedl <debian.axhn@manchmal.in-ulm.de> +Forwarded: not-needed +Reviewed-By: Anibal Monsalve Salazar <anibal@debian.org> +Last-Update: 2014-08-15 + +From: "Daniel Richard G." <skunk@iSKUNK.ORG> +Subject: Re: ssmtp: Partial loss of message body, sending message to wrong recipicients +Date: Thu, 19 Jun 2014 14:44:30 -0400 + +Attached is a patch against the original 2.64 source that should address +this bug, and hopefully not break anything. An overview of my changes: + +* Added code to standarise() to drop the trailing '\r' if the line + originally ended with "\r\n". + +* Added a check to header_parse() that effectively converts an "\r\n" in + the input into '\n'. + +* Added a conditional so that header_parse() doesn't pass the empty + string to header_save()---a behavior I observed in testing, at the end + of a header block with "\r\n" line endings. + +* Simplified the last if(in_header) conditional in header_parse(), + because it erroneously assumes that if in_header == True, then c could + have some value other than EOF. (See the condition on the previous + "while" loop, and the lack of any other way to exit said loop.) + + header_parse() will now properly grab a header if fed a message + without a body (i.e. no "\n\n" ending the header block), although this + code will still drop a header if there is no newline at the end. + +Christoph, thank you for your excellent analysis, and the test cases. I +made use of them, and with my changes sSMTP appears to do the right +thing. + +Debian patch from: https://sources.debian.net/patches/ssmtp/2.64-8/ + +Upstream-Status: Backport [debian] + +Signed-off-by: Andre McCurdy <armccurdy@gmail.com> + +Index: ssmtp-2.64/ssmtp.c +=================================================================== +--- ssmtp-2.64.orig/ssmtp.c ++++ ssmtp-2.64/ssmtp.c +@@ -375,6 +375,12 @@ bool_t standardise(char *str, bool_t *li + if((p = strchr(str, '\n'))) { + *p = (char)NULL; + *linestart = True; ++ ++ /* If the line ended in "\r\n", then drop the '\r' too */ ++ sl = strlen(str); ++ if(sl >= 1 && str[sl - 1] == '\r') { ++ str[sl - 1] = (char)NULL; ++ } + } + return(leadingdot); + } +@@ -768,6 +774,14 @@ void header_parse(FILE *stream) + } + len++; + ++ if(l == '\r' && c == '\n') { ++ /* Properly handle input that already has "\r\n" ++ line endings; see https://bugs.debian.org/584162 */ ++ l = (len >= 2 ? *(q - 2) : '\n'); ++ q--; ++ len--; ++ } ++ + if(l == '\n') { + switch(c) { + case ' ': +@@ -790,7 +804,9 @@ void header_parse(FILE *stream) + if((q = strrchr(p, '\n'))) { + *q = (char)NULL; + } +- header_save(p); ++ if(len > 0) { ++ header_save(p); ++ } + + q = p; + len = 0; +@@ -800,35 +816,12 @@ void header_parse(FILE *stream) + + l = c; + } +- if(in_header) { +- if(l == '\n') { +- switch(c) { +- case ' ': +- case '\t': +- /* Must insert '\r' before '\n's embedded in header +- fields otherwise qmail won't accept our mail +- because a bare '\n' violates some RFC */ +- +- *(q - 1) = '\r'; /* Replace previous \n with \r */ +- *q++ = '\n'; /* Insert \n */ +- len++; +- +- break; +- +- case '\n': +- in_header = False; +- +- default: +- *q = (char)NULL; +- if((q = strrchr(p, '\n'))) { +- *q = (char)NULL; +- } +- header_save(p); +- +- q = p; +- len = 0; +- } ++ if(in_header && l == '\n') { ++ /* Got EOF while reading the header */ ++ if((q = strrchr(p, '\n'))) { ++ *q = (char)NULL; + } ++ header_save(p); + } + (void)free(p); + } diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ssmtp/ssmtp_2.64.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/ssmtp/ssmtp_2.64.bb index 9d4864d79..07e3ffed4 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/ssmtp/ssmtp_2.64.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/ssmtp/ssmtp_2.64.bb @@ -1,25 +1,29 @@ SUMMARY = "extremely simple MTA to get mail off the system to a mail hub" HOMEPAGE = "http://packages.qa.debian.org/s/ssmtp.html" - LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=0c56db0143f4f80c369ee3af7425af6e" -SRC_URI = "\ - ${DEBIAN_MIRROR}/main/s/${BPN}/${BPN}_${PV}.orig.tar.bz2 \ +SRC_URI = "${DEBIAN_MIRROR}/main/s/${BPN}/${BPN}_${PV}.orig.tar.bz2 \ + file://ssmtp-bug584162-fix.patch \ file://build-ouside_srcdir.patch \ file://use-DESTDIR.patch \ - " - -EXTRA_OECONF += "--mandir=${mandir}" - -EXTRA_OEMAKE = "GEN_CONFIG='/bin/true'" +" SRC_URI[md5sum] = "65b4e0df4934a6cd08c506cabcbe584f" SRC_URI[sha256sum] = "22c37dc90c871e8e052b2cab0ad219d010fa938608cd66b21c8f3c759046fa36" -inherit autotools pkgconfig +inherit autotools + +PACKAGECONFIG ?= "ssl ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" + +PACKAGECONFIG[ssl] = "--enable-ssl,--disable-ssl,openssl" +PACKAGECONFIG[ipv6] = "--enable-inet6,--disable-inet6" + +EXTRA_OECONF += "--mandir=${mandir}" + +EXTRA_OEMAKE = "GEN_CONFIG='/bin/true'" -DEPENDS += "openssl inetutils" +LDFLAGS += "${@bb.utils.contains('PACKAGECONFIG', 'ssl', '-lssl -lcrypto', '', d)}" do_install_append () { install -d ${D}${mandir}/ diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/strongswan/files/0001-memory.h-Include-stdint.h-for-uintptr_t.patch b/import-layers/meta-openembedded/meta-networking/recipes-support/strongswan/files/0001-memory.h-Include-stdint.h-for-uintptr_t.patch index 7ebc39818..00178c84a 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/strongswan/files/0001-memory.h-Include-stdint.h-for-uintptr_t.patch +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/strongswan/files/0001-memory.h-Include-stdint.h-for-uintptr_t.patch @@ -1,15 +1,16 @@ -From 2a3ab04bbdc4624792886aa51579eadb427ef99e Mon Sep 17 00:00:00 2001 +From 33a53dc13fd924949a582109b45fedd8d0bed59b Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Tue, 27 Jun 2017 07:42:11 -0700 Subject: [PATCH] memory.h: Include stdint.h for uintptr_t Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- src/libstrongswan/utils/utils/memory.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/libstrongswan/utils/utils/memory.h b/src/libstrongswan/utils/utils/memory.h -index b978e7c..55aaaf5 100644 +index e840330..8a356a8 100644 --- a/src/libstrongswan/utils/utils/memory.h +++ b/src/libstrongswan/utils/utils/memory.h @@ -22,6 +22,8 @@ @@ -21,6 +22,3 @@ index b978e7c..55aaaf5 100644 /** * Helper function that compares two binary blobs for equality */ --- -2.13.2 - diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/strongswan/files/fix-funtion-parameter.patch b/import-layers/meta-openembedded/meta-networking/recipes-support/strongswan/files/fix-funtion-parameter.patch index da96983e6..be660d1fd 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/strongswan/files/fix-funtion-parameter.patch +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/strongswan/files/fix-funtion-parameter.patch @@ -1,4 +1,7 @@ -fix the function parameter +From 9f97479373f3fceedc471074b81486d77a49618d Mon Sep 17 00:00:00 2001 +From: "Roy.Li" <rongqing.li@windriver.com> +Date: Tue, 4 Mar 2014 14:38:42 +0800 +Subject: [PATCH] fix the function parameter Upstream-Status: pending @@ -31,9 +34,10 @@ on PPC, Now we simply correct the number of parameters. #11 0x4836c378 in process_message (this=0x514005f0, message=0x51500778) at sa/ike_sa.c:1317 #12 0x48362270 in execute (this=0x515008d0) - at processing/jobs/process_message_job.c:74 + at processing/jobs/process_message_job.c:74 Signed-off-by: Roy.Li <rongqing.li@windriver.com> + --- src/libstrongswan/plugins/openssl/openssl_diffie_hellman.c | 8 +++++++- src/libstrongswan/plugins/openssl/openssl_diffie_hellman.h | 4 +++- @@ -41,20 +45,20 @@ Signed-off-by: Roy.Li <rongqing.li@windriver.com> 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/libstrongswan/plugins/openssl/openssl_diffie_hellman.c b/src/libstrongswan/plugins/openssl/openssl_diffie_hellman.c -index ff33824..bd21446 100644 +index 8e9c118..a73b038 100644 --- a/src/libstrongswan/plugins/openssl/openssl_diffie_hellman.c +++ b/src/libstrongswan/plugins/openssl/openssl_diffie_hellman.c -@@ -142,7 +142,7 @@ METHOD(diffie_hellman_t, destroy, void, +@@ -192,7 +192,7 @@ METHOD(diffie_hellman_t, destroy, void, /* * Described in header. */ -openssl_diffie_hellman_t *openssl_diffie_hellman_create( +openssl_diffie_hellman_t *openssl_diffie_hellman_create_custom( - diffie_hellman_group_t group, chunk_t g, chunk_t p) + diffie_hellman_group_t group, ...) { private_openssl_diffie_hellman_t *this; -@@ -197,5 +197,11 @@ openssl_diffie_hellman_t *openssl_diffie_hellman_create( - +@@ -255,5 +255,11 @@ openssl_diffie_hellman_t *openssl_diffie_hellman_create( + DBG2(DBG_LIB, "size of DH secret exponent: %d bits", BN_num_bits(privkey)); return &this->public; } +openssl_diffie_hellman_t *openssl_diffie_hellman_create( diffie_hellman_group_t group) @@ -66,26 +70,26 @@ index ff33824..bd21446 100644 #endif /* OPENSSL_NO_DH */ diff --git a/src/libstrongswan/plugins/openssl/openssl_diffie_hellman.h b/src/libstrongswan/plugins/openssl/openssl_diffie_hellman.h -index 53dc59c..eb69eaa 100644 +index 5de5520..22586e0 100644 --- a/src/libstrongswan/plugins/openssl/openssl_diffie_hellman.h +++ b/src/libstrongswan/plugins/openssl/openssl_diffie_hellman.h -@@ -44,8 +44,10 @@ struct openssl_diffie_hellman_t { - * @param p custom prime, if MODP_CUSTOM +@@ -43,8 +43,10 @@ struct openssl_diffie_hellman_t { + * @param ... expects generator and prime as chunk_t if MODP_CUSTOM * @return openssl_diffie_hellman_t object, NULL if not supported */ -openssl_diffie_hellman_t *openssl_diffie_hellman_create( +openssl_diffie_hellman_t *openssl_diffie_hellman_create_custom( - diffie_hellman_group_t group, chunk_t g, chunk_t p); + diffie_hellman_group_t group, ...); +openssl_diffie_hellman_t *openssl_diffie_hellman_create( + diffie_hellman_group_t group); #endif /** OPENSSL_DIFFIE_HELLMAN_H_ @}*/ diff --git a/src/libstrongswan/plugins/openssl/openssl_plugin.c b/src/libstrongswan/plugins/openssl/openssl_plugin.c -index ff25086..c76873d 100644 +index 8b0a7c5..114d575 100644 --- a/src/libstrongswan/plugins/openssl/openssl_plugin.c +++ b/src/libstrongswan/plugins/openssl/openssl_plugin.c -@@ -388,6 +388,7 @@ METHOD(plugin_t, get_features, int, +@@ -609,6 +609,7 @@ METHOD(plugin_t, get_features, int, PLUGIN_PROVIDE(DH, MODP_1024_BIT), PLUGIN_PROVIDE(DH, MODP_1024_160), PLUGIN_PROVIDE(DH, MODP_768_BIT), @@ -93,6 +97,3 @@ index ff25086..c76873d 100644 PLUGIN_PROVIDE(DH, MODP_CUSTOM), #endif #ifndef OPENSSL_NO_RSA --- -1.8.3 - diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.5.3.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.6.2.bb index 3fb56bcfe..f2fe1f1cb 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.5.3.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.6.2.bb @@ -12,8 +12,8 @@ SRC_URI = "http://download.strongswan.org/strongswan-${PV}.tar.bz2 \ file://0001-memory.h-Include-stdint.h-for-uintptr_t.patch \ " -SRC_URI[md5sum] = "4afffe3c219bb2e04f09510905af836b" -SRC_URI[sha256sum] = "c5ea54b199174708de11af9b8f4ecf28b5b0743d4bc0e380e741f25b28c0f8d4" +SRC_URI[md5sum] = "46aa3aa18fbc4bd528f9a0345ce79913" +SRC_URI[sha256sum] = "e0a60a30ebf3c534c223559e1686497a21ded709a5d605c5123c2f52bcc22e92" EXTRA_OECONF = " \ --without-lib-prefix \ @@ -123,6 +123,7 @@ RDEPENDS_${PN} += "\ ${PN}-plugin-x509 \ ${PN}-plugin-xauth-generic \ ${PN}-plugin-xcbc \ + ${PN}-plugin-curve25519 \ " RPROVIDES_${PN} += "${PN}-systemd" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch b/import-layers/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch index 196cec7f2..b71435a04 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch @@ -1,4 +1,4 @@ -From 7b259580800e259d232229dc89f97058b56e2fe8 Mon Sep 17 00:00:00 2001 +From 8ee1ab1ac89557d48ac1ab7ddcc3c51be9b734ad Mon Sep 17 00:00:00 2001 From: "Hongjun.Yang" <hongjun.yang@windriver.com> Date: Wed, 22 Oct 2014 10:02:48 +0800 Subject: [PATCH] Add ptest for tcpdump @@ -6,15 +6,16 @@ Subject: [PATCH] Add ptest for tcpdump Upstream-Status: Pending Signed-off-by: Hongjun.Yang <hongjun.yang@windriver.com> + --- Makefile.in | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) -Index: tcpdump-4.9.0/Makefile.in -=================================================================== ---- tcpdump-4.9.0.orig/Makefile.in -+++ tcpdump-4.9.0/Makefile.in -@@ -436,9 +436,17 @@ distclean: +diff --git a/Makefile.in b/Makefile.in +index 0941f0e..3ce40c6 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -437,9 +437,17 @@ distclean: tests/failure-outputs.txt rm -rf autom4te.cache tests/DIFF tests/NEW diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch b/import-layers/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch index d7a3ac23b..8cefadf28 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch @@ -1,4 +1,7 @@ -unnecessary to check libpcap +From 741d77e42fc4af49804f7ee43b7237e01633cbcd Mon Sep 17 00:00:00 2001 +From: Roy Li <rongqing.li@windriver.com> +Date: Tue, 8 Jul 2014 13:20:47 +0800 +Subject: [PATCH] unnecessary to check libpcap Upstream-Status: Pending @@ -11,23 +14,21 @@ In fact, the libpcap has been added into the tcpdump's DEPENDS, not need to check if libpcap existed. Signed-off-by: Roy Li <rongqing.li@windriver.com> + --- - configure.in | 2 +- + configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.in b/configure.in -index 06fade1..9125de7 100644 +index b2305a5..b3b5dbf 100644 --- a/configure.in +++ b/configure.in -@@ -567,7 +567,7 @@ AC_SEARCH_LIBS(getrpcbynumber, nsl, - dnl AC_CHECK_LIB(z, uncompress) - dnl AC_CHECK_HEADERS(zlib.h) +@@ -418,7 +418,7 @@ dnl Some platforms may need -lnsl for getrpcbynumber. + AC_SEARCH_LIBS(getrpcbynumber, nsl, + AC_DEFINE(HAVE_GETRPCBYNUMBER, 1, [define if you have getrpcbynumber()])) -AC_LBL_LIBPCAP(V_PCAPDEP, V_INCLS) +#AC_LBL_LIBPCAP(V_PCAPDEP, V_INCLS) # # Check for these after AC_LBL_LIBPCAP, so we link with the appropriate --- -1.7.9.5 - diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/tinyproxy/tinyproxy_1.8.4.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/tinyproxy/tinyproxy_1.8.4.bb index e8025c4b5..98192dc99 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/tinyproxy/tinyproxy_1.8.4.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/tinyproxy/tinyproxy_1.8.4.bb @@ -23,8 +23,8 @@ inherit autotools systemd useradd #User specific USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "nobody" -GROUPADD_PARAM_${PN} = "--system tinyproxy" +USERADD_PARAM_${PN} = "--system --home /dev/null \ + --no-user-group --gid nogroup tinypoxy" SYSTEMD_PACKAGES += "${BPN}" SYSTEMD_SERVICE_${PN} = "tinyproxy.service" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/wireshark/files/libgcrypt.patch b/import-layers/meta-openembedded/meta-networking/recipes-support/wireshark/files/libgcrypt.patch new file mode 100644 index 000000000..2aa58f73c --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/wireshark/files/libgcrypt.patch @@ -0,0 +1,53 @@ +use OR PKG_CONFIG scheme for libgcrypt + +Upstream-Status: Inappropriate OE specific + +Signed-off-by: Armin Kuster <akuster808@gmail.com> + +Index: wireshark-2.4.4/m4/libgcrypt.m4 +=================================================================== +--- wireshark-2.4.4.orig/m4/libgcrypt.m4 ++++ wireshark-2.4.4/m4/libgcrypt.m4 +@@ -27,11 +27,11 @@ AC_DEFUN([AM_PATH_LIBGCRYPT], + libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="") + if test x$libgcrypt_config_prefix != x ; then + if test x${LIBGCRYPT_CONFIG+set} != xset ; then +- LIBGCRYPT_CONFIG=$libgcrypt_config_prefix/bin/libgcrypt-config ++ LIBGCRYPT_CONFIG=$libgcrypt_config_prefix/libgcrypt.pc + fi + fi + +- AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no) ++ AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt.pc, no) + tmp=ifelse([$1], ,1:1.2.0,$1) + if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then + req_libgcrypt_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` +@@ -50,7 +50,7 @@ AC_DEFUN([AM_PATH_LIBGCRYPT], + sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` + req_micro=`echo $min_libgcrypt_version | \ + sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` +- libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version` ++ libgcrypt_config_version=`$PKG_CONFIG --modversion libgcrypt` + major=`echo $libgcrypt_config_version | \ + sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` + minor=`echo $libgcrypt_config_version | \ +@@ -82,7 +82,7 @@ AC_DEFUN([AM_PATH_LIBGCRYPT], + # If we have a recent libgcrypt, we should also check that the + # API is compatible + if test "$req_libgcrypt_api" -gt 0 ; then +- tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0` ++ tmp=`$PKG_CONFIG --api-version libgcrypt 2>/dev/null || echo 0` + if test "$tmp" -gt 0 ; then + AC_MSG_CHECKING([LIBGCRYPT API version]) + if test "$req_libgcrypt_api" -eq "$tmp" ; then +@@ -95,8 +95,8 @@ AC_DEFUN([AM_PATH_LIBGCRYPT], + fi + fi + if test $ok = yes; then +- LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags` +- LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs` ++ LIBGCRYPT_CFLAGS=`$PKG_CONFIG --cflags libgcrypt` ++ LIBGCRYPT_LIBS=`$PKG_CONFIG --libs libgcrypt` + ifelse([$2], , :, [$2]) + else + LIBGCRYPT_CFLAGS="" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_2.2.10.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_2.4.6.bb index 5358ba07f..3da0a7baf 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_2.2.10.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_2.4.6.bb @@ -4,25 +4,27 @@ SECTION = "net" LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=6e271234ba1a13c6e512e76b94ac2f77" -DEPENDS = "pcre expat glib-2.0 glib-2.0-native" +DEPENDS = "pcre expat glib-2.0 glib-2.0-native libgcrypt libgpg-error" -SRC_URI = "https://2.na.dl.wireshark.org/src/all-versions/${BP}.tar.bz2" +SRC_URI = "https://1.as.dl.wireshark.org/src/${BP}.tar.xz" +SRC_URI += "file://libgcrypt.patch" -PE = "1" +UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src" + +SRC_URI[md5sum] = "8cfb73e286dd6427ca4405e6e802d13e" +SRC_URI[sha256sum] = "8e965fd282bc0c09e7c4eba5f08a555d0ccf40a7d1544b939e01b90bc893d5fe" -SRC_URI[md5sum] = "ae3a1a43a6e3687f44a738fd15d78021" -SRC_URI[sha256sum] = "8574a5e1fdec7affae640924bd46c1aed1bd866e02632fa5625e1450e4a50707" +PE = "1" -inherit autotools pkgconfig perlnative +inherit autotools pkgconfig perlnative upstream-version-is-even ARM_INSTRUCTION_SET = "arm" PACKAGECONFIG ?= "libpcap gnutls libnl libcap sbc" PACKAGECONFIG += " ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk2 graphics", "", d)}" -#PACKAGECONFIG += " ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "gtk3", "", d)}" -PACKAGECONFIG[libcap] = "--with-libcap=${STAGING_LIBDIR}, --with-libcap=no --enable-pcap-ng-default , libcap" -PACKAGECONFIG[libpcap] = "--with-pcap=${STAGING_LIBDIR} --with-pcap-remote, --with-pcap=no --enable-pcap-ng-default , libpcap" +PACKAGECONFIG[libcap] = "--with-libcap=${STAGING_DIR_HOST}/usr, --with-libcap=no --enable-pcap-ng-default , libcap" +PACKAGECONFIG[libpcap] = "--with-pcap=${STAGING_DIR_HOST}/usr --with-pcap-remote, --with-pcap=no --enable-pcap-ng-default , libpcap" PACKAGECONFIG[libsmi] = "--with-libsmi=yes, --with-libsmi=no, libsmi" PACKAGECONFIG[libnl] = "--with-libnl=yes, --with-libnl=no, libnl" PACKAGECONFIG[portaudio] = "--with-portaudio=yes, --with-portaudio=no, portaudio-v19" @@ -30,7 +32,6 @@ PACKAGECONFIG[gtk2] = "--with-gtk=2, , gtk+" PACKAGECONFIG[gtk3] = "--with-gtk=3, , gtk+3" PACKAGECONFIG[graphics] = "--enable-wireshark, --with-gtk=no --disable-wireshark," PACKAGECONFIG[gnutls] = "--with-gnutls=yes, --with-gnutls=no, gnutls" -PACKAGECONFIG[gcrypt] = "--with-gcrypt=yes, --with-gcrypt=no, libgcrypt" PACKAGECONFIG[ssl] = "--with-ssl=yes, --with-ssl=no, openssl" PACKAGECONFIG[krb5] = "--with-krb5=yes, --with-krb5=no, krb5" PACKAGECONFIG[lua] = "--with-lua=yes, --with-lua=no, lua" @@ -38,14 +39,15 @@ PACKAGECONFIG[zlib] = "--with-zlib=yes, --with-zlib=no, zlib" PACKAGECONFIG[geoip] = "--with-geoip=yes, --with-geoip=no, geoip" PACKAGECONFIG[plugins] = "--with-plugins=yes, --with-plugins=no" PACKAGECONFIG[sbc] = "--with-sbc=yes, --with-sbc=no, sbc" - -PACKAGECONFIG[libssh] = "--with-ssh=yes, --with-ssh=no, libssh2" - +PACKAGECONFIG[libssh] = "--with-libssh=${STAGING_DIR_HOST}/usr, --with-libssh=no, libssh2" +PACKAGECONFIG[lz4] = "--with-lz4=${STAGING_DIR_HOST}/usr, --with-lz4=no, lz4" # these next two options require addional layers PACKAGECONFIG[c-ares] = "--with-c-ares=yes, --with-c-ares=no, c-ares" -EXTRA_OECONF += "--with-qt=no --enable-tshark --enable-rawshark" +EXTRA_OECONF += "--with-libgcrypt-prefix=${PKG_CONFIG_DIR} --with-qt=no --enable-tshark --enable-rawshark" + +LDFLAGS_append = " -lgpg-error" # Currently wireshark does not install header files do_install_append () { diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/wpan-tools/wpan-tools_git.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/wpan-tools/wpan-tools_git.bb new file mode 100644 index 000000000..b6d2f6923 --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/wpan-tools/wpan-tools_git.bb @@ -0,0 +1,18 @@ +SUMMARY = "Userspace tools for Linux IEEE 802.15.4 stack" +HOMEPAGE = "http://wpan.cakelab.org/releases/" +DESCRIPTION = "This is a set of utils to manage the Linux WPAN stack via \ +netlink interface. This requires recent kernel with nl802154 interface." + +LICENSE = "ISC" +LIC_FILES_CHKSUM = "file://COPYING;md5=4cfd939b1d7e6aba9fcefb7f6e2fd45d" + +DEPENDS = "libnl" + +PV = "0.8+git${SRCPV}" +SRC_URI = "git://github.com/linux-wpan/wpan-tools \ + " +SRCREV = "3f473f5136f89773997cb4fff2d8ed647734e2f5" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig |