diff options
Diffstat (limited to 'meta-networking')
107 files changed, 694 insertions, 402 deletions
diff --git a/meta-networking/conf/include/non-repro-meta-networking.inc b/meta-networking/conf/include/non-repro-meta-networking.inc new file mode 100755 index 000000000..45eed5398 --- /dev/null +++ b/meta-networking/conf/include/non-repro-meta-networking.inc | |||
@@ -0,0 +1,57 @@ | |||
1 | # List of known non-reproducible package of the meta-networking layer | ||
2 | # Please keep this list sorted | ||
3 | KNOWN_NON_REPRO_META_NETWORKING = " \ | ||
4 | blueman \ | ||
5 | blueman-dbg \ | ||
6 | blueman-src \ | ||
7 | civetweb-dev \ | ||
8 | dhcp-relay-staticdev \ | ||
9 | ettercap-src \ | ||
10 | fetchmail \ | ||
11 | fetchmail-dbg \ | ||
12 | freediameter \ | ||
13 | freediameter-src \ | ||
14 | freeradius \ | ||
15 | htpdate-doc \ | ||
16 | keepalived \ | ||
17 | keepalived-dbg \ | ||
18 | libbearssl-staticdev \ | ||
19 | libfko3 \ | ||
20 | libfko-client \ | ||
21 | libfko-daemon \ | ||
22 | libfko-dbg \ | ||
23 | libmosquitto1 \ | ||
24 | libowfat-staticdev \ | ||
25 | libruli-staticdev \ | ||
26 | libsamba-util0 \ | ||
27 | mosquitto \ | ||
28 | mosquitto-dbg \ | ||
29 | ncftp \ | ||
30 | ncftp-dbg \ | ||
31 | ncftp-src \ | ||
32 | ndisc6-dbg \ | ||
33 | ndisc6-misc \ | ||
34 | ndisc6-ndisc6 \ | ||
35 | ndisc6-rdisc6 \ | ||
36 | ndisc6-rdnssd \ | ||
37 | ndisc6-rltraceroute6 \ | ||
38 | netsniff-ng-doc \ | ||
39 | ntpsec-src \ | ||
40 | openl2tp \ | ||
41 | openl2tp-dbg \ | ||
42 | ot-br-posix \ | ||
43 | ot-br-posix-dbg \ | ||
44 | postfix-cfg \ | ||
45 | proftpd \ | ||
46 | proftpd-dbg \ | ||
47 | proftpd-dev \ | ||
48 | rdist \ | ||
49 | rdist-dbg \ | ||
50 | samba-dbg \ | ||
51 | tayga \ | ||
52 | tayga-dbg \ | ||
53 | wolfssl \ | ||
54 | wolfssl-dbg \ | ||
55 | znc \ | ||
56 | znc-doc \ | ||
57 | " | ||
diff --git a/meta-networking/conf/layer.conf b/meta-networking/conf/layer.conf index ac5d15a0c..a9ba4abad 100644 --- a/meta-networking/conf/layer.conf +++ b/meta-networking/conf/layer.conf | |||
@@ -15,7 +15,7 @@ LAYERVERSION_networking-layer = "1" | |||
15 | 15 | ||
16 | LAYERDEPENDS_networking-layer = "core meta-python openembedded-layer" | 16 | LAYERDEPENDS_networking-layer = "core meta-python openembedded-layer" |
17 | 17 | ||
18 | LAYERSERIES_COMPAT_networking-layer = "scarthgap" | 18 | LAYERSERIES_COMPAT_networking-layer = "styhead" |
19 | 19 | ||
20 | LICENSE_PATH += "${LAYERDIR}/licenses" | 20 | LICENSE_PATH += "${LAYERDIR}/licenses" |
21 | 21 | ||
diff --git a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/firewalld_1.3.2.bb b/meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/firewalld_1.3.2.bb index 52157cf9a..12cc6645b 100644 --- a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/firewalld_1.3.2.bb +++ b/meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/firewalld_1.3.2.bb | |||
@@ -146,7 +146,7 @@ do_install:append() { | |||
146 | # firewalld ships an init script but it contains Red Hat-isms, replace it with our own | 146 | # firewalld ships an init script but it contains Red Hat-isms, replace it with our own |
147 | rm -rf ${D}${sysconfdir}/rc.d/ | 147 | rm -rf ${D}${sysconfdir}/rc.d/ |
148 | install -d ${D}${sysconfdir}/init.d | 148 | install -d ${D}${sysconfdir}/init.d |
149 | install -m0755 ${WORKDIR}/firewalld.init ${D}${sysconfdir}/init.d/firewalld | 149 | install -m0755 ${UNPACKDIR}/firewalld.init ${D}${sysconfdir}/init.d/firewalld |
150 | fi | 150 | fi |
151 | 151 | ||
152 | if ${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'false', 'true', d)}; then | 152 | if ${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'false', 'true', d)}; then |
diff --git a/meta-networking/recipes-connectivity/daq/daq_2.0.7.bb b/meta-networking/recipes-connectivity/daq/daq_2.0.7.bb index 66ad83f71..8cb4c04fa 100644 --- a/meta-networking/recipes-connectivity/daq/daq_2.0.7.bb +++ b/meta-networking/recipes-connectivity/daq/daq_2.0.7.bb | |||
@@ -11,6 +11,7 @@ DEPENDS = "libpcap libpcre libdnet bison-native libnetfilter-queue" | |||
11 | SRC_URI = "http://fossies.org/linux/misc/daq-${PV}.tar.gz \ | 11 | SRC_URI = "http://fossies.org/linux/misc/daq-${PV}.tar.gz \ |
12 | file://disable-run-test-program-while-cross-compiling.patch \ | 12 | file://disable-run-test-program-while-cross-compiling.patch \ |
13 | file://0001-correct-the-location-of-unistd.h.patch \ | 13 | file://0001-correct-the-location-of-unistd.h.patch \ |
14 | file://daq-fix-incompatible-pointer-type-error.patch \ | ||
14 | " | 15 | " |
15 | SRC_URI[sha256sum] = "bdc4e5a24d1ea492c39ee213a63c55466a2e8114b6a9abed609927ae13a7705e" | 16 | SRC_URI[sha256sum] = "bdc4e5a24d1ea492c39ee213a63c55466a2e8114b6a9abed609927ae13a7705e" |
16 | # these 2 create undeclared dependency on libdnet and libnetfilter-queue from meta-networking | 17 | # these 2 create undeclared dependency on libdnet and libnetfilter-queue from meta-networking |
diff --git a/meta-networking/recipes-connectivity/daq/files/daq-fix-incompatible-pointer-type-error.patch b/meta-networking/recipes-connectivity/daq/files/daq-fix-incompatible-pointer-type-error.patch new file mode 100644 index 000000000..ade3ec686 --- /dev/null +++ b/meta-networking/recipes-connectivity/daq/files/daq-fix-incompatible-pointer-type-error.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | Fix daq incompatible pointer type error when gcc option | ||
2 | '-Wincompatible-pointer-types is set: | ||
3 | |||
4 | | ../../daq-2.0.7/os-daq-modules/daq_nfq.c: In function 'SetPktHdr': | ||
5 | | ../../daq-2.0.7/os-daq-modules/daq_nfq.c:394:37: error: passing argument 2 | ||
6 | of 'nfq_get_payload' from incompatible pointer type [-Wincompatible-pointer-types] | ||
7 | | 394 | int len = nfq_get_payload(nfad, (char**)pkt); | ||
8 | | | ^~~~~~~~~~~ | ||
9 | | | | | ||
10 | | | char ** | ||
11 | |||
12 | Upstream-Status: Inactive-Upstream [lastrelease: 2019-03-09] | ||
13 | |||
14 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
15 | --- | ||
16 | os-daq-modules/daq_nfq.c | 2 +- | ||
17 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
18 | |||
19 | diff --git a/os-daq-modules/daq_nfq.c b/os-daq-modules/daq_nfq.c | ||
20 | index 4de94b6..a6de2f3 100644 | ||
21 | --- a/os-daq-modules/daq_nfq.c | ||
22 | +++ b/os-daq-modules/daq_nfq.c | ||
23 | @@ -391,7 +391,7 @@ static inline int SetPktHdr ( | ||
24 | DAQ_PktHdr_t* hdr, | ||
25 | uint8_t** pkt | ||
26 | ) { | ||
27 | - int len = nfq_get_payload(nfad, (char**)pkt); | ||
28 | + int len = nfq_get_payload(nfad, (unsigned char**)pkt); | ||
29 | |||
30 | if ( len <= 0 ) | ||
31 | return -1; | ||
diff --git a/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.3p1.bb b/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.3p1.bb index e5f7e0334..e458321e6 100644 --- a/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.3p1.bb +++ b/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.3p1.bb | |||
@@ -53,16 +53,16 @@ do_configure:prepend () { | |||
53 | } | 53 | } |
54 | 54 | ||
55 | do_install:append () { | 55 | do_install:append () { |
56 | install -Dm 0644 ${WORKDIR}/default-relay ${D}${sysconfdir}/default/dhcp-relay | 56 | install -Dm 0644 ${UNPACKDIR}/default-relay ${D}${sysconfdir}/default/dhcp-relay |
57 | 57 | ||
58 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then | 58 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then |
59 | install -d ${D}${systemd_unitdir}/system | 59 | install -d ${D}${systemd_unitdir}/system |
60 | install -m 0644 ${WORKDIR}/dhcrelay.service ${D}${systemd_unitdir}/system | 60 | install -m 0644 ${UNPACKDIR}/dhcrelay.service ${D}${systemd_unitdir}/system |
61 | sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/dhcrelay.service | 61 | sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/dhcrelay.service |
62 | sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/dhcrelay.service | 62 | sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/dhcrelay.service |
63 | else | 63 | else |
64 | install -d ${D}${sysconfdir}/init.d | 64 | install -d ${D}${sysconfdir}/init.d |
65 | install -m 0755 ${WORKDIR}/init-relay ${D}${sysconfdir}/init.d/dhcp-relay | 65 | install -m 0755 ${UNPACKDIR}/init-relay ${D}${sysconfdir}/init.d/dhcp-relay |
66 | fi | 66 | fi |
67 | } | 67 | } |
68 | 68 | ||
diff --git a/meta-networking/recipes-connectivity/freeradius/freeradius_3.2.3.bb b/meta-networking/recipes-connectivity/freeradius/freeradius_3.2.3.bb index 7ea63a65d..8397380c1 100644 --- a/meta-networking/recipes-connectivity/freeradius/freeradius_3.2.3.bb +++ b/meta-networking/recipes-connectivity/freeradius/freeradius_3.2.3.bb | |||
@@ -169,14 +169,14 @@ do_install() { | |||
169 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then | 169 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then |
170 | install -d ${D}${sysconfdir}/init.d | 170 | install -d ${D}${sysconfdir}/init.d |
171 | install -d ${D}${sysconfdir}/default/volatiles | 171 | install -d ${D}${sysconfdir}/default/volatiles |
172 | install -m 0755 ${WORKDIR}/freeradius ${D}/etc/init.d/radiusd | 172 | install -m 0755 ${UNPACKDIR}/freeradius ${D}/etc/init.d/radiusd |
173 | install -m 0644 ${WORKDIR}/volatiles.58_radiusd ${D}${sysconfdir}/default/volatiles/58_radiusd | 173 | install -m 0644 ${UNPACKDIR}/volatiles.58_radiusd ${D}${sysconfdir}/default/volatiles/58_radiusd |
174 | fi | 174 | fi |
175 | 175 | ||
176 | # For systemd | 176 | # For systemd |
177 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then | 177 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then |
178 | install -d ${D}${systemd_unitdir}/system | 178 | install -d ${D}${systemd_unitdir}/system |
179 | install -m 0644 ${WORKDIR}/radiusd.service ${D}${systemd_unitdir}/system | 179 | install -m 0644 ${UNPACKDIR}/radiusd.service ${D}${systemd_unitdir}/system |
180 | sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ | 180 | sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ |
181 | -e 's,@SBINDIR@,${sbindir},g' \ | 181 | -e 's,@SBINDIR@,${sbindir},g' \ |
182 | -e 's,@STATEDIR@,${localstatedir},g' \ | 182 | -e 's,@STATEDIR@,${localstatedir},g' \ |
@@ -184,7 +184,7 @@ do_install() { | |||
184 | ${D}${systemd_unitdir}/system/radiusd.service | 184 | ${D}${systemd_unitdir}/system/radiusd.service |
185 | 185 | ||
186 | install -d ${D}${sysconfdir}/tmpfiles.d/ | 186 | install -d ${D}${sysconfdir}/tmpfiles.d/ |
187 | install -m 0644 ${WORKDIR}/radiusd-volatiles.conf ${D}${sysconfdir}/tmpfiles.d/radiusd.conf | 187 | install -m 0644 ${UNPACKDIR}/radiusd-volatiles.conf ${D}${sysconfdir}/tmpfiles.d/radiusd.conf |
188 | fi | 188 | fi |
189 | 189 | ||
190 | oe_multilib_header freeradius/autoconf.h | 190 | oe_multilib_header freeradius/autoconf.h |
diff --git a/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.5.1.bb b/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.5.3.bb index 63476d349..0e1f50164 100644 --- a/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.5.1.bb +++ b/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.5.3.bb | |||
@@ -13,7 +13,7 @@ SECTION = "console/network" | |||
13 | LICENSE = "GPL-3.0-only" | 13 | LICENSE = "GPL-3.0-only" |
14 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | 14 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" |
15 | DEPENDS = "swig-native python3" | 15 | DEPENDS = "swig-native python3" |
16 | SRCREV = "210cf30897631fe2006ac50483caf8fd616622a2" | 16 | SRCREV = "6f557c490f0b46ab5d7ef1b01bb3bc9fab3f442f" |
17 | 17 | ||
18 | SRC_URI = "git://github.com/mz-automation/${BPN}.git;branch=v1.5;protocol=https \ | 18 | SRC_URI = "git://github.com/mz-automation/${BPN}.git;branch=v1.5;protocol=https \ |
19 | file://0001-pyiec61850-don-t-break-CMAKE_INSTALL_PATH-by-trying-.patch \ | 19 | file://0001-pyiec61850-don-t-break-CMAKE_INSTALL_PATH-by-trying-.patch \ |
diff --git a/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.28.8.bb b/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.28.8.bb index 301e65598..db79241f2 100644 --- a/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.28.8.bb +++ b/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.28.8.bb | |||
@@ -50,7 +50,7 @@ RPROVIDES:${PN} = "polarssl" | |||
50 | PACKAGES =+ "${PN}-programs" | 50 | PACKAGES =+ "${PN}-programs" |
51 | FILES:${PN}-programs = "${bindir}/" | 51 | FILES:${PN}-programs = "${bindir}/" |
52 | 52 | ||
53 | ALTERNATIVE:${PN}-programs = "hello" | 53 | ALTERNATIVE:${PN}-programs = "${@bb.utils.contains('PACKAGECONFIG', 'programs', 'hello', '', d)}" |
54 | ALTERNATIVE_LINK_NAME[hello] = "${bindir}/hello" | 54 | ALTERNATIVE_LINK_NAME[hello] = "${bindir}/hello" |
55 | 55 | ||
56 | BBCLASSEXTEND = "native nativesdk" | 56 | BBCLASSEXTEND = "native nativesdk" |
diff --git a/meta-networking/recipes-connectivity/mbedtls/mbedtls_3.6.0.bb b/meta-networking/recipes-connectivity/mbedtls/mbedtls_3.6.0.bb index 92a2de82a..a10fce0ff 100644 --- a/meta-networking/recipes-connectivity/mbedtls/mbedtls_3.6.0.bb +++ b/meta-networking/recipes-connectivity/mbedtls/mbedtls_3.6.0.bb | |||
@@ -55,7 +55,7 @@ RPROVIDES:${PN} = "polarssl" | |||
55 | PACKAGES =+ "${PN}-programs" | 55 | PACKAGES =+ "${PN}-programs" |
56 | FILES:${PN}-programs = "${bindir}/" | 56 | FILES:${PN}-programs = "${bindir}/" |
57 | 57 | ||
58 | ALTERNATIVE:${PN}-programs = "hello" | 58 | ALTERNATIVE:${PN}-programs = "${@bb.utils.contains('PACKAGECONFIG', 'programs', 'hello', '', d)}" |
59 | ALTERNATIVE_LINK_NAME[hello] = "${bindir}/hello" | 59 | ALTERNATIVE_LINK_NAME[hello] = "${bindir}/hello" |
60 | 60 | ||
61 | BBCLASSEXTEND = "native nativesdk" | 61 | BBCLASSEXTEND = "native nativesdk" |
diff --git a/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20191006.bb b/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20191006.bb index 468569eef..1c2f030f8 100644 --- a/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20191006.bb +++ b/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20191006.bb | |||
@@ -44,7 +44,7 @@ do_install() { | |||
44 | install ${S}/linux/miniupnpd.init.d.script ${D}/${sysconfdir}/init.d/miniupnpd | 44 | install ${S}/linux/miniupnpd.init.d.script ${D}/${sysconfdir}/init.d/miniupnpd |
45 | 45 | ||
46 | install -d ${D}${systemd_unitdir}/system | 46 | install -d ${D}${systemd_unitdir}/system |
47 | install -m 0644 ${WORKDIR}/miniupnpd.service ${D}${systemd_unitdir}/system/ | 47 | install -m 0644 ${UNPACKDIR}/miniupnpd.service ${D}${systemd_unitdir}/system/ |
48 | } | 48 | } |
49 | 49 | ||
50 | SYSTEMD_SERVICE:${PN} = "miniupnpd.service" | 50 | SYSTEMD_SERVICE:${PN} = "miniupnpd.service" |
diff --git a/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.18.bb b/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.18.bb index ea9eb4857..4ef065410 100644 --- a/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.18.bb +++ b/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.18.bb | |||
@@ -46,7 +46,7 @@ do_install:append() { | |||
46 | install -m 0644 ${S}/service/systemd/mosquitto.service.notify ${D}${systemd_unitdir}/system/mosquitto.service | 46 | install -m 0644 ${S}/service/systemd/mosquitto.service.notify ${D}${systemd_unitdir}/system/mosquitto.service |
47 | 47 | ||
48 | install -d ${D}${sysconfdir}/init.d/ | 48 | install -d ${D}${sysconfdir}/init.d/ |
49 | install -m 0755 ${WORKDIR}/mosquitto.init ${D}${sysconfdir}/init.d/mosquitto | 49 | install -m 0755 ${UNPACKDIR}/mosquitto.init ${D}${sysconfdir}/init.d/mosquitto |
50 | sed -i -e 's,@SBINDIR@,${sbindir},g' \ | 50 | sed -i -e 's,@SBINDIR@,${sbindir},g' \ |
51 | -e 's,@BASE_SBINDIR@,${base_sbindir},g' \ | 51 | -e 's,@BASE_SBINDIR@,${base_sbindir},g' \ |
52 | -e 's,@LOCALSTATEDIR@,${localstatedir},g' \ | 52 | -e 's,@LOCALSTATEDIR@,${localstatedir},g' \ |
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.10.2.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.11.0.bb index cdef11c89..f44526ff9 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.10.2.bb +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.11.0.bb | |||
@@ -13,7 +13,7 @@ SRC_URI = "${GNOME_MIRROR}/NetworkManager-openvpn/${@gnome_verdir("${PV}")}/Netw | |||
13 | 13 | ||
14 | SRC_URI:append:libc-musl = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' file://0001-linker-scripts-Do-not-export-_IO_stdin_used.patch', '', d)}" | 14 | SRC_URI:append:libc-musl = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' file://0001-linker-scripts-Do-not-export-_IO_stdin_used.patch', '', d)}" |
15 | 15 | ||
16 | SRC_URI[sha256sum] = "62f0f2a8782221b923f212ac2a8ebbc1002efd6a90ee945dad4adfb56d076d21" | 16 | SRC_URI[sha256sum] = "2128de06f91b33c13d63cdaa6e178bc1ca57fc770cde3bc7c24891f4d9824501" |
17 | 17 | ||
18 | S = "${WORKDIR}/NetworkManager-openvpn-${PV}" | 18 | S = "${WORKDIR}/NetworkManager-openvpn-${PV}" |
19 | 19 | ||
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-libnm-systemd-core-Disable-sd_dhcp6_client_set_duid_.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-libnm-systemd-core-Disable-sd_dhcp6_client_set_duid_.patch new file mode 100644 index 000000000..8e246efe0 --- /dev/null +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-libnm-systemd-core-Disable-sd_dhcp6_client_set_duid_.patch | |||
@@ -0,0 +1,65 @@ | |||
1 | From 34d7a6c9919a73c2e716835000944c17438b2ca1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 7 Jun 2024 14:03:15 -0700 | ||
4 | Subject: [PATCH] libnm-systemd-core: Disable sd_dhcp6_client_set_duid_uuid | ||
5 | function | ||
6 | |||
7 | When building on musl systems ( with out systemd ), and using LLD linker | ||
8 | from LLVM project we fail to link with undefined symbols. | ||
9 | |||
10 | This symbol is in sd_id128.c but its disabled, so let disable the functions | ||
11 | which need this function. | ||
12 | |||
13 | | x86_64-yoe-linux-musl-ld.lld: error: undefined symbol: sd_id128_get_machine_app_specific | ||
14 | | >>> referenced by sd-dhcp-duid.c:202 (/usr/src/debug/networkmanager/1.48.0/../NetworkManager-1.48.0/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c:202) | ||
15 | | >>> libnm-systemd-core.a.p/src_libsystemd-network_sd-dhcp-duid.c.o:(sd_dhcp_duid_set_uuid) in archive src/libnm-systemd-core/libnm-systemd-core.a | ||
16 | | x86_64-yoe-linux-musl-clang: error: linker command failed with exit code 1 (use -v to see invocation) | ||
17 | |||
18 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1966] | ||
19 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
20 | --- | ||
21 | src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c | 2 ++ | ||
22 | .../src/libsystemd-network/sd-dhcp6-client.c | 3 ++- | ||
23 | 2 files changed, 4 insertions(+), 1 deletion(-) | ||
24 | |||
25 | diff --git a/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c b/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c | ||
26 | index e664a4a..7ba5020 100644 | ||
27 | --- a/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c | ||
28 | +++ b/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c | ||
29 | @@ -193,6 +193,7 @@ int sd_dhcp_duid_set_en(sd_dhcp_duid *duid) { | ||
30 | return 0; | ||
31 | } | ||
32 | |||
33 | +#if 0 | ||
34 | int sd_dhcp_duid_set_uuid(sd_dhcp_duid *duid) { | ||
35 | sd_id128_t machine_id; | ||
36 | int r; | ||
37 | @@ -209,6 +210,7 @@ int sd_dhcp_duid_set_uuid(sd_dhcp_duid *duid) { | ||
38 | duid->size = offsetof(struct duid, uuid.uuid) + sizeof(machine_id); | ||
39 | return 0; | ||
40 | } | ||
41 | +#endif | ||
42 | |||
43 | int dhcp_duid_to_string_internal(uint16_t type, const void *data, size_t data_size, char **ret) { | ||
44 | _cleanup_free_ char *p = NULL, *x = NULL; | ||
45 | diff --git a/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-client.c b/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-client.c | ||
46 | index 7c20116..08c1e96 100644 | ||
47 | --- a/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-client.c | ||
48 | +++ b/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-client.c | ||
49 | @@ -244,6 +244,7 @@ int sd_dhcp6_client_set_duid_en(sd_dhcp6_client *client) { | ||
50 | return 0; | ||
51 | } | ||
52 | |||
53 | +#if 0 | ||
54 | int sd_dhcp6_client_set_duid_uuid(sd_dhcp6_client *client) { | ||
55 | int r; | ||
56 | |||
57 | @@ -256,7 +257,7 @@ int sd_dhcp6_client_set_duid_uuid(sd_dhcp6_client *client) { | ||
58 | |||
59 | return 0; | ||
60 | } | ||
61 | - | ||
62 | +#endif | ||
63 | int sd_dhcp6_client_set_duid_raw(sd_dhcp6_client *client, uint16_t duid_type, const uint8_t *duid, size_t duid_len) { | ||
64 | int r; | ||
65 | |||
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.46.0.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.48.0.bb index be30154a3..47287951f 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.46.0.bb +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.48.0.bb | |||
@@ -19,6 +19,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | |||
19 | " | 19 | " |
20 | 20 | ||
21 | DEPENDS = " \ | 21 | DEPENDS = " \ |
22 | glib-2.0 \ | ||
22 | python3-pygobject-native \ | 23 | python3-pygobject-native \ |
23 | coreutils-native \ | 24 | coreutils-native \ |
24 | intltool-native \ | 25 | intltool-native \ |
@@ -39,10 +40,11 @@ SRC_URI = " \ | |||
39 | file://${BPN}.initd \ | 40 | file://${BPN}.initd \ |
40 | file://enable-dhcpcd.conf \ | 41 | file://enable-dhcpcd.conf \ |
41 | file://enable-iwd.conf \ | 42 | file://enable-iwd.conf \ |
43 | file://0001-libnm-systemd-core-Disable-sd_dhcp6_client_set_duid_.patch \ | ||
42 | " | 44 | " |
43 | SRC_URI:append:libc-musl = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' file://0001-linker-scripts-Do-not-export-_IO_stdin_used.patch', '', d)}" | 45 | SRC_URI:append:libc-musl = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' file://0001-linker-scripts-Do-not-export-_IO_stdin_used.patch', '', d)}" |
44 | 46 | ||
45 | SRC_URI[sha256sum] = "722649e25362693b334371473802a729b0ec9ee283375096905f868808e74068" | 47 | SRC_URI[sha256sum] = "fc80b942de38e329468e6fc1dfb40aad6a78d02ddf6b8ec31f9acc6460b8723f" |
46 | 48 | ||
47 | S = "${WORKDIR}/NetworkManager-${PV}" | 49 | S = "${WORKDIR}/NetworkManager-${PV}" |
48 | 50 | ||
@@ -76,9 +78,11 @@ EXTRA_OEMESON = "\ | |||
76 | CFLAGS:append:libc-musl = " \ | 78 | CFLAGS:append:libc-musl = " \ |
77 | -DRTLD_DEEPBIND=0 \ | 79 | -DRTLD_DEEPBIND=0 \ |
78 | " | 80 | " |
79 | 81 | do_configure:prepend() { | |
80 | do_compile:prepend() { | 82 | cp -f ${STAGING_LIBDIR}/girepository-1.0/GLib*typelib ${STAGING_LIBDIR_NATIVE}/girepository-1.0/ |
81 | export GI_TYPELIB_PATH="${B}}/src/libnm-client-impl${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}" | 83 | cp -f ${STAGING_LIBDIR}/girepository-1.0/GObject*typelib ${STAGING_LIBDIR_NATIVE}/girepository-1.0/ |
84 | cp -f ${STAGING_LIBDIR}/girepository-1.0/Gio*typelib ${STAGING_LIBDIR_NATIVE}/girepository-1.0/ | ||
85 | cp -f ${STAGING_LIBDIR}/girepository-1.0/GModule*typelib ${STAGING_LIBDIR_NATIVE}/girepository-1.0/ | ||
82 | } | 86 | } |
83 | 87 | ||
84 | PACKAGECONFIG ??= "readline nss ifupdown dnsmasq nmcli vala \ | 88 | PACKAGECONFIG ??= "readline nss ifupdown dnsmasq nmcli vala \ |
@@ -298,7 +302,7 @@ RRECOMMENDS:${PN} += "\ | |||
298 | " | 302 | " |
299 | 303 | ||
300 | do_install:append() { | 304 | do_install:append() { |
301 | install -Dm 0755 ${WORKDIR}/${BPN}.initd ${D}${sysconfdir}/init.d/network-manager | 305 | install -Dm 0755 ${UNPACKDIR}/${BPN}.initd ${D}${sysconfdir}/init.d/network-manager |
302 | 306 | ||
303 | rm -rf ${D}/run ${D}${localstatedir}/run | 307 | rm -rf ${D}/run ${D}${localstatedir}/run |
304 | 308 | ||
@@ -312,11 +316,11 @@ do_install:append() { | |||
312 | 316 | ||
313 | # Enable iwd if compiled | 317 | # Enable iwd if compiled |
314 | if ${@bb.utils.contains('PACKAGECONFIG','iwd','true','false',d)}; then | 318 | if ${@bb.utils.contains('PACKAGECONFIG','iwd','true','false',d)}; then |
315 | install -Dm 0644 ${WORKDIR}/enable-iwd.conf ${D}${nonarch_libdir}/NetworkManager/conf.d/enable-iwd.conf | 319 | install -Dm 0644 ${UNPACKDIR}/enable-iwd.conf ${D}${nonarch_libdir}/NetworkManager/conf.d/enable-iwd.conf |
316 | fi | 320 | fi |
317 | 321 | ||
318 | # Enable dhcpd if compiled | 322 | # Enable dhcpd if compiled |
319 | if ${@bb.utils.contains('PACKAGECONFIG','dhcpcd','true','false',d)}; then | 323 | if ${@bb.utils.contains('PACKAGECONFIG','dhcpcd','true','false',d)}; then |
320 | install -Dm 0644 ${WORKDIR}/enable-dhcpcd.conf ${D}${nonarch_libdir}/NetworkManager/conf.d/enable-dhcpcd.conf | 324 | install -Dm 0644 ${UNPACKDIR}/enable-dhcpcd.conf ${D}${nonarch_libdir}/NetworkManager/conf.d/enable-dhcpcd.conf |
321 | fi | 325 | fi |
322 | } | 326 | } |
diff --git a/meta-networking/recipes-connectivity/openfortivpn/openfortivpn_1.21.0.bb b/meta-networking/recipes-connectivity/openfortivpn/openfortivpn_1.22.1.bb index e6c9a69ee..b69a7e235 100644 --- a/meta-networking/recipes-connectivity/openfortivpn/openfortivpn_1.21.0.bb +++ b/meta-networking/recipes-connectivity/openfortivpn/openfortivpn_1.22.1.bb | |||
@@ -3,7 +3,7 @@ LICENSE = "GPL-3.0-or-later" | |||
3 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3d575262a651a6f1a17210ce41bf907d" | 3 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3d575262a651a6f1a17210ce41bf907d" |
4 | 4 | ||
5 | SRC_URI = "git://github.com/adrienverge/openfortivpn.git;protocol=https;branch=master" | 5 | SRC_URI = "git://github.com/adrienverge/openfortivpn.git;protocol=https;branch=master" |
6 | SRCREV = "26a1fe68cc7a61c58f4f2a98862f6fcf30f9f2dc" | 6 | SRCREV = "388fa98f639ef91733461de50b06dd57f1ffb099" |
7 | 7 | ||
8 | DEPENDS = "openssl" | 8 | DEPENDS = "openssl" |
9 | 9 | ||
diff --git a/meta-networking/recipes-connectivity/samba/samba_4.19.5.bb b/meta-networking/recipes-connectivity/samba/samba_4.19.6.bb index f5ef86dd4..7bdcfd35c 100644 --- a/meta-networking/recipes-connectivity/samba/samba_4.19.5.bb +++ b/meta-networking/recipes-connectivity/samba/samba_4.19.6.bb | |||
@@ -31,7 +31,7 @@ SRC_URI:append:libc-musl = " \ | |||
31 | file://samba-4.3.9-remove-getpwent_r.patch \ | 31 | file://samba-4.3.9-remove-getpwent_r.patch \ |
32 | " | 32 | " |
33 | 33 | ||
34 | SRC_URI[sha256sum] = "0e2405b4cec29d0459621f4340a1a74af771ec7cffedff43250cad7f1f87605e" | 34 | SRC_URI[sha256sum] = "653b52095554dbc223c63b96af5cdf9e98c3e048549c5f56143d3b33dce1cef1" |
35 | 35 | ||
36 | UPSTREAM_CHECK_REGEX = "samba\-(?P<pver>4\.19(\.\d+)+).tar.gz" | 36 | UPSTREAM_CHECK_REGEX = "samba\-(?P<pver>4\.19(\.\d+)+).tar.gz" |
37 | 37 | ||
@@ -173,8 +173,8 @@ do_install:append() { | |||
173 | 173 | ||
174 | install -d ${D}${sysconfdir}/samba | 174 | install -d ${D}${sysconfdir}/samba |
175 | echo "127.0.0.1 localhost" > ${D}${sysconfdir}/samba/lmhosts | 175 | echo "127.0.0.1 localhost" > ${D}${sysconfdir}/samba/lmhosts |
176 | install -m644 ${WORKDIR}/smb.conf ${D}${sysconfdir}/samba/smb.conf | 176 | install -m644 ${UNPACKDIR}/smb.conf ${D}${sysconfdir}/samba/smb.conf |
177 | install -D -m 644 ${WORKDIR}/volatiles.03_samba ${D}${sysconfdir}/default/volatiles/03_samba | 177 | install -D -m 644 ${UNPACKDIR}/volatiles.03_samba ${D}${sysconfdir}/default/volatiles/03_samba |
178 | 178 | ||
179 | install -d ${D}${sysconfdir}/default | 179 | install -d ${D}${sysconfdir}/default |
180 | install -m644 packaging/systemd/samba.sysconfig ${D}${sysconfdir}/default/samba | 180 | install -m644 packaging/systemd/samba.sysconfig ${D}${sysconfdir}/default/samba |
diff --git a/meta-networking/recipes-connectivity/snort/snort_2.9.20.bb b/meta-networking/recipes-connectivity/snort/snort_2.9.20.bb index 8b9092b41..9bc14fc56 100644 --- a/meta-networking/recipes-connectivity/snort/snort_2.9.20.bb +++ b/meta-networking/recipes-connectivity/snort/snort_2.9.20.bb | |||
@@ -76,18 +76,18 @@ do_install:append() { | |||
76 | 76 | ||
77 | cp ${S}/preproc_rules/*.rules ${D}${sysconfdir}/snort/preproc_rules/ | 77 | cp ${S}/preproc_rules/*.rules ${D}${sysconfdir}/snort/preproc_rules/ |
78 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then | 78 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then |
79 | install -m 755 ${WORKDIR}/snort.init ${D}${sysconfdir}/init.d/snort | 79 | install -m 755 ${UNPACKDIR}/snort.init ${D}${sysconfdir}/init.d/snort |
80 | fi | 80 | fi |
81 | 81 | ||
82 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then | 82 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then |
83 | install -d ${D}/${systemd_system_unitdir} | 83 | install -d ${D}/${systemd_system_unitdir} |
84 | install -m 644 ${WORKDIR}/snort.service ${D}/${systemd_system_unitdir} | 84 | install -m 644 ${UNPACKDIR}/snort.service ${D}/${systemd_system_unitdir} |
85 | # Install default environment file | 85 | # Install default environment file |
86 | install -d ${D}/${sysconfdir}/default | 86 | install -d ${D}/${sysconfdir}/default |
87 | install -m 0644 ${WORKDIR}/snort.default ${D}${sysconfdir}/default/snort | 87 | install -m 0644 ${UNPACKDIR}/snort.default ${D}${sysconfdir}/default/snort |
88 | fi | 88 | fi |
89 | install -d ${D}${sysconfdir}/default/volatiles | 89 | install -d ${D}${sysconfdir}/default/volatiles |
90 | install -m 0644 ${WORKDIR}/volatiles.99_snort ${D}${sysconfdir}/default/volatiles/99_snort | 90 | install -m 0644 ${UNPACKDIR}/volatiles.99_snort ${D}${sysconfdir}/default/volatiles/99_snort |
91 | 91 | ||
92 | sed -i -e 's|-ffile-prefix-map[^ ]*||g; s|-fdebug-prefix-map[^ ]*||g; s|-fmacro-prefix-map[^ ]*||g; s|${STAGING_DIR_TARGET}||g' ${D}${libdir}/pkgconfig/*.pc | 92 | sed -i -e 's|-ffile-prefix-map[^ ]*||g; s|-fdebug-prefix-map[^ ]*||g; s|-fmacro-prefix-map[^ ]*||g; s|${STAGING_DIR_TARGET}||g' ${D}${libdir}/pkgconfig/*.pc |
93 | } | 93 | } |
diff --git a/meta-networking/recipes-connectivity/tayga/tayga_0.9.2.bb b/meta-networking/recipes-connectivity/tayga/tayga_0.9.2.bb index 36d35e6de..f6b58559d 100644 --- a/meta-networking/recipes-connectivity/tayga/tayga_0.9.2.bb +++ b/meta-networking/recipes-connectivity/tayga/tayga_0.9.2.bb | |||
@@ -13,9 +13,9 @@ SYSTEMD_PACKAGES = "${PN}" | |||
13 | SYSTEMD_SERVICE:${PN} = "tayga.service" | 13 | SYSTEMD_SERVICE:${PN} = "tayga.service" |
14 | 14 | ||
15 | do_install:append() { | 15 | do_install:append() { |
16 | install -m 0644 ${WORKDIR}/tayga.conf ${D}${sysconfdir}/tayga.conf | 16 | install -m 0644 ${UNPACKDIR}/tayga.conf ${D}${sysconfdir}/tayga.conf |
17 | install -d ${D}${systemd_unitdir}/system/ | 17 | install -d ${D}${systemd_unitdir}/system/ |
18 | install -m 0644 ${WORKDIR}/tayga.service ${D}${systemd_unitdir}/system/ | 18 | install -m 0644 ${UNPACKDIR}/tayga.service ${D}${systemd_unitdir}/system/ |
19 | } | 19 | } |
20 | 20 | ||
21 | inherit autotools systemd | 21 | inherit autotools systemd |
diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb b/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb index fe9c038f5..5876b5827 100644 --- a/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb +++ b/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb | |||
@@ -38,14 +38,14 @@ inherit perlnative pkgconfig | |||
38 | do_configure:append () { | 38 | do_configure:append () { |
39 | # Make sure we use our nativeperl wrapper | 39 | # Make sure we use our nativeperl wrapper |
40 | sed -i "1s:#!.*:#!/usr/bin/env nativeperl:" ${S}/*.pl | 40 | sed -i "1s:#!.*:#!/usr/bin/env nativeperl:" ${S}/*.pl |
41 | cp ${WORKDIR}/long-help ${S} | 41 | cp ${UNPACKDIR}/long-help ${S} |
42 | } | 42 | } |
43 | 43 | ||
44 | do_install () { | 44 | do_install () { |
45 | sed -i s:m600:m\ 600:g Makefile | 45 | sed -i s:m600:m\ 600:g Makefile |
46 | oe_runmake 'DESTDIR=${D}' 'PREFIX=/usr' install | 46 | oe_runmake 'DESTDIR=${D}' 'PREFIX=/usr' install |
47 | rm -f ${D}${sysconfdir}/vpnc/vpnc.conf #This file is useless | 47 | rm -f ${D}${sysconfdir}/vpnc/vpnc.conf #This file is useless |
48 | install ${WORKDIR}/default.conf ${D}${sysconfdir}/vpnc/default.conf | 48 | install ${UNPACKDIR}/default.conf ${D}${sysconfdir}/vpnc/default.conf |
49 | } | 49 | } |
50 | 50 | ||
51 | SYSROOT_PREPROCESS_FUNCS += "vpnc_sysroot_preprocess" | 51 | SYSROOT_PREPROCESS_FUNCS += "vpnc_sysroot_preprocess" |
diff --git a/meta-networking/recipes-daemons/atftp/atftp_0.8.0.bb b/meta-networking/recipes-daemons/atftp/atftp_0.8.0.bb index 507621795..41b7cf087 100644 --- a/meta-networking/recipes-daemons/atftp/atftp_0.8.0.bb +++ b/meta-networking/recipes-daemons/atftp/atftp_0.8.0.bb | |||
@@ -29,14 +29,14 @@ EXTRA_OEMAKE = "CFLAGS='${CFLAGS} -std=gnu89'" | |||
29 | 29 | ||
30 | do_install:append() { | 30 | do_install:append() { |
31 | install -d ${D}${sysconfdir}/init.d | 31 | install -d ${D}${sysconfdir}/init.d |
32 | install -m 0755 ${WORKDIR}/atftpd.init ${D}${sysconfdir}/init.d/atftpd | 32 | install -m 0755 ${UNPACKDIR}/atftpd.init ${D}${sysconfdir}/init.d/atftpd |
33 | 33 | ||
34 | install -d ${D}/srv/tftp | 34 | install -d ${D}/srv/tftp |
35 | 35 | ||
36 | rm ${D}${sbindir}/in.tftpd | 36 | rm ${D}${sbindir}/in.tftpd |
37 | 37 | ||
38 | install -d ${D}${systemd_unitdir}/system | 38 | install -d ${D}${systemd_unitdir}/system |
39 | install -m 0644 ${WORKDIR}/atftpd.service ${D}${systemd_unitdir}/system | 39 | install -m 0644 ${UNPACKDIR}/atftpd.service ${D}${systemd_unitdir}/system |
40 | } | 40 | } |
41 | 41 | ||
42 | PACKAGES =+ "${PN}d" | 42 | PACKAGES =+ "${PN}d" |
diff --git a/meta-networking/recipes-daemons/ippool/ippool_1.3.bb b/meta-networking/recipes-daemons/ippool/ippool_1.3.bb index 36ea28994..7947ffe45 100644 --- a/meta-networking/recipes-daemons/ippool/ippool_1.3.bb +++ b/meta-networking/recipes-daemons/ippool/ippool_1.3.bb | |||
@@ -65,14 +65,14 @@ do_install() { | |||
65 | oe_runmake DESTDIR=${D} install | 65 | oe_runmake DESTDIR=${D} install |
66 | 66 | ||
67 | install -D -m 0755 ${S}/debian/init.d ${D}${sysconfdir}/init.d/ippoold | 67 | install -D -m 0755 ${S}/debian/init.d ${D}${sysconfdir}/init.d/ippoold |
68 | install -D -m 0644 ${WORKDIR}/ippool.service ${D}${systemd_system_unitdir}/ippool.service | 68 | install -D -m 0644 ${UNPACKDIR}/ippool.service ${D}${systemd_system_unitdir}/ippool.service |
69 | sed -i -e 's:@SBINDIR@:${sbindir}:g' ${D}${systemd_system_unitdir}/ippool.service | 69 | sed -i -e 's:@SBINDIR@:${sbindir}:g' ${D}${systemd_system_unitdir}/ippool.service |
70 | 70 | ||
71 | # install self test | 71 | # install self test |
72 | install -d ${D}/opt/${BPN} | 72 | install -d ${D}/opt/${BPN} |
73 | install ${S}/test/all.tcl ${S}/test/ippool.test \ | 73 | install ${S}/test/all.tcl ${S}/test/ippool.test \ |
74 | ${S}/test/test_procs.tcl ${D}/opt/${BPN} | 74 | ${S}/test/test_procs.tcl ${D}/opt/${BPN} |
75 | install ${WORKDIR}/runtest.sh ${D}/opt/${BPN} | 75 | install ${UNPACKDIR}/runtest.sh ${D}/opt/${BPN} |
76 | # fix the ../ippoolconfig in test_procs.tcl | 76 | # fix the ../ippoolconfig in test_procs.tcl |
77 | sed -i -e "s:../ippoolconfig:ippoolconfig:" \ | 77 | sed -i -e "s:../ippoolconfig:ippoolconfig:" \ |
78 | ${D}/opt/${BPN}/test_procs.tcl | 78 | ${D}/opt/${BPN}/test_procs.tcl |
diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.8.bb b/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.10.bb index 2caddbb54..6a272775f 100644 --- a/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.8.bb +++ b/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.10.bb | |||
@@ -12,7 +12,7 @@ DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d) | |||
12 | 12 | ||
13 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | 13 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" |
14 | 14 | ||
15 | SRCREV = "543ba0f15d340b97f30782308cec424a6738fec3" | 15 | SRCREV = "d0f04ae4b9bf0bc0be55fbda5f235afdfbf5dd19" |
16 | 16 | ||
17 | SRC_URI = "git://github.com/open-iscsi/open-iscsi;branch=master;protocol=https \ | 17 | SRC_URI = "git://github.com/open-iscsi/open-iscsi;branch=master;protocol=https \ |
18 | file://0001-Makefile-Do-not-set-Werror.patch \ | 18 | file://0001-Makefile-Do-not-set-Werror.patch \ |
@@ -78,7 +78,7 @@ do_install () { | |||
78 | cp -dR ${S}/libopeniscsiusr/libopeniscsiusr.so* ${D}${libdir} | 78 | cp -dR ${S}/libopeniscsiusr/libopeniscsiusr.so* ${D}${libdir} |
79 | install -p -m 644 ${S}/doc/iscsiadm.8 ${S}/doc/iscsid.8 ${D}/${mandir}/man8 | 79 | install -p -m 644 ${S}/doc/iscsiadm.8 ${S}/doc/iscsid.8 ${D}/${mandir}/man8 |
80 | install -p -m 644 ${S}/etc/iscsid.conf ${D}${sysconfdir}/iscsi | 80 | install -p -m 644 ${S}/etc/iscsid.conf ${D}${sysconfdir}/iscsi |
81 | install -p -m 755 ${WORKDIR}/initd.debian ${D}${sysconfdir}/init.d/iscsid | 81 | install -p -m 755 ${UNPACKDIR}/initd.debian ${D}${sysconfdir}/init.d/iscsid |
82 | 82 | ||
83 | sed -i -e "s:= /sbin/iscsid:= ${sbindir}/iscsid:" ${D}${sysconfdir}/iscsi/iscsid.conf | 83 | sed -i -e "s:= /sbin/iscsid:= ${sbindir}/iscsid:" ${D}${sysconfdir}/iscsi/iscsid.conf |
84 | 84 | ||
@@ -87,17 +87,17 @@ do_install () { | |||
87 | echo "d /run/${BPN}/lock - - - -" \ | 87 | echo "d /run/${BPN}/lock - - - -" \ |
88 | > ${D}${sysconfdir}/tmpfiles.d/iscsi.conf | 88 | > ${D}${sysconfdir}/tmpfiles.d/iscsi.conf |
89 | install -d ${D}/etc/default/ | 89 | install -d ${D}/etc/default/ |
90 | install -p -m 755 ${WORKDIR}/iscsi-initiator ${D}${sysconfdir}/default/ | 90 | install -p -m 755 ${UNPACKDIR}/iscsi-initiator ${D}${sysconfdir}/default/ |
91 | 91 | ||
92 | install -d ${D}${systemd_unitdir}/system/ | 92 | install -d ${D}${systemd_unitdir}/system/ |
93 | install -m 0644 ${WORKDIR}/iscsi-initiator.service \ | 93 | install -m 0644 ${UNPACKDIR}/iscsi-initiator.service \ |
94 | ${WORKDIR}/iscsi-initiator-targets.service \ | 94 | ${UNPACKDIR}/iscsi-initiator-targets.service \ |
95 | ${D}${systemd_unitdir}/system/ | 95 | ${D}${systemd_unitdir}/system/ |
96 | install -d ${D}${nonarch_libdir}/iscsi | 96 | install -d ${D}${nonarch_libdir}/iscsi |
97 | install -m 0755 ${WORKDIR}/set_initiatorname ${D}${nonarch_libdir}/iscsi | 97 | install -m 0755 ${UNPACKDIR}/set_initiatorname ${D}${nonarch_libdir}/iscsi |
98 | else | 98 | else |
99 | install -d ${D}/etc/default/volatiles | 99 | install -d ${D}/etc/default/volatiles |
100 | install -m 0644 ${WORKDIR}/99_iscsi-initiator-utils ${D}/etc/default/volatiles | 100 | install -m 0644 ${UNPACKDIR}/99_iscsi-initiator-utils ${D}/etc/default/volatiles |
101 | fi | 101 | fi |
102 | } | 102 | } |
103 | 103 | ||
diff --git a/meta-networking/recipes-daemons/lldpd/lldpd_1.0.18.bb b/meta-networking/recipes-daemons/lldpd/lldpd_1.0.18.bb index 370465e14..4deab153c 100644 --- a/meta-networking/recipes-daemons/lldpd/lldpd_1.0.18.bb +++ b/meta-networking/recipes-daemons/lldpd/lldpd_1.0.18.bb | |||
@@ -48,8 +48,8 @@ INITSCRIPT_PARAMS = "defaults" | |||
48 | SYSTEMD_SERVICE:${PN} = "lldpd.service" | 48 | SYSTEMD_SERVICE:${PN} = "lldpd.service" |
49 | 49 | ||
50 | do_install:append() { | 50 | do_install:append() { |
51 | install -Dm 0755 ${WORKDIR}/lldpd.init.d ${D}${sysconfdir}/init.d/lldpd | 51 | install -Dm 0755 ${UNPACKDIR}/lldpd.init.d ${D}${sysconfdir}/init.d/lldpd |
52 | install -Dm 0644 ${WORKDIR}/lldpd.default ${D}${sysconfdir}/default/lldpd | 52 | install -Dm 0644 ${UNPACKDIR}/lldpd.default ${D}${sysconfdir}/default/lldpd |
53 | # Make an empty configuration file | 53 | # Make an empty configuration file |
54 | touch ${D}${sysconfdir}/lldpd.conf | 54 | touch ${D}${sysconfdir}/lldpd.conf |
55 | } | 55 | } |
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 f0f7eb5df..7f06e0ebf 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 | |||
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d" | |||
8 | 8 | ||
9 | inherit features_check systemd | 9 | inherit features_check systemd |
10 | 10 | ||
11 | RDEPENDS:${PN} = "python3-pygobject python3-dbus" | 11 | RDEPENDS:${PN} = "python3-pygobject python3-dbus python3-json" |
12 | REQUIRED_DISTRO_FEATURES = "systemd gobject-introspection-data" | 12 | REQUIRED_DISTRO_FEATURES = "systemd gobject-introspection-data" |
13 | 13 | ||
14 | SRCREV = "dfd26d72793914eb3da910ef8c71de6d7c8942a2" | 14 | SRCREV = "dfd26d72793914eb3da910ef8c71de6d7c8942a2" |
diff --git a/meta-networking/recipes-daemons/openhpi/openhpi_3.8.0.bb b/meta-networking/recipes-daemons/openhpi/openhpi_3.8.0.bb index 32c4783cf..ac13d7a19 100644 --- a/meta-networking/recipes-daemons/openhpi/openhpi_3.8.0.bb +++ b/meta-networking/recipes-daemons/openhpi/openhpi_3.8.0.bb | |||
@@ -75,10 +75,10 @@ do_install:append () { | |||
75 | install -m 0600 ${S}/openhpi.conf.example ${D}${sysconfdir}/${BPN}/openhpi.conf | 75 | install -m 0600 ${S}/openhpi.conf.example ${D}${sysconfdir}/${BPN}/openhpi.conf |
76 | install -m 0644 ${S}/simulation.data.example ${D}${sysconfdir}/${BPN}/simulation.data | 76 | install -m 0644 ${S}/simulation.data.example ${D}${sysconfdir}/${BPN}/simulation.data |
77 | install -m 0644 ${S}/test_agent.data.example ${D}${sysconfdir}/${BPN}/test_agent.data | 77 | install -m 0644 ${S}/test_agent.data.example ${D}${sysconfdir}/${BPN}/test_agent.data |
78 | install -m 0755 ${WORKDIR}/openhpi.init ${D}${sysconfdir}/init.d/openhpid | 78 | install -m 0755 ${UNPACKDIR}/openhpi.init ${D}${sysconfdir}/init.d/openhpid |
79 | 79 | ||
80 | install -d ${D}${systemd_unitdir}/system | 80 | install -d ${D}${systemd_unitdir}/system |
81 | install -m 0644 ${WORKDIR}/openhpid.service ${D}${systemd_unitdir}/system | 81 | install -m 0644 ${UNPACKDIR}/openhpid.service ${D}${systemd_unitdir}/system |
82 | sed -i -e "s,@SBINDIR@,${sbindir},g" -e "s,@SYSCONFDIR@,${sysconfdir},g" \ | 82 | sed -i -e "s,@SBINDIR@,${sbindir},g" -e "s,@SYSCONFDIR@,${sysconfdir},g" \ |
83 | ${D}${systemd_unitdir}/system/openhpid.service | 83 | ${D}${systemd_unitdir}/system/openhpid.service |
84 | } | 84 | } |
diff --git a/meta-networking/recipes-daemons/postfix/postfix_3.8.6.bb b/meta-networking/recipes-daemons/postfix/postfix_3.8.6.bb index 3ec7f22ad..d48e9145f 100644 --- a/meta-networking/recipes-daemons/postfix/postfix_3.8.6.bb +++ b/meta-networking/recipes-daemons/postfix/postfix_3.8.6.bb | |||
@@ -136,21 +136,21 @@ do_install () { | |||
136 | mv ${D}${sysconfdir}/postfix/main.cf ${D}${sysconfdir}/postfix/${MLPREFIX}sample-main.cf | 136 | mv ${D}${sysconfdir}/postfix/main.cf ${D}${sysconfdir}/postfix/${MLPREFIX}sample-main.cf |
137 | install -m 755 ${S}/bin/smtp-sink ${D}/${sbindir}/ | 137 | install -m 755 ${S}/bin/smtp-sink ${D}/${sbindir}/ |
138 | install -d ${D}${sysconfdir}/init.d | 138 | install -d ${D}${sysconfdir}/init.d |
139 | install -m 644 ${WORKDIR}/main.cf ${D}${sysconfdir}/postfix/main.cf | 139 | install -m 644 ${UNPACKDIR}/main.cf ${D}${sysconfdir}/postfix/main.cf |
140 | sed -i 's#@LIBEXECDIR@#${libexecdir}#' ${D}${sysconfdir}/postfix/main.cf | 140 | sed -i 's#@LIBEXECDIR@#${libexecdir}#' ${D}${sysconfdir}/postfix/main.cf |
141 | 141 | ||
142 | install -m 755 ${WORKDIR}/check_hostname.sh ${D}${sbindir}/ | 142 | install -m 755 ${UNPACKDIR}/check_hostname.sh ${D}${sbindir}/ |
143 | 143 | ||
144 | install -m 755 ${WORKDIR}/postfix ${D}${sysconfdir}/init.d/postfix | 144 | install -m 755 ${UNPACKDIR}/postfix ${D}${sysconfdir}/init.d/postfix |
145 | install -m 644 ${WORKDIR}/internal_recipient ${D}${sysconfdir}/postfix/internal_recipient | 145 | install -m 644 ${UNPACKDIR}/internal_recipient ${D}${sysconfdir}/postfix/internal_recipient |
146 | 146 | ||
147 | install -d ${D}${systemd_unitdir}/system | 147 | install -d ${D}${systemd_unitdir}/system |
148 | install -m 0644 ${WORKDIR}/postfix.service ${D}${systemd_unitdir}/system | 148 | install -m 0644 ${UNPACKDIR}/postfix.service ${D}${systemd_unitdir}/system |
149 | sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}${systemd_unitdir}/system/postfix.service | 149 | sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}${systemd_unitdir}/system/postfix.service |
150 | sed -i -e 's#@LOCALSTATEDIR@#${localstatedir}#g' ${D}${systemd_unitdir}/system/postfix.service | 150 | sed -i -e 's#@LOCALSTATEDIR@#${localstatedir}#g' ${D}${systemd_unitdir}/system/postfix.service |
151 | sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/postfix.service | 151 | sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/postfix.service |
152 | 152 | ||
153 | install -m 0755 ${WORKDIR}/aliasesdb ${D}${libexecdir}/postfix | 153 | install -m 0755 ${UNPACKDIR}/aliasesdb ${D}${libexecdir}/postfix |
154 | 154 | ||
155 | install -m 770 -d ${D}${localstatedir}/spool/postfix | 155 | install -m 770 -d ${D}${localstatedir}/spool/postfix |
156 | chown postfix:postfix ${D}${localstatedir}/spool/postfix | 156 | chown postfix:postfix ${D}${localstatedir}/spool/postfix |
diff --git a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.7c.bb b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.7c.bb index ecd277724..aa8d5fabd 100644 --- a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.7c.bb +++ b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.7c.bb | |||
@@ -82,14 +82,14 @@ do_install () { | |||
82 | sed -i '/ *User[ \t]*/s/ftp/${FTPUSER}/' ${D}${sysconfdir}/proftpd.conf | 82 | sed -i '/ *User[ \t]*/s/ftp/${FTPUSER}/' ${D}${sysconfdir}/proftpd.conf |
83 | sed -i '/ *Group[ \t]*/s/ftp/${FTPGROUP}/' ${D}${sysconfdir}/proftpd.conf | 83 | sed -i '/ *Group[ \t]*/s/ftp/${FTPGROUP}/' ${D}${sysconfdir}/proftpd.conf |
84 | install -d ${D}${sysconfdir}/init.d | 84 | install -d ${D}${sysconfdir}/init.d |
85 | install -m 0755 ${WORKDIR}/proftpd-basic.init ${D}${sysconfdir}/init.d/proftpd | 85 | install -m 0755 ${UNPACKDIR}/proftpd-basic.init ${D}${sysconfdir}/init.d/proftpd |
86 | sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/proftpd | 86 | sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/proftpd |
87 | sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/proftpd | 87 | sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/proftpd |
88 | sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/proftpd | 88 | sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/proftpd |
89 | sed -i 's!^PATH=.*!PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}${sysconfdir}/init.d/proftpd | 89 | sed -i 's!^PATH=.*!PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}${sysconfdir}/init.d/proftpd |
90 | 90 | ||
91 | install -d ${D}${sysconfdir}/default | 91 | install -d ${D}${sysconfdir}/default |
92 | install -m 0755 ${WORKDIR}/default ${D}${sysconfdir}/default/proftpd | 92 | install -m 0755 ${UNPACKDIR}/default ${D}${sysconfdir}/default/proftpd |
93 | 93 | ||
94 | # create the pub directory | 94 | # create the pub directory |
95 | mkdir -p ${D}/home/${FTPUSER}/pub/ | 95 | mkdir -p ${D}/home/${FTPUSER}/pub/ |
@@ -105,7 +105,7 @@ do_install () { | |||
105 | fi | 105 | fi |
106 | 106 | ||
107 | install -d ${D}/${systemd_unitdir}/system | 107 | install -d ${D}/${systemd_unitdir}/system |
108 | install -m 644 ${WORKDIR}/proftpd.service ${D}/${systemd_unitdir}/system | 108 | install -m 644 ${UNPACKDIR}/proftpd.service ${D}/${systemd_unitdir}/system |
109 | sed -e 's,@BASE_SBINDIR@,${base_sbindir},g' \ | 109 | sed -e 's,@BASE_SBINDIR@,${base_sbindir},g' \ |
110 | -e 's,@SYSCONFDIR@,${sysconfdir},g' \ | 110 | -e 's,@SYSCONFDIR@,${sysconfdir},g' \ |
111 | -e 's,@SBINDIR@,${sbindir},g' \ | 111 | -e 's,@SBINDIR@,${sbindir},g' \ |
diff --git a/meta-networking/recipes-daemons/ptpd/ptpd_2.3.1.bb b/meta-networking/recipes-daemons/ptpd/ptpd_2.3.1.bb index d1eb6e28f..f2c300855 100644 --- a/meta-networking/recipes-daemons/ptpd/ptpd_2.3.1.bb +++ b/meta-networking/recipes-daemons/ptpd/ptpd_2.3.1.bb | |||
@@ -47,13 +47,13 @@ do_install() { | |||
47 | 47 | ||
48 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then | 48 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then |
49 | install -d ${D}${systemd_unitdir}/system | 49 | install -d ${D}${systemd_unitdir}/system |
50 | install -m 0644 ${WORKDIR}/ptpd.service ${D}${systemd_unitdir}/system | 50 | install -m 0644 ${UNPACKDIR}/ptpd.service ${D}${systemd_unitdir}/system |
51 | 51 | ||
52 | sed -i -e 's#@SYSCONFDIR@#${sysconfdir}#g' ${D}${systemd_unitdir}/system/ptpd.service | 52 | sed -i -e 's#@SYSCONFDIR@#${sysconfdir}#g' ${D}${systemd_unitdir}/system/ptpd.service |
53 | sed -i -e 's#@BINDIR@#${bindir}#g' ${D}${systemd_unitdir}/system/ptpd.service | 53 | sed -i -e 's#@BINDIR@#${bindir}#g' ${D}${systemd_unitdir}/system/ptpd.service |
54 | 54 | ||
55 | install -d ${D}${sysconfdir}/default/ | 55 | install -d ${D}${sysconfdir}/default/ |
56 | install -m 0644 ${WORKDIR}/ptpd.conf ${D}${sysconfdir}/default/ptpd | 56 | install -m 0644 ${UNPACKDIR}/ptpd.conf ${D}${sysconfdir}/default/ptpd |
57 | fi | 57 | fi |
58 | } | 58 | } |
59 | 59 | ||
diff --git a/meta-networking/recipes-daemons/radvd/radvd_2.19.bb b/meta-networking/recipes-daemons/radvd/radvd_2.19.bb index a9b5f7942..a8a116cbe 100644 --- a/meta-networking/recipes-daemons/radvd/radvd_2.19.bb +++ b/meta-networking/recipes-daemons/radvd/radvd_2.19.bb | |||
@@ -34,30 +34,30 @@ do_install:append () { | |||
34 | ${D}${sysconfdir}/default/volatiles \ | 34 | ${D}${sysconfdir}/default/volatiles \ |
35 | ${D}${docdir}/radvd | 35 | ${D}${docdir}/radvd |
36 | # Install init script and volatiles | 36 | # Install init script and volatiles |
37 | install -m 0755 ${WORKDIR}/radvd.init ${D}${sysconfdir}/init.d/radvd | 37 | install -m 0755 ${UNPACKDIR}/radvd.init ${D}${sysconfdir}/init.d/radvd |
38 | sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/radvd | 38 | sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/radvd |
39 | sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/radvd | 39 | sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/radvd |
40 | sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/radvd | 40 | sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/radvd |
41 | sed -i 's!^PATH=.*!PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}${sysconfdir}/init.d/radvd | 41 | sed -i 's!^PATH=.*!PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}${sysconfdir}/init.d/radvd |
42 | 42 | ||
43 | install -m 0644 ${WORKDIR}/volatiles.03_radvd ${D}${sysconfdir}/default/volatiles/03_radvd | 43 | install -m 0644 ${UNPACKDIR}/volatiles.03_radvd ${D}${sysconfdir}/default/volatiles/03_radvd |
44 | 44 | ||
45 | # Install systemd service files | 45 | # Install systemd service files |
46 | install -d ${D}${systemd_unitdir}/system | 46 | install -d ${D}${systemd_unitdir}/system |
47 | install -m 0644 ${WORKDIR}/radvd.service ${D}${systemd_unitdir}/system | 47 | install -m 0644 ${UNPACKDIR}/radvd.service ${D}${systemd_unitdir}/system |
48 | sed -i -e 's#@SYSCONFDIR@#${sysconfdir}#g' \ | 48 | sed -i -e 's#@SYSCONFDIR@#${sysconfdir}#g' \ |
49 | -e 's#@SBINDIR@#${sbindir}#g' \ | 49 | -e 's#@SBINDIR@#${sbindir}#g' \ |
50 | -e 's#@BASE_BINDIR@#${base_bindir}#g' ${D}${systemd_unitdir}/system/radvd.service | 50 | -e 's#@BASE_BINDIR@#${base_bindir}#g' ${D}${systemd_unitdir}/system/radvd.service |
51 | 51 | ||
52 | # Install default environment file | 52 | # Install default environment file |
53 | install -m 0644 ${WORKDIR}/radvd.default ${D}${sysconfdir}/default/radvd | 53 | install -m 0644 ${UNPACKDIR}/radvd.default ${D}${sysconfdir}/default/radvd |
54 | 54 | ||
55 | # Documentation | 55 | # Documentation |
56 | for i in radvd.conf.example README; do \ | 56 | for i in radvd.conf.example README; do \ |
57 | install -m 0644 ${S}/$i ${D}${docdir}/radvd; \ | 57 | install -m 0644 ${S}/$i ${D}${docdir}/radvd; \ |
58 | done | 58 | done |
59 | 59 | ||
60 | install -m 0644 ${WORKDIR}/radvd.conf ${D}${sysconfdir}/radvd.conf | 60 | install -m 0644 ${UNPACKDIR}/radvd.conf ${D}${sysconfdir}/radvd.conf |
61 | } | 61 | } |
62 | 62 | ||
63 | USERADD_PACKAGES = "${PN}" | 63 | USERADD_PACKAGES = "${PN}" |
diff --git a/meta-networking/recipes-daemons/squid/squid_6.9.bb b/meta-networking/recipes-daemons/squid/squid_6.9.bb index f0663a5e0..f670a776e 100644 --- a/meta-networking/recipes-daemons/squid/squid_6.9.bb +++ b/meta-networking/recipes-daemons/squid/squid_6.9.bb | |||
@@ -68,6 +68,11 @@ EXTRA_OECONF += "--with-default-user=squid \ | |||
68 | --with-logdir=${localstatedir}/log/${BPN} \ | 68 | --with-logdir=${localstatedir}/log/${BPN} \ |
69 | 'PERL=${USRBINPATH}/env perl'" | 69 | 'PERL=${USRBINPATH}/env perl'" |
70 | 70 | ||
71 | # Workaround a build failure when using a native compiler that need -std=c++17 | ||
72 | # with a cross-compiler that doesn't. | ||
73 | # Upstream issue closed as invalid : https://bugs.squid-cache.org/show_bug.cgi?id=5376 | ||
74 | BUILD_CXXFLAGS += "-std=c++17" | ||
75 | |||
71 | export BUILDCXXFLAGS="${BUILD_CXXFLAGS}" | 76 | export BUILDCXXFLAGS="${BUILD_CXXFLAGS}" |
72 | 77 | ||
73 | TESTDIR = "test-suite" | 78 | TESTDIR = "test-suite" |
@@ -117,7 +122,7 @@ do_install:append() { | |||
117 | fi | 122 | fi |
118 | 123 | ||
119 | install -d ${D}${sysconfdir}/default/volatiles | 124 | install -d ${D}${sysconfdir}/default/volatiles |
120 | install -m 0644 ${WORKDIR}/volatiles.03_squid ${D}${sysconfdir}/default/volatiles/03_squid | 125 | install -m 0644 ${UNPACKDIR}/volatiles.03_squid ${D}${sysconfdir}/default/volatiles/03_squid |
121 | 126 | ||
122 | rmdir "${D}${localstatedir}/run/${BPN}" | 127 | rmdir "${D}${localstatedir}/run/${BPN}" |
123 | rmdir --ignore-fail-on-non-empty "${D}${localstatedir}/run" | 128 | rmdir --ignore-fail-on-non-empty "${D}${localstatedir}/run" |
@@ -127,7 +132,7 @@ do_install:append() { | |||
127 | 132 | ||
128 | # Install NetworkManager dispatcher reload hooks | 133 | # Install NetworkManager dispatcher reload hooks |
129 | install -d ${D}${libdir}/NetworkManager/dispatcher.d | 134 | install -d ${D}${libdir}/NetworkManager/dispatcher.d |
130 | install -m 0755 ${WORKDIR}/squid.nm ${D}${libdir}/NetworkManager/dispatcher.d/20-squid | 135 | install -m 0755 ${UNPACKDIR}/squid.nm ${D}${libdir}/NetworkManager/dispatcher.d/20-squid |
131 | } | 136 | } |
132 | 137 | ||
133 | SYSTEMD_AUTO_ENABLE = "disable" | 138 | SYSTEMD_AUTO_ENABLE = "disable" |
diff --git a/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb b/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb index 565f493ce..b5a2b9dae 100644 --- a/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb +++ b/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb | |||
@@ -58,18 +58,18 @@ do_install() { | |||
58 | 58 | ||
59 | install -m 755 -d ${D}${localstatedir}/lib/tftpboot/ | 59 | install -m 755 -d ${D}${localstatedir}/lib/tftpboot/ |
60 | install -d ${D}${sysconfdir}/init.d | 60 | install -d ${D}${sysconfdir}/init.d |
61 | install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/tftpd-hpa | 61 | install -m 0755 ${UNPACKDIR}/init ${D}${sysconfdir}/init.d/tftpd-hpa |
62 | sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/tftpd-hpa | 62 | sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/tftpd-hpa |
63 | sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/tftpd-hpa | 63 | sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/tftpd-hpa |
64 | sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/tftpd-hpa | 64 | sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/tftpd-hpa |
65 | sed -i 's!^PATH=.*!PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}${sysconfdir}/init.d/tftpd-hpa | 65 | sed -i 's!^PATH=.*!PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}${sysconfdir}/init.d/tftpd-hpa |
66 | 66 | ||
67 | install -d ${D}${sysconfdir}/default | 67 | install -d ${D}${sysconfdir}/default |
68 | install -m 0644 ${WORKDIR}/default ${D}${sysconfdir}/default/tftpd-hpa | 68 | install -m 0644 ${UNPACKDIR}/default ${D}${sysconfdir}/default/tftpd-hpa |
69 | 69 | ||
70 | install -d ${D}${systemd_unitdir}/system | 70 | install -d ${D}${systemd_unitdir}/system |
71 | install -m 0644 ${WORKDIR}/tftpd-hpa.socket ${D}${systemd_unitdir}/system | 71 | install -m 0644 ${UNPACKDIR}/tftpd-hpa.socket ${D}${systemd_unitdir}/system |
72 | install -m 0644 ${WORKDIR}/tftpd-hpa.service ${D}${systemd_unitdir}/system | 72 | install -m 0644 ${UNPACKDIR}/tftpd-hpa.service ${D}${systemd_unitdir}/system |
73 | sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/tftpd-hpa.service | 73 | sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/tftpd-hpa.service |
74 | } | 74 | } |
75 | 75 | ||
diff --git a/meta-networking/recipes-daemons/vblade/vblade_25.bb b/meta-networking/recipes-daemons/vblade/vblade_25.bb index 7c37fc167..7f20e927c 100644 --- a/meta-networking/recipes-daemons/vblade/vblade_25.bb +++ b/meta-networking/recipes-daemons/vblade/vblade_25.bb | |||
@@ -27,22 +27,22 @@ do_install() { | |||
27 | install -D -m 0755 ${S}/vbladed ${D}/${sbindir}/vbladed | 27 | install -D -m 0755 ${S}/vbladed ${D}/${sbindir}/vbladed |
28 | install -D -m 0644 ${S}/vblade.8 ${D}/${mandir}/man8/vblade.8 | 28 | install -D -m 0644 ${S}/vblade.8 ${D}/${mandir}/man8/vblade.8 |
29 | 29 | ||
30 | install -D -m 0644 ${WORKDIR}/${BPN}.conf ${D}/${sysconfdir}/${BPN}.conf | 30 | install -D -m 0644 ${UNPACKDIR}/${BPN}.conf ${D}/${sysconfdir}/${BPN}.conf |
31 | install -D -m 0755 ${WORKDIR}/${BPN}.init ${D}/${sysconfdir}/init.d/${BPN} | 31 | install -D -m 0755 ${UNPACKDIR}/${BPN}.init ${D}/${sysconfdir}/init.d/${BPN} |
32 | 32 | ||
33 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then | 33 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then |
34 | install -d ${D}/${sysconfdir}/default/volatiles | 34 | install -d ${D}/${sysconfdir}/default/volatiles |
35 | install -m 0755 ${WORKDIR}/volatiles.99_vblade ${D}/${sysconfdir}/default/volatiles/99_vblade | 35 | install -m 0755 ${UNPACKDIR}/volatiles.99_vblade ${D}/${sysconfdir}/default/volatiles/99_vblade |
36 | fi | 36 | fi |
37 | 37 | ||
38 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then | 38 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then |
39 | install -d ${D}/${bindir} | 39 | install -d ${D}/${bindir} |
40 | install -m 0755 ${WORKDIR}/${BPN}.init ${D}/${bindir}/ | 40 | install -m 0755 ${UNPACKDIR}/${BPN}.init ${D}/${bindir}/ |
41 | install -d ${D}${sysconfdir}/tmpfiles.d | 41 | install -d ${D}${sysconfdir}/tmpfiles.d |
42 | echo "d /var/run/${BPN} 0755 root root -" > ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf | 42 | echo "d /var/run/${BPN} 0755 root root -" > ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf |
43 | 43 | ||
44 | install -d ${D}${systemd_system_unitdir} | 44 | install -d ${D}${systemd_system_unitdir} |
45 | install -m 0644 ${WORKDIR}/vblade.service ${D}${systemd_system_unitdir} | 45 | install -m 0644 ${UNPACKDIR}/vblade.service ${D}${systemd_system_unitdir} |
46 | sed -e 's,@BINDIR@,${bindir},g' -i ${D}${systemd_system_unitdir}/*.service | 46 | sed -e 's,@BINDIR@,${bindir},g' -i ${D}${systemd_system_unitdir}/*.service |
47 | fi | 47 | fi |
48 | 48 | ||
diff --git a/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.5.bb b/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.5.bb index 0ae52c8dd..4a843bd80 100644 --- a/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.5.bb +++ b/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.5.bb | |||
@@ -65,14 +65,14 @@ do_install() { | |||
65 | install -d ${D}${mandir}/man5 | 65 | install -d ${D}${mandir}/man5 |
66 | oe_runmake 'DESTDIR=${D}' install | 66 | oe_runmake 'DESTDIR=${D}' install |
67 | install -d ${D}${sysconfdir} | 67 | install -d ${D}${sysconfdir} |
68 | install -m 600 ${WORKDIR}/vsftpd.conf ${D}${sysconfdir}/vsftpd.conf | 68 | install -m 600 ${UNPACKDIR}/vsftpd.conf ${D}${sysconfdir}/vsftpd.conf |
69 | install -d ${D}${sysconfdir}/init.d/ | 69 | install -d ${D}${sysconfdir}/init.d/ |
70 | install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/vsftpd | 70 | install -m 755 ${UNPACKDIR}/init ${D}${sysconfdir}/init.d/vsftpd |
71 | install -d ${D}/${sysconfdir}/default/volatiles | 71 | install -d ${D}/${sysconfdir}/default/volatiles |
72 | install -m 644 ${WORKDIR}/volatiles.99_vsftpd ${D}/${sysconfdir}/default/volatiles/99_vsftpd | 72 | install -m 644 ${UNPACKDIR}/volatiles.99_vsftpd ${D}/${sysconfdir}/default/volatiles/99_vsftpd |
73 | 73 | ||
74 | install -m 600 ${WORKDIR}/vsftpd.ftpusers ${D}${sysconfdir}/ | 74 | install -m 600 ${UNPACKDIR}/vsftpd.ftpusers ${D}${sysconfdir}/ |
75 | install -m 600 ${WORKDIR}/vsftpd.user_list ${D}${sysconfdir}/ | 75 | install -m 600 ${UNPACKDIR}/vsftpd.user_list ${D}${sysconfdir}/ |
76 | if ! test -z "${PAMLIB}" ; then | 76 | if ! test -z "${PAMLIB}" ; then |
77 | install -d ${D}${sysconfdir}/pam.d/ | 77 | install -d ${D}${sysconfdir}/pam.d/ |
78 | cp ${S}/RedHat/vsftpd.pam ${D}${sysconfdir}/pam.d/vsftpd | 78 | cp ${S}/RedHat/vsftpd.pam ${D}${sysconfdir}/pam.d/vsftpd |
@@ -87,7 +87,7 @@ do_install() { | |||
87 | 87 | ||
88 | # Install systemd unit files | 88 | # Install systemd unit files |
89 | install -d ${D}${systemd_unitdir}/system | 89 | install -d ${D}${systemd_unitdir}/system |
90 | install -m 0644 ${WORKDIR}/vsftpd.service ${D}${systemd_unitdir}/system | 90 | install -m 0644 ${UNPACKDIR}/vsftpd.service ${D}${systemd_unitdir}/system |
91 | sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/vsftpd.service | 91 | sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/vsftpd.service |
92 | } | 92 | } |
93 | 93 | ||
diff --git a/meta-networking/recipes-devtools/libcoap/libcoap_4.3.4.bb b/meta-networking/recipes-devtools/libcoap/libcoap_4.3.4.bb index 98f0f02fb..2f5d192a7 100644 --- a/meta-networking/recipes-devtools/libcoap/libcoap_4.3.4.bb +++ b/meta-networking/recipes-devtools/libcoap/libcoap_4.3.4.bb | |||
@@ -51,7 +51,7 @@ do_compile:prepend() { | |||
51 | 51 | ||
52 | do_install_ptest () { | 52 | do_install_ptest () { |
53 | install -d ${D}${PTEST_PATH} | 53 | install -d ${D}${PTEST_PATH} |
54 | install -m 0755 ${WORKDIR}/run-ptest ${D}${PTEST_PATH}/run-ptest | 54 | install -m 0755 ${UNPACKDIR}/run-ptest ${D}${PTEST_PATH}/run-ptest |
55 | install -m 0755 ${B}/tests/testdriver ${D}${PTEST_PATH}/testdriver | 55 | install -m 0755 ${B}/tests/testdriver ${D}${PTEST_PATH}/testdriver |
56 | } | 56 | } |
57 | 57 | ||
diff --git a/meta-networking/recipes-extended/corosync/corosync_3.1.6.bb b/meta-networking/recipes-extended/corosync/corosync_3.1.6.bb index 8fca57661..cbbbbc70c 100644 --- a/meta-networking/recipes-extended/corosync/corosync_3.1.6.bb +++ b/meta-networking/recipes-extended/corosync/corosync_3.1.6.bb | |||
@@ -40,7 +40,7 @@ EXTRA_OEMAKE = "tmpfilesdir_DATA=" | |||
40 | #} | 40 | #} |
41 | 41 | ||
42 | do_install:append() { | 42 | do_install:append() { |
43 | install -D -m 0644 ${WORKDIR}/corosync.conf ${D}${sysconfdir}/corosync/corosync.conf.example | 43 | install -D -m 0644 ${UNPACKDIR}/corosync.conf ${D}${sysconfdir}/corosync/corosync.conf.example |
44 | install -d ${D}${sysconfdir}/sysconfig/ | 44 | install -d ${D}${sysconfdir}/sysconfig/ |
45 | install -m 0644 ${S}/init/corosync.sysconfig.example ${D}${sysconfdir}/sysconfig/corosync | 45 | install -m 0644 ${S}/init/corosync.sysconfig.example ${D}${sysconfdir}/sysconfig/corosync |
46 | install -m 0644 ${S}/tools/corosync-notifyd.sysconfig.example ${D}${sysconfdir}/sysconfig/corosync-notifyd | 46 | install -m 0644 ${S}/tools/corosync-notifyd.sysconfig.example ${D}${sysconfdir}/sysconfig/corosync-notifyd |
diff --git a/meta-networking/recipes-extended/tgt/tgt_1.0.90.bb b/meta-networking/recipes-extended/tgt/tgt_1.0.90.bb index 35995f787..e816b79e8 100644 --- a/meta-networking/recipes-extended/tgt/tgt_1.0.90.bb +++ b/meta-networking/recipes-extended/tgt/tgt_1.0.90.bb | |||
@@ -39,12 +39,12 @@ do_install() { | |||
39 | 39 | ||
40 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then | 40 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then |
41 | install -d ${D}${sysconfdir}/init.d | 41 | install -d ${D}${sysconfdir}/init.d |
42 | install -m 0755 ${WORKDIR}/tgtd.init ${D}${sysconfdir}/init.d/tgtd | 42 | install -m 0755 ${UNPACKDIR}/tgtd.init ${D}${sysconfdir}/init.d/tgtd |
43 | elif ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then | 43 | elif ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then |
44 | install -d ${D}${systemd_unitdir}/system | 44 | install -d ${D}${systemd_unitdir}/system |
45 | install -m 0644 ${WORKDIR}/tgtd.service ${D}${systemd_unitdir}/system/tgtd.service | 45 | install -m 0644 ${UNPACKDIR}/tgtd.service ${D}${systemd_unitdir}/system/tgtd.service |
46 | install -d ${D}${sysconfdir}/sysconfig | 46 | install -d ${D}${sysconfdir}/sysconfig |
47 | install -m 0644 ${WORKDIR}/tgtd ${D}${sysconfdir}/sysconfig/tgtd | 47 | install -m 0644 ${UNPACKDIR}/tgtd ${D}${sysconfdir}/sysconfig/tgtd |
48 | sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/tgtd.service | 48 | sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/tgtd.service |
49 | sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' ${D}${systemd_unitdir}/system/tgtd.service | 49 | sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' ${D}${systemd_unitdir}/system/tgtd.service |
50 | sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/tgtd.service | 50 | sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/tgtd.service |
diff --git a/meta-networking/recipes-filter/arno-iptables-firewall/arno-iptables-firewall_2.1.1.bb b/meta-networking/recipes-filter/arno-iptables-firewall/arno-iptables-firewall_2.1.2.bb index e124fd290..940454c3a 100644 --- a/meta-networking/recipes-filter/arno-iptables-firewall/arno-iptables-firewall_2.1.1.bb +++ b/meta-networking/recipes-filter/arno-iptables-firewall/arno-iptables-firewall_2.1.2.bb | |||
@@ -4,7 +4,7 @@ HOMEPAGE = "http://rocky.eld.leidenuniv.nl/joomla/index.php?option=com_content&v | |||
4 | LICENSE = "GPL-2.0-only" | 4 | LICENSE = "GPL-2.0-only" |
5 | LIC_FILES_CHKSUM = "file://gpl_license.txt;md5=11c7b65c4a4acb9d5175f7e9bf99c403" | 5 | LIC_FILES_CHKSUM = "file://gpl_license.txt;md5=11c7b65c4a4acb9d5175f7e9bf99c403" |
6 | 6 | ||
7 | SRCREV = "a96b81da4a9b619e4045805f5f13a1e982c95663" | 7 | SRCREV = "c8dfd85b9e8e453e279525f30c1e3184c092f036" |
8 | SRC_URI = "git://github.com/arno-iptables-firewall/aif;branch=master;protocol=https" | 8 | SRC_URI = "git://github.com/arno-iptables-firewall/aif;branch=master;protocol=https" |
9 | 9 | ||
10 | S = "${WORKDIR}/git" | 10 | S = "${WORKDIR}/git" |
diff --git a/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.8.bb b/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.8.bb index 07e01845d..524718d56 100644 --- a/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.8.bb +++ b/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.8.bb | |||
@@ -34,8 +34,8 @@ do_install:append() { | |||
34 | install -d ${D}/${sysconfdir}/conntrackd | 34 | install -d ${D}/${sysconfdir}/conntrackd |
35 | install -d ${D}/${sysconfdir}/init.d | 35 | install -d ${D}/${sysconfdir}/init.d |
36 | install -m 0644 ${S}/doc/sync/ftfw/conntrackd.conf ${D}/${sysconfdir}/conntrackd/conntrackd.conf.sample | 36 | install -m 0644 ${S}/doc/sync/ftfw/conntrackd.conf ${D}/${sysconfdir}/conntrackd/conntrackd.conf.sample |
37 | install -m 0755 ${WORKDIR}/conntrack-failover ${D}/${sysconfdir}/init.d/conntrack-failover | 37 | install -m 0755 ${UNPACKDIR}/conntrack-failover ${D}/${sysconfdir}/init.d/conntrack-failover |
38 | install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/conntrackd | 38 | install -m 0755 ${UNPACKDIR}/init ${D}/${sysconfdir}/init.d/conntrackd |
39 | 39 | ||
40 | # Fix hardcoded paths in scripts | 40 | # Fix hardcoded paths in scripts |
41 | sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}/${sysconfdir}/init.d/conntrack-failover ${D}/${sysconfdir}/init.d/conntrackd | 41 | sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}/${sysconfdir}/init.d/conntrack-failover ${D}/${sysconfdir}/init.d/conntrackd |
@@ -45,7 +45,7 @@ do_install:append() { | |||
45 | 45 | ||
46 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then | 46 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then |
47 | install -d ${D}/${systemd_system_unitdir} | 47 | install -d ${D}/${systemd_system_unitdir} |
48 | install -m 644 ${WORKDIR}/conntrackd.service ${D}/${systemd_system_unitdir} | 48 | install -m 644 ${UNPACKDIR}/conntrackd.service ${D}/${systemd_system_unitdir} |
49 | fi | 49 | fi |
50 | } | 50 | } |
51 | 51 | ||
diff --git a/meta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb b/meta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb index d522b514f..8918936e1 100644 --- a/meta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb +++ b/meta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb | |||
@@ -29,14 +29,14 @@ do_install:append () { | |||
29 | # Replace upstream ebtables-save perl script with Fedora bash based rewrite | 29 | # Replace upstream ebtables-save perl script with Fedora bash based rewrite |
30 | # http://pkgs.fedoraproject.org/cgit/rpms/ebtables.git/tree/ebtables-save | 30 | # http://pkgs.fedoraproject.org/cgit/rpms/ebtables.git/tree/ebtables-save |
31 | rm -f ${D}${sbindir}/ebtables-legacy-save | 31 | rm -f ${D}${sbindir}/ebtables-legacy-save |
32 | install -m 0755 ${WORKDIR}/ebtables-legacy-save ${D}${sbindir}/ebtables-legacy-save | 32 | install -m 0755 ${UNPACKDIR}/ebtables-legacy-save ${D}${sbindir}/ebtables-legacy-save |
33 | 33 | ||
34 | # Install systemd service files | 34 | # Install systemd service files |
35 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then | 35 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then |
36 | install -d ${D}${systemd_unitdir}/system | 36 | install -d ${D}${systemd_unitdir}/system |
37 | install -m 0644 ${WORKDIR}/ebtables.service ${D}${systemd_unitdir}/system | 37 | install -m 0644 ${UNPACKDIR}/ebtables.service ${D}${systemd_unitdir}/system |
38 | sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/ebtables.service | 38 | sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/ebtables.service |
39 | install -m 0755 ${WORKDIR}/ebtables.common ${D}${sbindir}/ebtables.common | 39 | install -m 0755 ${UNPACKDIR}/ebtables.common ${D}${sbindir}/ebtables.common |
40 | fi | 40 | fi |
41 | 41 | ||
42 | install -d ${D}${base_sbindir} | 42 | install -d ${D}${base_sbindir} |
diff --git a/meta-networking/recipes-filter/nftables/nftables_1.0.9.bb b/meta-networking/recipes-filter/nftables/nftables_1.0.9.bb index 771892274..17f00ffd4 100644 --- a/meta-networking/recipes-filter/nftables/nftables_1.0.9.bb +++ b/meta-networking/recipes-filter/nftables/nftables_1.0.9.bb | |||
@@ -35,9 +35,9 @@ EXTRA_OECONF = " \ | |||
35 | 35 | ||
36 | SETUPTOOLS_SETUP_PATH = "${S}/py" | 36 | SETUPTOOLS_SETUP_PATH = "${S}/py" |
37 | 37 | ||
38 | inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'setuptools3', '', d)} | 38 | inherit_defer ${@bb.utils.contains('PACKAGECONFIG', 'python', 'setuptools3', '', d)} |
39 | 39 | ||
40 | PACKAGES =+ "${PN}-python" | 40 | PACKAGES =+ "${@bb.utils.contains('PACKAGECONFIG', 'python', '${PN}-python', '', d)}" |
41 | FILES:${PN}-python = "${PYTHON_SITEPACKAGES_DIR}" | 41 | FILES:${PN}-python = "${PYTHON_SITEPACKAGES_DIR}" |
42 | RDEPENDS:${PN}-python = "python3-core python3-json ${PN}" | 42 | RDEPENDS:${PN}-python = "python3-core python3-json ${PN}" |
43 | 43 | ||
diff --git a/meta-networking/recipes-filter/ulogd2/ulogd2_2.0.8.bb b/meta-networking/recipes-filter/ulogd2/ulogd2_2.0.8.bb index d075ec478..635fa6a40 100644 --- a/meta-networking/recipes-filter/ulogd2/ulogd2_2.0.8.bb +++ b/meta-networking/recipes-filter/ulogd2/ulogd2_2.0.8.bb | |||
@@ -42,11 +42,11 @@ do_install:append () { | |||
42 | install -m 0644 ${S}/ulogd.8 ${D}${mandir}/man8/ulogd.8 | 42 | install -m 0644 ${S}/ulogd.8 ${D}${mandir}/man8/ulogd.8 |
43 | 43 | ||
44 | install -d ${D}${systemd_system_unitdir} | 44 | install -d ${D}${systemd_system_unitdir} |
45 | install -m 0644 ${WORKDIR}/ulogd.service ${D}${systemd_system_unitdir} | 45 | install -m 0644 ${UNPACKDIR}/ulogd.service ${D}${systemd_system_unitdir} |
46 | sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_system_unitdir}/ulogd.service | 46 | sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_system_unitdir}/ulogd.service |
47 | 47 | ||
48 | install -d ${D}${sysconfdir}/init.d | 48 | install -d ${D}${sysconfdir}/init.d |
49 | install -m 755 ${WORKDIR}/ulogd.init ${D}${sysconfdir}/init.d/ulogd | 49 | install -m 755 ${UNPACKDIR}/ulogd.init ${D}${sysconfdir}/init.d/ulogd |
50 | } | 50 | } |
51 | 51 | ||
52 | PACKAGES += "${PN}-plugins" | 52 | PACKAGES += "${PN}-plugins" |
diff --git a/meta-networking/recipes-protocols/freediameter/freediameter_1.5.0.bb b/meta-networking/recipes-protocols/freediameter/freediameter_1.5.0.bb index b3282d273..c7c329a5d 100644 --- a/meta-networking/recipes-protocols/freediameter/freediameter_1.5.0.bb +++ b/meta-networking/recipes-protocols/freediameter/freediameter_1.5.0.bb | |||
@@ -78,18 +78,18 @@ do_install:append() { | |||
78 | mv ${D}${sysconfdir}/${fd_pkgname}/freediameter.conf.sample \ | 78 | mv ${D}${sysconfdir}/${fd_pkgname}/freediameter.conf.sample \ |
79 | ${D}${sysconfdir}/${fd_pkgname}/freeDiameter.conf.sample | 79 | ${D}${sysconfdir}/${fd_pkgname}/freeDiameter.conf.sample |
80 | install -d ${D}${sysconfdir}/freeDiameter | 80 | install -d ${D}${sysconfdir}/freeDiameter |
81 | install ${WORKDIR}/freeDiameter.conf ${D}${sysconfdir}/${fd_pkgname}/freeDiameter.conf | 81 | install ${UNPACKDIR}/freeDiameter.conf ${D}${sysconfdir}/${fd_pkgname}/freeDiameter.conf |
82 | 82 | ||
83 | # install daemon init related files | 83 | # install daemon init related files |
84 | install -d -m 0755 ${D}${sysconfdir}/default | 84 | install -d -m 0755 ${D}${sysconfdir}/default |
85 | install -d -m 0755 ${D}${sysconfdir}/init.d | 85 | install -d -m 0755 ${D}${sysconfdir}/init.d |
86 | install -m 0644 ${S}/contrib/debian/freediameter-daemon.default \ | 86 | install -m 0644 ${S}/contrib/debian/freediameter-daemon.default \ |
87 | ${D}${sysconfdir}/default/${BPN} | 87 | ${D}${sysconfdir}/default/${BPN} |
88 | install -m 0755 ${WORKDIR}/freediameter.init ${D}${sysconfdir}/init.d/${BPN} | 88 | install -m 0755 ${UNPACKDIR}/freediameter.init ${D}${sysconfdir}/init.d/${BPN} |
89 | 89 | ||
90 | # install for systemd | 90 | # install for systemd |
91 | install -d ${D}${systemd_system_unitdir} | 91 | install -d ${D}${systemd_system_unitdir} |
92 | install -m 0644 ${WORKDIR}/freediameter.service ${D}${systemd_system_unitdir} | 92 | install -m 0644 ${UNPACKDIR}/freediameter.service ${D}${systemd_system_unitdir} |
93 | sed -i -e 's,@BINDIR@,${bindir},g' ${D}${systemd_system_unitdir}/*.service | 93 | sed -i -e 's,@BINDIR@,${bindir},g' ${D}${systemd_system_unitdir}/*.service |
94 | 94 | ||
95 | cat >> ${D}${sysconfdir}/freeDiameter/freeDiameter.conf <<EOF | 95 | cat >> ${D}${sysconfdir}/freeDiameter/freeDiameter.conf <<EOF |
@@ -108,14 +108,14 @@ EOF | |||
108 | openssl req -x509 -config ${STAGING_DIR_NATIVE}/etc/ssl/openssl.cnf -newkey rsa:4096 -sha256 -nodes -out ${D}${sysconfdir}/freeDiameter/${FD_PEM} -keyout ${D}${sysconfdir}/freeDiameter/${FD_KEY} -days 3650 -subj '/CN=${FD_HOSTNAME}.${FD_REALM}' | 108 | openssl req -x509 -config ${STAGING_DIR_NATIVE}/etc/ssl/openssl.cnf -newkey rsa:4096 -sha256 -nodes -out ${D}${sysconfdir}/freeDiameter/${FD_PEM} -keyout ${D}${sysconfdir}/freeDiameter/${FD_KEY} -days 3650 -subj '/CN=${FD_HOSTNAME}.${FD_REALM}' |
109 | openssl dhparam -out ${D}${sysconfdir}/freeDiameter/${FD_DH_PEM} 1024 | 109 | openssl dhparam -out ${D}${sysconfdir}/freeDiameter/${FD_DH_PEM} 1024 |
110 | 110 | ||
111 | find ${B} \( -name "*.c" -o -name "*.h" \) -exec sed -i -e 's#${WORKDIR}##g' {} \; | 111 | find ${B} \( -name "*.c" -o -name "*.h" \) -exec sed -i -e 's#${UNPACKDIR}##g' {} \; |
112 | } | 112 | } |
113 | 113 | ||
114 | do_install_ptest() { | 114 | do_install_ptest() { |
115 | mv ${D}${PTEST_PATH}-tests/* ${D}${PTEST_PATH}/ | 115 | mv ${D}${PTEST_PATH}-tests/* ${D}${PTEST_PATH}/ |
116 | rmdir ${D}${PTEST_PATH}-tests | 116 | rmdir ${D}${PTEST_PATH}-tests |
117 | install -m 0644 ${B}/tests/CTestTestfile.cmake ${D}${PTEST_PATH}/ | 117 | install -m 0644 ${B}/tests/CTestTestfile.cmake ${D}${PTEST_PATH}/ |
118 | sed -i -e 's#${WORKDIR}##g' ${D}${PTEST_PATH}/CTestTestfile.cmake | 118 | sed -i -e 's#${UNPACKDIR}##g' ${D}${PTEST_PATH}/CTestTestfile.cmake |
119 | sed -i "/^set_tests_properties/d" ${D}${PTEST_PATH}/CTestTestfile.cmake | 119 | sed -i "/^set_tests_properties/d" ${D}${PTEST_PATH}/CTestTestfile.cmake |
120 | } | 120 | } |
121 | 121 | ||
diff --git a/meta-networking/recipes-protocols/frr/frr_9.1.bb b/meta-networking/recipes-protocols/frr/frr_10.0.bb index eea6d62f5..bdc359667 100644 --- a/meta-networking/recipes-protocols/frr/frr_9.1.bb +++ b/meta-networking/recipes-protocols/frr/frr_10.0.bb | |||
@@ -10,12 +10,12 @@ 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/9.1 \ | 13 | SRC_URI = "git://github.com/FRRouting/frr.git;protocol=https;branch=stable/10.0 \ |
14 | file://frr.pam \ | 14 | file://frr.pam \ |
15 | file://0001-zebra-Mimic-GNU-basename-API-for-non-glibc-library-e.patch \ | 15 | file://0001-zebra-Mimic-GNU-basename-API-for-non-glibc-library-e.patch \ |
16 | " | 16 | " |
17 | 17 | ||
18 | SRCREV = "ca2d6f0f1e000951224a18973cc1827f7f5215b5" | 18 | SRCREV = "03a143cd49ed1b190cb38f48a31ef4d71fa01a02" |
19 | 19 | ||
20 | UPSTREAM_CHECK_GITTAGREGEX = "frr-(?P<pver>\d+(\.\d+)+)$" | 20 | UPSTREAM_CHECK_GITTAGREGEX = "frr-(?P<pver>\d+(\.\d+)+)$" |
21 | 21 | ||
@@ -104,7 +104,7 @@ do_install:append:class-target () { | |||
104 | 104 | ||
105 | if ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'true', 'false', d)}; then | 105 | if ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'true', 'false', d)}; then |
106 | install -d ${D}/${sysconfdir}/pam.d | 106 | install -d ${D}/${sysconfdir}/pam.d |
107 | install -m 644 ${WORKDIR}/frr.pam ${D}/${sysconfdir}/pam.d/frr | 107 | install -m 644 ${UNPACKDIR}/frr.pam ${D}/${sysconfdir}/pam.d/frr |
108 | fi | 108 | fi |
109 | 109 | ||
110 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then | 110 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then |
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0001-Create-subroutine-for-cleaning-recent-interfaces.patch b/meta-networking/recipes-protocols/mdns/mdns/0001-Create-subroutine-for-cleaning-recent-interfaces.patch index f5d424d58..68a395d69 100644 --- a/meta-networking/recipes-protocols/mdns/mdns/0001-Create-subroutine-for-cleaning-recent-interfaces.patch +++ b/meta-networking/recipes-protocols/mdns/mdns/0001-Create-subroutine-for-cleaning-recent-interfaces.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From c1f3e19d3cb0aa948248616eb1684a1e80aa39b4 Mon Sep 17 00:00:00 2001 | 1 | From 1fefe289d0c907392382eb2fa2f1f0ecac02f85d Mon Sep 17 00:00:00 2001 |
2 | From: Nate Karstens <nate.karstens@garmin.com> | 2 | From: Nate Karstens <nate.karstens@garmin.com> |
3 | Date: Wed, 28 Jun 2017 17:30:00 -0500 | 3 | Date: Wed, 28 Jun 2017 17:30:00 -0500 |
4 | Subject: [PATCH 1/8] Create subroutine for cleaning recent interfaces | 4 | Subject: [PATCH] Create subroutine for cleaning recent interfaces |
5 | 5 | ||
6 | Moves functionality for cleaning the list of recent | 6 | Moves functionality for cleaning the list of recent |
7 | interfaces into its own subroutine. | 7 | interfaces into its own subroutine. |
@@ -14,11 +14,11 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | |||
14 | mDNSPosix/mDNSPosix.c | 24 ++++++++++++++---------- | 14 | mDNSPosix/mDNSPosix.c | 24 ++++++++++++++---------- |
15 | 1 file changed, 14 insertions(+), 10 deletions(-) | 15 | 1 file changed, 14 insertions(+), 10 deletions(-) |
16 | 16 | ||
17 | Index: mDNSResponder/mDNSPosix/mDNSPosix.c | 17 | diff --git a/mDNSPosix/mDNSPosix.c b/mDNSPosix/mDNSPosix.c |
18 | =================================================================== | 18 | index 3b761d04e3c4..5aa220cf694e 100644 |
19 | --- mDNSResponder.orig/mDNSPosix/mDNSPosix.c | 19 | --- a/mDNSPosix/mDNSPosix.c |
20 | +++ mDNSResponder/mDNSPosix/mDNSPosix.c | 20 | +++ b/mDNSPosix/mDNSPosix.c |
21 | @@ -1322,6 +1322,19 @@ mDNSlocal int SetupSocket(struct sockadd | 21 | @@ -1322,6 +1322,19 @@ mDNSlocal int SetupSocket(struct sockaddr *intfAddr, mDNSIPPort port, int interf |
22 | return err; | 22 | return err; |
23 | } | 23 | } |
24 | 24 | ||
@@ -38,7 +38,7 @@ Index: mDNSResponder/mDNSPosix/mDNSPosix.c | |||
38 | // Creates a PosixNetworkInterface for the interface whose IP address is | 38 | // Creates a PosixNetworkInterface for the interface whose IP address is |
39 | // intfAddr and whose name is intfName and registers it with mDNS core. | 39 | // intfAddr and whose name is intfName and registers it with mDNS core. |
40 | mDNSlocal int SetupOneInterface(mDNS *const m, struct sockaddr *intfAddr, struct sockaddr *intfMask, | 40 | mDNSlocal int SetupOneInterface(mDNS *const m, struct sockaddr *intfAddr, struct sockaddr *intfMask, |
41 | @@ -1559,16 +1572,7 @@ mDNSlocal int SetupInterfaceList(mDNS *c | 41 | @@ -1559,16 +1572,7 @@ mDNSlocal int SetupInterfaceList(mDNS *const m) |
42 | 42 | ||
43 | // Clean up. | 43 | // Clean up. |
44 | if (intfList != NULL) freeifaddrs(intfList); | 44 | if (intfList != NULL) freeifaddrs(intfList); |
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0001-Fix-SIGSEGV-during-DumpStateLog.patch b/meta-networking/recipes-protocols/mdns/mdns/0001-Fix-SIGSEGV-during-DumpStateLog.patch index 4b0227f1d..abf82b1e0 100644 --- a/meta-networking/recipes-protocols/mdns/mdns/0001-Fix-SIGSEGV-during-DumpStateLog.patch +++ b/meta-networking/recipes-protocols/mdns/mdns/0001-Fix-SIGSEGV-during-DumpStateLog.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 14cc53bb09a3d8adf301f3842c765598467e63e1 Mon Sep 17 00:00:00 2001 | 1 | From 2db1f5bc941e4b4cd1721e361a47cfe288b07a76 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: Thu, 1 Feb 2024 14:07:03 +0000 | 3 | Date: Thu, 1 Feb 2024 14:07:03 +0000 |
4 | Subject: [PATCH] Fix SIGSEGV during DumpStateLog() | 4 | Subject: [PATCH] Fix SIGSEGV during DumpStateLog() |
@@ -25,6 +25,3 @@ index 7a4ca19eff6d..d449dde320f6 100644 | |||
25 | { | 25 | { |
26 | return; | 26 | return; |
27 | } | 27 | } |
28 | -- | ||
29 | 2.39.0 | ||
30 | |||
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0001-Handle-interface-without-ifa_addr.patch b/meta-networking/recipes-protocols/mdns/mdns/0001-Handle-interface-without-ifa_addr.patch index 7e76f07c0..7ec599601 100644 --- a/meta-networking/recipes-protocols/mdns/mdns/0001-Handle-interface-without-ifa_addr.patch +++ b/meta-networking/recipes-protocols/mdns/mdns/0001-Handle-interface-without-ifa_addr.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 1cc54320306e07c1fc0eed98e7fbcbb07a2f3b28 Mon Sep 17 00:00:00 2001 | 1 | From c67102307f25c5f4d238c736e90519e56a76ae79 Mon Sep 17 00:00:00 2001 |
2 | From: Stefan Agner <stefan@agner.ch> | 2 | From: Stefan Agner <stefan@agner.ch> |
3 | Date: Fri, 23 Jun 2023 10:10:00 +0200 | 3 | Date: Fri, 23 Jun 2023 10:10:00 +0200 |
4 | Subject: [PATCH] Handle interface without `ifa_addr` | 4 | Subject: [PATCH] Handle interface without `ifa_addr` |
@@ -14,11 +14,11 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | |||
14 | mDNSPosix/mDNSPosix.c | 4 +++- | 14 | mDNSPosix/mDNSPosix.c | 4 +++- |
15 | 1 file changed, 3 insertions(+), 1 deletion(-) | 15 | 1 file changed, 3 insertions(+), 1 deletion(-) |
16 | 16 | ||
17 | Index: mDNSResponder/mDNSPosix/mDNSPosix.c | 17 | diff --git a/mDNSPosix/mDNSPosix.c b/mDNSPosix/mDNSPosix.c |
18 | =================================================================== | 18 | index 0c9dd2582660..c3ead26799e6 100644 |
19 | --- mDNSResponder.orig/mDNSPosix/mDNSPosix.c | 19 | --- a/mDNSPosix/mDNSPosix.c |
20 | +++ mDNSResponder/mDNSPosix/mDNSPosix.c | 20 | +++ b/mDNSPosix/mDNSPosix.c |
21 | @@ -1895,6 +1895,7 @@ mDNSlocal void InterfaceChangeCallback(i | 21 | @@ -1895,6 +1895,7 @@ mDNSlocal void InterfaceChangeCallback(int fd, void *context) |
22 | continue; | 22 | continue; |
23 | 23 | ||
24 | if ((ifa_loop4 == NULL) && | 24 | if ((ifa_loop4 == NULL) && |
@@ -26,7 +26,7 @@ Index: mDNSResponder/mDNSPosix/mDNSPosix.c | |||
26 | ((*ifi)->ifa_addr->sa_family == AF_INET) && | 26 | ((*ifi)->ifa_addr->sa_family == AF_INET) && |
27 | ((*ifi)->ifa_flags & IFF_UP) && | 27 | ((*ifi)->ifa_flags & IFF_UP) && |
28 | ((*ifi)->ifa_flags & IFF_LOOPBACK)) | 28 | ((*ifi)->ifa_flags & IFF_LOOPBACK)) |
29 | @@ -1903,7 +1904,8 @@ mDNSlocal void InterfaceChangeCallback(i | 29 | @@ -1903,7 +1904,8 @@ mDNSlocal void InterfaceChangeCallback(int fd, void *context) |
30 | continue; | 30 | continue; |
31 | } | 31 | } |
32 | 32 | ||
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 82825b294..0dc36ae1d 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,7 +1,7 @@ | |||
1 | From cea342c10731cb1c8c8b52f03d55f9d15fc3b091 Mon Sep 17 00:00:00 2001 | 1 | From a5fe20fa00088683136a09a4da3c36d9b20fe1b9 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 1/6] dns-sd: Include missing headers | 4 | Subject: [PATCH] dns-sd: Include missing headers |
5 | 5 | ||
6 | Fixes build on Musl | 6 | Fixes build on Musl |
7 | 7 | ||
@@ -11,10 +11,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
11 | mDNSPosix/nss_mdns.c | 3 +++ | 11 | mDNSPosix/nss_mdns.c | 3 +++ |
12 | 1 file changed, 3 insertions(+) | 12 | 1 file changed, 3 insertions(+) |
13 | 13 | ||
14 | Index: mDNSResponder/mDNSPosix/nss_mdns.c | 14 | diff --git a/mDNSPosix/nss_mdns.c b/mDNSPosix/nss_mdns.c |
15 | =================================================================== | 15 | index afadb3c6c33b..84c312759463 100644 |
16 | --- mDNSResponder.orig/mDNSPosix/nss_mdns.c | 16 | --- a/mDNSPosix/nss_mdns.c |
17 | +++ mDNSResponder/mDNSPosix/nss_mdns.c | 17 | +++ b/mDNSPosix/nss_mdns.c |
18 | @@ -89,6 +89,9 @@ | 18 | @@ -89,6 +89,9 @@ |
19 | 19 | ||
20 | #include <dns_sd.h> | 20 | #include <dns_sd.h> |
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0002-Create-subroutine-for-tearing-down-an-interface.patch b/meta-networking/recipes-protocols/mdns/mdns/0002-Create-subroutine-for-tearing-down-an-interface.patch index 867db88a5..5ce7eb101 100644 --- a/meta-networking/recipes-protocols/mdns/mdns/0002-Create-subroutine-for-tearing-down-an-interface.patch +++ b/meta-networking/recipes-protocols/mdns/mdns/0002-Create-subroutine-for-tearing-down-an-interface.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 40ef0241afbb49f84e76afd65eb3ee17466bb582 Mon Sep 17 00:00:00 2001 | 1 | From d265ac9346d3dcbcf1187134318baafcfa75c054 Mon Sep 17 00:00:00 2001 |
2 | From: Nate Karstens <nate.karstens@garmin.com> | 2 | From: Nate Karstens <nate.karstens@garmin.com> |
3 | Date: Wed, 28 Jun 2017 17:30:00 -0500 | 3 | Date: Wed, 28 Jun 2017 17:30:00 -0500 |
4 | Subject: [PATCH 2/8] Create subroutine for tearing down an interface | 4 | Subject: [PATCH] Create subroutine for tearing down an interface |
5 | 5 | ||
6 | Creates a subroutine for tearing down an interface. | 6 | Creates a subroutine for tearing down an interface. |
7 | 7 | ||
@@ -13,11 +13,11 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | |||
13 | mDNSPosix/mDNSPosix.c | 22 ++++++++++++++++------ | 13 | mDNSPosix/mDNSPosix.c | 22 ++++++++++++++++------ |
14 | 1 file changed, 16 insertions(+), 6 deletions(-) | 14 | 1 file changed, 16 insertions(+), 6 deletions(-) |
15 | 15 | ||
16 | Index: mDNSResponder/mDNSPosix/mDNSPosix.c | 16 | diff --git a/mDNSPosix/mDNSPosix.c b/mDNSPosix/mDNSPosix.c |
17 | =================================================================== | 17 | index 5aa220cf694e..a6041b04a21e 100644 |
18 | --- mDNSResponder.orig/mDNSPosix/mDNSPosix.c | 18 | --- a/mDNSPosix/mDNSPosix.c |
19 | +++ mDNSResponder/mDNSPosix/mDNSPosix.c | 19 | +++ b/mDNSPosix/mDNSPosix.c |
20 | @@ -1043,6 +1043,19 @@ mDNSlocal void FreePosixNetworkInterface | 20 | @@ -1043,6 +1043,19 @@ mDNSlocal void FreePosixNetworkInterface(PosixNetworkInterface *intf) |
21 | gRecentInterfaces = intf; | 21 | gRecentInterfaces = intf; |
22 | } | 22 | } |
23 | 23 | ||
@@ -37,7 +37,7 @@ Index: mDNSResponder/mDNSPosix/mDNSPosix.c | |||
37 | // Grab the first interface, deregister it, free it, and repeat until done. | 37 | // Grab the first interface, deregister it, free it, and repeat until done. |
38 | mDNSlocal void ClearInterfaceList(mDNS *const m) | 38 | mDNSlocal void ClearInterfaceList(mDNS *const m) |
39 | { | 39 | { |
40 | @@ -1051,13 +1064,10 @@ mDNSlocal void ClearInterfaceList(mDNS * | 40 | @@ -1051,13 +1064,10 @@ mDNSlocal void ClearInterfaceList(mDNS *const m) |
41 | while (m->HostInterfaces) | 41 | while (m->HostInterfaces) |
42 | { | 42 | { |
43 | PosixNetworkInterface *intf = (PosixNetworkInterface*)(m->HostInterfaces); | 43 | PosixNetworkInterface *intf = (PosixNetworkInterface*)(m->HostInterfaces); |
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 03fb1bc0d..86b659f8a 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,7 +1,7 @@ | |||
1 | From a198bcd457abd04f2e22812ff3a37246aa564614 Mon Sep 17 00:00:00 2001 | 1 | From dfa9e2c494d1a834f5bdfe4dc24e8329dd8720eb 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 2/6] make: Set libdns_sd.so soname correctly | 4 | Subject: [PATCH] make: Set libdns_sd.so soname correctly |
5 | 5 | ||
6 | Upstream-Status: Pending | 6 | Upstream-Status: Pending |
7 | Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | 7 | Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> |
@@ -9,11 +9,11 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | |||
9 | mDNSPosix/Makefile | 2 +- | 9 | mDNSPosix/Makefile | 2 +- |
10 | 1 file changed, 1 insertion(+), 1 deletion(-) | 10 | 1 file changed, 1 insertion(+), 1 deletion(-) |
11 | 11 | ||
12 | Index: mDNSResponder/mDNSPosix/Makefile | 12 | diff --git a/mDNSPosix/Makefile b/mDNSPosix/Makefile |
13 | =================================================================== | 13 | index 041706523139..c877c8bb19e6 100755 |
14 | --- mDNSResponder.orig/mDNSPosix/Makefile | 14 | --- a/mDNSPosix/Makefile |
15 | +++ mDNSResponder/mDNSPosix/Makefile | 15 | +++ b/mDNSPosix/Makefile |
16 | @@ -276,7 +276,7 @@ libdns_sd: setup $(BUILDDIR)/libdns_sd.$ | 16 | @@ -276,7 +276,7 @@ libdns_sd: setup $(BUILDDIR)/libdns_sd.$(LDSUFFIX) |
17 | CLIENTLIBOBJS = $(OBJDIR)/dnssd_clientlib.c.so.o $(OBJDIR)/dnssd_clientstub.c.so.o $(OBJDIR)/dnssd_ipc.c.so.o $(OBJDIR)/dnssd_errstring.c.so.o | 17 | CLIENTLIBOBJS = $(OBJDIR)/dnssd_clientlib.c.so.o $(OBJDIR)/dnssd_clientstub.c.so.o $(OBJDIR)/dnssd_ipc.c.so.o $(OBJDIR)/dnssd_errstring.c.so.o |
18 | 18 | ||
19 | $(BUILDDIR)/libdns_sd.$(LDSUFFIX): $(CLIENTLIBOBJS) | 19 | $(BUILDDIR)/libdns_sd.$(LDSUFFIX): $(CLIENTLIBOBJS) |
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0003-Track-interface-socket-family.patch b/meta-networking/recipes-protocols/mdns/mdns/0003-Track-interface-socket-family.patch index f1cda2b89..59871eb66 100644 --- a/meta-networking/recipes-protocols/mdns/mdns/0003-Track-interface-socket-family.patch +++ b/meta-networking/recipes-protocols/mdns/mdns/0003-Track-interface-socket-family.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From deb3a2c51f32e0d2741be11a492e727129f770e2 Mon Sep 17 00:00:00 2001 | 1 | From 5f58e5671cd6dbd4cb49bd30fb606d430b626361 Mon Sep 17 00:00:00 2001 |
2 | From: Nate Karstens <nate.karstens@garmin.com> | 2 | From: Nate Karstens <nate.karstens@garmin.com> |
3 | Date: Wed, 28 Jun 2017 17:30:00 -0500 | 3 | Date: Wed, 28 Jun 2017 17:30:00 -0500 |
4 | Subject: [PATCH 3/8] Track interface socket family | 4 | Subject: [PATCH] Track interface socket family |
5 | 5 | ||
6 | Tracks the socket family associated with the interface. | 6 | Tracks the socket family associated with the interface. |
7 | 7 | ||
@@ -14,11 +14,11 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | |||
14 | mDNSPosix/mDNSPosix.h | 2 ++ | 14 | mDNSPosix/mDNSPosix.h | 2 ++ |
15 | 2 files changed, 3 insertions(+) | 15 | 2 files changed, 3 insertions(+) |
16 | 16 | ||
17 | Index: mDNSResponder/mDNSPosix/mDNSPosix.c | 17 | diff --git a/mDNSPosix/mDNSPosix.c b/mDNSPosix/mDNSPosix.c |
18 | =================================================================== | 18 | index a6041b04a21e..15bbecee04a4 100644 |
19 | --- mDNSResponder.orig/mDNSPosix/mDNSPosix.c | 19 | --- a/mDNSPosix/mDNSPosix.c |
20 | +++ mDNSResponder/mDNSPosix/mDNSPosix.c | 20 | +++ b/mDNSPosix/mDNSPosix.c |
21 | @@ -1415,6 +1415,7 @@ mDNSlocal int SetupOneInterface(mDNS *co | 21 | @@ -1415,6 +1415,7 @@ mDNSlocal int SetupOneInterface(mDNS *const m, struct sockaddr *intfAddr, struct |
22 | // Set up the extra fields in PosixNetworkInterface. | 22 | // Set up the extra fields in PosixNetworkInterface. |
23 | assert(intf->intfName != NULL); // intf->intfName already set up above | 23 | assert(intf->intfName != NULL); // intf->intfName already set up above |
24 | intf->index = intfIndex; | 24 | intf->index = intfIndex; |
@@ -26,10 +26,10 @@ Index: mDNSResponder/mDNSPosix/mDNSPosix.c | |||
26 | intf->multicastSocket4 = -1; | 26 | intf->multicastSocket4 = -1; |
27 | #if HAVE_IPV6 | 27 | #if HAVE_IPV6 |
28 | intf->multicastSocket6 = -1; | 28 | intf->multicastSocket6 = -1; |
29 | Index: mDNSResponder/mDNSPosix/mDNSPosix.h | 29 | diff --git a/mDNSPosix/mDNSPosix.h b/mDNSPosix/mDNSPosix.h |
30 | =================================================================== | 30 | index 9675591b0434..dd7864cd0d5e 100644 |
31 | --- mDNSResponder.orig/mDNSPosix/mDNSPosix.h | 31 | --- a/mDNSPosix/mDNSPosix.h |
32 | +++ mDNSResponder/mDNSPosix/mDNSPosix.h | 32 | +++ b/mDNSPosix/mDNSPosix.h |
33 | @@ -19,6 +19,7 @@ | 33 | @@ -19,6 +19,7 @@ |
34 | #define __mDNSPlatformPosix_h | 34 | #define __mDNSPlatformPosix_h |
35 | 35 | ||
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0004-Indicate-loopback-interface-to-mDNS-core.patch b/meta-networking/recipes-protocols/mdns/mdns/0004-Indicate-loopback-interface-to-mDNS-core.patch index 6bc36456f..bf2b85c2a 100644 --- a/meta-networking/recipes-protocols/mdns/mdns/0004-Indicate-loopback-interface-to-mDNS-core.patch +++ b/meta-networking/recipes-protocols/mdns/mdns/0004-Indicate-loopback-interface-to-mDNS-core.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From beab76b5708862f44d9acbe7a92db45e2f99259f Mon Sep 17 00:00:00 2001 | 1 | From 935033dd40772240c9bcc6b9610d78eb3753bfaf Mon Sep 17 00:00:00 2001 |
2 | From: Nate Karstens <nate.karstens@garmin.com> | 2 | From: Nate Karstens <nate.karstens@garmin.com> |
3 | Date: Tue, 1 Aug 2017 17:06:01 -0500 | 3 | Date: Tue, 1 Aug 2017 17:06:01 -0500 |
4 | Subject: [PATCH 4/8] Indicate loopback interface to mDNS core | 4 | Subject: [PATCH] Indicate loopback interface to mDNS core |
5 | 5 | ||
6 | Tells the mDNS core if an interface is a loopback interface, | 6 | Tells the mDNS core if an interface is a loopback interface, |
7 | similar to AddInterfaceToList() in the MacOS implementation. | 7 | similar to AddInterfaceToList() in the MacOS implementation. |
@@ -14,11 +14,11 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | |||
14 | mDNSPosix/mDNSPosix.c | 7 ++++--- | 14 | mDNSPosix/mDNSPosix.c | 7 ++++--- |
15 | 1 file changed, 4 insertions(+), 3 deletions(-) | 15 | 1 file changed, 4 insertions(+), 3 deletions(-) |
16 | 16 | ||
17 | Index: mDNSResponder/mDNSPosix/mDNSPosix.c | 17 | diff --git a/mDNSPosix/mDNSPosix.c b/mDNSPosix/mDNSPosix.c |
18 | =================================================================== | 18 | index 15bbecee04a4..f4c31a07d587 100644 |
19 | --- mDNSResponder.orig/mDNSPosix/mDNSPosix.c | 19 | --- a/mDNSPosix/mDNSPosix.c |
20 | +++ mDNSResponder/mDNSPosix/mDNSPosix.c | 20 | +++ b/mDNSPosix/mDNSPosix.c |
21 | @@ -1348,7 +1348,7 @@ mDNSlocal void CleanRecentInterfaces(voi | 21 | @@ -1348,7 +1348,7 @@ mDNSlocal void CleanRecentInterfaces(void) |
22 | // Creates a PosixNetworkInterface for the interface whose IP address is | 22 | // Creates a PosixNetworkInterface for the interface whose IP address is |
23 | // intfAddr and whose name is intfName and registers it with mDNS core. | 23 | // intfAddr and whose name is intfName and registers it with mDNS core. |
24 | mDNSlocal int SetupOneInterface(mDNS *const m, struct sockaddr *intfAddr, struct sockaddr *intfMask, | 24 | mDNSlocal int SetupOneInterface(mDNS *const m, struct sockaddr *intfAddr, struct sockaddr *intfMask, |
@@ -27,7 +27,7 @@ Index: mDNSResponder/mDNSPosix/mDNSPosix.c | |||
27 | { | 27 | { |
28 | int err = 0; | 28 | int err = 0; |
29 | PosixNetworkInterface *intf; | 29 | PosixNetworkInterface *intf; |
30 | @@ -1411,6 +1411,7 @@ mDNSlocal int SetupOneInterface(mDNS *co | 30 | @@ -1411,6 +1411,7 @@ mDNSlocal int SetupOneInterface(mDNS *const m, struct sockaddr *intfAddr, struct |
31 | 31 | ||
32 | intf->coreIntf.Advertise = m->AdvertiseLocalAddresses; | 32 | intf->coreIntf.Advertise = m->AdvertiseLocalAddresses; |
33 | intf->coreIntf.McastTxRx = mDNStrue; | 33 | intf->coreIntf.McastTxRx = mDNStrue; |
@@ -35,7 +35,7 @@ Index: mDNSResponder/mDNSPosix/mDNSPosix.c | |||
35 | 35 | ||
36 | // Set up the extra fields in PosixNetworkInterface. | 36 | // Set up the extra fields in PosixNetworkInterface. |
37 | assert(intf->intfName != NULL); // intf->intfName already set up above | 37 | assert(intf->intfName != NULL); // intf->intfName already set up above |
38 | @@ -1561,7 +1562,7 @@ mDNSlocal int SetupInterfaceList(mDNS *c | 38 | @@ -1561,7 +1562,7 @@ mDNSlocal int SetupInterfaceList(mDNS *const m) |
39 | } | 39 | } |
40 | #endif | 40 | #endif |
41 | if (SetupOneInterface(m, i->ifa_addr, i->ifa_netmask, | 41 | if (SetupOneInterface(m, i->ifa_addr, i->ifa_netmask, |
@@ -44,7 +44,7 @@ Index: mDNSResponder/mDNSPosix/mDNSPosix.c | |||
44 | { | 44 | { |
45 | if (i->ifa_addr->sa_family == AF_INET) | 45 | if (i->ifa_addr->sa_family == AF_INET) |
46 | foundav4 = mDNStrue; | 46 | foundav4 = mDNStrue; |
47 | @@ -1578,7 +1579,7 @@ mDNSlocal int SetupInterfaceList(mDNS *c | 47 | @@ -1578,7 +1579,7 @@ mDNSlocal int SetupInterfaceList(mDNS *const m) |
48 | // if ((m->HostInterfaces == NULL) && (firstLoopback != NULL)) | 48 | // if ((m->HostInterfaces == NULL) && (firstLoopback != NULL)) |
49 | if (!foundav4 && firstLoopback) | 49 | if (!foundav4 && firstLoopback) |
50 | (void) SetupOneInterface(m, firstLoopback->ifa_addr, firstLoopback->ifa_netmask, | 50 | (void) SetupOneInterface(m, firstLoopback->ifa_addr, firstLoopback->ifa_netmask, |
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 837580ac3..8d1915de8 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,7 +1,7 @@ | |||
1 | From 22316f200803225f2d375ae5c36ffead59e2f6b8 Mon Sep 17 00:00:00 2001 | 1 | From f871ac42165c29f763785aa0199dfc76f1731f4d 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 4/6] make: Separate TLS targets from libraries | 4 | Subject: [PATCH] make: Separate TLS targets from libraries |
5 | 5 | ||
6 | There are dependencies on TLSOBJS, which fails when `-lmbedtls` is | 6 | There are dependencies on TLSOBJS, which fails when `-lmbedtls` is |
7 | listed as a dependency, so separate it out. | 7 | listed as a dependency, so separate it out. |
@@ -12,10 +12,10 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | |||
12 | mDNSPosix/Makefile | 14 ++++++++------ | 12 | mDNSPosix/Makefile | 14 ++++++++------ |
13 | 1 file changed, 8 insertions(+), 6 deletions(-) | 13 | 1 file changed, 8 insertions(+), 6 deletions(-) |
14 | 14 | ||
15 | Index: mDNSResponder/mDNSPosix/Makefile | 15 | diff --git a/mDNSPosix/Makefile b/mDNSPosix/Makefile |
16 | =================================================================== | 16 | index c877c8bb19e6..3a5897c4dbee 100755 |
17 | --- mDNSResponder.orig/mDNSPosix/Makefile | 17 | --- a/mDNSPosix/Makefile |
18 | +++ mDNSResponder/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) |
20 | ifeq ($(tls), no) | 20 | ifeq ($(tls), no) |
21 | CFLAGS_OS = -D_GNU_SOURCE -DHAVE_IPV6 -DNOT_HAVE_SA_LEN -DUSES_NETLINK -DHAVE_LINUX -DTARGET_OS_LINUX -ftabstop=4 -Wno-expansion-to-defined | 21 | CFLAGS_OS = -D_GNU_SOURCE -DHAVE_IPV6 -DNOT_HAVE_SA_LEN -DUSES_NETLINK -DHAVE_LINUX -DTARGET_OS_LINUX -ftabstop=4 -Wno-expansion-to-defined |
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0005-Use-list-for-changed-interfaces.patch b/meta-networking/recipes-protocols/mdns/mdns/0005-Use-list-for-changed-interfaces.patch index f00116c61..ebdfe8c78 100644 --- a/meta-networking/recipes-protocols/mdns/mdns/0005-Use-list-for-changed-interfaces.patch +++ b/meta-networking/recipes-protocols/mdns/mdns/0005-Use-list-for-changed-interfaces.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From e79f81f5cd626ad77ec64de4325f6645cf253c5e Mon Sep 17 00:00:00 2001 | 1 | From 47118760466b74939cec9f5233062236a12bb3f4 Mon Sep 17 00:00:00 2001 |
2 | From: Nate Karstens <nate.karstens@garmin.com> | 2 | From: Nate Karstens <nate.karstens@garmin.com> |
3 | Date: Thu, 13 Jul 2017 09:00:00 -0500 | 3 | Date: Thu, 13 Jul 2017 09:00:00 -0500 |
4 | Subject: [PATCH 5/8] Use list for changed interfaces | 4 | Subject: [PATCH] Use list for changed interfaces |
5 | 5 | ||
6 | Uses a linked list to store the index of changed network interfaces | 6 | Uses a linked list to store the index of changed network interfaces |
7 | instead of a bitfield. This allows for network interfaces with an | 7 | instead of a bitfield. This allows for network interfaces with an |
@@ -15,10 +15,10 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | |||
15 | mDNSPosix/mDNSPosix.c | 58 ++++++++++++++++++++++++++++++++----------- | 15 | mDNSPosix/mDNSPosix.c | 58 ++++++++++++++++++++++++++++++++----------- |
16 | 1 file changed, 43 insertions(+), 15 deletions(-) | 16 | 1 file changed, 43 insertions(+), 15 deletions(-) |
17 | 17 | ||
18 | Index: mDNSResponder/mDNSPosix/mDNSPosix.c | 18 | diff --git a/mDNSPosix/mDNSPosix.c b/mDNSPosix/mDNSPosix.c |
19 | =================================================================== | 19 | index f4c31a07d587..6b2fe76d4b66 100644 |
20 | --- mDNSResponder.orig/mDNSPosix/mDNSPosix.c | 20 | --- a/mDNSPosix/mDNSPosix.c |
21 | +++ mDNSResponder/mDNSPosix/mDNSPosix.c | 21 | +++ b/mDNSPosix/mDNSPosix.c |
22 | @@ -74,6 +74,14 @@ struct IfChangeRec | 22 | @@ -74,6 +74,14 @@ struct IfChangeRec |
23 | }; | 23 | }; |
24 | typedef struct IfChangeRec IfChangeRec; | 24 | typedef struct IfChangeRec IfChangeRec; |
@@ -34,7 +34,7 @@ Index: mDNSResponder/mDNSPosix/mDNSPosix.c | |||
34 | // Note that static data is initialized to zero in (modern) C. | 34 | // Note that static data is initialized to zero in (modern) C. |
35 | static PosixEventSource *gEventSources; // linked list of PosixEventSource's | 35 | static PosixEventSource *gEventSources; // linked list of PosixEventSource's |
36 | static sigset_t gEventSignalSet; // Signals which event loop listens for | 36 | static sigset_t gEventSignalSet; // Signals which event loop listens for |
37 | @@ -1621,6 +1629,23 @@ mDNSlocal mStatus OpenIfNotifySocket(int | 37 | @@ -1621,6 +1629,23 @@ mDNSlocal mStatus OpenIfNotifySocket(int *pFD) |
38 | return err; | 38 | return err; |
39 | } | 39 | } |
40 | 40 | ||
@@ -58,7 +58,7 @@ Index: mDNSResponder/mDNSPosix/mDNSPosix.c | |||
58 | #if MDNS_DEBUGMSGS | 58 | #if MDNS_DEBUGMSGS |
59 | mDNSlocal void PrintNetLinkMsg(const struct nlmsghdr *pNLMsg) | 59 | mDNSlocal void PrintNetLinkMsg(const struct nlmsghdr *pNLMsg) |
60 | { | 60 | { |
61 | @@ -1648,14 +1673,13 @@ mDNSlocal void PrintNetLinkMsg(cons | 61 | @@ -1648,14 +1673,13 @@ mDNSlocal void PrintNetLinkMsg(const struct nlmsghdr *pNLMsg) |
62 | } | 62 | } |
63 | #endif | 63 | #endif |
64 | 64 | ||
@@ -74,7 +74,7 @@ Index: mDNSResponder/mDNSPosix/mDNSPosix.c | |||
74 | 74 | ||
75 | // The structure here is more complex than it really ought to be because, | 75 | // The structure here is more complex than it really ought to be because, |
76 | // unfortunately, there's no good way to size a buffer in advance large | 76 | // unfortunately, there's no good way to size a buffer in advance large |
77 | @@ -1691,9 +1715,9 @@ mDNSlocal mDNSu32 ProcessRoutingNo | 77 | @@ -1691,9 +1715,9 @@ mDNSlocal mDNSu32 ProcessRoutingNotification(int sd) |
78 | 78 | ||
79 | // Process the NetLink message | 79 | // Process the NetLink message |
80 | if (pNLMsg->nlmsg_type == RTM_GETLINK || pNLMsg->nlmsg_type == RTM_NEWLINK) | 80 | if (pNLMsg->nlmsg_type == RTM_GETLINK || pNLMsg->nlmsg_type == RTM_NEWLINK) |
@@ -86,7 +86,7 @@ Index: mDNSResponder/mDNSPosix/mDNSPosix.c | |||
86 | 86 | ||
87 | // Advance pNLMsg to the next message in the buffer | 87 | // Advance pNLMsg to the next message in the buffer |
88 | if ((pNLMsg->nlmsg_flags & NLM_F_MULTI) != 0 && pNLMsg->nlmsg_type != NLMSG_DONE) | 88 | if ((pNLMsg->nlmsg_flags & NLM_F_MULTI) != 0 && pNLMsg->nlmsg_type != NLMSG_DONE) |
89 | @@ -1704,8 +1728,6 @@ mDNSlocal mDNSu32 ProcessRoutingNo | 89 | @@ -1704,8 +1728,6 @@ mDNSlocal mDNSu32 ProcessRoutingNotification(int sd) |
90 | else | 90 | else |
91 | break; // all done! | 91 | break; // all done! |
92 | } | 92 | } |
@@ -95,7 +95,7 @@ Index: mDNSResponder/mDNSPosix/mDNSPosix.c | |||
95 | } | 95 | } |
96 | 96 | ||
97 | #else // USES_NETLINK | 97 | #else // USES_NETLINK |
98 | @@ -1737,14 +1759,13 @@ mDNSlocal void PrintRoutingSocketMs | 98 | @@ -1737,14 +1759,13 @@ mDNSlocal void PrintRoutingSocketMsg(const struct ifa_msghdr *pRSMsg) |
99 | } | 99 | } |
100 | #endif | 100 | #endif |
101 | 101 | ||
@@ -111,7 +111,7 @@ Index: mDNSResponder/mDNSPosix/mDNSPosix.c | |||
111 | 111 | ||
112 | readCount = read(sd, buff, sizeof buff); | 112 | readCount = read(sd, buff, sizeof buff); |
113 | if (readCount < (ssize_t) sizeof(struct ifa_msghdr)) | 113 | if (readCount < (ssize_t) sizeof(struct ifa_msghdr)) |
114 | @@ -1759,12 +1780,10 @@ mDNSlocal mDNSu32 ProcessRoutingNo | 114 | @@ -1759,12 +1780,10 @@ mDNSlocal mDNSu32 ProcessRoutingNotification(int sd) |
115 | pRSMsg->ifam_type == RTM_IFINFO) | 115 | pRSMsg->ifam_type == RTM_IFINFO) |
116 | { | 116 | { |
117 | if (pRSMsg->ifam_type == RTM_IFINFO) | 117 | if (pRSMsg->ifam_type == RTM_IFINFO) |
@@ -126,7 +126,7 @@ Index: mDNSResponder/mDNSPosix/mDNSPosix.c | |||
126 | } | 126 | } |
127 | 127 | ||
128 | #endif // USES_NETLINK | 128 | #endif // USES_NETLINK |
129 | @@ -1774,7 +1793,8 @@ mDNSlocal void InterfaceChangeCallback(i | 129 | @@ -1774,7 +1793,8 @@ mDNSlocal void InterfaceChangeCallback(int fd, void *context) |
130 | { | 130 | { |
131 | IfChangeRec *pChgRec = (IfChangeRec*) context; | 131 | IfChangeRec *pChgRec = (IfChangeRec*) context; |
132 | fd_set readFDs; | 132 | fd_set readFDs; |
@@ -136,7 +136,7 @@ Index: mDNSResponder/mDNSPosix/mDNSPosix.c | |||
136 | struct timeval zeroTimeout = { 0, 0 }; | 136 | struct timeval zeroTimeout = { 0, 0 }; |
137 | 137 | ||
138 | (void)fd; // Unused | 138 | (void)fd; // Unused |
139 | @@ -1782,17 +1802,25 @@ mDNSlocal void InterfaceChangeCallback(i | 139 | @@ -1782,17 +1802,25 @@ mDNSlocal void InterfaceChangeCallback(int fd, void *context) |
140 | FD_ZERO(&readFDs); | 140 | FD_ZERO(&readFDs); |
141 | FD_SET(pChgRec->NotifySD, &readFDs); | 141 | FD_SET(pChgRec->NotifySD, &readFDs); |
142 | 142 | ||
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 fd2f2f117..3c46d599c 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,20 +1,19 @@ | |||
1 | From 764b6202402e9e5687ff873330e5ad6be6f69df7 Mon Sep 17 00:00:00 2001 | 1 | From 0b3953dfdeef8dc9b8a23820659feee9e15b5bad 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 |
5 | 5 | ||
6 | Upstream-Status: Pending | 6 | Upstream-Status: Pending |
7 | Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | 7 | Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> |
8 | |||
9 | --- | 8 | --- |
10 | mDNSCore/mDNS.c | 2 +- | 9 | mDNSCore/mDNS.c | 2 +- |
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | 10 | 1 file changed, 1 insertion(+), 1 deletion(-) |
12 | 11 | ||
13 | Index: mDNSResponder/mDNSCore/mDNS.c | 12 | diff --git a/mDNSCore/mDNS.c b/mDNSCore/mDNS.c |
14 | =================================================================== | 13 | index d4519a7f62aa..3090edb2ac5d 100644 |
15 | --- mDNSResponder.orig/mDNSCore/mDNS.c | 14 | --- a/mDNSCore/mDNS.c |
16 | +++ mDNSResponder/mDNSCore/mDNS.c | 15 | +++ b/mDNSCore/mDNS.c |
17 | @@ -10231,7 +10231,7 @@ mDNSlocal void mDNSCoreReceiveNoUnicastA | 16 | @@ -10253,7 +10253,7 @@ mDNSlocal void mDNSCoreReceiveNoUnicastAnswers(mDNS *const m, const DNSMessage * |
18 | #else | 17 | #else |
19 | const DNSServRef dnsserv = qptr->qDNSServer; | 18 | const DNSServRef dnsserv = qptr->qDNSServer; |
20 | #endif | 19 | #endif |
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0006-Handle-noisy-netlink-sockets.patch b/meta-networking/recipes-protocols/mdns/mdns/0006-Handle-noisy-netlink-sockets.patch index 80cdbca50..be63471e6 100644 --- a/meta-networking/recipes-protocols/mdns/mdns/0006-Handle-noisy-netlink-sockets.patch +++ b/meta-networking/recipes-protocols/mdns/mdns/0006-Handle-noisy-netlink-sockets.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From bfa1d68bed863e22c40a6d9a19ffbcc8694bbff6 Mon Sep 17 00:00:00 2001 | 1 | From 105514b75df6d7abd052ec64d8106f5c07cc4782 Mon Sep 17 00:00:00 2001 |
2 | From: Nate Karstens <nate.karstens@garmin.com> | 2 | From: Nate Karstens <nate.karstens@garmin.com> |
3 | Date: Mon, 24 Jul 2017 09:38:55 -0500 | 3 | Date: Mon, 24 Jul 2017 09:38:55 -0500 |
4 | Subject: [PATCH 6/8] Handle noisy netlink sockets | 4 | Subject: [PATCH] Handle noisy netlink sockets |
5 | 5 | ||
6 | The POSIX implementation currently clears all network interfaces | 6 | The POSIX implementation currently clears all network interfaces |
7 | when netlink indicates that there has been a change. This causes | 7 | when netlink indicates that there has been a change. This causes |
@@ -27,11 +27,11 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | |||
27 | mDNSPosix/mDNSPosix.c | 182 +++++++++++++++++++++++++++++++++++++++--- | 27 | mDNSPosix/mDNSPosix.c | 182 +++++++++++++++++++++++++++++++++++++++--- |
28 | 1 file changed, 172 insertions(+), 10 deletions(-) | 28 | 1 file changed, 172 insertions(+), 10 deletions(-) |
29 | 29 | ||
30 | Index: mDNSResponder/mDNSPosix/mDNSPosix.c | 30 | diff --git a/mDNSPosix/mDNSPosix.c b/mDNSPosix/mDNSPosix.c |
31 | =================================================================== | 31 | index 6b2fe76d4b66..ecd5741d038d 100644 |
32 | --- mDNSResponder.orig/mDNSPosix/mDNSPosix.c | 32 | --- a/mDNSPosix/mDNSPosix.c |
33 | +++ mDNSResponder/mDNSPosix/mDNSPosix.c | 33 | +++ b/mDNSPosix/mDNSPosix.c |
34 | @@ -1788,14 +1788,43 @@ mDNSlocal void ProcessRoutingNo | 34 | @@ -1788,14 +1788,43 @@ mDNSlocal void ProcessRoutingNotification(int sd, GenLinkedList *change |
35 | 35 | ||
36 | #endif // USES_NETLINK | 36 | #endif // USES_NETLINK |
37 | 37 | ||
@@ -75,7 +75,7 @@ Index: mDNSResponder/mDNSPosix/mDNSPosix.c | |||
75 | 75 | ||
76 | (void)fd; // Unused | 76 | (void)fd; // Unused |
77 | 77 | ||
78 | @@ -1810,12 +1839,149 @@ mDNSlocal void InterfaceChangeCallback(i | 78 | @@ -1810,12 +1839,149 @@ mDNSlocal void InterfaceChangeCallback(int fd, void *context) |
79 | } | 79 | } |
80 | while (0 < select(pChgRec->NotifySD + 1, &readFDs, (fd_set*) NULL, (fd_set*) NULL, &zeroTimeout)); | 80 | while (0 < select(pChgRec->NotifySD + 1, &readFDs, (fd_set*) NULL, (fd_set*) NULL, &zeroTimeout)); |
81 | 81 | ||
@@ -230,7 +230,7 @@ Index: mDNSResponder/mDNSPosix/mDNSPosix.c | |||
230 | while ((changedInterface = (NetworkInterfaceIndex*)changedInterfaces.Head) != NULL) | 230 | while ((changedInterface = (NetworkInterfaceIndex*)changedInterfaces.Head) != NULL) |
231 | { | 231 | { |
232 | RemoveFromList(&changedInterfaces, changedInterface); | 232 | RemoveFromList(&changedInterfaces, changedInterface); |
233 | @@ -1947,15 +2113,11 @@ mDNSexport void mDNSPlatformClose(mDNS * | 233 | @@ -1947,15 +2113,11 @@ mDNSexport void mDNSPlatformClose(mDNS *const m) |
234 | #endif | 234 | #endif |
235 | } | 235 | } |
236 | 236 | ||
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 c12a02fcd..ffa3fa382 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,7 +1,7 @@ | |||
1 | From fa9ef50ab4c4225cf3ade4bafc38ddf93e6fe127 Mon Sep 17 00:00:00 2001 | 1 | From 626ccae85aab5b0902a8e3c05d9f0e3fbbe4fcd2 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 6/6] make: Add top-level Makefile | 4 | Subject: [PATCH] make: Add top-level Makefile |
5 | 5 | ||
6 | Simple top level Makefile that just delegates to mDNSPosix. | 6 | Simple top level Makefile that just delegates to mDNSPosix. |
7 | 7 | ||
@@ -12,10 +12,11 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | |||
12 | 1 file changed, 2 insertions(+) | 12 | 1 file changed, 2 insertions(+) |
13 | create mode 100644 Makefile | 13 | create mode 100644 Makefile |
14 | 14 | ||
15 | Index: mDNSResponder/Makefile | 15 | diff --git a/Makefile b/Makefile |
16 | =================================================================== | 16 | new file mode 100644 |
17 | index 000000000000..feb6ac67ef47 | ||
17 | --- /dev/null | 18 | --- /dev/null |
18 | +++ mDNSResponder/Makefile | 19 | +++ b/Makefile |
19 | @@ -0,0 +1,2 @@ | 20 | @@ -0,0 +1,2 @@ |
20 | +all clean: | 21 | +all clean: |
21 | + cd mDNSPosix && $(MAKE) $@ | 22 | + cd mDNSPosix && $(MAKE) $@ |
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0007-Mark-deleted-interfaces-as-being-changed.patch b/meta-networking/recipes-protocols/mdns/mdns/0007-Mark-deleted-interfaces-as-being-changed.patch index dae1ac7ea..276f879df 100644 --- a/meta-networking/recipes-protocols/mdns/mdns/0007-Mark-deleted-interfaces-as-being-changed.patch +++ b/meta-networking/recipes-protocols/mdns/mdns/0007-Mark-deleted-interfaces-as-being-changed.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From a8accffb95267490b50401c8b65ec18db57b5ef5 Mon Sep 17 00:00:00 2001 | 1 | From 3715b3f4a0ba2d2cb05e5ba617b523c759c88d4b Mon Sep 17 00:00:00 2001 |
2 | From: Nate Karstens <nate.karstens@garmin.com> | 2 | From: Nate Karstens <nate.karstens@garmin.com> |
3 | Date: Wed, 9 Aug 2017 09:16:58 -0500 | 3 | Date: Wed, 9 Aug 2017 09:16:58 -0500 |
4 | Subject: [PATCH 7/8] Mark deleted interfaces as being changed | 4 | Subject: [PATCH] Mark deleted interfaces as being changed |
5 | 5 | ||
6 | Netlink notification handling ignores messages for deleted links, | 6 | Netlink notification handling ignores messages for deleted links, |
7 | RTM_DELLINK. It does handle RTM_GETLINK. According to libnl docu- | 7 | RTM_DELLINK. It does handle RTM_GETLINK. According to libnl docu- |
@@ -22,11 +22,11 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | |||
22 | mDNSPosix/mDNSPosix.c | 2 +- | 22 | mDNSPosix/mDNSPosix.c | 2 +- |
23 | 1 file changed, 1 insertion(+), 1 deletion(-) | 23 | 1 file changed, 1 insertion(+), 1 deletion(-) |
24 | 24 | ||
25 | Index: mDNSResponder/mDNSPosix/mDNSPosix.c | 25 | diff --git a/mDNSPosix/mDNSPosix.c b/mDNSPosix/mDNSPosix.c |
26 | =================================================================== | 26 | index ecd5741d038d..776531dbc8e8 100644 |
27 | --- mDNSResponder.orig/mDNSPosix/mDNSPosix.c | 27 | --- a/mDNSPosix/mDNSPosix.c |
28 | +++ mDNSResponder/mDNSPosix/mDNSPosix.c | 28 | +++ b/mDNSPosix/mDNSPosix.c |
29 | @@ -1714,7 +1714,7 @@ mDNSlocal void ProcessRoutingNo | 29 | @@ -1714,7 +1714,7 @@ mDNSlocal void ProcessRoutingNotification(int sd, GenLinkedList *change |
30 | #endif | 30 | #endif |
31 | 31 | ||
32 | // Process the NetLink message | 32 | // Process the NetLink message |
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0008-Handle-errors-from-socket-calls.patch b/meta-networking/recipes-protocols/mdns/mdns/0008-Handle-errors-from-socket-calls.patch index 1789001e1..f3c7f62d3 100644 --- a/meta-networking/recipes-protocols/mdns/mdns/0008-Handle-errors-from-socket-calls.patch +++ b/meta-networking/recipes-protocols/mdns/mdns/0008-Handle-errors-from-socket-calls.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From ed58146d3aeecdb9920fdc017f85c18b5b10f2db Mon Sep 17 00:00:00 2001 | 1 | From 4e6621eee389e1cbb558fe268e02d5153a1d8f2d Mon Sep 17 00:00:00 2001 |
2 | From: Nate Karstens <nate.karstens@garmin.com> | 2 | From: Nate Karstens <nate.karstens@garmin.com> |
3 | Date: Thu, 10 Aug 2017 08:27:32 -0500 | 3 | Date: Thu, 10 Aug 2017 08:27:32 -0500 |
4 | Subject: [PATCH 8/8] Handle errors from socket calls | 4 | Subject: [PATCH] Handle errors from socket calls |
5 | 5 | ||
6 | Adds handling for socket() or read() returning a | 6 | Adds handling for socket() or read() returning a |
7 | negative value (indicating an error has occurred). | 7 | negative value (indicating an error has occurred). |
@@ -14,11 +14,11 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | |||
14 | mDNSPosix/mDNSPosix.c | 12 +++++++++--- | 14 | mDNSPosix/mDNSPosix.c | 12 +++++++++--- |
15 | 1 file changed, 9 insertions(+), 3 deletions(-) | 15 | 1 file changed, 9 insertions(+), 3 deletions(-) |
16 | 16 | ||
17 | Index: mDNSResponder/mDNSPosix/mDNSPosix.c | 17 | diff --git a/mDNSPosix/mDNSPosix.c b/mDNSPosix/mDNSPosix.c |
18 | =================================================================== | 18 | index 776531dbc8e8..0c9dd2582660 100644 |
19 | --- mDNSResponder.orig/mDNSPosix/mDNSPosix.c | 19 | --- a/mDNSPosix/mDNSPosix.c |
20 | +++ mDNSResponder/mDNSPosix/mDNSPosix.c | 20 | +++ b/mDNSPosix/mDNSPosix.c |
21 | @@ -1677,7 +1677,7 @@ mDNSlocal void ProcessRoutingNo | 21 | @@ -1677,7 +1677,7 @@ mDNSlocal void ProcessRoutingNotification(int sd, GenLinkedList *change |
22 | // Read through the messages on sd and if any indicate that any interface records should | 22 | // Read through the messages on sd and if any indicate that any interface records should |
23 | // be torn down and rebuilt, return affected indices as a bitmask. Otherwise return 0. | 23 | // be torn down and rebuilt, return affected indices as a bitmask. Otherwise return 0. |
24 | { | 24 | { |
@@ -27,7 +27,7 @@ Index: mDNSResponder/mDNSPosix/mDNSPosix.c | |||
27 | char buff[4096]; | 27 | char buff[4096]; |
28 | struct nlmsghdr *pNLMsg = (struct nlmsghdr*) buff; | 28 | struct nlmsghdr *pNLMsg = (struct nlmsghdr*) buff; |
29 | 29 | ||
30 | @@ -1686,7 +1686,10 @@ mDNSlocal void ProcessRoutingNo | 30 | @@ -1686,7 +1686,10 @@ mDNSlocal void ProcessRoutingNotification(int sd, GenLinkedList *change |
31 | // enough to hold all pending data and so avoid message fragmentation. | 31 | // enough to hold all pending data and so avoid message fragmentation. |
32 | // (Note that FIONREAD is not supported on AF_NETLINK.) | 32 | // (Note that FIONREAD is not supported on AF_NETLINK.) |
33 | 33 | ||
@@ -39,7 +39,7 @@ Index: mDNSResponder/mDNSPosix/mDNSPosix.c | |||
39 | while (1) | 39 | while (1) |
40 | { | 40 | { |
41 | // Make sure we've got an entire nlmsghdr in the buffer, and payload, too. | 41 | // Make sure we've got an entire nlmsghdr in the buffer, and payload, too. |
42 | @@ -1702,7 +1705,9 @@ mDNSlocal void ProcessRoutingNo | 42 | @@ -1702,7 +1705,9 @@ mDNSlocal void ProcessRoutingNotification(int sd, GenLinkedList *change |
43 | pNLMsg = (struct nlmsghdr*) buff; | 43 | pNLMsg = (struct nlmsghdr*) buff; |
44 | 44 | ||
45 | // read more data | 45 | // read more data |
@@ -50,7 +50,7 @@ Index: mDNSResponder/mDNSPosix/mDNSPosix.c | |||
50 | continue; // spin around and revalidate with new readCount | 50 | continue; // spin around and revalidate with new readCount |
51 | } | 51 | } |
52 | else | 52 | else |
53 | @@ -2017,6 +2022,7 @@ mDNSlocal mDNSBool mDNSPlatformInit_CanR | 53 | @@ -2017,6 +2022,7 @@ mDNSlocal mDNSBool mDNSPlatformInit_CanReceiveUnicast(void) |
54 | int err; | 54 | int err; |
55 | int s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); | 55 | int s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); |
56 | struct sockaddr_in s5353; | 56 | struct sockaddr_in s5353; |
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch b/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch index d443bc97b..818017037 100644 --- a/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch +++ b/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 1d7e71e72c597ffcc19c04373a477d1fbd3ad955 Mon Sep 17 00:00:00 2001 | 1 | From 05cb409ce213f35798c02faf2032d4846a84b48e Mon Sep 17 00:00:00 2001 |
2 | From: Beniamin Sandu <beniaminsandu@gmail.com> | 2 | From: Beniamin Sandu <beniaminsandu@gmail.com> |
3 | Date: Thu, 15 Jun 2023 17:02:58 +0000 | 3 | Date: Thu, 15 Jun 2023 17:02:58 +0000 |
4 | Subject: [PATCH] remove unneeded headers | 4 | Subject: [PATCH] remove unneeded headers |
@@ -14,10 +14,10 @@ Signed-off-by: Beniamin Sandu <beniaminsandu@gmail.com> | |||
14 | mDNSPosix/mbedtls.c | 2 -- | 14 | mDNSPosix/mbedtls.c | 2 -- |
15 | 1 file changed, 2 deletions(-) | 15 | 1 file changed, 2 deletions(-) |
16 | 16 | ||
17 | Index: mDNSResponder/mDNSPosix/mbedtls.c | 17 | diff --git a/mDNSPosix/mbedtls.c b/mDNSPosix/mbedtls.c |
18 | =================================================================== | 18 | index a73681b6d528..ab8f8c772c00 100644 |
19 | --- mDNSResponder.orig/mDNSPosix/mbedtls.c | 19 | --- a/mDNSPosix/mbedtls.c |
20 | +++ mDNSResponder/mDNSPosix/mbedtls.c | 20 | +++ b/mDNSPosix/mbedtls.c |
21 | @@ -38,10 +38,8 @@ | 21 | @@ -38,10 +38,8 @@ |
22 | #include <mbedtls/sha256.h> | 22 | #include <mbedtls/sha256.h> |
23 | #include <mbedtls/base64.h> | 23 | #include <mbedtls/base64.h> |
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0015-Add-missing-limits.h.patch b/meta-networking/recipes-protocols/mdns/mdns/0015-Add-missing-limits.h.patch deleted file mode 100644 index 511a6fdc1..000000000 --- a/meta-networking/recipes-protocols/mdns/mdns/0015-Add-missing-limits.h.patch +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | From 9fc45a2cf3b78573a568abf538a6e6f4bd30b2d7 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alex Kiernan <alex.kiernan@gmail.com> | ||
3 | Date: Wed, 27 Sep 2023 11:45:26 +0100 | ||
4 | Subject: [PATCH] Add missing limits.h | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | ||
8 | --- | ||
9 | mDNSShared/PlatformCommon.c | 1 + | ||
10 | 1 file changed, 1 insertion(+) | ||
11 | |||
12 | Index: mDNSResponder/mDNSShared/PlatformCommon.c | ||
13 | =================================================================== | ||
14 | --- mDNSResponder.orig/mDNSShared/PlatformCommon.c | ||
15 | +++ mDNSResponder/mDNSShared/PlatformCommon.c | ||
16 | @@ -32,6 +32,7 @@ | ||
17 | #include <time.h> | ||
18 | #include <sys/time.h> // Needed for #include <sys/time.h>(). | ||
19 | #include <assert.h> | ||
20 | +#include <limits.h> | ||
21 | |||
22 | |||
23 | #include "mDNSEmbeddedAPI.h" // Defines the interface provided to the client layer above | ||
diff --git a/meta-networking/recipes-protocols/mdns/mdns_2200.100.94.0.2.bb b/meta-networking/recipes-protocols/mdns/mdns_2200.120.24.bb index 183f05ebc..9aeda92a4 100644 --- a/meta-networking/recipes-protocols/mdns/mdns_2200.100.94.0.2.bb +++ b/meta-networking/recipes-protocols/mdns/mdns_2200.120.24.bb | |||
@@ -22,11 +22,10 @@ SRC_URI = "git://github.com/apple-oss-distributions/mDNSResponder;protocol=https | |||
22 | file://0008-Handle-errors-from-socket-calls.patch \ | 22 | file://0008-Handle-errors-from-socket-calls.patch \ |
23 | file://0009-remove-unneeded-headers.patch \ | 23 | file://0009-remove-unneeded-headers.patch \ |
24 | file://mdns.service \ | 24 | file://mdns.service \ |
25 | file://0015-Add-missing-limits.h.patch \ | ||
26 | file://0001-Handle-interface-without-ifa_addr.patch \ | 25 | file://0001-Handle-interface-without-ifa_addr.patch \ |
27 | file://0001-Fix-SIGSEGV-during-DumpStateLog.patch \ | 26 | file://0001-Fix-SIGSEGV-during-DumpStateLog.patch \ |
28 | " | 27 | " |
29 | SRCREV = "8f70f98fc1d0cf439ca3a6470be6ad8ac2bcc019" | 28 | SRCREV = "51a7148a21362285f8013648c4bfa91247ff598a" |
30 | 29 | ||
31 | # We install a stub Makefile in the top directory so that the various checks | 30 | # We install a stub Makefile in the top directory so that the various checks |
32 | # in base.bbclass pass their tests for a Makefile, this ensures (that amongst | 31 | # in base.bbclass pass their tests for a Makefile, this ensures (that amongst |
@@ -104,7 +103,7 @@ do_install () { | |||
104 | install -m 0644 libnss_mdns.8 ${D}${mandir}/man8 | 103 | install -m 0644 libnss_mdns.8 ${D}${mandir}/man8 |
105 | 104 | ||
106 | install -d ${D}${systemd_system_unitdir} | 105 | install -d ${D}${systemd_system_unitdir} |
107 | install -m 0644 ${WORKDIR}/mdns.service ${D}${systemd_system_unitdir} | 106 | install -m 0644 ${UNPACKDIR}/mdns.service ${D}${systemd_system_unitdir} |
108 | 107 | ||
109 | install -d ${D}${INIT_D_DIR} | 108 | install -d ${D}${INIT_D_DIR} |
110 | install mdnsd.sh ${D}${INIT_D_DIR}/mdns | 109 | install mdnsd.sh ${D}${INIT_D_DIR}/mdns |
diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.4.bb b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.4.bb index 395b02df0..75b3d9e8c 100644 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.4.bb +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.4.bb | |||
@@ -116,12 +116,12 @@ do_configure:append() { | |||
116 | do_install:append() { | 116 | do_install:append() { |
117 | install -d ${D}${sysconfdir}/snmp | 117 | install -d ${D}${sysconfdir}/snmp |
118 | install -d ${D}${sysconfdir}/init.d | 118 | install -d ${D}${sysconfdir}/init.d |
119 | install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/snmpd | 119 | install -m 755 ${UNPACKDIR}/init ${D}${sysconfdir}/init.d/snmpd |
120 | install -m 644 ${WORKDIR}/snmpd.conf ${D}${sysconfdir}/snmp/ | 120 | install -m 644 ${UNPACKDIR}/snmpd.conf ${D}${sysconfdir}/snmp/ |
121 | install -m 644 ${WORKDIR}/snmptrapd.conf ${D}${sysconfdir}/snmp/ | 121 | install -m 644 ${UNPACKDIR}/snmptrapd.conf ${D}${sysconfdir}/snmp/ |
122 | install -d ${D}${systemd_unitdir}/system | 122 | install -d ${D}${systemd_unitdir}/system |
123 | install -m 0644 ${WORKDIR}/snmpd.service ${D}${systemd_unitdir}/system | 123 | install -m 0644 ${UNPACKDIR}/snmpd.service ${D}${systemd_unitdir}/system |
124 | install -m 0644 ${WORKDIR}/snmptrapd.service ${D}${systemd_unitdir}/system | 124 | install -m 0644 ${UNPACKDIR}/snmptrapd.service ${D}${systemd_unitdir}/system |
125 | sed -e "s@^NSC_SRCDIR=.*@NSC_SRCDIR=.@g" \ | 125 | sed -e "s@^NSC_SRCDIR=.*@NSC_SRCDIR=.@g" \ |
126 | -i ${D}${bindir}/net-snmp-create-v3-user | 126 | -i ${D}${bindir}/net-snmp-create-v3-user |
127 | sed -e 's@^NSC_SRCDIR=.*@NSC_SRCDIR=.@g' \ | 127 | sed -e 's@^NSC_SRCDIR=.*@NSC_SRCDIR=.@g' \ |
diff --git a/meta-networking/recipes-protocols/openflow/openflow/0001-Link-in-libexecinfo-if-it-has-backtrace-API.patch b/meta-networking/recipes-protocols/openflow/openflow/0001-Link-in-libexecinfo-if-it-has-backtrace-API.patch new file mode 100644 index 000000000..6382c2a9a --- /dev/null +++ b/meta-networking/recipes-protocols/openflow/openflow/0001-Link-in-libexecinfo-if-it-has-backtrace-API.patch | |||
@@ -0,0 +1,62 @@ | |||
1 | From 2272df8407d86519d72504d6468b710e7eb56de8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sat, 18 May 2024 00:23:43 -0700 | ||
4 | Subject: [PATCH] Link in libexecinfo if it has backtrace() API | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
8 | --- | ||
9 | m4/libopenflow.m4 | 5 +++++ | ||
10 | tests/automake.mk | 2 +- | ||
11 | utilities/automake.mk | 4 ++-- | ||
12 | 3 files changed, 8 insertions(+), 3 deletions(-) | ||
13 | |||
14 | diff --git a/m4/libopenflow.m4 b/m4/libopenflow.m4 | ||
15 | index 58014ed..c9302b8 100644 | ||
16 | --- a/m4/libopenflow.m4 | ||
17 | +++ b/m4/libopenflow.m4 | ||
18 | @@ -96,6 +96,11 @@ AC_DEFUN([OFP_CHECK_FAULT_LIBS], | ||
19 | [AC_CHECK_LIB([dl], [dladdr], [FAULT_LIBS=-ldl]) | ||
20 | AC_SUBST([FAULT_LIBS])]) | ||
21 | |||
22 | +dnl Checks for libraries needed by lib/fault.c. | ||
23 | +AC_DEFUN([OFP_CHECK_FAULT_LIBS], | ||
24 | + [AC_CHECK_LIB([execinfo], [backtrace], [FAULT_LIBS=-lexecinfo]) | ||
25 | + AC_SUBST([FAULT_LIBS])]) | ||
26 | + | ||
27 | dnl Checks for libraries needed by lib/socket-util.c. | ||
28 | AC_DEFUN([OFP_CHECK_SOCKET_LIBS], | ||
29 | [AC_CHECK_LIB([socket], [connect]) | ||
30 | diff --git a/tests/automake.mk b/tests/automake.mk | ||
31 | index a4e945a..0944275 100644 | ||
32 | --- a/tests/automake.mk | ||
33 | +++ b/tests/automake.mk | ||
34 | @@ -27,7 +27,7 @@ EXTRA_DIST += tests/test-stp.sh | ||
35 | noinst_PROGRAMS += tests/test-stp | ||
36 | |||
37 | tests_test_stp_SOURCES = tests/test-stp.c | ||
38 | -tests_test_stp_LDADD = lib/libopenflow.a | ||
39 | +tests_test_stp_LDADD = lib/libopenflow.a $(FAULT_LIBS) | ||
40 | stp_files = \ | ||
41 | tests/test-stp-ieee802.1d-1998 \ | ||
42 | tests/test-stp-ieee802.1d-2004-fig17.4 \ | ||
43 | diff --git a/utilities/automake.mk b/utilities/automake.mk | ||
44 | index d6f79a8..0608655 100644 | ||
45 | --- a/utilities/automake.mk | ||
46 | +++ b/utilities/automake.mk | ||
47 | @@ -36,10 +36,10 @@ utilities_dpctl_SOURCES = utilities/dpctl.c | ||
48 | utilities_dpctl_LDADD = lib/libopenflow.a $(FAULT_LIBS) $(SSL_LIBS) | ||
49 | |||
50 | utilities_vlogconf_SOURCES = utilities/vlogconf.c | ||
51 | -utilities_vlogconf_LDADD = lib/libopenflow.a | ||
52 | +utilities_vlogconf_LDADD = lib/libopenflow.a $(FAULT_LIBS) | ||
53 | |||
54 | utilities_ofp_discover_SOURCES = utilities/ofp-discover.c | ||
55 | -utilities_ofp_discover_LDADD = lib/libopenflow.a | ||
56 | +utilities_ofp_discover_LDADD = lib/libopenflow.a $(FAULT_LIBS) | ||
57 | |||
58 | utilities_ofp_kill_SOURCES = utilities/ofp-kill.c | ||
59 | utilities_ofp_kill_LDADD = lib/libopenflow.a | ||
60 | -- | ||
61 | 2.45.1 | ||
62 | |||
diff --git a/meta-networking/recipes-protocols/openflow/openflow_git.bb b/meta-networking/recipes-protocols/openflow/openflow_git.bb index 41bedcd0c..aad044a04 100644 --- a/meta-networking/recipes-protocols/openflow/openflow_git.bb +++ b/meta-networking/recipes-protocols/openflow/openflow_git.bb | |||
@@ -21,6 +21,7 @@ SRC_URI = "git://github.com/mininet/openflow;protocol=https;branch=master \ | |||
21 | file://0001-generate-not-static-get_dh-functions.patch \ | 21 | file://0001-generate-not-static-get_dh-functions.patch \ |
22 | file://0001-socket-util-Include-sys-stat.h-for-fchmod.patch \ | 22 | file://0001-socket-util-Include-sys-stat.h-for-fchmod.patch \ |
23 | file://0001-Makefile.am-Specify-export-dynamic-directly-to-linke.patch \ | 23 | file://0001-Makefile.am-Specify-export-dynamic-directly-to-linke.patch \ |
24 | file://0001-Link-in-libexecinfo-if-it-has-backtrace-API.patch \ | ||
24 | " | 25 | " |
25 | CVE_STATUS[CVE-2015-1611] = "not-applicable-config: Not referred to our implementation of openflow" | 26 | CVE_STATUS[CVE-2015-1611] = "not-applicable-config: Not referred to our implementation of openflow" |
26 | CVE_STATUS[CVE-2015-1612] = "not-applicable-config: Not referred to our implementation of openflow" | 27 | CVE_STATUS[CVE-2015-1612] = "not-applicable-config: Not referred to our implementation of openflow" |
@@ -34,9 +35,7 @@ EXTRA_OECONF += " \ | |||
34 | KARCH=${TARGET_ARCH} \ | 35 | KARCH=${TARGET_ARCH} \ |
35 | ${@bb.utils.contains('PACKAGECONFIG', 'openssl', 'SSL_LIBS="-lssl -lcrypto"', '', d)} \ | 36 | ${@bb.utils.contains('PACKAGECONFIG', 'openssl', 'SSL_LIBS="-lssl -lcrypto"', '', d)} \ |
36 | " | 37 | " |
37 | |||
38 | DEPENDS:append:libc-musl = " libexecinfo" | 38 | DEPENDS:append:libc-musl = " libexecinfo" |
39 | LDFLAGS:append:libc-musl = " -lexecinfo" | ||
40 | 39 | ||
41 | S = "${WORKDIR}/git" | 40 | S = "${WORKDIR}/git" |
42 | 41 | ||
diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb b/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb index 183c0066d..f64c7340d 100644 --- a/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb | |||
@@ -74,7 +74,7 @@ do_install:append () { | |||
74 | install -m 0755 ${S}/etc/sysconfig/openl2tpd ${D}${sysconfdir}/default/openl2tpd | 74 | install -m 0755 ${S}/etc/sysconfig/openl2tpd ${D}${sysconfdir}/default/openl2tpd |
75 | 75 | ||
76 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then | 76 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then |
77 | install -D -m 0644 ${WORKDIR}/openl2tpd.service ${D}${systemd_system_unitdir}/openl2tpd.service | 77 | install -D -m 0644 ${UNPACKDIR}/openl2tpd.service ${D}${systemd_system_unitdir}/openl2tpd.service |
78 | sed -i -e 's,@STATEDIR@,${localstatedir},g' \ | 78 | sed -i -e 's,@STATEDIR@,${localstatedir},g' \ |
79 | -e 's,@SYSCONFDIR@,${sysconfdir},g' \ | 79 | -e 's,@SYSCONFDIR@,${sysconfdir},g' \ |
80 | -e 's,@SBINDIR@,${sbindir},g' \ | 80 | -e 's,@SBINDIR@,${sbindir},g' \ |
diff --git a/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.10.0.bb b/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.10.0.bb index 0d26c338b..cabe18ef8 100644 --- a/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.10.0.bb +++ b/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.10.0.bb | |||
@@ -26,7 +26,7 @@ do_install() { | |||
26 | install -d ${D}${sbindir} ${D}${sysconfdir}/ppp ${D}${mandir}/man8 | 26 | install -d ${D}${sbindir} ${D}${sysconfdir}/ppp ${D}${mandir}/man8 |
27 | install -m 555 pptp ${D}${sbindir} | 27 | install -m 555 pptp ${D}${sbindir} |
28 | install -m 644 pptp.8 ${D}${mandir}/man8 | 28 | install -m 644 pptp.8 ${D}${mandir}/man8 |
29 | install -m 644 ${WORKDIR}/options.pptp ${D}${sysconfdir}/ppp | 29 | install -m 644 ${UNPACKDIR}/options.pptp ${D}${sysconfdir}/ppp |
30 | } | 30 | } |
31 | 31 | ||
32 | RDEPENDS:${PN} = "ppp" | 32 | RDEPENDS:${PN} = "ppp" |
diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.15.bb b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.15.bb index 4dfdb8fc2..c8e176711 100644 --- a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.15.bb +++ b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.15.bb | |||
@@ -29,7 +29,7 @@ CFLAGS += "-D_GNU_SOURCE" | |||
29 | 29 | ||
30 | do_install:append() { | 30 | do_install:append() { |
31 | install -d ${D}${systemd_unitdir}/system | 31 | install -d ${D}${systemd_unitdir}/system |
32 | install -m 0644 ${WORKDIR}/pppoe-server.service ${D}${systemd_unitdir}/system | 32 | install -m 0644 ${UNPACKDIR}/pppoe-server.service ${D}${systemd_unitdir}/system |
33 | sed -i -e 's#@SYSCONFDIR@#${sysconfdir}#g' ${D}${systemd_unitdir}/system/pppoe-server.service | 33 | sed -i -e 's#@SYSCONFDIR@#${sysconfdir}#g' ${D}${systemd_unitdir}/system/pppoe-server.service |
34 | sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/pppoe-server.service | 34 | sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/pppoe-server.service |
35 | install -d ${D}${datadir}/doc/${PN} | 35 | install -d ${D}${datadir}/doc/${PN} |
@@ -41,8 +41,8 @@ do_install:append() { | |||
41 | do_install() { | 41 | do_install() { |
42 | # Install init script and default settings | 42 | # Install init script and default settings |
43 | install -m 0755 -d ${D}${sysconfdir}/default ${D}${sysconfdir}/init.d | 43 | install -m 0755 -d ${D}${sysconfdir}/default ${D}${sysconfdir}/init.d |
44 | install -m 0644 ${WORKDIR}/pppoe-server.default ${D}${sysconfdir}/default/pppoe-server | 44 | install -m 0644 ${UNPACKDIR}/pppoe-server.default ${D}${sysconfdir}/default/pppoe-server |
45 | install -m 0755 ${WORKDIR}/pppoe-server.init ${D}${sysconfdir}/init.d/pppoe-server | 45 | install -m 0755 ${UNPACKDIR}/pppoe-server.init ${D}${sysconfdir}/init.d/pppoe-server |
46 | # Install | 46 | # Install |
47 | oe_runmake -C ${S} DESTDIR=${D} docdir=${docdir} install | 47 | oe_runmake -C ${S} DESTDIR=${D} docdir=${docdir} install |
48 | chmod 4755 ${D}${sbindir}/pppoe | 48 | chmod 4755 ${D}${sbindir}/pppoe |
diff --git a/meta-networking/recipes-protocols/zeroconf/zeroconf_0.9.bb b/meta-networking/recipes-protocols/zeroconf/zeroconf_0.9.bb index 61f6b79dd..cb2669921 100644 --- a/meta-networking/recipes-protocols/zeroconf/zeroconf_0.9.bb +++ b/meta-networking/recipes-protocols/zeroconf/zeroconf_0.9.bb | |||
@@ -32,6 +32,6 @@ do_install () { | |||
32 | install -d ${D}${sysconfdir}/network/if-up.d | 32 | install -d ${D}${sysconfdir}/network/if-up.d |
33 | install -d ${D}${sysconfdir}/default | 33 | install -d ${D}${sysconfdir}/default |
34 | install -c -m 755 ${S}/zeroconf ${D}${sbindir}/zeroconf | 34 | install -c -m 755 ${S}/zeroconf ${D}${sbindir}/zeroconf |
35 | install -c -m 755 ${WORKDIR}/debian-zeroconf ${D}${sysconfdir}/network/if-up.d/zeroconf | 35 | install -c -m 755 ${UNPACKDIR}/debian-zeroconf ${D}${sysconfdir}/network/if-up.d/zeroconf |
36 | install -c ${WORKDIR}/zeroconf-default ${D}${sysconfdir}/default/zeroconf | 36 | install -c ${UNPACKDIR}/zeroconf-default ${D}${sysconfdir}/default/zeroconf |
37 | } | 37 | } |
diff --git a/meta-networking/recipes-support/arptables/arptables_git.bb b/meta-networking/recipes-support/arptables/arptables_git.bb index 949794bf3..f9dd66f60 100644 --- a/meta-networking/recipes-support/arptables/arptables_git.bb +++ b/meta-networking/recipes-support/arptables/arptables_git.bb | |||
@@ -25,7 +25,7 @@ do_install() { | |||
25 | oe_runmake install DESTDIR=${D} | 25 | oe_runmake install DESTDIR=${D} |
26 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then | 26 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then |
27 | install -d ${D}${systemd_unitdir}/system | 27 | install -d ${D}${systemd_unitdir}/system |
28 | install -m 644 ${WORKDIR}/arptables.service ${D}${systemd_unitdir}/system | 28 | install -m 644 ${UNPACKDIR}/arptables.service ${D}${systemd_unitdir}/system |
29 | fi | 29 | fi |
30 | } | 30 | } |
31 | 31 | ||
diff --git a/meta-networking/recipes-support/chrony/chrony_4.5.bb b/meta-networking/recipes-support/chrony/chrony_4.5.bb index ed26e5987..0681a3439 100644 --- a/meta-networking/recipes-support/chrony/chrony_4.5.bb +++ b/meta-networking/recipes-support/chrony/chrony_4.5.bb | |||
@@ -90,7 +90,7 @@ do_install() { | |||
90 | 90 | ||
91 | # Config file | 91 | # Config file |
92 | install -d ${D}${sysconfdir} | 92 | install -d ${D}${sysconfdir} |
93 | install -m 644 ${WORKDIR}/chrony.conf ${D}${sysconfdir} | 93 | install -m 644 ${UNPACKDIR}/chrony.conf ${D}${sysconfdir} |
94 | if ${@bb.utils.contains('PACKAGECONFIG', 'privdrop', 'true', 'false', d)}; then | 94 | if ${@bb.utils.contains('PACKAGECONFIG', 'privdrop', 'true', 'false', d)}; then |
95 | echo "# Define user to drop to after dropping root privileges" >> ${D}${sysconfdir}/chrony.conf | 95 | echo "# Define user to drop to after dropping root privileges" >> ${D}${sysconfdir}/chrony.conf |
96 | echo "user chronyd" >> ${D}${sysconfdir}/chrony.conf | 96 | echo "user chronyd" >> ${D}${sysconfdir}/chrony.conf |
@@ -98,7 +98,7 @@ do_install() { | |||
98 | 98 | ||
99 | # System V init script | 99 | # System V init script |
100 | install -d ${D}${sysconfdir}/init.d | 100 | install -d ${D}${sysconfdir}/init.d |
101 | install -m 755 ${WORKDIR}/chronyd ${D}${sysconfdir}/init.d | 101 | install -m 755 ${UNPACKDIR}/chronyd ${D}${sysconfdir}/init.d |
102 | 102 | ||
103 | # systemd unit configuration file | 103 | # systemd unit configuration file |
104 | install -d ${D}${systemd_unitdir}/system | 104 | install -d ${D}${systemd_unitdir}/system |
diff --git a/meta-networking/recipes-support/cim-schema/cim-schema-docs_2.40.0.bb b/meta-networking/recipes-support/cim-schema/cim-schema-docs_2.40.0.bb index 62daf3279..86f6a0df5 100644 --- a/meta-networking/recipes-support/cim-schema/cim-schema-docs_2.40.0.bb +++ b/meta-networking/recipes-support/cim-schema/cim-schema-docs_2.40.0.bb | |||
@@ -9,7 +9,7 @@ SRC_URI = "http://dmtf.org/sites/default/files/cim/cim_schema_v2400/cim_schema_$ | |||
9 | " | 9 | " |
10 | SRC_URI[md5sum] = "3d01940bc1085c6c42184c25fb61f739" | 10 | SRC_URI[md5sum] = "3d01940bc1085c6c42184c25fb61f739" |
11 | SRC_URI[sha256sum] = "3174cf0f8657b19d80dc59e184778d8e553da424728cb2966fe9d5428dd84267" | 11 | SRC_URI[sha256sum] = "3174cf0f8657b19d80dc59e184778d8e553da424728cb2966fe9d5428dd84267" |
12 | LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=eecc6f71a56ff3caf17f15bf7aeac7b4" | 12 | LIC_FILES_CHKSUM = "file://${UNPACKDIR}/LICENSE;md5=eecc6f71a56ff3caf17f15bf7aeac7b4" |
13 | 13 | ||
14 | do_install() { | 14 | do_install() { |
15 | install -d -m 0755 ${D}${datadir}/doc/cim-schema-${PV}-docs | 15 | install -d -m 0755 ${D}${datadir}/doc/cim-schema-${PV}-docs |
diff --git a/meta-networking/recipes-support/cim-schema/cim-schema-exper_2.50.0.bb b/meta-networking/recipes-support/cim-schema/cim-schema-exper_2.50.0.bb index 7d51bc1c9..45eee8f1b 100644 --- a/meta-networking/recipes-support/cim-schema/cim-schema-exper_2.50.0.bb +++ b/meta-networking/recipes-support/cim-schema/cim-schema-exper_2.50.0.bb | |||
@@ -9,12 +9,12 @@ SRC_URI = "http://dmtf.org/sites/default/files/cim/cim_schema_v2500/cim_schema_$ | |||
9 | " | 9 | " |
10 | SRC_URI[md5sum] = "ee4ad6441a2b65ca60a3abc53e3ec629" | 10 | SRC_URI[md5sum] = "ee4ad6441a2b65ca60a3abc53e3ec629" |
11 | SRC_URI[sha256sum] = "a44d67881325e267ef46b72eabe0c69f90470b1033b1ce7c26d9ba99072adb50" | 11 | SRC_URI[sha256sum] = "a44d67881325e267ef46b72eabe0c69f90470b1033b1ce7c26d9ba99072adb50" |
12 | LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=eecc6f71a56ff3caf17f15bf7aeac7b4" | 12 | LIC_FILES_CHKSUM = "file://${UNPACKDIR}/LICENSE;md5=eecc6f71a56ff3caf17f15bf7aeac7b4" |
13 | 13 | ||
14 | do_install() { | 14 | do_install() { |
15 | install -d -m 0755 ${D}${datadir}/mof/cimv${PV}/ | 15 | install -d -m 0755 ${D}${datadir}/mof/cimv${PV}/ |
16 | install -d -m 0755 ${D}${datadir}/doc/cim-schema-${PV} | 16 | install -d -m 0755 ${D}${datadir}/doc/cim-schema-${PV} |
17 | install -m 644 ${WORKDIR}/LICENSE ${D}${datadir}/doc/cim-schema-${PV} | 17 | install -m 644 ${UNPACKDIR}/LICENSE ${D}${datadir}/doc/cim-schema-${PV} |
18 | 18 | ||
19 | cp -R --no-dereference --preserve=mode,links -v ${S}/* ${D}${datadir}/mof/cimv${PV}/ | 19 | cp -R --no-dereference --preserve=mode,links -v ${S}/* ${D}${datadir}/mof/cimv${PV}/ |
20 | chown -R root:root ${D}${datadir}/mof/cimv${PV} | 20 | chown -R root:root ${D}${datadir}/mof/cimv${PV} |
diff --git a/meta-networking/recipes-support/cim-schema/cim-schema-final_2.40.0.bb b/meta-networking/recipes-support/cim-schema/cim-schema-final_2.40.0.bb index 32bd8acbb..d046622df 100644 --- a/meta-networking/recipes-support/cim-schema/cim-schema-final_2.40.0.bb +++ b/meta-networking/recipes-support/cim-schema/cim-schema-final_2.40.0.bb | |||
@@ -9,12 +9,12 @@ SRC_URI = "http://dmtf.org/sites/default/files/cim/cim_schema_v2400/cim_schema_$ | |||
9 | " | 9 | " |
10 | SRC_URI[md5sum] = "a9bdf17c7374e3b5b7adeaac4842c4ad" | 10 | SRC_URI[md5sum] = "a9bdf17c7374e3b5b7adeaac4842c4ad" |
11 | SRC_URI[sha256sum] = "dbfa3064ea427acd71a4bebbc172ca2dc44b0b09a6d83b0945b9ffa988a9058a" | 11 | SRC_URI[sha256sum] = "dbfa3064ea427acd71a4bebbc172ca2dc44b0b09a6d83b0945b9ffa988a9058a" |
12 | LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=eecc6f71a56ff3caf17f15bf7aeac7b4" | 12 | LIC_FILES_CHKSUM = "file://${UNPACKDIR}/LICENSE;md5=eecc6f71a56ff3caf17f15bf7aeac7b4" |
13 | 13 | ||
14 | do_install() { | 14 | do_install() { |
15 | install -d -m 0755 ${D}${datadir}/mof/cimv${PV}/ | 15 | install -d -m 0755 ${D}${datadir}/mof/cimv${PV}/ |
16 | install -d -m 0755 ${D}${datadir}/doc/cim-schema-${PV} | 16 | install -d -m 0755 ${D}${datadir}/doc/cim-schema-${PV} |
17 | install -m 644 ${WORKDIR}/LICENSE ${D}${datadir}/doc/cim-schema-${PV} | 17 | install -m 644 ${UNPACKDIR}/LICENSE ${D}${datadir}/doc/cim-schema-${PV} |
18 | 18 | ||
19 | cp -R --no-dereference --preserve=mode,links -v ${S}/* ${D}${datadir}/mof/cimv${PV}/ | 19 | cp -R --no-dereference --preserve=mode,links -v ${S}/* ${D}${datadir}/mof/cimv${PV}/ |
20 | chown -R root:root ${D}${datadir}/mof/cimv${PV}/ | 20 | chown -R root:root ${D}${datadir}/mof/cimv${PV}/ |
diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.90.bb b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.90.bb index 38fa271dc..be74759d5 100644 --- a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.90.bb +++ b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.90.bb | |||
@@ -81,20 +81,20 @@ do_install () { | |||
81 | "MANDIR=${D}${mandir}" \ | 81 | "MANDIR=${D}${mandir}" \ |
82 | install-i18n | 82 | install-i18n |
83 | install -d ${D}${sysconfdir}/ ${D}${sysconfdir}/init.d ${D}${sysconfdir}/dnsmasq.d | 83 | install -d ${D}${sysconfdir}/ ${D}${sysconfdir}/init.d ${D}${sysconfdir}/dnsmasq.d |
84 | install -m 644 ${WORKDIR}/dnsmasq.conf ${D}${sysconfdir}/ | 84 | install -m 644 ${UNPACKDIR}/dnsmasq.conf ${D}${sysconfdir}/ |
85 | install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/dnsmasq | 85 | install -m 755 ${UNPACKDIR}/init ${D}${sysconfdir}/init.d/dnsmasq |
86 | 86 | ||
87 | install -d ${D}${systemd_unitdir}/system | 87 | install -d ${D}${systemd_unitdir}/system |
88 | 88 | ||
89 | if [ "${@bb.utils.filter('PACKAGECONFIG', 'resolvconf', d)}" ]; then | 89 | if [ "${@bb.utils.filter('PACKAGECONFIG', 'resolvconf', d)}" ]; then |
90 | install -m 0644 ${WORKDIR}/dnsmasq-resolvconf.service ${D}${systemd_unitdir}/system/dnsmasq.service | 90 | install -m 0644 ${UNPACKDIR}/dnsmasq-resolvconf.service ${D}${systemd_unitdir}/system/dnsmasq.service |
91 | else | 91 | else |
92 | install -m 0644 ${WORKDIR}/dnsmasq-noresolvconf.service ${D}${systemd_unitdir}/system/dnsmasq.service | 92 | install -m 0644 ${UNPACKDIR}/dnsmasq-noresolvconf.service ${D}${systemd_unitdir}/system/dnsmasq.service |
93 | fi | 93 | fi |
94 | 94 | ||
95 | if [ "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" ]; then | 95 | if [ "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" ]; then |
96 | install -d ${D}${sysconfdir}/systemd/resolved.conf.d/ | 96 | install -d ${D}${sysconfdir}/systemd/resolved.conf.d/ |
97 | install -m 0644 ${WORKDIR}/dnsmasq-resolved.conf ${D}${sysconfdir}/systemd/resolved.conf.d/ | 97 | install -m 0644 ${UNPACKDIR}/dnsmasq-resolved.conf ${D}${sysconfdir}/systemd/resolved.conf.d/ |
98 | fi | 98 | fi |
99 | 99 | ||
100 | if [ "${@bb.utils.filter('PACKAGECONFIG', 'dhcp', d)}" ]; then | 100 | if [ "${@bb.utils.filter('PACKAGECONFIG', 'dhcp', d)}" ]; then |
@@ -113,11 +113,11 @@ do_install () { | |||
113 | 113 | ||
114 | if [ "${@bb.utils.filter('PACKAGECONFIG', 'resolvconf', d)}" ]; then | 114 | if [ "${@bb.utils.filter('PACKAGECONFIG', 'resolvconf', d)}" ]; then |
115 | install -d ${D}${sysconfdir}/resolvconf/update.d/ | 115 | install -d ${D}${sysconfdir}/resolvconf/update.d/ |
116 | install -m 0755 ${WORKDIR}/dnsmasq.resolvconf ${D}${sysconfdir}/resolvconf/update.d/dnsmasq | 116 | install -m 0755 ${UNPACKDIR}/dnsmasq.resolvconf ${D}${sysconfdir}/resolvconf/update.d/dnsmasq |
117 | 117 | ||
118 | install -d ${D}${sysconfdir}/default/volatiles | 118 | install -d ${D}${sysconfdir}/default/volatiles |
119 | install -m 0644 ${WORKDIR}/99_dnsmasq ${D}${sysconfdir}/default/volatiles | 119 | install -m 0644 ${UNPACKDIR}/99_dnsmasq ${D}${sysconfdir}/default/volatiles |
120 | install -m 0755 ${WORKDIR}/dnsmasq-resolvconf-helper ${D}${bindir} | 120 | install -m 0755 ${UNPACKDIR}/dnsmasq-resolvconf-helper ${D}${bindir} |
121 | fi | 121 | fi |
122 | } | 122 | } |
123 | 123 | ||
diff --git a/meta-networking/recipes-support/dovecot/dovecot_2.3.21.bb b/meta-networking/recipes-support/dovecot/dovecot_2.3.21.bb index 17fbd789b..2f887e601 100644 --- a/meta-networking/recipes-support/dovecot/dovecot_2.3.21.bb +++ b/meta-networking/recipes-support/dovecot/dovecot_2.3.21.bb | |||
@@ -52,7 +52,7 @@ do_install:append () { | |||
52 | install -d 755 ${D}/etc/dovecot | 52 | install -d 755 ${D}/etc/dovecot |
53 | touch 644 ${D}/etc/dovecot/dovecot.conf | 53 | touch 644 ${D}/etc/dovecot/dovecot.conf |
54 | if [ "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" ]; then | 54 | if [ "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" ]; then |
55 | install -m 0644 ${WORKDIR}/dovecot.service ${D}${systemd_unitdir}/system | 55 | install -m 0644 ${UNPACKDIR}/dovecot.service ${D}${systemd_unitdir}/system |
56 | sed -i -e 's#@SYSCONFDIR@#${sysconfdir}#g' ${D}${systemd_unitdir}/system/dovecot.service | 56 | sed -i -e 's#@SYSCONFDIR@#${sysconfdir}#g' ${D}${systemd_unitdir}/system/dovecot.service |
57 | sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/dovecot.service | 57 | sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/dovecot.service |
58 | fi | 58 | fi |
diff --git a/meta-networking/recipes-support/fetchmail/fetchmail_6.4.38.bb b/meta-networking/recipes-support/fetchmail/fetchmail_6.4.38.bb index 587a47949..6cde94b20 100644 --- a/meta-networking/recipes-support/fetchmail/fetchmail_6.4.38.bb +++ b/meta-networking/recipes-support/fetchmail/fetchmail_6.4.38.bb | |||
@@ -18,8 +18,11 @@ inherit autotools gettext pkgconfig python3-dir python3native | |||
18 | 18 | ||
19 | EXTRA_OECONF = "--with-ssl=${STAGING_DIR_HOST}${prefix}" | 19 | EXTRA_OECONF = "--with-ssl=${STAGING_DIR_HOST}${prefix}" |
20 | 20 | ||
21 | INSANE_SKIP:${PN} = "already-stripped" | ||
22 | |||
21 | do_install:append() { | 23 | do_install:append() { |
22 | sed -i 's,${RECIPE_SYSROOT_NATIVE},,g' ${D}${bindir}/fetchmailconf | 24 | sed -i 's,${RECIPE_SYSROOT_NATIVE},,g' ${D}${bindir}/fetchmailconf |
25 | sed -i 's,${RECIPE_SYSROOT},,g' ${D}${bindir}/fetchmail | ||
23 | } | 26 | } |
24 | 27 | ||
25 | PACKAGES =+ "fetchmail-python" | 28 | PACKAGES =+ "fetchmail-python" |
diff --git a/meta-networking/recipes-support/fping/fping/0001-fping-Initialize-msghdr-struct-in-a-portable-way.patch b/meta-networking/recipes-support/fping/fping/0001-fping-Initialize-msghdr-struct-in-a-portable-way.patch deleted file mode 100644 index 9965d2ec5..000000000 --- a/meta-networking/recipes-support/fping/fping/0001-fping-Initialize-msghdr-struct-in-a-portable-way.patch +++ /dev/null | |||
@@ -1,42 +0,0 @@ | |||
1 | From c3f476a763412be51b4df0e748af04d4150a2c71 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 29 Aug 2022 15:41:51 -0700 | ||
4 | Subject: [PATCH] fping: Initialize msghdr struct in a portable way | ||
5 | |||
6 | Initializing the structure assuming glibc layout results in | ||
7 | compile errors on musl, therefore do partial intialization and then | ||
8 | assigning the members individually. | ||
9 | |||
10 | Upstream-Status: Submitted [https://github.com/schweikert/fping/pull/263] | ||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | --- | ||
13 | src/fping.c | 16 +++++++--------- | ||
14 | 1 file changed, 7 insertions(+), 9 deletions(-) | ||
15 | |||
16 | diff --git a/src/fping.c b/src/fping.c | ||
17 | index e26b216..81a61d9 100644 | ||
18 | --- a/src/fping.c | ||
19 | +++ b/src/fping.c | ||
20 | @@ -1951,15 +1951,13 @@ int receive_packet(int64_t wait_time, | ||
21 | reply_buf, | ||
22 | reply_buf_len | ||
23 | }; | ||
24 | - struct msghdr recv_msghdr = { | ||
25 | - reply_src_addr, | ||
26 | - reply_src_addr_len, | ||
27 | - &msg_iov, | ||
28 | - 1, | ||
29 | - &msg_control, | ||
30 | - sizeof(msg_control), | ||
31 | - 0 | ||
32 | - }; | ||
33 | + struct msghdr recv_msghdr = {0}; | ||
34 | + recv_msghdr.msg_name = reply_src_addr; | ||
35 | + recv_msghdr.msg_namelen = reply_src_addr_len; | ||
36 | + recv_msghdr.msg_iov = &msg_iov; | ||
37 | + recv_msghdr.msg_iovlen = 1; | ||
38 | + recv_msghdr.msg_control = &msg_control; | ||
39 | + recv_msghdr.msg_controllen = sizeof(msg_control); | ||
40 | #if HAVE_SO_TIMESTAMPNS | ||
41 | struct cmsghdr* cmsg; | ||
42 | #endif | ||
diff --git a/meta-networking/recipes-support/fping/fping_5.1.bb b/meta-networking/recipes-support/fping/fping_5.2.bb index 0682eafa0..f75b6441b 100644 --- a/meta-networking/recipes-support/fping/fping_5.1.bb +++ b/meta-networking/recipes-support/fping/fping_5.2.bb | |||
@@ -14,10 +14,8 @@ LICENSE = "fping" | |||
14 | NO_GENERIC_LICENSE[fping] = "COPYING" | 14 | NO_GENERIC_LICENSE[fping] = "COPYING" |
15 | LIC_FILES_CHKSUM = "file://COPYING;md5=c6170fbadddfcd74f011515291d96901" | 15 | LIC_FILES_CHKSUM = "file://COPYING;md5=c6170fbadddfcd74f011515291d96901" |
16 | 16 | ||
17 | SRC_URI = "http://www.fping.org/dist/fping-${PV}.tar.gz \ | 17 | SRC_URI = "http://www.fping.org/dist/fping-${PV}.tar.gz" |
18 | file://0001-fping-Initialize-msghdr-struct-in-a-portable-way.patch \ | 18 | SRC_URI[sha256sum] = "a7692d10d73fb0bb76e1f7459aa7f19bbcdbfc5adbedef02f468974b18b0e42f" |
19 | " | ||
20 | SRC_URI[sha256sum] = "1ee5268c063d76646af2b4426052e7d81a42b657e6a77d8e7d3d2e60fd7409fe" | ||
21 | 19 | ||
22 | S = "${WORKDIR}/fping-${PV}" | 20 | S = "${WORKDIR}/fping-${PV}" |
23 | 21 | ||
diff --git a/meta-networking/recipes-support/geoip/geoip-perl_1.51.bb b/meta-networking/recipes-support/geoip/geoip-perl_1.51.bb index d8288f9b4..8e23b66c4 100644 --- a/meta-networking/recipes-support/geoip/geoip-perl_1.51.bb +++ b/meta-networking/recipes-support/geoip/geoip-perl_1.51.bb | |||
@@ -30,6 +30,7 @@ do_install_ptest () { | |||
30 | install ${S}/t/*.t* ${D}${PTEST_PATH}/t | 30 | install ${S}/t/*.t* ${D}${PTEST_PATH}/t |
31 | install ${S}/t/data/* ${D}${PTEST_PATH}/t/data | 31 | install ${S}/t/data/* ${D}${PTEST_PATH}/t/data |
32 | } | 32 | } |
33 | RDEPENDS:${PN}-ptest += "perl-modules" | ||
33 | 34 | ||
34 | FILES:${PN}-dbg += "${libdir}/perl/vendor_perl/*/auto/Geo/IP/.debug" | 35 | FILES:${PN}-dbg += "${libdir}/perl/vendor_perl/*/auto/Geo/IP/.debug" |
35 | 36 | ||
diff --git a/meta-networking/recipes-support/geoip/geoip_1.6.12.bb b/meta-networking/recipes-support/geoip/geoip_1.6.12.bb index 429cd69d6..b247823cd 100644 --- a/meta-networking/recipes-support/geoip/geoip_1.6.12.bb +++ b/meta-networking/recipes-support/geoip/geoip_1.6.12.bb | |||
@@ -46,10 +46,10 @@ EXTRA_OECONF = "--disable-static \ | |||
46 | do_install() { | 46 | do_install() { |
47 | make DESTDIR=${D} install | 47 | make DESTDIR=${D} install |
48 | install -d ${D}/${datadir}/GeoIP | 48 | install -d ${D}/${datadir}/GeoIP |
49 | install ${WORKDIR}/GeoIP.dat.${GEOIP_DATABASE_VERSION} ${D}/${datadir}/GeoIP/GeoIP.dat | 49 | install ${UNPACKDIR}/GeoIP.dat.${GEOIP_DATABASE_VERSION} ${D}/${datadir}/GeoIP/GeoIP.dat |
50 | install ${WORKDIR}/GeoIPv6.dat.${GEOIP_DATABASE_VERSION} ${D}/${datadir}/GeoIP/GeoIPv6.dat | 50 | install ${UNPACKDIR}/GeoIPv6.dat.${GEOIP_DATABASE_VERSION} ${D}/${datadir}/GeoIP/GeoIPv6.dat |
51 | install ${WORKDIR}/GeoLiteCity.dat.${GEOIP_DATABASE_VERSION} ${D}/${datadir}/GeoIP/GeoLiteCity.dat | 51 | install ${UNPACKDIR}/GeoLiteCity.dat.${GEOIP_DATABASE_VERSION} ${D}/${datadir}/GeoIP/GeoLiteCity.dat |
52 | install ${WORKDIR}/GeoLiteCityv6.dat.${GEOIP_DATABASE_VERSION} ${D}/${datadir}/GeoIP/GeoLiteCityv6.dat | 52 | install ${UNPACKDIR}/GeoLiteCityv6.dat.${GEOIP_DATABASE_VERSION} ${D}/${datadir}/GeoIP/GeoLiteCityv6.dat |
53 | ln -s GeoLiteCity.dat ${D}${datadir}/GeoIP/GeoIPCity.dat | 53 | ln -s GeoLiteCity.dat ${D}${datadir}/GeoIP/GeoIPCity.dat |
54 | } | 54 | } |
55 | 55 | ||
diff --git a/meta-networking/recipes-support/geoip/geoipupdate_2.5.0.bb b/meta-networking/recipes-support/geoip/geoipupdate_2.5.0.bb index 9a0292eac..e4dc9dee4 100644 --- a/meta-networking/recipes-support/geoip/geoipupdate_2.5.0.bb +++ b/meta-networking/recipes-support/geoip/geoipupdate_2.5.0.bb | |||
@@ -28,6 +28,6 @@ inherit autotools | |||
28 | do_install:append() { | 28 | do_install:append() { |
29 | install -d ${D}/${sysconfdir} | 29 | install -d ${D}/${sysconfdir} |
30 | install -d ${D}/${sysconfdir}/cron.d | 30 | install -d ${D}/${sysconfdir}/cron.d |
31 | install ${WORKDIR}/GeoIP.conf ${D}/${sysconfdir}/ | 31 | install ${UNPACKDIR}/GeoIP.conf ${D}/${sysconfdir}/ |
32 | install ${WORKDIR}/geoipupdate.cron ${D}/${sysconfdir}/cron.d/ | 32 | install ${UNPACKDIR}/geoipupdate.cron ${D}/${sysconfdir}/cron.d/ |
33 | } | 33 | } |
diff --git a/meta-networking/recipes-support/libtevent/libtevent_0.16.0.bb b/meta-networking/recipes-support/libtevent/libtevent_0.16.1.bb index ac80f3733..0a37d7977 100644 --- a/meta-networking/recipes-support/libtevent/libtevent_0.16.0.bb +++ b/meta-networking/recipes-support/libtevent/libtevent_0.16.1.bb | |||
@@ -17,7 +17,7 @@ SRC_URI = "https://samba.org/ftp/tevent/tevent-${PV}.tar.gz \ | |||
17 | 17 | ||
18 | LIC_FILES_CHKSUM = "file://tevent.h;endline=26;md5=47386b7c539bf2706b7ce52dc9341681" | 18 | LIC_FILES_CHKSUM = "file://tevent.h;endline=26;md5=47386b7c539bf2706b7ce52dc9341681" |
19 | 19 | ||
20 | SRC_URI[sha256sum] = "1aa58f21017ed8c2f606ae84aa7e795b5439edd4dd5f68f1a388a7d6fb40f682" | 20 | SRC_URI[sha256sum] = "362971e0f32dc1905f6fe4736319c4b8348c22dc85aa6c3f690a28efe548029e" |
21 | 21 | ||
22 | inherit pkgconfig ptest waf-samba | 22 | inherit pkgconfig ptest waf-samba |
23 | 23 | ||
diff --git a/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.19.bb b/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.19.bb index 3f945eeee..0243f2a1d 100644 --- a/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.19.bb +++ b/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.19.bb | |||
@@ -27,8 +27,8 @@ BBCLASSEXTEND = "native" | |||
27 | inherit autotools-brokensep pkgconfig binconfig ptest | 27 | inherit autotools-brokensep pkgconfig binconfig ptest |
28 | 28 | ||
29 | do_install_ptest () { | 29 | do_install_ptest () { |
30 | install -m 0755 ${WORKDIR}/v4test.sh ${D}${PTEST_PATH} | 30 | install -m 0755 ${UNPACKDIR}/v4test.sh ${D}${PTEST_PATH} |
31 | install -m 0755 ${WORKDIR}/v6test.sh ${D}${PTEST_PATH} | 31 | install -m 0755 ${UNPACKDIR}/v6test.sh ${D}${PTEST_PATH} |
32 | for testcase in `find ${B}/src/apps/.libs ${B}/src/func_tests/.libs -maxdepth 1 -type f -executable`; do | 32 | for testcase in `find ${B}/src/apps/.libs ${B}/src/func_tests/.libs -maxdepth 1 -type f -executable`; do |
33 | install $testcase ${D}${PTEST_PATH} | 33 | install $testcase ${D}${PTEST_PATH} |
34 | done | 34 | done |
diff --git a/meta-networking/recipes-support/mdio-tools/mdio-netlink_1.3.1.bb b/meta-networking/recipes-support/mdio-tools/mdio-netlink_1.3.1.bb index b50d33f90..3867b8905 100644 --- a/meta-networking/recipes-support/mdio-tools/mdio-netlink_1.3.1.bb +++ b/meta-networking/recipes-support/mdio-tools/mdio-netlink_1.3.1.bb | |||
@@ -3,11 +3,12 @@ require mdio-tools.inc | |||
3 | DEPENDS += "virtual/kernel libmnl" | 3 | DEPENDS += "virtual/kernel libmnl" |
4 | # This module requires Linux 5.6 higher | 4 | # This module requires Linux 5.6 higher |
5 | 5 | ||
6 | S = "${WORKDIR}/git/kernel" | 6 | S = "${WORKDIR}/git" |
7 | 7 | ||
8 | inherit module | 8 | inherit module |
9 | 9 | ||
10 | EXTRA_OEMAKE = "KDIR=${STAGING_KERNEL_DIR}" | 10 | EXTRA_OEMAKE = "-C kernel/ KDIR=${STAGING_KERNEL_DIR}" |
11 | MODULES_MODULE_SYMVERS_LOCATION="kernel" | ||
11 | MODULES_INSTALL_TARGET = "install" | 12 | MODULES_INSTALL_TARGET = "install" |
12 | 13 | ||
13 | RPROVIDES:${PN} += "kernel-module-mdio-netlink" | 14 | RPROVIDES:${PN} += "kernel-module-mdio-netlink" |
diff --git a/meta-networking/recipes-support/nbd/nbd/0001-nbd-client-Fix-build-on-musl-gcc14.patch b/meta-networking/recipes-support/nbd/nbd/0001-nbd-client-Fix-build-on-musl-gcc14.patch new file mode 100644 index 000000000..15b439e25 --- /dev/null +++ b/meta-networking/recipes-support/nbd/nbd/0001-nbd-client-Fix-build-on-musl-gcc14.patch | |||
@@ -0,0 +1,43 @@ | |||
1 | From 909d20a2ee4afecd5ae4cc5950c8ee599f72972d Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 20 May 2024 17:48:13 -0700 | ||
4 | Subject: [PATCH] nbd-client: Fix build on musl + gcc14 | ||
5 | |||
6 | GCC-14 has promoted incompatible-pointer-types warning into error which is | ||
7 | now flagged especially with when building on musl | ||
8 | |||
9 | Fixes following error | ||
10 | |||
11 | | ../nbd-3.26.1/nbd-client.c: In function 'openunix': | ||
12 | | ../nbd-3.26.1/nbd-client.c:345:27: error: passing argument 2 of 'connect' from incompatible pointer type [-Wincompatible-pointer-types] | ||
13 | | 345 | if (connect(sock, &un_addr, sizeof(un_addr)) == -1) { | ||
14 | | | ^~~~~~~~ | ||
15 | | | | | ||
16 | | | struct sockaddr_un * | ||
17 | | In file included from ../nbd-3.26.1/nbd-client.c:25: | ||
18 | | /mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux-musl/nbd/3.26.1/recipe-sysroot/usr/include/sys/socket.h:386:19: note: expected 'const struct sockaddr *' but argument is of type 'struct sockaddr_un *' | ||
19 | | 386 | int connect (int, const struct sockaddr *, socklen_t); | ||
20 | | | ^~~~~~~~~~~~~~~~~~~~~~~ | ||
21 | |||
22 | Upstream-Status: Submitted [https://lists.debian.org/nbd/2024/05/msg00012.html] | ||
23 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
24 | --- | ||
25 | nbd-client.c | 2 +- | ||
26 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
27 | |||
28 | diff --git a/nbd-client.c b/nbd-client.c | ||
29 | index 8d1101b..7b25c67 100644 | ||
30 | --- a/nbd-client.c | ||
31 | +++ b/nbd-client.c | ||
32 | @@ -342,7 +342,7 @@ int openunix(const char *path) { | ||
33 | return -1; | ||
34 | }; | ||
35 | |||
36 | - if (connect(sock, &un_addr, sizeof(un_addr)) == -1) { | ||
37 | + if (connect(sock, (struct sockaddr*)&un_addr, sizeof(un_addr)) == -1) { | ||
38 | err_nonfatal("CONNECT failed"); | ||
39 | close(sock); | ||
40 | return -1; | ||
41 | -- | ||
42 | 2.45.1 | ||
43 | |||
diff --git a/meta-networking/recipes-support/nbd/nbd/f0418b0d8b54c21a1e5b0c6dce3277e938d07e7c.patch b/meta-networking/recipes-support/nbd/nbd/f0418b0d8b54c21a1e5b0c6dce3277e938d07e7c.patch new file mode 100644 index 000000000..716ded55b --- /dev/null +++ b/meta-networking/recipes-support/nbd/nbd/f0418b0d8b54c21a1e5b0c6dce3277e938d07e7c.patch | |||
@@ -0,0 +1,50 @@ | |||
1 | From f0418b0d8b54c21a1e5b0c6dce3277e938d07e7c Mon Sep 17 00:00:00 2001 | ||
2 | From: Dave Jones <dave.jones@canonical.com> | ||
3 | Date: Thu, 14 Mar 2024 11:13:05 +0000 | ||
4 | Subject: [PATCH] Fix the check & no cases of enable_manpages | ||
5 | |||
6 | Currently, running "configure --disable-manpages" while docbook2man *is* | ||
7 | installed results in the error "don't know what to do here" when it | ||
8 | should disable manpages. | ||
9 | |||
10 | There also appears to be a missing conditional at the start of the line; | ||
11 | there's closing un-matched ]) at the end of the line. Still, at this | ||
12 | point the check can be done in pure shell; no need for AC macros. I've | ||
13 | also removed the confusing m4_divert_text call on the check case. Not | ||
14 | sure why that was there, but it appears unnecessary. | ||
15 | |||
16 | Upstream-Status: Backport [https://github.com/NetworkBlockDevice/nbd/commit/f0418b0d8b54c21a1e5b0c6dce3277e938d07e7c] | ||
17 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
18 | --- | ||
19 | configure.ac | 13 +++++++++---- | ||
20 | 1 file changed, 9 insertions(+), 4 deletions(-) | ||
21 | |||
22 | --- a/configure.ac | ||
23 | +++ b/configure.ac | ||
24 | @@ -328,7 +328,7 @@ AC_MSG_CHECKING([whether man pages are r | ||
25 | AC_ARG_ENABLE([manpages], | ||
26 | AS_HELP_STRING([--disable-manpages], [Do not install man pages]), | ||
27 | [], | ||
28 | - [: m4_divert_text([DEFAULTS], [enable_manpages=check])] | ||
29 | + [enable_manpages=check] | ||
30 | ) | ||
31 | AC_MSG_RESULT([$enable_manpages]) | ||
32 | |||
33 | @@ -337,9 +337,14 @@ AS_IF([test "x$enable_manpages" != "xno" | ||
34 | ]) | ||
35 | AS_IF([test "x$enable_manpages" = "xyes" -a "x$DB2M" = "x"], [ | ||
36 | AC_MSG_ERROR([docbook2man not found, but is required to build manpages]) | ||
37 | - ], | ||
38 | - [test "x$DB2M" != "x"], [enable_manpages=yes], | ||
39 | - [AC_MSG_ERROR([don't know what to do here])]) | ||
40 | + ]) | ||
41 | +if test "x$enable_manpages" = "xcheck"; then | ||
42 | + if test "x$DB2M" = "x"; then | ||
43 | + enable_manpages=no | ||
44 | + else | ||
45 | + enable_manpages=yes | ||
46 | + fi | ||
47 | +fi | ||
48 | AC_MSG_CHECKING([whether to build manpages]) | ||
49 | AC_MSG_RESULT([$enable_manpages]) | ||
50 | |||
diff --git a/meta-networking/recipes-support/nbd/nbd_3.24.bb b/meta-networking/recipes-support/nbd/nbd_3.24.bb deleted file mode 100644 index da9f82952..000000000 --- a/meta-networking/recipes-support/nbd/nbd_3.24.bb +++ /dev/null | |||
@@ -1,20 +0,0 @@ | |||
1 | DESCRIPTION = "Network Block Device" | ||
2 | HOMEPAGE = "http://nbd.sourceforge.net" | ||
3 | SECTION = "net" | ||
4 | LICENSE = "GPL-2.0-only" | ||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | ||
6 | |||
7 | DEPENDS = "autoconf-archive bison-native glib-2.0 libnl" | ||
8 | |||
9 | SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.xz" | ||
10 | SRC_URI[md5sum] = "a6d9e7bbc311a2ed07ef84a58b82b5dd" | ||
11 | SRC_URI[sha256sum] = "6877156d23a7b33f75eee89d2f5c2c91c542afc3cdcb636dea5a88539a58d10c" | ||
12 | |||
13 | inherit autotools pkgconfig | ||
14 | |||
15 | PACKAGES = "${PN}-client ${PN}-dbg ${PN}-doc ${PN}-server ${PN}-trdump ${PN}-trplay" | ||
16 | |||
17 | FILES:${PN}-client = "${sbindir}/${BPN}-client" | ||
18 | FILES:${PN}-server = "${bindir}/${BPN}-server" | ||
19 | FILES:${PN}-trdump = "${bindir}/${BPN}-trdump" | ||
20 | FILES:${PN}-trplay = "${bindir}/${BPN}-trplay" | ||
diff --git a/meta-networking/recipes-support/nbd/nbd_3.26.1.bb b/meta-networking/recipes-support/nbd/nbd_3.26.1.bb new file mode 100644 index 000000000..a69d35fa9 --- /dev/null +++ b/meta-networking/recipes-support/nbd/nbd_3.26.1.bb | |||
@@ -0,0 +1,24 @@ | |||
1 | DESCRIPTION = "Network Block Device user-space tools (TCP version)" | ||
2 | HOMEPAGE = "https://github.com/NetworkBlockDevice/nbd" | ||
3 | SECTION = "net" | ||
4 | LICENSE = "GPL-2.0-only" | ||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | ||
6 | |||
7 | DEPENDS = "autoconf-archive bison-native glib-2.0 libnl zlib bison-native" | ||
8 | |||
9 | SRC_URI = "https://github.com/NetworkBlockDevice/${BPN}/releases/download/${BP}/${BP}.tar.xz \ | ||
10 | file://f0418b0d8b54c21a1e5b0c6dce3277e938d07e7c.patch \ | ||
11 | file://0001-nbd-client-Fix-build-on-musl-gcc14.patch \ | ||
12 | " | ||
13 | SRC_URI[sha256sum] = "f0cf509fa5b20b1a07f7904eb637e9b47d3e30b6ed6f00075af5d8b701c78fef" | ||
14 | |||
15 | inherit autotools pkgconfig | ||
16 | |||
17 | EXTRA_OECONF += "--enable-syslog --enable-lfs --disable-manpages" | ||
18 | |||
19 | PACKAGES = "${PN}-client ${PN}-dbg ${PN}-doc ${PN}-server ${PN}-trdump ${PN}-trplay" | ||
20 | |||
21 | FILES:${PN}-client = "${sbindir}/${BPN}-client" | ||
22 | FILES:${PN}-server = "${bindir}/${BPN}-server" | ||
23 | FILES:${PN}-trdump = "${bindir}/${BPN}-trdump" | ||
24 | FILES:${PN}-trplay = "${bindir}/${BPN}-trplay" | ||
diff --git a/meta-networking/recipes-support/netperf/netperf_git.bb b/meta-networking/recipes-support/netperf/netperf_git.bb index 6e459eeeb..579a04b86 100644 --- a/meta-networking/recipes-support/netperf/netperf_git.bb +++ b/meta-networking/recipes-support/netperf/netperf_git.bb | |||
@@ -42,14 +42,14 @@ do_configure:prepend() { | |||
42 | } | 42 | } |
43 | 43 | ||
44 | do_install() { | 44 | do_install() { |
45 | sed -e 's#/usr/sbin/#${sbindir}/#g' -i ${WORKDIR}/init | 45 | sed -e 's#/usr/sbin/#${sbindir}/#g' -i ${UNPACKDIR}/init |
46 | install -d ${D}${sbindir} ${D}${bindir} ${D}${sysconfdir}/init.d ${D}${systemd_system_unitdir} | 46 | install -d ${D}${sbindir} ${D}${bindir} ${D}${sysconfdir}/init.d ${D}${systemd_system_unitdir} |
47 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then | 47 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then |
48 | sed -e 's#/usr/sbin/#${sbindir}/#g' ${WORKDIR}/netserver.service > ${D}${systemd_system_unitdir}/netserver.service | 48 | sed -e 's#/usr/sbin/#${sbindir}/#g' ${UNPACKDIR}/netserver.service > ${D}${systemd_system_unitdir}/netserver.service |
49 | fi | 49 | fi |
50 | install -m 4755 src/netperf ${D}${bindir} | 50 | install -m 4755 src/netperf ${D}${bindir} |
51 | install -m 4755 src/netserver ${D}${sbindir} | 51 | install -m 4755 src/netserver ${D}${sbindir} |
52 | install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/netperf | 52 | install -m 0755 ${UNPACKDIR}/init ${D}${sysconfdir}/init.d/netperf |
53 | 53 | ||
54 | # man | 54 | # man |
55 | install -d ${D}${mandir}/man1/ | 55 | install -d ${D}${mandir}/man1/ |
diff --git a/meta-networking/recipes-support/nis/yp-tools_2.14.bb b/meta-networking/recipes-support/nis/yp-tools_2.14.bb index 8b7ed6fa2..0e147826f 100644 --- a/meta-networking/recipes-support/nis/yp-tools_2.14.bb +++ b/meta-networking/recipes-support/nis/yp-tools_2.14.bb | |||
@@ -30,5 +30,5 @@ CACHED_CONFIGUREVARS += "ac_cv_prog_STRIP=/bin/true" | |||
30 | 30 | ||
31 | do_install:append() { | 31 | do_install:append() { |
32 | install -d ${D}${systemd_unitdir}/system | 32 | install -d ${D}${systemd_unitdir}/system |
33 | install -m 0644 ${WORKDIR}/domainname.service ${D}${systemd_unitdir}/system | 33 | install -m 0644 ${UNPACKDIR}/domainname.service ${D}${systemd_unitdir}/system |
34 | } | 34 | } |
diff --git a/meta-networking/recipes-support/nis/yp-tools_4.2.3.bb b/meta-networking/recipes-support/nis/yp-tools_4.2.3.bb index d2535487b..9b2c18687 100644 --- a/meta-networking/recipes-support/nis/yp-tools_4.2.3.bb +++ b/meta-networking/recipes-support/nis/yp-tools_4.2.3.bb | |||
@@ -43,5 +43,5 @@ FILES:${PN}-staticdev += " ${libdir}/yp-nis/*.a" | |||
43 | 43 | ||
44 | do_install:append() { | 44 | do_install:append() { |
45 | install -d ${D}${systemd_unitdir}/system | 45 | install -d ${D}${systemd_unitdir}/system |
46 | install -m 0644 ${WORKDIR}/domainname.service ${D}${systemd_unitdir}/system | 46 | install -m 0644 ${UNPACKDIR}/domainname.service ${D}${systemd_unitdir}/system |
47 | } | 47 | } |
diff --git a/meta-networking/recipes-support/nis/ypbind-mt_2.7.2.bb b/meta-networking/recipes-support/nis/ypbind-mt_2.7.2.bb index a95062bc8..e29730a23 100644 --- a/meta-networking/recipes-support/nis/ypbind-mt_2.7.2.bb +++ b/meta-networking/recipes-support/nis/ypbind-mt_2.7.2.bb | |||
@@ -49,10 +49,10 @@ do_install:append () { | |||
49 | install -d ${D}${sysconfdir}/init.d | 49 | install -d ${D}${sysconfdir}/init.d |
50 | install -d ${D}${sysconfdir}/rcS.d | 50 | install -d ${D}${sysconfdir}/rcS.d |
51 | 51 | ||
52 | install -m 0755 ${WORKDIR}/ypbind.init ${D}${sysconfdir}/init.d/ypbind | 52 | install -m 0755 ${UNPACKDIR}/ypbind.init ${D}${sysconfdir}/init.d/ypbind |
53 | 53 | ||
54 | install -d ${D}${systemd_unitdir}/system | 54 | install -d ${D}${systemd_unitdir}/system |
55 | install -m 0644 ${WORKDIR}/ypbind.service ${D}${systemd_unitdir}/system | 55 | install -m 0644 ${UNPACKDIR}/ypbind.service ${D}${systemd_unitdir}/system |
56 | } | 56 | } |
57 | 57 | ||
58 | # uses glibc internal APIs e.g. _hostalias | 58 | # uses glibc internal APIs e.g. _hostalias |
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 new file mode 100644 index 000000000..eefd4e1ab --- /dev/null +++ b/meta-networking/recipes-support/ntopng/files/0001-Follow-rrd-post-1.8-change.patch | |||
@@ -0,0 +1,32 @@ | |||
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/ntopng_5.2.1.bb b/meta-networking/recipes-support/ntopng/ntopng_5.2.1.bb index 110ca3686..9bb93910f 100644 --- a/meta-networking/recipes-support/ntopng/ntopng_5.2.1.bb +++ b/meta-networking/recipes-support/ntopng/ntopng_5.2.1.bb | |||
@@ -19,6 +19,7 @@ SRC_URI = "git://github.com/ntop/ntopng.git;protocol=https;branch=5.2-stable \ | |||
19 | file://0001-autogen.sh-generate-configure.ac-only.patch \ | 19 | file://0001-autogen.sh-generate-configure.ac-only.patch \ |
20 | file://0001-configure.ac.in-not-check-clang-on-host.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 \ | 21 | file://0001-configure.ac.in-Allow-dynamic-linking-against-ndpi-3.patch \ |
22 | file://0001-Follow-rrd-post-1.8-change.patch \ | ||
22 | file://ntopng.service \ | 23 | file://ntopng.service \ |
23 | " | 24 | " |
24 | 25 | ||
@@ -34,7 +35,7 @@ inherit autotools-brokensep gettext pkgconfig systemd | |||
34 | 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 ${WORKDIR}/ntopng.service ${D}${systemd_unitdir}/system | 38 | install -m 0644 ${UNPACKDIR}/ntopng.service ${D}${systemd_unitdir}/system |
38 | } | 39 | } |
39 | 40 | ||
40 | FILES:${PN} += "\ | 41 | FILES:${PN} += "\ |
diff --git a/meta-networking/recipes-support/ntp/ntp_4.2.8p17.bb b/meta-networking/recipes-support/ntp/ntp_4.2.8p18.bb index 4ed58cd6a..302cf9915 100644 --- a/meta-networking/recipes-support/ntp/ntp_4.2.8p17.bb +++ b/meta-networking/recipes-support/ntp/ntp_4.2.8p18.bb | |||
@@ -6,7 +6,7 @@ or satellite receiver or modem." | |||
6 | HOMEPAGE = "http://support.ntp.org" | 6 | HOMEPAGE = "http://support.ntp.org" |
7 | SECTION = "net" | 7 | SECTION = "net" |
8 | LICENSE = "NTP" | 8 | LICENSE = "NTP" |
9 | LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=3a8ffebbcad335abf2c39fec38671eec" | 9 | LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=2311915f6d5142b06395231b0ffeaf29" |
10 | 10 | ||
11 | DEPENDS = "libevent" | 11 | DEPENDS = "libevent" |
12 | 12 | ||
@@ -24,7 +24,7 @@ SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${PV}.tar.g | |||
24 | file://ntpd.list \ | 24 | file://ntpd.list \ |
25 | " | 25 | " |
26 | 26 | ||
27 | SRC_URI[sha256sum] = "103dd272e6a66c5b8df07dce5e9a02555fcd6f1397bdfb782237328e89d3a866" | 27 | SRC_URI[sha256sum] = "cf84c5f3fb1a295284942624d823fffa634144e096cfc4f9969ac98ef5f468e5" |
28 | 28 | ||
29 | CVE_STATUS[CVE-2016-9312] = "not-applicable-platform: Issue only applies on Windows" | 29 | CVE_STATUS[CVE-2016-9312] = "not-applicable-platform: Issue only applies on Windows" |
30 | CVE_STATUS[CVE-2019-11331] = "upstream-wontfix: inherent to RFC 5905 and cannot be fixed without breaking compatibility" | 30 | CVE_STATUS[CVE-2019-11331] = "upstream-wontfix: inherent to RFC 5905 and cannot be fixed without breaking compatibility" |
@@ -90,8 +90,8 @@ PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," | |||
90 | 90 | ||
91 | do_install:append() { | 91 | do_install:append() { |
92 | install -d ${D}${sysconfdir}/init.d | 92 | install -d ${D}${sysconfdir}/init.d |
93 | install -m 644 ${WORKDIR}/ntp.conf ${D}${sysconfdir} | 93 | install -m 644 ${UNPACKDIR}/ntp.conf ${D}${sysconfdir} |
94 | install -m 755 ${WORKDIR}/ntpd ${D}${sysconfdir}/init.d | 94 | install -m 755 ${UNPACKDIR}/ntpd ${D}${sysconfdir}/init.d |
95 | 95 | ||
96 | install -m 755 -d ${D}${NTP_USER_HOME} | 96 | install -m 755 -d ${D}${NTP_USER_HOME} |
97 | chown ntp:ntp ${D}${NTP_USER_HOME} | 97 | chown ntp:ntp ${D}${NTP_USER_HOME} |
@@ -109,14 +109,14 @@ do_install:append() { | |||
109 | sed -i '/use/i use warnings;' ${D}${sbindir}/calc_tickadj | 109 | sed -i '/use/i use warnings;' ${D}${sbindir}/calc_tickadj |
110 | 110 | ||
111 | install -d ${D}/${sysconfdir}/default | 111 | install -d ${D}/${sysconfdir}/default |
112 | install -m 0644 ${WORKDIR}/sntp ${D}${sysconfdir}/default/ | 112 | install -m 0644 ${UNPACKDIR}/sntp ${D}${sysconfdir}/default/ |
113 | 113 | ||
114 | install -d ${D}${systemd_unitdir}/system | 114 | install -d ${D}${systemd_unitdir}/system |
115 | install -m 0644 ${WORKDIR}/ntpd.service ${D}${systemd_unitdir}/system/ | 115 | install -m 0644 ${UNPACKDIR}/ntpd.service ${D}${systemd_unitdir}/system/ |
116 | install -m 0644 ${WORKDIR}/sntp.service ${D}${systemd_unitdir}/system/ | 116 | install -m 0644 ${UNPACKDIR}/sntp.service ${D}${systemd_unitdir}/system/ |
117 | 117 | ||
118 | install -d ${D}${systemd_unitdir}/ntp-units.d | 118 | install -d ${D}${systemd_unitdir}/ntp-units.d |
119 | install -m 0644 ${WORKDIR}/ntpd.list ${D}${systemd_unitdir}/ntp-units.d/60-ntpd.list | 119 | install -m 0644 ${UNPACKDIR}/ntpd.list ${D}${systemd_unitdir}/ntp-units.d/60-ntpd.list |
120 | 120 | ||
121 | # Remove the empty libexecdir and bindir. | 121 | # Remove the empty libexecdir and bindir. |
122 | rmdir --ignore-fail-on-non-empty ${D}${libexecdir} | 122 | rmdir --ignore-fail-on-non-empty ${D}${libexecdir} |
diff --git a/meta-networking/recipes-support/ntpsec/ntpsec_1.2.2a.bb b/meta-networking/recipes-support/ntpsec/ntpsec_1.2.2a.bb index 9ad97e768..872d1ce4f 100644 --- a/meta-networking/recipes-support/ntpsec/ntpsec_1.2.2a.bb +++ b/meta-networking/recipes-support/ntpsec/ntpsec_1.2.2a.bb | |||
@@ -81,7 +81,7 @@ do_install:append() { | |||
81 | install -m 755 ${S}/etc/rc/ntpd ${D}${sysconfdir}/init.d | 81 | install -m 755 ${S}/etc/rc/ntpd ${D}${sysconfdir}/init.d |
82 | cp -r ${S}/etc/ntp.d ${D}${sysconfdir} | 82 | cp -r ${S}/etc/ntp.d ${D}${sysconfdir} |
83 | 83 | ||
84 | sed -e 's:@NTP_USER_HOME@:${NTP_USER_HOME}:g' ${WORKDIR}/volatiles.ntpsec >${T}/volatiles.ntpsec | 84 | sed -e 's:@NTP_USER_HOME@:${NTP_USER_HOME}:g' ${UNPACKDIR}/volatiles.ntpsec >${T}/volatiles.ntpsec |
85 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then | 85 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then |
86 | cp ${B}/main/etc/* ${D}${systemd_system_unitdir} | 86 | cp ${B}/main/etc/* ${D}${systemd_system_unitdir} |
87 | awk '{print $1, $5, $4, $2, $3, "-"}' ${T}/volatiles.ntpsec >${T}/tmpfiles.ntpsec | 87 | awk '{print $1, $5, $4, $2, $3, "-"}' ${T}/volatiles.ntpsec >${T}/tmpfiles.ntpsec |
diff --git a/meta-networking/recipes-support/nuttcp/nuttcp_8.2.2.bb b/meta-networking/recipes-support/nuttcp/nuttcp_8.2.2.bb index 115b51e96..b02f775a5 100644 --- a/meta-networking/recipes-support/nuttcp/nuttcp_8.2.2.bb +++ b/meta-networking/recipes-support/nuttcp/nuttcp_8.2.2.bb | |||
@@ -18,7 +18,8 @@ SRC_URI = "http://nuttcp.net/${BPN}/beta/${BP}.c \ | |||
18 | SRC_URI[md5sum] = "d3c92c4d2f261221193c3726c1b9a42f" | 18 | SRC_URI[md5sum] = "d3c92c4d2f261221193c3726c1b9a42f" |
19 | SRC_URI[sha256sum] = "8c5595bcd27c2fd66831be74c390df078cfb1870aa427f2511ac2586d236c8a1" | 19 | SRC_URI[sha256sum] = "8c5595bcd27c2fd66831be74c390df078cfb1870aa427f2511ac2586d236c8a1" |
20 | 20 | ||
21 | S = "${WORKDIR}" | 21 | S = "${WORKDIR}/sources" |
22 | UNPACKDIR = "${S}" | ||
22 | 23 | ||
23 | do_compile () { | 24 | do_compile () { |
24 | ${CC} ${CFLAGS} ${LDFLAGS} -o nuttcp nuttcp-${PV}.c | 25 | ${CC} ${CFLAGS} ${LDFLAGS} -o nuttcp nuttcp-${PV}.c |
@@ -28,8 +29,8 @@ do_install () { | |||
28 | install -d ${D}${bindir} | 29 | install -d ${D}${bindir} |
29 | install -d ${D}${systemd_system_unitdir} | 30 | install -d ${D}${systemd_system_unitdir} |
30 | install -m 0755 nuttcp ${D}${bindir} | 31 | install -m 0755 nuttcp ${D}${bindir} |
31 | install -m 0644 ${WORKDIR}/nuttcp@.service ${D}${systemd_system_unitdir} | 32 | install -m 0644 ${UNPACKDIR}/nuttcp@.service ${D}${systemd_system_unitdir} |
32 | install -m 0644 ${WORKDIR}/nuttcp.socket ${D}${systemd_system_unitdir} | 33 | install -m 0644 ${UNPACKDIR}/nuttcp.socket ${D}${systemd_system_unitdir} |
33 | } | 34 | } |
34 | 35 | ||
35 | FILES:${PN} += " \ | 36 | FILES:${PN} += " \ |
diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.3.5.bb b/meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.3.5.bb index 6696e552c..7e3fe5601 100644 --- a/meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.3.5.bb +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.3.5.bb | |||
@@ -97,12 +97,12 @@ do_install:append() { | |||
97 | install -d ${D}${sysconfdir}/vmware-tools | 97 | install -d ${D}${sysconfdir}/vmware-tools |
98 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then | 98 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then |
99 | install -d ${D}${systemd_unitdir}/system | 99 | install -d ${D}${systemd_unitdir}/system |
100 | install -m 644 ${WORKDIR}/*.service ${D}${systemd_unitdir}/system | 100 | install -m 644 ${UNPACKDIR}/*.service ${D}${systemd_unitdir}/system |
101 | else | 101 | else |
102 | install -d ${D}${sysconfdir}/init.d | 102 | install -d ${D}${sysconfdir}/init.d |
103 | install -m 0755 ${WORKDIR}/vmtoolsd.init ${D}${sysconfdir}/init.d/vmtoolsd | 103 | install -m 0755 ${UNPACKDIR}/vmtoolsd.init ${D}${sysconfdir}/init.d/vmtoolsd |
104 | fi | 104 | fi |
105 | install -m 0644 ${WORKDIR}/tools.conf ${D}${sysconfdir}/vmware-tools/tools.conf | 105 | install -m 0644 ${UNPACKDIR}/tools.conf ${D}${sysconfdir}/vmware-tools/tools.conf |
106 | } | 106 | } |
107 | 107 | ||
108 | do_configure:prepend() { | 108 | do_configure:prepend() { |
@@ -120,3 +120,5 @@ python() { | |||
120 | } | 120 | } |
121 | 121 | ||
122 | CVE_PRODUCT = "open-vm-tools vmware:tools" | 122 | CVE_PRODUCT = "open-vm-tools vmware:tools" |
123 | CVE_STATUS[CVE-2014-4199] = "fixed-version: No action required. The current version (12.3.5) is not affected by the CVE which affects version 10.0.3" | ||
124 | CVE_STATUS[CVE-2014-4200] = "fixed-version: No action required. The current version (12.3.5) is not affected by the CVE which affects version 10.0.3" | ||
diff --git a/meta-networking/recipes-support/openipmi/openipmi_2.0.34.bb b/meta-networking/recipes-support/openipmi/openipmi_2.0.35.bb index eacbe5ce9..c7c757367 100644 --- a/meta-networking/recipes-support/openipmi/openipmi_2.0.34.bb +++ b/meta-networking/recipes-support/openipmi/openipmi_2.0.35.bb | |||
@@ -34,7 +34,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/openipmi/OpenIPMI-${PV}.tar.gz \ | |||
34 | 34 | ||
35 | S = "${WORKDIR}/OpenIPMI-${PV}" | 35 | S = "${WORKDIR}/OpenIPMI-${PV}" |
36 | 36 | ||
37 | SRC_URI[sha256sum] = "93227e43c72b5c3bd5949323e0669aa5527d1a971473a3a365af03fb8284a95f" | 37 | SRC_URI[sha256sum] = "b059114f6299d73f04ff6e76a0857a0ab81aa362dee99644d256b223872437ad" |
38 | 38 | ||
39 | inherit autotools-brokensep pkgconfig perlnative update-rc.d systemd cpan-base python3targetconfig | 39 | inherit autotools-brokensep pkgconfig perlnative update-rc.d systemd cpan-base python3targetconfig |
40 | 40 | ||
@@ -102,10 +102,10 @@ do_install:append () { | |||
102 | 102 | ||
103 | # for systemd | 103 | # for systemd |
104 | install -d ${D}${systemd_unitdir}/system | 104 | install -d ${D}${systemd_unitdir}/system |
105 | install -m 0664 ${WORKDIR}/ipmi.service ${D}${systemd_unitdir}/system | 105 | install -m 0664 ${UNPACKDIR}/ipmi.service ${D}${systemd_unitdir}/system |
106 | sed -i -e "s,@LIBEXECDIR@,${libexecdir},g" ${D}${systemd_unitdir}/system/ipmi.service | 106 | sed -i -e "s,@LIBEXECDIR@,${libexecdir},g" ${D}${systemd_unitdir}/system/ipmi.service |
107 | install -d ${D}${libexecdir} | 107 | install -d ${D}${libexecdir} |
108 | install -m 0755 ${WORKDIR}/openipmi-helper ${D}${libexecdir} | 108 | install -m 0755 ${UNPACKDIR}/openipmi-helper ${D}${libexecdir} |
109 | } | 109 | } |
110 | 110 | ||
111 | INITSCRIPT_NAME = "ipmi" | 111 | INITSCRIPT_NAME = "ipmi" |
diff --git a/meta-networking/recipes-support/openvpn/openvpn_2.6.10.bb b/meta-networking/recipes-support/openvpn/openvpn_2.6.10.bb index f8de78ff7..ba53d40f4 100644 --- a/meta-networking/recipes-support/openvpn/openvpn_2.6.10.bb +++ b/meta-networking/recipes-support/openvpn/openvpn_2.6.10.bb | |||
@@ -44,7 +44,7 @@ PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" | |||
44 | 44 | ||
45 | do_install:append() { | 45 | do_install:append() { |
46 | install -d ${D}/${sysconfdir}/init.d | 46 | install -d ${D}/${sysconfdir}/init.d |
47 | install -m 755 ${WORKDIR}/openvpn ${D}/${sysconfdir}/init.d | 47 | install -m 755 ${UNPACKDIR}/openvpn ${D}/${sysconfdir}/init.d |
48 | 48 | ||
49 | install -d ${D}/${sysconfdir}/openvpn | 49 | install -d ${D}/${sysconfdir}/openvpn |
50 | install -d ${D}/${sysconfdir}/openvpn/server | 50 | install -d ${D}/${sysconfdir}/openvpn/server |
diff --git a/meta-networking/recipes-support/pgpool2/pgpool2_4.5.1.bb b/meta-networking/recipes-support/pgpool2/pgpool2_4.5.1.bb index ffb879952..ddcad46be 100644 --- a/meta-networking/recipes-support/pgpool2/pgpool2_4.5.1.bb +++ b/meta-networking/recipes-support/pgpool2/pgpool2_4.5.1.bb | |||
@@ -43,8 +43,8 @@ do_configure:append() { | |||
43 | 43 | ||
44 | do_install:append() { | 44 | do_install:append() { |
45 | install -d ${D}${sysconfdir}/pgpool-II | 45 | install -d ${D}${sysconfdir}/pgpool-II |
46 | install -D -m 0644 ${WORKDIR}/pgpool.sysconfig ${D}${sysconfdir}/pgpool-II/pgpool.conf | 46 | install -D -m 0644 ${UNPACKDIR}/pgpool.sysconfig ${D}${sysconfdir}/pgpool-II/pgpool.conf |
47 | install -D -m 0644 ${S}/src/sample/pcp.conf.sample ${D}${sysconfdir}/pgpool-II/pcp.conf | 47 | install -D -m 0644 ${S}/src/sample/pcp.conf.sample ${D}${sysconfdir}/pgpool-II/pcp.conf |
48 | install -D -m 0644 ${S}/src/sample/pool_hba.conf.sample ${D}${sysconfdir}/pgpool-II/pool_hba.conf | 48 | install -D -m 0644 ${S}/src/sample/pool_hba.conf.sample ${D}${sysconfdir}/pgpool-II/pool_hba.conf |
49 | install -Dm 0644 ${WORKDIR}/pgpool.service ${D}${systemd_system_unitdir}/pgpool.service | 49 | install -Dm 0644 ${UNPACKDIR}/pgpool.service ${D}${systemd_system_unitdir}/pgpool.service |
50 | } | 50 | } |
diff --git a/meta-networking/recipes-support/smcroute/smcroute_2.5.6.bb b/meta-networking/recipes-support/smcroute/smcroute_2.5.7.bb index 09752825c..950f6a2e2 100644 --- a/meta-networking/recipes-support/smcroute/smcroute_2.5.6.bb +++ b/meta-networking/recipes-support/smcroute/smcroute_2.5.7.bb | |||
@@ -5,7 +5,7 @@ SECTION = "net" | |||
5 | LICENSE = "GPL-2.0-or-later" | 5 | LICENSE = "GPL-2.0-or-later" |
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" |
7 | 7 | ||
8 | SRCREV = "999bdd724a1f963ac8bfd0598ffdd2a3d651646e" | 8 | SRCREV = "b315d06ddb0dad16a52fe91e5831b4030ce37010" |
9 | SRC_URI = "git://github.com/troglobit/smcroute.git;branch=master;protocol=https" | 9 | SRC_URI = "git://github.com/troglobit/smcroute.git;branch=master;protocol=https" |
10 | 10 | ||
11 | S = "${WORKDIR}/git" | 11 | S = "${WORKDIR}/git" |
diff --git a/meta-networking/recipes-support/spice/spice-gtk_0.42.bb b/meta-networking/recipes-support/spice/spice-gtk_0.42.bb index 82ce7067d..c8a3f7f53 100644 --- a/meta-networking/recipes-support/spice/spice-gtk_0.42.bb +++ b/meta-networking/recipes-support/spice/spice-gtk_0.42.bb | |||
@@ -40,7 +40,7 @@ DEPENDS = " \ | |||
40 | " | 40 | " |
41 | DEPENDS:append:libc-musl = " libucontext" | 41 | DEPENDS:append:libc-musl = " libucontext" |
42 | 42 | ||
43 | RDEPENDS:${PN} = "python3-pyparsing python3-six usbids" | 43 | RDEPENDS:${PN} = "python3-pyparsing python3-six hwdata" |
44 | 44 | ||
45 | inherit meson pkgconfig vala gobject-introspection features_check gtk-doc | 45 | inherit meson pkgconfig vala gobject-introspection features_check gtk-doc |
46 | 46 | ||
@@ -59,8 +59,9 @@ do_configure:prepend() { | |||
59 | PACKAGECONFIG ??= "${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'vapi', '', d)} smartcard" | 59 | PACKAGECONFIG ??= "${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'vapi', '', d)} smartcard" |
60 | PACKAGECONFIG[vapi] = "-Dvapi=enabled,-Dvapi=disabled" | 60 | PACKAGECONFIG[vapi] = "-Dvapi=enabled,-Dvapi=disabled" |
61 | PACKAGECONFIG[smartcard] = "-Dsmartcard=enabled,-Dsmartcard=disabled,libcacard" | 61 | PACKAGECONFIG[smartcard] = "-Dsmartcard=enabled,-Dsmartcard=disabled,libcacard" |
62 | PACKAGECONFIG[webdav] = "-Dwebdav=enabled,-Dwebdav=disabled,phodav libsoup" | ||
62 | 63 | ||
63 | EXTRA_OEMESON = "-Dpie=true -Dusb-ids-path=${datadir}/usb.ids " | 64 | EXTRA_OEMESON = "-Dpie=true -Dusb-ids-path=${datadir}/hwdata/usb.ids " |
64 | EXTRA_OEMESON:append:libc-musl = " -Dcoroutine=libucontext" | 65 | EXTRA_OEMESON:append:libc-musl = " -Dcoroutine=libucontext" |
65 | 66 | ||
66 | LDFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' -Wl,--undefined-version', '', d)}" | 67 | LDFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' -Wl,--undefined-version', '', d)}" |
diff --git a/meta-networking/recipes-support/tinyproxy/tinyproxy_1.11.1.bb b/meta-networking/recipes-support/tinyproxy/tinyproxy_1.11.1.bb index 999deff4d..4f52ee2ba 100644 --- a/meta-networking/recipes-support/tinyproxy/tinyproxy_1.11.1.bb +++ b/meta-networking/recipes-support/tinyproxy/tinyproxy_1.11.1.bb | |||
@@ -36,7 +36,7 @@ SYSTEMD_AUTO_ENABLE:${PN} = "enable" | |||
36 | do_install:append() { | 36 | do_install:append() { |
37 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then | 37 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then |
38 | install -d ${D}${systemd_system_unitdir} | 38 | install -d ${D}${systemd_system_unitdir} |
39 | install -m 0644 ${WORKDIR}/tinyproxy.service ${D}${systemd_system_unitdir} | 39 | install -m 0644 ${UNPACKDIR}/tinyproxy.service ${D}${systemd_system_unitdir} |
40 | fi | 40 | fi |
41 | install -m 0644 ${WORKDIR}/tinyproxy.conf ${D}${sysconfdir}/tinyproxy.conf | 41 | install -m 0644 ${UNPACKDIR}/tinyproxy.conf ${D}${sysconfdir}/tinyproxy.conf |
42 | } | 42 | } |
diff --git a/meta-networking/recipes-support/unbound/unbound_1.19.3.bb b/meta-networking/recipes-support/unbound/unbound_1.20.0.bb index ffdc78e9d..fe0111f59 100644 --- a/meta-networking/recipes-support/unbound/unbound_1.19.3.bb +++ b/meta-networking/recipes-support/unbound/unbound_1.20.0.bb | |||
@@ -9,8 +9,8 @@ SECTION = "net" | |||
9 | LICENSE = "BSD-3-Clause" | 9 | LICENSE = "BSD-3-Clause" |
10 | LIC_FILES_CHKSUM = "file://LICENSE;md5=5308494bc0590c0cb036afd781d78f06" | 10 | LIC_FILES_CHKSUM = "file://LICENSE;md5=5308494bc0590c0cb036afd781d78f06" |
11 | 11 | ||
12 | SRC_URI = "git://github.com/NLnetLabs/unbound.git;protocol=https;branch=branch-1.19.3" | 12 | SRC_URI = "git://github.com/NLnetLabs/unbound.git;protocol=https;branch=branch-1.20.0" |
13 | SRCREV = "48b6c60a24e9a5d6d369a7a37c9fe2a767f26abd" | 13 | SRCREV = "b9525c5fd47ba481a29b90109017d2253beb105d" |
14 | 14 | ||
15 | inherit autotools pkgconfig systemd update-rc.d | 15 | inherit autotools pkgconfig systemd update-rc.d |
16 | 16 | ||
diff --git a/meta-networking/recipes-support/wireshark/wireshark_4.2.4.bb b/meta-networking/recipes-support/wireshark/wireshark_4.2.5.bb index 95db2efc4..7cbe3e632 100644 --- a/meta-networking/recipes-support/wireshark/wireshark_4.2.4.bb +++ b/meta-networking/recipes-support/wireshark/wireshark_4.2.5.bb | |||
@@ -17,7 +17,7 @@ SRC_URI = "https://1.eu.dl.wireshark.org/src/wireshark-${PV}.tar.xz \ | |||
17 | 17 | ||
18 | UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src" | 18 | UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src" |
19 | 19 | ||
20 | SRC_URI[sha256sum] = "46bd0f4474337144b30816fb2d8f14e72a26d0391f24fe0b7b619acdcdad8c0c" | 20 | SRC_URI[sha256sum] = "55e793ab87a9a73aac44336235c92cb76c52180c469b362ed3a54f26fbb1261f" |
21 | 21 | ||
22 | PE = "1" | 22 | PE = "1" |
23 | 23 | ||