diff options
Diffstat (limited to 'meta-openembedded/meta-networking/recipes-connectivity')
27 files changed, 94 insertions, 283 deletions
diff --git a/meta-openembedded/meta-networking/recipes-connectivity/bearssl/bearssl_0.6.bb b/meta-openembedded/meta-networking/recipes-connectivity/bearssl/bearssl_0.6.bb index c0556e7395..777ba2270b 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/bearssl/bearssl_0.6.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/bearssl/bearssl_0.6.bb @@ -25,7 +25,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=1fc37e1037ae673975fbcb96a98f7191" PV .= "+git${SRCPV}" SRCREV = "79b1a9996c094ff593ae50bc4edc1f349f39dd6d" -SRC_URI = "git://www.bearssl.org/git/BearSSL;protocol=https \ +SRC_URI = "git://www.bearssl.org/git/BearSSL;protocol=https;branch=master \ file://0001-conf-Unix.mk-remove-fixed-command-definitions.patch \ file://0002-test-test_x509.c-fix-potential-overflow-issue.patch \ file://0001-make-Pass-LDFLAGS-when-building-shared-objects.patch \ diff --git a/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.2.1.bb b/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.2.3.bb index 8e874edd5e..df496c3683 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.2.1.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.2.3.bb @@ -11,7 +11,7 @@ SRC_URI = " \ file://0001-Search-for-cython3.patch \ file://0002-fix-fail-to-enable-bluetooth.patch \ " -SRC_URI[sha256sum] = "fcc10a2259bef2c5ac63f577010d76caed460d68810b7f70fecf056bf10a1a72" +SRC_URI[sha256sum] = "6edd791da6afd8f610ffb08d5138cfcf50e6257ad30efad686287f3a2be106e9" EXTRA_OECONF = " \ --disable-appindicator \ diff --git a/meta-openembedded/meta-networking/recipes-connectivity/bluepy/bluepy_git.bb b/meta-openembedded/meta-networking/recipes-connectivity/bluepy/bluepy_git.bb index 887870fb78..a3b734c2ec 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/bluepy/bluepy_git.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/bluepy/bluepy_git.bb @@ -7,7 +7,7 @@ DEPENDS = "glib-2.0" SRCREV = "7ad565231a97c304c0eff45f2649cd005e69db09" PV = "1.3.0+git${SRCPV}" -SRC_URI = "git://github.com/IanHarvey/bluepy.git;protocol=https \ +SRC_URI = "git://github.com/IanHarvey/bluepy.git;protocol=https;branch=master \ file://0001-bluepy-Fix-username-issue-with-tarballs.patch \ " diff --git a/meta-openembedded/meta-networking/recipes-connectivity/cannelloni/cannelloni_1.0.0.bb b/meta-openembedded/meta-networking/recipes-connectivity/cannelloni/cannelloni_1.0.0.bb index 0cf57ccdb7..86b6577721 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/cannelloni/cannelloni_1.0.0.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/cannelloni/cannelloni_1.0.0.bb @@ -2,7 +2,7 @@ SUMMARY = "a SocketCAN over Ethernet tunnel" HOMEPAGE = "https://github.com/mguentner/cannelloni" LICENSE = "GPLv2" -SRC_URI = "git://github.com/mguentner/cannelloni.git;protocol=https" +SRC_URI = "git://github.com/mguentner/cannelloni.git;protocol=https;branch=master" SRCREV = "0bd7e27db35bdef361226882ae04205504f7b2f4" LIC_FILES_CHKSUM = "file://gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/civetweb/civetweb_git.bb b/meta-openembedded/meta-networking/recipes-connectivity/civetweb/civetweb_git.bb index 2820f9fa6d..e9c2056180 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/civetweb/civetweb_git.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/civetweb/civetweb_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=50bd1d7f135b50d7e218996ba28d0d88" SRCREV = "4b440a339979852d5a51fb11a822952712231c23" PV = "1.12+git${SRCPV}" -SRC_URI = "git://github.com/civetweb/civetweb.git \ +SRC_URI = "git://github.com/civetweb/civetweb.git;branch=master;protocol=https \ file://0001-Unittest-Link-librt-and-libm-using-l-option.patch \ " diff --git a/meta-openembedded/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.2p1.bb b/meta-openembedded/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.2p1.bb index 93364758e3..c86926813d 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.2p1.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.2p1.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;beginline=4;md5=004a4db50a1e20972e924a8618747 DEPENDS = "openssl libcap zlib" SRC_URI = "https://ftp.isc.org/isc/dhcp/4.4.2-P1/dhcp-4.4.2-P1.tar.gz \ - https://ftp.isc.org/isc/bind9/9.11.32/bind-9.11.32.tar.gz;name=bind;downloadfilename=bind.tar.gz;unpack=0 \ + https://ftp.isc.org/isc/bind9/9.11.32/bind-9.11.32.tar.gz;name=bind;unpack=0 \ file://default-relay \ file://init-relay \ file://dhcrelay.service \ @@ -43,23 +43,22 @@ EXTRA_OECONF = "--enable-paranoia \ --enable-libtool \ --with-randomdev=/dev/random \ " -EXTRA_OEMAKE += "LIBTOOL='${S}/${HOST_SYS}-libtool'" # Enable shared libs per dhcp README do_configure:prepend () { cp configure.ac+lt configure.ac - rm ${S}/bind/bind.tar.gz - mv ${WORKDIR}/bind.tar.gz ${S}/bind/ + cp ${WORKDIR}/bind-9.11.32.tar.gz ${S}/bind/bind.tar.gz } do_compile:prepend() { + # Need to unpack this now instead of earlier as do_configure will delete the configure script rm -rf ${S}/bind/bind-9.11.32/ tar xf ${S}/bind/bind.tar.gz -C ${S}/bind install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/bind/bind-9.11.32/ install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}/bind/bind-9.11.32/ cp -fpR ${S}/m4/*.m4 ${S}/bind/bind-9.11.32/libtool.m4/ rm -rf ${S}/bind/bind-9.11.32/libtool - install -m 0755 ${S}/${HOST_SYS}-libtool ${S}/bind/bind-9.11.32/ + install -m 0755 ${S}/libtool ${S}/bind/bind-9.11.32/ } do_install:append () { diff --git a/meta-openembedded/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb b/meta-openembedded/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb index 7558c314ff..8c74c3954e 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=7236695bb6d4461c105d685a8b61c4e3" SRCREV = "a7c6cf58a88a510cb00841351e75030ce78d36bf" -SRC_URI = "git://github.com/tomaszmrugalski/dibbler \ +SRC_URI = "git://github.com/tomaszmrugalski/dibbler;branch=master;protocol=https \ file://dibbler_fix_getSize_crash.patch \ " PV = "1.0.1+1.0.2RC1+git${SRCREV}" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.21.bb b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.21.bb index 0d1c4adc1d..3e5cca6405 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.21.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.21.bb @@ -13,7 +13,7 @@ LICENSE = "GPLv2 & LGPLv2+" LIC_FILES_CHKSUM = "file://LICENSE;md5=eb723b61539feef013de476e68b5c50a" DEPENDS = "openssl-native openssl libidn libtool libpcap libtalloc" -SRC_URI = "git://github.com/FreeRADIUS/freeradius-server.git;branch=v3.0.x;lfs=0; \ +SRC_URI = "git://github.com/FreeRADIUS/freeradius-server.git;branch=v3.0.x;lfs=0;;protocol=https \ file://freeradius \ file://volatiles.58_radiusd \ file://freeradius-enble-user-in-conf.patch \ diff --git a/meta-openembedded/meta-networking/recipes-connectivity/libdnet/libdnet_1.14.bb b/meta-openembedded/meta-networking/recipes-connectivity/libdnet/libdnet_1.14.bb index df48782eef..9f2ff51576 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/libdnet/libdnet_1.14.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/libdnet/libdnet_1.14.bb @@ -4,7 +4,7 @@ SECTION = "libs" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=0036c1b155f4e999f3e0a373490b5db9" -SRC_URI = "git://github.com/dugsong/libdnet.git;nobranch=1" +SRC_URI = "git://github.com/dugsong/libdnet.git;nobranch=1;protocol=https" SRCREV = "3e782472d2a58d5e1b94d04eda4a364c2d257600" UPSTREAM_CHECK_GITTAGREGEX = "libdnet-(?P<pver>\d+(\.\d+)+)" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.5.0.bb b/meta-openembedded/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.5.0.bb index ab7167c946..fa42be62a2 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.5.0.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.5.0.bb @@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" DEPENDS = "swig-native python3" SRCREV = "fcefc746fea286aeaa40d2f62240216da81c85e5" -SRC_URI = "git://github.com/mz-automation/${BPN}.git;branch=v1.5 \ +SRC_URI = "git://github.com/mz-automation/${BPN}.git;branch=v1.5;protocol=https \ file://0001-pyiec61850-don-t-break-CMAKE_INSTALL_PATH-by-trying-.patch \ " diff --git a/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.12.bb b/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.12.bb index d2fa9cf322..06d8211a27 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.12.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.12.bb @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=ca9a8f366c6babf593e374d0d7d58749 \ file://epl-v20;md5=d9fc0efef5228704e7f5b37f27192723 \ file://NOTICE.md;md5=a7a91b4754c6f7995020d1b49bc829c6 \ " -DEPENDS = "uthash cjson dlt-daemon" +DEPENDS = "uthash cjson" SRC_URI = "http://mosquitto.org/files/source/mosquitto-${PV}.tar.gz \ file://mosquitto.init \ diff --git a/meta-openembedded/meta-networking/recipes-connectivity/nanomsg/nanomsg_1.1.5.bb b/meta-openembedded/meta-networking/recipes-connectivity/nanomsg/nanomsg_1.1.5.bb index 750b252106..3c2ab980e5 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/nanomsg/nanomsg_1.1.5.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/nanomsg/nanomsg_1.1.5.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=587b3fd7fd291e418ff4d2b8f3904755" SECTION = "libs/networking" -SRC_URI = "git://github.com/nanomsg/nanomsg.git;protocol=https" +SRC_URI = "git://github.com/nanomsg/nanomsg.git;protocol=https;branch=master" SRCREV = "1749fd7b039165a91b8d556b4df18e3e632ad830" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/nanomsg/nng_1.5.2.bb b/meta-openembedded/meta-networking/recipes-connectivity/nanomsg/nng_1.5.2.bb index 1ffd8918a4..ab2907110d 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/nanomsg/nng_1.5.2.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/nanomsg/nng_1.5.2.bb @@ -5,7 +5,7 @@ SECTION = "libs/networking" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a41e579bb4326c21c774f8e51e41d8a3" -SRC_URI = "git://github.com/nanomsg/nng.git" +SRC_URI = "git://github.com/nanomsg/nng.git;branch=master;protocol=https" SRCREV = "169221da8d53b2ca4fda76f894bee8505887a7c6" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/nanomsg/nngpp_git.bb b/meta-openembedded/meta-networking/recipes-connectivity/nanomsg/nngpp_git.bb index 176fa3bed2..b52154025b 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/nanomsg/nngpp_git.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/nanomsg/nngpp_git.bb @@ -7,7 +7,7 @@ DEPENDS = "nng" SRCREV = "cc5d2641babab165d8a9943817c46d36c6dc17c2" PV = "1.3.0" -SRC_URI = "git://github.com/cwzx/nngpp" +SRC_URI = "git://github.com/cwzx/nngpp;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan_0.103.bb b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan_0.103.bb index 3527bceeb2..81e20b9c8e 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan_0.103.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan_0.103.bb @@ -14,7 +14,7 @@ S = "${WORKDIR}/git" SRCREV = "51c872d856db80281ea810ebc02e05c09d5310fa" PV = "0.103" -SRC_URI = "git://github.com/CanonicalLtd/netplan.git;branch=main \ +SRC_URI = "git://github.com/CanonicalLtd/netplan.git;branch=main;protocol=https \ file://0001-parse-nm-fix-32bit-format-string.patch \ file://0001-Makefile-do-not-use-Werror.patch \ " @@ -40,6 +40,7 @@ do_install() { install -m 644 ${S}/netplan/cli/commands/*.py ${D}${datadir}/netplan/netplan/cli/commands install -m 755 ${S}/src/netplan.script ${D}${datadir}/netplan/ ln -srf ${D}${datadir}/netplan/netplan.script ${D}${sbindir}/netplan + sed -i -e "s#/lib/netplan/generate#${base_libdir}/netplan/generate#" ${D}${datadir}/netplan/netplan/cli/utils.py install -d ${D}/${systemd_unitdir}/system ${D}${systemd_unitdir}/system-generators ln -srf ${D}/${base_libdir}/netplan/generate ${D}${systemd_unitdir}/system-generators @@ -49,6 +50,7 @@ do_install() { install -m 755 ${S}/netplan-dbus ${D}${base_libdir}/netplan install -m 644 ${S}/dbus/io.netplan.Netplan.conf ${D}${datadir}/dbus-1/system.d install -m 644 ${S}/dbus/io.netplan.Netplan.service ${D}${datadir}/dbus-1/system-services + sed -i -e "s#^Exec=/lib/#Exec=${base_libdir}/#" ${D}${datadir}/dbus-1/system-services/io.netplan.Netplan.service fi install -m 755 ${S}/libnetplan.so.0.0 ${D}${libdir} diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.32.12.bb b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.34.0.bb index c45452f75c..ec15aea070 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.32.12.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.34.0.bb @@ -27,7 +27,7 @@ SRC_URI = " \ file://0002-Do-not-create-settings-settings-property-documentati.patch \ file://0003-install-firewalld-to-var-libdir-rather-than-hardcod-.patch \ " -SRC_URI[sha256sum] = "a8ab36a0a502fe73cd8e3bacb6585f97fbb94ebef79e276cdbaf11c33ff8f54b" +SRC_URI[sha256sum] = "819795d0899076204f5672421a58f1b1d9e393536ee87bb844b911e6243bf0bd" S = "${WORKDIR}/NetworkManager-${PV}" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/openconnect/openconnect_8.10.bb b/meta-openembedded/meta-networking/recipes-connectivity/openconnect/openconnect_8.10.bb index c66192aea9..7a61f74e31 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/openconnect/openconnect_8.10.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/openconnect/openconnect_8.10.bb @@ -3,7 +3,7 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING.LGPL;md5=243b725d71bb5df4a1e5920b344b86ad" SRC_URI = " \ - git://git.infradead.org/users/dwmw2/openconnect.git \ + git://git.infradead.org/users/dwmw2/openconnect.git;branch=master \ " SRCREV = "9d287e40c57233190a51b6434ba7345370e36f38" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/relayd/relayd_git.bb b/meta-openembedded/meta-networking/recipes-connectivity/relayd/relayd_git.bb index ebe64cb1b5..1dd50f6e12 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/relayd/relayd_git.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/relayd/relayd_git.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://main.c;endline=17;md5=86aad799085683e0a2e1c2684a20bab DEPENDS = "libubox" -SRC_URI = "git://git.openwrt.org/project/relayd.git \ +SRC_URI = "git://git.openwrt.org/project/relayd.git;branch=master \ file://0001-rtnl_flush-Error-on-failed-write.patch \ " diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0001-Fix-pyext_PATTERN-for-cross-compilation.patch b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0001-Fix-pyext_PATTERN-for-cross-compilation.patch new file mode 100644 index 0000000000..d497dd32ca --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0001-Fix-pyext_PATTERN-for-cross-compilation.patch @@ -0,0 +1,63 @@ +From a0547cacaddcb2fbef1fb9991c5ad522226e6817 Mon Sep 17 00:00:00 2001 +From: Yi Zhao <yi.zhao@windriver.com> +Date: Wed, 24 Nov 2021 13:33:35 +0800 +Subject: [PATCH] Fix pyext_PATTERN for cross compilation + +The pyext_PATTERN will add native arch as suffix when cross compiling. +For example, on qemuarm64, it is expanded to: +pyext_PATTERN ='%s.cpython-310-x86_64-linux-gnu.so' +which will result in the incorrect library name. + +root@qemuarm64:~# find /usr/lib -name \*cpython\* +/usr/lib/pkgconfig/samba-policy.cpython-310-x86_64-linux-gnu.pc +/usr/lib/libsamba-policy.cpython-310-x86-64-linux-gnu.so +/usr/lib/samba/libsamba-python.cpython-310-x86-64-linux-gnu-samba4.so +/usr/lib/samba/libsamba-net.cpython-310-x86-64-linux-gnu-samba4.so +/usr/lib/libsamba-policy.cpython-310-x86-64-linux-gnu.so.0 +/usr/lib/libsamba-policy.cpython-310-x86-64-linux-gnu.so.0.0.1 +/usr/lib/python3.10/site-packages/samba/dsdb_dns.cpython-310-x86_64-linux-gnu.so +/usr/lib/python3.10/site-packages/samba/dsdb.cpython-310-x86_64-linux-gnu.so +/usr/lib/python3.10/site-packages/samba/xattr_tdb.cpython-310-x86_64-linux-gnu.so +/usr/lib/python3.10/site-packages/samba/_ldb.cpython-310-x86_64-linux-gnu.so +/usr/lib/python3.10/site-packages/samba/gensec.cpython-310-x86_64-linux-gnu.so +[snip] + +Set pyext_PATTERN to '%s.so' to remove the suffix. +After the patch: +root@qemuarm64:~# find /usr/lib/ +/usr/lib/pkgconfig/samba-policy.pc +/usr/lib/libsamba-policy.so +/usr/lib/samba/libsamba-python-samba4.so +/usr/lib/samba/libsamba-net-samba4.so +/usr/lib/libsamba-policy.so.0 +/usr/lib/libsamba-policy.so.0.0.1 +/usr/lib/python3.10/site-packages/samba/dsdb_dns.so +/usr/lib/python3.10/site-packages/samba/dsdb.so +/usr/lib/python3.10/site-packages/samba/xattr_tdb.so +/usr/lib/python3.10/site-packages/samba/_ldb.so +/usr/lib/python3.10/site-packages/samba/gensec.so +[snip] + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + third_party/waf/waflib/Tools/python.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/third_party/waf/waflib/Tools/python.py b/third_party/waf/waflib/Tools/python.py +index b1c8dd0..24faa31 100644 +--- a/third_party/waf/waflib/Tools/python.py ++++ b/third_party/waf/waflib/Tools/python.py +@@ -328,7 +328,7 @@ def check_python_headers(conf, features='pyembed pyext'): + x = 'MACOSX_DEPLOYMENT_TARGET' + if dct[x]: + env[x] = conf.environ[x] = dct[x] +- env.pyext_PATTERN = '%s' + dct['SO'] # not a mistake ++ env.pyext_PATTERN = '%s.so' + + + # Try to get pythonX.Y-config +-- +2.17.1 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0006-samba-defeat-iconv-test.patch b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0006-samba-defeat-iconv-test.patch deleted file mode 100644 index 00b692b580..0000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0006-samba-defeat-iconv-test.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 59f7098bfbd63f9b3c19d7d297a8f90870a1893d Mon Sep 17 00:00:00 2001 -From: Joe Slater <joe.slater@windriver.com> -Date: Mon, 31 May 2021 14:50:38 +0800 -Subject: [PATCH] samba: defeat iconv test - -A test was added when configuring samba which requires target code -to be executed. In general, this will not work, so we eliminate it. - -Upstream-Status: Pending - -Signed-off-by: Joe Slater <joe.slater@windriver.com> ---- - lib/util/charset/wscript_configure | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/lib/util/charset/wscript_configure b/lib/util/charset/wscript_configure -index 9c27fc6..845eb36 100644 ---- a/lib/util/charset/wscript_configure -+++ b/lib/util/charset/wscript_configure -@@ -17,6 +17,8 @@ if (conf.CHECK_FUNCS_IN('iconv_open', 'iconv', checklibc=False, headers='iconv.h - - conf.DEFINE('HAVE_NATIVE_ICONV', 1) - -+""" -+[added for 4.7.0, but breaks cross-compilation] - conf.CHECK_CODE(''' - uint8_t inbuf[2] = { 0x30, 0xdf }; - uint8_t outbuf[4] = { 0 }; -@@ -36,6 +38,7 @@ conf.CHECK_CODE(''' - msg='Checking errno of iconv for illegal multibyte sequence', - lib='iconv', - headers='errno.h iconv.h') -+""" - - if conf.CHECK_CFG(package='icu-i18n', - args='--cflags --libs', --- -2.17.1 - diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0007-wscript_configure_system_gnutls-disable-check-gnutls.patch b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0007-wscript_configure_system_gnutls-disable-check-gnutls.patch deleted file mode 100644 index 0f843af20a..0000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0007-wscript_configure_system_gnutls-disable-check-gnutls.patch +++ /dev/null @@ -1,39 +0,0 @@ -From a31a014c5d98501074fde1acb5c00162c927c361 Mon Sep 17 00:00:00 2001 -From: Yi Zhao <yi.zhao@windriver.com> -Date: Mon, 31 May 2021 15:47:58 +0800 -Subject: [PATCH] wscript_configure_system_gnutls: disable check gnutls - AES_CFB8/AES_CMAC - -The CHECK_VALUEOF() can not work on cross-compilation. - -Fixes configure error: - Checking value of GNUTLS_CIPHER_AES_128_CFB8: UNKNOWN - Checking value of GNUTLS_MAC_AES_CMAC_128: UNKNOWN - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Yi Zhao <yi.zhao@windriver.com> ---- - wscript_configure_system_gnutls | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/wscript_configure_system_gnutls b/wscript_configure_system_gnutls -index 2ec217f..cd91b55 100644 ---- a/wscript_configure_system_gnutls -+++ b/wscript_configure_system_gnutls -@@ -39,6 +39,7 @@ if (parse_version(gnutls_version) > parse_version('3.6.14')): - if conf.CHECK_FUNCS_IN('gnutls_get_system_config_file', 'gnutls'): - conf.DEFINE('HAVE_GNUTLS_CRYPTO_POLICIES', 1) - -+""" - if conf.CHECK_VALUEOF('GNUTLS_CIPHER_AES_128_CFB8', headers='gnutls/gnutls.h'): - conf.DEFINE('HAVE_GNUTLS_AES_CFB8', 1) - else: -@@ -48,3 +49,4 @@ if conf.CHECK_VALUEOF('GNUTLS_MAC_AES_CMAC_128', headers='gnutls/gnutls.h'): - conf.DEFINE('HAVE_GNUTLS_AES_CMAC', 1) - else: - Logs.warn('No gnutls support for AES CMAC') -+""" --- -2.17.1 - diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0008-source3-wscript-disable-check-fcntl-F_OWNER_EX.patch b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0008-source3-wscript-disable-check-fcntl-F_OWNER_EX.patch deleted file mode 100644 index d4ceb5ce9b..0000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0008-source3-wscript-disable-check-fcntl-F_OWNER_EX.patch +++ /dev/null @@ -1,79 +0,0 @@ -From ba6bc5459cf148dd617fd9cd38dd50c3a9b5d706 Mon Sep 17 00:00:00 2001 -From: Yi Zhao <yi.zhao@windriver.com> -Date: Mon, 31 May 2021 15:50:48 +0800 -Subject: [PATCH] source3/wscript: disable check fcntl F_OWNER_EX - -It fails on cross-compilation. - -Fixes configure error: - Checking whether fcntl supports flags to send direct I/O availability signals: UNKNOWN - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Yi Zhao <yi.zhao@windriver.com> ---- - source3/wscript | 48 ------------------------------------------------ - 1 file changed, 48 deletions(-) - -diff --git a/source3/wscript b/source3/wscript -index adc31ce..f6de0a6 100644 ---- a/source3/wscript -+++ b/source3/wscript -@@ -1168,54 +1168,6 @@ err: - #include <fcntl.h> - #include <unistd.h> - #include <stdlib.h> --#include <sys/socket.h> -- --int main(void) --{ -- int sockfd, ret; -- struct f_owner_ex owner, get_owner; -- -- sockfd = socket(AF_UNIX, SOCK_STREAM, 0); -- if (sockfd == -1) { -- goto err; -- } -- -- owner.type = F_OWNER_PID; -- owner.pid = getpid(); -- -- ret = fcntl(sockfd, F_SETOWN_EX, &owner); -- if (ret == -1) { -- goto err; -- } -- -- ret = fcntl(sockfd, F_GETOWN_EX, &get_owner); -- if (ret == -1) { -- goto err; -- } -- -- if (get_owner.type != F_OWNER_PID) { -- goto err; -- } -- -- if (get_owner.pid != getpid()) { -- goto err; -- } -- -- close(sockfd); -- exit(0); --err: -- close(sockfd); -- exit(1); --}''', -- 'HAVE_F_OWNER_EX', -- addmain=False, -- execute=True, -- msg="Checking whether fcntl supports flags to send direct I/O availability signals") -- -- conf.CHECK_CODE(''' --#include <fcntl.h> --#include <unistd.h> --#include <stdlib.h> - #include <stdint.h> - - #define DATA "hinttest.fcntl" --- -2.17.1 - diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0009-source3-wscript-disable-check-fcntl-RW_HINTS.patch b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0009-source3-wscript-disable-check-fcntl-RW_HINTS.patch deleted file mode 100644 index a0b7510346..0000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0009-source3-wscript-disable-check-fcntl-RW_HINTS.patch +++ /dev/null @@ -1,92 +0,0 @@ -From 9942bca2e276c7b4c7696a08594258430c4c5bb5 Mon Sep 17 00:00:00 2001 -From: Yi Zhao <yi.zhao@windriver.com> -Date: Thu, 3 Jun 2021 09:39:56 +0800 -Subject: [PATCH] source3/wscript: disable check fcntl RW_HINTS - -It fails on cross-compilation for musl. - -Fixes configure error: - Checking whether fcntl supports setting/geting hints: UNKNOWN - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Yi Zhao <yi.zhao@windriver.com> ---- - source3/wscript | 61 ------------------------------------------------- - 1 file changed, 61 deletions(-) - -diff --git a/source3/wscript b/source3/wscript -index f6de0a6..3e260c1 100644 ---- a/source3/wscript -+++ b/source3/wscript -@@ -1164,67 +1164,6 @@ err: - execute=True, - msg="Checking whether fcntl lock supports open file description locks") - -- conf.CHECK_CODE(''' --#include <fcntl.h> --#include <unistd.h> --#include <stdlib.h> --#include <stdint.h> -- --#define DATA "hinttest.fcntl" -- --int main(void) --{ -- uint64_t hint, get_hint; -- int fd; -- -- fd = open(DATA, O_RDONLY | O_CREAT | O_EXCL); -- if (fd == -1) { -- goto err; -- } -- -- hint = RWH_WRITE_LIFE_SHORT; -- int ret = fcntl(fd, F_SET_RW_HINT, &hint); -- if (ret == -1) { -- goto err; -- } -- -- ret = fcntl(fd, F_GET_RW_HINT, &get_hint); -- if (ret == -1) { -- goto err; -- } -- -- if (get_hint != RWH_WRITE_LIFE_SHORT) { -- goto err; -- } -- -- hint = RWH_WRITE_LIFE_EXTREME; -- ret = fcntl(fd, F_SET_FILE_RW_HINT, &hint); -- if (ret == -1) { -- goto err; -- } -- -- ret = fcntl(fd, F_GET_FILE_RW_HINT, &get_hint); -- if (ret == -1) { -- goto err; -- } -- -- if (get_hint != RWH_WRITE_LIFE_EXTREME) { -- goto err; -- } -- -- close(fd); -- unlink(DATA); -- exit(0); --err: -- close(fd); -- unlink(DATA); -- exit(1); --}''', -- 'HAVE_RW_HINTS', -- addmain=False, -- execute=True, -- msg="Checking whether fcntl supports setting/geting hints") -- - conf.CHECK_STRUCTURE_MEMBER('struct stat', 'st_mtim.tv_nsec', - define='HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC') # Linux, Solaris - conf.CHECK_STRUCTURE_MEMBER('struct stat', 'st_mtimensec', --- -2.17.1 - diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.14.8.bb b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.14.11.bb index 0dd563c5b9..0e125891e9 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.14.8.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.14.11.bb @@ -20,10 +20,7 @@ SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \ file://0003-Add-config-option-without-valgrind.patch \ file://0004-Add-options-to-configure-the-use-of-libbsd.patch \ file://0005-samba-build-dnsserver_common-code.patch \ - file://0006-samba-defeat-iconv-test.patch \ - file://0007-wscript_configure_system_gnutls-disable-check-gnutls.patch \ - file://0008-source3-wscript-disable-check-fcntl-F_OWNER_EX.patch \ - file://0009-source3-wscript-disable-check-fcntl-RW_HINTS.patch \ + file://0001-Fix-pyext_PATTERN-for-cross-compilation.patch \ " SRC_URI:append:libc-musl = " \ @@ -34,8 +31,7 @@ SRC_URI:append:libc-musl = " \ file://samba-fix-musl-lib-without-innetgr.patch \ " -SRC_URI[md5sum] = "5c6636b34a322de0eb917ee0403be322" -SRC_URI[sha256sum] = "c936b782c2aced8cd7299c13bec67c495fd4affdb217a6ed6150f4fd6d770fde" +SRC_URI[sha256sum] = "3d9ebbf3280c7cf5eac1b15aeff8857b31151abaec4d2987be015a66c2945d98" UPSTREAM_CHECK_REGEX = "samba\-(?P<pver>4\.14(\.\d+)+).tar.gz" @@ -244,7 +240,7 @@ PACKAGESPLITFUNCS:prepend = "samba_populate_packages " PACKAGES_DYNAMIC = "samba-auth-.* samba-pdb-.*" RDEPENDS:${PN} += "${PN}-base ${PN}-python3 ${PN}-dsdb-modules python3" -RDEPENDS:${PN}-python3 += "pytalloc python3-tdb" +RDEPENDS:${PN}-python3 += "pytalloc python3-tdb pyldb" FILES:${PN}-base = "${sbindir}/nmbd \ ${sbindir}/smbd \ diff --git a/meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.18.1.bb b/meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.19.bb index 1e2495406e..9c479d2200 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.18.1.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.19.bb @@ -14,7 +14,7 @@ SRC_URI = "https://www.snort.org/downloads/archive/snort/${BP}.tar.gz \ file://disable-run-test-program-while-cross-compiling.patch \ file://configure.in-disable-tirpc-checking-for-fedora.patch \ " -SRC_URI[sha256sum] = "da8af0f1b2e4f247d970c6a3c0e83fb6dcd5c84faa21aea49f306f269e8e28aa" +SRC_URI[sha256sum] = "b12fc6db72afb58987a2bf1954b8f45bde02047c235513c7663857b9506369c7" UPSTREAM_CHECK_URI = "https://www.snort.org/downloads" UPSTREAM_CHECK_REGEX = "snort-(?P<pver>\d+(\.\d+)+)\.tar" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb b/meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb index 63a0494e4e..421ebaa969 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb @@ -9,7 +9,7 @@ DEPENDS += "libgcrypt" PV .= "r550-2jnpr1" SRCREV = "b1243d29e0c00312ead038b04a2cf5e2fa31d740" -SRC_URI = "git://github.com/ndpgroup/vpnc \ +SRC_URI = "git://github.com/ndpgroup/vpnc;branch=master;protocol=https \ file://long-help \ file://default.conf \ file://0001-search-for-log-help-in-build-dir.patch \ diff --git a/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_4.7.1.bb b/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_5.1.0.bb index c2b3c3d63a..7b43b06781 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_4.7.1.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_5.1.0.bb @@ -12,9 +12,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" PROVIDES += "cyassl" RPROVIDES:${PN} = "cyassl" -SRC_URI = "git://github.com/wolfSSL/wolfssl.git;protocol=https \ -" -SRCREV = "95b91d89133a712a3d0f389442924612c103da24" +SRC_URI = "git://github.com/wolfSSL/wolfssl.git;protocol=https;branch=master" +SRCREV = "2b670c026debc8e70621eb5c75b60931c9aa0bc5" + S = "${WORKDIR}/git" inherit autotools |