diff options
Diffstat (limited to 'meta-openembedded/meta-networking/recipes-support')
32 files changed, 266 insertions, 229 deletions
diff --git a/meta-openembedded/meta-networking/recipes-support/chrony/chrony/0001-Fix-compilation-with-musl.patch b/meta-openembedded/meta-networking/recipes-support/chrony/chrony/0001-Fix-compilation-with-musl.patch new file mode 100644 index 000000000..17b635352 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/chrony/chrony/0001-Fix-compilation-with-musl.patch @@ -0,0 +1,29 @@ +From 11ec10cdb5ab4b94c5999e018a9c854419997761 Mon Sep 17 00:00:00 2001 +From: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> +Date: Wed, 10 Apr 2019 03:18:17 +0200 +Subject: [PATCH] Fix compilation with musl + +Fixes: +../hash_intmd5.c:58: undefined reference to `MIN' + +Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> +--- + hash_intmd5.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/hash_intmd5.c b/hash_intmd5.c +index 49da1cf..47efe4c 100644 +--- a/hash_intmd5.c ++++ b/hash_intmd5.c +@@ -33,6 +33,8 @@ + + #include "md5.c" + ++#include <sys/param.h> ++ + static MD5_CTX ctx; + + int +-- +2.17.1 + diff --git a/meta-openembedded/meta-networking/recipes-support/chrony/chrony_3.3.bb b/meta-openembedded/meta-networking/recipes-support/chrony/chrony_3.4.bb index 2586370fa..f6898c0b7 100644 --- a/meta-openembedded/meta-networking/recipes-support/chrony/chrony_3.3.bb +++ b/meta-openembedded/meta-networking/recipes-support/chrony/chrony_3.4.bb @@ -35,8 +35,13 @@ SRC_URI = "https://download.tuxfamily.org/chrony/chrony-${PV}.tar.gz \ file://chronyd \ file://arm_eabi.patch \ " -SRC_URI[md5sum] = "81ab62cf5d60b4b3fa8cd2c1b267ffd9" -SRC_URI[sha256sum] = "0d1fb2d5875032f2d5a86f3770374c87ee4c941916f64171e81f7684f2a73128" + +SRC_URI_append_libc-musl = " \ + file://0001-Fix-compilation-with-musl.patch \ +" + +SRC_URI[md5sum] = "7170e750469c198fc6784047d6f71144" +SRC_URI[sha256sum] = "af77e47c2610a7e55c8af5b89a8aeff52d9a867dd5983d848b52d374bc0e6b9f" DEPENDS = "pps-tools" diff --git a/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_git.bb b/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_6.9.bb index 198e3ef98..51dcb23d1 100644 --- a/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_git.bb +++ b/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_6.9.bb @@ -4,12 +4,10 @@ SECTION = "otherosfs" LICENSE = "GPLv3 & LGPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -PV = "6.7" +PV = "6.9" -SRCREV = "8101a07871f185c7044fa2ca221b282ab4607c8b" -SRC_URI = "git://git.samba.org/cifs-utils.git \ - file://0001-mount.cifs-Remove-data_blob.h-include.patch \ - " +SRCREV = "9a8c21ad9e4510a83a3a41f7a04f763a4fe9ec09" +SRC_URI = "git://git.samba.org/cifs-utils.git" S = "${WORKDIR}/git" DEPENDS += "libtalloc" diff --git a/meta-openembedded/meta-networking/recipes-support/cifs/files/0001-mount.cifs-Remove-data_blob.h-include.patch b/meta-openembedded/meta-networking/recipes-support/cifs/files/0001-mount.cifs-Remove-data_blob.h-include.patch deleted file mode 100644 index 07f2a5726..000000000 --- a/meta-openembedded/meta-networking/recipes-support/cifs/files/0001-mount.cifs-Remove-data_blob.h-include.patch +++ /dev/null @@ -1,32 +0,0 @@ -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/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.2.36.bb b/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.2.36.3.bb index 39bfb912e..be633e03b 100644 --- a/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.2.36.bb +++ b/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.2.36.3.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] = "a8d6492584025b2413e82ea48de3cd5f" -SRC_URI[sha256sum] = "e9aba89bb1ac1e9581b84e4a7a50f53142539614eaf7cc4c80007ebea4988be5" +SRC_URI[md5sum] = "80c1c271b1c4cbe26a793f4e3b09eb8e" +SRC_URI[sha256sum] = "992521305fa1d61f4726aac2619ccc65094a3cc2e5c80644455199764305863e" DEPENDS = "openssl xz zlib bzip2 libcap icu libtirpc" CFLAGS += "-I${STAGING_INCDIR}/tirpc" diff --git a/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-drbd-tools-only-rmmod-if-DRBD-is-a-module.patch b/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-drbd-tools-only-rmmod-if-DRBD-is-a-module.patch deleted file mode 100644 index c0f3adf24..000000000 --- a/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-drbd-tools-only-rmmod-if-DRBD-is-a-module.patch +++ /dev/null @@ -1,43 +0,0 @@ -Subject: drbd-tools: only rmmod if DRBD is a module - -Account for the case if the DRBD drive is built into -the kernel. Otherwise, errors, like the following, -will occur: - -root@localhost:~# /etc/init.d/drbd stop - Stopping all DRBD resources: ERROR: Module drbd - does not exist in /proc/modules - -Upstream-Status: Submitted [https://github.com/LINBIT/drbd-utils/pull/2] - -Signed-off-by: Aws Ismail <aws.ismail@windriver.com> -Signed-off-by: Jason Wessel <jason.wessel@windriver.com> - -[ refresh to 8.4.4: squash Aws' and Jason's patches ] -Signed-off-by: Michel Thebeau <michel.thebeau@windriver.com> - -Signed-off-by: Chen Qi <Qi.Chen@windriver.com> -Signed-off-by: Changqing Li <changqing.li@windriver.com> - ---- - scripts/drbd | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/scripts/drbd b/scripts/drbd -index 20bf628..de589dc 100755 ---- a/scripts/drbd -+++ b/scripts/drbd -@@ -241,7 +241,9 @@ case "$1" in - if [ -d /sys/module/drbd/holders ]; then - (cd /sys/module/drbd/holders; for tr in *; do [ -d ${tr} ] && ${RMMOD} ${tr}; done) - fi -- $RMMOD drbd && break -+ if [ ! -z "$(cat /proc/modules | grep -w drbd)" ]; then -+ $RMMOD drbd && break -+ fi - fi - done - run_hook stop --- -1.9.1 - diff --git a/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.5.0.bb b/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.8.0.bb index bd1e8576f..70e04b943 100644 --- a/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.5.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.8.0.bb @@ -10,11 +10,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018" SRC_URI = "git://github.com/LINBIT/drbd-utils;name=drbd-utils \ git://github.com/LINBIT/drbd-headers;name=drbd-headers;destsuffix=git/drbd-headers \ - file://0001-drbd-drbd-tools-only-rmmod-if-DRBD-is-a-module.patch \ " -# v9.5.0 -SRCREV_drbd-utils = "ee126652638328b55dc6bff47d07d6161ab768db" -SRCREV_drbd-headers = "b47cc11bcabe1a65c40ad23f71dcaf2da6419630" +# v9.8.0 +SRCREV_drbd-utils = "c30216b49330216bf8a567b7727da6e24f099f08" +SRCREV_drbd-headers = "2357a11fb49bcbadf6b490e6d4cfe982a3d24813" S = "${WORKDIR}/git" @@ -48,8 +47,9 @@ do_configure_prepend() { } do_install_append() { - # don't install empty /var/lock to avoid conflict with base-files + # don't install empty /var/lock and /var/run to avoid conflict with base-files rm -rf ${D}${localstatedir}/lock + rm -rf ${D}${localstatedir}/run } RDEPENDS_${PN} += "bash perl-module-getopt-long perl-module-exporter perl-module-constant perl-module-overloading perl-module-exporter-heavy" diff --git a/meta-openembedded/meta-networking/recipes-support/drbd/drbd/0001-drbd-kbuild-fix-use-M-don-t-forget-addprefix-obj.patch b/meta-openembedded/meta-networking/recipes-support/drbd/drbd/0001-drbd-kbuild-fix-use-M-don-t-forget-addprefix-obj.patch new file mode 100644 index 000000000..fbf94d513 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/drbd/drbd/0001-drbd-kbuild-fix-use-M-don-t-forget-addprefix-obj.patch @@ -0,0 +1,79 @@ +Upstream-Status: Backport [https://github.com/LINBIT/drbd-9.0/commit/46e8e3f] + +Backport patch to fix compile errors: + +| LD [M] /home/kkang/buildarea/Yocto/build/tmp/work/qemux86_64-poky-linux/drbd/9.0.17-1-r0/drbd-9.0.17-1/drbd/drbd.o +| x86_64-poky-linux-ld.bfd: cannot find .../tmp/work/qemux86_64-poky-linux/drbd/9.0.17-1-r0/drbd-9.0.17-1/drbd/drbd_bitmap.o: No such file or directory + +Signed-off-by: Kai Kang <kai.kang@windriver.com> + +From 46e8e3fc31b651fb56ea38134dcf14382fc43000 Mon Sep 17 00:00:00 2001 +From: Lars Ellenberg <lars.ellenberg@linbit.com> +Date: Wed, 3 Apr 2019 10:57:46 +0200 +Subject: [PATCH] drbd: kbuild fix: use M=; don't forget addprefix $(obj) + +Kernel build started to warn about using SUBDIRS instead of M, +and we don't support "very old" kernels anymore anyways. + +Our list of dependencies for drbd_buildtag.c needs to depend on the +actual files $(obj)/*.o resulting from the build, +not on just the list of *.o names. + +This apparently also fixes a build failure in opensuse build service for +tumbleweed when using make-4.2.1-7.5 against kernel 5.0.5-something. +--- + drbd/Kbuild | 11 +++++------ + drbd/Makefile | 4 +--- + 2 files changed, 6 insertions(+), 9 deletions(-) + +diff --git a/drbd/Kbuild b/drbd/Kbuild +index 285f7a81..99228029 100644 +--- a/drbd/Kbuild ++++ b/drbd/Kbuild +@@ -1,4 +1,5 @@ +-obj-m := drbd.o drbd_transport_tcp.o ++obj-m += drbd.o drbd_transport_tcp.o ++# obj-$(CONFIG_BLK_DEV_DRBD) += drbd.o drbd_transport_tcp.o + + clean-files := compat.h $(wildcard .config.$(KERNELVERSION).timestamp) + +@@ -56,10 +57,8 @@ ifndef DISABLE_KREF_DEBUGGING_HERE + drbd-y += kref_debug.o drbd_kref_debug.o + endif + +-$(patsubst %,$(obj)/%,$(drbd-y)): $(obj)/compat.h +-$(patsubst %,$(obj)/%,drbd_transport_tcp.o): $(obj)/compat.h +- +-obj-$(CONFIG_BLK_DEV_DRBD) += drbd.o ++$(addprefix $(obj)/,$(drbd-y)): $(obj)/compat.h ++$(obj)/drbd_transport_tcp.o: $(obj)/compat.h + + # ====================================================================== + +@@ -124,7 +123,7 @@ endif + # and not in e.g. dash. I'm too lazy to fix it to be compatible. + SHELL=/bin/bash + +-$(obj)/drbd_buildtag.c: $(filter-out drbd_buildtag.o,$(drbd-y)) ++$(obj)/drbd_buildtag.c: $(addprefix $(obj)/,$(filter-out drbd_buildtag.o,$(drbd-y))) + @$(kecho) ' GEN $@ $(echo-why)' + @set -e; exec > $@.new; \ + echo -e "/* automatically generated. DO NOT EDIT. */"; \ +diff --git a/drbd/Makefile b/drbd/Makefile +index 5f768fc6..f9e8792a 100644 +--- a/drbd/Makefile ++++ b/drbd/Makefile +@@ -102,9 +102,7 @@ else + + kbuild: + @rm -f .drbd_kernelrelease* +- # previous to 2.6.6 (suse: 2.6.5-dunno), this should be: +- $(MAKE) -C $(KDIR) $(if $(O),O=$(O),) SUBDIRS=$(DRBDSRC) $(ARCH_UM) modules +-# $(MAKE) -C $(KDIR) M=$(DRBDSRC) $(ARCH_UM) modules ++ $(MAKE) -C $(KDIR) $(if $(O),O=$(O),) M=$(DRBDSRC) $(ARCH_UM) modules + -mv .drbd_kernelrelease.new .drbd_kernelrelease + @echo -n "Memorizing module configuration ... " + @config=$$( (for x in $(KDIR)/.config $(O)/.config ; do \ +-- +2.20.0 + diff --git a/meta-openembedded/meta-networking/recipes-support/drbd/drbd_9.0.16-1.bb b/meta-openembedded/meta-networking/recipes-support/drbd/drbd_9.0.17-1.bb index 8794c4f91..1eada269c 100644 --- a/meta-openembedded/meta-networking/recipes-support/drbd/drbd_9.0.16-1.bb +++ b/meta-openembedded/meta-networking/recipes-support/drbd/drbd_9.0.17-1.bb @@ -9,10 +9,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018" DEPENDS = "virtual/kernel" SRC_URI = "http://www.linbit.com/downloads/drbd/9.0/drbd-${PV}.tar.gz \ - file://check_existence_of_modules_before_installing.patch" + file://check_existence_of_modules_before_installing.patch \ + file://0001-drbd-kbuild-fix-use-M-don-t-forget-addprefix-obj.patch \ + " -SRC_URI[md5sum] = "6414a9eef2807c8210b6403e36ce3ea4" -SRC_URI[sha256sum] = "6074b0d643f4bbae4641d3b4bc30f4840e74f2a212dd9c6555b8141e530e5789" +SRC_URI[md5sum] = "ae8d5030760b2820a4b3e250447890a0" +SRC_URI[sha256sum] = "86dd6cc0fdc8123056a3bb67a634cd7ba62a7b05b23caab9995cce7730891da8" inherit module diff --git a/meta-openembedded/meta-networking/recipes-support/fwknop/fwknop_2.6.9.bb b/meta-openembedded/meta-networking/recipes-support/fwknop/fwknop_2.6.10.bb index 0fd5f6fed..3eca3ab62 100644 --- a/meta-openembedded/meta-networking/recipes-support/fwknop/fwknop_2.6.9.bb +++ b/meta-openembedded/meta-networking/recipes-support/fwknop/fwknop_2.6.10.bb @@ -7,9 +7,8 @@ inherit autotools-brokensep SRC_URI = "http://www.cipherdyne.org/${BPN}/download/${BPN}-${PV}.tar.bz2 \ " - -SRC_URI[md5sum] = "e2c49e9674888a028bd443a55c3aaa22" -SRC_URI[sha256sum] = "5bf47fe1fd30e862d29464f762c0b8bf89b5e298665c37624d6707826da956d4" +SRC_URI[md5sum] = "47a9c7c214c40dceb5dc2aa8832e4f32" +SRC_URI[sha256sum] = "f6c09bec97ed8e474a98ae14f9f53e1bcdda33393f20667b6af3fb6bb894ca77" DEPENDS = "libpcap gpgme" diff --git a/meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools/fix-CVE-2016-10396.patch b/meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools/fix-CVE-2016-10396.patch index 19220c4e7..fec4804c0 100644 --- a/meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools/fix-CVE-2016-10396.patch +++ b/meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools/fix-CVE-2016-10396.patch @@ -1,6 +1,6 @@ Upstream-Status: Backport [https://anonscm.debian.org/cgit/pkg-ipsec-tools/pkg-ipsec-tools.git/plain/debian/patches/CVE-2016-10396.patch?id=62ac12648a4eb7c5ba5dba0f81998d1acf310d8b] -CVE: CVE-2016-10396. +CVE: CVE-2016-10396 Signed-off-by: Kai Kang <kai.kang@windriver.com> --- diff --git a/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm/0002-sigd-Replace-on_exit-API-with-atexit.patch b/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm/0002-sigd-Replace-on_exit-API-with-atexit.patch deleted file mode 100644 index ce061231c..000000000 --- a/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm/0002-sigd-Replace-on_exit-API-with-atexit.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 27fa80dc8045e71c30dd2abea835206d5c8f6c71 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 17 Jun 2017 16:18:56 -0700 -Subject: [PATCH 2/3] sigd: Replace on_exit() API with atexit() - -on_exit is not universally available - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/sigd/atmsigd.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/sigd/atmsigd.c b/src/sigd/atmsigd.c -index 52e41c7..b766606 100644 ---- a/src/sigd/atmsigd.c -+++ b/src/sigd/atmsigd.c -@@ -517,7 +517,7 @@ int main(int argc,char **argv) - exit(0); - } - } -- (void) on_exit(trace_on_exit,NULL); -+ atexit(trace_on_exit); - poll_loop(); - close_all(); - for (sig = entities; sig; sig = sig->next) stop_saal(&sig->saal); --- -2.13.1 - diff --git a/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm/musl-no-on_exit.patch b/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm/musl-no-on_exit.patch new file mode 100644 index 000000000..25211d7c1 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm/musl-no-on_exit.patch @@ -0,0 +1,37 @@ +Description: musl lacks on_exit +Author: Adrian Bunk <bunk@stusta.de> + +Only prints a trace on nonzero exit(), +so can safely be disabled in musl builds. + +Signed-off-by: Adrian Bunk <bunk@stusta.de> +Upstream-Status: Inappropriate [musl specific] + +--- linux-atm-2.5.1.orig/src/sigd/atmsigd.c ++++ linux-atm-2.5.1/src/sigd/atmsigd.c +@@ -283,6 +283,7 @@ static void setup_signals(void) + /* ------------------------------- main ... ------------------------------- */ + + ++#if 0 + static void trace_on_exit(int status,void *dummy) + { + char path[PATH_MAX+1]; +@@ -300,6 +301,7 @@ static void trace_on_exit(int status,voi + dump_trace(file,"Message trace (after error exit)"); + if (file != stderr) (void) fclose(file); + } ++#endif + + + static void manual_override(void) +@@ -517,7 +519,9 @@ int main(int argc,char **argv) + exit(0); + } + } ++#if 0 + (void) on_exit(trace_on_exit,NULL); ++#endif + poll_loop(); + close_all(); + for (sig = entities; sig; sig = sig->next) stop_saal(&sig->saal); diff --git a/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb b/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb index 51682b1ed..9ed7ca613 100644 --- a/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb +++ b/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb @@ -3,20 +3,19 @@ HOMEPAGE = "http://linux-atm.sourceforge.net/" SECTION = "libs" LICENSE = "GPL-2.0 & LGPL-2.0" -DEPENDS = "virtual/kernel flex flex-native" - -PACKAGE_ARCH = "${MACHINE_ARCH}" +DEPENDS = "flex flex-native" SRC_URI = "http://nchc.dl.sourceforge.net/project/${BPN}/${BPN}/${PV}/${BPN}-${PV}.tar.gz \ file://link-with-ldflags.patch \ file://install-from-buildir.patch \ file://0001-fix-compile-error-with-linux-kernel-v4.8.patch \ file://0001-ttcp-Add-printf-format-string.patch \ - file://0002-sigd-Replace-on_exit-API-with-atexit.patch \ file://0003-mpoad-Drop-old-hack-to-compile-with-very-old-glibc.patch \ file://0001-IFNAMSIZ-is-defined-in-net-if.h.patch \ " +SRC_URI_append_libc-musl = " file://musl-no-on_exit.patch" + SRC_URI[md5sum] = "d49499368c3cf15f73a05d9bce8824a8" SRC_URI[sha256sum] = "9645481a2b16476b59220aa2d6bc5bc41043f291326c9b37581018fbd16dd53a" diff --git a/meta-openembedded/meta-networking/recipes-support/macchanger/macchanger/0001-Fix-musl-build.patch b/meta-openembedded/meta-networking/recipes-support/macchanger/macchanger/0001-Fix-musl-build.patch new file mode 100644 index 000000000..d36087d55 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/macchanger/macchanger/0001-Fix-musl-build.patch @@ -0,0 +1,31 @@ +From 12d1cc9da14b0cd0265bca3c4289a335ddf2e357 Mon Sep 17 00:00:00 2001 +From: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> +Date: Mon, 8 Apr 2019 21:00:20 +0200 +Subject: [PATCH] Fix musl build + +Fixes compilation error on musl: +| ../macchanger-1.7.0/src/netinfo.c:116:26: error: expected ';' before 'epa' +| req.ifr_data = (caddr_t)epa; + +Missing data type is defined in <sys/types.h>. + +Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> +--- + src/netinfo.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/netinfo.c b/src/netinfo.c +index 3525123..1aa3293 100644 +--- a/src/netinfo.c ++++ b/src/netinfo.c +@@ -28,6 +28,7 @@ + #include <string.h> + #include <unistd.h> + #include <sys/ioctl.h> ++#include <sys/types.h> + + #include <linux/ethtool.h> + #include <linux/sockios.h> +-- +2.17.1 + diff --git a/meta-openembedded/meta-networking/recipes-support/macchanger/macchanger_1.5.0.bb b/meta-openembedded/meta-networking/recipes-support/macchanger/macchanger_1.5.0.bb deleted file mode 100644 index a90177f19..000000000 --- a/meta-openembedded/meta-networking/recipes-support/macchanger/macchanger_1.5.0.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "Tool to view/change network interface MAC addresses" -DESCRIPTION = "A GNU/Linux utility for viewing/manipulating the MAC address of network interfaces." -HOMEPAGE = "http://www.alobbs.com/macchanger" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -SECTION = "net" - -SRC_URI = "${GNU_MIRROR}/macchanger/${BPN}-${PV}.tar.gz" - -SRC_URI[md5sum] = "79b7cdaeca3d8ebafa764c4b0dd03ab7" -SRC_URI[sha256sum] = "d44bfa27cb29c5a718627cb3ef3aa42eb5130426545eb2031120826cd73fa8fe" - -FILES_${PN} = " \ - ${bindir}/${BPN} \ - ${datadir}/${BPN}/wireless.list \ - ${datadir}/${BPN}/OUI.list \ -" - -FILES_${PN}-doc = " \ - ${datadir}/info \ - ${datadir}/man \ -" - -inherit autotools diff --git a/meta-openembedded/meta-networking/recipes-support/macchanger/macchanger_1.7.0.bb b/meta-openembedded/meta-networking/recipes-support/macchanger/macchanger_1.7.0.bb new file mode 100644 index 000000000..6506fd8ef --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/macchanger/macchanger_1.7.0.bb @@ -0,0 +1,25 @@ +SUMMARY = "Tool to view/change network interface MAC addresses" +DESCRIPTION = "A GNU/Linux utility for viewing/manipulating the MAC address of network interfaces." +HOMEPAGE = "https://github.com/alobbs/macchanger" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" +SECTION = "net" + +SRC_URI = "https://github.com/alobbs/macchanger/releases/download/${PV}/${BPN}-${PV}.tar.gz \ + file://0001-Fix-musl-build.patch \ +" +SRC_URI[md5sum] = "ca56f16142914337391dac91603eb332" +SRC_URI[sha256sum] = "dae2717c270fd5f62d790dbf80c19793c651b1b26b62c101b82d5fdf25a845bf" + +FILES_${PN} = " \ + ${bindir}/${BPN} \ + ${datadir}/${BPN}/wireless.list \ + ${datadir}/${BPN}/OUI.list \ +" + +FILES_${PN}-doc = " \ + ${datadir}/info \ + ${datadir}/man \ +" + +inherit autotools diff --git a/meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2_1.37.0.bb b/meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2_1.38.0.bb index 50196d669..42b437933 100644 --- a/meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2_1.37.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2_1.38.0.bb @@ -5,8 +5,8 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=764abdf30b2eadd37ce47dcbce0ea1ec" SRC_URI = "https://github.com/nghttp2/nghttp2/releases/download/v${PV}/nghttp2-${PV}.tar.xz" -SRC_URI[md5sum] = "dc7536d02aa7d4883c20eaf637747381" -SRC_URI[sha256sum] = "aa090b164b17f4b91fe32310a1c0edf3e97e02cd9d1524eef42d60dd1e8d47b7" +SRC_URI[md5sum] = "45b47086ee6da8171e11887c1665f275" +SRC_URI[sha256sum] = "ef75c761858241c6b4372fa6397aa0481a984b84b7b07c4ec7dc2d7b9eee87f8" DEPENDS = "libxml2 openssl zlib jansson cunit c-ares" diff --git a/meta-openembedded/meta-networking/recipes-support/nis/ypbind-mt_2.4.bb b/meta-openembedded/meta-networking/recipes-support/nis/ypbind-mt_2.6.bb index 9822f455e..1a64e6c2e 100644 --- a/meta-openembedded/meta-networking/recipes-support/nis/ypbind-mt_2.4.bb +++ b/meta-openembedded/meta-networking/recipes-support/nis/ypbind-mt_2.6.bb @@ -16,7 +16,7 @@ the server which answered as first. \ \ This is the final IPv4-only version of ypbind-mt. \ " -HOMEPAGE = "http://www.linux-nis.org/nis/ypbind-mt/index.html" +HOMEPAGE = "https://github.com/thkukuk/ypbind-mt/" DEPENDS = " \ yp-tools \ ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ @@ -28,13 +28,13 @@ RDEPENDS_${PN} += "yp-tools" # and is used in place of it. PROVIDES += "ypbind" -SRC_URI = "http://www.linux-nis.org/download/ypbind-mt/${BP}.tar.bz2 \ +SRC_URI = "https://github.com/thkukuk/ypbind-mt/releases/download/v${PV}/${BPN}-${PV}.tar.xz \ file://ypbind.init \ file://ypbind.service \ file://0001-dns_hosts-Fix-build-with-musl.patch \ " -SRC_URI[md5sum] = "1aeccd0d11c064d5d59c56941bca682b" -SRC_URI[sha256sum] = "a2e1fa8fc992a12b289c229e00e38c20d59070c3bcf08babf40c692515c340e0" +SRC_URI[md5sum] = "7cf89641fdc128d0919207e4b7caaf1d" +SRC_URI[sha256sum] = "0696c0263c4fd48a4ff2ce6c109f05f37aab0f71646d81cb22c7c28591bf80eb" inherit systemd update-rc.d diff --git a/meta-openembedded/meta-networking/recipes-support/ntp/ntp_4.2.8p12.bb b/meta-openembedded/meta-networking/recipes-support/ntp/ntp_4.2.8p13.bb index 289d2645b..dc18a602a 100644 --- a/meta-openembedded/meta-networking/recipes-support/ntp/ntp_4.2.8p12.bb +++ b/meta-openembedded/meta-networking/recipes-support/ntp/ntp_4.2.8p13.bb @@ -6,7 +6,7 @@ or satellite receiver or modem." HOMEPAGE = "http://support.ntp.org" SECTION = "net" LICENSE = "NTP" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=e877a1d567a6a58996d2b66e3e387003" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=4cee33257467509e498f4cd9a6a4bd53" DEPENDS = "libevent" @@ -25,8 +25,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] = "1522d66574bae14abb2622746dad2bdc" -SRC_URI[sha256sum] = "709b222b5013d77d26bfff532b5ea470a8039497ef29d09363931c036cb30454" +SRC_URI[md5sum] = "ea040ab9b4ca656b5229b89d6b822f13" +SRC_URI[sha256sum] = "288772cecfcd9a53694ffab108d1825a31ba77f3a8466b0401baeca3bc232a38" inherit autotools update-rc.d useradd systemd pkgconfig diff --git a/meta-openembedded/meta-networking/recipes-support/nuttcp/nuttcp_7.3.3.bb b/meta-openembedded/meta-networking/recipes-support/nuttcp/nuttcp_8.2.2.bb index ec4067806..2fd563123 100644 --- a/meta-openembedded/meta-networking/recipes-support/nuttcp/nuttcp_7.3.3.bb +++ b/meta-openembedded/meta-networking/recipes-support/nuttcp/nuttcp_8.2.2.bb @@ -8,11 +8,13 @@ number of bytes." HOMEPAGE = "http://www.nuttcp.net/Welcome%20Page.html" LICENSE = "GPL-2.0" SECTION = "net" -LIC_FILES_CHKSUM = "file://${BP}.c;beginline=4;endline=30;md5=c55daba5a5a869a123c3565de07d15a6" +LIC_FILES_CHKSUM = "file://${BP}.c;beginline=4;endline=30;md5=496a7c0bb83c07ff528d226bf85e05c5" + +UPSTREAM_CHECK_URI = "https://www.nuttcp.net/nuttcp/beta/" SRC_URI = "http://nuttcp.net/${BPN}/beta/${BP}.c" -SRC_URI[md5sum] = "dfbff3c38fb0cbdc474ca6d13539d425" -SRC_URI[sha256sum] = "d68e291a72375d76f301d54aa945727c95e78090aa6783a4844764e632e98a4a" +SRC_URI[md5sum] = "d3c92c4d2f261221193c3726c1b9a42f" +SRC_URI[sha256sum] = "8c5595bcd27c2fd66831be74c390df078cfb1870aa427f2511ac2586d236c8a1" S = "${WORKDIR}" diff --git a/meta-openembedded/meta-networking/recipes-support/open-isns/open-isns/0001-util.h-endian.h-is-available-on-musl-on-linux.patch b/meta-openembedded/meta-networking/recipes-support/open-isns/open-isns/0001-util.h-endian.h-is-available-on-musl-on-linux.patch deleted file mode 100644 index fbdc4e911..000000000 --- a/meta-openembedded/meta-networking/recipes-support/open-isns/open-isns/0001-util.h-endian.h-is-available-on-musl-on-linux.patch +++ /dev/null @@ -1,38 +0,0 @@ -From e0d86318227a23f00cf0f6639a6685bb9f5771a1 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 12 Dec 2017 09:42:19 -0800 -Subject: [PATCH] util.h: endian.h is available on musl on linux - -just checking for glibc alone is not enough since -it excludes musl, therefore check for platform -being linux as well - -Fixes build issues - -include/libisns/util.h:114:12: fatal error: sys/endian.h: No such file or directory - # include <sys/endian.h> - ^~~~~~~~~~~~~~ - -Upstream-Status: Submitted - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - include/libisns/util.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/libisns/util.h b/include/libisns/util.h -index 9a2bd13..6cc1a1b 100644 ---- a/include/libisns/util.h -+++ b/include/libisns/util.h -@@ -100,7 +100,7 @@ enum { - * There's no htonll yet - */ - #ifndef htonll --# ifdef __GLIBC__ -+# if defined(__GLIBC__) || defined(__linux__) - # include <endian.h> - # include <byteswap.h> - # if __BYTE_ORDER == __BIG_ENDIAN --- -2.15.1 - diff --git a/meta-openembedded/meta-networking/recipes-support/open-isns/open-isns_0.98.bb b/meta-openembedded/meta-networking/recipes-support/open-isns/open-isns_0.99.bb index 5e64f893e..a03b92f5f 100644 --- a/meta-openembedded/meta-networking/recipes-support/open-isns/open-isns_0.98.bb +++ b/meta-openembedded/meta-networking/recipes-support/open-isns/open-isns_0.99.bb @@ -13,11 +13,9 @@ SECTION = "net" DEPENDS = "openssl" -SRC_URI = "git://github.com/open-iscsi/open-isns \ - file://0001-util.h-endian.h-is-available-on-musl-on-linux.patch \ - " +SRC_URI = "git://github.com/open-iscsi/open-isns" -SRCREV = "e84374ce7d1f5fc58a4c0fc751e075b2cc752c34" +SRCREV = "cfdbcff867ee580a71bc9c18c3a38a6057df0150" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.4.6.bb b/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.4.7.bb index 84fd467c7..2a4eb2528 100644 --- a/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.4.6.bb +++ b/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.4.7.bb @@ -1,5 +1,5 @@ SUMMARY = "A full-featured SSL VPN solution via tun device." -HOMEPAGE = "http://openvpn.sourceforge.net" +HOMEPAGE = "https://openvpn.net/" SECTION = "net" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=7aee596ed2deefe3e8a861e24292abba" @@ -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] = "971d57e29b78b4b902eb2f4aae2f05a7" -SRC_URI[sha256sum] = "738dbd37fcf8eb9382c53628db22258c41ba9550165519d9200e8bebaef4cbe2" +SRC_URI[md5sum] = "9d67cabc9b0441062ebd4e12bb7dfedb" +SRC_URI[sha256sum] = "73dce542ed3d6f0553674f49025dfbdff18348eb8a25e6215135d686b165423c" SYSTEMD_SERVICE_${PN} += "openvpn@loopback-server.service openvpn@loopback-client.service" SYSTEMD_AUTO_ENABLE = "disable" diff --git a/meta-openembedded/meta-networking/recipes-support/phytool/phytool.bb b/meta-openembedded/meta-networking/recipes-support/phytool/phytool.bb index 4ed3ed1e4..29499d6d7 100644 --- a/meta-openembedded/meta-networking/recipes-support/phytool/phytool.bb +++ b/meta-openembedded/meta-networking/recipes-support/phytool/phytool.bb @@ -2,8 +2,8 @@ SUMMARY = "PHY interface tool for Linux" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://LICENSE;md5=39bba7d2cf0ba1036f2a6e2be52fe3f0" -PV = "1.0.1+git${SRCPV}" -SRCREV = "3149bfdb4f513e2f0da0a7d0bc5d0873578696f2" +PV = "2+git${SRCPV}" +SRCREV = "8882328c08ba2efb13c049812098f1d0cb8adf0c" SRC_URI = "git://github.com/wkz/phytool.git" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-networking/recipes-support/smcroute/smcroute_2.0.0.bb b/meta-openembedded/meta-networking/recipes-support/smcroute/smcroute_2.4.4.bb index 9b6fc2f38..0b63f79ac 100644 --- a/meta-openembedded/meta-networking/recipes-support/smcroute/smcroute_2.0.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/smcroute/smcroute_2.4.4.bb @@ -3,9 +3,9 @@ DESCRIPTION = "SMCRoute is a daemon and command line tool to manipulate the mult HOMEPAGE = "http://troglobit.github.io/smcroute.html" SECTION = "net" LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -SRCREV = "d6280e64b27d5a4bd7f37dac36b455f4ae5f9ab3" +SRCREV = "a8e5847e5f7e411be424f9b52a6cdf9d2ed4aeb5" SRC_URI = "git://github.com/troglobit/smcroute.git;branch=master;protocol=git" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-networking/recipes-support/spice/usbredir_git.bb b/meta-openembedded/meta-networking/recipes-support/spice/usbredir_0.8.0.bb index 3fea7528e..9ee43be1e 100644 --- a/meta-openembedded/meta-networking/recipes-support/spice/usbredir_git.bb +++ b/meta-openembedded/meta-networking/recipes-support/spice/usbredir_0.8.0.bb @@ -7,8 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ DEPENDS = "libusb1" -SRCREV = "39aa3c69f61bba28856a3eef3fe4ab37a3968e88" -PV = "0.7.1+git${SRCPV}" +SRCREV = "07b98b8e71f620dfdd57e92ddef6b677b259a092" SRC_URI = " \ git://anongit.freedesktop.org/spice/usbredir \ diff --git a/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel_5.49.bb b/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel_5.51.bb index eca77cf84..61be9be61 100644 --- a/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel_5.49.bb +++ b/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel_5.51.bb @@ -6,7 +6,7 @@ SECTION = "net" # a combined work based on stunnel. Thus, the terms and conditions of the GNU # General Public License cover the whole combination. LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=f6b7fe7379c9c2d7db6c80f7bd41e06d" +LIC_FILES_CHKSUM = "file://COPYING;md5=c7acb24399f540ea323acb0366aecdbe" DEPENDS = "autoconf-archive libnsl2 openssl" @@ -14,8 +14,8 @@ SRC_URI = "ftp://ftp.stunnel.org/stunnel/archive/5.x/${BP}.tar.gz \ file://fix-openssl-no-des.patch \ " -SRC_URI[md5sum] = "0b41240e5585ec7d55ca343feed5530f" -SRC_URI[sha256sum] = "3d6641213a82175c19f23fde1c3d1c841738385289eb7ca1554f4a58b96d955e" +SRC_URI[md5sum] = "57040c64f4b95e35a756e53e1c496728" +SRC_URI[sha256sum] = "77437cdd1aef1a621824bb3607e966534642fe90c69f4d2279a9da9fa36c3253" inherit autotools diff --git a/meta-openembedded/meta-networking/recipes-support/traceroute/traceroute_2.1.0.bb b/meta-openembedded/meta-networking/recipes-support/traceroute/traceroute_2.1.0.bb index 8f17d3fdb..19bbf03f1 100644 --- a/meta-openembedded/meta-networking/recipes-support/traceroute/traceroute_2.1.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/traceroute/traceroute_2.1.0.bb @@ -13,6 +13,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ inherit update-alternatives +UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/traceroute/files/traceroute/" + SRC_URI = "${SOURCEFORGE_MIRROR}/traceroute/traceroute/${BP}/${BP}.tar.gz \ file://filter-out-the-patches-from-subdirs.patch \ " diff --git a/meta-openembedded/meta-networking/recipes-support/uftp/uftp_4.9.8.bb b/meta-openembedded/meta-networking/recipes-support/uftp/uftp_4.9.9.bb index 0bbdd6b1d..a64d081cf 100644 --- a/meta-openembedded/meta-networking/recipes-support/uftp/uftp_4.9.8.bb +++ b/meta-openembedded/meta-networking/recipes-support/uftp/uftp_4.9.9.bb @@ -1,13 +1,14 @@ DESCRIPTION = "Encrypted UDP based FTP with multicast" HOMEPAGE = "https://sourceforge.net/projects/uftp-multicast" SECTION = "libs/network" - LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=d32239bcb673463ab874e80d47fae504" +UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/uftp-multicast/files/source-tar/" + SRC_URI = "${SOURCEFORGE_MIRROR}/uftp-multicast/source-tar/uftp-${PV}.tar.gz" -SRC_URI[md5sum] = "f7a5affd3000b5aafbb13df49719b6c0" -SRC_URI[sha256sum] = "e98c6318e497124d777ca71eae752d213207c35de9f782c8bcaaf82ece20e599" +SRC_URI[md5sum] = "154e2c82a33fd4999040f8836e2dca2c" +SRC_URI[sha256sum] = "c04bc75a88fc3d57504269f260be4d0b1bc440508b5a5ca587df6c16b771aa48" DEPENDS = "openssl" diff --git a/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.0.0.bb b/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.0.1.bb index dc55e3de0..572dc1a45 100644 --- a/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.0.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.0.1.bb @@ -12,8 +12,8 @@ SRC_URI = "https://1.eu.dl.wireshark.org/src/wireshark-${PV}.tar.xz" UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src" -SRC_URI[md5sum] = "258d62ac7434d126dc497303c8f7961b" -SRC_URI[sha256sum] = "bc4f30f5b2e94f3a696fef9de44673cdf402db90aac5299966da647f708f009e" +SRC_URI[md5sum] = "370a113e1c8ec240c4621cfb5abb0c52" +SRC_URI[sha256sum] = "86864c3d0f6c2311992a98d8ea7dfd429097fe62dae2e5516e1a2f6bef2ac08c" PE = "1" diff --git a/meta-openembedded/meta-networking/recipes-support/wpan-tools/wpan-tools_git.bb b/meta-openembedded/meta-networking/recipes-support/wpan-tools/wpan-tools_0.9.bb index b6d2f6923..bab75fee3 100644 --- a/meta-openembedded/meta-networking/recipes-support/wpan-tools/wpan-tools_git.bb +++ b/meta-openembedded/meta-networking/recipes-support/wpan-tools/wpan-tools_0.9.bb @@ -8,10 +8,8 @@ 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" +SRC_URI = "git://github.com/linux-wpan/wpan-tools" +SRCREV = "a316ca2caa746d60817400e5bf646c2820f09273" S = "${WORKDIR}/git" |