diff options
Diffstat (limited to 'meta-networking')
36 files changed, 665 insertions, 376 deletions
diff --git a/meta-networking/recipes-connectivity/mbedtls/mbedtls_3.6.5.bb b/meta-networking/recipes-connectivity/mbedtls/mbedtls_3.6.5.bb index e6dfe43092..bc2ff8ffb5 100644 --- a/meta-networking/recipes-connectivity/mbedtls/mbedtls_3.6.5.bb +++ b/meta-networking/recipes-connectivity/mbedtls/mbedtls_3.6.5.bb | |||
| @@ -15,7 +15,8 @@ understand what the code does. It features: \ | |||
| 15 | platform abstraction and threading \ | 15 | platform abstraction and threading \ |
| 16 | " | 16 | " |
| 17 | 17 | ||
| 18 | HOMEPAGE = "https://tls.mbed.org/" | 18 | HOMEPAGE = "https://www.trustedfirmware.org/projects/mbed-tls/" |
| 19 | BUGTRACKER = "https://github.com/Mbed-TLS/mbedtls/issues" | ||
| 19 | 20 | ||
| 20 | LICENSE = "Apache-2.0 | GPL-2.0-or-later" | 21 | LICENSE = "Apache-2.0 | GPL-2.0-or-later" |
| 21 | LIC_FILES_CHKSUM = "file://LICENSE;md5=379d5819937a6c2f1ef1630d341e026d" | 22 | LIC_FILES_CHKSUM = "file://LICENSE;md5=379d5819937a6c2f1ef1630d341e026d" |
diff --git a/meta-networking/recipes-connectivity/mosquitto/files/2895.patch b/meta-networking/recipes-connectivity/mosquitto/files/2895.patch deleted file mode 100644 index d9432e749e..0000000000 --- a/meta-networking/recipes-connectivity/mosquitto/files/2895.patch +++ /dev/null | |||
| @@ -1,38 +0,0 @@ | |||
| 1 | From: Joachim Zobel <jz-2017@heute-morgen.de> | ||
| 2 | Date: Wed, 13 Sep 2023 10:05:43 +0200 | ||
| 3 | Subject: [PATCH] Mosquitto now waits for network-online when starting | ||
| 4 | (Closes: #1036450) | ||
| 5 | |||
| 6 | See: https://github.com/eclipse/mosquitto/issues/2878 | ||
| 7 | --- | ||
| 8 | Upstream-Status: Submitted [https://github.com/eclipse-mosquitto/mosquitto/pull/2895] | ||
| 9 | |||
| 10 | service/systemd/mosquitto.service.simple | 4 ++-- | ||
| 11 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| 12 | |||
| 13 | --- a/service/systemd/mosquitto.service.simple | ||
| 14 | +++ b/service/systemd/mosquitto.service.simple | ||
| 15 | @@ -1,8 +1,8 @@ | ||
| 16 | [Unit] | ||
| 17 | Description=Mosquitto MQTT Broker | ||
| 18 | Documentation=man:mosquitto.conf(5) man:mosquitto(8) | ||
| 19 | -After=network.target | ||
| 20 | -Wants=network.target | ||
| 21 | +After=network-online.target | ||
| 22 | +Wants=network-online.target | ||
| 23 | |||
| 24 | [Service] | ||
| 25 | ExecStart=/usr/sbin/mosquitto -c /etc/mosquitto/mosquitto.conf | ||
| 26 | --- a/service/systemd/mosquitto.service.notify | ||
| 27 | +++ b/service/systemd/mosquitto.service.notify | ||
| 28 | @@ -1,8 +1,8 @@ | ||
| 29 | [Unit] | ||
| 30 | Description=Mosquitto MQTT Broker | ||
| 31 | Documentation=man:mosquitto.conf(5) man:mosquitto(8) | ||
| 32 | -After=network.target | ||
| 33 | -Wants=network.target | ||
| 34 | +After=network-online.target | ||
| 35 | +Wants=network-online.target | ||
| 36 | |||
| 37 | [Service] | ||
| 38 | Type=notify | ||
diff --git a/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.22.bb b/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.1.2.bb index 1bdf54eea1..6a6e554453 100644 --- a/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.22.bb +++ b/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.1.2.bb | |||
| @@ -6,20 +6,19 @@ provides a lightweight method of carrying out messaging using a \ | |||
| 6 | publish/subscribe model. " | 6 | publish/subscribe model. " |
| 7 | HOMEPAGE = "http://mosquitto.org/" | 7 | HOMEPAGE = "http://mosquitto.org/" |
| 8 | SECTION = "console/network" | 8 | SECTION = "console/network" |
| 9 | LICENSE = "EPL-2.0 | EDL-1.0" | 9 | LICENSE = "EPL-2.0 | BSD-3-Clause" |
| 10 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=ca9a8f366c6babf593e374d0d7d58749 \ | 10 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f6d64fd27a4071b14ef656a0e8a4f4cf \ |
| 11 | file://edl-v10;md5=9f6accb1afcb570f8be65039e2fcd49e \ | 11 | file://edl-v10;md5=9f6accb1afcb570f8be65039e2fcd49e \ |
| 12 | file://epl-v20;md5=2dd765ca47a05140be15ebafddbeadfe \ | 12 | file://epl-v20;md5=2dd765ca47a05140be15ebafddbeadfe \ |
| 13 | file://NOTICE.md;md5=a7a91b4754c6f7995020d1b49bc829c6 \ | 13 | file://NOTICE.md;md5=611234becddb76dca161d4ffce7ab420 \ |
| 14 | " | 14 | " |
| 15 | DEPENDS = "uthash cjson" | 15 | DEPENDS = "uthash cjson" |
| 16 | 16 | ||
| 17 | SRC_URI = "http://mosquitto.org/files/source/mosquitto-${PV}.tar.gz \ | 17 | SRC_URI = "http://mosquitto.org/files/source/mosquitto-${PV}.tar.gz \ |
| 18 | file://mosquitto.init \ | 18 | file://mosquitto.init \ |
| 19 | file://2895.patch \ | ||
| 20 | " | 19 | " |
| 21 | 20 | ||
| 22 | SRC_URI[sha256sum] = "2f752589ef7db40260b633fbdb536e9a04b446a315138d64a7ff3c14e2de6b68" | 21 | SRC_URI[sha256sum] = "fd905380691ac65ea5a93779e8214941829e3d6e038d5edff9eac5fd74cbed02" |
| 23 | 22 | ||
| 24 | inherit systemd update-rc.d useradd cmake pkgconfig | 23 | inherit systemd update-rc.d useradd cmake pkgconfig |
| 25 | 24 | ||
| @@ -27,16 +26,24 @@ PACKAGECONFIG ??= "ssl websockets \ | |||
| 27 | ${@bb.utils.filter('DISTRO_FEATURES','systemd', d)} \ | 26 | ${@bb.utils.filter('DISTRO_FEATURES','systemd', d)} \ |
| 28 | " | 27 | " |
| 29 | 28 | ||
| 30 | PACKAGECONFIG[manpages] = "-DDOCUMENTATION=ON,-DDOCUMENTATION=OFF,libxslt-native docbook-xsl-stylesheets-native" | 29 | PACKAGECONFIG[manpages] = "-DWITH_DOCS=ON,-DWITH_DOCS=OFF,libxslt-native docbook-xsl-stylesheets-native" |
| 31 | PACKAGECONFIG[dns-srv] = "-DWITH_SRV=ON,-DWITH_SRV=OFF,c-ares" | 30 | PACKAGECONFIG[dns-srv] = "-DWITH_SRV=ON,-DWITH_SRV=OFF,c-ares" |
| 32 | PACKAGECONFIG[ssl] = "-DWITH_TLS=ON -DWITH_TLS_PSK=ON -DWITH_EC=ON,-DWITH_TLS=OFF -DWITH_TLS_PSK=OFF -DWITH_EC=OFF,openssl" | 31 | PACKAGECONFIG[ssl] = "-DWITH_TLS=ON -DWITH_TLS_PSK=ON,-DWITH_TLS=OFF -DWITH_TLS_PSK=OFF,openssl" |
| 33 | PACKAGECONFIG[systemd] = "-DWITH_SYSTEMD=ON,-DWITH_SYSTEMD=OFF,systemd" | 32 | PACKAGECONFIG[systemd] = "-DWITH_SYSTEMD=ON,-DWITH_SYSTEMD=OFF,systemd" |
| 34 | PACKAGECONFIG[websockets] = "-DWITH_WEBSOCKETS=ON,-DWITH_WEBSOCKETS=OFF,libwebsockets" | 33 | PACKAGECONFIG[websockets] = "-DWITH_WEBSOCKETS=ON -DWITH_WEBSOCKETS_BUILTIN=OFF,-DWITH_WEBSOCKETS=OFF,libwebsockets" |
| 35 | PACKAGECONFIG[dlt] = "-DWITH_DLT=ON,-DWITH_DLT=OFF,dlt-daemon" | 34 | PACKAGECONFIG[dlt] = "-DWITH_DLT=ON,-DWITH_DLT=OFF,dlt-daemon" |
| 36 | 35 | PACKAGECONFIG[http-api] = "-DWITH_HTTP_API=ON,-DWITH_HTTP_API=OFF,libmicrohttpd" | |
| 36 | PACKAGECONFIG[persist-sqlite] = "-DWITH_PLUGIN_PERSIST_SQLITE=ON,-DWITH_PLUGIN_PERSIST_SQLITE=OFF,sqlite3" | ||
| 37 | PACKAGECONFIG[ctrl-shell] = "-DWITH_CTRL_SHELL=ON,-DWITH_CTRL_SHELL=OFF,libedit" | ||
| 38 | |||
| 39 | # Disable building/running tests to avoid GoogleTest discovery executing target binaries | ||
| 40 | # during cross-compilation (Yocto). This prevents CMake from calling gtest_discover_tests(). | ||
| 41 | # See: Yocto + GTest cross-compile issues and gtest_discover_tests execution failures. | ||
| 42 | # (Refs: SO example and googletest issue) | ||
| 37 | EXTRA_OECMAKE = " \ | 43 | EXTRA_OECMAKE = " \ |
| 38 | -DWITH_BUNDLED_DEPS=OFF \ | 44 | -DWITH_BUNDLED_DEPS=OFF \ |
| 39 | -DWITH_ADNS=ON \ | 45 | -DWITH_ADNS=OFF \ |
| 46 | -DWITH_TESTS=OFF \ | ||
| 40 | " | 47 | " |
| 41 | 48 | ||
| 42 | do_install:append() { | 49 | do_install:append() { |
| @@ -52,17 +59,14 @@ do_install:append() { | |||
| 52 | ${D}${sysconfdir}/init.d/mosquitto | 59 | ${D}${sysconfdir}/init.d/mosquitto |
| 53 | } | 60 | } |
| 54 | 61 | ||
| 55 | PACKAGES += "libmosquitto1 libmosquittopp1 ${PN}-clients" | 62 | PACKAGE_BEFORE_PN = "libmosquitto1 libmosquittopp1 ${PN}-clients ${PN}-examples" |
| 56 | |||
| 57 | PACKAGE_BEFORE_PN = "${PN}-examples" | ||
| 58 | 63 | ||
| 59 | FILES:${PN} = "${sbindir}/mosquitto \ | 64 | FILES:${PN} += " \ |
| 60 | ${bindir}/mosquitto_passwd \ | 65 | ${libdir}/mosquitto_acl_file.so \ |
| 61 | ${bindir}/mosquitto_ctrl \ | 66 | ${libdir}/mosquitto_dynamic_security.so \ |
| 62 | ${libdir}/mosquitto_dynamic_security.so \ | 67 | ${libdir}/mosquitto_password_file.so \ |
| 63 | ${sysconfdir}/mosquitto \ | 68 | ${libdir}/mosquitto_sparkplug_aware.so \ |
| 64 | ${sysconfdir}/init.d \ | 69 | ${systemd_unitdir}/system/mosquitto.service \ |
| 65 | ${systemd_unitdir}/system/mosquitto.service \ | ||
| 66 | " | 70 | " |
| 67 | 71 | ||
| 68 | CONFFILES:${PN} += "${sysconfdir}/mosquitto/mosquitto.conf" | 72 | CONFFILES:${PN} += "${sysconfdir}/mosquitto/mosquitto.conf" |
diff --git a/meta-networking/recipes-connectivity/wolfssl/wolfssl_5.8.4.bb b/meta-networking/recipes-connectivity/wolfssl/wolfssl_5.9.0.bb index f16c8c1e68..a2d6455d93 100644 --- a/meta-networking/recipes-connectivity/wolfssl/wolfssl_5.8.4.bb +++ b/meta-networking/recipes-connectivity/wolfssl/wolfssl_5.9.0.bb | |||
| @@ -17,7 +17,7 @@ SRC_URI = " \ | |||
| 17 | file://run-ptest \ | 17 | file://run-ptest \ |
| 18 | " | 18 | " |
| 19 | 19 | ||
| 20 | SRCREV = "59f4fa568615396fbf381b073b220d1e8d61e4c2" | 20 | SRCREV = "922d04b3568c6428a9fb905ddee3ef5a68db3108" |
| 21 | 21 | ||
| 22 | 22 | ||
| 23 | inherit autotools ptest | 23 | inherit autotools ptest |
| @@ -46,6 +46,3 @@ do_install_ptest() { | |||
| 46 | cp -rf ${S}/certs ${D}${PTEST_PATH} | 46 | cp -rf ${S}/certs ${D}${PTEST_PATH} |
| 47 | cp -rf ${S}/tests ${D}${PTEST_PATH} | 47 | cp -rf ${S}/tests ${D}${PTEST_PATH} |
| 48 | } | 48 | } |
| 49 | |||
| 50 | CVE_STATUS[CVE-2025-11931] = "fixed-version: The currently used version (5.8.4) contains the fix already." | ||
| 51 | CVE_STATUS[CVE-2025-12889] = "fixed-version: The currently used version (5.8.4) contains the fix already." | ||
diff --git a/meta-networking/recipes-connectivity/wowlan-udev/wowlan-udev.bb b/meta-networking/recipes-connectivity/wowlan-udev/wowlan-udev.bb index 857bbc3f95..61cba47e33 100644 --- a/meta-networking/recipes-connectivity/wowlan-udev/wowlan-udev.bb +++ b/meta-networking/recipes-connectivity/wowlan-udev/wowlan-udev.bb | |||
| @@ -4,6 +4,8 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda | |||
| 4 | 4 | ||
| 5 | SRC_URI = "file://99-wowlan.rules" | 5 | SRC_URI = "file://99-wowlan.rules" |
| 6 | 6 | ||
| 7 | S = "${UNPACKDIR}" | ||
| 8 | |||
| 7 | do_install() { | 9 | do_install() { |
| 8 | install -d ${D}${sysconfdir}/udev/rules.d | 10 | install -d ${D}${sysconfdir}/udev/rules.d |
| 9 | install -m 0644 ${UNPACKDIR}/99-wowlan.rules \ | 11 | install -m 0644 ${UNPACKDIR}/99-wowlan.rules \ |
diff --git a/meta-networking/recipes-daemons/lldpd/lldpd_1.0.20.bb b/meta-networking/recipes-daemons/lldpd/lldpd_1.0.20.bb index 044f1e0745..b7224d0f3d 100644 --- a/meta-networking/recipes-daemons/lldpd/lldpd_1.0.20.bb +++ b/meta-networking/recipes-daemons/lldpd/lldpd_1.0.20.bb | |||
| @@ -29,7 +29,7 @@ EXTRA_OECONF += "--without-embedded-libevent \ | |||
| 29 | " | 29 | " |
| 30 | 30 | ||
| 31 | PACKAGECONFIG ??= "cdp fdp edp sonmp lldpmed dot1 dot3" | 31 | PACKAGECONFIG ??= "cdp fdp edp sonmp lldpmed dot1 dot3" |
| 32 | PACKAGECONFIG[xml] = "--with-xml,--without-xml,libxm2" | 32 | PACKAGECONFIG[xml] = "--with-xml,--without-xml,libxml2" |
| 33 | PACKAGECONFIG[snmp] = "--with-snmp,--without-snmp,net-snmp" | 33 | PACKAGECONFIG[snmp] = "--with-snmp,--without-snmp,net-snmp" |
| 34 | PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" | 34 | PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" |
| 35 | PACKAGECONFIG[seccomp] = "--with-seccomp,--without-seccomp,libseccomp" | 35 | PACKAGECONFIG[seccomp] = "--with-seccomp,--without-seccomp,libseccomp" |
diff --git a/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.2.4.bb b/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.2.4.bb index e7db8a948b..aa7c9b8736 100644 --- a/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.2.4.bb +++ b/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.2.4.bb | |||
| @@ -2,20 +2,20 @@ SUMMARY = "Dispatcher service for systemd-networkd connection status changes" | |||
| 2 | DESCRIPTION = "This daemon is similar to NetworkManager-dispatcher, but is much \ | 2 | DESCRIPTION = "This daemon is similar to NetworkManager-dispatcher, but is much \ |
| 3 | more limited in the types of events it supports due to the limited nature of \ | 3 | more limited in the types of events it supports due to the limited nature of \ |
| 4 | systemd-networkd(8)." | 4 | systemd-networkd(8)." |
| 5 | HOMEPAGE = "https://gitlab.com/craftyguy/networkd-dispatcher" | ||
| 6 | BUGTRACKER = "https://gitlab.com/craftyguy/networkd-dispatcher/-/issues" | ||
| 7 | SECTION = "network" | ||
| 5 | 8 | ||
| 6 | LICENSE = "GPL-3.0-only" | 9 | LICENSE = "GPL-3.0-only" |
| 7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d" | 10 | LIC_FILES_CHKSUM = "file://LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d" |
| 8 | 11 | ||
| 9 | inherit features_check systemd | 12 | inherit allarch features_check systemd |
| 10 | 13 | ||
| 11 | RDEPENDS:${PN} = "python3-pygobject python3-dbus python3-json" | ||
| 12 | REQUIRED_DISTRO_FEATURES = "systemd gobject-introspection-data" | 14 | REQUIRED_DISTRO_FEATURES = "systemd gobject-introspection-data" |
| 13 | 15 | ||
| 16 | SRC_URI = "git://gitlab.com/craftyguy/networkd-dispatcher;protocol=https;nobranch=1;tag=${PV}" | ||
| 14 | SRCREV = "dfd26d72793914eb3da910ef8c71de6d7c8942a2" | 17 | SRCREV = "dfd26d72793914eb3da910ef8c71de6d7c8942a2" |
| 15 | SRC_URI = "git://gitlab.com/craftyguy/networkd-dispatcher;protocol=https;nobranch=1" | ||
| 16 | 18 | ||
| 17 | |||
| 18 | SYSTEMD_PACKAGES = "${PN}" | ||
| 19 | SYSTEMD_SERVICE:${PN} = "networkd-dispatcher.service" | 19 | SYSTEMD_SERVICE:${PN} = "networkd-dispatcher.service" |
| 20 | SYSTEMD_AUTO_ENABLE = "disable" | 20 | SYSTEMD_AUTO_ENABLE = "disable" |
| 21 | 21 | ||
| @@ -28,3 +28,5 @@ do_install() { | |||
| 28 | install -D -m 0644 ${S}/networkd-dispatcher.service ${D}/${systemd_system_unitdir}/networkd-dispatcher.service | 28 | install -D -m 0644 ${S}/networkd-dispatcher.service ${D}/${systemd_system_unitdir}/networkd-dispatcher.service |
| 29 | install -D -m 0644 ${S}/networkd-dispatcher.conf ${D}/${sysconfdir}/conf.d/networkd-dispatcher.conf | 29 | install -D -m 0644 ${S}/networkd-dispatcher.conf ${D}/${sysconfdir}/conf.d/networkd-dispatcher.conf |
| 30 | } | 30 | } |
| 31 | |||
| 32 | RDEPENDS:${PN} = "python3-dbus python3-json python3-pygobject" | ||
diff --git a/meta-networking/recipes-protocols/frr/frr_10.5.2.bb b/meta-networking/recipes-protocols/frr/frr_10.5.3.bb index 710bdf4a5d..1c06f7bda5 100644 --- a/meta-networking/recipes-protocols/frr/frr_10.5.2.bb +++ b/meta-networking/recipes-protocols/frr/frr_10.5.3.bb | |||
| @@ -10,13 +10,13 @@ LIC_FILES_CHKSUM = "file://doc/licenses/GPL-2.0;md5=b234ee4d69f5fce4486a80fdaf4a | |||
| 10 | file://doc/licenses/LGPL-2.1;md5=4fbd65380cdd255951079008b364516c" | 10 | file://doc/licenses/LGPL-2.1;md5=4fbd65380cdd255951079008b364516c" |
| 11 | 11 | ||
| 12 | 12 | ||
| 13 | SRC_URI = "git://github.com/FRRouting/frr.git;protocol=https;branch=stable/10.5;tag=frr-${PV} \ | 13 | SRC_URI = "git://github.com/FRRouting/frr.git;protocol=https;nobranch=1;tag=frr-${PV} \ |
| 14 | file://frr.pam \ | 14 | file://frr.pam \ |
| 15 | file://CVE-2025-61099-61107-1.patch \ | 15 | file://CVE-2025-61099-61107-1.patch \ |
| 16 | file://CVE-2025-61099-61107-2.patch \ | 16 | file://CVE-2025-61099-61107-2.patch \ |
| 17 | file://CVE-2025-61099-61107-3.patch \ | 17 | file://CVE-2025-61099-61107-3.patch \ |
| 18 | " | 18 | " |
| 19 | SRCREV = "fa68c0ca04f95125cb993b5cacb64fc1495348eb" | 19 | SRCREV = "cd39d029a48a1e58929a7f31e7d61a594c2ecb42" |
| 20 | 20 | ||
| 21 | UPSTREAM_CHECK_GITTAGREGEX = "frr-(?P<pver>\d+(\.\d+)+)$" | 21 | UPSTREAM_CHECK_GITTAGREGEX = "frr-(?P<pver>\d+(\.\d+)+)$" |
| 22 | 22 | ||
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0001-Fix-build-with-gcc-15.patch b/meta-networking/recipes-protocols/mdns/mdns/0001-Fix-build-with-gcc-15.patch index af33d5444c..c232685a15 100644 --- a/meta-networking/recipes-protocols/mdns/mdns/0001-Fix-build-with-gcc-15.patch +++ b/meta-networking/recipes-protocols/mdns/mdns/0001-Fix-build-with-gcc-15.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From c84f185f29d0839b97177aecb0a78b9717947973 Mon Sep 17 00:00:00 2001 | 1 | From 0ec55ecaa7386f924ee3d64fdfbe1c2d0df1341a Mon Sep 17 00:00:00 2001 |
| 2 | From: Nguyen Dat Tho <tho3.nguyen@lge.com> | 2 | From: Nguyen Dat Tho <tho3.nguyen@lge.com> |
| 3 | Date: Wed, 9 Apr 2025 13:05:24 +0900 | 3 | Date: Wed, 9 Apr 2025 13:05:24 +0900 |
| 4 | Subject: [PATCH] Fix build with gcc-15 | 4 | Subject: [PATCH] Fix build with gcc-15 |
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0001-dns-sd-Include-missing-headers.patch b/meta-networking/recipes-protocols/mdns/mdns/0001-dns-sd-Include-missing-headers.patch index 5464e3febe..c9929db4ca 100644 --- a/meta-networking/recipes-protocols/mdns/mdns/0001-dns-sd-Include-missing-headers.patch +++ b/meta-networking/recipes-protocols/mdns/mdns/0001-dns-sd-Include-missing-headers.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From cdbc28c668dd627906f833f9a8e32ac53b0b0139 Mon Sep 17 00:00:00 2001 | 1 | From 18b1239b7abd289fe5275fddc2545727a956a4ad Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Thu, 4 Nov 2021 07:31:32 -0700 | 3 | Date: Thu, 4 Nov 2021 07:31:32 -0700 |
| 4 | Subject: [PATCH] dns-sd: Include missing headers | 4 | Subject: [PATCH] dns-sd: Include missing headers |
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0002-make-Set-libdns_sd.so-soname-correctly.patch b/meta-networking/recipes-protocols/mdns/mdns/0002-make-Set-libdns_sd.so-soname-correctly.patch index f547c64d93..5f91e91b1d 100644 --- a/meta-networking/recipes-protocols/mdns/mdns/0002-make-Set-libdns_sd.so-soname-correctly.patch +++ b/meta-networking/recipes-protocols/mdns/mdns/0002-make-Set-libdns_sd.so-soname-correctly.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From dcc1f39a0918cdebf53ac7c105b3d33df960ed14 Mon Sep 17 00:00:00 2001 | 1 | From 7319d6c328d7b18a048e9855902e180fe23641a2 Mon Sep 17 00:00:00 2001 |
| 2 | From: Alex Kiernan <alex.kiernan@gmail.com> | 2 | From: Alex Kiernan <alex.kiernan@gmail.com> |
| 3 | Date: Mon, 5 Dec 2022 15:14:12 +0000 | 3 | Date: Mon, 5 Dec 2022 15:14:12 +0000 |
| 4 | Subject: [PATCH] make: Set libdns_sd.so soname correctly | 4 | Subject: [PATCH] make: Set libdns_sd.so soname correctly |
| @@ -10,7 +10,7 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | |||
| 10 | 1 file changed, 1 insertion(+), 1 deletion(-) | 10 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 11 | 11 | ||
| 12 | diff --git a/mDNSPosix/Makefile b/mDNSPosix/Makefile | 12 | diff --git a/mDNSPosix/Makefile b/mDNSPosix/Makefile |
| 13 | index e05ba10b4340..7c510317f1b6 100755 | 13 | index 22789f0368c7..2bb57eae5659 100755 |
| 14 | --- a/mDNSPosix/Makefile | 14 | --- a/mDNSPosix/Makefile |
| 15 | +++ b/mDNSPosix/Makefile | 15 | +++ b/mDNSPosix/Makefile |
| 16 | @@ -276,7 +276,7 @@ libdns_sd: setup $(BUILDDIR)/libdns_sd.$(LDSUFFIX) | 16 | @@ -276,7 +276,7 @@ libdns_sd: setup $(BUILDDIR)/libdns_sd.$(LDSUFFIX) |
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0004-make-Separate-TLS-targets-from-libraries.patch b/meta-networking/recipes-protocols/mdns/mdns/0004-make-Separate-TLS-targets-from-libraries.patch index 2969b5e244..b6697f0ba6 100644 --- a/meta-networking/recipes-protocols/mdns/mdns/0004-make-Separate-TLS-targets-from-libraries.patch +++ b/meta-networking/recipes-protocols/mdns/mdns/0004-make-Separate-TLS-targets-from-libraries.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From f7ee12c1f8e85b9d2fe4023b6539c8051dc710c3 Mon Sep 17 00:00:00 2001 | 1 | From e27ac4bb6243b33d23ccb7a137983887676fda7f Mon Sep 17 00:00:00 2001 |
| 2 | From: Alex Kiernan <alex.kiernan@gmail.com> | 2 | From: Alex Kiernan <alex.kiernan@gmail.com> |
| 3 | Date: Mon, 5 Dec 2022 15:14:26 +0000 | 3 | Date: Mon, 5 Dec 2022 15:14:26 +0000 |
| 4 | Subject: [PATCH] make: Separate TLS targets from libraries | 4 | Subject: [PATCH] make: Separate TLS targets from libraries |
| @@ -13,7 +13,7 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | |||
| 13 | 1 file changed, 8 insertions(+), 6 deletions(-) | 13 | 1 file changed, 8 insertions(+), 6 deletions(-) |
| 14 | 14 | ||
| 15 | diff --git a/mDNSPosix/Makefile b/mDNSPosix/Makefile | 15 | diff --git a/mDNSPosix/Makefile b/mDNSPosix/Makefile |
| 16 | index 7c510317f1b6..8dd5984020ee 100755 | 16 | index 2bb57eae5659..490165561410 100755 |
| 17 | --- a/mDNSPosix/Makefile | 17 | --- a/mDNSPosix/Makefile |
| 18 | +++ b/mDNSPosix/Makefile | 18 | +++ b/mDNSPosix/Makefile |
| 19 | @@ -112,9 +112,11 @@ ifeq ($(findstring linux,$(os)),linux) | 19 | @@ -112,9 +112,11 @@ ifeq ($(findstring linux,$(os)),linux) |
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0005-mDNSCore-Fix-broken-debug-parameter.patch b/meta-networking/recipes-protocols/mdns/mdns/0005-mDNSCore-Fix-broken-debug-parameter.patch index 0c1a9f373f..b8929ea439 100644 --- a/meta-networking/recipes-protocols/mdns/mdns/0005-mDNSCore-Fix-broken-debug-parameter.patch +++ b/meta-networking/recipes-protocols/mdns/mdns/0005-mDNSCore-Fix-broken-debug-parameter.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From e79f75487e32f87677519ec40c021b1623395bde Mon Sep 17 00:00:00 2001 | 1 | From ab62d343d7e13ae79b0445a0b3d0954ba3534a0c Mon Sep 17 00:00:00 2001 |
| 2 | From: Alex Kiernan <alex.kiernan@gmail.com> | 2 | From: Alex Kiernan <alex.kiernan@gmail.com> |
| 3 | Date: Mon, 5 Dec 2022 22:49:49 +0000 | 3 | Date: Mon, 5 Dec 2022 22:49:49 +0000 |
| 4 | Subject: [PATCH] mDNSCore: Fix broken debug parameter | 4 | Subject: [PATCH] mDNSCore: Fix broken debug parameter |
| @@ -9,11 +9,11 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | |||
| 9 | mDNSCore/mDNS.c | 2 +- | 9 | mDNSCore/mDNS.c | 2 +- |
| 10 | 1 file changed, 1 insertion(+), 1 deletion(-) | 10 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 11 | 11 | ||
| 12 | Index: mDNSResponder/mDNSCore/mDNS.c | 12 | diff --git a/mDNSCore/mDNS.c b/mDNSCore/mDNS.c |
| 13 | =================================================================== | 13 | index 08bfafb11d8d..079c9742e419 100644 |
| 14 | --- mDNSResponder.orig/mDNSCore/mDNS.c | 14 | --- a/mDNSCore/mDNS.c |
| 15 | +++ mDNSResponder/mDNSCore/mDNS.c | 15 | +++ b/mDNSCore/mDNS.c |
| 16 | @@ -9481,7 +9481,7 @@ mDNSlocal void mDNSCoreReceiveNoUnicastA | 16 | @@ -9481,7 +9481,7 @@ mDNSlocal void mDNSCoreReceiveNoUnicastAnswers(mDNS *const m, const DNSMessage * |
| 17 | { | 17 | { |
| 18 | CacheRecord *negcr; | 18 | CacheRecord *negcr; |
| 19 | const DNSServRef dnsserv = qptr->qDNSServer; | 19 | const DNSServRef dnsserv = qptr->qDNSServer; |
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0006-make-Add-top-level-Makefile.patch b/meta-networking/recipes-protocols/mdns/mdns/0006-make-Add-top-level-Makefile.patch index 5f8f428302..87b163f1e2 100644 --- a/meta-networking/recipes-protocols/mdns/mdns/0006-make-Add-top-level-Makefile.patch +++ b/meta-networking/recipes-protocols/mdns/mdns/0006-make-Add-top-level-Makefile.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From a1c982808ebfb71ba7e0f16040013b7127a6e2ab Mon Sep 17 00:00:00 2001 | 1 | From a90eacb0f42e4ac63fe8c0ab624e8af7d9d47bd1 Mon Sep 17 00:00:00 2001 |
| 2 | From: Alex Kiernan <alex.kiernan@gmail.com> | 2 | From: Alex Kiernan <alex.kiernan@gmail.com> |
| 3 | Date: Tue, 6 Dec 2022 13:28:31 +0000 | 3 | Date: Tue, 6 Dec 2022 13:28:31 +0000 |
| 4 | Subject: [PATCH] make: Add top-level Makefile | 4 | Subject: [PATCH] make: Add top-level Makefile |
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0007-mDNSShared-Make-Apple-Wireless-Direct-Link-depend-on.patch b/meta-networking/recipes-protocols/mdns/mdns/0007-mDNSShared-Make-Apple-Wireless-Direct-Link-depend-on.patch new file mode 100644 index 0000000000..7a47ddd789 --- /dev/null +++ b/meta-networking/recipes-protocols/mdns/mdns/0007-mDNSShared-Make-Apple-Wireless-Direct-Link-depend-on.patch | |||
| @@ -0,0 +1,27 @@ | |||
| 1 | From eac5e89c884b4dd28a80f77d2c447a398e8db94f Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Alex Kiernan <alex.kiernan@gmail.com> | ||
| 3 | Date: Sat, 21 Mar 2026 20:12:39 +0000 | ||
| 4 | Subject: [PATCH] mDNSShared: Make Apple Wireless Direct Link depend on macOS | ||
| 5 | |||
| 6 | Upstream-Status: Inactive-Upstream [Upstream does not take patches] | ||
| 7 | Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | ||
| 8 | --- | ||
| 9 | mDNSShared/uds_daemon.c | 4 ++++ | ||
| 10 | 1 file changed, 4 insertions(+) | ||
| 11 | |||
| 12 | diff --git a/mDNSShared/uds_daemon.c b/mDNSShared/uds_daemon.c | ||
| 13 | index 6486f1ed51dd..3113313191d7 100644 | ||
| 14 | --- a/mDNSShared/uds_daemon.c | ||
| 15 | +++ b/mDNSShared/uds_daemon.c | ||
| 16 | @@ -3626,7 +3626,11 @@ mDNSlocal void resolve_result_callback(mDNS *const m, DNSQuestion *question, con | ||
| 17 | request_state *const req = question->QuestionContext; | ||
| 18 | const mDNSu32 name_hash = mDNS_DomainNameFNV1aHash(&question->qname); | ||
| 19 | const mDNSBool isMDNSQuestion = mDNSOpaque16IsZero(question->TargetQID); | ||
| 20 | +#if MDNS_OS(macOS) | ||
| 21 | const mDNSBool is_split_awdl_query = (req->resolve_awdl && question->InterfaceID == AWDLInterfaceID); | ||
| 22 | +#else | ||
| 23 | + const mDNSBool is_split_awdl_query = mDNSfalse; | ||
| 24 | +#endif | ||
| 25 | UDS_LOG_ANSWER_EVENT(isMDNSQuestion ? MDNS_LOG_CATEGORY_MDNS : MDNS_LOG_CATEGORY_DEFAULT, MDNS_LOG_DEFAULT, | ||
| 26 | req, question, answer, mDNSfalse, "DNSServiceResolve result", AddRecord); | ||
| 27 | |||
diff --git a/meta-networking/recipes-protocols/mdns/mdns_2881.0.25.bb b/meta-networking/recipes-protocols/mdns/mdns_2881.80.4.0.1.bb index d44eb72f67..48bf3291b6 100644 --- a/meta-networking/recipes-protocols/mdns/mdns_2881.0.25.bb +++ b/meta-networking/recipes-protocols/mdns/mdns_2881.80.4.0.1.bb | |||
| @@ -14,9 +14,10 @@ SRC_URI = "git://github.com/apple-oss-distributions/mDNSResponder;protocol=https | |||
| 14 | file://0006-make-Add-top-level-Makefile.patch \ | 14 | file://0006-make-Add-top-level-Makefile.patch \ |
| 15 | file://0001-Fix-build-with-gcc-15.patch \ | 15 | file://0001-Fix-build-with-gcc-15.patch \ |
| 16 | file://mdns.service \ | 16 | file://mdns.service \ |
| 17 | file://0007-mDNSShared-Make-Apple-Wireless-Direct-Link-depend-on.patch \ | ||
| 17 | " | 18 | " |
| 18 | BRANCH = "main" | 19 | BRANCH = "rel/mDNSResponder-2881" |
| 19 | SRCREV = "d4658af3f5f291311c6aee4210aa6d39bda82bbe" | 20 | SRCREV = "e2a1e56a2f8d29640908c48f4de3f1ba65d1af46" |
| 20 | 21 | ||
| 21 | inherit github-releases manpages systemd update-rc.d | 22 | inherit github-releases manpages systemd update-rc.d |
| 22 | 23 | ||
diff --git a/meta-networking/recipes-support/netcf/netcf/0001-Adopt-to-new-gnulib-read_file-fread_file-signature.patch b/meta-networking/recipes-support/netcf/netcf/0001-Adopt-to-new-gnulib-read_file-fread_file-signature.patch index b188248fff..83fdfded52 100644 --- a/meta-networking/recipes-support/netcf/netcf/0001-Adopt-to-new-gnulib-read_file-fread_file-signature.patch +++ b/meta-networking/recipes-support/netcf/netcf/0001-Adopt-to-new-gnulib-read_file-fread_file-signature.patch | |||
| @@ -17,11 +17,9 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
| 17 | src/ncftransform.c | 2 +- | 17 | src/ncftransform.c | 2 +- |
| 18 | 4 files changed, 5 insertions(+), 5 deletions(-) | 18 | 4 files changed, 5 insertions(+), 5 deletions(-) |
| 19 | 19 | ||
| 20 | diff --git a/src/dutil_linux.c b/src/dutil_linux.c | ||
| 21 | index 742153a..eb72eb2 100644 | ||
| 22 | --- a/src/dutil_linux.c | 20 | --- a/src/dutil_linux.c |
| 23 | +++ b/src/dutil_linux.c | 21 | +++ b/src/dutil_linux.c |
| 24 | @@ -1113,7 +1113,7 @@ static void add_link_info(struct netcf *ncf, | 22 | @@ -1113,7 +1113,7 @@ static void add_link_info(struct netcf * |
| 25 | 23 | ||
| 26 | xasprintf(&path, "/sys/class/net/%s/operstate", ifname); | 24 | xasprintf(&path, "/sys/class/net/%s/operstate", ifname); |
| 27 | ERR_NOMEM(!path, ncf); | 25 | ERR_NOMEM(!path, ncf); |
| @@ -30,7 +28,7 @@ index 742153a..eb72eb2 100644 | |||
| 30 | if (!state) { | 28 | if (!state) { |
| 31 | /* missing operstate is *not* an error. It could be due to an | 29 | /* missing operstate is *not* an error. It could be due to an |
| 32 | * alias interface, which has no entry in /sys/class/net at | 30 | * alias interface, which has no entry in /sys/class/net at |
| 33 | @@ -1132,7 +1132,7 @@ static void add_link_info(struct netcf *ncf, | 31 | @@ -1132,7 +1132,7 @@ static void add_link_info(struct netcf * |
| 34 | FREE(path); | 32 | FREE(path); |
| 35 | xasprintf(&path, "/sys/class/net/%s/speed", ifname); | 33 | xasprintf(&path, "/sys/class/net/%s/speed", ifname); |
| 36 | ERR_NOMEM(path == NULL, ncf); | 34 | ERR_NOMEM(path == NULL, ncf); |
| @@ -39,11 +37,9 @@ index 742153a..eb72eb2 100644 | |||
| 39 | if (!speed && errno == EINVAL) { | 37 | if (!speed && errno == EINVAL) { |
| 40 | /* attempts to read $ifname/speed result in EINVAL if the | 38 | /* attempts to read $ifname/speed result in EINVAL if the |
| 41 | * interface is ifconfiged down (which isn't exactly the | 39 | * interface is ifconfiged down (which isn't exactly the |
| 42 | diff --git a/src/dutil_posix.c b/src/dutil_posix.c | ||
| 43 | index 1313514..b9884f0 100644 | ||
| 44 | --- a/src/dutil_posix.c | 40 | --- a/src/dutil_posix.c |
| 45 | +++ b/src/dutil_posix.c | 41 | +++ b/src/dutil_posix.c |
| 46 | @@ -211,7 +211,7 @@ int run_program(struct netcf *ncf, const char *const *argv, char **output) | 42 | @@ -211,7 +211,7 @@ int run_program(struct netcf *ncf, const |
| 47 | "Failed to create file stream for output while executing '%s': %s", | 43 | "Failed to create file stream for output while executing '%s': %s", |
| 48 | argv_str, errbuf); | 44 | argv_str, errbuf); |
| 49 | 45 | ||
| @@ -52,11 +48,9 @@ index 1313514..b9884f0 100644 | |||
| 52 | ERR_THROW_STRERROR(*output == NULL, ncf, EEXEC, | 48 | ERR_THROW_STRERROR(*output == NULL, ncf, EEXEC, |
| 53 | "Error while reading output from execution of '%s': %s", | 49 | "Error while reading output from execution of '%s': %s", |
| 54 | argv_str, errbuf); | 50 | argv_str, errbuf); |
| 55 | diff --git a/src/ncftool.c b/src/ncftool.c | ||
| 56 | index f1b5642..c878cb0 100644 | ||
| 57 | --- a/src/ncftool.c | 51 | --- a/src/ncftool.c |
| 58 | +++ b/src/ncftool.c | 52 | +++ b/src/ncftool.c |
| 59 | @@ -351,7 +351,7 @@ static int cmd_define(const struct command *cmd) { | 53 | @@ -351,7 +351,7 @@ static int cmd_define(const struct comma |
| 60 | struct netcf_if *nif = NULL; | 54 | struct netcf_if *nif = NULL; |
| 61 | int result = CMD_RES_ERR; | 55 | int result = CMD_RES_ERR; |
| 62 | 56 | ||
| @@ -65,8 +59,6 @@ index f1b5642..c878cb0 100644 | |||
| 65 | if (xml == NULL) { | 59 | if (xml == NULL) { |
| 66 | fprintf(stderr, "Failed to read %s\n", fname); | 60 | fprintf(stderr, "Failed to read %s\n", fname); |
| 67 | goto done; | 61 | goto done; |
| 68 | diff --git a/src/ncftransform.c b/src/ncftransform.c | ||
| 69 | index fbabfc3..4c9a56d 100644 | ||
| 70 | --- a/src/ncftransform.c | 62 | --- a/src/ncftransform.c |
| 71 | +++ b/src/ncftransform.c | 63 | +++ b/src/ncftransform.c |
| 72 | @@ -54,7 +54,7 @@ int main(int argc, char **argv) { | 64 | @@ -54,7 +54,7 @@ int main(int argc, char **argv) { |
| @@ -78,6 +70,25 @@ index fbabfc3..4c9a56d 100644 | |||
| 78 | if (in_xml == NULL) | 70 | if (in_xml == NULL) |
| 79 | die("Failed to read %s\n", argv[2]); | 71 | die("Failed to read %s\n", argv[2]); |
| 80 | 72 | ||
| 81 | -- | 73 | --- a/src/internal.h |
| 82 | 2.44.0 | 74 | +++ b/src/internal.h |
| 83 | 75 | @@ -30,6 +30,7 @@ | |
| 76 | |||
| 77 | #include <string.h> | ||
| 78 | #include <stdarg.h> | ||
| 79 | +#include <stdlib.h> | ||
| 80 | |||
| 81 | #include <libxslt/transform.h> | ||
| 82 | #include <libxml/relaxng.h> | ||
| 83 | @@ -85,6 +86,11 @@ | ||
| 84 | #define ATTRIBUTE_NOINLINE | ||
| 85 | #endif /* __GNUC__ */ | ||
| 86 | |||
| 87 | +#ifndef REALLOC_N | ||
| 88 | +# define REALLOC_N(ptr, count) \ | ||
| 89 | + (((ptr) = realloc((ptr), sizeof(*(ptr)) * (count))) == NULL ? -1 : 0) | ||
| 90 | +#endif | ||
| 91 | + | ||
| 92 | /* This needs ATTRIBUTE_RETURN_CHECK */ | ||
| 93 | #include "ref.h" | ||
| 94 | |||
diff --git a/meta-networking/recipes-support/netcf/netcf/0001-netcf-fix-bootstrap-with-newer-gnulib-automake.patch b/meta-networking/recipes-support/netcf/netcf/0001-netcf-fix-bootstrap-with-newer-gnulib-automake.patch new file mode 100644 index 0000000000..62daeff812 --- /dev/null +++ b/meta-networking/recipes-support/netcf/netcf/0001-netcf-fix-bootstrap-with-newer-gnulib-automake.patch | |||
| @@ -0,0 +1,61 @@ | |||
| 1 | From dded6e3321e304f50922e61c553d4e4eb0f80fd0 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <khem.raj@oss.qualcomm.com> | ||
| 3 | Date: Sun, 22 Mar 2026 11:05:34 -0700 | ||
| 4 | Subject: [PATCH] netcf: fix bootstrap with newer gnulib/automake | ||
| 5 | |||
| 6 | Upstream netcf is old enough that bootstrap/autoreconf now trips over: | ||
| 7 | - gnulib-tool.py wrapper expectations in newer gnulib | ||
| 8 | - stricter automake handling of AM_CFLAGS += from generated gnulib.mk | ||
| 9 | - subdir source warnings | ||
| 10 | - deprecated INCLUDES usage | ||
| 11 | |||
| 12 | Upstream-Status: Pending | ||
| 13 | Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com> | ||
| 14 | --- | ||
| 15 | configure.ac | 2 +- | ||
| 16 | gnulib/lib/Makefile.am | 2 +- | ||
| 17 | gnulib/tests/Makefile.am | 2 ++ | ||
| 18 | tests/Makefile.am | 2 +- | ||
| 19 | 4 files changed, 5 insertions(+), 3 deletions(-) | ||
| 20 | |||
| 21 | --- a/configure.ac | ||
| 22 | +++ b/configure.ac | ||
| 23 | @@ -3,7 +3,7 @@ AC_CONFIG_SRCDIR([src/netcf.c]) | ||
| 24 | AC_CONFIG_AUX_DIR([build-aux]) | ||
| 25 | AC_CONFIG_MACRO_DIR([gnulib/m4]) | ||
| 26 | AC_CONFIG_HEADERS([config.h]) | ||
| 27 | -AM_INIT_AUTOMAKE([-Wno-portability 1.11 color-tests parallel-tests]) | ||
| 28 | +AM_INIT_AUTOMAKE([-Wno-portability 1.11 subdir-objects color-tests parallel-tests]) | ||
| 29 | AM_SILENT_RULES([yes]) # make --enable-silent-rules the default. | ||
| 30 | AC_CANONICAL_HOST | ||
| 31 | |||
| 32 | --- a/gnulib/lib/Makefile.am | ||
| 33 | +++ b/gnulib/lib/Makefile.am | ||
| 34 | @@ -13,4 +13,4 @@ CLEANFILES= | ||
| 35 | |||
| 36 | include gnulib.mk | ||
| 37 | |||
| 38 | -INCLUDES = $(GETTEXT_CPPFLAGS) | ||
| 39 | +AM_CPPFLAGS = $(GETTEXT_CPPFLAGS) | ||
| 40 | --- a/gnulib/tests/Makefile.am | ||
| 41 | +++ b/gnulib/tests/Makefile.am | ||
| 42 | @@ -3,6 +3,6 @@ | ||
| 43 | ## Copyright (C) 2011 Red Hat, Inc. | ||
| 44 | ## See COPYING.LIB for the License of this software | ||
| 45 | |||
| 46 | -include gnulib.mk | ||
| 47 | +AM_CFLAGS = | ||
| 48 | |||
| 49 | -INCLUDES = $(GETTEXT_CPPFLAGS) | ||
| 50 | +include gnulib.mk | ||
| 51 | --- a/tests/Makefile.am | ||
| 52 | +++ b/tests/Makefile.am | ||
| 53 | @@ -14,7 +14,7 @@ TESTS_ENVIRONMENT = \ | ||
| 54 | abs_top_builddir='$(abs_top_builddir)' \ | ||
| 55 | abs_top_srcdir='$(abs_top_srcdir)' | ||
| 56 | |||
| 57 | -INCLUDES = -I$(top_srcdir)/src | ||
| 58 | +AM_CPPFLAGS = -I$(top_srcdir)/src | ||
| 59 | |||
| 60 | TESTS= | ||
| 61 | check_PROGRAMS= | ||
diff --git a/meta-networking/recipes-support/netcf/netcf_0.2.8.bb b/meta-networking/recipes-support/netcf/netcf_0.2.8.bb index 4170e9fab0..a73531de82 100644 --- a/meta-networking/recipes-support/netcf/netcf_0.2.8.bb +++ b/meta-networking/recipes-support/netcf/netcf_0.2.8.bb | |||
| @@ -10,6 +10,7 @@ SRCREV = "2c5d4255857531bc09d91dcd02e86545f29004d4" | |||
| 10 | PV .= "+git" | 10 | PV .= "+git" |
| 11 | 11 | ||
| 12 | SRC_URI = "git://pagure.io/netcf.git;protocol=https;branch=master \ | 12 | SRC_URI = "git://pagure.io/netcf.git;protocol=https;branch=master \ |
| 13 | file://0001-netcf-fix-bootstrap-with-newer-gnulib-automake.patch \ | ||
| 13 | file://0001-Adopt-to-new-gnulib-read_file-fread_file-signature.patch" | 14 | file://0001-Adopt-to-new-gnulib-read_file-fread_file-signature.patch" |
| 14 | 15 | ||
| 15 | UPSTREAM_CHECK_GITTAGREGEX = "release-(?P<pver>(\d+(\.\d+)+))" | 16 | UPSTREAM_CHECK_GITTAGREGEX = "release-(?P<pver>(\d+(\.\d+)+))" |
| @@ -50,11 +51,11 @@ do_install:append() { | |||
| 50 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then | 51 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then |
| 51 | install -d ${D}${systemd_unitdir}/system | 52 | install -d ${D}${systemd_unitdir}/system |
| 52 | if [ -d "${D}${libdir}/systemd/system" ]; then | 53 | if [ -d "${D}${libdir}/systemd/system" ]; then |
| 53 | if [ "${systemd_unitdir}" != "${libdir}/systemd" ] ; then | 54 | if [ "${systemd_unitdir}" != "${libdir}/systemd" ] ; then |
| 54 | mv ${D}${libdir}/systemd/system/* ${D}${systemd_unitdir}/system/ | 55 | mv ${D}${libdir}/systemd/system/* ${D}${systemd_unitdir}/system/ |
| 55 | rm -rf ${D}${libdir}/systemd/ | 56 | rm -rf ${D}${libdir}/systemd/ |
| 56 | fi | 57 | fi |
| 57 | elif [ "${systemd_unitdir}" != "${nonarch_libdir}/systemd" ] ; then | 58 | elif [ "${systemd_unitdir}" != "${nonarch_libdir}/systemd" ] ; then |
| 58 | mv ${D}${nonarch_libdir}/systemd/system/* ${D}${systemd_unitdir}/system/ | 59 | mv ${D}${nonarch_libdir}/systemd/system/* ${D}${systemd_unitdir}/system/ |
| 59 | rm -rf ${D}${nonarch_libdir}/systemd/ | 60 | rm -rf ${D}${nonarch_libdir}/systemd/ |
| 60 | fi | 61 | fi |
diff --git a/meta-networking/recipes-support/ntopng/files/0001-Follow-rrd-post-1.8-change.patch b/meta-networking/recipes-support/ntopng/files/0001-Follow-rrd-post-1.8-change.patch deleted file mode 100644 index eefd4e1ab2..0000000000 --- a/meta-networking/recipes-support/ntopng/files/0001-Follow-rrd-post-1.8-change.patch +++ /dev/null | |||
| @@ -1,32 +0,0 @@ | |||
| 1 | From a3bd9efe78f9c381f19b99c8ceb7f52b4c2a52b8 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> | ||
| 3 | Date: Wed, 5 Jun 2024 09:40:17 +0300 | ||
| 4 | Subject: [PATCH] Follow rrd post-1.8 change | ||
| 5 | |||
| 6 | Git version of rrdtool has changed rrd_tune argument from char pointer | ||
| 7 | to const char pointer. GCC 14 is more strict regarding the pointer | ||
| 8 | constantness checks and errors out in such a case. Update rrd_tune | ||
| 9 | invokation. | ||
| 10 | |||
| 11 | Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> | ||
| 12 | Upstream-Status: Pending [CLA is not signed on our side] | ||
| 13 | --- | ||
| 14 | src/LuaEngineNtop.cpp | 2 +- | ||
| 15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 16 | |||
| 17 | diff --git a/src/LuaEngineNtop.cpp b/src/LuaEngineNtop.cpp | ||
| 18 | index bd2de79e3021..dd00f1608f78 100644 | ||
| 19 | --- a/src/LuaEngineNtop.cpp | ||
| 20 | +++ b/src/LuaEngineNtop.cpp | ||
| 21 | @@ -5427,7 +5427,7 @@ static int ntop_rrd_tune(lua_State* vm) { | ||
| 22 | filename = argv[1]; | ||
| 23 | |||
| 24 | reset_rrd_state(); | ||
| 25 | - status = rrd_tune(argc, (char**)argv); | ||
| 26 | + status = rrd_tune(argc, (const char**)argv); | ||
| 27 | |||
| 28 | if(status != 0) { | ||
| 29 | char *err = rrd_get_error(); | ||
| 30 | -- | ||
| 31 | 2.39.2 | ||
| 32 | |||
diff --git a/meta-networking/recipes-support/ntopng/files/0001-Makefile.in-don-t-use-the-internal-lua.patch b/meta-networking/recipes-support/ntopng/files/0001-Makefile.in-don-t-use-the-internal-lua.patch index bb5bcfbd63..402d679a90 100644 --- a/meta-networking/recipes-support/ntopng/files/0001-Makefile.in-don-t-use-the-internal-lua.patch +++ b/meta-networking/recipes-support/ntopng/files/0001-Makefile.in-don-t-use-the-internal-lua.patch | |||
| @@ -14,26 +14,32 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | |||
| 14 | Makefile.in | 2 -- | 14 | Makefile.in | 2 -- |
| 15 | 1 file changed, 2 deletions(-) | 15 | 1 file changed, 2 deletions(-) |
| 16 | 16 | ||
| 17 | diff --git a/Makefile.in b/Makefile.in | ||
| 18 | index d737e74..a611b16 100755 | ||
| 19 | --- a/Makefile.in | 17 | --- a/Makefile.in |
| 20 | +++ b/Makefile.in | 18 | +++ b/Makefile.in |
| 21 | @@ -36,7 +36,6 @@ MONGOOSE_INC=-I$(MONGOOSE_HOME) | 19 | @@ -31,8 +31,6 @@ MONGOOSE_INC=-I$(MONGOOSE_HOME) |
| 20 | |||
| 22 | LUA_PLATFORM=generic | 21 | LUA_PLATFORM=generic |
| 23 | LUA_HOME=${PWD}/third-party/lua-5.4.3 | 22 | LUA_HOME=${PWD}/third-party/lua-5.4.6 |
| 24 | LUA_INC=-I$(LUA_HOME)/src | 23 | -LUA_INC=-I$(LUA_HOME)/src |
| 25 | -LUA_LIB=$(LUA_HOME)/src/liblua.a | 24 | -LUA_LIB=$(LUA_HOME)/src/liblua.a |
| 26 | 25 | ||
| 27 | ifeq ($(OS),Linux) | 26 | HAVE_CLICKHOUSE=@HAVE_CLICKHOUSE@ |
| 28 | LUA_PLATFORM=linux | 27 | CLICKHOUSE_HOME= |
| 29 | @@ -102,7 +101,6 @@ RPM_PKG = $(TARGET)-$(NTOPNG_VERSION)-@REVISION@.$(PLATFORM).rpm | 28 | @@ -52,7 +50,7 @@ else ifeq ($(OS),Darwin) |
| 30 | RPM_DATA_PKG = $(TARGET)-data-$(NTOPNG_VERSION)-@REVISION@.noarch.rpm | 29 | LUA_PLATFORM=macosx |
| 30 | else ifeq ($(OS), $(filter $(OS), FreeBSD)) | ||
| 31 | LUA_PLATFORM=freebsd | ||
| 32 | - LUA_LIB=/usr/local/lib/liblua-5.3.a | ||
| 33 | + LUA_LIB=liblua.a | ||
| 34 | endif | ||
| 35 | |||
| 31 | ###### | 36 | ###### |
| 37 | @@ -138,7 +136,7 @@ HEADERS = $(wildcard include/*.h) $(wild | ||
| 38 | INC = $(wildcard src/*.inc) | ||
| 39 | OBJECTS_NO_MAIN := $(filter-out src/main.o,$(OBJECTS)) | ||
| 32 | 40 | ||
| 33 | -LIB_TARGETS = $(LUA_LIB) | 41 | -TEST_FILES = $(wildcard tests/src/*.cpp) |
| 42 | +TEST_FILES = $(wildcard tests/src/*.cpp) | ||
| 43 | TEST_HEADERS = $(wildcard tests/include/*.h) | ||
| 34 | 44 | ||
| 35 | ifneq ($(HAS_ZEROMQ), 0) | 45 | %.o: %.c $(HEADERS) $(INC) Makefile |
| 36 | LIB_TARGETS += $(ZEROMQ_LIB) | ||
| 37 | -- | ||
| 38 | 2.25.1 | ||
| 39 | |||
diff --git a/meta-networking/recipes-support/ntopng/files/0001-autogen.sh-generate-configure.ac-only.patch b/meta-networking/recipes-support/ntopng/files/0001-autogen.sh-generate-configure.ac-only.patch deleted file mode 100644 index 8d62147b9e..0000000000 --- a/meta-networking/recipes-support/ntopng/files/0001-autogen.sh-generate-configure.ac-only.patch +++ /dev/null | |||
| @@ -1,36 +0,0 @@ | |||
| 1 | From 22f0bec462763f1b0b92daa33133e274d3b45f4f Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Mingli Yu <mingli.yu@windriver.com> | ||
| 3 | Date: Thu, 5 Nov 2020 00:05:21 -0800 | ||
| 4 | Subject: [PATCH] autogen.sh: generate configure.ac only | ||
| 5 | |||
| 6 | The autogen.sh should only generate configure.ac and the | ||
| 7 | logic used to generate configure script should follow the | ||
| 8 | autotools.bbclass in oe. Otherwise there may comes below | ||
| 9 | do_configure error: | ||
| 10 | | checking whether we are cross compiling... configure: error: in `/path/tmp/work/core2-64-poky-linux/ndpi/3.4-r0/git': | ||
| 11 | | configure: error: cannot run C compiled programs. | ||
| 12 | | If you meant to cross compile, use `--host'. | ||
| 13 | |||
| 14 | Upstream-Status: Inappropriate [embedded specific] | ||
| 15 | |||
| 16 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | ||
| 17 | --- | ||
| 18 | autogen.sh | 5 ----- | ||
| 19 | 1 file changed, 5 deletions(-) | ||
| 20 | |||
| 21 | diff --git a/autogen.sh b/autogen.sh | ||
| 22 | index 73f8d0ebe..15ff0aa84 100755 | ||
| 23 | --- a/autogen.sh | ||
| 24 | +++ b/autogen.sh | ||
| 25 | @@ -73,8 +73,3 @@ cat configure.seed | sed \ | ||
| 26 | > configure.ac | ||
| 27 | |||
| 28 | rm -f config.h config.h.in *~ #* | ||
| 29 | - | ||
| 30 | -echo "Wait please..." | ||
| 31 | -autoreconf -if | ||
| 32 | -echo "" | ||
| 33 | -echo "Now run ./configure" | ||
| 34 | -- | ||
| 35 | 2.17.1 | ||
| 36 | |||
diff --git a/meta-networking/recipes-support/ntopng/files/0001-autogen.sh-not-generate-configure.patch b/meta-networking/recipes-support/ntopng/files/0001-autogen.sh-not-generate-configure.patch deleted file mode 100644 index d5c7f5f1cc..0000000000 --- a/meta-networking/recipes-support/ntopng/files/0001-autogen.sh-not-generate-configure.patch +++ /dev/null | |||
| @@ -1,35 +0,0 @@ | |||
| 1 | From d482bcc8fca90afc95ac3cbe848a3c9d7ad81ddc Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Mingli Yu <mingli.yu@windriver.com> | ||
| 3 | Date: Wed, 4 Nov 2020 23:37:44 -0800 | ||
| 4 | Subject: [PATCH] autogen.sh: not generate configure | ||
| 5 | |||
| 6 | Only use autogen.sh to generate configure.ac. | ||
| 7 | |||
| 8 | Upstream-Status: Inappropriate [embedded specific] | ||
| 9 | |||
| 10 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | ||
| 11 | |||
| 12 | refresh patch to 4.0 | ||
| 13 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
| 14 | --- | ||
| 15 | autogen.sh | 7 ------- | ||
| 16 | 1 file changed, 7 deletions(-) | ||
| 17 | |||
| 18 | diff --git a/autogen.sh b/autogen.sh | ||
| 19 | index 0aa7507..36e0423 100755 | ||
| 20 | --- a/autogen.sh | ||
| 21 | +++ b/autogen.sh | ||
| 22 | @@ -33,10 +33,3 @@ if test -z $PKG_CONFIG; then | ||
| 23 | echo "pkg-config is missing: please install it (apt-get install pkg-config) and try again" | ||
| 24 | exit | ||
| 25 | fi | ||
| 26 | - | ||
| 27 | -autoreconf -ivf | ||
| 28 | - | ||
| 29 | -echo "./configure $@" | ||
| 30 | -chmod +x configure | ||
| 31 | -./configure $@ | ||
| 32 | - | ||
| 33 | -- | ||
| 34 | 2.25.1 | ||
| 35 | |||
diff --git a/meta-networking/recipes-support/ntopng/files/0001-configure-Stop-embedding-pwd-at-configure-time.patch b/meta-networking/recipes-support/ntopng/files/0001-configure-Stop-embedding-pwd-at-configure-time.patch new file mode 100644 index 0000000000..b8b0b04bf4 --- /dev/null +++ b/meta-networking/recipes-support/ntopng/files/0001-configure-Stop-embedding-pwd-at-configure-time.patch | |||
| @@ -0,0 +1,55 @@ | |||
| 1 | From 25129a49bd220b4668e1df474b1b1549885aaced Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Fri, 20 Mar 2026 09:47:12 -0700 | ||
| 4 | Subject: [PATCH] configure: Stop embedding pwd at configure time | ||
| 5 | |||
| 6 | NDPI_BASE_DIR seems to unused and currently encodes hardcoded | ||
| 7 | absolute paths in for it breaking repeoducible builds | ||
| 8 | |||
| 9 | Upstream-Status: Inappropriate [OE-Specific] | ||
| 10 | |||
| 11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 12 | --- | ||
| 13 | configure.ac | 10 ++-------- | ||
| 14 | 1 file changed, 2 insertions(+), 8 deletions(-) | ||
| 15 | |||
| 16 | diff --git a/configure.ac b/configure.ac | ||
| 17 | index 6984b38b5..1b9aae4df 100644 | ||
| 18 | --- a/configure.ac | ||
| 19 | +++ b/configure.ac | ||
| 20 | @@ -353,7 +353,7 @@ case "$host" in | ||
| 21 | if test -f $PCAP_HOME/lib/libpfring.a; then : | ||
| 22 | PFRING_LIB=$PCAP_HOME/lib/libpfring.a | ||
| 23 | fi | ||
| 24 | - | ||
| 25 | + | ||
| 26 | PCAP_LIB="$PCAP_HOME/libpcap/libpcap.a $PFRING_LIB $LIBNUMA `$PCAP_HOME/lib/pfring_config --libs`" | ||
| 27 | AC_CHECK_LIB([rt], [clock_gettime], [PCAP_LIB="$PCAP_LIB -lrt"]) | ||
| 28 | AC_CHECK_LIB([nl], [nl_handle_alloc], [PCAP_LIB="$PCAP_LIB -lnl"]) | ||
| 29 | @@ -438,7 +438,7 @@ PCRE2_ENABLED=0 | ||
| 30 | AC_ARG_WITH(pcre2, AS_HELP_STRING([--with-pcre2], [Enable nDPI build with libpcre2])) | ||
| 31 | if test "${with_pcre2+set}" = set; then : | ||
| 32 | AC_CHECK_LIB(pcre2-8, pcre2_compile_8, AC_DEFINE_UNQUOTED(HAVE_PCRE2, 1, [libpcre2(-dev) is present])) | ||
| 33 | - | ||
| 34 | + | ||
| 35 | if test "x$ac_cv_lib_pcre2_8_pcre2_compile_8" = xyes; then : | ||
| 36 | ADDITIONAL_LIBS="${ADDITIONAL_LIBS} -lpcre2-8" | ||
| 37 | PCRE2_ENABLED=1 | ||
| 38 | @@ -456,11 +456,6 @@ if test "${with_maxminddb+set}" = set; then : | ||
| 39 | fi | ||
| 40 | fi | ||
| 41 | |||
| 42 | -dnl> Use absolute source directory for NDPI_BASE_DIR | ||
| 43 | -NDPI_ABS_SRCDIR="`cd ${srcdir} && pwd`" | ||
| 44 | -AC_DEFINE_UNQUOTED(NDPI_BASE_DIR, "${NDPI_ABS_SRCDIR}", [nDPI base directory]) | ||
| 45 | -AC_SUBST(NDPI_BASE_DIR, "${NDPI_ABS_SRCDIR}") | ||
| 46 | - | ||
| 47 | dnl> Curl | ||
| 48 | dnl> AC_CHECK_LIB([curl], [curl_easy_perform]) | ||
| 49 | dnl> if test ${ac_cv_lib_curl_curl_easy_perform} = "no"; then | ||
| 50 | @@ -515,5 +510,4 @@ AC_SUBST(DISABLE_NPCAP) | ||
| 51 | AC_SUBST(EXE_SUFFIX) | ||
| 52 | AC_SUBST(NDPI_CFLAGS) | ||
| 53 | AC_SUBST(NDPI_LDFLAGS) | ||
| 54 | -AC_SUBST(NDPI_BASE_DIR) | ||
| 55 | AC_OUTPUT | ||
diff --git a/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-Allow-dynamic-linking-against-ndpi-3.patch b/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-Allow-dynamic-linking-against-ndpi-3.patch index c645110f22..b0cdcd8401 100644 --- a/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-Allow-dynamic-linking-against-ndpi-3.patch +++ b/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-Allow-dynamic-linking-against-ndpi-3.patch | |||
| @@ -17,23 +17,42 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
| 17 | configure.ac.in | 6 ++---- | 17 | configure.ac.in | 6 ++---- |
| 18 | 1 file changed, 2 insertions(+), 4 deletions(-) | 18 | 1 file changed, 2 insertions(+), 4 deletions(-) |
| 19 | 19 | ||
| 20 | diff --git a/configure.ac.in b/configure.ac.in | ||
| 21 | index 7f4c0f893..c3299fda2 100644 | ||
| 22 | --- a/configure.ac.in | 20 | --- a/configure.ac.in |
| 23 | +++ b/configure.ac.in | 21 | +++ b/configure.ac.in |
| 24 | @@ -193,10 +193,8 @@ if test -d /usr/local/include/ndpi ; then : | 22 | @@ -235,8 +235,9 @@ AC_ARG_WITH(ndpi-includes, |
| 23 | NDPI_CUST_INC="-I$withval -I$withval/../lib/third_party/include" | ||
| 24 | ]) | ||
| 25 | |||
| 26 | -NDPI_INC=`echo $NDPI_CFLAGS | sed -e "s/[ ]*$//"` | ||
| 27 | -NDPI_LIB= | ||
| 28 | +NDPI_INC="$NDPI_CFLAGS" | ||
| 29 | +NDPI_LIB="$NDPI_LIBS" | ||
| 30 | + | ||
| 31 | NDPI_LIB_DEP= | ||
| 32 | |||
| 33 | AS_VAR_IF(with_dynamic_ndpi, no, [ | ||
| 34 | @@ -267,11 +268,6 @@ AC_MSG_CHECKING(for nDPI source) | ||
| 35 | fi | ||
| 36 | ]) | ||
| 37 | |||
| 38 | -AS_VAR_IF(with_dynamic_ndpi, yes, [ | ||
| 39 | - NDPI_LIB="-lndpi" | ||
| 40 | - NDPI_LIB_DEP=$NDPI_LIB | ||
| 41 | -]) | ||
| 42 | - | ||
| 43 | if test ! -z "$NDPI_CUST_INC" ; then : | ||
| 44 | NDPI_INC=$NDPI_CUST_INC | ||
| 45 | fi | ||
| 46 | @@ -280,12 +276,6 @@ if test ! -z "$NDPI_CUST_LIB" ; then : | ||
| 47 | NDPI_LIB=$NDPI_CUST_LIB | ||
| 25 | fi | 48 | fi |
| 26 | 49 | ||
| 27 | PKG_CHECK_MODULES([NDPI], [libndpi >= 2.0], [ | 50 | -if test -z "$NDPI_LIB" ; then : |
| 28 | - NDPI_INC=`echo $NDPI_CFLAGS | sed -e "s/[ ]*$//"` | 51 | - echo "Could not find nDPI" |
| 29 | - # Use static libndpi library as building against the dynamic library fails | 52 | - echo "Please do cd ..; git clone https://github.com/ntop/nDPI.git; cd nDPI; ./autogen.sh; ${MAKE}; cd ../ntopng" |
| 30 | - NDPI_LIB="-Wl,-Bstatic $NDPI_LIBS -Wl,-Bdynamic" | 53 | - echo "and try again" |
| 31 | - #NDPI_LIB="$NDPI_LIBS" | 54 | - exit 1 |
| 32 | + NDPI_INC="$NDPI_CFLAGS" | 55 | -fi |
| 33 | + NDPI_LIB="$NDPI_LIBS" | 56 | dnl finish: nDPI handling |
| 34 | NDPI_LIB_DEP= | 57 | |
| 35 | ], [ | 58 | AC_ARG_WITH(json-c-static, |
| 36 | AC_MSG_CHECKING(for nDPI source) | ||
| 37 | -- | ||
| 38 | 2.35.1 | ||
| 39 | |||
diff --git a/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-fix-configure-error.patch b/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-fix-configure-error.patch deleted file mode 100644 index d4908e3227..0000000000 --- a/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-fix-configure-error.patch +++ /dev/null | |||
| @@ -1,42 +0,0 @@ | |||
| 1 | From 29797dd037009d38e4976249ed21b2076240751e Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Mingli Yu <mingli.yu@windriver.com> | ||
| 3 | Date: Wed, 4 Nov 2020 04:36:46 +0000 | ||
| 4 | Subject: [PATCH] configure.ac.in: fix configure error | ||
| 5 | |||
| 6 | fix the below error: | ||
| 7 | configure: error: cannot run test program while cross compiling | ||
| 8 | |||
| 9 | Upstream-Status: Inappropriate [embedded specific] | ||
| 10 | |||
| 11 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | ||
| 12 | --- | ||
| 13 | configure.ac.in | 13 +------------ | ||
| 14 | 1 file changed, 1 insertion(+), 12 deletions(-) | ||
| 15 | |||
| 16 | diff --git a/configure.ac.in b/configure.ac.in | ||
| 17 | index a321f9bbf..03f9a31b0 100644 | ||
| 18 | --- a/configure.ac.in | ||
| 19 | +++ b/configure.ac.in | ||
| 20 | @@ -642,18 +642,7 @@ if test x$radcli = xtrue; then | ||
| 21 | fi | ||
| 22 | fi | ||
| 23 | |||
| 24 | -AC_CACHE_CHECK([if pthread rwlocks are supported], [my_cv_rw_locks_supported], [ | ||
| 25 | - AC_TRY_RUN([ | ||
| 26 | - #include <pthread.h> | ||
| 27 | - | ||
| 28 | - int main() { | ||
| 29 | - pthread_rwlock_t t; | ||
| 30 | - return 0; | ||
| 31 | - } | ||
| 32 | -] | ||
| 33 | -, [my_cv_rw_locks_supported=yes], [my_cv_rw_locks_supported=no]) | ||
| 34 | -] | ||
| 35 | -) | ||
| 36 | +AC_CACHE_CHECK([if pthread rwlocks are supported], [my_cv_rw_locks_supported]) | ||
| 37 | |||
| 38 | if test "$my_cv_rw_locks_supported" = yes; then | ||
| 39 | AC_DEFINE_UNQUOTED(HAVE_RW_LOCK, 1, [pthread rwlocks supported]) | ||
| 40 | -- | ||
| 41 | 2.26.2 | ||
| 42 | |||
diff --git a/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-fix-host-contamination.patch b/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-fix-host-contamination.patch index 5e1440b3d6..e3c0534da8 100644 --- a/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-fix-host-contamination.patch +++ b/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-fix-host-contamination.patch | |||
| @@ -14,17 +14,95 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | |||
| 14 | configure.ac.in | 43 +++---------------------------------------- | 14 | configure.ac.in | 43 +++---------------------------------------- |
| 15 | 1 file changed, 3 insertions(+), 40 deletions(-) | 15 | 1 file changed, 3 insertions(+), 40 deletions(-) |
| 16 | 16 | ||
| 17 | diff --git a/configure.ac.in b/configure.ac.in | ||
| 18 | index 1d6380c..beffc6c 100644 | ||
| 19 | --- a/configure.ac.in | 17 | --- a/configure.ac.in |
| 20 | +++ b/configure.ac.in | 18 | +++ b/configure.ac.in |
| 21 | @@ -167,31 +167,6 @@ fi | 19 | @@ -83,30 +83,6 @@ if test "$with_dynamic_ndpi" = "yes"; th |
| 22 | # | 20 | AC_DEFINE([HAVE_DYNAMIC_NDPI], [1], [Define if using dynamic linking with nDPI]) |
| 23 | REVISION=`git log --pretty=oneline | wc -l` | 21 | fi |
| 22 | |||
| 23 | -dnl> CLANG_STDLIB="-stdlib=libc++" | ||
| 24 | - | ||
| 25 | -dnl> On Ubuntu do sudo apt-get install -y clang-14 clang-tools-14 | ||
| 26 | -if test "x$USE_CLANG" = xyes; then | ||
| 27 | - if test $SYSTEM = "Darwin"; then | ||
| 28 | - CC=clang | ||
| 29 | - CXX="clang++ -fno-color-diagnostics -fPIE -stdlib=libc++" | ||
| 30 | - else | ||
| 31 | - if test -x "/usr/bin/clang-10"; then | ||
| 32 | - CLANG_VERSION=10 | ||
| 33 | - elif test -x "/usr/bin/clang-13"; then | ||
| 34 | - CLANG_VERSION=13 | ||
| 35 | - elif test -x "/usr/bin/clang-14"; then | ||
| 36 | - CLANG_VERSION=14 | ||
| 37 | - else | ||
| 38 | - echo "Could not find clang. Please install clang-14 clang-tools-14" | ||
| 39 | - exit 1 | ||
| 40 | - fi | ||
| 41 | - | ||
| 42 | - CC=clang-$CLANG_VERSION | ||
| 43 | - CXX="clang++-$CLANG_VERSION -fno-color-diagnostics -fPIE $CLANG_STDLIB" | ||
| 44 | - fi | ||
| 45 | -fi | ||
| 46 | - | ||
| 47 | CFLAGS="${CFLAGS} -I${HERE} -I${HERE}/include" | ||
| 48 | CXXFLAGS="${CXXFLAGS} -I${HERE} -I${HERE}/include" | ||
| 49 | |||
| 50 | @@ -122,7 +98,7 @@ fi | ||
| 51 | |||
| 52 | if test -f /proc/device-tree/model; then | ||
| 53 | IS_RASPBERRY=`cat /proc/device-tree/model | grep -a -e "Orange Pi" -e Raspberry | wc -l` | ||
| 54 | - | ||
| 55 | + | ||
| 56 | if test "$IS_RASPBERRY" = "1"; then | ||
| 57 | CFLAGS="${CFLAGS} -DHAVE_EMBEDDED_SUPPORT" | ||
| 58 | CXXFLAGS="${CXXFLAGS} -DHAVE_EMBEDDED_SUPPORT" | ||
| 59 | @@ -158,39 +134,6 @@ MAKE=make | ||
| 60 | BIN_PATH=/usr/bin | ||
| 61 | LIBPCAP=-lpcap | ||
| 62 | |||
| 63 | -if test $SYSTEM = "FreeBSD" || test $SYSTEM = "Darwin"; then | ||
| 64 | - CFLAGS="${CFLAGS} -I/usr/local/include" | ||
| 65 | - LDFLAGS="${LDFLAGS} -L/usr/local/lib" | ||
| 66 | - | ||
| 67 | - dnl> https://github.com/google/sanitizers/wiki/AddressSanitizerFlags | ||
| 68 | - CC=clang | ||
| 69 | - CXX="clang++ -fpie -fno-color-diagnostics $CLANG_STDLIB" | ||
| 70 | - if test $SYSTEM = "FreeBSD"; then | ||
| 71 | - MAKE=gmake | ||
| 72 | - BIN_PATH=/usr/local/bin | ||
| 73 | - else | ||
| 74 | - dnl> Adds /opt if MacPorts is installed | ||
| 75 | - if [ test -f /opt/local/bin/port ]; then | ||
| 76 | - CFLAGS="${CFLAGS} -I/opt/local/include" | ||
| 77 | - LDFLAGS="${LDFLAGS} -L/opt/local/lib" | ||
| 78 | - fi | ||
| 79 | - fi | ||
| 80 | - dnl> CXX=clang++ -fsanitize=address -fsanitize-address-use-after-scope | ||
| 81 | - OSXV=`sw_vers -productVersion` | ||
| 82 | - if test $SYSTEM = "Darwin"; then | ||
| 83 | - OS="macOS $OSXV" | ||
| 84 | - else | ||
| 85 | - OS=`uname -or | cut -d '-' -f 1` | ||
| 86 | - fi | ||
| 87 | - if test $MACHINE = "x86_64"; then | ||
| 88 | - LDFLAGS="${LDFLAGS} -L/usr/local/opt/ntopng" | ||
| 89 | - RES=`g++ -Wall -fno-color-diagnostics Prefs.cpp 2>&1 | grep "unrecognized command line option "|wc -l` | ||
| 90 | - if test $RES -eq 0; then | ||
| 91 | - CFLAGS="-fno-color-diagnostics $CFLAGS" | ||
| 92 | - fi | ||
| 93 | - fi | ||
| 94 | -fi | ||
| 95 | - | ||
| 96 | dnl> Remove spaces | ||
| 97 | OS="${OS#"${OS%%[![:space:]]*}"}" | ||
| 98 | |||
| 99 | @@ -237,31 +180,6 @@ if test "${with_nedge+set}" = set; then | ||
| 100 | LIBS="${LIBS} -lnetfilter_queue -lnfnetlink -lnetfilter_conntrack" | ||
| 101 | fi | ||
| 24 | 102 | ||
| 25 | -if test -d "/usr/local/include"; then | 103 | -if test -d "/usr/local/include"; then |
| 26 | - CFLAGS="${CFLAGS} -I/usr/local/include" | 104 | - CFLAGS="${CFLAGS} -I/usr/local/include" |
| 27 | - CPPFLAGS="${CPPFLAGS} -I/usr/local/include" | 105 | - CXXFLAGS="${CXXFLAGS} -I/usr/local/include" |
| 28 | -fi | 106 | -fi |
| 29 | - | 107 | - |
| 30 | -if test -d "/usr/local/lib"; then | 108 | -if test -d "/usr/local/lib"; then |
| @@ -33,7 +111,7 @@ index 1d6380c..beffc6c 100644 | |||
| 33 | - | 111 | - |
| 34 | -if test -d /opt/local/include; then : | 112 | -if test -d /opt/local/include; then : |
| 35 | - CFLAGS="${CFLAGS} -I/opt/local/include" | 113 | - CFLAGS="${CFLAGS} -I/opt/local/include" |
| 36 | - CPPFLAGS="${CPPFLAGS} -I/opt/local/include" | 114 | - CXXFLAGS="${CXXFLAGS} -I/opt/local/include" |
| 37 | -fi | 115 | -fi |
| 38 | - | 116 | - |
| 39 | -if test -d /opt/local/lib; then : | 117 | -if test -d /opt/local/lib; then : |
| @@ -42,15 +120,26 @@ index 1d6380c..beffc6c 100644 | |||
| 42 | - | 120 | - |
| 43 | -if [ test -f /usr/bin/lsb_release ]; then | 121 | -if [ test -f /usr/bin/lsb_release ]; then |
| 44 | - CODENAME=`/usr/bin/lsb_release -c|cut -f 2` | 122 | - CODENAME=`/usr/bin/lsb_release -c|cut -f 2` |
| 45 | - if [[ $CODENAME == "wheezy" ]]; then : | 123 | - if test $CODENAME = "wheezy" ; then |
| 46 | - CPPFLAGS="${CPPFLAGS} -DOLD_NETFILTER_INTERFACE=1" | 124 | - CXXFLAGS="${CXXFLAGS} -DOLD_NETFILTER_INTERFACE=1" |
| 47 | - fi | 125 | - fi |
| 48 | -fi | 126 | -fi |
| 49 | - | 127 | - |
| 50 | SHORT_MACHINE=`uname -m | cut -b1-3` | 128 | if test -d "pro"; then |
| 129 | NTOPCLOUD_LIB= | ||
| 130 | NTOPCLOUD_HOME="../ntopcloud" | ||
| 131 | @@ -317,10 +235,6 @@ AC_ARG_WITH(ndpi-includes, | ||
| 132 | NDPI_CUST_INC="-I$withval -I$withval/../lib/third_party/include" | ||
| 133 | ]) | ||
| 51 | 134 | ||
| 52 | GIT_RELEASE="@GIT_RELEASE@" | 135 | -if test -d /usr/local/include/ndpi ; then : |
| 53 | @@ -300,23 +275,11 @@ fi | 136 | - echo "WARNING: /usr/local/include/ndpi is present and might lead to compile errors" |
| 137 | -fi | ||
| 138 | - | ||
| 139 | NDPI_INC=`echo $NDPI_CFLAGS | sed -e "s/[ ]*$//"` | ||
| 140 | NDPI_LIB= | ||
| 141 | NDPI_LIB_DEP= | ||
| 142 | @@ -387,7 +301,7 @@ fi | ||
| 54 | pkg-config --exists libssl | 143 | pkg-config --exists libssl |
| 55 | if test "$?" -ne 1; then | 144 | if test "$?" -ne 1; then |
| 56 | AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl]) | 145 | AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl]) |
| @@ -58,25 +147,70 @@ index 1d6380c..beffc6c 100644 | |||
| 58 | + SSL_INC="`pkg-config --cflags libssl`" | 147 | + SSL_INC="`pkg-config --cflags libssl`" |
| 59 | SSL_LIB="`pkg-config --libs libssl` -lssl -lcrypto" | 148 | SSL_LIB="`pkg-config --libs libssl` -lssl -lcrypto" |
| 60 | else | 149 | else |
| 61 | - dnl Workaround for MacOS Brew | 150 | dnl Workaround for MacOS Brew |
| 62 | - if test -d "/usr/local/opt/openssl/lib"; then | 151 | @@ -408,10 +322,6 @@ else |
| 63 | - AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl]) | 152 | SSL_INC="-I/usr/local/opt/openssl/include" |
| 64 | - SSL_INC="-I/usr/local/opt/openssl/include" | 153 | SSL_LIB="-L/usr/local/opt/openssl/lib -lssl -lcrypto" |
| 65 | - SSL_LIB="-L/usr/local/opt/openssl/lib -lssl -lcrypto" | 154 | dnl Workaround for FreeBSD |
| 66 | - dnl Workaround for FreeBSD | ||
| 67 | - elif test -f "/usr/lib/libssl.so"; then | 155 | - elif test -f "/usr/lib/libssl.so"; then |
| 68 | - AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl]) | 156 | - AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl]) |
| 69 | - SSL_INC="-I/usr/include" | 157 | - SSL_INC="-I/usr/include" |
| 70 | - SSL_LIB="-L/usr/lib -lssl -lcrypto" | 158 | - SSL_LIB="-L/usr/lib -lssl -lcrypto" |
| 71 | - else | 159 | else |
| 72 | - echo "Please install openssl-dev(el) package prerequisite" | 160 | echo "Please install openssl-dev(el) package prerequisite" |
| 73 | - exit -1 | 161 | exit -1 |
| 162 | @@ -433,13 +343,6 @@ fi | ||
| 163 | AC_MSG_CHECKING(for ntopng professional edition) | ||
| 164 | |||
| 165 | REDIS_SERVICE="redis.service" | ||
| 166 | -if [ test -f /usr/bin/lsb_release ]; then | ||
| 167 | - UBUNTU_RELEASE=`lsb_release -r|cut -f 2` | ||
| 168 | - UBUNTU_SUB_RELEASE=`echo $UBUNTU_RELEASE|cut -f 1 -d '.'` | ||
| 169 | - if test "$UBUNTU_SUB_RELEASE" = "8" || test "$UBUNTU_SUB_RELEASE" = "10"; then | ||
| 170 | - REDIS_SERVICE="redis-server.service" | ||
| 74 | - fi | 171 | - fi |
| 75 | + echo "Please install openssl-dev(el) package prerequisite" | 172 | -fi |
| 76 | + exit -1 | 173 | |
| 174 | SERVICE_ALIAS= | ||
| 175 | SERVICE_REQUIRES= | ||
| 176 | @@ -497,7 +400,7 @@ fi | ||
| 177 | echo "Using clickhouse-cpp stored at ${CLICKHOUSE_HOME}" | ||
| 178 | |||
| 179 | dnl> fi dnl> test $SYSTEM = "Linux" | ||
| 180 | - | ||
| 181 | + | ||
| 182 | AC_DEFINE_UNQUOTED(NTOPNG_PRO_GIT_RELEASE, "r${PRO_GIT_RELEASE}", [ntopng professional release]) | ||
| 183 | AC_DEFINE_UNQUOTED(NTOPNG_PRO_GIT_DATE, "${PRO_GIT_DATE}", [ntopng professional date]) | ||
| 184 | DUMMY=`cd ./pro; ${MAKE} build` | ||
| 185 | @@ -531,21 +434,7 @@ if test -f ".git/index"; then | ||
| 77 | fi | 186 | fi |
| 78 | 187 | ||
| 79 | AC_CHECK_LIB([gcrypt], [gcry_cipher_checktag], [LIBS="${LIBS} -lgcrypt"]) | 188 | if test $SYSTEM = "Linux"; then |
| 80 | -- | 189 | - if [ test -f /usr/bin/lsb_release ]; then |
| 81 | 2.25.1 | 190 | - OSNAME=`/usr/bin/lsb_release -d|cut -d ':' -f 2| sed -e 's/^[[[:space:]]]*//'` |
| 82 | 191 | - OS="$OSNAME" | |
| 192 | - else | ||
| 193 | - if test -f /etc/debian_version; then | ||
| 194 | - DEBIAN_VERSION=`cat /etc/debian_version` | ||
| 195 | - OSNAME="Debian $DEBIAN_VERSION" | ||
| 196 | - else | ||
| 197 | - if test -f /etc/redhat-release; then | ||
| 198 | - OS=`cat /etc/redhat-release | cut -d '(' -f 1 | awk '{$1=$1};1'` | ||
| 199 | - else | ||
| 200 | - OS=`./config.guess` | ||
| 201 | - fi | ||
| 202 | - fi | ||
| 203 | - fi | ||
| 204 | + OS=`./config.guess` | ||
| 205 | else | ||
| 206 | dnl> wget -O config.guess 'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD' | ||
| 207 | if test $SYSTEM = "FreeBSD"; then | ||
| 208 | @@ -575,7 +464,7 @@ AS_VAR_IF(with_hiredis, yes, [ | ||
| 209 | else | ||
| 210 | pkg-config --exists hiredis | ||
| 211 | if test "$?" -ne 1; then | ||
| 212 | - HIREDIS_INC="`pkg-config --cflags hiredis` -I/usr/include/hiredis" | ||
| 213 | + HIREDIS_INC="`pkg-config --cflags hiredis`" | ||
| 214 | if test $SYSTEM = "FreeBSD" && $FREEBSD_VERSION != "15"; then | ||
| 215 | dnl> Note: on freebsd 15 .a is not installed | ||
| 216 | HIREDIS_LIB="/usr/local/lib/libhiredis.a" | ||
diff --git a/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-not-check-clang-on-host.patch b/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-not-check-clang-on-host.patch deleted file mode 100644 index ffb106723c..0000000000 --- a/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-not-check-clang-on-host.patch +++ /dev/null | |||
| @@ -1,44 +0,0 @@ | |||
| 1 | From 5867be19e53a3cc09730b83282c83bdd26147cc3 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Mingli Yu <mingli.yu@windriver.com> | ||
| 3 | Date: Mon, 9 Nov 2020 04:05:25 +0000 | ||
| 4 | Subject: [PATCH] configure.ac.in: not check clang on host | ||
| 5 | |||
| 6 | Don't check clang on host to avoid host contamination. | ||
| 7 | |||
| 8 | Upstream-Status: Inappropriate [OE specific] | ||
| 9 | |||
| 10 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | ||
| 11 | --- | ||
| 12 | configure.ac.in | 16 ---------------- | ||
| 13 | 1 file changed, 16 deletions(-) | ||
| 14 | |||
| 15 | diff --git a/configure.ac.in b/configure.ac.in | ||
| 16 | index 55bd49678..94bc0bc48 100644 | ||
| 17 | --- a/configure.ac.in | ||
| 18 | +++ b/configure.ac.in | ||
| 19 | @@ -90,22 +90,6 @@ if test $SYSTEM = "FreeBSD" || test $SYSTEM = "Darwin"; then | ||
| 20 | CFLAGS="-fno-color-diagnostics $CFLAGS" | ||
| 21 | fi | ||
| 22 | fi | ||
| 23 | -else | ||
| 24 | - if test $SYSTEM = "Linux"; then | ||
| 25 | - if [ test -f /usr/bin/clang++ ]; then | ||
| 26 | - CC=clang | ||
| 27 | - CXX=clang++ | ||
| 28 | - AC_MSG_RESULT(Using clang++ compiler) | ||
| 29 | - fi | ||
| 30 | - | ||
| 31 | - if [ test -f /etc/redhat-release ]; then | ||
| 32 | - OS=`cat /etc/redhat-release` | ||
| 33 | - else | ||
| 34 | - if [ test -f /usr/bin/lsb_release ]; then | ||
| 35 | - OS=`/usr/bin/lsb_release -d|cut -d ':' -f 2` | ||
| 36 | - fi | ||
| 37 | - fi | ||
| 38 | - fi | ||
| 39 | fi | ||
| 40 | |||
| 41 | dnl> Remove spaces | ||
| 42 | -- | ||
| 43 | 2.17.1 | ||
| 44 | |||
diff --git a/meta-networking/recipes-support/ntopng/files/0001-luaengine-Use-lua-5.5-API-signature-for-lua_newstate.patch b/meta-networking/recipes-support/ntopng/files/0001-luaengine-Use-lua-5.5-API-signature-for-lua_newstate.patch new file mode 100644 index 0000000000..8046d755c2 --- /dev/null +++ b/meta-networking/recipes-support/ntopng/files/0001-luaengine-Use-lua-5.5-API-signature-for-lua_newstate.patch | |||
| @@ -0,0 +1,31 @@ | |||
| 1 | From 6c4806436c3214e32487d05ce099ac86b0b2519c Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <khem.raj@oss.qualcomm.com> | ||
| 3 | Date: Sun, 22 Mar 2026 10:08:01 -0700 | ||
| 4 | Subject: [PATCH] luaengine: Use lua 5.5 API signature for lua_newstate | ||
| 5 | |||
| 6 | in Lua 5.5 lua_newstate gained a third argument, | ||
| 7 | |||
| 8 | lua_State *lua_newstate(lua_Alloc f, void *ud, unsigned int seed); | ||
| 9 | |||
| 10 | The 5.5 manual says that third argument, seed, | ||
| 11 | is "a seed for the hashing of strings," and the 5.5 incompatibilities | ||
| 12 | section explicitly calls out that lua_newstate now has | ||
| 13 | a third parameter. | ||
| 14 | |||
| 15 | Upstream-Status: Pending | ||
| 16 | Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com> | ||
| 17 | --- | ||
| 18 | src/LuaEngine.cpp | 64 +++++++++++++++++++++++------------------------ | ||
| 19 | 1 file changed, 32 insertions(+), 32 deletions(-) | ||
| 20 | |||
| 21 | --- a/src/LuaEngine.cpp | ||
| 22 | +++ b/src/LuaEngine.cpp | ||
| 23 | @@ -154,7 +154,7 @@ LuaEngine::LuaEngine() { | ||
| 24 | is_system_vm = false; | ||
| 25 | mem_used = 0; | ||
| 26 | |||
| 27 | - L = lua_newstate(l_alloc, this); | ||
| 28 | + L = lua_newstate(l_alloc, this, luaL_makeseed(NULL)); | ||
| 29 | |||
| 30 | if (!L) { | ||
| 31 | ntop->getTrace()->traceEvent(TRACE_ERROR, "Unable to create a new Lua state."); | ||
diff --git a/meta-networking/recipes-support/ntopng/ndpi_4.2.bb b/meta-networking/recipes-support/ntopng/ndpi_5.0.bb index 66d24e4cd8..6eadf8ba62 100644 --- a/meta-networking/recipes-support/ntopng/ndpi_4.2.bb +++ b/meta-networking/recipes-support/ntopng/ndpi_5.0.bb | |||
| @@ -8,23 +8,23 @@ RDEPENDS:${PN} += " libpcap" | |||
| 8 | LICENSE = "LGPL-3.0-only" | 8 | LICENSE = "LGPL-3.0-only" |
| 9 | LIC_FILES_CHKSUM = "file://COPYING;md5=b52f2d57d10c4f7ee67a7eb9615d5d24" | 9 | LIC_FILES_CHKSUM = "file://COPYING;md5=b52f2d57d10c4f7ee67a7eb9615d5d24" |
| 10 | 10 | ||
| 11 | SRCREV = "8b5c6af71b562549f8416b31803daae223e09f46" | 11 | SRCREV = "375f99ef9fb4999d778b57bbeece171b3fa9fba6" |
| 12 | SRC_URI = "git://github.com/ntop/nDPI.git;branch=4.2-stable;protocol=https \ | 12 | SRC_URI = "git://github.com/ntop/nDPI.git;branch=5.0-stable;protocol=https;tag=${PV} \ |
| 13 | file://0001-autogen.sh-not-generate-configure.patch \ | 13 | file://0001-configure-Stop-embedding-pwd-at-configure-time.patch \ |
| 14 | " | 14 | " |
| 15 | 15 | ||
| 16 | 16 | inherit autotools pkgconfig | |
| 17 | inherit autotools-brokensep pkgconfig | ||
| 18 | 17 | ||
| 19 | CPPFLAGS += "${SELECTED_OPTIMIZATION}" | 18 | CPPFLAGS += "${SELECTED_OPTIMIZATION}" |
| 20 | 19 | ||
| 21 | do_configure:prepend() { | 20 | do_configure:prepend() { |
| 22 | ${S}/autogen.sh | 21 | (cd ${S} && ${S}/autogen.sh) |
| 22 | } | ||
| 23 | |||
| 24 | do_install:append() { | ||
| 25 | install -Dm 0644 ${B}/src/include/ndpi_define.h ${D}${includedir}/ndpi/ndpi_define.h | ||
| 23 | } | 26 | } |
| 24 | 27 | ||
| 25 | EXTRA_OEMAKE = " \ | 28 | EXTRA_OEMAKE = " \ |
| 26 | libdir=${libdir} \ | 29 | libdir=${libdir} \ |
| 27 | " | 30 | " |
| 28 | |||
| 29 | # remove this CVE_STATUS, when the recipe is updated to 4.12 or newer | ||
| 30 | CVE_STATUS[CVE-2025-25066] = "cpe-incorrect: Version 4.2 is not vulnerable yet" | ||
diff --git a/meta-networking/recipes-support/ntopng/ntopng_5.2.1.bb b/meta-networking/recipes-support/ntopng/ntopng_6.6.bb index 014706893a..3c039781d8 100644 --- a/meta-networking/recipes-support/ntopng/ntopng_5.2.1.bb +++ b/meta-networking/recipes-support/ntopng/ntopng_6.6.bb | |||
| @@ -11,27 +11,28 @@ RDEPENDS:${PN} = "bash redis" | |||
| 11 | LICENSE = "GPL-3.0-only" | 11 | LICENSE = "GPL-3.0-only" |
| 12 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | 12 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" |
| 13 | 13 | ||
| 14 | SRCREV = "d3ce78948e8d81dc1e2c5298ce556f9f2247aac1" | 14 | SRCREV = "d3a1229954dd783af06c9fd2dcd9ce926826a228" |
| 15 | SRC_URI = "git://github.com/ntop/ntopng.git;protocol=https;branch=5.2-stable \ | 15 | SRC_URI = "gitsm://github.com/ntop/ntopng;protocol=https;branch=6.6-stable \ |
| 16 | file://0001-configure.ac.in-fix-configure-error.patch \ | ||
| 17 | file://0001-configure.ac.in-fix-host-contamination.patch \ | 16 | file://0001-configure.ac.in-fix-host-contamination.patch \ |
| 18 | file://0001-Makefile.in-don-t-use-the-internal-lua.patch \ | 17 | file://0001-Makefile.in-don-t-use-the-internal-lua.patch \ |
| 19 | file://0001-autogen.sh-generate-configure.ac-only.patch \ | ||
| 20 | file://0001-configure.ac.in-not-check-clang-on-host.patch \ | ||
| 21 | file://0001-configure.ac.in-Allow-dynamic-linking-against-ndpi-3.patch \ | 18 | file://0001-configure.ac.in-Allow-dynamic-linking-against-ndpi-3.patch \ |
| 22 | file://0001-Follow-rrd-post-1.8-change.patch \ | 19 | file://0001-luaengine-Use-lua-5.5-API-signature-for-lua_newstate.patch \ |
| 23 | file://ntopng.service \ | 20 | file://ntopng.service \ |
| 24 | " | 21 | " |
| 25 | 22 | ||
| 26 | |||
| 27 | # don't use the lua under thirdparty as it supports cross compiling badly | 23 | # don't use the lua under thirdparty as it supports cross compiling badly |
| 28 | export LUA_LIB = "${STAGING_LIBDIR}/liblua.a" | 24 | export LUA_LIB = "-llua" |
| 29 | 25 | export LUA_INC = "-I${STAGING_INCDIR}" | |
| 26 | export NDPI_CUST_INC = "-I${STAGING_INCDIR}/ndpi" | ||
| 27 | export NDPI_CUST_LIB = "-lndpi" | ||
| 30 | LDFLAGS:append:mipsarch = " -latomic" | 28 | LDFLAGS:append:mipsarch = " -latomic" |
| 31 | LDFLAGS:append:powerpc = " -latomic" | 29 | LDFLAGS:append:powerpc = " -latomic" |
| 32 | LDFLAGS:append:riscv32 = " -latomic" | 30 | LDFLAGS:append:riscv32 = " -latomic" |
| 31 | |||
| 33 | inherit autotools-brokensep gettext pkgconfig systemd | 32 | inherit autotools-brokensep gettext pkgconfig systemd |
| 34 | 33 | ||
| 34 | EXTRA_OECONF += "--with-dynamic-ndpi" | ||
| 35 | |||
| 35 | do_install:append() { | 36 | do_install:append() { |
| 36 | install -d ${D}${systemd_unitdir}/system/ | 37 | install -d ${D}${systemd_unitdir}/system/ |
| 37 | install -m 0644 ${UNPACKDIR}/ntopng.service ${D}${systemd_unitdir}/system | 38 | install -m 0644 ${UNPACKDIR}/ntopng.service ${D}${systemd_unitdir}/system |
diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-fix-initialization-discards-const-qualifier-from-poi.patch b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-fix-initialization-discards-const-qualifier-from-poi.patch new file mode 100644 index 0000000000..c06a88f27e --- /dev/null +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-fix-initialization-discards-const-qualifier-from-poi.patch | |||
| @@ -0,0 +1,144 @@ | |||
| 1 | From 070500fd0e97abb07585882ae448ac35b1c4396c Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Rudi Heitbaum <rudi@heitbaum.com> | ||
| 3 | Date: Mon, 26 Jan 2026 11:55:03 +0000 | ||
| 4 | Subject: [PATCH] fix initialization discards 'const' qualifier from pointer | ||
| 5 | target type | ||
| 6 | |||
| 7 | Since glibc-2.43: | ||
| 8 | |||
| 9 | For ISO C23, the functions bsearch, memchr, strchr, strpbrk, strrchr, | ||
| 10 | strstr, wcschr, wcspbrk, wcsrchr, wcsstr and wmemchr that return | ||
| 11 | pointers into their input arrays now have definitions as macros that | ||
| 12 | return a pointer to a const-qualified type when the input argument is | ||
| 13 | a pointer to a const-qualified type. | ||
| 14 | |||
| 15 | https://lists.gnu.org/archive/html/info-gnu/2026-01/msg00005.html | ||
| 16 | |||
| 17 | Signed-off-by: Rudi Heitbaum <rudi@heitbaum.com> | ||
| 18 | |||
| 19 | Upstream-Status: Submitted [https://github.com/vmware/open-vm-tools/pull/783] | ||
| 20 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 21 | --- | ||
| 22 | open-vm-tools/lib/hgfs/hgfsEscape.c | 6 +++--- | ||
| 23 | open-vm-tools/lib/hgfsServer/hgfsServerLinux.c | 2 +- | ||
| 24 | open-vm-tools/lib/misc/strutil.c | 7 ++++--- | ||
| 25 | open-vm-tools/lib/nicInfo/nicInfoPosix.c | 2 +- | ||
| 26 | open-vm-tools/libvmtools/i18n.c | 2 +- | ||
| 27 | open-vm-tools/services/plugins/vix/vixTools.c | 2 +- | ||
| 28 | 6 files changed, 11 insertions(+), 10 deletions(-) | ||
| 29 | |||
| 30 | diff --git a/open-vm-tools/lib/hgfs/hgfsEscape.c b/open-vm-tools/lib/hgfs/hgfsEscape.c | ||
| 31 | index c4d39b12d..212ea1c79 100644 | ||
| 32 | --- a/open-vm-tools/lib/hgfs/hgfsEscape.c | ||
| 33 | +++ b/open-vm-tools/lib/hgfs/hgfsEscape.c | ||
| 34 | @@ -175,7 +175,7 @@ HgfsAddEscapeCharacter(char const * bufIn, // IN: input name | ||
| 35 | HgfsEscapeContext *escapeContext = (HgfsEscapeContext *)context; | ||
| 36 | uint32 charactersToCopy; | ||
| 37 | uint32 outputSpace; | ||
| 38 | - char* illegal; | ||
| 39 | + const char* illegal; | ||
| 40 | Bool result = TRUE; | ||
| 41 | |||
| 42 | ASSERT(offset >= escapeContext->processedOffset); // Scanning forward | ||
| 43 | @@ -573,7 +573,7 @@ HgfsIsEscapeSequence(char const *bufIn, // IN: input name | ||
| 44 | uint32 length) // IN: length of the name in characters | ||
| 45 | { | ||
| 46 | if (bufIn[offset] == HGFS_ESCAPE_CHAR && offset > 0) { | ||
| 47 | - char *substitute; | ||
| 48 | + const char *substitute; | ||
| 49 | if (bufIn[offset - 1] == HGFS_ESCAPE_SUBSTITUE_CHAR && offset > 1) { | ||
| 50 | /* | ||
| 51 | * Possibly a valid sequence, check it must be preceded with a substitute | ||
| 52 | @@ -887,7 +887,7 @@ HgfsEscapeUndoComponent(char *bufIn, // IN: Characters to be unesc | ||
| 53 | size_t offset = escapePointer - bufIn; | ||
| 54 | |||
| 55 | if (HgfsIsEscapeSequence(bufIn, offset, sizeIn)) { | ||
| 56 | - char* substitute = strchr(HGFS_SUBSTITUTE_CHARS, bufIn[offset - 1]); | ||
| 57 | + const char* substitute = strchr(HGFS_SUBSTITUTE_CHARS, bufIn[offset - 1]); | ||
| 58 | if (substitute != NULL) { | ||
| 59 | bufIn[offset - 1] = HGFS_ILLEGAL_CHARS[substitute - HGFS_SUBSTITUTE_CHARS]; | ||
| 60 | } else if (bufIn[offset - 1] == HGFS_ESCAPE_SUBSTITUE_CHAR) { | ||
| 61 | diff --git a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c | ||
| 62 | index 445a53881..eeabcadd4 100644 | ||
| 63 | --- a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c | ||
| 64 | +++ b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c | ||
| 65 | @@ -1366,7 +1366,7 @@ static void | ||
| 66 | HgfsGetHiddenAttr(char const *fileName, // IN: Input filename | ||
| 67 | HgfsFileAttrInfo *attr) // OUT: Struct to copy into | ||
| 68 | { | ||
| 69 | - char *baseName; | ||
| 70 | + const char *baseName; | ||
| 71 | |||
| 72 | ASSERT(fileName); | ||
| 73 | ASSERT(attr); | ||
| 74 | diff --git a/open-vm-tools/lib/misc/strutil.c b/open-vm-tools/lib/misc/strutil.c | ||
| 75 | index 4fc6502e4..4be63b7b8 100644 | ||
| 76 | --- a/open-vm-tools/lib/misc/strutil.c | ||
| 77 | +++ b/open-vm-tools/lib/misc/strutil.c | ||
| 78 | @@ -1454,6 +1454,7 @@ StrUtil_ReplaceAll(const char *orig, // IN | ||
| 79 | char *result; | ||
| 80 | const char *current; | ||
| 81 | char *tmp; | ||
| 82 | + const char *tmp2; | ||
| 83 | size_t lenWhat; | ||
| 84 | size_t lenWith; | ||
| 85 | size_t occurrences = 0; | ||
| 86 | @@ -1467,8 +1468,8 @@ StrUtil_ReplaceAll(const char *orig, // IN | ||
| 87 | lenWith = strlen(with); | ||
| 88 | |||
| 89 | current = orig; | ||
| 90 | - while ((tmp = strstr(current, what)) != NULL) { | ||
| 91 | - current = tmp + lenWhat; | ||
| 92 | + while ((tmp2 = strstr(current, what)) != NULL) { | ||
| 93 | + current = tmp2 + lenWhat; | ||
| 94 | ++occurrences; | ||
| 95 | } | ||
| 96 | |||
| 97 | @@ -1695,7 +1696,7 @@ StrUtilHasListItem(char const *list, // IN: | ||
| 98 | char const *item, // IN: | ||
| 99 | int (*ncmp)(char const *, char const*, size_t)) // IN: | ||
| 100 | { | ||
| 101 | - char *foundDelim; | ||
| 102 | + const char *foundDelim; | ||
| 103 | int itemLen = strlen(item); | ||
| 104 | |||
| 105 | if (list == NULL) { | ||
| 106 | diff --git a/open-vm-tools/lib/nicInfo/nicInfoPosix.c b/open-vm-tools/lib/nicInfo/nicInfoPosix.c | ||
| 107 | index 6f20547b2..a387e377b 100644 | ||
| 108 | --- a/open-vm-tools/lib/nicInfo/nicInfoPosix.c | ||
| 109 | +++ b/open-vm-tools/lib/nicInfo/nicInfoPosix.c | ||
| 110 | @@ -267,7 +267,7 @@ static Bool | ||
| 111 | IpEntryMatchesDevice(const char *devName, | ||
| 112 | const char *label) | ||
| 113 | { | ||
| 114 | - char *p; | ||
| 115 | + const char *p; | ||
| 116 | size_t n; | ||
| 117 | |||
| 118 | if ((p = strchr(label, ':')) != NULL) { | ||
| 119 | diff --git a/open-vm-tools/libvmtools/i18n.c b/open-vm-tools/libvmtools/i18n.c | ||
| 120 | index 3085f72d7..f61406d14 100644 | ||
| 121 | --- a/open-vm-tools/libvmtools/i18n.c | ||
| 122 | +++ b/open-vm-tools/libvmtools/i18n.c | ||
| 123 | @@ -698,7 +698,7 @@ VMTools_BindTextDomain(const char *domain, | ||
| 124 | * If we couldn't find the catalog file for the user's language, see if | ||
| 125 | * we can find a more generic language (e.g., for "en_US", also try "en"). | ||
| 126 | */ | ||
| 127 | - char *sep = Str_Strrchr(lang, '_'); | ||
| 128 | + const char *sep = Str_Strrchr(lang, '_'); | ||
| 129 | if (sep != NULL) { | ||
| 130 | if (usrlang == NULL) { | ||
| 131 | usrlang = Util_SafeStrdup(lang); | ||
| 132 | diff --git a/open-vm-tools/services/plugins/vix/vixTools.c b/open-vm-tools/services/plugins/vix/vixTools.c | ||
| 133 | index b2079a10d..6a8498ffb 100644 | ||
| 134 | --- a/open-vm-tools/services/plugins/vix/vixTools.c | ||
| 135 | +++ b/open-vm-tools/services/plugins/vix/vixTools.c | ||
| 136 | @@ -925,7 +925,7 @@ VixToolsBuildUserEnvironmentTable(const char * const *envp) // IN: optional | ||
| 137 | for (; NULL != *envp; envp++) { | ||
| 138 | char *name; | ||
| 139 | char *value; | ||
| 140 | - char *whereToSplit; | ||
| 141 | + const char *whereToSplit; | ||
| 142 | size_t nameLen; | ||
| 143 | |||
| 144 | whereToSplit = strchr(*envp, '='); | ||
diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools_13.0.10.bb b/meta-networking/recipes-support/open-vm-tools/open-vm-tools_13.0.10.bb index 4ec6d5aa86..a48d1ce88d 100644 --- a/meta-networking/recipes-support/open-vm-tools/open-vm-tools_13.0.10.bb +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools_13.0.10.bb | |||
| @@ -44,6 +44,7 @@ SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https;branch=maste | |||
| 44 | file://0013-open-vm-tools-Correct-include-path-for-poll.h.patch;patchdir=.. \ | 44 | file://0013-open-vm-tools-Correct-include-path-for-poll.h.patch;patchdir=.. \ |
| 45 | file://0014-timeSync-Portable-way-to-print-64bit-time_t.patch;patchdir=.. \ | 45 | file://0014-timeSync-Portable-way-to-print-64bit-time_t.patch;patchdir=.. \ |
| 46 | file://0001-glib_stubs-avoid-GLib-g_free-macro-redefinition-erro.patch;patchdir=.. \ | 46 | file://0001-glib_stubs-avoid-GLib-g_free-macro-redefinition-erro.patch;patchdir=.. \ |
| 47 | file://0001-fix-initialization-discards-const-qualifier-from-poi.patch;patchdir=.. \ | ||
| 47 | " | 48 | " |
| 48 | 49 | ||
| 49 | UPSTREAM_CHECK_GITTAGREGEX = "stable-(?P<pver>\d+(\.\d+)+)" | 50 | UPSTREAM_CHECK_GITTAGREGEX = "stable-(?P<pver>\d+(\.\d+)+)" |
diff --git a/meta-networking/recipes-support/openvpn/openvpn_2.6.17.bb b/meta-networking/recipes-support/openvpn/openvpn_2.7.0.bb index c454a93276..2567747121 100644 --- a/meta-networking/recipes-support/openvpn/openvpn_2.6.17.bb +++ b/meta-networking/recipes-support/openvpn/openvpn_2.7.0.bb | |||
| @@ -2,7 +2,7 @@ SUMMARY = "A full-featured SSL VPN solution via tun device." | |||
| 2 | HOMEPAGE = "https://openvpn.net/" | 2 | HOMEPAGE = "https://openvpn.net/" |
| 3 | SECTION = "net" | 3 | SECTION = "net" |
| 4 | LICENSE = "GPL-2.0-only" | 4 | LICENSE = "GPL-2.0-only" |
| 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=89196bacc47ed37a5b242a535661a049" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=924af2c382c415a0a68d0d9e7b483d23" |
| 6 | DEPENDS = "lzo lz4 openssl libcap-ng ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} ${@bb.utils.contains('PTEST_ENABLED', '1', 'cmocka', '', d)} " | 6 | DEPENDS = "lzo lz4 openssl libcap-ng ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} ${@bb.utils.contains('PTEST_ENABLED', '1', 'cmocka', '', d)} " |
| 7 | 7 | ||
| 8 | inherit autotools systemd update-rc.d pkgconfig ptest | 8 | inherit autotools systemd update-rc.d pkgconfig ptest |
| @@ -15,7 +15,7 @@ SRC_URI = "http://swupdate.openvpn.org/community/releases/${BP}.tar.gz \ | |||
| 15 | 15 | ||
| 16 | UPSTREAM_CHECK_URI = "https://openvpn.net/community-downloads" | 16 | UPSTREAM_CHECK_URI = "https://openvpn.net/community-downloads" |
| 17 | 17 | ||
| 18 | SRC_URI[sha256sum] = "4cc8e63f710d3001493b13d8a32cf22a214d5e4f71dd37d93831e2fd3208b370" | 18 | SRC_URI[sha256sum] = "2f0e10eb272be61e8fb25fe1cfa20875ff30ac857ef1418000c02290bd6dfa45" |
| 19 | 19 | ||
| 20 | CVE_STATUS[CVE-2020-27569] = "not-applicable-config: Applies only Aviatrix OpenVPN client, not openvpn" | 20 | CVE_STATUS[CVE-2020-27569] = "not-applicable-config: Applies only Aviatrix OpenVPN client, not openvpn" |
| 21 | 21 | ||
| @@ -46,6 +46,7 @@ PACKAGECONFIG[iproute2] = "--enable-iproute2,,iproute2,iproute2-ip" | |||
| 46 | PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd" | 46 | PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd" |
| 47 | PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" | 47 | PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" |
| 48 | 48 | ||
| 49 | RDEPENDS:${PN}:append = " bash" | ||
| 49 | RDEPENDS:${PN}-ptest:append = " make bash" | 50 | RDEPENDS:${PN}-ptest:append = " make bash" |
| 50 | 51 | ||
| 51 | do_install:append() { | 52 | do_install:append() { |
diff --git a/meta-networking/recipes-support/phytool/phytool.bb b/meta-networking/recipes-support/phytool/phytool_git.bb index 6471f46c28..35d11f8516 100644 --- a/meta-networking/recipes-support/phytool/phytool.bb +++ b/meta-networking/recipes-support/phytool/phytool_git.bb | |||
| @@ -1,11 +1,15 @@ | |||
| 1 | SUMMARY = "PHY interface tool for Linux" | 1 | SUMMARY = "PHY interface tool for Linux" |
| 2 | DESCRIPTION = "A tool to read and write PHY registers on Linux." | ||
| 3 | HOMEPAGE = "https://github.com/wkz/phytool" | ||
| 4 | BUGTRACKER = "https://github.com/wkz/phytool/issues" | ||
| 5 | SECTION = "console/network" | ||
| 6 | |||
| 2 | LICENSE = "GPL-2.0-only" | 7 | LICENSE = "GPL-2.0-only" |
| 3 | LIC_FILES_CHKSUM = "file://LICENSE;md5=39bba7d2cf0ba1036f2a6e2be52fe3f0" | 8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=39bba7d2cf0ba1036f2a6e2be52fe3f0" |
| 4 | 9 | ||
| 5 | PV = "2+git" | 10 | PV = "2+git" |
| 6 | SRCREV = "8882328c08ba2efb13c049812098f1d0cb8adf0c" | ||
| 7 | SRC_URI = "git://github.com/wkz/phytool.git;branch=master;protocol=https" | 11 | SRC_URI = "git://github.com/wkz/phytool.git;branch=master;protocol=https" |
| 8 | 12 | SRCREV = "bcf23b0261aa9f352ee4b944e30e3482158640a4" | |
| 9 | 13 | ||
| 10 | # The Makefile has "$PREFIX/bin" hardcoded into it, hence not using $bindir here | 14 | # The Makefile has "$PREFIX/bin" hardcoded into it, hence not using $bindir here |
| 11 | do_install() { | 15 | do_install() { |
diff --git a/meta-networking/recipes-support/tunctl/tunctl/makefile-add-ldflags.patch b/meta-networking/recipes-support/tunctl/tunctl/makefile-add-ldflags.patch index a556f6eebb..45fbb68b70 100644 --- a/meta-networking/recipes-support/tunctl/tunctl/makefile-add-ldflags.patch +++ b/meta-networking/recipes-support/tunctl/tunctl/makefile-add-ldflags.patch | |||
| @@ -4,11 +4,18 @@ Upstream-Status: Inactive-Upstream [last change: 2013-03-22] | |||
| 4 | 4 | ||
| 5 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | 5 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> |
| 6 | 6 | ||
| 7 | diff --git a/Makefile b/Makefile | ||
| 8 | index a0aa7f6..d6ce2c7 100644 | ||
| 9 | --- a/Makefile | 7 | --- a/Makefile |
| 10 | +++ b/Makefile | 8 | +++ b/Makefile |
| 11 | @@ -14,7 +14,7 @@ MAN_DIR ?= /usr/share/man/man$(MANS) | 9 | @@ -6,7 +6,7 @@ MAN = $(PACKAGE).$(MANS) |
| 10 | |||
| 11 | DIST = Makefile $(PACKAGE).spec $(PACKAGE).c $(PACKAGE).sgml ChangeLog | ||
| 12 | |||
| 13 | -CFLAGS = -g -Wall | ||
| 14 | +CFLAGS ?= -g -Wall | ||
| 15 | |||
| 16 | BIN_DIR ?= /usr/sbin | ||
| 17 | MAN_DIR ?= /usr/share/man/man$(MANS) | ||
| 18 | @@ -14,12 +14,12 @@ MAN_DIR ?= /usr/share/man/man$(MANS) | ||
| 12 | all : $(BIN) $(MAN) | 19 | all : $(BIN) $(MAN) |
| 13 | 20 | ||
| 14 | $(BIN) : $(BIN).c | 21 | $(BIN) : $(BIN).c |
| @@ -17,3 +24,9 @@ index a0aa7f6..d6ce2c7 100644 | |||
| 17 | 24 | ||
| 18 | $(MAN) : $(PACKAGE).sgml | 25 | $(MAN) : $(PACKAGE).sgml |
| 19 | docbook2man $(PACKAGE).sgml | 26 | docbook2man $(PACKAGE).sgml |
| 27 | |||
| 28 | -clean : | ||
| 29 | +clean : | ||
| 30 | rm -f $(BIN) $(OBJS) $(MAN) *~ manpage.* | ||
| 31 | |||
| 32 | install : $(BIN) $(MAN) | ||
