diff options
Diffstat (limited to 'meta-networking')
1089 files changed, 27215 insertions, 30223 deletions
diff --git a/meta-networking/MAINTAINERS b/meta-networking/MAINTAINERS index bbb2d1b5b2..dc549d7582 100644 --- a/meta-networking/MAINTAINERS +++ b/meta-networking/MAINTAINERS @@ -8,7 +8,7 @@ When sending single patches, please use something like: git send-email -1 -M \ --to openembedded-devel@lists.openembedded.org \ - --subject-prefix=meta-networking][PATCH + --subject-prefix='meta-networking][PATCH' You may also contact the maintainers directly. @@ -26,10 +26,14 @@ Please keep this list in alphabetical order. Maintainers List (try to look for most precise areas first) COMMON -M: Joe MacDonald <joe_macdonald@mentor.com> +M: Khem Raj <raj.khem@gmail.com> +M: "Joe MacDonald (backup)" <joe@deserted.net> +L: openembedded-devel@lists.openembedded.org +Q: https://patchwork.openembedded.org/project/oe/ +S: Maintained F: conf F: recipes-* -NETKIT -M: Armin Kuster <akuster808@gmail.com> -F: recipes-netkit +OPENTHREAD +M: Stefan Schmidt <stefan@datenfreihafen.org> +F: recipes-connectivity/openthread/ diff --git a/meta-networking/README b/meta-networking/README.md index e1ba27d83b..ab2640618f 100644 --- a/meta-networking/README +++ b/meta-networking/README.md @@ -17,24 +17,23 @@ Dependencies This layer depends on: -URI: git://github.com/openembedded/openembedded-core.git +URI: git://git.openembedded.org/openembedded-core branch: master -revision: HEAD For some recipes, the meta-oe layer is required: -URI: git://github.com/openembedded/meta-openembedded.git +URI: git://git.openembedded.org/meta-openembedded subdirectory: meta-oe branch: master -revision: HEAD -URI: git://github.com/openembedded/meta-openembedded.git +URI: git://git.openembedded.org/meta-openembedded subdirectory: meta-python branch: master -revision: HEAD Maintenance ----------- +Layer maintainers: Khem Raj <raj.khem@gmail.com> + Please see the MAINTAINERS file for information on contacting the maintainers of this layer, as well as instructions for submitting patches. diff --git a/meta-networking/classes/kernel_wireless_regdb.bbclass b/meta-networking/classes/kernel_wireless_regdb.bbclass new file mode 100644 index 0000000000..9ad566c837 --- /dev/null +++ b/meta-networking/classes/kernel_wireless_regdb.bbclass @@ -0,0 +1,20 @@ +# Linux kernels before v4.15, allowed to be compiled with static +# regulatory database if it was put under net/wireless/db.txt. +# +# This class copies the regulatory plaintext database to kernel sources before +# compiling. +# +# Usage: +# 1. The class should be inherited by kernel recipe (e.g. in +# linux-yocto_%.bbappend). +# 2. For Linux kernels up to v4.14, build kernel with CONFIG_EXPERT and +# CONFIG_CFG80211_INTERNAL_REGDB. + +DEPENDS += "wireless-regdb-native" + +SRCTREECOVEREDTASKS += "do_kernel_add_regdb" +do_kernel_add_regdb() { + cp ${STAGING_LIBDIR_NATIVE}/crda/db.txt ${S}/net/wireless/db.txt +} +do_kernel_add_regdb[dirs] = "${S}" +addtask kernel_add_regdb before do_compile after do_configure diff --git a/meta-networking/classes/waf-samba.bbclass b/meta-networking/classes/waf-samba.bbclass index e490176241..79acacc989 100644 --- a/meta-networking/classes/waf-samba.bbclass +++ b/meta-networking/classes/waf-samba.bbclass @@ -1,9 +1,9 @@ # waf is a build system which is used by samba related project. # Obtain details from https://wiki.samba.org/index.php/Waf -# -inherit qemu pythonnative waf +# +inherit qemu python3native -DEPENDS += "qemu-native libxslt-native docbook-xsl-stylesheets-native python" +DEPENDS += "qemu-native libxslt-native docbook-xsl-stylesheets-native python3" CONFIGUREOPTS = " --prefix=${prefix} \ --bindir=${bindir} \ @@ -15,12 +15,35 @@ CONFIGUREOPTS = " --prefix=${prefix} \ --localstatedir=${localstatedir} \ --libdir=${libdir} \ --includedir=${includedir} \ - --oldincludedir=${oldincludedir} \ + --oldincludedir=${includedir} \ --infodir=${infodir} \ --mandir=${mandir} \ ${PACKAGECONFIG_CONFARGS} \ " +# avoids build breaks when using no-static-libs.inc +DISABLE_STATIC = "" + +def get_waf_parallel_make(d): + pm = d.getVar('PARALLEL_MAKE') + if pm: + # look for '-j' and throw other options (e.g. '-l') away + # because they might have different meaning in bjam + pm = pm.split() + while pm: + opt = pm.pop(0) + if opt == '-j': + v = pm.pop(0) + elif opt.startswith('-j'): + v = opt[2:].strip() + else: + continue + + v = min(64, int(v)) + return '-j' + str(v) + + return "" + # Three methods for waf cross compile: # 1. answers: # Only --cross-answers - try the cross-answers file, and if @@ -72,6 +95,8 @@ do_configure() { export STAGING_LIBDIR=${STAGING_LIBDIR} export STAGING_INCDIR=${STAGING_INCDIR} export PYTHONPATH=${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} + export PYTHONARCHDIR=${PYTHON_SITEPACKAGES_DIR} + export PYTHON_CONFIG=${STAGING_EXECPREFIXDIR}/python-target-config/python3-config CONFIG_CMD="./configure ${CONFIGUREOPTS} ${EXTRA_OECONF} --cross-compile" if [ "${CROSS_METHOD}" = "answer" ]; then @@ -86,8 +111,9 @@ do_configure() { fi } +do_compile[progress] = "outof:^\[\s*(\d+)/\s*(\d+)\]\s+" do_compile () { - python ./buildtools/bin/waf ${@get_waf_parallel_make(d)} + python3 ./buildtools/bin/waf ${@oe.utils.parallel_make_argument(d, '-j%d', limit=64)} } do_install() { 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 0000000000..45eed5398e --- /dev/null +++ b/meta-networking/conf/include/non-repro-meta-networking.inc @@ -0,0 +1,57 @@ +# List of known non-reproducible package of the meta-networking layer +# Please keep this list sorted +KNOWN_NON_REPRO_META_NETWORKING = " \ + blueman \ + blueman-dbg \ + blueman-src \ + civetweb-dev \ + dhcp-relay-staticdev \ + ettercap-src \ + fetchmail \ + fetchmail-dbg \ + freediameter \ + freediameter-src \ + freeradius \ + htpdate-doc \ + keepalived \ + keepalived-dbg \ + libbearssl-staticdev \ + libfko3 \ + libfko-client \ + libfko-daemon \ + libfko-dbg \ + libmosquitto1 \ + libowfat-staticdev \ + libruli-staticdev \ + libsamba-util0 \ + mosquitto \ + mosquitto-dbg \ + ncftp \ + ncftp-dbg \ + ncftp-src \ + ndisc6-dbg \ + ndisc6-misc \ + ndisc6-ndisc6 \ + ndisc6-rdisc6 \ + ndisc6-rdnssd \ + ndisc6-rltraceroute6 \ + netsniff-ng-doc \ + ntpsec-src \ + openl2tp \ + openl2tp-dbg \ + ot-br-posix \ + ot-br-posix-dbg \ + postfix-cfg \ + proftpd \ + proftpd-dbg \ + proftpd-dev \ + rdist \ + rdist-dbg \ + samba-dbg \ + tayga \ + tayga-dbg \ + wolfssl \ + wolfssl-dbg \ + znc \ + znc-doc \ +" diff --git a/meta-networking/conf/include/ptest-packagelists-meta-networking.inc b/meta-networking/conf/include/ptest-packagelists-meta-networking.inc new file mode 100644 index 0000000000..7ec6f9063d --- /dev/null +++ b/meta-networking/conf/include/ptest-packagelists-meta-networking.inc @@ -0,0 +1,37 @@ +# +# Lists of the ptest in meta-networking, sorted into two sets by the time they take +# Please keep these sorted in alphabetical order +# +# A first pass at getting all meta-networking recipes which inherit ptest +# meta_networking_ptest_recipes=$(bitbake-layers show-recipes --recipes-only --layer meta-networking --inherits ptest --bare | sed -e '1,/=== Matching recipes: ===/d') +# ptests which take less than ~30s each + +PTESTS_FAST_META_NETWORKING = "\ + freediameter \ + geoip \ + libcoap \ + libldb \ + libnftnl \ + libtalloc \ + libtdb \ + lldpd \ + mbedtls \ + openhpi \ + squid \ + tcpdump \ +" + +# firewalld currently hangs forever so disable it for now +# firewalld +PTESTS_SLOW_META_NETWORKING = "\ + net-snmp \ +" + +PTESTS_PROBLEMS_META_NETWORKING = "\ + geoip-perl \ + libtevent \ + lksctp-tools \ + nftables \ + openl2tp \ + python3-scapy \ +" diff --git a/meta-networking/conf/layer.conf b/meta-networking/conf/layer.conf index 2dfde4bdf4..a9ba4abade 100644 --- a/meta-networking/conf/layer.conf +++ b/meta-networking/conf/layer.conf @@ -13,12 +13,17 @@ BBFILE_PRIORITY_networking-layer = "5" # cause compatibility issues with other layers LAYERVERSION_networking-layer = "1" -LAYERDEPENDS_networking-layer = "core" -LAYERDEPENDS_networking-layer += "openembedded-layer" -LAYERDEPENDS_networking-layer += "meta-python" +LAYERDEPENDS_networking-layer = "core meta-python openembedded-layer" + +LAYERSERIES_COMPAT_networking-layer = "styhead" LICENSE_PATH += "${LAYERDIR}/licenses" SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ wireguard-tools->wireguard-module \ + mdio-tools->mdio-netlink \ + ot-br-posix->ipset \ +" +BBFILES_DYNAMIC += " \ + meta-python:${LAYERDIR}/dynamic-layers/meta-python/recipes-*/*/*.bb \ " diff --git a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/files/firewalld.init b/meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/files/firewalld.init new file mode 100644 index 0000000000..08e8930b97 --- /dev/null +++ b/meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/files/firewalld.init @@ -0,0 +1,48 @@ +#!/bin/sh + +### BEGIN INIT INFO +# Provides: firewalld +# Required-Start: $syslog $local_fs messagebus +# Required-Stop: +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: +# Description: +### END INIT INFO + +. /etc/init.d/functions + +firewalld=/usr/sbin/firewalld +pidfile=/var/run/firewalld.pid + +case "$1" in + start) + echo -n "Starting firewalld: " + start-stop-daemon --start --quiet --exec $firewalld + echo "." + ;; + stop) + echo -n "Stopping firewalld: " + start-stop-daemon --stop --quiet --pidfile $pidfile + echo "." + ;; + restart) + echo -n "Stopping firewalld: " + start-stop-daemon --stop --quiet --pidfile $pidfile + echo "." + echo -n "Starting firewalld: " + start-stop-daemon --start --quiet --exec $firewalld + echo "." + ;; + reload) + echo -n "Reloading firewalld: " + firewall-cmd --reload + echo "." + ;; + status) + firewall-cmd --state + ;; + *) + echo "Usage: /etc/init.d/firewalld {start|stop|restart|reload|status}" >&2 + exit 1 +esac diff --git a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/files/run-ptest b/meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/files/run-ptest new file mode 100644 index 0000000000..9d3ec79042 --- /dev/null +++ b/meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/files/run-ptest @@ -0,0 +1,21 @@ +#!/bin/sh + +ret_val=0 + +# Check if all the kernel modules are available +FIREWALLD_KERNEL_MODULES="@@FIREWALLD_KERNEL_MODULES@@" +for m in $FIREWALLD_KERNEL_MODULES; do + if modprobe $m; then + echo "PASS: loading $m" + else + echo "FAIL: loading $m" + ret_val=1 + fi +done + +# Run the test suite from firewalld +# Failing testsuites: 203 226 241 250 270 280 281 282 285 286 +# Problem icmpv6 compared against ipv6-icmptype? +/usr/share/firewalld/testsuite/testsuite -C /tmp -A || ret_val=1 + +exit $ret_val 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 new file mode 100644 index 0000000000..12cc6645b5 --- /dev/null +++ b/meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/firewalld_1.3.2.bb @@ -0,0 +1,312 @@ +SUMMARY = "Dynamic firewall daemon with a D-Bus interface" +HOMEPAGE = "https://firewalld.org/" +BUGTRACKER = "https://github.com/firewalld/firewalld/issues" +UPSTREAM_CHECK_URI = "https://github.com/firewalld/firewalld/releases" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRC_URI = "\ + https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.bz2 \ + file://firewalld.init \ + file://run-ptest \ +" +SRC_URI[sha256sum] = "aba0d8ce9617b906ea4866bf0bdfb2c2d5312f53b8e9e8e9e4d49bf330da5b5e" + +# glib-2.0-native is needed for GSETTINGS_RULES autoconf macro from gsettings.m4 +DEPENDS = "intltool-native glib-2.0-native nftables" + +inherit gettext autotools-brokensep bash-completion pkgconfig python3native python3-dir gsettings systemd update-rc.d ptest features_check + +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG[systemd] = "--with-systemd-unitdir=${systemd_system_unitdir},--disable-systemd" +PACKAGECONFIG[docs] = "--with-xml-catalog=${STAGING_ETCDIR_NATIVE}/xml/catalog,--disable-docs,libxslt-native docbook-xsl-stylesheets-native" +PACKAGECONFIG[ipset] = "--with-ipset=${sbindir}/ipset,--without-ipset,,ipset" +PACKAGECONFIG[ebtables] = "--with-ebtables=${base_sbindir}/ebtables --with-ebtables-restore=${sbindir}/ebtables-legacy-restore,--without-ebtables --without-ebtables-restore,,ebtables" + +# Default logging configuration: mixed syslog file console +FIREWALLD_DEFAULT_LOG_TARGET ??= "syslog" + +# The UIs are not yet tested and the dependencies are probably not quite correct yet. +# Splitting into separate packages is beneficial so that no dead code is transferred +# to the target device. +# Without enabling qt5, the firewalld-config package is not usable. +# Without enabling qt5 and gtk, the firewalld-applet package is not usable. +PACKAGECONFIG[qt5] = "" +PACKAGECONFIG[gtk] = "" + +PACKAGES =+ "python3-firewall ${PN}-applet ${PN}-config ${PN}-offline-cmd ${PN}-zsh-completion ${PN}-log-rotate" + +# iptables, ip6tables, ebtables, and ipset *should* be unnecessary +# when the nftables backend is available, because nftables supersedes all of them. +# However we still need iptables and ip6tables to be available otherwise any +# application relying on "direct passthrough" rules (such as docker) will break. +# /etc/sysconfig/firewalld is a Red Hat-ism, only referenced by +# the Red Hat-specific init script which we aren't using, so we disable that. +EXTRA_OECONF = "\ + --with-iptables=${sbindir}/iptables \ + --with-iptables-restore=${sbindir}/iptables-restore \ + --with-ip6tables=${sbindir}/ip6tables \ + --with-ip6tables-restore=${sbindir}/ip6tables-restore \ + --disable-sysconfig \ +" + +INITSCRIPT_NAME = "firewalld" +SYSTEMD_SERVICE:${PN} = "firewalld.service" + +# kernel modules loaded after ptest execution (linux-yocto 5.15) +FIREWALLD_KERNEL_MODULES ?= "\ + xt_tcpudp \ + xt_TCPMSS \ + xt_set \ + xt_sctp \ + xt_REDIRECT \ + xt_pkttype \ + xt_NFLOG \ + xt_nat \ + xt_MASQUERADE \ + xt_mark \ + xt_mac \ + xt_LOG \ + xt_limit \ + xt_dccp \ + xt_CT \ + xt_conntrack \ + xt_CHECKSUM \ + nft_redir \ + nft_objref \ + nft_nat \ + nft_masq \ + nft_log \ + nfnetlink_log \ + nf_nat_tftp \ + nf_nat_sip \ + nf_nat_ftp \ + nf_log_syslog \ + nf_conntrack_tftp \ + nf_conntrack_sip \ + nf_conntrack_netbios_ns \ + nf_conntrack_ftp \ + nf_conntrack_broadcast \ + ipt_REJECT \ + ip6t_rpfilter \ + ip6t_REJECT \ + ip_set_hash_netport \ + ip_set_hash_netnet \ + ip_set_hash_netiface \ + ip_set_hash_net \ + ip_set_hash_mac \ + ip_set_hash_ipportnet \ + ip_set_hash_ipport \ + ip_set_hash_ipmark \ + ip_set_hash_ip \ + ebt_ip6 \ + nft_fib_inet \ + nft_fib_ipv4 \ + nft_fib_ipv6 \ + nft_fib \ + nft_reject_inet \ + nf_reject_ipv4 \ + nf_reject_ipv6 \ + nft_reject \ + nft_ct \ + nft_chain_nat \ + ebtable_nat \ + ebtable_broute \ + ip6table_nat \ + ip6table_mangle \ + ip6table_raw \ + ip6table_security \ + iptable_nat \ + nf_nat \ + nf_conntrack \ + nf_defrag_ipv6 \ + nf_defrag_ipv4 \ + iptable_mangle \ + iptable_raw \ + iptable_security \ + ip_set \ + ebtable_filter \ + ebtables \ + ip6table_filter \ + ip6_tables \ + iptable_filter \ + ip_tables \ + x_tables \ + sch_fq_codel \ +" + +do_configure:prepend() { + export DEFAULT_LOG_TARGET=${FIREWALLD_DEFAULT_LOG_TARGET} +} + +do_install:append() { + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'false', 'true', d)}; then + # firewalld ships an init script but it contains Red Hat-isms, replace it with our own + rm -rf ${D}${sysconfdir}/rc.d/ + install -d ${D}${sysconfdir}/init.d + install -m0755 ${UNPACKDIR}/firewalld.init ${D}${sysconfdir}/init.d/firewalld + fi + + if ${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'false', 'true', d)}; then + # Delete polkit profiles if polkit is not available + rm -rf ${D}${datadir}/polkit-1 + fi + + # We ran ./configure with PYTHON pointed at the binary inside $STAGING_BINDIR_NATIVE + # so now we need to fix up any references to point at the proper path in the image. + # This hack is also in distutils.bbclass, but firewalld doesn't use distutils/setuptools. + if [ ${PN} != "${BPN}-native" ]; then + sed -i -e s:${STAGING_BINDIR_NATIVE}/python3-native/python3:${bindir}/python3:g \ + ${D}${bindir}/* ${D}${sbindir}/* ${D}${sysconfdir}/firewalld/*.xml + fi + sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g \ + ${D}${bindir}/* ${D}${sbindir}/* ${D}${sysconfdir}/firewalld/*.xml + + # This file contains Red Hat-isms. Modules get loaded without it. + rm -f ${D}${sysconfdir}/modprobe.d/firewalld-sysctls.conf +} + +do_install_ptest:append() { + # Add kernel modules to the ptest script + if [ ${PTEST_ENABLED} = "1" ]; then + sed -i -e 's:@@FIREWALLD_KERNEL_MODULES@@:${FIREWALLD_KERNEL_MODULES}:g' \ + ${D}${PTEST_PATH}/run-ptest + fi +} + +SUMMARY:python3-firewall = "${SUMMARY} (Python3 bindings)" +FILES:python3-firewall = "\ + ${PYTHON_SITEPACKAGES_DIR}/firewall/__pycache__/*.py* \ + ${PYTHON_SITEPACKAGES_DIR}/firewall/*.py* \ + ${PYTHON_SITEPACKAGES_DIR}/firewall/config/*.py* \ + ${PYTHON_SITEPACKAGES_DIR}/firewall/config/__pycache__/*.py* \ + ${PYTHON_SITEPACKAGES_DIR}/firewall/core/*.py* \ + ${PYTHON_SITEPACKAGES_DIR}/firewall/core/__pycache__/*.py* \ + ${PYTHON_SITEPACKAGES_DIR}/firewall/core/io/*.py* \ + ${PYTHON_SITEPACKAGES_DIR}/firewall/core/io/__pycache__/*.py* \ + ${PYTHON_SITEPACKAGES_DIR}/firewall/server/*.py* \ + ${PYTHON_SITEPACKAGES_DIR}/firewall/server/__pycache__/*.py* \ +" +RDEPENDS:python3-firewall = "\ + python3-dbus \ + nftables-python \ + python3-pygobject \ +" + +# Do not depend on QT5 layer and GTK deps if not explicitely required. +FIREWALLD_QT5_RDEPENDS = "\ + ${PN}-config \ + hicolor-icon-theme \ + python3-pyqt5 \ + python3-pygobject \ + libnotify \ + networkmanager \ +" +FIREWALLD_GTK_RDEPENDS = "\ + gtk3 \ +" + +# A QT5 based UI +SUMMARY:${PN}-config = "${SUMMARY} (configuration application)" +FILES:${PN}-config = "\ + ${bindir}/firewall-config \ + ${datadir}/firewalld/firewall-config.glade \ + ${datadir}/firewalld/gtk3_chooserbutton.py* \ + ${datadir}/firewalld/gtk3_niceexpander.py* \ + ${datadir}/applications/firewall-config.desktop \ + ${datadir}/metainfo/firewall-config.appdata.xml \ + ${datadir}/icons/hicolor/*/apps/firewall-config*.* \ +" +RDEPENDS:${PN}-config += "\ + python3-core \ + python3-ctypes \ + ${@bb.utils.contains('PACKAGECONFIG', 'qt5', '${FIREWALLD_QT5_RDEPENDS}', '', d)} \ +" + +# A GTK3 applet depending on the QT5 firewall-config UI +SUMMARY:${PN}-applet = "${SUMMARY} (panel applet)" +FILES:${PN}-applet += "\ + ${bindir}/firewall-applet \ + ${sysconfdir}/xdg/autostart/firewall-applet.desktop \ + ${sysconfdir}/firewall/applet.conf \ + ${datadir}/icons/hicolor/*/apps/firewall-applet*.* \ +" +RDEPENDS:${PN}-applet += "\ + python3-core \ + python3-ctypes \ + ${@bb.utils.contains('PACKAGECONFIG', 'qt5', '${FIREWALLD_QT5_RDEPENDS}', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'gtk', '${FIREWALLD_GTK_RDEPENDS}', '', d)} \ +" + +SUMMARY:${PN}-offline-cmd = "${SUMMARY} (offline configuration utility)" +FILES:${PN}-offline-cmd += " \ + ${bindir}/firewall-offline-cmd \ +" +RDEPENDS:${PN}-offline-cmd += "python3-core" + +SUMMARY:${PN}-log-rotate = "${SUMMARY} (log-rotate configuration)" +FILES:${PN}-log-rotate += "${sysconfdir}/logrotate.d" + +# To get allmost all tests passing +# - Enable PACKAGECONFIG ipset, ebtable +# - Enough RAM QB_MEM = "-m 8192" (used für fancy ipset tests) +FILES:${PN}-ptest += "\ + ${datadir}/firewalld/testsuite \ +" +RDEPENDS:${PN}-ptest += "\ + python3-unittest \ + ${PN}-offline-cmd \ + procps-ps \ + iproute2 \ +" +RDEPENDS:${PN}-ptest:append:libc-glibc = " glibc-utils glibc-localedata-en-us" + +FILES:${PN}-zsh-completion = "${datadir}/zsh/site-functions" + +FILES:${PN} += "\ + ${PYTHON_SITEPACKAGES_DIR}/firewall \ + ${nonarch_libdir}/firewalld \ + ${datadir}/dbus-1 \ + ${datadir}/polkit-1 \ + ${datadir}/metainfo \ + ${datadir}/glib-2.0/schemas/org.fedoraproject.FirewallConfig.gschema.xml \ +" +RDEPENDS:${PN} += "\ + python3-firewall \ + iptables \ + python3-core \ + python3-io \ + python3-fcntl \ + python3-syslog \ + python3-xml \ + python3-json \ + python3-ctypes \ + python3-pprint \ +" +# If firewalld writes a log file rotation is needed +RRECOMMENDS:${PN} += "${@bb.utils.contains_any('FIREWALLD_DEFAULT_LOG_TARGET', [ 'mixed', 'file' ], '${PN}-log-rotate', '', d)}" + +# Add required kernel modules. With Yocto kernel 5.15 this currently means: +# - features/nf_tables/nf_tables.scc +# - features/netfilter/netfilter.scc +# - cgl/features/audit/audit.scc +# - cfg/net/ip6_nf.scc +# - Plus: +# - ebtables +# - ipset +# - CONFIG_IP6_NF_SECURITY=m +# - CONFIG_IP6_NF_MATCH_RPFILTER=m +# - CONFIG_IP6_NF_TARGET_REJECT=m +# - CONFIG_NFT_OBJREF=m +# - CONFIG_NFT_FIB=m +# - CONFIG_NFT_FIB_INET=m +# - CONFIG_NFT_FIB_IPV4=m +# - CONFIG_NFT_FIB_IPV6=m +# - CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m +# - CONFIG_NETFILTER_XT_SET=m +def get_kernel_deps(d): + kmodules = (d.getVar('FIREWALLD_KERNEL_MODULES') or "").split() + return ' '.join([ 'kernel-module-' + mod.replace('_', '-').lower() for mod in kmodules ]) +RRECOMMENDS:${PN} += "${@get_kernel_deps(d)}" diff --git a/meta-networking/dynamic-layers/meta-python/recipes-printing/system-config-printer/system-config-printer_1.5.18.bb b/meta-networking/dynamic-layers/meta-python/recipes-printing/system-config-printer/system-config-printer_1.5.18.bb new file mode 100644 index 0000000000..bff16b4412 --- /dev/null +++ b/meta-networking/dynamic-layers/meta-python/recipes-printing/system-config-printer/system-config-printer_1.5.18.bb @@ -0,0 +1,50 @@ +DESCRIPTION = "a graphical user interface that allows the user to change print settings" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRC_URI = "git://github.com/OpenPrinting/system-config-printer.git;protocol=https;branch=master" + +SRCREV = "895d3dec50c93bfd4f142bac9bfcc13051bf84cb" +S = "${WORKDIR}/git" + +inherit autotools gettext pkgconfig python3native features_check + +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" + +DEPENDS = "cups glib-2.0 libusb xmlto-native desktop-file-utils-native autoconf-archive-native python3-setuptools-native" + +PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd polkit', d)}" +PACKAGECONFIG[systemd] = ",--without-systemdsystemunitdir,systemd" +PACKAGECONFIG[polkit] = ",,,cups-pk-helper" + +do_configure:prepend() { + # This file is not provided if fetching from git but required for configure + touch ${S}/ChangeLog +} + +do_install:append() { + cp -rf ${B}/cupshelpers.egg-info ${D}${PYTHON_SITEPACKAGES_DIR} + cp -rf ${B}/cupshelpers ${D}${PYTHON_SITEPACKAGES_DIR} + rm -rf ${D}${PYTHON_SITEPACKAGES_DIR}/*.egg + for f in __init__.cpython-311.pyc cupshelpers.cpython-311.pyc \ + config.cpython-311.pyc ppds.cpython-311.pyc \ + installdriver.cpython-311.pyc openprinting.cpython-311.pyc \ + xmldriverprefs.cpython-311.pyc; do + rm -rf ${D}${PYTHON_SITEPACKAGES_DIR}/cupshelpers/__pycache__/$f + done +} + +FILES:${PN} += "${libdir} ${datadir}" + +RDEPENDS:${PN} = " \ + cups \ + dbus-x11 \ + gtk+3 \ + libnotify \ + python3-core \ + python3-dbus \ + python3-firewall \ + python3-pycups \ + python3-pycurl \ + python3-pygobject \ +" diff --git a/meta-networking/files/static-group-meta-networking b/meta-networking/files/static-group-meta-networking new file mode 100644 index 0000000000..dbdc7a5b9b --- /dev/null +++ b/meta-networking/files/static-group-meta-networking @@ -0,0 +1,15 @@ +ftp:x:630: +dovecot:x:631: +dovenull:x:632: +postfix:x:633: +postdrop:x:634: +vmail:x:635: +frr:x:637: +frrvty:x:638: +nogroup:x:65534: +ftp:x:640: +rwhod:x:641: +lldpd:x:642: +opensaf:x:643: +radiusd:x:651: +ntp:x:653: diff --git a/meta-networking/files/static-passwd-meta-networking b/meta-networking/files/static-passwd-meta-networking new file mode 100644 index 0000000000..bca257bb27 --- /dev/null +++ b/meta-networking/files/static-passwd-meta-networking @@ -0,0 +1,19 @@ +ftp:x:630:630::/:/bin/nologin +dovecot:x:631:631::/:/bin/nologin +dovenull:x:632:632::/:/bin/nologin +postfix:x:633:633::/:/bin/nologin +vmail:x:635:635::/:/bin/nologin +radvd:x:636:nogroup::${localstatedir}/run/radvd/:/bin/nologin +frr:x:637:637::/:/bin/nologin +ftp:x:640:640::/:/bin/nologin +rwhod:x:641:641::/:/bin/nologin +lldpd:x:642:642::/:/bin/nologin +opensaf:x:643:643::/:/bin/nologin +tinyproxy:x:650:nogroup::/:/bin/nologin +radiusd:x:651:radiusd::/:/bin/nologin +nm-openconnect:x:652:nogroup::/:/bin/nologin +ntp:x:653:ntp::/:/bin/nologin +nm-fortisslvpn:x:654:nogroup::/:/bin/nologin +nm-openvpn:x:655:nogroup::/:/bin/nologin +squid:x:656:nogroup::/:/bin/nologin +mosquitto:x:657:nogroup::/:/bin/nologin diff --git a/meta-networking/files/waf-cross-answers/cross-answers-aarch64.txt b/meta-networking/files/waf-cross-answers/cross-answers-aarch64.txt index 1023f6aff3..ea561073ed 100644 --- a/meta-networking/files/waf-cross-answers/cross-answers-aarch64.txt +++ b/meta-networking/files/waf-cross-answers/cross-answers-aarch64.txt @@ -37,3 +37,11 @@ Checking for small off_t: NO Checking whether blkcnt_t is 32 bit: NO Checking whether blkcnt_t is 64 bit: OK Checking whether fcntl lock supports open file description locks: OK +Checking for a 64-bit host to support lmdb: OK +Checking errno of iconv for illegal multibyte sequence: NO +Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK +Checking value of GNUTLS_MAC_AES_CMAC_128: OK +Checking whether fcntl supports flags to send direct I/O availability signals: NO +Checking whether fcntl supports setting/getting hints: NO +Checking for readlink breakage: NO +Checking for gnutls fips mode support: NO diff --git a/meta-networking/files/waf-cross-answers/cross-answers-aarch64_be.txt b/meta-networking/files/waf-cross-answers/cross-answers-aarch64_be.txt new file mode 100644 index 0000000000..ea561073ed --- /dev/null +++ b/meta-networking/files/waf-cross-answers/cross-answers-aarch64_be.txt @@ -0,0 +1,47 @@ +Checking uname sysname type: "Linux" +Checking uname version type: "# Wed May 20 10:34:39 UTC 2015" +Checking simple C program: "hello world" +rpath library support: OK +-Wl,--version-script support: OK +Checking getconf LFS_CFLAGS: NO +Checking correct behavior of strtoll: NO +Checking for working strptime: OK +Checking for C99 vsnprintf: "1" +Checking for HAVE_SHARED_MMAP: OK +Checking for HAVE_MREMAP: OK +Checking for HAVE_SECURE_MKSTEMP: OK +Checking for HAVE_IFACE_GETIFADDRS: NO +Checking for HAVE_IFACE_IFCONF: NO +Checking for HAVE_IFACE_IFREQ: NO +Checking for large file support without additional flags: OK +Checking for HAVE_INCOHERENT_MMAP: NO +Checking value of NSIG: "65" +Checking value of _NSIG: "65" +Checking value of SIGRTMAX: "64" +Checking value of SIGRTMIN: "34" +Checking whether the WRFILE -keytab is supported: OK +Checking for kernel change notify support: OK +Checking for Linux kernel oplocks: OK +Checking for kernel share modes: OK +Checking whether POSIX capabilities are available: OK +Checking if can we convert from CP850 to UCS-2LE: OK +Checking if can we convert from UTF-8 to UCS-2LE: OK +vfs_fileid checking for statfs() and struct statfs.f_fsid: OK +Checking whether we can use Linux thread-specific credentials: OK +Checking whether fcntl locking is available: OK +Checking for the maximum value of the 'time_t' type: OK +Checking whether the realpath function allows a NULL argument: OK +Checking for ftruncate extend: OK +getcwd takes a NULL argument: OK +Checking for small off_t: NO +Checking whether blkcnt_t is 32 bit: NO +Checking whether blkcnt_t is 64 bit: OK +Checking whether fcntl lock supports open file description locks: OK +Checking for a 64-bit host to support lmdb: OK +Checking errno of iconv for illegal multibyte sequence: NO +Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK +Checking value of GNUTLS_MAC_AES_CMAC_128: OK +Checking whether fcntl supports flags to send direct I/O availability signals: NO +Checking whether fcntl supports setting/getting hints: NO +Checking for readlink breakage: NO +Checking for gnutls fips mode support: NO diff --git a/meta-networking/files/waf-cross-answers/cross-answers-arm.txt b/meta-networking/files/waf-cross-answers/cross-answers-arm.txt index a5cd9981a3..5655a65852 100644 --- a/meta-networking/files/waf-cross-answers/cross-answers-arm.txt +++ b/meta-networking/files/waf-cross-answers/cross-answers-arm.txt @@ -38,3 +38,11 @@ Checking for small off_t: NO Checking whether blkcnt_t is 32 bit: NO Checking whether blkcnt_t is 64 bit: OK Checking whether fcntl lock supports open file description locks: OK +Checking for a 64-bit host to support lmdb: NO +Checking errno of iconv for illegal multibyte sequence: NO +Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK +Checking value of GNUTLS_MAC_AES_CMAC_128: OK +Checking whether fcntl supports flags to send direct I/O availability signals: NO +Checking whether fcntl supports setting/getting hints: NO +Checking for readlink breakage: NO +Checking for gnutls fips mode support: NO diff --git a/meta-networking/files/waf-cross-answers/cross-answers-armeb.txt b/meta-networking/files/waf-cross-answers/cross-answers-armeb.txt new file mode 100644 index 0000000000..5655a65852 --- /dev/null +++ b/meta-networking/files/waf-cross-answers/cross-answers-armeb.txt @@ -0,0 +1,48 @@ +Checking uname sysname type: "Linux" +Checking uname version type: "# Wed May 20 10:34:39 UTC 2015" +Checking simple C program: "hello world" +rpath library support: OK +-Wl,--version-script support: OK +Checking getconf LFS_CFLAGS: NO +Checking correct behavior of strtoll: NO +Checking for working strptime: OK +Checking for C99 vsnprintf: "1" +Checking for HAVE_SHARED_MMAP: OK +Checking for HAVE_MREMAP: OK +Checking for HAVE_SECURE_MKSTEMP: OK +Checking for HAVE_IFACE_GETIFADDRS: NO +Checking for HAVE_IFACE_IFCONF: NO +Checking for HAVE_IFACE_IFREQ: NO +Checking for large file support without additional flags: NO +Checking for -D_FILE_OFFSET_BITS=64: OK +Checking for HAVE_INCOHERENT_MMAP: NO +Checking value of NSIG: "65" +Checking value of _NSIG: "65" +Checking value of SIGRTMAX: "64" +Checking value of SIGRTMIN: "34" +Checking whether the WRFILE -keytab is supported: OK +Checking for kernel change notify support: OK +Checking for Linux kernel oplocks: OK +Checking for kernel share modes: OK +Checking whether POSIX capabilities are available: OK +Checking if can we convert from CP850 to UCS-2LE: OK +Checking if can we convert from UTF-8 to UCS-2LE: OK +vfs_fileid checking for statfs() and struct statfs.f_fsid: OK +Checking whether we can use Linux thread-specific credentials with 32-bit system calls: OK +Checking whether fcntl locking is available: OK +Checking for the maximum value of the 'time_t' type: NO +Checking whether the realpath function allows a NULL argument: OK +Checking for ftruncate extend: OK +getcwd takes a NULL argument: OK +Checking for small off_t: NO +Checking whether blkcnt_t is 32 bit: NO +Checking whether blkcnt_t is 64 bit: OK +Checking whether fcntl lock supports open file description locks: OK +Checking for a 64-bit host to support lmdb: NO +Checking errno of iconv for illegal multibyte sequence: NO +Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK +Checking value of GNUTLS_MAC_AES_CMAC_128: OK +Checking whether fcntl supports flags to send direct I/O availability signals: NO +Checking whether fcntl supports setting/getting hints: NO +Checking for readlink breakage: NO +Checking for gnutls fips mode support: NO diff --git a/meta-networking/files/waf-cross-answers/cross-answers-i586.txt b/meta-networking/files/waf-cross-answers/cross-answers-i586.txt index a5cd9981a3..5655a65852 100644 --- a/meta-networking/files/waf-cross-answers/cross-answers-i586.txt +++ b/meta-networking/files/waf-cross-answers/cross-answers-i586.txt @@ -38,3 +38,11 @@ Checking for small off_t: NO Checking whether blkcnt_t is 32 bit: NO Checking whether blkcnt_t is 64 bit: OK Checking whether fcntl lock supports open file description locks: OK +Checking for a 64-bit host to support lmdb: NO +Checking errno of iconv for illegal multibyte sequence: NO +Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK +Checking value of GNUTLS_MAC_AES_CMAC_128: OK +Checking whether fcntl supports flags to send direct I/O availability signals: NO +Checking whether fcntl supports setting/getting hints: NO +Checking for readlink breakage: NO +Checking for gnutls fips mode support: NO diff --git a/meta-networking/files/waf-cross-answers/cross-answers-i686.txt b/meta-networking/files/waf-cross-answers/cross-answers-i686.txt index a5cd9981a3..5655a65852 100644 --- a/meta-networking/files/waf-cross-answers/cross-answers-i686.txt +++ b/meta-networking/files/waf-cross-answers/cross-answers-i686.txt @@ -38,3 +38,11 @@ Checking for small off_t: NO Checking whether blkcnt_t is 32 bit: NO Checking whether blkcnt_t is 64 bit: OK Checking whether fcntl lock supports open file description locks: OK +Checking for a 64-bit host to support lmdb: NO +Checking errno of iconv for illegal multibyte sequence: NO +Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK +Checking value of GNUTLS_MAC_AES_CMAC_128: OK +Checking whether fcntl supports flags to send direct I/O availability signals: NO +Checking whether fcntl supports setting/getting hints: NO +Checking for readlink breakage: NO +Checking for gnutls fips mode support: NO diff --git a/meta-networking/files/waf-cross-answers/cross-answers-mips.txt b/meta-networking/files/waf-cross-answers/cross-answers-mips.txt index 3e239e727f..84816e06f5 100644 --- a/meta-networking/files/waf-cross-answers/cross-answers-mips.txt +++ b/meta-networking/files/waf-cross-answers/cross-answers-mips.txt @@ -38,3 +38,11 @@ Checking for small off_t: NO Checking whether blkcnt_t is 32 bit: NO Checking whether blkcnt_t is 64 bit: OK Checking whether fcntl lock supports open file description locks: OK +Checking for a 64-bit host to support lmdb: NO +Checking errno of iconv for illegal multibyte sequence: NO +Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK +Checking value of GNUTLS_MAC_AES_CMAC_128: OK +Checking whether fcntl supports flags to send direct I/O availability signals: NO +Checking whether fcntl supports setting/getting hints: NO +Checking for readlink breakage: NO +Checking for gnutls fips mode support: NO diff --git a/meta-networking/files/waf-cross-answers/cross-answers-mips64.txt b/meta-networking/files/waf-cross-answers/cross-answers-mips64.txt index 82e694fdaf..cdf7169cb0 100644 --- a/meta-networking/files/waf-cross-answers/cross-answers-mips64.txt +++ b/meta-networking/files/waf-cross-answers/cross-answers-mips64.txt @@ -37,3 +37,11 @@ Checking for small off_t: NO Checking whether blkcnt_t is 32 bit: NO Checking whether blkcnt_t is 64 bit: OK Checking whether fcntl lock supports open file description locks: OK +Checking for a 64-bit host to support lmdb: OK +Checking errno of iconv for illegal multibyte sequence: NO +Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK +Checking value of GNUTLS_MAC_AES_CMAC_128: OK +Checking whether fcntl supports flags to send direct I/O availability signals: NO +Checking whether fcntl supports setting/getting hints: NO +Checking for readlink breakage: NO +Checking for gnutls fips mode support: NO diff --git a/meta-networking/files/waf-cross-answers/cross-answers-mips64el.txt b/meta-networking/files/waf-cross-answers/cross-answers-mips64el.txt new file mode 100644 index 0000000000..cdf7169cb0 --- /dev/null +++ b/meta-networking/files/waf-cross-answers/cross-answers-mips64el.txt @@ -0,0 +1,47 @@ +Checking uname sysname type: "Linux" +Checking uname version type: "# Wed May 20 10:34:39 UTC 2015" +Checking simple C program: "hello world" +rpath library support: OK +-Wl,--version-script support: OK +Checking getconf LFS_CFLAGS: NO +Checking correct behavior of strtoll: NO +Checking for working strptime: OK +Checking for C99 vsnprintf: "1" +Checking for HAVE_SHARED_MMAP: OK +Checking for HAVE_MREMAP: OK +Checking for HAVE_SECURE_MKSTEMP: OK +Checking for HAVE_IFACE_GETIFADDRS: NO +Checking for HAVE_IFACE_IFCONF: NO +Checking for HAVE_IFACE_IFREQ: NO +Checking for large file support without additional flags: OK +Checking for HAVE_INCOHERENT_MMAP: OK +Checking value of NSIG: "128" +Checking value of _NSIG: "128" +Checking value of SIGRTMAX: "127" +Checking value of SIGRTMIN: "34" +Checking whether the WRFILE -keytab is supported: OK +Checking for kernel change notify support: OK +Checking for Linux kernel oplocks: OK +Checking for kernel share modes: OK +Checking whether POSIX capabilities are available: OK +Checking if can we convert from CP850 to UCS-2LE: OK +Checking if can we convert from UTF-8 to UCS-2LE: OK +vfs_fileid checking for statfs() and struct statfs.f_fsid: OK +Checking whether we can use Linux thread-specific credentials: OK +Checking whether fcntl locking is available: OK +Checking for the maximum value of the 'time_t' type: OK +Checking whether the realpath function allows a NULL argument: OK +Checking for ftruncate extend: OK +getcwd takes a NULL argument: OK +Checking for small off_t: NO +Checking whether blkcnt_t is 32 bit: NO +Checking whether blkcnt_t is 64 bit: OK +Checking whether fcntl lock supports open file description locks: OK +Checking for a 64-bit host to support lmdb: OK +Checking errno of iconv for illegal multibyte sequence: NO +Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK +Checking value of GNUTLS_MAC_AES_CMAC_128: OK +Checking whether fcntl supports flags to send direct I/O availability signals: NO +Checking whether fcntl supports setting/getting hints: NO +Checking for readlink breakage: NO +Checking for gnutls fips mode support: NO diff --git a/meta-networking/files/waf-cross-answers/cross-answers-mipsel.txt b/meta-networking/files/waf-cross-answers/cross-answers-mipsel.txt index 3e239e727f..84816e06f5 100644 --- a/meta-networking/files/waf-cross-answers/cross-answers-mipsel.txt +++ b/meta-networking/files/waf-cross-answers/cross-answers-mipsel.txt @@ -38,3 +38,11 @@ Checking for small off_t: NO Checking whether blkcnt_t is 32 bit: NO Checking whether blkcnt_t is 64 bit: OK Checking whether fcntl lock supports open file description locks: OK +Checking for a 64-bit host to support lmdb: NO +Checking errno of iconv for illegal multibyte sequence: NO +Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK +Checking value of GNUTLS_MAC_AES_CMAC_128: OK +Checking whether fcntl supports flags to send direct I/O availability signals: NO +Checking whether fcntl supports setting/getting hints: NO +Checking for readlink breakage: NO +Checking for gnutls fips mode support: NO diff --git a/meta-networking/files/waf-cross-answers/cross-answers-powerpc.txt b/meta-networking/files/waf-cross-answers/cross-answers-powerpc.txt index 27b9378a42..c563a27967 100644 --- a/meta-networking/files/waf-cross-answers/cross-answers-powerpc.txt +++ b/meta-networking/files/waf-cross-answers/cross-answers-powerpc.txt @@ -38,3 +38,11 @@ Checking for small off_t: NO Checking whether blkcnt_t is 32 bit: NO Checking whether blkcnt_t is 64 bit: OK Checking whether fcntl lock supports open file description locks: OK +Checking for a 64-bit host to support lmdb: NO +Checking errno of iconv for illegal multibyte sequence: NO +Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK +Checking value of GNUTLS_MAC_AES_CMAC_128: OK +Checking whether fcntl supports flags to send direct I/O availability signals: NO +Checking whether fcntl supports setting/getting hints: NO +Checking for readlink breakage: NO +Checking for gnutls fips mode support: NO diff --git a/meta-networking/files/waf-cross-answers/cross-answers-powerpc64.txt b/meta-networking/files/waf-cross-answers/cross-answers-powerpc64.txt index 7fd3092cb9..31a27e2464 100644 --- a/meta-networking/files/waf-cross-answers/cross-answers-powerpc64.txt +++ b/meta-networking/files/waf-cross-answers/cross-answers-powerpc64.txt @@ -38,3 +38,11 @@ Checking for small off_t: NO Checking whether blkcnt_t is 32 bit: NO Checking whether blkcnt_t is 64 bit: OK Checking whether fcntl lock supports open file description locks: OK +Checking for a 64-bit host to support lmdb: OK +Checking errno of iconv for illegal multibyte sequence: NO +Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK +Checking value of GNUTLS_MAC_AES_CMAC_128: OK +Checking whether fcntl supports flags to send direct I/O availability signals: NO +Checking whether fcntl supports setting/getting hints: NO +Checking for readlink breakage: NO +Checking for gnutls fips mode support: NO diff --git a/meta-networking/files/waf-cross-answers/cross-answers-powerpc64le.txt b/meta-networking/files/waf-cross-answers/cross-answers-powerpc64le.txt new file mode 100644 index 0000000000..31a27e2464 --- /dev/null +++ b/meta-networking/files/waf-cross-answers/cross-answers-powerpc64le.txt @@ -0,0 +1,48 @@ +Checking uname sysname type: "Linux" +Checking uname version type: "# Wed May 20 10:34:39 UTC 2015" +Checking simple C program: "hello world" +rpath library support: OK +-Wl,--version-script support: OK +Checking getconf LFS_CFLAGS: NO +Checking correct behavior of strtoll: NO +Checking for working strptime: OK +Checking for C99 vsnprintf: "1" +Checking for HAVE_SHARED_MMAP: OK +Checking for HAVE_MREMAP: OK +Checking for HAVE_SECURE_MKSTEMP: OK +Checking for HAVE_IFACE_GETIFADDRS: NO +Checking for HAVE_IFACE_IFCONF: NO +Checking for HAVE_IFACE_IFREQ: NO +Checking for large file support without additional flags: OK +Checking for HAVE_INCOHERENT_MMAP: NO +Checking value of NSIG: "65" +Checking value of _NSIG: "65" +Checking value of SIGRTMAX: "64" +Checking value of SIGRTMIN: "34" +Checking whether the WRFILE -keytab is supported: OK +Checking for kernel change notify support: OK +Checking for Linux kernel oplocks: OK +Checking for kernel share modes: OK +Checking whether POSIX capabilities are available: OK +Checking if can we convert from CP850 to UCS-2LE: (255, "") +Checking if can we convert from IBM850 to UCS-2LE: (255, "") +Checking if can we convert from UTF-8 to UCS-2LE: OK +vfs_fileid checking for statfs() and struct statfs.f_fsid: OK +Checking whether we can use Linux thread-specific credentials: OK +Checking whether fcntl locking is available: OK +Checking for the maximum value of the 'time_t' type: OK +Checking whether the realpath function allows a NULL argument: OK +Checking for ftruncate extend: OK +getcwd takes a NULL argument: OK +Checking for small off_t: NO +Checking whether blkcnt_t is 32 bit: NO +Checking whether blkcnt_t is 64 bit: OK +Checking whether fcntl lock supports open file description locks: OK +Checking for a 64-bit host to support lmdb: OK +Checking errno of iconv for illegal multibyte sequence: NO +Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK +Checking value of GNUTLS_MAC_AES_CMAC_128: OK +Checking whether fcntl supports flags to send direct I/O availability signals: NO +Checking whether fcntl supports setting/getting hints: NO +Checking for readlink breakage: NO +Checking for gnutls fips mode support: NO diff --git a/meta-networking/files/waf-cross-answers/cross-answers-riscv32.txt b/meta-networking/files/waf-cross-answers/cross-answers-riscv32.txt new file mode 100644 index 0000000000..5655a65852 --- /dev/null +++ b/meta-networking/files/waf-cross-answers/cross-answers-riscv32.txt @@ -0,0 +1,48 @@ +Checking uname sysname type: "Linux" +Checking uname version type: "# Wed May 20 10:34:39 UTC 2015" +Checking simple C program: "hello world" +rpath library support: OK +-Wl,--version-script support: OK +Checking getconf LFS_CFLAGS: NO +Checking correct behavior of strtoll: NO +Checking for working strptime: OK +Checking for C99 vsnprintf: "1" +Checking for HAVE_SHARED_MMAP: OK +Checking for HAVE_MREMAP: OK +Checking for HAVE_SECURE_MKSTEMP: OK +Checking for HAVE_IFACE_GETIFADDRS: NO +Checking for HAVE_IFACE_IFCONF: NO +Checking for HAVE_IFACE_IFREQ: NO +Checking for large file support without additional flags: NO +Checking for -D_FILE_OFFSET_BITS=64: OK +Checking for HAVE_INCOHERENT_MMAP: NO +Checking value of NSIG: "65" +Checking value of _NSIG: "65" +Checking value of SIGRTMAX: "64" +Checking value of SIGRTMIN: "34" +Checking whether the WRFILE -keytab is supported: OK +Checking for kernel change notify support: OK +Checking for Linux kernel oplocks: OK +Checking for kernel share modes: OK +Checking whether POSIX capabilities are available: OK +Checking if can we convert from CP850 to UCS-2LE: OK +Checking if can we convert from UTF-8 to UCS-2LE: OK +vfs_fileid checking for statfs() and struct statfs.f_fsid: OK +Checking whether we can use Linux thread-specific credentials with 32-bit system calls: OK +Checking whether fcntl locking is available: OK +Checking for the maximum value of the 'time_t' type: NO +Checking whether the realpath function allows a NULL argument: OK +Checking for ftruncate extend: OK +getcwd takes a NULL argument: OK +Checking for small off_t: NO +Checking whether blkcnt_t is 32 bit: NO +Checking whether blkcnt_t is 64 bit: OK +Checking whether fcntl lock supports open file description locks: OK +Checking for a 64-bit host to support lmdb: NO +Checking errno of iconv for illegal multibyte sequence: NO +Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK +Checking value of GNUTLS_MAC_AES_CMAC_128: OK +Checking whether fcntl supports flags to send direct I/O availability signals: NO +Checking whether fcntl supports setting/getting hints: NO +Checking for readlink breakage: NO +Checking for gnutls fips mode support: NO diff --git a/meta-networking/files/waf-cross-answers/cross-answers-riscv64.txt b/meta-networking/files/waf-cross-answers/cross-answers-riscv64.txt new file mode 100644 index 0000000000..ea561073ed --- /dev/null +++ b/meta-networking/files/waf-cross-answers/cross-answers-riscv64.txt @@ -0,0 +1,47 @@ +Checking uname sysname type: "Linux" +Checking uname version type: "# Wed May 20 10:34:39 UTC 2015" +Checking simple C program: "hello world" +rpath library support: OK +-Wl,--version-script support: OK +Checking getconf LFS_CFLAGS: NO +Checking correct behavior of strtoll: NO +Checking for working strptime: OK +Checking for C99 vsnprintf: "1" +Checking for HAVE_SHARED_MMAP: OK +Checking for HAVE_MREMAP: OK +Checking for HAVE_SECURE_MKSTEMP: OK +Checking for HAVE_IFACE_GETIFADDRS: NO +Checking for HAVE_IFACE_IFCONF: NO +Checking for HAVE_IFACE_IFREQ: NO +Checking for large file support without additional flags: OK +Checking for HAVE_INCOHERENT_MMAP: NO +Checking value of NSIG: "65" +Checking value of _NSIG: "65" +Checking value of SIGRTMAX: "64" +Checking value of SIGRTMIN: "34" +Checking whether the WRFILE -keytab is supported: OK +Checking for kernel change notify support: OK +Checking for Linux kernel oplocks: OK +Checking for kernel share modes: OK +Checking whether POSIX capabilities are available: OK +Checking if can we convert from CP850 to UCS-2LE: OK +Checking if can we convert from UTF-8 to UCS-2LE: OK +vfs_fileid checking for statfs() and struct statfs.f_fsid: OK +Checking whether we can use Linux thread-specific credentials: OK +Checking whether fcntl locking is available: OK +Checking for the maximum value of the 'time_t' type: OK +Checking whether the realpath function allows a NULL argument: OK +Checking for ftruncate extend: OK +getcwd takes a NULL argument: OK +Checking for small off_t: NO +Checking whether blkcnt_t is 32 bit: NO +Checking whether blkcnt_t is 64 bit: OK +Checking whether fcntl lock supports open file description locks: OK +Checking for a 64-bit host to support lmdb: OK +Checking errno of iconv for illegal multibyte sequence: NO +Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK +Checking value of GNUTLS_MAC_AES_CMAC_128: OK +Checking whether fcntl supports flags to send direct I/O availability signals: NO +Checking whether fcntl supports setting/getting hints: NO +Checking for readlink breakage: NO +Checking for gnutls fips mode support: NO diff --git a/meta-networking/files/waf-cross-answers/cross-answers-x86_64.txt b/meta-networking/files/waf-cross-answers/cross-answers-x86_64.txt index 1023f6aff3..ea561073ed 100644 --- a/meta-networking/files/waf-cross-answers/cross-answers-x86_64.txt +++ b/meta-networking/files/waf-cross-answers/cross-answers-x86_64.txt @@ -37,3 +37,11 @@ Checking for small off_t: NO Checking whether blkcnt_t is 32 bit: NO Checking whether blkcnt_t is 64 bit: OK Checking whether fcntl lock supports open file description locks: OK +Checking for a 64-bit host to support lmdb: OK +Checking errno of iconv for illegal multibyte sequence: NO +Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK +Checking value of GNUTLS_MAC_AES_CMAC_128: OK +Checking whether fcntl supports flags to send direct I/O availability signals: NO +Checking whether fcntl supports setting/getting hints: NO +Checking for readlink breakage: NO +Checking for gnutls fips mode support: NO diff --git a/meta-networking/licenses/netperf b/meta-networking/licenses/netperf deleted file mode 100644 index 3f3ceb2fc2..0000000000 --- a/meta-networking/licenses/netperf +++ /dev/null @@ -1,43 +0,0 @@ - - - Copyright (C) 1993 Hewlett-Packard Company - ALL RIGHTS RESERVED. - - The enclosed software and documentation includes copyrighted works - of Hewlett-Packard Co. For as long as you comply with the following - limitations, you are hereby authorized to (i) use, reproduce, and - modify the software and documentation, and to (ii) distribute the - software and documentation, including modifications, for - non-commercial purposes only. - - 1. The enclosed software and documentation is made available at no - charge in order to advance the general development of - high-performance networking products. - - 2. You may not delete any copyright notices contained in the - software or documentation. All hard copies, and copies in - source code or object code form, of the software or - documentation (including modifications) must contain at least - one of the copyright notices. - - 3. The enclosed software and documentation has not been subjected - to testing and quality control and is not a Hewlett-Packard Co. - product. At a future time, Hewlett-Packard Co. may or may not - offer a version of the software and documentation as a product. - - 4. THE SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS". - HEWLETT-PACKARD COMPANY DOES NOT WARRANT THAT THE USE, - REPRODUCTION, MODIFICATION OR DISTRIBUTION OF THE SOFTWARE OR - DOCUMENTATION WILL NOT INFRINGE A THIRD PARTY'S INTELLECTUAL - PROPERTY RIGHTS. HP DOES NOT WARRANT THAT THE SOFTWARE OR - DOCUMENTATION IS ERROR FREE. HP DISCLAIMS ALL WARRANTIES, - EXPRESS AND IMPLIED, WITH REGARD TO THE SOFTWARE AND THE - DOCUMENTATION. HP SPECIFICALLY DISCLAIMS ALL WARRANTIES OF - MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. - - 5. HEWLETT-PACKARD COMPANY WILL NOT IN ANY EVENT BE LIABLE FOR ANY - DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES - (INCLUDING LOST PROFITS) RELATED TO ANY USE, REPRODUCTION, - MODIFICATION, OR DISTRIBUTION OF THE SOFTWARE OR DOCUMENTATION. - - diff --git a/meta-networking/recipes-connectivity/adcli/adcli_0.9.2.bb b/meta-networking/recipes-connectivity/adcli/adcli_0.9.2.bb new file mode 100644 index 0000000000..c5dcccbac5 --- /dev/null +++ b/meta-networking/recipes-connectivity/adcli/adcli_0.9.2.bb @@ -0,0 +1,25 @@ +SUMMARY = "Active Directory enrollment" +DESCRIPTION = "A helper library and tools for Active Directory client operations." + +HOMEPAGE = "http://cgit.freedesktop.org/realmd/adcli" +SECTION = "net" + +SRCREV = "8e88e3590a19006362ea8b8dfdc18bb88b3cb3b5" + +SRC_URI = "git://gitlab.freedesktop.org/realmd/adcli;protocol=https;branch=master" + +S = "${WORKDIR}/git" + +LICENSE = "LGPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=23c2a5e0106b99d75238986559bb5fc6" + +inherit autotools xmlcatalog + +DEPENDS += "virtual/crypt krb5 openldap gettext libxslt xmlto libxml2-native \ + cyrus-sasl libxslt-native xmlto-native coreutils-native\ + " + +EXTRA_OECONF += "--disable-static \ + --disable-silent-rules \ + --disable-doc \ + " diff --git a/meta-networking/recipes-connectivity/autossh/autossh_1.4g.bb b/meta-networking/recipes-connectivity/autossh/autossh_1.4g.bb new file mode 100644 index 0000000000..de7e2d3e01 --- /dev/null +++ b/meta-networking/recipes-connectivity/autossh/autossh_1.4g.bb @@ -0,0 +1,31 @@ +DESCRIPTION = "autossh is a program to start a copy of ssh and monitor it, restarting it as necessary should it die or stop passing traffic" +HOMEPAGE = "https://www.harding.motd.ca/autossh/" + +LICENSE = "BSD-1-Clause & BSD-4-Clause" +LIC_FILES_CHKSUM = "file://autossh.c;beginline=7;endline=22;md5=9ae0c9b04856148d77984ef58536732b \ + file://daemon.h;beginline=7;endline=36;md5=839bb7bf781ff48da4a3fec2a62a1a47" + +SRC_URI = "https://www.harding.motd.ca/autossh/${BP}.tgz" +SRC_URI[md5sum] = "2b804bc1bf6d2f2afaa526d02df7c0a2" +SRC_URI[sha256sum] = "5fc3cee3361ca1615af862364c480593171d0c54ec156de79fc421e31ae21277" + +RDEPENDS:${PN} = "ssh" + +CFLAGS:prepend = "-I${WORKDIR}/build " + +inherit autotools + +EXTRA_OECONF="--with-ssh=/usr/bin/ssh" + +do_compile:append() { + cp ${WORKDIR}/autossh-${PV}/CHANGES ${WORKDIR}/build + cp ${WORKDIR}/autossh-${PV}/README ${WORKDIR}/build + cp ${WORKDIR}/autossh-${PV}/autossh.host ${WORKDIR}/build + cp ${WORKDIR}/autossh-${PV}/rscreen ${WORKDIR}/build + cp ${WORKDIR}/autossh-${PV}/autossh.1 ${WORKDIR}/build + cp ${WORKDIR}/autossh-${PV}/autossh.spec ${WORKDIR}/build +} + +do_install:append() { + rm -rf ${D}${datadir}/examples +} diff --git a/meta-networking/recipes-connectivity/bearssl/bearssl/0002-test-test_x509.c-fix-potential-overflow-issue.patch b/meta-networking/recipes-connectivity/bearssl/bearssl/0002-test-test_x509.c-fix-potential-overflow-issue.patch new file mode 100644 index 0000000000..e0e5c13588 --- /dev/null +++ b/meta-networking/recipes-connectivity/bearssl/bearssl/0002-test-test_x509.c-fix-potential-overflow-issue.patch @@ -0,0 +1,43 @@ +From 542380a13f178d97851751b57054a6b5be555d1c Mon Sep 17 00:00:00 2001 +From: Jens Rehsack <sno@netbsd.org> +Date: Thu, 13 Aug 2020 16:16:44 +0200 +Subject: [PATCH 2/2] test/test_x509.c: fix potential overflow issue + +Instead of doing a memcpy() which does static overflow checking, use +snprintf() for string copying which does the check dynamically. + +Fixes: +| In file included from .../recipe-sysroot/usr/include/string.h:519, +| from test/test_x509.c:27: +| In function 'memcpy', +| inlined from 'parse_keyvalue' at test/test_x509.c:845:2, +| inlined from 'process_conf_file' at test/test_x509.c:1360:7, +| inlined from 'main' at test/test_x509.c:2038:2: +| .../recipe-sysroot/usr/include/bits/string_fortified.h:34:10: warning: '__builtin_memcpy' specified bound 4294967295 exceeds maximum object size 2147483647 [-Wstringop-overflow=] +| 34 | return __builtin___memcpy_chk (__dest, __src, __len, __bos0 (__dest)); +| | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Signed-off-by: Jens Rehsack <sno@netbsd.org> +--- +Upstream-Status: Pending + + test/test_x509.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/test/test_x509.c b/test/test_x509.c +index 2c61cf5..76f6ab9 100644 +--- a/test/test_x509.c ++++ b/test/test_x509.c +@@ -842,8 +842,7 @@ parse_keyvalue(HT *d) + return -1; + } + name = xmalloc(u + 1); +- memcpy(name, buf, u); +- name[u] = 0; ++ snprintf(name, u, "%s", buf); + if (HT_get(d, name) != NULL) { + xfree(name); + return -1; +-- +2.17.1 + diff --git a/meta-networking/recipes-connectivity/bearssl/bearssl_0.6.bb b/meta-networking/recipes-connectivity/bearssl/bearssl_0.6.bb new file mode 100644 index 0000000000..39569e9d06 --- /dev/null +++ b/meta-networking/recipes-connectivity/bearssl/bearssl_0.6.bb @@ -0,0 +1,52 @@ +SUMMARY = "BearSSL is an implementation of the SSL/TLS protocol (RFC 5246) written in C" +DESCRIPTION = "BearSSL is an implementation of the SSL/TLS protocol (RFC \ +5246) written in C. It aims at offering the following features: \ + * Be correct and secure. In particular, insecure protocol versions and \ + choices of algorithms are not supported, by design; cryptographic \ + algorithm implementations are constant-time by default. \ + * Be small, both in RAM and code footprint. For instance, a minimal \ + server implementation may fit in about 20 kilobytes of compiled code \ + and 25 kilobytes of RAM. \ + * Be highly portable. BearSSL targets not only “big” operating systems \ + like Linux and Windows, but also small embedded systems and even special \ + contexts like bootstrap code. \ + * Be feature-rich and extensible. SSL/TLS has many defined cipher suites \ + and extensions; BearSSL should implement most of them, and allow extra \ + algorithm implementations to be added afterwards, possibly from third \ + parties." +HOMEPAGE = "https://bearssl.org" + +SECTION = "libs" + +inherit lib_package + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=1fc37e1037ae673975fbcb96a98f7191" + +PV .= "+git" +SRCREV = "79c060eea3eea1257797f15ea1608a9a9923aa6f" +SRC_URI = "git://www.bearssl.org/git/BearSSL;protocol=https;branch=master \ + file://0002-test-test_x509.c-fix-potential-overflow-issue.patch \ + " + +SONAME = "libbearssl.so.6" +# without compile errors like +# <..>/ld: build/obj/ghash_pclmul.o: warning: relocation against `br_ghash_pclmul' in read-only section `.text' +CFLAGS += "-fPIC" + +EXTRA_OEMAKE += 'CC="${CC}" CFLAGS="${CFLAGS}" LDDLL="${CCLD} ${LDFLAGS}" LD="${CCLD}" LDFLAGS="${LDFLAGS}" \ + BEARSSLDLL=build/${SONAME} \ + LDDLLFLAGS="-shared -Wl,-soname,${SONAME}" \ + ${@ "STATICLIB=no" if d.getVar('DISABLE_STATIC') != "" else "" } \ +' + +S = "${WORKDIR}/git" + +do_install() { + install -d ${D}/${bindir} ${D}/${libdir} ${D}/${includedir} + install -m 0755 ${B}/build/brssl ${D}/${bindir} + oe_libinstall -C ${B}/build libbearssl ${D}/${libdir} + for inc in ${S}/inc/*.h; do + install -m 0644 "${inc}" ${D}/${includedir} + done +} diff --git a/meta-networking/recipes-connectivity/blueman/blueman/0001-Search-for-cython3.patch b/meta-networking/recipes-connectivity/blueman/blueman/0001-Search-for-cython3.patch new file mode 100644 index 0000000000..913566dce9 --- /dev/null +++ b/meta-networking/recipes-connectivity/blueman/blueman/0001-Search-for-cython3.patch @@ -0,0 +1,24 @@ +Subject: [PATCH] Search for cython3 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate + +Signed-off-by: Markus Volk <f_l_k@gmx.net> +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/module/meson.build 2022-02-10 08:49:35.000000000 +0100 ++++ b/module/meson.build 2022-03-29 12:58:03.456193737 +0200 +@@ -1,4 +1,4 @@ +-cython = find_program('cython', required: true) ++cython = find_program('cython3', required: true) + + blueman_c = custom_target( + 'blueman_c', + +-- +2.14.3 + diff --git a/meta-networking/recipes-connectivity/blueman/blueman/0001-meson-add-pythoninstalldir-option.patch b/meta-networking/recipes-connectivity/blueman/blueman/0001-meson-add-pythoninstalldir-option.patch new file mode 100644 index 0000000000..cc448b4ffd --- /dev/null +++ b/meta-networking/recipes-connectivity/blueman/blueman/0001-meson-add-pythoninstalldir-option.patch @@ -0,0 +1,50 @@ +From 37f24a9bd62f0a8f3e37eaddd33f2f0c9d3aaa0a Mon Sep 17 00:00:00 2001 +From: Chen Qi <Qi.Chen@windriver.com> +Date: Fri, 1 Apr 2022 23:12:17 -0700 +Subject: [PATCH] meson: add pythoninstalldir option + +In case of cross build, using host python to determine the python +site-packages directory for target is not feasible, add a new option +pythoninstalldir to fix the issue. + +Upstream-Status: Submitted [https://github.com/blueman-project/blueman/pull/1699] + +Signed-off-by: Chen Qi <Qi.Chen@windriver.com> +--- + meson.build | 7 ++++++- + meson_options.txt | 1 + + 2 files changed, 7 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index e12d0ce6..e84457a5 100644 +--- a/meson.build ++++ b/meson.build +@@ -26,7 +26,12 @@ pkgdatadir = join_paths([prefix, get_option('datadir'), package_name]) + bindir = join_paths([prefix, get_option('bindir')]) + libexecdir = join_paths([prefix, get_option('libexecdir')]) + schemadir = join_paths(['share', 'glib-2.0', 'schemas']) +-pythondir = pyinstall.get_install_dir() ++pythoninstalldir = get_option('pythoninstalldir') ++if pythoninstalldir != '' ++ pythondir = join_paths([prefix, pythoninstalldir]) ++else ++ pythondir = join_paths([prefix, python.sysconfig_path('purelib')]) ++endif + + if get_option('policykit') + have_polkit = 'True' +diff --git a/meson_options.txt b/meson_options.txt +index 177d9ab8..3e397d8e 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -2,6 +2,7 @@ option('runtime_deps_check', type: 'boolean', value: true, description: 'Disable + option('dhcp-config-path', type: 'string', value: '/etc/dhcp3/dhcpd.conf', description: 'Set dhcp3 server configuration path') + option('policykit', type: 'boolean', value: true, description: 'Enable policykit support') + option('pulseaudio', type: 'boolean', value: true, description: 'Enable PulseAudio support') ++option('pythoninstalldir', type: 'string', description: 'Path to python site-packages dir relative to ${prefix}') + option('systemdsystemunitdir', type: 'string', description: 'Path to systemd system unit dir relative to ${prefix}') + option('systemduserunitdir', type: 'string', description: 'Path to systemd user unit dir relative to ${prefix}') + option('sendto-plugins', type: 'array', choices: ['Caja', 'Nemo', 'Nautilus'], value: ['Caja', 'Nemo', 'Nautilus'], description: 'Install sendto plugins for various filemanagers') +-- +2.34.1 + diff --git a/meta-networking/recipes-connectivity/blueman/blueman/0002-fix-fail-to-enable-bluetooth.patch b/meta-networking/recipes-connectivity/blueman/blueman/0002-fix-fail-to-enable-bluetooth.patch new file mode 100644 index 0000000000..282d821374 --- /dev/null +++ b/meta-networking/recipes-connectivity/blueman/blueman/0002-fix-fail-to-enable-bluetooth.patch @@ -0,0 +1,72 @@ +Fix fail to enable bluetooth issue + +When launch blueman-manager while bluetooth is disable, it may fails +with error: + + Failed to enable bluetooth + +Because when get bluetooth status right after change its status, the +status may not be updated that plugin applet/KillSwitch.py sets the +bluetooth status via method of another dbus service which doesn't return +immediately. + +Provides a new dbus method for PowerManager which checks whether dbus +method SetBluetoothStatus() has finished. Then it makes sure to get +right bluetooth status. + +Upstream-Status: Inappropriate +Send to upstream but not accepted: +https://github.com/blueman-project/blueman/pull/1121 + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- + blueman/Functions.py | 10 ++++++++++ + blueman/plugins/applet/PowerManager.py | 4 ++++ + 2 files changed, 14 insertions(+) + +diff --git a/blueman/Functions.py b/blueman/Functions.py +index 3917f42..b4d5eae 100644 +--- a/blueman/Functions.py ++++ b/blueman/Functions.py +@@ -80,6 +80,16 @@ def check_bluetooth_status(message: str, exitfunc: Callable[[], Any]) -> None: + return + + applet.SetBluetoothStatus('(b)', True) ++ ++ timeout = time.time() + 10 ++ while applet.GetRequestStatus(): ++ time.sleep(0.1) ++ if time.time() > timeout: ++ # timeout 5s has been set in applet/PowerManager.py ++ # so it should NOT reach timeout here ++ logging.warning('Should NOT reach timeout.') ++ break ++ + if not applet.GetBluetoothStatus(): + print('Failed to enable bluetooth') + exitfunc() +diff --git a/blueman/plugins/applet/PowerManager.py b/blueman/plugins/applet/PowerManager.py +index c2f7bc3..bf6c99f 100644 +--- a/blueman/plugins/applet/PowerManager.py ++++ b/blueman/plugins/applet/PowerManager.py +@@ -63,6 +63,7 @@ class PowerManager(AppletPlugin, StatusIconProvider): + self._add_dbus_signal("BluetoothStatusChanged", "b") + self._add_dbus_method("SetBluetoothStatus", ("b",), "", self.request_power_state) + self._add_dbus_method("GetBluetoothStatus", (), "b", self.get_bluetooth_status) ++ self._add_dbus_method("GetRequestStatus", (), "b", self.get_request_status) + + def on_unload(self) -> None: + self.parent.Plugins.Menu.unregister(self) +@@ -196,6 +197,9 @@ class PowerManager(AppletPlugin, StatusIconProvider): + def get_bluetooth_status(self) -> bool: + return self.current_state + ++ def get_request_status(self): ++ return self.request_in_progress ++ + def on_adapter_property_changed(self, _path: str, key: str, value: Any) -> None: + if key == "Powered": + if value and not self.current_state: +-- +2.31.1 + diff --git a/meta-networking/recipes-connectivity/blueman/blueman_2.3.5.bb b/meta-networking/recipes-connectivity/blueman/blueman_2.3.5.bb new file mode 100644 index 0000000000..0374d23f0c --- /dev/null +++ b/meta-networking/recipes-connectivity/blueman/blueman_2.3.5.bb @@ -0,0 +1,88 @@ +DESCRIPTION = "Blueman is a GTK+ Bluetooth Manager" +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +DEPENDS = "gtk+3 glib-2.0 bluez5 python3-pygobject python3-cython-native" + +inherit meson gettext systemd gsettings pkgconfig python3native gtk-icon-cache useradd features_check + +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" + +SRC_URI = " \ + git://github.com/blueman-project/blueman.git;protocol=https;branch=2-3-stable \ + file://0001-Search-for-cython3.patch \ + file://0002-fix-fail-to-enable-bluetooth.patch \ + file://0001-meson-add-pythoninstalldir-option.patch \ +" +S = "${WORKDIR}/git" +SRCREV = "c85e7afb8d6547d4c35b7b639124de8e999c3650" + +EXTRA_OEMESON = "-Druntime_deps_check=false -Dpythoninstalldir=${@noprefix('PYTHON_SITEPACKAGES_DIR', d)}" + +SYSTEMD_SERVICE:${PN} = "${BPN}-mechanism.service" +SYSTEMD_AUTO_ENABLE:${PN} = "disable" + +RRECOMMENDS:${PN} += "adwaita-icon-theme" +RDEPENDS:${PN} += " \ + python3-core \ + python3-ctypes \ + python3-dbus \ + python3-pygobject \ + python3-terminal \ + python3-fcntl \ + packagegroup-tools-bluetooth \ +" + +PACKAGECONFIG ??= " \ + ${@bb.utils.filter('DISTRO_FEATURES', 'polkit pulseaudio ', d)} \ + thunar \ +" +PACKAGECONFIG[thunar] = "-Dthunar-sendto=true,-Dthunar-sendto=false" +PACKAGECONFIG[pulseaudio] = "-Dpulseaudio=true,-Dpulseaudio=false" +PACKAGECONFIG[polkit] = "-Dpolicykit=true,-Dpolicykit=false" + +FILES:${PN} += " \ + ${datadir} \ + ${systemd_user_unitdir} \ + ${PYTHON_SITEPACKAGES_DIR} \ +" + +# In code, path to python is a variable that is replaced with path to native version of it +# during the configure stage, e.g ../recipe-sysroot-native/usr/bin/python3-native/python3. +# Replace it with #!/usr/bin/env python3 +do_install:append() { + sed -i "1s/.*/#!\/usr\/bin\/env python3/" ${D}${prefix}/libexec/blueman-rfcomm-watcher \ + ${D}${prefix}/libexec/blueman-mechanism \ + ${D}${bindir}/blueman-adapters \ + ${D}${bindir}/blueman-applet \ + ${D}${bindir}/blueman-manager \ + ${D}${bindir}/blueman-sendto \ + ${D}${bindir}/blueman-services \ + ${D}${bindir}/blueman-tray +} + +do_install:append() { + install -d ${D}${datadir}/polkit-1/rules.d + cat >${D}${datadir}/polkit-1/rules.d/51-blueman.rules <<EOF +/* Allow users in wheel group to use blueman feature requiring root without authentication */ +polkit.addRule(function(action, subject) { + if ((action.id == "org.blueman.network.setup" || + action.id == "org.blueman.dhcp.client" || + action.id == "org.blueman.rfkill.setstate" || + action.id == "org.blueman.pppd.pppconnect") && + subject.isInGroup("wheel")) { + + return polkit.Result.YES; + } +}); +EOF +} + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM:${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 --shell /bin/nologin polkitd" + +do_install:append() { + # Fix up permissions on polkit rules.d to work with rpm4 constraints + chmod 700 ${D}/${datadir}/polkit-1/rules.d + chown polkitd:root ${D}/${datadir}/polkit-1/rules.d +} diff --git a/meta-networking/recipes-connectivity/bluepy/bluepy/0001-bluepy-Fix-username-issue-with-tarballs.patch b/meta-networking/recipes-connectivity/bluepy/bluepy/0001-bluepy-Fix-username-issue-with-tarballs.patch new file mode 100644 index 0000000000..93b367a77b --- /dev/null +++ b/meta-networking/recipes-connectivity/bluepy/bluepy/0001-bluepy-Fix-username-issue-with-tarballs.patch @@ -0,0 +1,32 @@ +From 318a0e7dfaa0f5f233a20c0b347948c8004cf6af Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 20 Oct 2021 14:02:09 -0700 +Subject: [PATCH] bluepy: Fix username issue with tarballs + +Fixes +Cannot change ownership to uid 1000, gid 1000: Operation not permitted + +Upstream-Status: Submitted [https://github.com/IanHarvey/bluepy/pull/462] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + bluepy/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/bluepy/Makefile ++++ b/bluepy/Makefile +@@ -30,13 +30,13 @@ bluepy-helper: $(LOCAL_SRCS) $(IMPORT_SR + $(CC) -L. $(CFLAGS) $(CPPFLAGS) -o $@ $(LOCAL_SRCS) $(IMPORT_SRCS) $(LDLIBS) + + $(IMPORT_SRCS): bluez-src.tgz +- tar xzf $< ++ tar xzf $< --no-same-owner + touch $(IMPORT_SRCS) + + .PHONY: bluez-tarfile + + bluez-tarfile: +- (cd ..; tar czf bluepy/bluez-src.tgz $(BLUEZ_PATH)) ++ (cd ..; tar czf bluepy/bluez-src.tgz $(BLUEZ_PATH) --no-same-owner) + + GET_SERVICES=get_services.py + diff --git a/meta-networking/recipes-connectivity/bluepy/bluepy_git.bb b/meta-networking/recipes-connectivity/bluepy/bluepy_git.bb new file mode 100644 index 0000000000..5b784d9a04 --- /dev/null +++ b/meta-networking/recipes-connectivity/bluepy/bluepy_git.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "Python interface to Bluetooth LE on Linux" +HOMEPAGE = "https://github.com/IanHarvey/bluepy" +SECTION = "devel/python" +LICENSE = "GPL-2.0-only & PD" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=59e0d45ea684dda215889aa1b5acd001" +DEPENDS = "glib-2.0" +SRCREV = "7ad565231a97c304c0eff45f2649cd005e69db09" +PV = "1.3.0+git" + +SRC_URI = "git://github.com/IanHarvey/bluepy.git;protocol=https;branch=master \ + file://0001-bluepy-Fix-username-issue-with-tarballs.patch \ + " + +S = "${WORKDIR}/git" + +inherit setuptools3 pkgconfig + +RDEPENDS:${PN} = "bluez5" + +TARGET_CC_ARCH += "${LDFLAGS}" diff --git a/meta-networking/recipes-connectivity/bluez-tools/bluez-tools/fix-memory-leaks.patch b/meta-networking/recipes-connectivity/bluez-tools/bluez-tools/fix-memory-leaks.patch new file mode 100644 index 0000000000..22e1fac855 --- /dev/null +++ b/meta-networking/recipes-connectivity/bluez-tools/bluez-tools/fix-memory-leaks.patch @@ -0,0 +1,768 @@ +Upstream-Status: Submitted [https://github.com/khvzak/bluez-tools/pull/48] + +From e5db2eec2591f0109f0eb7c2631055210b55f2f5 Mon Sep 17 00:00:00 2001 +Message-Id: <e5db2eec2591f0109f0eb7c2631055210b55f2f5.1710791277.git.joerg.sommer@navimatix.de> +From: thatlittlegit <personal@thatlittlegit.tk> +Date: Sat, 7 Nov 2020 01:07:24 -0500 +Subject: [PATCH 1/9] Remove memory leaks and overall restructure + manager_find_adapter + +--- + src/lib/manager.c | 61 +++++++++++++++++++++++++++++++++-------------- + 1 file changed, 43 insertions(+), 18 deletions(-) + +diff --git a/src/lib/manager.c b/src/lib/manager.c +index 5286a3a..2263afc 100644 +--- a/src/lib/manager.c ++++ b/src/lib/manager.c +@@ -136,43 +136,68 @@ const gchar *manager_find_adapter(Manager *self, const gchar *pattern, GError ** + GVariant *ifaces_and_properties; + GVariantIter i; + ++ gchar *pattern_lowercase = g_ascii_strdown(pattern, -1); ++ + g_variant_iter_init(&i, objects); +- while (g_variant_iter_next(&i, "{&o@a{sa{sv}}}", &object_path, &ifaces_and_properties)) ++ gboolean still_looking = TRUE; ++ while (still_looking && g_variant_iter_next(&i, "{&o@a{sa{sv}}}", &object_path, &ifaces_and_properties)) + { + const gchar *interface_name; +- GVariant *properties; + GVariantIter ii; ++ GVariant* properties; + g_variant_iter_init(&ii, ifaces_and_properties); + while (g_variant_iter_next(&ii, "{&s@a{sv}}", &interface_name, &properties)) + { +- if (g_strstr_len(g_ascii_strdown(interface_name, -1), -1, "adapter")) ++ gchar *interface_name_lowercase = g_ascii_strdown(interface_name, -1); ++ if (strstr(interface_name_lowercase, "adapter")) + { +- const gchar *object_base_name = g_path_get_basename(object_path); +- if (g_strstr_len(g_ascii_strdown(object_base_name, -1), -1, g_ascii_strdown(pattern, -1))) ++ g_free(interface_name_lowercase); ++ ++ gchar *object_base_name_original = g_path_get_basename(object_path); ++ gchar *object_base_name = g_ascii_strdown(interface_name, -1); ++ g_free(object_base_name_original); ++ ++ if (strstr(object_base_name, pattern_lowercase)) + { +- const gchar *retVal = g_strdup(object_path); +- g_variant_unref(properties); +- g_variant_unref(ifaces_and_properties); +- g_variant_unref(objects); +- return retVal; ++ still_looking = FALSE; ++ g_free(object_base_name); ++ break; + } +- const gchar *address = g_variant_get_string(g_variant_lookup_value(properties, "Address", NULL), NULL); +- if (g_strstr_len(g_ascii_strdown(address, -1), -1, g_ascii_strdown(pattern, -1))) ++ ++ g_free(object_base_name); ++ ++ const gchar *address_original = g_variant_get_string(g_variant_lookup_value(properties, "Address", NULL), NULL); ++ gchar *address = g_ascii_strdown(address_original, -1); ++ ++ if (strstr(address, pattern_lowercase)) + { +- gchar *retVal = g_strdup(object_path); +- g_variant_unref(properties); +- g_variant_unref(ifaces_and_properties); +- g_variant_unref(objects); +- return retVal; ++ still_looking = FALSE; ++ g_free(address); ++ break; + } ++ g_free(address); + } ++ else ++ { ++ g_free(interface_name_lowercase); ++ } ++ + g_variant_unref(properties); + } ++ + g_variant_unref(ifaces_and_properties); + } + g_variant_unref(objects); ++ g_free(pattern_lowercase); + +- return NULL; ++ if (still_looking) ++ { ++ return NULL; ++ } ++ else ++ { ++ return object_path; ++ } + } + + GPtrArray *manager_get_adapters(Manager *self) +-- +2.34.1 + + +From 163fcc94f1bc7c8f238e78adb03af914a566d979 Mon Sep 17 00:00:00 2001 +Message-Id: <163fcc94f1bc7c8f238e78adb03af914a566d979.1710791277.git.joerg.sommer@navimatix.de> +In-Reply-To: <e5db2eec2591f0109f0eb7c2631055210b55f2f5.1710791277.git.joerg.sommer@navimatix.de> +References: <e5db2eec2591f0109f0eb7c2631055210b55f2f5.1710791277.git.joerg.sommer@navimatix.de> +From: thatlittlegit <personal@thatlittlegit.tk> +Date: Sat, 7 Nov 2020 22:12:21 -0500 +Subject: [PATCH 2/9] Replace manager_default_adapter with + manager_find_adapter(..., NULL, ...) + +--- + src/lib/helpers.c | 57 ++++++++++++++++++----------------------------- + src/lib/manager.c | 51 +++++++++--------------------------------- + src/lib/manager.h | 1 - + 3 files changed, 33 insertions(+), 76 deletions(-) + +diff --git a/src/lib/helpers.c b/src/lib/helpers.c +index d7e95f9..99561b5 100644 +--- a/src/lib/helpers.c ++++ b/src/lib/helpers.c +@@ -159,52 +159,39 @@ Adapter *find_adapter(const gchar *name, GError **error) + + Manager *manager = g_object_new(MANAGER_TYPE, NULL); + +- // If name is null or empty - return default adapter +- if (name == NULL || strlen(name) == 0) ++ // Try to find by id ++ adapter_path = (gchar *) manager_find_adapter(manager, name, error); ++ ++ // Found ++ if (adapter_path) + { +- adapter_path = (gchar *) manager_default_adapter(manager, error); +- if (adapter_path) +- { +- // adapter = g_object_new(ADAPTER_TYPE, "DBusObjectPath", adapter_path, NULL); +- adapter = adapter_new(adapter_path); +- } ++ // adapter = g_object_new(ADAPTER_TYPE, "DBusObjectPath", adapter_path, NULL); ++ adapter = adapter_new(adapter_path); + } + else + { +- // Try to find by id +- adapter_path = (gchar *) manager_find_adapter(manager, name, error); +- +- // Found +- if (adapter_path) ++ // Try to find by name ++ const GPtrArray *adapters_list = manager_get_adapters(manager); ++ g_assert(adapters_list != NULL); ++ for (int i = 0; i < adapters_list->len; i++) + { ++ adapter_path = g_ptr_array_index(adapters_list, i); + // adapter = g_object_new(ADAPTER_TYPE, "DBusObjectPath", adapter_path, NULL); + adapter = adapter_new(adapter_path); +- } +- else +- { +- // Try to find by name +- const GPtrArray *adapters_list = manager_get_adapters(manager); +- g_assert(adapters_list != NULL); +- for (int i = 0; i < adapters_list->len; i++) ++ adapter_path = NULL; ++ ++ if (g_strcmp0(name, adapter_get_name(adapter, error)) == 0) + { +- adapter_path = g_ptr_array_index(adapters_list, i); +- // adapter = g_object_new(ADAPTER_TYPE, "DBusObjectPath", adapter_path, NULL); +- adapter = adapter_new(adapter_path); +- adapter_path = NULL; +- +- if (g_strcmp0(name, adapter_get_name(adapter, error)) == 0) ++ if (*error) + { +- if (error) +- { +- g_error_free(*error); +- *error = NULL; +- } +- break; ++ g_error_free(*error); ++ *error = NULL; + } +- +- g_object_unref(adapter); +- adapter = NULL; ++ break; + } ++ ++ g_object_unref(adapter); ++ adapter = NULL; + } + } + +diff --git a/src/lib/manager.c b/src/lib/manager.c +index 2263afc..891fc45 100644 +--- a/src/lib/manager.c ++++ b/src/lib/manager.c +@@ -84,45 +84,6 @@ GVariant *manager_get_managed_objects(Manager *self, GError **error) + return retVal; + } + +-const gchar *manager_default_adapter(Manager *self, GError **error) +-{ +- g_assert(MANAGER_IS(self)); +- +- GVariant *objects = NULL; +- objects = manager_get_managed_objects(self, error); +- if (objects == NULL) +- return NULL; +- +- const gchar *object_path; +- GVariant *ifaces_and_properties; +- GVariantIter i; +- +- g_variant_iter_init(&i, objects); +- while (g_variant_iter_next(&i, "{&o@a{sa{sv}}}", &object_path, &ifaces_and_properties)) +- { +- const gchar *interface_name; +- GVariant *properties; +- GVariantIter ii; +- g_variant_iter_init(&ii, ifaces_and_properties); +- while (g_variant_iter_next(&ii, "{&s@a{sv}}", &interface_name, &properties)) +- { +- if (g_strstr_len(g_ascii_strdown(interface_name, -1), -1, "adapter")) +- { +- const gchar *retVal = g_strdup(object_path); +- g_variant_unref(properties); +- g_variant_unref(ifaces_and_properties); +- g_variant_unref(objects); +- return retVal; +- } +- g_variant_unref(properties); +- } +- g_variant_unref(ifaces_and_properties); +- } +- g_variant_unref(objects); +- +- return NULL; +-} +- + const gchar *manager_find_adapter(Manager *self, const gchar *pattern, GError **error) + { + g_assert(MANAGER_IS(self)); +@@ -136,7 +97,11 @@ const gchar *manager_find_adapter(Manager *self, const gchar *pattern, GError ** + GVariant *ifaces_and_properties; + GVariantIter i; + +- gchar *pattern_lowercase = g_ascii_strdown(pattern, -1); ++ gchar *pattern_lowercase = NULL; ++ if (pattern != NULL) ++ { ++ pattern_lowercase = g_ascii_strdown(pattern, -1); ++ } + + g_variant_iter_init(&i, objects); + gboolean still_looking = TRUE; +@@ -153,6 +118,12 @@ const gchar *manager_find_adapter(Manager *self, const gchar *pattern, GError ** + { + g_free(interface_name_lowercase); + ++ if (!pattern_lowercase) ++ { ++ still_looking = FALSE; ++ break; ++ } ++ + gchar *object_base_name_original = g_path_get_basename(object_path); + gchar *object_base_name = g_ascii_strdown(interface_name, -1); + g_free(object_base_name_original); +diff --git a/src/lib/manager.h b/src/lib/manager.h +index 0c9e052..b651812 100644 +--- a/src/lib/manager.h ++++ b/src/lib/manager.h +@@ -54,7 +54,6 @@ extern "C" { + * Method definitions. + */ + GVariant *manager_get_managed_objects(Manager *self, GError **error); +- const gchar *manager_default_adapter(Manager *self, GError **error); + const gchar *manager_find_adapter(Manager *self, const gchar *pattern, GError **error); + GPtrArray *manager_get_adapters(Manager *self); + const gchar **manager_get_devices(Manager *self, const gchar *adapter_pattern); +-- +2.34.1 + + +From b463d9cfc2390ca6352c16e6f6e113cf42d0f688 Mon Sep 17 00:00:00 2001 +Message-Id: <b463d9cfc2390ca6352c16e6f6e113cf42d0f688.1710791277.git.joerg.sommer@navimatix.de> +In-Reply-To: <e5db2eec2591f0109f0eb7c2631055210b55f2f5.1710791277.git.joerg.sommer@navimatix.de> +References: <e5db2eec2591f0109f0eb7c2631055210b55f2f5.1710791277.git.joerg.sommer@navimatix.de> +From: thatlittlegit <personal@thatlittlegit.tk> +Date: Sat, 7 Nov 2020 23:38:42 -0500 +Subject: [PATCH 3/9] Fix remaining g_ascii_strdown leaks + +--- + src/lib/helpers.c | 2 +- + src/lib/manager.c | 5 ++++- + src/lib/properties.c | 4 ++-- + 3 files changed, 7 insertions(+), 4 deletions(-) + +diff --git a/src/lib/helpers.c b/src/lib/helpers.c +index 99561b5..b61bc07 100644 +--- a/src/lib/helpers.c ++++ b/src/lib/helpers.c +@@ -242,7 +242,7 @@ Device *find_device(Adapter *adapter, const gchar *name, GError **error) + + if(g_variant_lookup(properties, "Address", "s", &address)) + { +- if(g_strcmp0(g_ascii_strdown(address, -1), g_ascii_strdown(name, -1)) == 0) ++ if(name && address && g_ascii_strcasecmp(address, name) == 0) + { + device = device_new(object_path); + } +diff --git a/src/lib/manager.c b/src/lib/manager.c +index 891fc45..d506ae6 100644 +--- a/src/lib/manager.c ++++ b/src/lib/manager.c +@@ -200,8 +200,11 @@ GPtrArray *manager_get_adapters(Manager *self) + g_variant_iter_init(&ii, ifaces_and_properties); + while (g_variant_iter_next(&ii, "{&s@a{sv}}", &interface_name, &properties)) + { +- if (g_strstr_len(g_ascii_strdown(interface_name, -1), -1, "adapter")) ++ char* interface_name_lowercase = g_ascii_strdown(interface_name, -1); ++ if (strstr(interface_name_lowercase, "adapter")) + g_ptr_array_add(adapter_array, (gpointer) g_strdup(object_path)); ++ ++ g_free(interface_name_lowercase); + g_variant_unref(properties); + } + g_variant_unref(ifaces_and_properties); +diff --git a/src/lib/properties.c b/src/lib/properties.c +index 8b913d5..70a7640 100644 +--- a/src/lib/properties.c ++++ b/src/lib/properties.c +@@ -205,12 +205,12 @@ static void _properties_create_gdbus_proxy(Properties *self, GError **error) + { + if(self->priv->dbus_type && self->priv->dbus_service_name && self->priv->dbus_object_path) + { +- if(g_ascii_strcasecmp(g_ascii_strdown(self->priv->dbus_type, -1), "system") == 0) ++ if(g_ascii_strcasecmp(self->priv->dbus_type, "system") == 0) + { + g_assert(system_conn != NULL); + self->priv->proxy = g_dbus_proxy_new_sync(system_conn, G_DBUS_PROXY_FLAGS_NONE, NULL, self->priv->dbus_service_name, self->priv->dbus_object_path, PROPERTIES_DBUS_INTERFACE, NULL, error); + } +- else if(g_ascii_strcasecmp(g_ascii_strdown(self->priv->dbus_type, -1), "session") == 0) ++ else if(g_ascii_strcasecmp(self->priv->dbus_type, "session") == 0) + { + g_assert(session_conn != NULL); + self->priv->proxy = g_dbus_proxy_new_sync(session_conn, G_DBUS_PROXY_FLAGS_NONE, NULL, self->priv->dbus_service_name, self->priv->dbus_object_path, PROPERTIES_DBUS_INTERFACE, NULL, error); +-- +2.34.1 + + +From 7ca191164a3a3d8867b1a4af7cd349dc53569fa3 Mon Sep 17 00:00:00 2001 +Message-Id: <7ca191164a3a3d8867b1a4af7cd349dc53569fa3.1710791277.git.joerg.sommer@navimatix.de> +In-Reply-To: <e5db2eec2591f0109f0eb7c2631055210b55f2f5.1710791277.git.joerg.sommer@navimatix.de> +References: <e5db2eec2591f0109f0eb7c2631055210b55f2f5.1710791277.git.joerg.sommer@navimatix.de> +From: thatlittlegit <personal@thatlittlegit.tk> +Date: Sun, 8 Nov 2020 14:04:36 -0500 +Subject: [PATCH 4/9] Don't leak g_variant_lookup_value results in bt-obex + +--- + src/bt-obex.c | 23 ++++++++++++++++------- + 1 file changed, 16 insertions(+), 7 deletions(-) + +diff --git a/src/bt-obex.c b/src/bt-obex.c +index 8aacb40..0f044a5 100644 +--- a/src/bt-obex.c ++++ b/src/bt-obex.c +@@ -213,15 +213,24 @@ static void _obex_opp_client_object_manager_handler(GDBusConnection *connection, + g_hash_table_insert(_transfers, g_strdup(interface_object_path), t); + + ObexTransferInfo *info = g_malloc0(sizeof(ObexTransferInfo)); +- info->filesize = g_variant_get_uint64(g_variant_lookup_value(properties, "Size", NULL)); +- info->filename = g_strdup(g_variant_get_string(g_variant_lookup_value(properties, "Name", NULL), NULL)); +- info->status = g_strdup(g_variant_get_string(g_variant_lookup_value(properties, "Status", NULL), NULL)); +- ObexSession *session = obex_session_new(g_variant_get_string(g_variant_lookup_value(properties, "Session", NULL), NULL)); +- ++ ++ GVariant* size_variant = g_variant_lookup_value(properties, "Size", NULL); ++ GVariant* name_variant = g_variant_lookup_value(properties, "Name", NULL); ++ GVariant* status_variant = g_variant_lookup_value(properties, "Status", NULL); ++ GVariant* session_variant = g_variant_lookup_value(properties, "Session", NULL); ++ ++ info->filesize = g_variant_get_uint64(size_variant); ++ info->filename = g_variant_dup_string(name_variant, NULL); ++ info->status = g_variant_dup_string(status_variant, NULL); ++ ObexSession *session = obex_session_new(g_variant_get_string(session_variant, NULL)); + info->obex_root = g_strdup(obex_session_get_root(session, NULL)); +- ++ ++ g_variant_unref(size_variant); ++ g_variant_unref(name_variant); ++ g_variant_unref(status_variant); ++ g_variant_unref(session_variant); + g_object_unref(session); +- ++ + g_hash_table_insert(_transfer_infos, g_strdup(interface_object_path), info); + if(g_strcmp0(info->status, "queued") == 0) + g_print("[Transfer#%s] Waiting...\n", info->filename); +-- +2.34.1 + + +From 7100380b710b36f8e31748ac5bf0e6ffb7c4eed7 Mon Sep 17 00:00:00 2001 +Message-Id: <7100380b710b36f8e31748ac5bf0e6ffb7c4eed7.1710791277.git.joerg.sommer@navimatix.de> +In-Reply-To: <e5db2eec2591f0109f0eb7c2631055210b55f2f5.1710791277.git.joerg.sommer@navimatix.de> +References: <e5db2eec2591f0109f0eb7c2631055210b55f2f5.1710791277.git.joerg.sommer@navimatix.de> +From: thatlittlegit <personal@thatlittlegit.tk> +Date: Thu, 12 Nov 2020 21:41:55 -0500 +Subject: [PATCH 5/9] Correctly free temporary values in bt-obex + +--- + src/bt-obex.c | 35 +++++++++++++++++++++++++---------- + src/lib/helpers.c | 3 ++- + 2 files changed, 27 insertions(+), 11 deletions(-) + +diff --git a/src/bt-obex.c b/src/bt-obex.c +index 0f044a5..547186b 100644 +--- a/src/bt-obex.c ++++ b/src/bt-obex.c +@@ -70,25 +70,32 @@ static void _obex_server_object_manager_handler(GDBusConnection *connection, con + const gchar *interface_object_path = g_variant_get_string(g_variant_get_child_value(parameters, 0), NULL); + GVariant *interfaces_and_properties = g_variant_get_child_value(parameters, 1); + GVariant *properties = NULL; +- ++ + if(g_variant_lookup(interfaces_and_properties, OBEX_TRANSFER_DBUS_INTERFACE, "@a{sv}", &properties)) + { + g_print("[OBEX Server] Transfer started\n"); + ObexTransfer *t = obex_transfer_new(interface_object_path); + g_hash_table_insert(_transfers, g_strdup(interface_object_path), t); +- ++ ++ GVariant* size_variant = g_variant_lookup_value(properties, "Size", NULL); ++ GVariant* status_variant = g_variant_lookup_value(properties, "Status", NULL); ++ GVariant* session_variant = g_variant_lookup_value(properties, "Session", NULL); ++ + ObexTransferInfo *info = g_malloc0(sizeof(ObexTransferInfo)); +- info->filesize = g_variant_get_uint64(g_variant_lookup_value(properties, "Size", NULL)); +- info->status = g_strdup(g_variant_get_string(g_variant_lookup_value(properties, "Status", NULL), NULL)); +- ObexSession *session = obex_session_new(g_variant_get_string(g_variant_lookup_value(properties, "Session", NULL), NULL)); +- ++ info->filesize = g_variant_get_uint64(size_variant); ++ info->status = g_strdup(g_variant_get_string(status_variant, NULL)); ++ ++ ObexSession *session = obex_session_new(g_variant_get_string(session_variant, NULL)); + info->obex_root = g_strdup(obex_session_get_root(session, NULL)); +- + g_object_unref(session); ++ ++ g_variant_unref(size_variant); ++ g_variant_unref(status_variant); ++ g_variant_unref(session_variant); + + g_hash_table_insert(_transfer_infos, g_strdup(interface_object_path), info); + } +- ++ + if(g_variant_lookup(interfaces_and_properties, OBEX_SESSION_DBUS_INTERFACE, "@a{sv}", &properties)) + { + g_print("[OBEX Server] OBEX session opened\n"); +@@ -177,7 +184,12 @@ static void _obex_server_properties_handler(GDBusConnection *connection, const g + { + g_print("[OBEX Server] Transfer succeeded\n"); + ObexTransferInfo *info = g_hash_table_lookup(_transfer_infos, object_path); +- g_rename(g_build_filename(info->obex_root, info->filename, NULL), g_build_filename(_root_path, info->filename, NULL)); ++ ++ gchar* old_name = g_build_filename(info->obex_root, info->filename, NULL); ++ gchar* new_name = g_build_filename(_root_path, info->filename, NULL); ++ g_rename(old_name, new_name); ++ g_free(old_name); ++ g_free(new_name); + } + else if(g_strcmp0(status, "error") == 0) + { +@@ -202,7 +214,8 @@ static void _obex_opp_client_object_manager_handler(GDBusConnection *connection, + { + if(g_strcmp0(signal_name, "InterfacesAdded") == 0) + { +- const gchar *interface_object_path = g_variant_get_string(g_variant_get_child_value(parameters, 0), NULL); ++ GVariant* interface_value = g_variant_get_child_value(parameters, 0); ++ const gchar *interface_object_path = g_variant_get_string(interface_value, NULL); + GVariant *interfaces_and_properties = g_variant_get_child_value(parameters, 1); + GVariant *properties = NULL; + +@@ -242,6 +255,8 @@ static void _obex_opp_client_object_manager_handler(GDBusConnection *connection, + } + + g_variant_unref(interfaces_and_properties); ++ g_variant_unref(interface_value); ++ + if(properties) + g_variant_unref(properties); + } +diff --git a/src/lib/helpers.c b/src/lib/helpers.c +index b61bc07..d9e2257 100644 +--- a/src/lib/helpers.c ++++ b/src/lib/helpers.c +@@ -171,7 +171,7 @@ Adapter *find_adapter(const gchar *name, GError **error) + else + { + // Try to find by name +- const GPtrArray *adapters_list = manager_get_adapters(manager); ++ GPtrArray *adapters_list = manager_get_adapters(manager); + g_assert(adapters_list != NULL); + for (int i = 0; i < adapters_list->len; i++) + { +@@ -193,6 +193,7 @@ Adapter *find_adapter(const gchar *name, GError **error) + g_object_unref(adapter); + adapter = NULL; + } ++ g_ptr_array_unref(adapters_list); + } + + g_object_unref(manager); +-- +2.34.1 + + +From 860fb6e19a7bc272722c36a980004044bc9906e5 Mon Sep 17 00:00:00 2001 +Message-Id: <860fb6e19a7bc272722c36a980004044bc9906e5.1710791277.git.joerg.sommer@navimatix.de> +In-Reply-To: <e5db2eec2591f0109f0eb7c2631055210b55f2f5.1710791277.git.joerg.sommer@navimatix.de> +References: <e5db2eec2591f0109f0eb7c2631055210b55f2f5.1710791277.git.joerg.sommer@navimatix.de> +From: thatlittlegit <personal@thatlittlegit.tk> +Date: Thu, 12 Nov 2020 21:45:51 -0500 +Subject: [PATCH 6/9] Use g_hash_table_new_full() instead of manual freeing + +--- + src/bt-obex.c | 56 +++++++++++++++++---------------------------------- + 1 file changed, 18 insertions(+), 38 deletions(-) + +diff --git a/src/bt-obex.c b/src/bt-obex.c +index 547186b..413c12d 100644 +--- a/src/bt-obex.c ++++ b/src/bt-obex.c +@@ -55,6 +55,14 @@ struct _ObexTransferInfo { + gchar *status; + }; + ++static void obex_transfer_info_free(ObexTransferInfo* info) ++{ ++ g_free(info->filename); ++ g_free(info->obex_root); ++ g_free(info->status); ++ g_free(info); ++} ++ + static void sigterm_handler(int sig) + { + g_message("%s received", sig == SIGTERM ? "SIGTERM" : "SIGINT"); +@@ -117,10 +125,7 @@ static void _obex_server_object_manager_handler(GDBusConnection *connection, con + if(g_strcmp0(*inf, OBEX_TRANSFER_DBUS_INTERFACE) == 0) + { + g_print("[OBEX Server] OBEX transfer closed\n"); +- ObexTransfer *transfer = g_hash_table_lookup(_transfers, interface_object_path); + g_hash_table_remove(_transfers, interface_object_path); +- g_object_unref(transfer); +- g_free(g_hash_table_lookup(_transfer_infos, interface_object_path)); + g_hash_table_remove(_transfer_infos, interface_object_path); + } + +@@ -272,10 +277,7 @@ static void _obex_opp_client_object_manager_handler(GDBusConnection *connection, + if(g_strcmp0(*inf, OBEX_TRANSFER_DBUS_INTERFACE) == 0) + { + // g_print("[OBEX Client] OBEX transfer closed\n"); +- ObexTransfer *transfer = g_hash_table_lookup(_transfers, interface_object_path); + g_hash_table_remove(_transfers, interface_object_path); +- g_object_unref(transfer); +- g_free(g_hash_table_lookup(_transfer_infos, interface_object_path)); + g_hash_table_remove(_transfer_infos, interface_object_path); + if (g_main_loop_is_running(mainloop)) + g_main_loop_quit(mainloop); +@@ -514,8 +516,8 @@ int main(int argc, char *argv[]) + exit_if_error(error); + } + +- _transfers = g_hash_table_new(g_str_hash, g_str_equal); +- _transfer_infos = g_hash_table_new(g_str_hash, g_str_equal); ++ _transfers = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_object_unref); ++ _transfer_infos = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, (GDestroyNotify)obex_transfer_info_free); + + ObexAgentManager *manager = obex_agent_manager_new(); + +@@ -552,21 +554,10 @@ int main(int argc, char *argv[]) + g_hash_table_iter_init(&iter, _transfers); + while (g_hash_table_iter_next(&iter, &key, &value)) + { +- ObexTransfer *t = OBEX_TRANSFER(value); +- obex_transfer_cancel(t, NULL); // skip errors +- g_object_unref(t); +- g_hash_table_iter_remove(&iter); +- } +- g_hash_table_unref(_transfers); +- +- // Remove transfer information +- g_hash_table_iter_init(&iter, _transfer_infos); +- while (g_hash_table_iter_next(&iter, &key, &value)) +- { +- g_free(value); +- g_hash_table_iter_remove(&iter); ++ obex_transfer_cancel(OBEX_TRANSFER(value), NULL); + } + g_hash_table_unref(_transfers); ++ g_hash_table_unref(_transfer_infos); + + g_dbus_connection_signal_unsubscribe(session_conn, obex_server_object_id); + g_dbus_connection_signal_unsubscribe(session_conn, obex_server_properties_id); +@@ -588,8 +579,8 @@ int main(int argc, char *argv[]) + exit_if_error(error); + } + +- _transfers = g_hash_table_new(g_str_hash, g_str_equal); +- _transfer_infos = g_hash_table_new(g_str_hash, g_str_equal); ++ _transfers = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_object_unref); ++ _transfer_infos = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free); + + gchar * files_to_send[] = {NULL, NULL}; + files_to_send[0] = g_path_is_absolute(opp_file_arg) ? g_strdup(opp_file_arg) : get_absolute_path(opp_file_arg); +@@ -663,24 +654,13 @@ int main(int argc, char *argv[]) + g_hash_table_iter_init(&iter, _transfers); + while (g_hash_table_iter_next(&iter, &key, &value)) + { +- ObexTransfer *t = OBEX_TRANSFER(value); +- obex_transfer_cancel(t, NULL); // skip errors +- g_object_unref(t); +- g_hash_table_iter_remove(&iter); ++ obex_transfer_cancel(OBEX_TRANSFER(value), NULL); + } + g_hash_table_unref(_transfers); +- +- // Remove transfer information objects +- g_hash_table_iter_init(&iter, _transfer_infos); +- while (g_hash_table_iter_next(&iter, &key, &value)) +- { +- g_free(value); +- g_hash_table_iter_remove(&iter); +- } +- g_hash_table_unref(_transfers); +- +- g_object_unref(client); + ++ g_hash_table_unref(_transfer_infos); ++ g_object_unref(client); ++ g_object_unref(session); + g_variant_unref(device_dict); + + g_free(src_address); +-- +2.34.1 + + +From 9804eb7e5996c52cc542eef59ba3b5f4d0b0b2f9 Mon Sep 17 00:00:00 2001 +Message-Id: <9804eb7e5996c52cc542eef59ba3b5f4d0b0b2f9.1710791277.git.joerg.sommer@navimatix.de> +In-Reply-To: <e5db2eec2591f0109f0eb7c2631055210b55f2f5.1710791277.git.joerg.sommer@navimatix.de> +References: <e5db2eec2591f0109f0eb7c2631055210b55f2f5.1710791277.git.joerg.sommer@navimatix.de> +From: thatlittlegit <personal@thatlittlegit.tk> +Date: Thu, 12 Nov 2020 21:51:34 -0500 +Subject: [PATCH 7/9] Don't set filesize if we don't know the size + +I only meant to fix the g_variant_unref warning, but fixing all of them +works too! +--- + src/bt-obex.c | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +diff --git a/src/bt-obex.c b/src/bt-obex.c +index 413c12d..219d458 100644 +--- a/src/bt-obex.c ++++ b/src/bt-obex.c +@@ -90,14 +90,22 @@ static void _obex_server_object_manager_handler(GDBusConnection *connection, con + GVariant* session_variant = g_variant_lookup_value(properties, "Session", NULL); + + ObexTransferInfo *info = g_malloc0(sizeof(ObexTransferInfo)); +- info->filesize = g_variant_get_uint64(size_variant); + info->status = g_strdup(g_variant_get_string(status_variant, NULL)); + + ObexSession *session = obex_session_new(g_variant_get_string(session_variant, NULL)); + info->obex_root = g_strdup(obex_session_get_root(session, NULL)); + g_object_unref(session); + +- g_variant_unref(size_variant); ++ if (size_variant != NULL) ++ { ++ info->filesize = g_variant_get_uint64(size_variant); ++ g_variant_unref(size_variant); ++ } ++ else ++ { ++ info->filesize = 0; ++ } ++ + g_variant_unref(status_variant); + g_variant_unref(session_variant); + +-- +2.34.1 + + +From 9566f84464d486983ec597945bc4d5d1594ed830 Mon Sep 17 00:00:00 2001 +Message-Id: <9566f84464d486983ec597945bc4d5d1594ed830.1710791277.git.joerg.sommer@navimatix.de> +In-Reply-To: <e5db2eec2591f0109f0eb7c2631055210b55f2f5.1710791277.git.joerg.sommer@navimatix.de> +References: <e5db2eec2591f0109f0eb7c2631055210b55f2f5.1710791277.git.joerg.sommer@navimatix.de> +From: thatlittlegit <personal@thatlittlegit.tk> +Date: Sun, 15 Nov 2020 16:18:36 -0500 +Subject: [PATCH 8/9] Fix a use-after-free in bt-obex + +--- + src/bt-obex.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/bt-obex.c b/src/bt-obex.c +index 219d458..7dc5d6b 100644 +--- a/src/bt-obex.c ++++ b/src/bt-obex.c +@@ -626,7 +626,7 @@ int main(int argc, char *argv[]) + mainloop = g_main_loop_new(NULL, FALSE); + + ObexClient *client = obex_client_new(); +- const gchar *session_path = obex_client_create_session(client, dst_address, device_dict, &error); ++ const gchar *session_path = obex_client_create_session(client, dst_address, g_variant_ref(device_dict), &error); + exit_if_error(error); + ObexSession *session = obex_session_new(session_path); + ObexObjectPush *oop = obex_object_push_new(obex_session_get_dbus_object_path(session)); +-- +2.34.1 + + +From 5271a4c6419b54a0b18070d39bfc69fae2819c00 Mon Sep 17 00:00:00 2001 +Message-Id: <5271a4c6419b54a0b18070d39bfc69fae2819c00.1710791277.git.joerg.sommer@navimatix.de> +In-Reply-To: <e5db2eec2591f0109f0eb7c2631055210b55f2f5.1710791277.git.joerg.sommer@navimatix.de> +References: <e5db2eec2591f0109f0eb7c2631055210b55f2f5.1710791277.git.joerg.sommer@navimatix.de> +From: thatlittlegit <personal@thatlittlegit.tk> +Date: Sat, 21 Nov 2020 13:09:46 -0500 +Subject: [PATCH 9/9] Fix running sdptool if it isn't in $PATH + +--- + src/bt-device.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/bt-device.c b/src/bt-device.c +index a739b98..948a10c 100644 +--- a/src/bt-device.c ++++ b/src/bt-device.c +@@ -331,9 +331,9 @@ static GHashTable *_bt_device_sdp_browse(const gchar *device_path, const gchar * + } + + if(pattern == NULL || strlen(pattern) == 0) +- execl("/bin/sdptool", "/bin/sdptool", "browse", "--xml", device_path, (char *) 0); ++ execlp("sdptool", "sdptool", "browse", "--xml", device_path, (char *) 0); + else +- execl("/bin/sdptool", "/bin/sdptool", "browse", "--xml", "--uuid", pattern, device_path, (char *) 0); ++ execlp("sdptool", "sdptool", "browse", "--xml", "--uuid", pattern, device_path, (char *) 0); + + } + if(pid == -1) +-- +2.34.1 + diff --git a/meta-networking/recipes-connectivity/bluez-tools/bluez-tools/obex-file-fix-null-check.patch b/meta-networking/recipes-connectivity/bluez-tools/bluez-tools/obex-file-fix-null-check.patch new file mode 100644 index 0000000000..231f3b0b71 --- /dev/null +++ b/meta-networking/recipes-connectivity/bluez-tools/bluez-tools/obex-file-fix-null-check.patch @@ -0,0 +1,41 @@ +Upstream-Status: Submitted [https://github.com/khvzak/bluez-tools/pull/47] + +From f9bc83d46f131037f7fa5195a506b65560199d0d Mon Sep 17 00:00:00 2001 +Message-Id: <f9bc83d46f131037f7fa5195a506b65560199d0d.1710791715.git.joerg.sommer@navimatix.de> +From: George Talusan <george.talusan@gmail.com> +Date: Mon, 26 Oct 2020 21:35:51 -0400 +Subject: [PATCH] fix null checks + +--- + src/lib/bluez/obex/obex_file_transfer.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/lib/bluez/obex/obex_file_transfer.c b/src/lib/bluez/obex/obex_file_transfer.c +index 2d3dafe..91c41d6 100644 +--- a/src/lib/bluez/obex/obex_file_transfer.c ++++ b/src/lib/bluez/obex/obex_file_transfer.c +@@ -194,7 +194,7 @@ GVariant *obex_file_transfer_get_file(ObexFileTransfer *self, const gchar *targe + g_assert(OBEX_FILE_TRANSFER_IS(self)); + GVariant *ret = NULL; + GVariant *proxy_ret = g_dbus_proxy_call_sync(self->priv->proxy, "GetFile", g_variant_new ("(ss)", targetfile, sourcefile), G_DBUS_CALL_FLAGS_NONE, -1, NULL, error); +- if (proxy_ret != NULL) ++ if (proxy_ret == NULL) + return NULL; + ret = g_variant_ref_sink(proxy_ret); + g_variant_unref(proxy_ret); +@@ -228,9 +228,9 @@ GVariant *obex_file_transfer_put_file(ObexFileTransfer *self, const gchar *sourc + g_assert(OBEX_FILE_TRANSFER_IS(self)); + GVariant *ret = NULL; + GVariant *proxy_ret = g_dbus_proxy_call_sync(self->priv->proxy, "PutFile", g_variant_new ("(ss)", targetfile, sourcefile), G_DBUS_CALL_FLAGS_NONE, -1, NULL, error); +- if (proxy_ret != NULL) ++ if (proxy_ret == NULL) + return NULL; + ret = g_variant_ref_sink(proxy_ret); + g_variant_unref(proxy_ret); + return ret; +-} +\ No newline at end of file ++} +-- +2.34.1 + diff --git a/meta-networking/recipes-connectivity/bluez-tools/bluez-tools_git.bb b/meta-networking/recipes-connectivity/bluez-tools/bluez-tools_git.bb new file mode 100644 index 0000000000..22005632c2 --- /dev/null +++ b/meta-networking/recipes-connectivity/bluez-tools/bluez-tools_git.bb @@ -0,0 +1,24 @@ +SUMMARY = "Bluez Tools" +DESCRIPTION = "\ + Additional tools for bluez5 to list, manage, and show inforations about \ + adapters, agents, devices, network connections, and obex. \ +" +HOMEPAGE = "https://github.com/khvzak/bluez-tools" +BUGTRACKER = "https://github.com/khvzak/bluez-tools/issues" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e" + +DEPENDS = "dbus-glib glib-2.0 readline" + +SRC_URI = "\ + git://github.com/khvzak/bluez-tools.git;protocol=https;branch=master \ + file://fix-memory-leaks.patch \ + file://obex-file-fix-null-check.patch \ +" +SRCREV = "f65321736475429316f07ee94ec0deac8e46ec4a" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig + +RDEPENDS:${PN} = "bluez5" diff --git a/meta-networking/recipes-connectivity/cannelloni/cannelloni/0001-include-bits-stdc-.h-only-when-using-libstdc.patch b/meta-networking/recipes-connectivity/cannelloni/cannelloni/0001-include-bits-stdc-.h-only-when-using-libstdc.patch new file mode 100644 index 0000000000..71f447c94b --- /dev/null +++ b/meta-networking/recipes-connectivity/cannelloni/cannelloni/0001-include-bits-stdc-.h-only-when-using-libstdc.patch @@ -0,0 +1,37 @@ +From 7aed36765ae44b41ede7e139da0a11b3696f2e06 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 13 Nov 2023 00:07:23 -0800 +Subject: [PATCH] include bits/stdc++.h only when using libstdc++ + +We have other c++ runtime implementations e.g. llvm's libc++ which does +not provide this header bits/stdc++.h, therefore make sure that this +header is only included when using libstdc++ + +Fixes +| /mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/cannelloni/1.1.0/git/tcpthread.cpp:27:10: fatal error: 'bits/stdc++.h' file not found +| 27 | #include <bits/stdc++.h> +| | ^~~~~~~~~~~~~~~ + +Upstream-Status: Submitted [https://github.com/mguentner/cannelloni/pull/56] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + tcpthread.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/tcpthread.cpp b/tcpthread.cpp +index a1b3047..bb5a7b2 100644 +--- a/tcpthread.cpp ++++ b/tcpthread.cpp +@@ -24,7 +24,9 @@ + #include <cstdint> + #include <cstdio> + ++#ifdef __GLIBCXX__ + #include <bits/stdc++.h> ++#endif + + #include <linux/can.h> + #include <string.h> +-- +2.42.1 + diff --git a/meta-networking/recipes-connectivity/cannelloni/cannelloni_1.1.0.bb b/meta-networking/recipes-connectivity/cannelloni/cannelloni_1.1.0.bb new file mode 100644 index 0000000000..dfa7437ba8 --- /dev/null +++ b/meta-networking/recipes-connectivity/cannelloni/cannelloni_1.1.0.bb @@ -0,0 +1,17 @@ +SUMMARY = "a SocketCAN over Ethernet tunnel" +HOMEPAGE = "https://github.com/mguentner/cannelloni" +LICENSE = "GPL-2.0-only" + +SRC_URI = "git://github.com/mguentner/cannelloni.git;protocol=https;branch=master \ + file://0001-include-bits-stdc-.h-only-when-using-libstdc.patch \ + " +SRCREV = "3d4fb8c8b07f6d7c62b2bdad7e5a94de61c9a29b" + +LIC_FILES_CHKSUM = "file://gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +inherit cmake + +S = "${WORKDIR}/git" + +PACKAGECONFIG ??= "lksctp-tools" +PACKAGECONFIG[lksctp-tools] = "-DSCTP_SUPPORT=true, -DSCTP_SUPPORT=false, lksctp-tools" diff --git a/meta-networking/recipes-connectivity/civetweb/civetweb/0001-Unittest-Link-librt-and-libm-using-l-option.patch b/meta-networking/recipes-connectivity/civetweb/civetweb/0001-Unittest-Link-librt-and-libm-using-l-option.patch new file mode 100644 index 0000000000..eecbc14682 --- /dev/null +++ b/meta-networking/recipes-connectivity/civetweb/civetweb/0001-Unittest-Link-librt-and-libm-using-l-option.patch @@ -0,0 +1,40 @@ +From 21e9a4bb214648ffd43c66b535fbf096bfcc9f4f Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 24 Jun 2018 00:04:37 -0700 +Subject: [PATCH] Unittest: Link librt and libm using -l option + +cmake'ry forces full path to .so files when found using +find_package and since we have proper sysrooted toolchain +-lm and -lrt is all we need + +Upstream-Status: Inappropriate [Cross compile specific] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + unittest/CMakeLists.txt | 10 ++-------- + 1 file changed, 2 insertions(+), 8 deletions(-) + +diff --git a/unittest/CMakeLists.txt b/unittest/CMakeLists.txt +index c4cdf229..e1b63caf 100644 +--- a/unittest/CMakeLists.txt ++++ b/unittest/CMakeLists.txt +@@ -57,14 +57,8 @@ elseif (WIN32) + else() + set(CHECK_LIBRARIES "${CHECK_INSTALL_DIR}/lib/libcheck.a") + endif() +-find_package(LibM) +-if (LIBM_FOUND) +- set(CHECK_LIBRARIES "${CHECK_LIBRARIES};LIBM::LIBM") +-endif() +-find_package(LibRt) +-if (LIBRT_FOUND) +- set(CHECK_LIBRARIES "${CHECK_LIBRARIES};LIBRT::LIBRT") +-endif() ++set(CHECK_LIBRARIES "${CHECK_LIBRARIES};-lm") ++set(CHECK_LIBRARIES "${CHECK_LIBRARIES};-lrt") + + # Build the C unit tests + add_library(shared-c-unit-tests STATIC shared.c) +-- +2.18.0 + diff --git a/meta-networking/recipes-connectivity/civetweb/civetweb_1.16.bb b/meta-networking/recipes-connectivity/civetweb/civetweb_1.16.bb new file mode 100644 index 0000000000..f5a699d5be --- /dev/null +++ b/meta-networking/recipes-connectivity/civetweb/civetweb_1.16.bb @@ -0,0 +1,48 @@ +SUMMARY = "Civetweb embedded web server" +HOMEPAGE = "https://github.com/civetweb/civetweb" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=ce6ce6eb1b2fd59ee6bab219470442a3" + +SRCREV = "d7ba35bbb649209c66e582d5a0244ba988a15159" + +SRC_URI = "git://github.com/civetweb/civetweb.git;branch=master;protocol=https \ + file://0001-Unittest-Link-librt-and-libm-using-l-option.patch \ + " + +S = "${WORKDIR}/git" + +# civetweb supports building with make or cmake (although cmake lacks few features) +inherit cmake + +# Disable Lua and Duktape because they do not compile from CMake (as of v1.8, v1.9 and v1.10). +# Disable ASAN as it is included only in Debug build. +EXTRA_OECMAKE = " \ + -DBUILD_SHARED_LIBS=ON \ + -DCIVETWEB_ENABLE_DUKTAPE=OFF \ + -DCIVETWEB_ENABLE_LUA=OFF \ + -DCIVETWEB_ENABLE_ASAN=OFF \ + -DCIVETWEB_BUILD_TESTING=OFF \ + -DCIVETWEB_SSL_OPENSSL_API_3_0=ON \ +" + +# Building with ninja fails on missing third_party/lib/libcheck.a (which +# should come from external CMake project) +OECMAKE_GENERATOR = "Unix Makefiles" + +PACKAGECONFIG ??= "caching ipv6 server ssl websockets" +PACKAGECONFIG[caching] = "-DCIVETWEB_DISABLE_CACHING=OFF,-DCIVETWEB_DISABLE_CACHING=ON," +PACKAGECONFIG[cgi] = "-DCIVETWEB_DISABLE_CGI=OFF,-DCIVETWEB_DISABLE_CGI=ON," +PACKAGECONFIG[cpp] = "-DCIVETWEB_ENABLE_CXX=ON,-DCIVETWEB_ENABLE_CXX=OFF," +PACKAGECONFIG[debug] = "-DCIVETWEB_ENABLE_MEMORY_DEBUGGING=ON,-DCIVETWEB_ENABLE_MEMORY_DEBUGGING=OFF," +PACKAGECONFIG[ipv6] = "-DCIVETWEB_ENABLE_IPV6=ON,-DCIVETWEB_ENABLE_IPV6=OFF," +PACKAGECONFIG[server] = "-DCIVETWEB_ENABLE_SERVER_EXECUTABLE=ON -DCIVETWEB_INSTALL_EXECUTABLE=ON,-DCIVETWEB_ENABLE_SERVER_EXECUTABLE=OFF -DCIVETWEB_INSTALL_EXECUTABLE=OFF," +PACKAGECONFIG[ssl] = "-DCIVETWEB_ENABLE_SSL=ON -DCIVETWEB_SSL_OPENSSL_API_1_1=OFF -DCIVETWEB_ENABLE_SSL_DYNAMIC_LOADING=OFF,-DCIVETWEB_ENABLE_SSL=OFF,openssl (=1.0.2%)," +PACKAGECONFIG[websockets] = "-DCIVETWEB_ENABLE_WEBSOCKETS=ON,-DCIVETWEB_ENABLE_WEBSOCKETS=OFF," + +do_install:append() { + sed -i -e 's|${RECIPE_SYSROOT_NATIVE}||g' \ + -e 's|${RECIPE_SYSROOT}||g' ${D}${libdir}/cmake/civetweb/civetweb-targets.cmake +} + +BBCLASSEXTEND = "native" diff --git a/meta-networking/recipes-connectivity/crda/crda/0001-Makefile-respect-LDFLAGS-for-libreg.patch b/meta-networking/recipes-connectivity/crda/crda/0001-Makefile-respect-LDFLAGS-for-libreg.patch deleted file mode 100644 index 16800d5066..0000000000 --- a/meta-networking/recipes-connectivity/crda/crda/0001-Makefile-respect-LDFLAGS-for-libreg.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 1e1a78b7b4fa1662b4447aa19c15b1e839b7e9db Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Stefan=20M=C3=BCller-Klieser?= <s.mueller-klieser@phytec.de> -Date: Wed, 24 Aug 2016 10:58:45 +0200 -Subject: [PATCH] Makefile: respect LDFLAGS for libreg -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de> ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 2879896..1650db8 100644 ---- a/Makefile -+++ b/Makefile -@@ -116,7 +116,7 @@ keys-%.c: utils/key2pub.py $(wildcard $(PUBKEY_DIR)/*.pem) - - $(LIBREG): regdb.h reglib.h reglib.c - $(NQ) ' CC ' $@ -- $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^ $(LIBREGLDLIBS) -+ $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^ $(LDFLAGS) $(LIBREGLDLIBS) - - install-libreg-headers: - $(NQ) ' INSTALL libreg-headers' --- -1.9.1 - diff --git a/meta-networking/recipes-connectivity/crda/crda/do-not-run-ldconfig-if-destdir-is-set.patch b/meta-networking/recipes-connectivity/crda/crda/do-not-run-ldconfig-if-destdir-is-set.patch deleted file mode 100644 index 3ef35ee549..0000000000 --- a/meta-networking/recipes-connectivity/crda/crda/do-not-run-ldconfig-if-destdir-is-set.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Ben Hutchings <ben@decadent.org.uk> -Date: Sat, 23 Aug 2014 12:27:34 -0700 -Subject: crda: Do not run ldconfig if DESTDIR is set - -Upstream-Status: Backport [http://www.spinics.net/lists/linux-wireless/msg126028.html] - -Signed-off-by: Ben Hutchings <ben@decadent.org.uk> -Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> - ---- a/Makefile -+++ b/Makefile -@@ -132,7 +132,9 @@ install-libreg: - $(NQ) ' INSTALL libreg' - $(Q)mkdir -p $(DESTDIR)/$(LIBDIR) - $(Q)cp $(LIBREG) $(DESTDIR)/$(LIBDIR)/ -+ifndef DESTDIR - $(Q)ldconfig -+endif - - %.o: %.c regdb.h $(LIBREG) - $(NQ) ' CC ' $@ diff --git a/meta-networking/recipes-connectivity/crda/crda/fix-gcc-6-unused-variables.patch b/meta-networking/recipes-connectivity/crda/crda/fix-gcc-6-unused-variables.patch deleted file mode 100644 index 747804d345..0000000000 --- a/meta-networking/recipes-connectivity/crda/crda/fix-gcc-6-unused-variables.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- crda-3.18/utils/key2pub.py.orig 2016-06-18 09:54:23.671326113 -0400 -+++ crda-3.18/utils/key2pub.py 2016-06-18 09:54:34.387326300 -0400 -@@ -115,7 +115,7 @@ - .n = _n, .len_n = sizeof(_n), \ - } - --static const struct key_params keys[] = { -+static const struct key_params keys[] __attribute__((unused))= { - ''') - for n in xrange(n + 1): - output.write(' KEYS(e_%d, n_%d),\n' % (n, n)) diff --git a/meta-networking/recipes-connectivity/crda/crda/fix-issues-when-USE_OPENSSL-1.patch b/meta-networking/recipes-connectivity/crda/crda/fix-issues-when-USE_OPENSSL-1.patch deleted file mode 100644 index 93c836cf34..0000000000 --- a/meta-networking/recipes-connectivity/crda/crda/fix-issues-when-USE_OPENSSL-1.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 8d2164a090f17286ea8291f30a123595cf447dc3 Mon Sep 17 00:00:00 2001 -From: Haiqing Bai <Haiqing.Bai@windriver.com> -Date: Wed, 30 Nov 2016 10:27:36 +0800 -Subject: [PATCH] crda: fix issues when 'USE_OPENSSL=1'. - -Fxed the below issues if configured with 'USE_OPENSSL=1': -a. keys-ssl.c uses BN_ULONG but doesn't include the openssl headers leading - to build failures: - keys-ssl.c:2:8: error: unknown type name 'BN_ULONG' - static BN_ULONG e_0[1] = { - -b. The large unqualified constants also break building: - keys-ssl.c:8:2: warning: overflow in implicit constant conversion [-Woverflow] - 0x63a2705416a0d8e1, 0xdc9fca11c8ba757b, - -c. keys-ssl.c: error: 'keys' defined but not used [-Werror=unused-variable] - static struct pubkey keys[] = { - -Signed-off-by: Mike Frysinger <vapier@gentoo.org> -Upsteam-Status: Pending -Signed-off-by: Haiqing Bai <Haiqing.Bai@windriver.com> ---- - utils/key2pub.py | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/utils/key2pub.py b/utils/key2pub.py -index 401d58a..3ae00b8 100755 ---- a/utils/key2pub.py -+++ b/utils/key2pub.py -@@ -24,7 +24,7 @@ def print_ssl_64(output, name, val): - for v1, v2, v3, v4, v5, v6, v7, v8 in vnew: - if not idx: - output.write('\t') -- output.write('0x%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2x, ' % (ord(v1), ord(v2), ord(v3), ord(v4), ord(v5), ord(v6), ord(v7), ord(v8))) -+ output.write('0x%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2xULL, ' % (ord(v1), ord(v2), ord(v3), ord(v4), ord(v5), ord(v6), ord(v7), ord(v8))) - idx += 1 - if idx == 2: - idx = 0 -@@ -60,6 +60,7 @@ def print_ssl_32(output, name, val): - def print_ssl(output, name, val): - import os - output.write('#include <stdint.h>\n') -+ output.write('#include <openssl/bn.h>\n') - if os.getenv('TARGET_BITS') == '64': - return print_ssl_64(output, name, val) - else: -@@ -78,7 +79,7 @@ struct pubkey { - - #define KEYS(e,n) { KEY(e), KEY(n), } - --static struct pubkey keys[] = { -+static struct pubkey keys[] __attribute__((unused))= { - ''') - for n in xrange(n + 1): - output.write(' KEYS(e_%d, n_%d),\n' % (n, n)) --- -1.9.1 - diff --git a/meta-networking/recipes-connectivity/crda/crda/fix-linking-of-libraries-used-by-reglib.patch b/meta-networking/recipes-connectivity/crda/crda/fix-linking-of-libraries-used-by-reglib.patch deleted file mode 100644 index aceb56df74..0000000000 --- a/meta-networking/recipes-connectivity/crda/crda/fix-linking-of-libraries-used-by-reglib.patch +++ /dev/null @@ -1,50 +0,0 @@ -From: Ben Hutchings <ben@decadent.org.uk> -Date: Sat, 23 Aug 2014 12:26:37 -0700 -Subject: Fix linking of libraries used by libreg - -The math and crypto libraries are called by and need to be linked to -libreg.so, not to the executables. - -Upstream-Status: Backport [http://www.spinics.net/lists/linux-wireless/msg126027.html] - -Signed-off-by: Ben Hutchings <ben@decadent.org.uk> -Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> - ---- a/Makefile -+++ b/Makefile -@@ -30,7 +30,7 @@ CFLAGS += -std=gnu99 -Wall -Werror -peda - CFLAGS += -Wall -g - LDLIBREG += -lreg - LDLIBS += $(LDLIBREG) --LDLIBS += -lm -+LIBREGLDLIBS += -lm - LIBREG += libreg.so - LDFLAGS += -L ./ - -@@ -40,7 +40,7 @@ all_noverify: $(LIBREG) crda intersect r - - ifeq ($(USE_OPENSSL),1) - CFLAGS += -DUSE_OPENSSL -DPUBKEY_DIR=\"$(RUNTIME_PUBKEY_DIR)\" `pkg-config --cflags openssl` --LDLIBS += `pkg-config --libs openssl` -+LIBREGLDLIBS += `pkg-config --libs openssl` - - ifeq ($(RUNTIME_PUBKEY_ONLY),1) - CFLAGS += -DRUNTIME_PUBKEY_ONLY -@@ -51,7 +51,7 @@ endif - - else - CFLAGS += -DUSE_GCRYPT --LDLIBS += -lgcrypt -+LIBREGLDLIBS += -lgcrypt - - $(LIBREG): keys-gcrypt.c - -@@ -121,7 +121,7 @@ keys-%.c: utils/key2pub.py $(wildcard $( - - $(LIBREG): regdb.h reglib.h reglib.c - $(NQ) ' CC ' $@ -- $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^ -+ $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^ $(LIBREGLDLIBS) - - install-libreg-headers: - $(NQ) ' INSTALL libreg-headers' diff --git a/meta-networking/recipes-connectivity/crda/crda/make.patch b/meta-networking/recipes-connectivity/crda/crda/make.patch deleted file mode 100644 index 0b737852c2..0000000000 --- a/meta-networking/recipes-connectivity/crda/crda/make.patch +++ /dev/null @@ -1,25 +0,0 @@ -These headers are not related to any Make rule but they do appear in -compiling of libreg.so, specifying .h files in compiler cmdline is flagged -as error by clang - -| clang-4.0: error: cannot specify -o when generating multiple output files -| make: *** [libreg.so] Error 1 - -This is how we see headers in cmdline --O2 -fpic -std=gnu -99 -Wall -Werror -pedantic -Wall -g -DUSE_GCRYPT -DCONFIG_LIBNL30 `pkg-config --cflags libnl-3.0` -o libreg.so -shared -Wl,-soname,libreg.so -regdb.h reglib.h reglib.c keys-gcrypt.c -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -L ./ -lm -lgcrypt - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- a/Makefile.kk 2016-11-15 04:54:53.338670000 +0000 -+++ a/Makefile 2016-11-15 04:55:07.718670000 +0000 -@@ -114,7 +114,7 @@ keys-%.c: utils/key2pub.py $(wildcard $( - $(NQ) ' Trusted pubkeys:' $(wildcard $(PUBKEY_DIR)/*.pem) - $(Q)./utils/key2pub.py --$* $(wildcard $(PUBKEY_DIR)/*.pem) $@ - --$(LIBREG): regdb.h reglib.h reglib.c -+$(LIBREG): reglib.c - $(NQ) ' CC ' $@ - $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^ $(LDFLAGS) $(LIBREGLDLIBS) - diff --git a/meta-networking/recipes-connectivity/crda/crda/use-target-word-size-instead-of-host-s.patch b/meta-networking/recipes-connectivity/crda/crda/use-target-word-size-instead-of-host-s.patch deleted file mode 100644 index 100b765f2d..0000000000 --- a/meta-networking/recipes-connectivity/crda/crda/use-target-word-size-instead-of-host-s.patch +++ /dev/null @@ -1,34 +0,0 @@ -From c1c42513edd27c97341f2033af77c13a4724eb8f Mon Sep 17 00:00:00 2001 -From: Haiqing Bai <Haiqing.Bai@windriver.com> -Date: Fri, 25 Nov 2016 16:48:01 +0800 -Subject: [PATCH] crda: Use target word size instead of host's. - -In key2pub.py, the codes check the wordsize -of the host machine but not the target's, this fix -fetches the wordsize of target from the build system. - -Upstream-Status: Pending -Signed-off-by: Haiqing Bai <Haiqing.Bai@windriver.com> ---- - utils/key2pub.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/utils/key2pub.py b/utils/key2pub.py -index 3e84cd2..401d58a 100755 ---- a/utils/key2pub.py -+++ b/utils/key2pub.py -@@ -58,9 +58,9 @@ def print_ssl_32(output, name, val): - output.write('};\n\n') - - def print_ssl(output, name, val): -- import struct -+ import os - output.write('#include <stdint.h>\n') -- if len(struct.pack('@L', 0)) == 8: -+ if os.getenv('TARGET_BITS') == '64': - return print_ssl_64(output, name, val) - else: - return print_ssl_32(output, name, val) --- -1.9.1 - diff --git a/meta-networking/recipes-connectivity/crda/crda_3.18.bb b/meta-networking/recipes-connectivity/crda/crda_3.18.bb deleted file mode 100644 index 82a297b33e..0000000000 --- a/meta-networking/recipes-connectivity/crda/crda_3.18.bb +++ /dev/null @@ -1,36 +0,0 @@ -SUMMARY = "Wireless Central Regulatory Domain Agent" -HOMEPAGE = "http://wireless.kernel.org/en/developers/Regulatory/CRDA" -SECTION = "net" -LICENSE = "copyleft-next-0.3.0" -LIC_FILES_CHKSUM = "file://copyleft-next-0.3.0;md5=8743a2c359037d4d329a31e79eabeffe" - -DEPENDS = "python-m2crypto-native python-typing-native python-native libgcrypt libnl openssl" - -SRC_URI = "https://www.kernel.org/pub/software/network/${BPN}/${BP}.tar.xz \ - file://do-not-run-ldconfig-if-destdir-is-set.patch \ - file://fix-linking-of-libraries-used-by-reglib.patch \ - file://fix-gcc-6-unused-variables.patch \ - file://0001-Makefile-respect-LDFLAGS-for-libreg.patch \ - file://make.patch \ - file://use-target-word-size-instead-of-host-s.patch \ - file://fix-issues-when-USE_OPENSSL-1.patch \ -" -SRC_URI[md5sum] = "0431fef3067bf503dfb464069f06163a" -SRC_URI[sha256sum] = "43fcb9679f8b75ed87ad10944a506292def13e4afb194afa7aa921b01e8ecdbf" - -inherit python-dir pythonnative -# Recursive make problem -EXTRA_OEMAKE = "MAKEFLAGS= DESTDIR=${D} LIBDIR=${libdir}/crda LDLIBREG='-Wl,-rpath,${libdir}/crda -lreg'" -EXTRA_OEMAKE_append = " USE_OPENSSL=1" -TARGET_BITS = "${SITEINFO_BITS}" -export TARGET_BITS - -do_compile() { - oe_runmake all_noverify -} - -do_install() { - oe_runmake SBINDIR=${sbindir}/ install -} - -RDEPENDS_${PN} = "udev wireless-regdb" diff --git a/meta-networking/recipes-connectivity/daq/daq_2.0.6.bb b/meta-networking/recipes-connectivity/daq/daq_2.0.7.bb index ec35175a08..96515935a9 100644 --- a/meta-networking/recipes-connectivity/daq/daq_2.0.6.bb +++ b/meta-networking/recipes-connectivity/daq/daq_2.0.7.bb @@ -1,35 +1,37 @@ SUMMARY = "The dump DAQ test the various inline mode features " HOMEPAGE = "http://www.snort.org" SECTION = "libs" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=f9ce51a65dd738dc1ae631d8b21c40e0" PARALLEL_MAKE = "" -DEPENDS = "libpcap libpcre libdnet" +DEPENDS = "libpcap libpcre libdnet bison-native libnetfilter-queue" SRC_URI = "http://fossies.org/linux/misc/daq-${PV}.tar.gz \ file://disable-run-test-program-while-cross-compiling.patch \ file://0001-correct-the-location-of-unistd.h.patch \ " - +SRC_URI[sha256sum] = "bdc4e5a24d1ea492c39ee213a63c55466a2e8114b6a9abed609927ae13a7705e" # these 2 create undeclared dependency on libdnet and libnetfilter-queue from meta-networking # this error from test-dependencies script: # daq/daq/latest lost dependency on libdnet libmnl libnetfilter-queue libnfnetlink # # never look to /usr/local lib while cross compiling -EXTRA_OECONF = "--disable-nfq-module --disable-ipq-module --includedir=${includedir} \ +EXTRA_OECONF = "--enable-nfq-module --disable-ipq-module --includedir=${includedir} \ --with-libpcap-includes=${STAGING_INCDIR} --with-dnet-includes=${STAGING_LIBDIR}" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," -SRC_URI[md5sum] = "2cd6da422a72c129c685fc4bb848c24c" -SRC_URI[sha256sum] = "b40e1d1273e08aaeaa86e69d4f28d535b7e53bdb3898adf539266b63137be7cb" - -inherit autotools +inherit autotools multilib_script +MULTILIB_SCRIPTS += "${PN}:${bindir}/daq-modules-config " DISABLE_STATIC = "" BBCLASSEXTEND = "native" + +# http://errors.yoctoproject.org/Errors/Details/766912/ +# daq-2.0.7/os-daq-modules/daq_nfq.c:394:37: error: passing argument 2 of 'nfq_get_payload' from incompatible pointer type [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-networking/recipes-connectivity/daq/files/0001-correct-the-location-of-unistd.h.patch b/meta-networking/recipes-connectivity/daq/files/0001-correct-the-location-of-unistd.h.patch index 4798a77f55..7587d44336 100644 --- a/meta-networking/recipes-connectivity/daq/files/0001-correct-the-location-of-unistd.h.patch +++ b/meta-networking/recipes-connectivity/daq/files/0001-correct-the-location-of-unistd.h.patch @@ -1,12 +1,15 @@ -From 10e7d4e4bfcb70344d18f0d4ce36068475747f25 Mon Sep 17 00:00:00 2001 +From b7d54de51553f6d09906c355bd0dd326890c8fe4 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 29 Mar 2017 15:59:43 -0700 Subject: [PATCH] correct the location of unistd.h +Upstream-Status: Pending + Signed-off-by: Khem Raj <raj.khem@gmail.com> --- os-daq-modules/daq_ipfw.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + os-daq-modules/daq_nfq.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/os-daq-modules/daq_ipfw.c b/os-daq-modules/daq_ipfw.c index 016beb0..c2a4175 100644 @@ -24,6 +27,22 @@ index 016beb0..c2a4175 100644 #include <netinet/in.h> #include <sys/socket.h> +diff --git a/os-daq-modules/daq_nfq.c b/os-daq-modules/daq_nfq.c +index 33021c0..4de94b6 100644 +--- a/os-daq-modules/daq_nfq.c ++++ b/os-daq-modules/daq_nfq.c +@@ -24,10 +24,10 @@ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> ++#include <unistd.h> + + #include <sys/types.h> + #include <sys/time.h> +-#include <sys/unistd.h> + + #include <netinet/ip.h> + -- -2.12.1 +2.25.1 diff --git a/meta-networking/recipes-connectivity/daq/files/disable-run-test-program-while-cross-compiling.patch b/meta-networking/recipes-connectivity/daq/files/disable-run-test-program-while-cross-compiling.patch index a100b7cb83..cb986b85da 100644 --- a/meta-networking/recipes-connectivity/daq/files/disable-run-test-program-while-cross-compiling.patch +++ b/meta-networking/recipes-connectivity/daq/files/disable-run-test-program-while-cross-compiling.patch @@ -1,4 +1,4 @@ -Upstream-Status:Inappropriate [embedded specific] +Upstream-Status: Inappropriate [embedded specific] fix the below error: configure: error: cannot run test program while cross compiling diff --git a/meta-networking/recipes-connectivity/daq/libdaq/0001-example-Use-lm-for-the-fst-module.patch b/meta-networking/recipes-connectivity/daq/libdaq/0001-example-Use-lm-for-the-fst-module.patch new file mode 100644 index 0000000000..7147c042a1 --- /dev/null +++ b/meta-networking/recipes-connectivity/daq/libdaq/0001-example-Use-lm-for-the-fst-module.patch @@ -0,0 +1,32 @@ +From 9357da2a5a829f7a0620e6c19835a65b7b02a8fb Mon Sep 17 00:00:00 2001 +From: Khawaja Shaheryar <behzadshaheryar@gmail.com> +Date: Tue, 20 Feb 2024 21:03:26 +0500 +Subject: [PATCH] example: Use -lm for the fst module + +If -lm is not passed in Makefile.am, the following is seen +| arm-yoe-linux-gnueabi-ld.lld: error: undefined symbol: ceilf +| >>> referenced by math.h:632 (/usr/include/c++/v1/math.h:632) +| >>> libdaq_static_fst_la-daq_fst.o:(std::__1::pair<std::__1::__hash_iterator<std::__1::__hash_node<std::__1::__hash_value_type<FstKey, FstNode*>, void*>*>, bool> std::__1::__hash_table<std::__1::__hash_value_type<FstKey, FstNode*>, std::__1::__unordered_map_hasher<FstKey, std::__1::__hash_value_type<FstKey, FstNode*>, FstKeyHash, std::__1::equal_to<FstKey>, true>, std::__1::__unordered_map_equal<FstKey, std::__1::__hash_value_type<FstKey, FstNode*>, std::__1::equal_to<FstKey>, FstKeyHash, true>, std::__1::allocator<std::__1::__hash_value_type<FstKey, FstNode*>>>::__emplace_unique_key_args<FstKey, std::__1::pair<FstKey const, FstNode*>>(FstKey const&, std::__1::pair<FstKey const, FstNode*>&&)) in archive ../modules/fst/.libs/libdaq_static_fst.a + +Upstream-Status: Pending + +Signed-off-by: Khawaja Shaheryar <behzadshaheryar@gmail.com> +--- + example/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/example/Makefile.am b/example/Makefile.am +index 0d5ca31..1eaa9e8 100644 +--- a/example/Makefile.am ++++ b/example/Makefile.am +@@ -31,6 +31,7 @@ endif + if BUILD_FST_MODULE + daqtest_static_CFLAGS += -DBUILD_FST_MODULE + daqtest_static_LDADD += ${top_builddir}/modules/fst/libdaq_static_fst.la $(DAQ_FST_LIBS) ++daqtest_static_LDFLAGS += -lm + endif + if BUILD_NETMAP_MODULE + daqtest_static_CFLAGS += -DBUILD_NETMAP_MODULE +-- +2.34.1 + diff --git a/meta-networking/recipes-connectivity/daq/libdaq_3.0.14.bb b/meta-networking/recipes-connectivity/daq/libdaq_3.0.14.bb new file mode 100644 index 0000000000..74964e0741 --- /dev/null +++ b/meta-networking/recipes-connectivity/daq/libdaq_3.0.14.bb @@ -0,0 +1,18 @@ +SUMMARY = "LibDAQ: The Data AcQuisition Library" +DESCRIPTION = "LibDAQ is a pluggable abstraction layer for interacting with a data source (traditionally a network interface or network data plane)." +HOMEPAGE = "http://www.snort.org" +SECTION = "libs" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=79258250506422d064560a7b95b2d53e" + +DEPENDS = "libdnet libpcap" + +inherit autotools pkgconfig + +SRC_URI = "git://github.com/snort3/libdaq.git;protocol=https;branch=master \ + file://0001-example-Use-lm-for-the-fst-module.patch" +SRCREV = "4e68d7ba6940df9a1503599d7b177029112d6b6a" + +S = "${WORKDIR}/git" + +FILES:${PN} += "${libdir}/daq/*.so" 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 new file mode 100644 index 0000000000..e458321e6e --- /dev/null +++ b/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.3p1.bb @@ -0,0 +1,72 @@ +SECTION = "console/network" +SUMMARY = "Internet Software Consortium DHCP Relay Agent" +DESCRIPTION = "A DHCP relay agent passes DHCP requests from one \ +LAN to another, so that a DHCP server is not needed on every LAN." + +HOMEPAGE = "http://www.isc.org/" + +LICENSE = "MPL-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c463f4afde26d9eb60f14f50aeb85f8f" + +DEPENDS = "openssl libcap zlib" + +SRC_URI = "https://downloads.isc.org/isc/dhcp/4.4.3-P1/dhcp-4.4.3-P1.tar.gz \ + file://default-relay \ + file://init-relay \ + file://dhcrelay.service \ + file://0001-Makefile.am-only-build-dhcrelay.patch \ + file://0002-bind-Makefile.in-disable-backtrace.patch \ + file://0003-bind-Makefile.in-regenerate-configure.patch \ + " + +SRC_URI[sha256sum] = "0ac416bb55997ca8632174fd10737fd61cdb8dba2752160a335775bc21dc73c7" + +UPSTREAM_CHECK_URI = "http://ftp.isc.org/isc/dhcp/" +UPSTREAM_CHECK_REGEX = "(?P<pver>\d+\.\d+\.(\d+?))/" + +S = "${WORKDIR}/dhcp-4.4.3-P1" + +inherit autotools-brokensep systemd pkgconfig + +SYSTEMD_SERVICE:${PN} = "dhcrelay.service" +SYSTEMD_AUTO_ENABLE:${PN} = "disable" + +CFLAGS += "-D_GNU_SOURCE -fcommon" +LDFLAGS:append = " -pthread" + +BIND_EXTRA_CONFIG = "\ + --build=${BUILD_SYS} \ + --host=${HOST_SYS} \ + --target=${TARGET_SYS} \ +" + +EXTRA_OECONF = "--with-bind-extra-config="${BIND_EXTRA_CONFIG}" \ + --enable-paranoia \ + --disable-static \ + --enable-libtool \ + --with-randomdev=/dev/random \ + " + +# Enable shared libs per dhcp README +do_configure:prepend () { + cp configure.ac+lt configure.ac +} + +do_install:append () { + install -Dm 0644 ${UNPACKDIR}/default-relay ${D}${sysconfdir}/default/dhcp-relay + + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${UNPACKDIR}/dhcrelay.service ${D}${systemd_unitdir}/system + sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/dhcrelay.service + sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/dhcrelay.service + else + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${UNPACKDIR}/init-relay ${D}${sysconfdir}/init.d/dhcp-relay + fi +} + +PARALLEL_MAKE = "" + +# dhcp-relay contains a bundled "bind", thus their dev packages conflict each other +RCONFLICTS:${PN}-dev = "bind-dev" diff --git a/meta-networking/recipes-connectivity/dhcp/files/0001-Makefile.am-only-build-dhcrelay.patch b/meta-networking/recipes-connectivity/dhcp/files/0001-Makefile.am-only-build-dhcrelay.patch new file mode 100644 index 0000000000..5320d7c9e9 --- /dev/null +++ b/meta-networking/recipes-connectivity/dhcp/files/0001-Makefile.am-only-build-dhcrelay.patch @@ -0,0 +1,30 @@ +From 4fd67b6adb7c1d8524ba17d1a0b3894f901555a9 Mon Sep 17 00:00:00 2001 +From: Yi Zhao <yi.zhao@windriver.com> +Date: Thu, 13 May 2021 15:23:16 +0800 +Subject: [PATCH] Makefile.am: only build dhcrelay + +Drop client and server build as we don't need them. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index ed692a5..34f9772 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -38,7 +38,7 @@ endif + + # Use an autoconf substitution vs an automake conditional here + # to fool automake when the bind directory does not exist. +-SUBDIRS = @BINDSUBDIR@ includes tests common omapip client dhcpctl relay server ++SUBDIRS = @BINDSUBDIR@ includes common omapip relay + + DIST_SUBDIRS = $(SUBDIRS) keama + +-- +2.25.1 + diff --git a/meta-networking/recipes-connectivity/dhcp/files/0002-bind-Makefile.in-disable-backtrace.patch b/meta-networking/recipes-connectivity/dhcp/files/0002-bind-Makefile.in-disable-backtrace.patch new file mode 100644 index 0000000000..631a640ecc --- /dev/null +++ b/meta-networking/recipes-connectivity/dhcp/files/0002-bind-Makefile.in-disable-backtrace.patch @@ -0,0 +1,31 @@ +From 6c6bbfe6b33e5c7e46a4260d656593dbe610fd8a Mon Sep 17 00:00:00 2001 +From: Yi Zhao <yi.zhao@windriver.com> +Date: Tue, 8 Jun 2021 10:13:57 +0800 +Subject: [PATCH] bind/Makefile.in: disable backtrace + +Fixes build error for qemuarm on musl: +libisc.so: undefined reference to `_Unwind_GetIP' + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + bind/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/bind/Makefile.in b/bind/Makefile.in +index 2e60091..533d55c 100644 +--- a/bind/Makefile.in ++++ b/bind/Makefile.in +@@ -22,7 +22,7 @@ prefix = @prefix@ + exec_prefix = @exec_prefix@ + + bindconfig = --without-openssl --without-libxml2 --without-libjson \ +- --without-gssapi --disable-threads --without-lmdb \ ++ --without-gssapi --disable-threads --without-lmdb --disable-backtrace \ + --includedir=@includedir@ --libdir=@libdir@ --without-python\ + @BINDLT@ @BINDIOMUX@ @BINDCONFIG@ --enable-full-report + +-- +2.25.1 + diff --git a/meta-networking/recipes-connectivity/dhcp/files/0003-bind-Makefile.in-regenerate-configure.patch b/meta-networking/recipes-connectivity/dhcp/files/0003-bind-Makefile.in-regenerate-configure.patch new file mode 100644 index 0000000000..71be0276a3 --- /dev/null +++ b/meta-networking/recipes-connectivity/dhcp/files/0003-bind-Makefile.in-regenerate-configure.patch @@ -0,0 +1,30 @@ +From 6ca1b224032355521b35471d222d0b09c08369a0 Mon Sep 17 00:00:00 2001 +From: Yi Zhao <yi.zhao@windriver.com> +Date: Thu, 27 May 2021 11:38:36 +0800 +Subject: [PATCH] bind/Makefile.in: regenerate configure + +Run autogen.sh to regenerate configure. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + bind/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/bind/Makefile.in b/bind/Makefile.in +index 533d55c..fdffe15 100644 +--- a/bind/Makefile.in ++++ b/bind/Makefile.in +@@ -55,7 +55,7 @@ bind1: + else \ + echo Configuring BIND libraries for DHCP. ; \ + rm -rf ${cleandirs} ${cleanfiles} ; \ +- (cd ${bindsrcdir} && \ ++ (cd ${bindsrcdir} && ./autogen.sh && \ + ./configure ${bindconfig} > ${binddir}/configure.log); \ + fi + +-- +2.25.1 + diff --git a/meta-networking/recipes-connectivity/dhcp/files/default-relay b/meta-networking/recipes-connectivity/dhcp/files/default-relay new file mode 100644 index 0000000000..7961f014be --- /dev/null +++ b/meta-networking/recipes-connectivity/dhcp/files/default-relay @@ -0,0 +1,12 @@ +# Defaults for dhcp-relay initscript +# sourced by /etc/init.d/dhcp-relay + +# What servers should the DHCP relay forward requests to? +# e.g: SERVERS="192.168.0.1" +SERVERS="" + +# On what interfaces should the DHCP relay (dhrelay) serve DHCP requests? +INTERFACES="" + +# Additional options that are passed to the DHCP relay daemon? +OPTIONS="" diff --git a/meta-networking/recipes-connectivity/dhcp/files/dhcrelay.service b/meta-networking/recipes-connectivity/dhcp/files/dhcrelay.service new file mode 100644 index 0000000000..15ff927d34 --- /dev/null +++ b/meta-networking/recipes-connectivity/dhcp/files/dhcrelay.service @@ -0,0 +1,10 @@ +[Unit] +Description=DHCP Relay Agent Daemon +After=network.target + +[Service] +EnvironmentFile=@SYSCONFDIR@/default/dhcp-relay +ExecStart=@SBINDIR@/dhcrelay -d --no-pid -q $SERVERS + +[Install] +WantedBy=multi-user.target diff --git a/meta-networking/recipes-connectivity/dhcp/files/init-relay b/meta-networking/recipes-connectivity/dhcp/files/init-relay new file mode 100644 index 0000000000..019a7e84cf --- /dev/null +++ b/meta-networking/recipes-connectivity/dhcp/files/init-relay @@ -0,0 +1,44 @@ +#!/bin/sh +# +# $Id: dhcp3-relay,v 1.1 2004/04/16 15:41:08 ml Exp $ +# + +# It is not safe to start if we don't have a default configuration... +if [ ! -f /etc/default/dhcp-relay ]; then + echo "/etc/default/dhcp-relay does not exist! - Aborting..." + echo "create this file to fix the problem." + exit 1 +fi + +# Read init script configuration (interfaces the daemon should listen on +# and the DHCP server we should forward requests to.) +. /etc/default/dhcp-relay + +# Build command line for interfaces (will be passed to dhrelay below.) +IFCMD="" +if test "$INTERFACES" != ""; then + for I in $INTERFACES; do + IFCMD=${IFCMD}"-i "${I}" " + done +fi + +DHCRELAYPID=/var/run/dhcrelay.pid + +case "$1" in + start) + start-stop-daemon -S -x /usr/sbin/dhcrelay -- -q $OPTIONS $IFCMD $SERVERS + ;; + stop) + start-stop-daemon -K -x /usr/sbin/dhcrelay + ;; + restart | force-reload) + $0 stop + sleep 2 + $0 start + ;; + *) + echo "Usage: /etc/init.d/dhcp-relay {start|stop|restart|force-reload}" + exit 1 +esac + +exit 0 diff --git a/meta-networking/recipes-connectivity/dhcpcd/dhcpcd_6.11.3.bb b/meta-networking/recipes-connectivity/dhcpcd/dhcpcd_6.11.3.bb deleted file mode 100644 index cb3b5c22f5..0000000000 --- a/meta-networking/recipes-connectivity/dhcpcd/dhcpcd_6.11.3.bb +++ /dev/null @@ -1,24 +0,0 @@ -SECTION = "console/network" -SUMMARY = "dhcpcd - a DHCP client" -DESCRIPTION = "dhcpcd runs on your machine and silently configures your computer to work on the attached networks without trouble and mostly without configuration." - -HOMEPAGE = "http://roy.marples.name/projects/dhcpcd/" - -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://dhcpcd.c;endline=26;md5=77c40d671aff804ca91ea99556da8e9b" - -SRC_URI = "http://roy.marples.name/downloads/${BPN}/${BPN}-${PV}.tar.xz" - -SRC_URI[md5sum] = "d4f2f3ed4964197dee7767219c33a9df" -SRC_URI[sha256sum] = "5abd12c4df2947d608f60a35227f9bf8ae8ab9de06ce975cdab1144d8f229b06" - -inherit autotools-brokensep - -PACKAGECONFIG ?= "udev ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" - -PACKAGECONFIG[udev] = "--with-udev,--without-udev,udev,udev" -PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6" - -EXTRA_OECONF = "--enable-ipv4" - -FILES_${PN}-dbg += "${libdir}/dhcpcd/dev/.debug" diff --git a/meta-networking/recipes-connectivity/dibbler/dibbler/0001-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch b/meta-networking/recipes-connectivity/dibbler/dibbler/0001-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch new file mode 100644 index 0000000000..d48d7265d4 --- /dev/null +++ b/meta-networking/recipes-connectivity/dibbler/dibbler/0001-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch @@ -0,0 +1,125 @@ +From 9e9d94566d39eef3e4606f806aa418bf5534fab9 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 15 Jan 2023 22:04:31 -0800 +Subject: [PATCH 1/2] Define alignof using _Alignof when using C11 or newer + +WG14 N2350 made very clear that it is an UB having type definitions +within "offsetof" [1]. This patch enhances the implementation of macro +alignof to use builtin "_Alignof" to avoid undefined behavior on +when using std=c11 or newer + +clang 16+ has started to flag this [2] + +Fixes build when using -std >= gnu11 and using clang16+ + +Older compilers gcc < 4.9 or clang < 8 has buggy _Alignof even though it +may support C11, exclude those compilers too + +[1] https://www.open-std.org/jtc1/sc22/wg14/www/docs/n2350.htm +[2] https://reviews.llvm.org/D133574 + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Misc/md5-coreutils.c | 12 +++++++++++- + Misc/sha1.c | 12 +++++++++++- + Misc/sha256.c | 12 +++++++++++- + Misc/sha512.c | 12 +++++++++++- + 4 files changed, 44 insertions(+), 4 deletions(-) + +diff --git a/Misc/md5-coreutils.c b/Misc/md5-coreutils.c +index d6503e02..2ffb6050 100644 +--- a/Misc/md5-coreutils.c ++++ b/Misc/md5-coreutils.c +@@ -154,7 +154,17 @@ md5_process_bytes (const void *buffer, size_t len, struct md5_ctx *ctx) + if (len >= 64) + { + #if !_STRING_ARCH_unaligned +-# define alignof(type) offsetof (struct { char c; type x; }, x) ++/* GCC releases before GCC 4.9 had a bug in _Alignof. See GCC bug 52023 ++ <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52023>. ++ clang versions < 8.0.0 have the same bug. */ ++# if (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112 \ ++ || (defined __GNUC__ && __GNUC__ < 4 + (__GNUC_MINOR__ < 9) \ ++ && !defined __clang__) \ ++ || (defined __clang__ && __clang_major__ < 8)) ++# define alignof(type) offsetof (struct { char c; type x; }, x) ++# else ++# define alignof(type) _Alignof(type) ++# endif + # define UNALIGNED_P(p) (((size_t) p) % alignof (uint32_t) != 0) + if (UNALIGNED_P (buffer)) + while (len > 64) +diff --git a/Misc/sha1.c b/Misc/sha1.c +index 18ceb845..a170efe3 100644 +--- a/Misc/sha1.c ++++ b/Misc/sha1.c +@@ -149,7 +149,17 @@ sha1_process_bytes (const void *buffer, size_t len, struct sha1_ctx *ctx) + if (len >= 64) + { + #if !_STRING_ARCH_unaligned +-# define alignof(type) offsetof (struct { char c; type x; }, x) ++/* GCC releases before GCC 4.9 had a bug in _Alignof. See GCC bug 52023 ++ <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52023>. ++ clang versions < 8.0.0 have the same bug. */ ++# if (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112 \ ++ || (defined __GNUC__ && __GNUC__ < 4 + (__GNUC_MINOR__ < 9) \ ++ && !defined __clang__) \ ++ || (defined __clang__ && __clang_major__ < 8)) ++# define alignof(type) offsetof (struct { char c; type x; }, x) ++# else ++# define alignof(type) _Alignof(type) ++# endif + # define UNALIGNED_P(p) (((size_t) p) % alignof (uint32_t) != 0) + if (UNALIGNED_P (buffer)) + while (len > 64) +diff --git a/Misc/sha256.c b/Misc/sha256.c +index 68292326..da59e81d 100644 +--- a/Misc/sha256.c ++++ b/Misc/sha256.c +@@ -372,7 +372,17 @@ sha256_process_bytes (const void *buffer, size_t len, struct sha256_ctx *ctx) + if (len >= 64) + { + #if !_STRING_ARCH_unaligned +-# define alignof(type) offsetof (struct { char c; type x; }, x) ++/* GCC releases before GCC 4.9 had a bug in _Alignof. See GCC bug 52023 ++ <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52023>. ++ clang versions < 8.0.0 have the same bug. */ ++# if (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112 \ ++ || (defined __GNUC__ && __GNUC__ < 4 + (__GNUC_MINOR__ < 9) \ ++ && !defined __clang__) \ ++ || (defined __clang__ && __clang_major__ < 8)) ++# define alignof(type) offsetof (struct { char c; type x; }, x) ++# else ++# define alignof(type) _Alignof(type) ++# endif + # define UNALIGNED_P(p) (((size_t) p) % alignof (uint32_t) != 0) + if (UNALIGNED_P (buffer)) + while (len > 64) +diff --git a/Misc/sha512.c b/Misc/sha512.c +index db86c659..38e162fc 100644 +--- a/Misc/sha512.c ++++ b/Misc/sha512.c +@@ -190,7 +190,17 @@ sha512_process_bytes (const void *buffer, size_t len, struct sha512_ctx *ctx) + if (len >= 128) + { + #if !_STRING_ARCH_unaligned +-# define alignof(type) offsetof (struct { char c; type x; }, x) ++/* GCC releases before GCC 4.9 had a bug in _Alignof. See GCC bug 52023 ++ <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52023>. ++ clang versions < 8.0.0 have the same bug. */ ++# if (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112 \ ++ || (defined __GNUC__ && __GNUC__ < 4 + (__GNUC_MINOR__ < 9) \ ++ && !defined __clang__) \ ++ || (defined __clang__ && __clang_major__ < 8)) ++# define alignof(type) offsetof (struct { char c; type x; }, x) ++# else ++# define alignof(type) _Alignof(type) ++# endif + # define UNALIGNED_P(p) (((size_t) p) % alignof (uint64_t) != 0) + if (UNALIGNED_P (buffer)) + while (len > 128) +-- +2.39.0 + diff --git a/meta-networking/recipes-connectivity/dibbler/dibbler/0001-port-linux-Re-order-header-includes.patch b/meta-networking/recipes-connectivity/dibbler/dibbler/0001-port-linux-Re-order-header-includes.patch new file mode 100644 index 0000000000..884be404b5 --- /dev/null +++ b/meta-networking/recipes-connectivity/dibbler/dibbler/0001-port-linux-Re-order-header-includes.patch @@ -0,0 +1,33 @@ +From cbb33e1548fe526c3e7dead294617bde1f087ae3 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 24 Aug 2022 16:40:38 -0700 +Subject: [PATCH] port-linux: Re-order header includes + +linux/if.h when included before net/if.h casues duplicate definitions + +Upstream-Status: Inappropriate [Upstream is Dead] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Port-linux/interface.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Port-linux/interface.c b/Port-linux/interface.c +index 18777e91..19aefb2b 100644 +--- a/Port-linux/interface.c ++++ b/Port-linux/interface.c +@@ -25,7 +25,6 @@ + #include <sys/types.h> + #include <sys/socket.h> + #include <sys/ioctl.h> +-#include <linux/if.h> + #include <syslog.h> + #include <string.h> + #include <errno.h> +@@ -42,6 +41,7 @@ + #include <stdarg.h> + #include <linux/sockios.h> + #include <linux/if_ether.h> ++#include <linux/if.h> + + int interface_auto_up = 0; + int interface_do_message = 0; diff --git a/meta-networking/recipes-connectivity/dibbler/dibbler/0002-make-Do-not-enforce-c99.patch b/meta-networking/recipes-connectivity/dibbler/dibbler/0002-make-Do-not-enforce-c99.patch new file mode 100644 index 0000000000..8889130a3b --- /dev/null +++ b/meta-networking/recipes-connectivity/dibbler/dibbler/0002-make-Do-not-enforce-c99.patch @@ -0,0 +1,50 @@ +From e826206c58bbaa1c256f55b103d5eb7b0182f152 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 15 Jan 2023 22:05:53 -0800 +Subject: [PATCH 2/2] make: Do not enforce c99 + +Latest gcc/clang from OE defaults to c11 or newer and stickly to c99 +means we can not use _AlignOf + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Misc/Makefile.am | 4 +--- + Port-linux/Makefile.am | 1 - + 2 files changed, 1 insertion(+), 4 deletions(-) + +diff --git a/Misc/Makefile.am b/Misc/Makefile.am +index d881525a..8d71d2d4 100644 +--- a/Misc/Makefile.am ++++ b/Misc/Makefile.am +@@ -6,8 +6,6 @@ endif + + noinst_LIBRARIES = libMisc.a + +-libMisc_a_CFLAGS = -std=c99 +- + libMisc_a_CPPFLAGS = -I$(top_srcdir) + + libMisc_a_SOURCES = addrpack.c +@@ -27,4 +25,4 @@ libMisc_a_SOURCES += lowlevel-posix.c + + libMisc_a_SOURCES += hmac-sha-md5.h hmac-sha-md5.c + libMisc_a_SOURCES += md5-coreutils.c md5.h +-libMisc_a_SOURCES += sha1.c sha1.h sha256.c sha256.h sha512.c sha512.h +\ No newline at end of file ++libMisc_a_SOURCES += sha1.c sha1.h sha256.c sha256.h sha512.c sha512.h +diff --git a/Port-linux/Makefile.am b/Port-linux/Makefile.am +index 72b0a5e3..635998ea 100644 +--- a/Port-linux/Makefile.am ++++ b/Port-linux/Makefile.am +@@ -1,6 +1,5 @@ + noinst_LIBRARIES = libLowLevel.a + +-libLowLevel_a_CFLAGS = -std=c99 + libLowLevel_a_CPPFLAGS = -I$(top_srcdir)/Misc + + libLowLevel_a_SOURCES = daemon.cpp daemon.h ethtool-kernel.h ethtool-local.h interface.c interface.h ip_common.h iproute.c libnetlink.c libnetlink.h ll_map.c ll_map.h ll_types.c lowlevel-linux.c lowlevel-linux-link-state.c lowlevel-options-linux.c rtm_map.h rt_names.h utils.c utils.h +-- +2.39.0 + diff --git a/meta-networking/recipes-connectivity/dibbler/dibbler/dibbler_fix_getSize_crash.patch b/meta-networking/recipes-connectivity/dibbler/dibbler/dibbler_fix_getSize_crash.patch index 42d2627a1a..439ef1177d 100644 --- a/meta-networking/recipes-connectivity/dibbler/dibbler/dibbler_fix_getSize_crash.patch +++ b/meta-networking/recipes-connectivity/dibbler/dibbler/dibbler_fix_getSize_crash.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Index: git/ClntMessages/ClntMsgRequest.cpp =================================================================== --- git.orig/ClntMessages/ClntMsgRequest.cpp diff --git a/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb b/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb index 8890e14318..cc36fbd4f0 100644 --- a/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb +++ b/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb @@ -2,14 +2,17 @@ SUMMARY = "Dibbler DHCPv6 client" DESCRIPTION = "Dibbler is a portable DHCPv6 implementation. It supports stateful as well as stateless autoconfiguration for IPv6." HOMEPAGE = "http://klub.com.pl/dhcpv6" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=7236695bb6d4461c105d685a8b61c4e3" -SRCREV = "c4b0ed52e751da7823dd9a36e91f93a6310e5525" +SRCREV = "a7c6cf58a88a510cb00841351e75030ce78d36bf" -SRC_URI = "git://github.com/tomaszmrugalski/dibbler \ +SRC_URI = "git://github.com/tomaszmrugalski/dibbler;branch=master;protocol=https \ file://dibbler_fix_getSize_crash.patch \ - " + file://0001-port-linux-Re-order-header-includes.patch \ + file://0001-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch \ + file://0002-make-Do-not-enforce-c99.patch \ + " PV = "1.0.1+1.0.2RC1+git${SRCREV}" S = "${WORKDIR}/git" @@ -29,9 +32,16 @@ inherit autotools DEPENDS += "flex-native" +CPPFLAGS += "-D_GNU_SOURCE -Dregister=''" +LDFLAGS += "-pthread" + PACKAGES =+ "${PN}-requestor ${PN}-client ${PN}-relay ${PN}-server" -FILES_${PN}-client = "${sbindir}/${PN}-client" -FILES_${PN}-relay = "${sbindir}/${PN}-relay" -FILES_${PN}-requestor = "${sbindir}/${PN}-requestor" -FILES_${PN}-server = "${sbindir}/${PN}-server" +FILES:${PN}-client = "${sbindir}/${PN}-client" +FILES:${PN}-relay = "${sbindir}/${PN}-relay" +FILES:${PN}-requestor = "${sbindir}/${PN}-requestor" +FILES:${PN}-server = "${sbindir}/${PN}-server" + +# http://errors.yoctoproject.org/Errors/Details/766880/ +# git/Port-linux/interface.c:118:18: error: assignment to '__caddr_t' {aka 'char *'} from incompatible pointer type 'struct ethtool_value *' [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-networking/recipes-connectivity/ez-ipupdate/ez-ipupdate_3.0.11b7.bb b/meta-networking/recipes-connectivity/ez-ipupdate/ez-ipupdate_3.0.11b7.bb index 51e220c9e7..42ecf9bac4 100644 --- a/meta-networking/recipes-connectivity/ez-ipupdate/ez-ipupdate_3.0.11b7.bb +++ b/meta-networking/recipes-connectivity/ez-ipupdate/ez-ipupdate_3.0.11b7.bb @@ -1,15 +1,16 @@ SUMMARY = "daemon that sends updates when your IP changes" HOMEPAGE = "http://sourceforge.net/projects/ez-ipupdate/" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=7783169b4be06b54e86730eb01bc3a31" SRC_URI = "http://sourceforge.net/projects/ez-ipupdate/files/${BPN}/${PV}/${BPN}-${PV}.tar.gz \ - file://Makefile.am.patch \ - file://cache_file.c.patch \ - file://conf_file.c.patch \ - file://wformat.patch \ - " + file://Makefile.am.patch \ + file://cache_file.c.patch \ + file://conf_file.c.patch \ + file://wformat.patch \ + file://0001-ez-ipupdate-Include-time.h-for-time-API-prototype.patch \ + " SRC_URI[md5sum] = "525be4550b4461fdf105aed8e753b020" SRC_URI[sha256sum] = "a15ec0dc0b78ec7578360987c68e43a67bc8d3591cbf528a323588830ae22c20" diff --git a/meta-networking/recipes-connectivity/ez-ipupdate/files/0001-ez-ipupdate-Include-time.h-for-time-API-prototype.patch b/meta-networking/recipes-connectivity/ez-ipupdate/files/0001-ez-ipupdate-Include-time.h-for-time-API-prototype.patch new file mode 100644 index 0000000000..b2a2ebdae3 --- /dev/null +++ b/meta-networking/recipes-connectivity/ez-ipupdate/files/0001-ez-ipupdate-Include-time.h-for-time-API-prototype.patch @@ -0,0 +1,44 @@ +From 6c8fe883df993b9e7987c8f1c849962f8007a373 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 29 Aug 2022 12:50:37 -0700 +Subject: [PATCH] ez-ipupdate: Include time.h for time() API prototype + +Fix printf format specifiers for snprintf + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + ez-ipupdate.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/ez-ipupdate.c b/ez-ipupdate.c +index 15a4c13..5cbe7f3 100644 +--- a/ez-ipupdate.c ++++ b/ez-ipupdate.c +@@ -38,6 +38,8 @@ + # include <config.h> + #endif + ++#include <time.h> ++ + // you man very well need to edit this, don't worry though, email is only sent + // if bad things happend and it has to exit when in daemon mode. + #define SEND_EMAIL_CMD "mail" +@@ -2483,7 +2485,7 @@ int DHS_update_entry(void) + p += strlen(p); + limit = BUFFER_SIZE - 1 - strlen(buf); + +- snprintf(buf, BUFFER_SIZE, "Content-length: %d\015\012", strlen(putbuf)); ++ snprintf(buf, BUFFER_SIZE, "Content-length: %lu\015\012", strlen(putbuf)); + output(buf); + snprintf(buf, BUFFER_SIZE, "\015\012"); + output(buf); +@@ -2620,7 +2622,7 @@ int DHS_update_entry(void) + p += strlen(p); + limit = BUFFER_SIZE - 1 - strlen(buf); + +- snprintf(buf, BUFFER_SIZE, "Content-length: %d\015\012", strlen(putbuf)); ++ snprintf(buf, BUFFER_SIZE, "Content-length: %lu\015\012", strlen(putbuf)); + output(buf); + snprintf(buf, BUFFER_SIZE, "\015\012"); + output(buf); diff --git a/meta-networking/recipes-connectivity/ez-ipupdate/files/Makefile.am.patch b/meta-networking/recipes-connectivity/ez-ipupdate/files/Makefile.am.patch index d80ed3e29d..dde233121a 100644 --- a/meta-networking/recipes-connectivity/ez-ipupdate/files/Makefile.am.patch +++ b/meta-networking/recipes-connectivity/ez-ipupdate/files/Makefile.am.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Remove EXTRASRC and EXTRAOBJ from obj list --- ez-ipupdate-3.0.11b7/Makefile.am.orig 2014-07-02 13:47:50.758034983 -0600 diff --git a/meta-networking/recipes-connectivity/ez-ipupdate/files/cache_file.c.patch b/meta-networking/recipes-connectivity/ez-ipupdate/files/cache_file.c.patch index de5eb3a6d1..0199cb1278 100644 --- a/meta-networking/recipes-connectivity/ez-ipupdate/files/cache_file.c.patch +++ b/meta-networking/recipes-connectivity/ez-ipupdate/files/cache_file.c.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Dont assume errno type --- ez-ipupdate-3.0.11b7/cache_file.c.orig 2014-07-02 14:01:07.126029412 -0600 diff --git a/meta-networking/recipes-connectivity/ez-ipupdate/files/conf_file.c.patch b/meta-networking/recipes-connectivity/ez-ipupdate/files/conf_file.c.patch index 02218a39ea..6325c1873f 100644 --- a/meta-networking/recipes-connectivity/ez-ipupdate/files/conf_file.c.patch +++ b/meta-networking/recipes-connectivity/ez-ipupdate/files/conf_file.c.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Dont assume errno type --- ez-ipupdate-3.0.11b7/conf_file.c.orig 2014-07-02 14:01:19.174029328 -0600 diff --git a/meta-networking/recipes-connectivity/ez-ipupdate/files/wformat.patch b/meta-networking/recipes-connectivity/ez-ipupdate/files/wformat.patch index 1de267f083..3b791559d5 100644 --- a/meta-networking/recipes-connectivity/ez-ipupdate/files/wformat.patch +++ b/meta-networking/recipes-connectivity/ez-ipupdate/files/wformat.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Index: ez-ipupdate-3.0.11b7/ez-ipupdate.c =================================================================== --- ez-ipupdate-3.0.11b7.orig/ez-ipupdate.c diff --git a/meta-networking/recipes-connectivity/freeradius/files/0001-Add-autogen.sh.patch b/meta-networking/recipes-connectivity/freeradius/files/0001-Add-autogen.sh.patch new file mode 100644 index 0000000000..e1228c2ebe --- /dev/null +++ b/meta-networking/recipes-connectivity/freeradius/files/0001-Add-autogen.sh.patch @@ -0,0 +1,46 @@ +From 3be3b9a1345942d1578ec73efa9b2e3c41bd67c5 Mon Sep 17 00:00:00 2001 +From: Yi Zhao <yi.zhao@windriver.com> +Date: Fri, 21 Jan 2022 13:22:24 +0800 +Subject: [PATCH] Add autogen.sh + +The autogen.sh has been removed since 3.0.22[1]. But we still need it in +do_configure. Add it back. + +[1] https://github.com/FreeRADIUS/freeradius-server/commit/2e9b6227efd19e2b0926541aa26874908e7b7314 + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + autogen.sh | 19 +++++++++++++++++++ + 1 file changed, 19 insertions(+) + create mode 100755 autogen.sh + +diff --git a/autogen.sh b/autogen.sh +new file mode 100755 +index 0000000000..959182b39e +--- /dev/null ++++ b/autogen.sh +@@ -0,0 +1,19 @@ ++#!/bin/sh -e ++ ++parentdir=`dirname $0` ++ ++cd $parentdir ++parentdir=`pwd` ++m4include="-I$parentdir -I$parentdir/m4 -Im4" ++ ++autoreconf -Wcross --verbose --install --force ++ ++mysubdirs="$mysubdirs `find src/modules/ -name configure -print | sed 's%/configure%%'`" ++mysubdirs=`echo $mysubdirs` ++ ++for F in $mysubdirs ++do ++ echo "Configuring in $F..." ++ (cd $F && grep "^AC_CONFIG_HEADER" configure.ac > /dev/null || exit 0; autoheader $m4include) ++ (cd $F && autoconf $m4include) ++done +-- +2.25.1 + diff --git a/meta-networking/recipes-connectivity/freeradius/files/0001-rlm_mschap-Use-includedir-instead-of-hardcoding-usr-.patch b/meta-networking/recipes-connectivity/freeradius/files/0001-rlm_mschap-Use-includedir-instead-of-hardcoding-usr-.patch deleted file mode 100644 index db8caab12e..0000000000 --- a/meta-networking/recipes-connectivity/freeradius/files/0001-rlm_mschap-Use-includedir-instead-of-hardcoding-usr-.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 66e8bcdcca8971b5c43c31755d56d7f675d8b5ff Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 16 Jun 2017 20:10:49 -0700 -Subject: [PATCH] rlm_mschap: Use includedir instead of hardcoding /usr/include - -OE QA flags it correctly as a voilation of cross compilation -namespace - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/modules/rlm_mschap/configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: freeradius-server-3.0.14/src/modules/rlm_mschap/configure.ac -=================================================================== ---- freeradius-server-3.0.14.orig/src/modules/rlm_mschap/configure.ac -+++ freeradius-server-3.0.14/src/modules/rlm_mschap/configure.ac -@@ -72,7 +72,7 @@ if test x$with_[]modname != xno; then - mod_ldflags="-framework DirectoryService" - fi - -- smart_try_dir="$winbind_include_dir /usr/include/samba-4.0" -+ smart_try_dir="$winbind_include_dir =/usr/include/samba-4.0" - FR_SMART_CHECK_INCLUDE(wbclient.h, [#include <stdint.h> - #include <stdbool.h>]) - if test "x$ac_cv_header_wbclient_h" != "xyes"; then diff --git a/meta-networking/recipes-connectivity/freeradius/files/freeradius-enble-user-in-conf.patch b/meta-networking/recipes-connectivity/freeradius/files/0002-Enable-and-change-user-and-group-of-freeradius-serve.patch index 4a62bf1fa2..c57ee93c33 100644 --- a/meta-networking/recipes-connectivity/freeradius/files/freeradius-enble-user-in-conf.patch +++ b/meta-networking/recipes-connectivity/freeradius/files/0002-Enable-and-change-user-and-group-of-freeradius-serve.patch @@ -1,4 +1,8 @@ -Enable and change user and group of freeradius server to radiusd +From 2a74c10836c0d2d19248ca40d113936f4a56b039 Mon Sep 17 00:00:00 2001 +From: "Roy.Li" <rongqing.li@windriver.com> +Date: Sun, 8 Jan 2023 22:47:11 +0800 +Subject: [PATCH] Enable and change user and group of freeradius server to + radiusd Upstream-Status: Inappropriate [configuration] @@ -9,10 +13,10 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/raddb/radiusd.conf.in b/raddb/radiusd.conf.in -index c62f4ff..0b4a84e 100644 +index 154b50d610..4594d6d2d2 100644 --- a/raddb/radiusd.conf.in +++ b/raddb/radiusd.conf.in -@@ -436,8 +436,8 @@ security { +@@ -557,8 +557,8 @@ security { # member. This can allow for some finer-grained access # controls. # @@ -24,5 +28,5 @@ index c62f4ff..0b4a84e 100644 # Core dumps are a bad thing. This should only be set to # 'yes' if you're debugging a problem with the server. -- -1.9.1 +2.25.1 diff --git a/meta-networking/recipes-connectivity/freeradius/files/0003-configure.ac-allow-cross-compilation.patch b/meta-networking/recipes-connectivity/freeradius/files/0003-configure.ac-allow-cross-compilation.patch new file mode 100644 index 0000000000..3635412d3b --- /dev/null +++ b/meta-networking/recipes-connectivity/freeradius/files/0003-configure.ac-allow-cross-compilation.patch @@ -0,0 +1,39 @@ +From ba1390a80662ff2ab7bfda978cde7df9a871f6ae Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Tue, 24 Jul 2018 15:03:39 +0800 +Subject: [PATCH] configure.ac: allow cross-compilation + +The checking OpenSSL library and header version consistency will +always fail in cross compiling, skip the check and give a warning +instead for cross compiling. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Jackie Huang <jackie.huang@windriver.com> +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> + +Update to new version 3.0.17 to fix patch warning +Signed-off-by: Changqing Li <changqing.li@windriver.com> + +Rebased for 3.2.3 +Signed-off-by: Randy MacLeod <randy.macleod@windriver.com> +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> + +--- + src/modules/rlm_krb5/configure.ac | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/modules/rlm_krb5/configure.ac b/src/modules/rlm_krb5/configure.ac +index 9ee6379ea4..1dad481da8 100644 +--- a/src/modules/rlm_krb5/configure.ac ++++ b/src/modules/rlm_krb5/configure.ac +@@ -143,7 +143,8 @@ if test "$krb5threadsafe" != "no"; then + FR_SMART_CHECK_LIB(krb5, krb5_is_thread_safe) + if test "x$ac_cv_lib_krb5_krb5_is_thread_safe" = xyes; then + AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <krb5.h>]], [[return krb5_is_thread_safe() ? 0 : 1]])], +- [krb5threadsafe="-DKRB5_IS_THREAD_SAFE"], [AC_MSG_WARN([[libkrb5 is not threadsafe]])]) ++ [krb5threadsafe="-DKRB5_IS_THREAD_SAFE"], [AC_MSG_WARN([[libkrb5 is not threadsafe]])], ++ [AC_MSG_WARN(cross compiling: not checking)]) + fi + else + krb5threadsafe="" diff --git a/meta-networking/recipes-connectivity/freeradius/files/freeradius-libtool-detection.patch b/meta-networking/recipes-connectivity/freeradius/files/0004-Fix-libtool-detection.patch index 4eb61ff2ec..479e1ba76f 100644 --- a/meta-networking/recipes-connectivity/freeradius/files/freeradius-libtool-detection.patch +++ b/meta-networking/recipes-connectivity/freeradius/files/0004-Fix-libtool-detection.patch @@ -1,10 +1,8 @@ -From 56ef434e454bcc82c162a83d9bcb076d4fc72b7f Mon Sep 17 00:00:00 2001 -From: Jackie Huang <jackie.huang@windriver.com> -Date: Thu, 9 Jan 2014 14:30:26 +0800 +From 5ba3d140842268cbbdd983266efecb1fba5bdd59 Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Thu, 22 Aug 2019 10:45:46 +0800 Subject: [PATCH] Fix libtool detection -Upstream-Status: pending - Use LT_INIT instead of the deprecated AC_PROG_LIBTOOL to detect libtool, so it can work with our libtoolize and libtool. @@ -12,36 +10,20 @@ Simplify the detection of ltdl. It will find the ltdl from the sysroot; the switch --with-system-libltdl is no longer needed. The code is copied from pulseaudio configure.ac, together with the comment paragraph. -Also patch autogen.sh so it uses autoreconf, which handles libtoolize better. +Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Jesse Zhang <sen.zhang@windriver.com> Signed-off-by: Jackie Huang <jackie.huang@windriver.com> +Signed-off-by: Changqing Li <changqing.li@windriver.com> --- - autogen.sh | 5 +---- configure.ac | 36 ++++++++++++++++++++++++++++++++++++ - 2 files changed, 37 insertions(+), 4 deletions(-) + 1 file changed, 36 insertions(+) -diff --git a/autogen.sh b/autogen.sh -index 3418673..e42c3d5 100755 ---- a/autogen.sh -+++ b/autogen.sh -@@ -5,10 +5,7 @@ parentdir=`dirname $0` - cd $parentdir - parentdir=`pwd` - --libtoolize -f -c --#aclocal --autoheader --autoconf -+autoreconf -Wcross --verbose --install --force - - mysubdirs="$mysubdirs `find src/modules/ -name configure -print | sed 's%/configure%%'`" - mysubdirs=`echo $mysubdirs` diff --git a/configure.ac b/configure.ac -index e73e4ad..066d3d7 100644 +index ad8bc8cdda..ef8fced680 100644 --- a/configure.ac +++ b/configure.ac -@@ -205,6 +205,42 @@ dnl # See if we have Git. +@@ -321,6 +321,42 @@ dnl # See if we have Git. dnl # AC_CHECK_PROG(GIT, git, yes, no) @@ -85,5 +67,5 @@ index e73e4ad..066d3d7 100644 dnl AC_ARG_WITH(disablemodulefoo, dnl [ --without-rlm_foo Disables module compilation. Module list:] -- -1.8.3 +2.25.1 diff --git a/meta-networking/recipes-connectivity/freeradius/files/freeradius-configure.ac-add-option-for-libcap.patch b/meta-networking/recipes-connectivity/freeradius/files/0005-configure.ac-add-option-for-libcap.patch index 71b78090c3..8ef3c4bdf9 100644 --- a/meta-networking/recipes-connectivity/freeradius/files/freeradius-configure.ac-add-option-for-libcap.patch +++ b/meta-networking/recipes-connectivity/freeradius/files/0005-configure.ac-add-option-for-libcap.patch @@ -1,20 +1,21 @@ -From 74eed61dec8702c89f3e121d577ea9db25c961a4 Mon Sep 17 00:00:00 2001 -From: Jackie Huang <jackie.huang@windriver.com> -Date: Mon, 11 Jan 2016 02:52:16 -0500 +From 9548dc5e1a6c835cd4f387ba384d8f3f14c3fc8b Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Thu, 22 Aug 2019 10:50:21 +0800 Subject: [PATCH] configure.ac: add option for libcap Upstream-Status: Pending Signed-off-by: Jackie Huang <jackie.huang@windriver.com> +Signed-off-by: Changqing Li <changqing.li@windriver.com> --- - configure.ac | 37 ++++++++++++++++++++++++++++--------- - 1 file changed, 28 insertions(+), 9 deletions(-) + configure.ac | 36 +++++++++++++++++++++++++++--------- + 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac -index 066d3d7..6e4266b 100644 +index ef8fced680..263098f7fd 100644 --- a/configure.ac +++ b/configure.ac -@@ -948,6 +948,23 @@ fi +@@ -1161,6 +1161,22 @@ fi dnl Set by FR_SMART_CHECKLIB LIBS="${old_LIBS}" @@ -34,11 +35,10 @@ index 066d3d7..6e4266b 100644 + esac ] +) + -+ dnl Check for cap dnl extra argument: --with-cap-lib-dir=DIR cap_lib_dir= -@@ -981,15 +998,17 @@ AC_ARG_WITH(cap-include-dir, +@@ -1194,15 +1210,17 @@ AC_ARG_WITH(cap-include-dir, ;; esac]) @@ -64,7 +64,7 @@ index 066d3d7..6e4266b 100644 + fi fi - VL_LIB_READLINE + dnl # -- -1.9.1 +2.25.1 diff --git a/meta-networking/recipes-connectivity/freeradius/files/0006-Avoid-searching-host-dirs.patch b/meta-networking/recipes-connectivity/freeradius/files/0006-Avoid-searching-host-dirs.patch new file mode 100644 index 0000000000..510136da1f --- /dev/null +++ b/meta-networking/recipes-connectivity/freeradius/files/0006-Avoid-searching-host-dirs.patch @@ -0,0 +1,223 @@ +From 8fe25b30b6fbb3170705f4468eb4c92eef3a968f Mon Sep 17 00:00:00 2001 +From: Jackie Huang <jackie.huang@windriver.com> +Date: Mon, 4 Jan 2016 01:44:04 -0500 +Subject: [PATCH] Avoid searching host dirs + +Don't search the hardcoded host dirs to avoid +host contamination. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Jackie Huang <jackie.huang@windriver.com> +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> + +Rebased for 3.2.3 +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + m4/fr_smart_check_include.m4 | 2 +- + m4/fr_smart_check_lib.m4 | 22 ---------------------- + src/modules/rlm_sql/drivers/rlm_sql_db2/configure.ac | 4 ++-- + src/modules/rlm_sql/drivers/rlm_sql_firebird/configure.ac | 4 ++-- + src/modules/rlm_sql/drivers/rlm_sql_iodbc/configure.ac | 4 ++-- + src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.ac | 6 +++--- + src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.ac | 2 +- + src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac | 4 ++-- + src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure.ac | 4 ++-- + 9 files changed, 15 insertions(+), 37 deletions(-) + +diff --git a/m4/fr_smart_check_include.m4 b/m4/fr_smart_check_include.m4 +index e7d4443f9c..2b69704f98 100644 +--- a/m4/fr_smart_check_include.m4 ++++ b/m4/fr_smart_check_include.m4 +@@ -9,7 +9,7 @@ ac_safe=`echo "$1" | sed 'y%./+-%__pm%'` + old_CPPFLAGS="$CPPFLAGS" + smart_include= + dnl # The default directories we search in (in addition to the compilers search path) +-smart_include_dir="/usr/local/include /opt/include" ++smart_include_dir="" + + dnl # Our local versions + _smart_try_dir= +diff --git a/src/modules/rlm_sql/drivers/rlm_sql_db2/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_db2/configure.ac +index 0d94ee9bf6..6108e62054 100644 +--- a/src/modules/rlm_sql/drivers/rlm_sql_db2/configure.ac ++++ b/src/modules/rlm_sql/drivers/rlm_sql_db2/configure.ac +@@ -58,14 +58,14 @@ AC_ARG_WITH(ibmdb2-dir, + esac]) + + dnl Check for SQLConnect in -ldb2 +-smart_try_dir="$ibmdb2_lib_dir /usr/local/db2/lib /usr/IBMdb2/V7.1/lib" ++smart_try_dir="$ibmdb2_lib_dir" + FR_SMART_CHECK_LIB(db2, SQLConnect) + if test "x$ac_cv_lib_db2_SQLConnect" != xyes; then + FR_MODULE_FAIL([libdb2]) + fi + + dnl Check for sqlcli.h +-smart_try_dir="$ibmdb2_include_dir /usr/local/db2/include /usr/IBMdb2/V7.1/include" ++smart_try_dir="$ibmdb2_include_dir" + FR_SMART_CHECK_INCLUDE(sqlcli.h) + if test "x$ac_cv_header_sqlcli_h" != xyes; then + FR_MODULE_FAIL([sqlcli.h]) +diff --git a/src/modules/rlm_sql/drivers/rlm_sql_firebird/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_firebird/configure.ac +index 5aa7b4b6ee..2eda5b6cc5 100644 +--- a/src/modules/rlm_sql/drivers/rlm_sql_firebird/configure.ac ++++ b/src/modules/rlm_sql/drivers/rlm_sql_firebird/configure.ac +@@ -58,14 +58,14 @@ AC_ARG_WITH(firebird-dir, + esac]) + + dnl Check for isc_attach_database in -lfbclient +-smart_try_dir="$firebird_lib_dir /usr/lib/firebird2/lib /usr/local/firebird/lib" ++smart_try_dir="$firebird_lib_dir" + FR_SMART_CHECK_LIB(fbclient, isc_attach_database) + if test "x$ac_cv_lib_fbclient_isc_attach_database" != xyes; then + FR_MODULE_FAIL([libfbclient]) + fi + + dnl Check for ibase.h +-smart_try_dir="$firebird_include_dir /usr/lib/firebird2/include /usr/local/firebird/include" ++smart_try_dir="$firebird_include_dir" + FR_SMART_CHECK_INCLUDE(ibase.h) + if test "x$ac_cv_header_ibase_h" != xyes; then + FR_MODULE_FAIL([ibase.h]) +diff --git a/src/modules/rlm_sql/drivers/rlm_sql_iodbc/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_iodbc/configure.ac +index d96216aca8..88cbc469f7 100644 +--- a/src/modules/rlm_sql/drivers/rlm_sql_iodbc/configure.ac ++++ b/src/modules/rlm_sql/drivers/rlm_sql_iodbc/configure.ac +@@ -58,14 +58,14 @@ AC_ARG_WITH(iodbc-dir, + esac]) + + dnl Check for SQLConnect in -liodbc +-smart_try_dir="$iodbc_lib_dir /usr/lib /usr/lib/iodbc /usr/local/lib/iodbc /usr/local/iodbc/lib/iodbc" ++smart_try_dir="$iodbc_lib_dir" + FR_SMART_CHECK_LIB(iodbc, SQLConnect) + if test "x$ac_cv_lib_iodbc_SQLConnect" != xyes; then + FR_MODULE_FAIL([libiodbc]) + fi + + dnl Check for isql.h +-smart_try_dir="$iodbc_include_dir /usr/include /usr/include/iodbc /usr/local/iodbc/include" ++smart_try_dir="$iodbc_include_dir" + FR_SMART_CHECK_INCLUDE(isql.h) + if test "x$ac_cv_header_isql_h" != xyes; then + FR_MODULE_FAIL([isql.h]) +diff --git a/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.ac +index d36aecbda6..201a623d4e 100644 +--- a/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.ac ++++ b/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.ac +@@ -138,7 +138,7 @@ fi + + dnl # Check for libmysqlclient_r + if test "x$have_a_libmysqlclient" != "xyes"; then +- smart_try_dir="$mysql_lib_dir /usr/lib /usr/lib/mysql /usr/local/lib/mysql /usr/local/mysql/lib/mysql" ++ smart_try_dir="$mysql_lib_dir" + FR_SMART_CHECK_LIB(mysqlclient_r, mysql_init) + if test "x$ac_cv_lib_mysqlclient_r_mysql_init" = "xyes"; then + have_a_libmysqlclient='yes' +@@ -147,7 +147,7 @@ fi + + dnl # Check for libmysqlclient + if test "x$have_a_libmysqlclient" != "xyes"; then +- smart_try_dir="$mysql_lib_dir /usr/lib /usr/lib/mysql /usr/local/lib/mysql /usr/local/mysql/lib/mysql" ++ smart_try_dir="$mysql_lib_dir" + FR_SMART_CHECK_LIB(mysqlclient, mysql_init) + if test "x$ac_cv_lib_mysqlclient_mysql_init" = "xyes"; then + have_a_libmysqlclient='yes' +@@ -242,7 +242,7 @@ if test "x$have_mysql_h" != "xyes"; then + fi + + if test "x$have_mysql_h" != "xyes"; then +- smart_try_dir="$mysql_include_dir /usr/local/include /usr/local/mysql/include" ++ smart_try_dir="$mysql_include_dir" + FR_SMART_CHECK_INCLUDE(mysql/mysql.h) + if test "x$ac_cv_header_mysql_mysql_h" = "xyes"; then + AC_DEFINE(HAVE_MYSQL_MYSQL_H, [], [Define if you have <mysql/mysql.h>]) +diff --git a/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.ac +index f31b7d2c5a..67bbf66df5 100644 +--- a/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.ac ++++ b/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.ac +@@ -66,7 +66,7 @@ dnl ############################################################ + dnl # Check for header files + dnl ############################################################ + +-smart_try_dir="$oracle_include_dir /usr/local/instaclient/include" ++smart_try_dir="$oracle_include_dir" + + if test "x$ORACLE_HOME" != "x"; then + smart_try_dir="${smart_try_dir} ${ORACLE_HOME}/include" +diff --git a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac +index 46587e4099..b41c51bda7 100644 +--- a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac ++++ b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac +@@ -43,7 +43,7 @@ AC_ARG_WITH(rlm-sql-postgresql-include-dir, + ;; + esac]) + +-smart_try_dir="$rlm_sql_postgresql_include_dir /usr/include/postgresql /usr/local/pgsql/include /usr/include/pgsql" ++smart_try_dir="$rlm_sql_postgresql_include_dir" + FR_SMART_CHECK_INCLUDE(libpq-fe.h) + if test "x$ac_cv_header_libpqmfe_h" != "xyes"; then + FR_MODULE_FAIL([libpq-fe.h]) +@@ -95,7 +95,7 @@ else + ]) + fi + +-smart_try_dir="$rlm_sql_postgresql_lib_dir /usr/lib /usr/local/pgsql/lib" ++smart_try_dir="$rlm_sql_postgresql_lib_dir" + FR_SMART_CHECK_LIB(pq, PQconnectdb) + if test "x$ac_cv_lib_pq_PQconnectdb" != "xyes"; then + FR_MODULE_FAIL([libpq]) +diff --git a/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure.ac +index 3bdfae6032..ce68c312c6 100644 +--- a/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure.ac ++++ b/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure.ac +@@ -58,14 +58,14 @@ AC_ARG_WITH(unixodbc-dir, + esac]) + + dnl Check for SQLConnect in -lodbc +-smart_try_dir="$unixodbc_lib_dir /usr/local/unixodbc/lib" ++smart_try_dir="$unixodbc_lib_dir" + FR_SMART_CHECK_LIB(odbc, SQLConnect) + if test "x$ac_cv_lib_odbc_SQLConnect" != xyes; then + FR_MODULE_FAIL([libodbc]) + fi + + dnl Check for sql.h +-smart_try_dir="$unixodbc_include_dir /usr/local/unixodbc/include" ++smart_try_dir="$unixodbc_include_dir" + FR_SMART_CHECK_INCLUDE(sql.h) + if test "x$ac_cv_header_sql_h" != xyes; then + FR_MODULE_FAIL([sql.h]) +diff --git a/m4/fr_smart_check_lib.m4 b/m4/fr_smart_check_lib.m4 +index 16ac5b3c5e..0f5e9fc6d6 100644 +--- a/m4/fr_smart_check_lib.m4 ++++ b/m4/fr_smart_check_lib.m4 +@@ -64,28 +64,6 @@ if test "x$smart_lib" = "x"; then + LIBS="$old_LIBS" + fi + +-dnl # +-dnl # Try to guess possible locations. +-dnl # +-if test "x$smart_lib" = "x"; then +- for try in /usr/local/lib /opt/lib; do +- AC_MSG_CHECKING([for $2 in -l$1 in $try]) +- LIBS="-l$1 $old_LIBS" +- CPPFLAGS="-L$try -Wl,-rpath,$try $old_CPPFLAGS" +- AC_TRY_LINK([extern char $2();], +- [$2()], +- [ +- smart_lib="-l$1" +- smart_ldflags="-L$try -Wl,-rpath,$try" +- AC_MSG_RESULT(yes) +- break +- ], +- [AC_MSG_RESULT(no)]) +- done +- LIBS="$old_LIBS" +- CPPFLAGS="$old_CPPFLAGS" +-fi +- + dnl # + dnl # Found it, set the appropriate variable. + dnl # diff --git a/meta-networking/recipes-connectivity/freeradius/files/freeradius-rlm_python-add-PY_INC_DIR.patch b/meta-networking/recipes-connectivity/freeradius/files/0007-rlm_python-add-PY_INC_DIR-in-search-dir.patch index 675940dd6c..78259d7d74 100644 --- a/meta-networking/recipes-connectivity/freeradius/files/freeradius-rlm_python-add-PY_INC_DIR.patch +++ b/meta-networking/recipes-connectivity/freeradius/files/0007-rlm_python-add-PY_INC_DIR-in-search-dir.patch @@ -1,14 +1,14 @@ -From a0bf65e04d2bbd3271cab94bd5ac93f8e877bfc5 Mon Sep 17 00:00:00 2001 +From e4ff7a2a9834e2589bc7bdda4b74f5bc962b15e6 Mon Sep 17 00:00:00 2001 From: Jackie Huang <jackie.huang@windriver.com> Date: Wed, 27 Jan 2016 05:07:19 -0500 Subject: [PATCH] rlm_python: add PY_INC_DIR in search dir -Upstream-Status: Pending - configure option --with-rlm-python-include-dir is used to set PY_INC_DIR which is never used and it fails to find Python.h, so add it into search dir to fix it. +Upstream-Status: Inappropriate [embedded specific] + Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Yi Zhao <yi.zhao@windriver.com> --- @@ -16,18 +16,15 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/rlm_python/configure.ac b/src/modules/rlm_python/configure.ac -index 831a33a..c3792d8 100644 +index c79c327064..5f4d274990 100644 --- a/src/modules/rlm_python/configure.ac +++ b/src/modules/rlm_python/configure.ac -@@ -93,7 +93,7 @@ if test x$with_[]modname != xno; then +@@ -103,7 +103,7 @@ FR_MODULE_TEST_PASS_DO([ - old_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS $PY_CFLAGS" -- smart_try_dir="$PY_PREFIX/include/python$PY_SYS_VERSION" -+ smart_try_dir="$PY_PREFIX/include/python$PY_SYS_VERSION $PY_INC_DIR" - FR_SMART_CHECK_INCLUDE(Python.h) - CFLAGS=$old_CFLAGS + old_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS $PY_CFLAGS" +- smart_try_dir="$PY_PREFIX/include/python$PY_SYS_VERSION" ++ smart_try_dir="$PY_PREFIX/include/python$PY_SYS_VERSION $PY_INC_DIR" + FR_SMART_CHECK_INCLUDE(Python.h) + CFLAGS=$old_CFLAGS --- -2.10.2 - diff --git a/meta-networking/recipes-connectivity/freeradius/files/freeradius-libtool-do-not-use-jlibtool.patch b/meta-networking/recipes-connectivity/freeradius/files/0008-libtool-do-not-use-jlibtool.patch index 1954586b2b..559b857b63 100644 --- a/meta-networking/recipes-connectivity/freeradius/files/freeradius-libtool-do-not-use-jlibtool.patch +++ b/meta-networking/recipes-connectivity/freeradius/files/0008-libtool-do-not-use-jlibtool.patch @@ -1,4 +1,4 @@ -From 16bf899447fc1524ffc3c79e1d35380e5285a552 Mon Sep 17 00:00:00 2001 +From d0fa5b259c2dc942d0a43a9cf1bfc32f40c184f9 Mon Sep 17 00:00:00 2001 From: Jackie Huang <jackie.huang@windriver.com> Date: Thu, 7 Jan 2016 22:37:30 -0800 Subject: [PATCH] libtool: do not use jlibtool @@ -7,7 +7,7 @@ jlibtool is hardcoded to be used but we need to use our libtool, so fix the makfiles to make it compatible with our libtool. -Upstream-Status: Inappropriate [oe specific] +Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Yi Zhao <yi.zhao@windriver.com> @@ -19,7 +19,7 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com> 4 files changed, 27 insertions(+), 15 deletions(-) diff --git a/Make.inc.in b/Make.inc.in -index 7a77625..fd8aa3e 100644 +index 05f82776ff..e78f3fe9dc 100644 --- a/Make.inc.in +++ b/Make.inc.in @@ -57,7 +57,7 @@ CPPFLAGS = @CPPFLAGS@ @@ -31,7 +31,7 @@ index 7a77625..fd8aa3e 100644 ACLOCAL = @ACLOCAL@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ -@@ -163,7 +163,7 @@ ANALYZE.c := @clang_path@ +@@ -168,7 +168,7 @@ ANALYZE.c := @clang_path@ # ifeq "$(USE_SHARED_LIBS)" "yes" TESTBINDIR = ./$(BUILD_DIR)/bin/local @@ -41,10 +41,10 @@ index 7a77625..fd8aa3e 100644 TESTBINDIR = ./$(BUILD_DIR)/bin TESTBIN = ./$(BUILD_DIR)/bin diff --git a/scripts/boiler.mk b/scripts/boiler.mk -index bccec5e..926a13e 100644 +index 2ce0c18f34..567cc0f22f 100644 --- a/scripts/boiler.mk +++ b/scripts/boiler.mk -@@ -266,6 +266,7 @@ define COMPILE_C_CMDS +@@ -272,6 +272,7 @@ define COMPILE_C_CMDS $(Q)$(ECHO) CC $< $(Q)$(strip ${COMPILE.c} -o $@ -c -MD ${CPPFLAGS} ${CFLAGS} ${SRC_CFLAGS} ${INCDIRS} \ $(addprefix -I, ${SRC_INCDIRS}) ${SRC_DEFS} ${DEFS} $<) @@ -52,7 +52,7 @@ index bccec5e..926a13e 100644 endef else # -@@ -281,6 +282,7 @@ define COMPILE_C_CMDS +@@ -287,6 +288,7 @@ define COMPILE_C_CMDS $(Q)cppcheck --enable=style -q ${CHECKFLAGS} $(filter -isystem%,${SRC_CFLAGS}) \ $(filter -I%,${SRC_CFLAGS}) $(filter -D%,${SRC_CFLAGS}) ${INCDIRS} \ $(addprefix -I,${SRC_INCDIRS}) ${SRC_DEFS} ${DEFS} --suppress=variableScope --suppress=invalidscanf $< @@ -61,7 +61,7 @@ index bccec5e..926a13e 100644 endif diff --git a/scripts/install.mk b/scripts/install.mk -index 9164115..e38c1ed 100644 +index 916411563b..e38c1ed697 100644 --- a/scripts/install.mk +++ b/scripts/install.mk @@ -46,7 +46,7 @@ define ADD_INSTALL_RULE.exe @@ -116,10 +116,10 @@ index 9164115..e38c1ed 100644 diff --git a/scripts/libtool.mk b/scripts/libtool.mk -index 57915e1..2cb2f7d 100644 +index 381127ec2d..e83d7e6ad7 100644 --- a/scripts/libtool.mk +++ b/scripts/libtool.mk -@@ -55,7 +55,9 @@ ifeq "${LIBTOOL}" "JLIBTOOL" +@@ -60,7 +60,9 @@ ifeq "${LIBTOOL}" "JLIBTOOL" # Tell GNU Make to use this value, rather than anything specified # on the command line. override LIBTOOL := ${JLIBTOOL} @@ -130,7 +130,7 @@ index 57915e1..2cb2f7d 100644 # When using libtool, it produces a '.libs' directory. Ensure that it # is removed on "make clean", too. -@@ -69,11 +71,19 @@ clean: .libs_clean +@@ -74,11 +76,19 @@ clean: .libs_clean # Re-define compilers and linkers # OBJ_EXT = lo @@ -156,5 +156,5 @@ index 57915e1..2cb2f7d 100644 # LIBTOOL_ENDINGS - Given a library ending in ".a" or ".so", replace that -- -2.10.2 +2.25.1 diff --git a/meta-networking/recipes-connectivity/freeradius/files/freeradius-fix-quoting-for-BUILT_WITH.patch b/meta-networking/recipes-connectivity/freeradius/files/0009-Fix-quoting-for-BUILD_WITH.patch index b0929c4b07..9386675e46 100644 --- a/meta-networking/recipes-connectivity/freeradius/files/freeradius-fix-quoting-for-BUILT_WITH.patch +++ b/meta-networking/recipes-connectivity/freeradius/files/0009-Fix-quoting-for-BUILD_WITH.patch @@ -1,4 +1,7 @@ -Fix quoting for BUILD_WITH +From 3e701d6274924adaed568e22af2362aa5af1f055 Mon Sep 17 00:00:00 2001 +From: Peter Seebach <peter.seebach@windriver.com> +Date: Sun, 8 Jan 2023 23:01:28 +0800 +Subject: [PATCH] Fix quoting for BUILD_WITH The escaped quotes are to make the -D values produce strings which can be used to display these values. However, if the values are more @@ -16,7 +19,7 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com> 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/libfreeradius-server.mk b/src/main/libfreeradius-server.mk -index 4495f72..07c28f1 100644 +index 4495f72481..07c28f1968 100644 --- a/src/main/libfreeradius-server.mk +++ b/src/main/libfreeradius-server.mk @@ -18,5 +18,5 @@ SOURCES := conffile.c \ @@ -27,7 +30,7 @@ index 4495f72..07c28f1 100644 +SRC_CFLAGS += -DBUILT_WITH_CPPFLAGS="\"$(CPPFLAGS)\"" -DBUILT_WITH_CFLAGS="\"$(CFLAGS)\"" -DBUILT_WITH_LDFLAGS="\"$(LDFLAGS)\"" -DBUILT_WITH_LIBS="\"$(LIBS)\"" endif diff --git a/src/main/unittest.mk b/src/main/unittest.mk -index 09f3938..ed33952 100644 +index edd4f133a7..b5b44d5e11 100644 --- a/src/main/unittest.mk +++ b/src/main/unittest.mk @@ -21,5 +21,5 @@ TGT_PREREQS += libfreeradius-eap.a @@ -38,7 +41,7 @@ index 09f3938..ed33952 100644 +SRC_CFLAGS += -DBUILT_WITH_CPPFLAGS="\"$(CPPFLAGS)\"" -DBUILT_WITH_CFLAGS="\"$(CFLAGS)\"" -DBUILT_WITH_LDFLAGS="\"$(LDFLAGS)\"" -DBUILT_WITH_LIBS="\"$(LIBS)\"" endif diff --git a/src/modules/rlm_eap/radeapclient.mk b/src/modules/rlm_eap/radeapclient.mk -index 6068f54..7d3c556 100644 +index 6068f54813..7d3c55625b 100644 --- a/src/modules/rlm_eap/radeapclient.mk +++ b/src/modules/rlm_eap/radeapclient.mk @@ -23,7 +23,7 @@ SRC_CFLAGS += -DWITH_EAPCLIENT @@ -51,5 +54,5 @@ index 6068f54..7d3c556 100644 endif -- -2.10.2 +2.25.1 diff --git a/meta-networking/recipes-connectivity/freeradius/files/freeradius-fix-error-for-expansion-of-macro.patch b/meta-networking/recipes-connectivity/freeradius/files/0010-fix-error-for-expansion-of-macro-in-thread.h.patch index af1bff051f..051b66af8f 100644 --- a/meta-networking/recipes-connectivity/freeradius/files/freeradius-fix-error-for-expansion-of-macro.patch +++ b/meta-networking/recipes-connectivity/freeradius/files/0010-fix-error-for-expansion-of-macro-in-thread.h.patch @@ -1,4 +1,4 @@ -From 5b6d8b14f2696fcf1dca119212f9d0a0fa04defd Mon Sep 17 00:00:00 2001 +From 30ce5ccd62446349d432ff65d3fe8d46872423c8 Mon Sep 17 00:00:00 2001 From: Yi Zhao <yi.zhao@windriver.com> Date: Wed, 18 Jan 2017 14:59:39 +0800 Subject: [PATCH] fix error for expansion of macro in thread.h @@ -22,7 +22,7 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com> 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/include/threads.h b/src/include/threads.h -index e36d81d..2bcb6aa 100644 +index e36d81dac0..2bcb6aadcb 100644 --- a/src/include/threads.h +++ b/src/include/threads.h @@ -89,7 +89,7 @@ static _t __fr_thread_local_init_##_n(pthread_destructor_t func)\ @@ -57,5 +57,5 @@ index e36d81d..2bcb6aa 100644 #endif #endif -- -2.10.2 +2.25.1 diff --git a/meta-networking/recipes-connectivity/freeradius/files/0011-rlm_mschap-Use-includedir-instead-of-hardcoding-usr-.patch b/meta-networking/recipes-connectivity/freeradius/files/0011-rlm_mschap-Use-includedir-instead-of-hardcoding-usr-.patch new file mode 100644 index 0000000000..efa5c53c9f --- /dev/null +++ b/meta-networking/recipes-connectivity/freeradius/files/0011-rlm_mschap-Use-includedir-instead-of-hardcoding-usr-.patch @@ -0,0 +1,28 @@ +From f0e764826e3a85488047f7f4e94ebf91460d2c12 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 16 Jun 2017 20:10:49 -0700 +Subject: [PATCH] rlm_mschap: Use includedir instead of hardcoding /usr/include + +OE QA flags it correctly as a voilation of cross compilation +namespace + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/modules/rlm_mschap/configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/modules/rlm_mschap/configure.ac b/src/modules/rlm_mschap/configure.ac +index 953336f475..77a18af55d 100644 +--- a/src/modules/rlm_mschap/configure.ac ++++ b/src/modules/rlm_mschap/configure.ac +@@ -77,7 +77,7 @@ else + FR_MODULE_FEATURE([opendirectory], [without opendirectory support]) + fi + +-smart_try_dir="$winbind_include_dir /usr/include/samba-4.0" ++smart_try_dir="$winbind_include_dir =/usr/include/samba-4.0" + FR_SMART_CHECK_INCLUDE(wbclient.h, [#include <stdint.h> + #include <stdbool.h>]) + if test "x$ac_cv_header_wbclient_h" != "xyes"; then diff --git a/meta-networking/recipes-connectivity/freeradius/files/0012-raddb-certs-Makefile-fix-the-existed-certificate-err.patch b/meta-networking/recipes-connectivity/freeradius/files/0012-raddb-certs-Makefile-fix-the-existed-certificate-err.patch new file mode 100644 index 0000000000..cbac989284 --- /dev/null +++ b/meta-networking/recipes-connectivity/freeradius/files/0012-raddb-certs-Makefile-fix-the-existed-certificate-err.patch @@ -0,0 +1,55 @@ +From 0f9f18fc330fe88080be13e43f300fbf7ba4a85a Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Mon, 13 Jul 2020 07:01:45 +0000 +Subject: [PATCH] raddb/certs/Makefile: fix the existed certificate error + +Fixes: + # ./bootstrap + [snip] +openssl ca -batch -keyfile ca.key -cert ca.pem -in client.csr -key 'whatever' -out client.crt -extensions xpclient_ext -extfile xpextensions -config ./client.cnf +Using configuration from ./client.cnf +Check that the request matches the signature +Signature ok +ERROR:There is already a certificate for /C=FR/ST=Radius/O=Example Inc./CN=user@example.org/emailAddress=user@example.org +The matching entry has the following details +Type :Valid +Expires on :200908024833Z +Serial Number :02 +File name :unknown +Subject Name :/C=FR/ST=Radius/O=Example Inc./CN=user@example.org/emailAddress=user@example.org +make: *** [Makefile:128: client.crt] Error 1 + +Add the check to fix the above error and it does the same for server.crt. + +Upstream-Status: Pending + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + raddb/certs/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/raddb/certs/Makefile b/raddb/certs/Makefile +index c9fbc9e864..d064fe252d 100644 +--- a/raddb/certs/Makefile ++++ b/raddb/certs/Makefile +@@ -92,7 +92,7 @@ server.csr server.key: server.cnf + chmod g+r server.key + + server.crt: ca.key ca.pem server.csr +- $(OPENSSL) ca -batch -keyfile ca.key -cert ca.pem -in server.csr -key $(PASSWORD_CA) -out server.crt -extensions xpserver_ext -extfile xpextensions -config ./server.cnf ++ @[ -f server.crt ] || $(OPENSSL) ca -batch -keyfile ca.key -cert ca.pem -in server.csr -key $(PASSWORD_CA) -out server.crt -extensions xpserver_ext -extfile xpextensions -config ./server.cnf + + server.p12: server.crt + $(OPENSSL) pkcs12 -export -in server.crt -inkey server.key -out server.p12 -passin pass:$(PASSWORD_SERVER) -passout pass:$(PASSWORD_SERVER) +@@ -117,7 +117,7 @@ client.csr client.key: client.cnf + chmod g+r client.key + + client.crt: ca.key ca.pem client.csr +- $(OPENSSL) ca -batch -keyfile ca.key -cert ca.pem -in client.csr -key $(PASSWORD_CA) -out client.crt -extensions xpclient_ext -extfile xpextensions -config ./client.cnf ++ @[ -f client.crt ] || $(OPENSSL) ca -batch -keyfile ca.key -cert ca.pem -in client.csr -key $(PASSWORD_CA) -out client.crt -extensions xpclient_ext -extfile xpextensions -config ./client.cnf + + client.p12: client.crt + $(OPENSSL) pkcs12 -export -in client.crt -inkey client.key -out client.p12 -passin pass:$(PASSWORD_CLIENT) -passout pass:$(PASSWORD_CLIENT) +-- +2.25.1 + diff --git a/meta-networking/recipes-connectivity/freeradius/files/0013-raddb-certs-Makefile-fix-the-occasional-verification.patch b/meta-networking/recipes-connectivity/freeradius/files/0013-raddb-certs-Makefile-fix-the-occasional-verification.patch new file mode 100644 index 0000000000..287e47adcc --- /dev/null +++ b/meta-networking/recipes-connectivity/freeradius/files/0013-raddb-certs-Makefile-fix-the-occasional-verification.patch @@ -0,0 +1,136 @@ +From bb1cb2ffc7a31c0a2bb2de51ef82d304b0a107c3 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Wed, 5 Aug 2020 07:23:11 +0000 +Subject: [PATCH] raddb/certs/Makefile: fix the occasional verification failure + +Fixes: + # cd /etc/raddb/certs + # ./bootstrap +[snip] +chmod g+r ca.key +openssl pkcs12 -in server.p12 -out server.pem -passin pass:'whatever' -passout pass:'whatever' +chmod g+r server.pem +C = FR, ST = Radius, O = Example Inc., CN = Example Server Certificate, emailAddress = admin@example.org +error 7 at 0 depth lookup: certificate signature failure +140066667427072:error:04067084:rsa routines:rsa_ossl_public_decrypt:data too large for modulus:../openssl-1.1.1g/crypto/rsa/rsa_ossl.c:553: +140066667427072:error:0D0C5006:asn1 encoding routines:ASN1_item_verify:EVP lib:../openssl-1.1.1g/crypto/asn1/a_verify.c:170: +error server.pem: verification failed +make: *** [Makefile:107: server.vrfy] Error 2 + +It seems the ca.pem mismatchs server.pem which results in failing to +execute "openssl verify -CAfile ca.pem server.pem", so add to check +the file to avoid inconsistency. + +Upstream-Status: Pending + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + raddb/certs/Makefile | 30 +++++++++++++++--------------- + 1 file changed, 15 insertions(+), 15 deletions(-) + +diff --git a/raddb/certs/Makefile b/raddb/certs/Makefile +index d064fe252d..86f4547804 100644 +--- a/raddb/certs/Makefile ++++ b/raddb/certs/Makefile +@@ -59,7 +59,7 @@ passwords.mk: server.cnf ca.cnf client.cnf inner-server.cnf + # + ###################################################################### + dh: +- $(OPENSSL) dhparam -out dh -2 $(DH_KEY_SIZE) ++ @[ -f dh ] || $(OPENSSL) dhparam -out dh -2 $(DH_KEY_SIZE) + + ###################################################################### + # +@@ -69,17 +69,17 @@ dh: + ca.key ca.pem: ca.cnf + @[ -f index.txt ] || $(MAKE) index.txt + @[ -f serial ] || $(MAKE) serial +- $(OPENSSL) req -new -x509 -keyout ca.key -out ca.pem \ ++ @[ -f ca.pem ] || $(OPENSSL) req -new -x509 -keyout ca.key -out ca.pem \ + -days $(CA_DEFAULT_DAYS) -config ./ca.cnf \ + -passin pass:$(PASSWORD_CA) -passout pass:$(PASSWORD_CA) + chmod g+r ca.key + + ca.der: ca.pem +- $(OPENSSL) x509 -inform PEM -outform DER -in ca.pem -out ca.der ++ @[ -f ca.der ] || $(OPENSSL) x509 -inform PEM -outform DER -in ca.pem -out ca.der + + ca.crl: ca.pem +- $(OPENSSL) ca -gencrl -keyfile ca.key -cert ca.pem -config ./ca.cnf -out ca-crl.pem -key $(PASSWORD_CA) +- $(OPENSSL) crl -in ca-crl.pem -outform der -out ca.crl ++ @[ -f ca-crl.pem ] || $(OPENSSL) ca -gencrl -keyfile ca.key -cert ca.pem -config ./ca.cnf -out ca-crl.pem -key $(PASSWORD_CA) ++ @[ -f ca.crl ] || $(OPENSSL) crl -in ca-crl.pem -outform der -out ca.crl + rm ca-crl.pem + + ###################################################################### +@@ -88,18 +88,18 @@ ca.crl: ca.pem + # + ###################################################################### + server.csr server.key: server.cnf +- $(OPENSSL) req -new -out server.csr -keyout server.key -config ./server.cnf ++ @[ -f server.csr ] || $(OPENSSL) req -new -out server.csr -keyout server.key -config ./server.cnf + chmod g+r server.key + + server.crt: ca.key ca.pem server.csr + @[ -f server.crt ] || $(OPENSSL) ca -batch -keyfile ca.key -cert ca.pem -in server.csr -key $(PASSWORD_CA) -out server.crt -extensions xpserver_ext -extfile xpextensions -config ./server.cnf + + server.p12: server.crt +- $(OPENSSL) pkcs12 -export -in server.crt -inkey server.key -out server.p12 -passin pass:$(PASSWORD_SERVER) -passout pass:$(PASSWORD_SERVER) ++ @[ -f server.p12 ] || $(OPENSSL) pkcs12 -export -in server.crt -inkey server.key -out server.p12 -passin pass:$(PASSWORD_SERVER) -passout pass:$(PASSWORD_SERVER) + chmod g+r server.p12 + + server.pem: server.p12 +- $(OPENSSL) pkcs12 -in server.p12 -out server.pem -passin pass:$(PASSWORD_SERVER) -passout pass:$(PASSWORD_SERVER) ++ @[ -f server.pem ] || $(OPENSSL) pkcs12 -in server.p12 -out server.pem -passin pass:$(PASSWORD_SERVER) -passout pass:$(PASSWORD_SERVER) + chmod g+r server.pem + + .PHONY: server.vrfy +@@ -113,19 +113,19 @@ server.vrfy: ca.pem + # + ###################################################################### + client.csr client.key: client.cnf +- $(OPENSSL) req -new -out client.csr -keyout client.key -config ./client.cnf ++ @[ -f client.csr ] || $(OPENSSL) req -new -out client.csr -keyout client.key -config ./client.cnf + chmod g+r client.key + + client.crt: ca.key ca.pem client.csr + @[ -f client.crt ] || $(OPENSSL) ca -batch -keyfile ca.key -cert ca.pem -in client.csr -key $(PASSWORD_CA) -out client.crt -extensions xpclient_ext -extfile xpextensions -config ./client.cnf + + client.p12: client.crt +- $(OPENSSL) pkcs12 -export -in client.crt -inkey client.key -out client.p12 -passin pass:$(PASSWORD_CLIENT) -passout pass:$(PASSWORD_CLIENT) ++ @[ -f client.p12 ] || $(OPENSSL) pkcs12 -export -in client.crt -inkey client.key -out client.p12 -passin pass:$(PASSWORD_CLIENT) -passout pass:$(PASSWORD_CLIENT) + chmod g+r client.p12 + cp client.p12 $(USER_NAME).p12 + + client.pem: client.p12 +- $(OPENSSL) pkcs12 -in client.p12 -out client.pem -passin pass:$(PASSWORD_CLIENT) -passout pass:$(PASSWORD_CLIENT) ++ @[ -f client.pem ] || $(OPENSSL) pkcs12 -in client.p12 -out client.pem -passin pass:$(PASSWORD_CLIENT) -passout pass:$(PASSWORD_CLIENT) + chmod g+r client.pem + cp client.pem $(USER_NAME).pem + +@@ -140,18 +140,18 @@ client.vrfy: ca.pem client.pem + # + ###################################################################### + inner-server.csr inner-server.key: inner-server.cnf +- $(OPENSSL) req -new -out inner-server.csr -keyout inner-server.key -config ./inner-server.cnf ++ @[ -f inner-server.csr] || $(OPENSSL) req -new -out inner-server.csr -keyout inner-server.key -config ./inner-server.cnf + chmod g+r inner-server.key + + inner-server.crt: ca.key ca.pem inner-server.csr +- $(OPENSSL) ca -batch -keyfile ca.key -cert ca.pem -in inner-server.csr -key $(PASSWORD_CA) -out inner-server.crt -extensions xpserver_ext -extfile xpextensions -config ./inner-server.cnf ++ @[ -f inner-server.crt ] || $(OPENSSL) ca -batch -keyfile ca.key -cert ca.pem -in inner-server.csr -key $(PASSWORD_CA) -out inner-server.crt -extensions xpserver_ext -extfile xpextensions -config ./inner-server.cnf + + inner-server.p12: inner-server.crt +- $(OPENSSL) pkcs12 -export -in inner-server.crt -inkey inner-server.key -out inner-server.p12 -passin pass:$(PASSWORD_INNER) -passout pass:$(PASSWORD_INNER) ++ @[ -f inner-server.p12 ] || $(OPENSSL) pkcs12 -export -in inner-server.crt -inkey inner-server.key -out inner-server.p12 -passin pass:$(PASSWORD_INNER) -passout pass:$(PASSWORD_INNER) + chmod g+r inner-server.p12 + + inner-server.pem: inner-server.p12 +- $(OPENSSL) pkcs12 -in inner-server.p12 -out inner-server.pem -passin pass:$(PASSWORD_INNER) -passout pass:$(PASSWORD_INNER) ++ @[ -f inner-server.pem ] || $(OPENSSL) pkcs12 -in inner-server.p12 -out inner-server.pem -passin pass:$(PASSWORD_INNER) -passout pass:$(PASSWORD_INNER) + chmod g+r inner-server.pem + + .PHONY: inner-server.vrfy +-- +2.25.1 + diff --git a/meta-networking/recipes-connectivity/freeradius/files/0014-Workaround-error-with-autoconf-2.7.patch b/meta-networking/recipes-connectivity/freeradius/files/0014-Workaround-error-with-autoconf-2.7.patch new file mode 100644 index 0000000000..17eadc7e59 --- /dev/null +++ b/meta-networking/recipes-connectivity/freeradius/files/0014-Workaround-error-with-autoconf-2.7.patch @@ -0,0 +1,42 @@ +From c591da4a361496eec93625cf8c4f89bddfedaca7 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Sun, 7 Feb 2021 16:02:36 +0800 +Subject: [PATCH] Workaround error with autoconf 2.7 + +While using autoconf 2.7, the AM_MISSING_PROG caused unexpected error: +... +configure.ac: error: required file 'missing' not found +... + +Since these tools were explicitly added by autotools bbclass, +remove the testing to workaround the error with autoconf 2.7 + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + configure.ac | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 263098f7fd..fc296832d8 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -878,14 +878,6 @@ fi + + AC_PATH_PROG(RUSERS, rusers, /usr/bin/rusers) + +-dnl # +-dnl # FIXME This is truly gross. +-dnl # +-missing_dir=`cd $ac_aux_dir && pwd` +-AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir) +-AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir) +-AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir) +- + AC_PATH_PROG(DIRNAME,dirname) + AC_PATH_PROG(GREP,grep) + +-- +2.25.1 + diff --git a/meta-networking/recipes-connectivity/freeradius/files/0015-bootstrap-check-commands-of-openssl-exist.patch b/meta-networking/recipes-connectivity/freeradius/files/0015-bootstrap-check-commands-of-openssl-exist.patch new file mode 100644 index 0000000000..d1d0111607 --- /dev/null +++ b/meta-networking/recipes-connectivity/freeradius/files/0015-bootstrap-check-commands-of-openssl-exist.patch @@ -0,0 +1,44 @@ +From 78494ea005bd38324953b05176d6eb2c3f55af2c Mon Sep 17 00:00:00 2001 +From: Kai Kang <kai.kang@windriver.com> +Date: Sun, 8 Jan 2023 23:21:24 +0800 +Subject: [PATCH] bootstrap: check commands of openssl exist + +It calls openssl commands dhparam and pkcs12 in script bootstrap. These +commands are configurable based on configure options 'no-dh' and +'no-des', and may not be provided by openssl. So check existence of +these commands. If not, abort running of script bootstrap. + +1. https://github.com/openssl/openssl/blob/master/apps/build.info#L37 +2. https://github.com/openssl/openssl/blob/master/apps/build.info#L22 + +Upstream-Status: Denied [https://github.com/FreeRADIUS/freeradius-server/pull/4059] + The maintainer commented in the pull that the script could + be run on a host which provides these openssl commands. + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- + raddb/certs/bootstrap | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/raddb/certs/bootstrap b/raddb/certs/bootstrap +index 57de8cf0d7..4641c71700 100755 +--- a/raddb/certs/bootstrap ++++ b/raddb/certs/bootstrap +@@ -13,6 +13,14 @@ + umask 027 + cd `dirname $0` + ++# check commands of openssl exist ++for cmd in dhparam pkcs12; do ++ if ! openssl ${cmd} -help >/dev/null 2>&1; then ++ echo "Error: command ${cmd} is not supported by openssl." ++ exit 1 ++ fi ++done ++ + make -h > /dev/null 2>&1 + + # +-- +2.25.1 + diff --git a/meta-networking/recipes-connectivity/freeradius/files/0016-version.c-don-t-print-build-flags.patch b/meta-networking/recipes-connectivity/freeradius/files/0016-version.c-don-t-print-build-flags.patch new file mode 100644 index 0000000000..2d67fdef05 --- /dev/null +++ b/meta-networking/recipes-connectivity/freeradius/files/0016-version.c-don-t-print-build-flags.patch @@ -0,0 +1,41 @@ +From cbbb62ddda5c189c225f96bf6b599b3b3e8c8252 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Wed, 3 Aug 2022 16:44:29 +0800 +Subject: [PATCH] version.c: don't print build flags + +Don't print the build flags to avoid collecting the build environment info. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + src/main/version.c | 13 ------------- + 1 file changed, 13 deletions(-) + +diff --git a/src/main/version.c b/src/main/version.c +index f1f1e87810..3ffcbb25a0 100644 +--- a/src/main/version.c ++++ b/src/main/version.c +@@ -589,19 +589,6 @@ void version_print(void) + DEBUG2(" unknown"); + #endif + +- DEBUG2("Compilation flags:"); +-#ifdef BUILT_WITH_CPPFLAGS +- DEBUG2(" cppflags : " BUILT_WITH_CPPFLAGS); +-#endif +-#ifdef BUILT_WITH_CFLAGS +- DEBUG2(" cflags : " BUILT_WITH_CFLAGS); +-#endif +-#ifdef BUILT_WITH_LDFLAGS +- DEBUG2(" ldflags : " BUILT_WITH_LDFLAGS); +-#endif +-#ifdef BUILT_WITH_LIBS +- DEBUG2(" libs : " BUILT_WITH_LIBS); +-#endif + DEBUG2(" "); + } + INFO("FreeRADIUS Version " RADIUSD_VERSION_STRING); +-- +2.25.1 + diff --git a/meta-networking/recipes-connectivity/freeradius/files/0017-Add-acinclude.m4-to-include-required-macros.patch b/meta-networking/recipes-connectivity/freeradius/files/0017-Add-acinclude.m4-to-include-required-macros.patch new file mode 100644 index 0000000000..f5c399e584 --- /dev/null +++ b/meta-networking/recipes-connectivity/freeradius/files/0017-Add-acinclude.m4-to-include-required-macros.patch @@ -0,0 +1,61 @@ +From 40abff4062d0521cf2b2a8a4660a3d2933f86f9d Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Mon, 1 Apr 2024 09:09:07 +0000 +Subject: [PATCH] Add acinclude.m4 to include required macros + +* These micro files are in the m4 directories, but the aclocal didn't + add them to aclocal.m4 automatically, so add them to acinclude.m4 + manually. + +* The runlog.m4 is added for python.m4. + +Upstream-Status: Inappropriate [OE Specific] + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + acinclude.m4 | 8 ++++++++ + m4/runlog.m4 | 17 +++++++++++++++++ + 2 files changed, 25 insertions(+) + create mode 100644 acinclude.m4 + create mode 100644 m4/runlog.m4 + +diff --git a/acinclude.m4 b/acinclude.m4 +new file mode 100644 +index 0000000000..118b7f0e5f +--- /dev/null ++++ b/acinclude.m4 +@@ -0,0 +1,8 @@ ++m4_include([m4/fr_init_module.m4]) ++m4_include([m4/ax_with_prog.m4]) ++m4_include([m4/runlog.m4]) ++m4_include([m4/python.m4]) ++m4_include([m4/ax_compare_version.m4]) ++m4_include([m4/libcurl_check_config.m4]) ++m4_include([m4/ax_ruby_devel.m4]) ++m4_include([m4/ax_prog_ruby_version.m4]) +diff --git a/m4/runlog.m4 b/m4/runlog.m4 +new file mode 100644 +index 0000000000..690efc3258 +--- /dev/null ++++ b/m4/runlog.m4 +@@ -0,0 +1,17 @@ ++## -*- Autoconf -*- ++# Copyright (C) 2001-2018 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# AM_RUN_LOG(COMMAND) ++# ------------------- ++# Run COMMAND, save the exit status in ac_status, and log it. ++# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) ++AC_DEFUN([AM_RUN_LOG], ++[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD ++ ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD ++ (exit $ac_status); }]) +-- +2.35.5 + diff --git a/meta-networking/recipes-connectivity/freeradius/files/freeradius-avoid-searching-host-dirs.patch b/meta-networking/recipes-connectivity/freeradius/files/freeradius-avoid-searching-host-dirs.patch deleted file mode 100644 index 9c997661fc..0000000000 --- a/meta-networking/recipes-connectivity/freeradius/files/freeradius-avoid-searching-host-dirs.patch +++ /dev/null @@ -1,197 +0,0 @@ -From dc41591d5ceb18900ec85894f8f7b7bb44bb3bd9 Mon Sep 17 00:00:00 2001 -From: Jackie Huang <jackie.huang@windriver.com> -Date: Mon, 4 Jan 2016 01:44:04 -0500 -Subject: [PATCH] avoid searching host dirs - -Don't search the hardcoded host dirs to avoid -host contamination. - -Upstream-Status: Inappropriate [cross-compile specific] - -Signed-off-by: Jackie Huang <jackie.huang@windriver.com> ---- - acinclude.m4 | 4 ++-- - src/modules/rlm_sql/drivers/rlm_sql_db2/configure.ac | 4 ++-- - src/modules/rlm_sql/drivers/rlm_sql_firebird/configure.ac | 4 ++-- - src/modules/rlm_sql/drivers/rlm_sql_iodbc/configure.ac | 4 ++-- - src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.ac | 6 +++--- - src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.ac | 2 +- - src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac | 4 ++-- - src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure.ac | 4 ++-- - 8 files changed, 16 insertions(+), 16 deletions(-) - -diff --git a/acinclude.m4 b/acinclude.m4 -index da48acc..b513ae1 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -178,7 +178,7 @@ if test "x$smart_lib" = "x"; then - FR_LOCATE_DIR(smart_lib_dir,[lib$1${libltdl_cv_shlibext}]) - FR_LOCATE_DIR(smart_lib_dir,[lib$1.a]) - -- for try in $smart_lib_dir /usr/local/lib /opt/lib; do -+ for try in $smart_lib_dir; do - AC_MSG_CHECKING([for $2 in -l$1 in $try]) - LIBS="-l$1 $old_LIBS" - CPPFLAGS="-L$try -Wl,-rpath,$try $old_CPPFLAGS" -@@ -218,7 +218,7 @@ ac_safe=`echo "$1" | sed 'y%./+-%__pm%'` - old_CPPFLAGS="$CPPFLAGS" - smart_include= - dnl # The default directories we search in (in addition to the compilers search path) --smart_include_dir="/usr/local/include /opt/include" -+smart_include_dir= - - dnl # Our local versions - _smart_try_dir= -diff --git a/src/modules/rlm_sql/drivers/rlm_sql_db2/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_db2/configure.ac -index 75c851a..a262d71 100644 ---- a/src/modules/rlm_sql/drivers/rlm_sql_db2/configure.ac -+++ b/src/modules/rlm_sql/drivers/rlm_sql_db2/configure.ac -@@ -57,14 +57,14 @@ if test x$with_[]modname != xno; then - esac]) - - dnl Check for SQLConnect in -ldb2 -- smart_try_dir="$ibmdb2_lib_dir /usr/local/db2/lib /usr/IBMdb2/V7.1/lib" -+ smart_try_dir="$ibmdb2_lib_dir" - FR_SMART_CHECK_LIB(db2, SQLConnect) - if test "x$ac_cv_lib_db2_SQLConnect" != xyes; then - fail="$fail libdb2" - fi - - dnl Check for sqlcli.h -- smart_try_dir="$ibmdb2_include_dir /usr/local/db2/include /usr/IBMdb2/V7.1/include" -+ smart_try_dir="$ibmdb2_include_dir" - FR_SMART_CHECK_INCLUDE(sqlcli.h) - if test "x$ac_cv_header_sqlcli_h" != xyes; then - fail="$fail sqlcli.h" -diff --git a/src/modules/rlm_sql/drivers/rlm_sql_firebird/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_firebird/configure.ac -index 4da57b3..752b043 100644 ---- a/src/modules/rlm_sql/drivers/rlm_sql_firebird/configure.ac -+++ b/src/modules/rlm_sql/drivers/rlm_sql_firebird/configure.ac -@@ -56,14 +56,14 @@ if test x$with_[]modname != xno; then - esac]) - - dnl Check for isc_attach_database in -lfbclient -- smart_try_dir="$firebird_lib_dir /usr/lib/firebird2/lib /usr/local/firebird/lib" -+ smart_try_dir="$firebird_lib_dir" - FR_SMART_CHECK_LIB(fbclient, isc_attach_database) - if test "x$ac_cv_lib_fbclient_isc_attach_database" != xyes; then - fail="$fail libfbclient" - fi - - dnl Check for ibase.h -- smart_try_dir="$firebird_include_dir /usr/lib/firebird2/include /usr/local/firebird/include" -+ smart_try_dir="$firebird_include_dir" - FR_SMART_CHECK_INCLUDE(ibase.h) - if test "x$ac_cv_header_ibase_h" != xyes; then - fail="$fail ibase.h" -diff --git a/src/modules/rlm_sql/drivers/rlm_sql_iodbc/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_iodbc/configure.ac -index ba6304f..3393557 100644 ---- a/src/modules/rlm_sql/drivers/rlm_sql_iodbc/configure.ac -+++ b/src/modules/rlm_sql/drivers/rlm_sql_iodbc/configure.ac -@@ -57,14 +57,14 @@ if test x$with_[]modname != xno; then - esac]) - - dnl Check for SQLConnect in -liodbc -- smart_try_dir="$iodbc_lib_dir /usr/lib /usr/lib/iodbc /usr/local/lib/iodbc /usr/local/iodbc/lib/iodbc" -+ smart_try_dir="$iodbc_lib_dir" - FR_SMART_CHECK_LIB(iodbc, SQLConnect) - if test "x$ac_cv_lib_iodbc_SQLConnect" != xyes; then - fail="$fail libiodbc" - fi - - dnl Check for isql.h -- smart_try_dir="$iodbc_include_dir /usr/include /usr/include/iodbc /usr/local/iodbc/include" -+ smart_try_dir="$iodbc_include_dir" - FR_SMART_CHECK_INCLUDE(isql.h) - if test "x$ac_cv_header_isql_h" != xyes; then - fail="$fail isql.h" -diff --git a/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.ac -index 1401677..2e7db44 100644 ---- a/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.ac -+++ b/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.ac -@@ -136,7 +136,7 @@ if test x$with_[]modname != xno; then - - dnl # Check for libmysqlclient_r - if test "x$have_a_libmysqlclient" != "xyes"; then -- smart_try_dir="$mysql_lib_dir /usr/lib /usr/lib/mysql /usr/local/lib/mysql /usr/local/mysql/lib/mysql" -+ smart_try_dir="$mysql_lib_dir" - FR_SMART_CHECK_LIB(mysqlclient_r, mysql_init) - if test "x$ac_cv_lib_mysqlclient_r_mysql_init" = "xyes"; then - have_a_libmysqlclient='yes' -@@ -145,7 +145,7 @@ if test x$with_[]modname != xno; then - - dnl # Check for libmysqlclient - if test "x$have_a_libmysqlclient" != "xyes"; then -- smart_try_dir="$mysql_lib_dir /usr/lib /usr/lib/mysql /usr/local/lib/mysql /usr/local/mysql/lib/mysql" -+ smart_try_dir="$mysql_lib_dir" - FR_SMART_CHECK_LIB(mysqlclient, mysql_init) - if test "x$ac_cv_lib_mysqlclient_mysql_init" = "xyes"; then - have_a_libmysqlclient='yes' -@@ -189,7 +189,7 @@ if test x$with_[]modname != xno; then - fi - - if test "x$have_mysql_h" != "xyes"; then -- smart_try_dir="$mysql_include_dir /usr/local/include /usr/local/mysql/include" -+ smart_try_dir="$mysql_include_dir" - FR_SMART_CHECK_INCLUDE(mysql/mysql.h) - if test "x$ac_cv_header_mysql_mysql_h" = "xyes"; then - AC_DEFINE(HAVE_MYSQL_MYSQL_H, [], [Define if you have <mysql/mysql.h>]) -diff --git a/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.ac -index 3178462..5cbc8c2 100644 ---- a/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.ac -+++ b/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.ac -@@ -63,7 +63,7 @@ if test x$with_[]modname != xno; then - dnl # Check for header files - dnl ############################################################ - -- smart_try_dir="$oracle_include_dir /usr/local/instaclient/include" -+ smart_try_dir="$oracle_include_dir" - - if test "x$ORACLE_HOME" != "x"; then - smart_try_dir="${smart_try_dir} ${ORACLE_HOME}/include" -diff --git a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac -index 4f9a890..e1cf811 100644 ---- a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac -+++ b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac -@@ -41,7 +41,7 @@ if test x$with_[]modname != xno; then - esac ] - ) - -- smart_try_dir="$rlm_sql_postgresql_include_dir /usr/include/postgresql /usr/local/pgsql/include /usr/include/pgsql" -+ smart_try_dir="$rlm_sql_postgresql_include_dir" - FR_SMART_CHECK_INCLUDE(libpq-fe.h) - if test "x$ac_cv_header_libpqmfe_h" != "xyes"; then - fail="$fail libpq-fe.h" -@@ -76,7 +76,7 @@ if test x$with_[]modname != xno; then - ]) - fi - -- smart_try_dir="$rlm_sql_postgresql_lib_dir /usr/lib /usr/local/pgsql/lib" -+ smart_try_dir="$rlm_sql_postgresql_lib_dir" - FR_SMART_CHECK_LIB(pq, PQconnectdb) - if test "x$ac_cv_lib_pq_PQconnectdb" != "xyes"; then - fail="$fail libpq" -diff --git a/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure.ac -index 3545387..c543ed4 100644 ---- a/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure.ac -+++ b/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure.ac -@@ -57,14 +57,14 @@ if test x$with_[]modname != xno; then - esac]) - - dnl Check for SQLConnect in -lodbc -- smart_try_dir="$unixodbc_lib_dir /usr/local/unixodbc/lib" -+ smart_try_dir="$unixodbc_lib_dir" - FR_SMART_CHECK_LIB(odbc, SQLConnect) - if test "x$ac_cv_lib_odbc_SQLConnect" != xyes; then - fail="$fail libodbc" - fi - - dnl Check for sql.h -- smart_try_dir="$unixodbc_include_dir /usr/local/unixodbc/include" -+ smart_try_dir="$unixodbc_include_dir" - FR_SMART_CHECK_INCLUDE(sql.h) - if test "x$ac_cv_header_sql_h" != xyes; then - fail="$fail sql.h" --- -1.9.1 - diff --git a/meta-networking/recipes-connectivity/freeradius/files/freeradius-configure.ac-allow-cross-compilation.patch b/meta-networking/recipes-connectivity/freeradius/files/freeradius-configure.ac-allow-cross-compilation.patch deleted file mode 100644 index 30497a6029..0000000000 --- a/meta-networking/recipes-connectivity/freeradius/files/freeradius-configure.ac-allow-cross-compilation.patch +++ /dev/null @@ -1,31 +0,0 @@ -Subject: [PATCH] configure.ac: allow cross-compilation - -The checking OpenSSL library and header version consistency will -always fail in cross compiling, skip the check and give a warning -instead for cross compiling. - -Upstream-Status: Inappropriate[embedded specific] - -Signed-off-by: Jackie Huang <jackie.huang@windriver.com> -Signed-off-by: Yi Zhao <yi.zhao@windriver.com> ---- - src/modules/rlm_krb5/configure.ac | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/modules/rlm_krb5/configure.ac b/src/modules/rlm_krb5/configure.ac -index eb43534..113a079 100644 ---- a/src/modules/rlm_krb5/configure.ac -+++ b/src/modules/rlm_krb5/configure.ac -@@ -137,7 +137,8 @@ if test x$with_[]modname != xno; then - FR_SMART_CHECK_LIB(krb5, krb5_is_thread_safe) - if test "x$ac_cv_lib_krb5_krb5_is_thread_safe" == xyes; then - AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <krb5.h>]], [[return krb5_is_thread_safe() ? 0 : 1]])], -- [krb5threadsafe="-DKRB5_IS_THREAD_SAFE"], [AC_MSG_WARN([[libkrb5 is not threadsafe]])]) -+ [krb5threadsafe="-DKRB5_IS_THREAD_SAFE"], [AC_MSG_WARN([[libkrb5 is not threadsafe]])], -+ [AC_MSG_WARN(cross compiling: not checking)]) - fi - else - krb5threadsafe="" --- -2.10.2 - diff --git a/meta-networking/recipes-connectivity/freeradius/files/freeradius-fix-issues-related-to-m4-include-path.patch b/meta-networking/recipes-connectivity/freeradius/files/freeradius-fix-issues-related-to-m4-include-path.patch deleted file mode 100644 index d29b2ac39d..0000000000 --- a/meta-networking/recipes-connectivity/freeradius/files/freeradius-fix-issues-related-to-m4-include-path.patch +++ /dev/null @@ -1,236 +0,0 @@ -From d8e251ef97869ab2c1c82bd374016f402083997c Mon Sep 17 00:00:00 2001 -From: Jorge Pereira <jpereiran@gmail.com> -Date: Mon, 7 Dec 2015 16:51:07 -0200 -Subject: [PATCH] Fixing issues related to m4 include path - -Upstream-Status: Submitted [1] - -[1]: https://github.com/FreeRADIUS/freeradius-server/pull/1428 - -Submmited by: Jorge Pereira <jpereiran@gmail.com> ---- - src/modules/rlm_example/config.h.in | 39 ++-------------------- - src/modules/rlm_ldap/configure | 2 +- - src/modules/rlm_pam/config.h.in | 3 ++ - src/modules/rlm_perl/config.h.in | 3 ++ - src/modules/rlm_perl/configure.ac | 2 +- - src/modules/rlm_radutmp/config.h.in | 3 ++ - src/modules/rlm_ruby/configure | 1 + - src/modules/rlm_ruby/configure.ac | 9 ++--- - src/modules/rlm_smsotp/config.h.in | 3 ++ - .../rlm_sql/drivers/rlm_sql_mysql/config.h.in | 3 ++ - src/modules/rlm_unix/config.h.in | 6 ++++ - 11 files changed, 32 insertions(+), 42 deletions(-) - -diff --git a/src/modules/rlm_example/config.h.in b/src/modules/rlm_example/config.h.in -index 2a81ef5..f80de9c 100644 ---- a/src/modules/rlm_example/config.h.in -+++ b/src/modules/rlm_example/config.h.in -@@ -1,38 +1,5 @@ - /* config.h.in. Generated from configure.ac by autoheader. */ - --/* Define to 1 if you have the <inttypes.h> header file. */ --#undef HAVE_INTTYPES_H -- --/* Define to 1 if you have the <memory.h> header file. */ --#undef HAVE_MEMORY_H -- --/* Define to 1 if you have the `printf' function. */ --#undef HAVE_PRINTF -- --/* Define to 1 if you have the <stdint.h> header file. */ --#undef HAVE_STDINT_H -- --/* Define to 1 if you have the <stdio.h> header file. */ --#undef HAVE_STDIO_H -- --/* Define to 1 if you have the <stdlib.h> header file. */ --#undef HAVE_STDLIB_H -- --/* Define to 1 if you have the <strings.h> header file. */ --#undef HAVE_STRINGS_H -- --/* Define to 1 if you have the <string.h> header file. */ --#undef HAVE_STRING_H -- --/* Define to 1 if you have the <sys/stat.h> header file. */ --#undef HAVE_SYS_STAT_H -- --/* Define to 1 if you have the <sys/types.h> header file. */ --#undef HAVE_SYS_TYPES_H -- --/* Define to 1 if you have the <unistd.h> header file. */ --#undef HAVE_UNISTD_H -- - /* Define to the address where bug reports for this package should be sent. */ - #undef PACKAGE_BUGREPORT - -@@ -45,8 +12,8 @@ - /* Define to the one symbol short name of this package. */ - #undef PACKAGE_TARNAME - -+/* Define to the home page for this package. */ -+#undef PACKAGE_URL -+ - /* Define to the version of this package. */ - #undef PACKAGE_VERSION -- --/* Define to 1 if you have the ANSI C header files. */ --#undef STDC_HEADERS -diff --git a/src/modules/rlm_ldap/configure b/src/modules/rlm_ldap/configure -index e0c15d9..cdf96d5 100755 ---- a/src/modules/rlm_ldap/configure -+++ b/src/modules/rlm_ldap/configure -@@ -3992,7 +3992,7 @@ smart_prefix= - $as_echo "#define WITH_SASL 1" >>confdefs.h - - SASL=sasl.c -- fi -+ fi - fi - - targetname=rlm_ldap -diff --git a/src/modules/rlm_pam/config.h.in b/src/modules/rlm_pam/config.h.in -index 32ef6ff..1ad20c5 100644 ---- a/src/modules/rlm_pam/config.h.in -+++ b/src/modules/rlm_pam/config.h.in -@@ -45,6 +45,9 @@ - /* Define to the one symbol short name of this package. */ - #undef PACKAGE_TARNAME - -+/* Define to the home page for this package. */ -+#undef PACKAGE_URL -+ - /* Define to the version of this package. */ - #undef PACKAGE_VERSION - -diff --git a/src/modules/rlm_perl/config.h.in b/src/modules/rlm_perl/config.h.in -index 989ed53..f80de9c 100644 ---- a/src/modules/rlm_perl/config.h.in -+++ b/src/modules/rlm_perl/config.h.in -@@ -12,5 +12,8 @@ - /* Define to the one symbol short name of this package. */ - #undef PACKAGE_TARNAME - -+/* Define to the home page for this package. */ -+#undef PACKAGE_URL -+ - /* Define to the version of this package. */ - #undef PACKAGE_VERSION -diff --git a/src/modules/rlm_perl/configure.ac b/src/modules/rlm_perl/configure.ac -index 44c5fc9..6b2a043 100644 ---- a/src/modules/rlm_perl/configure.ac -+++ b/src/modules/rlm_perl/configure.ac -@@ -3,7 +3,7 @@ AC_INIT(rlm_perl.c) - AC_REVISION($Revision$) - AC_DEFUN(modname,[rlm_perl]) - --m4_include([ax_with_prog.m4]) -+m4_include([m4/ax_with_prog.m4]) - - if test x$with_[]modname != xno; then - AC_PROG_CC -diff --git a/src/modules/rlm_radutmp/config.h.in b/src/modules/rlm_radutmp/config.h.in -index 9a883cc..750b434 100644 ---- a/src/modules/rlm_radutmp/config.h.in -+++ b/src/modules/rlm_radutmp/config.h.in -@@ -42,6 +42,9 @@ - /* Define to the one symbol short name of this package. */ - #undef PACKAGE_TARNAME - -+/* Define to the home page for this package. */ -+#undef PACKAGE_URL -+ - /* Define to the version of this package. */ - #undef PACKAGE_VERSION - -diff --git a/src/modules/rlm_ruby/configure b/src/modules/rlm_ruby/configure -index 15868ab..c728af2 100755 ---- a/src/modules/rlm_ruby/configure -+++ b/src/modules/rlm_ruby/configure -@@ -1875,6 +1875,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - -+ - # =========================================================================== - # http://www.gnu.org/software/autoconf-archive/ax_compare_version.html - # =========================================================================== -diff --git a/src/modules/rlm_ruby/configure.ac b/src/modules/rlm_ruby/configure.ac -index 9306382..f1c8118 100644 ---- a/src/modules/rlm_ruby/configure.ac -+++ b/src/modules/rlm_ruby/configure.ac -@@ -3,15 +3,16 @@ AC_INIT(rlm_ruby.c) - AC_REVISION($Revision: 1.9 $) - AC_DEFUN(modname,[rlm_ruby]) - --m4_include([ax_with_prog.m4]) -+m4_include([m4/ax_with_prog.m4]) - - AC_DEFUN([AX_WITH_RUBY],[ - AX_WITH_PROG([RUBY],[ruby],[not-found],[${PATH}:/usr/bin:/usr/local/bin]) - ]) - --m4_include([ax_compare_version.m4]) --m4_include([ax_prog_ruby_version.m4]) --m4_include([ax_ruby_devel.m4]) -+ -+m4_include([m4/ax_compare_version.m4]) -+m4_include([m4/ax_prog_ruby_version.m4]) -+m4_include([m4/ax_ruby_devel.m4]) - - targetname=modname - mod_cflags= -diff --git a/src/modules/rlm_smsotp/config.h.in b/src/modules/rlm_smsotp/config.h.in -index 5feaf91..9e69f85 100644 ---- a/src/modules/rlm_smsotp/config.h.in -+++ b/src/modules/rlm_smsotp/config.h.in -@@ -42,6 +42,9 @@ - /* Define to the one symbol short name of this package. */ - #undef PACKAGE_TARNAME - -+/* Define to the home page for this package. */ -+#undef PACKAGE_URL -+ - /* Define to the version of this package. */ - #undef PACKAGE_VERSION - -diff --git a/src/modules/rlm_sql/drivers/rlm_sql_mysql/config.h.in b/src/modules/rlm_sql/drivers/rlm_sql_mysql/config.h.in -index e03d1a9..6262c48 100644 ---- a/src/modules/rlm_sql/drivers/rlm_sql_mysql/config.h.in -+++ b/src/modules/rlm_sql/drivers/rlm_sql_mysql/config.h.in -@@ -18,5 +18,8 @@ - /* Define to the one symbol short name of this package. */ - #undef PACKAGE_TARNAME - -+/* Define to the home page for this package. */ -+#undef PACKAGE_URL -+ - /* Define to the version of this package. */ - #undef PACKAGE_VERSION -diff --git a/src/modules/rlm_unix/config.h.in b/src/modules/rlm_unix/config.h.in -index dcb9aa2..70b4680 100644 ---- a/src/modules/rlm_unix/config.h.in -+++ b/src/modules/rlm_unix/config.h.in -@@ -1,5 +1,8 @@ - /* config.h.in. Generated from configure.ac by autoheader. */ - -+/* Define to 1 if you have the `getpwnam' function. */ -+#undef HAVE_GETPWNAM -+ - /* Define to 1 if you have the `getspnam' function. */ - #undef HAVE_GETSPNAM - -@@ -54,6 +57,9 @@ - /* Define to the one symbol short name of this package. */ - #undef PACKAGE_TARNAME - -+/* Define to the home page for this package. */ -+#undef PACKAGE_URL -+ - /* Define to the version of this package. */ - #undef PACKAGE_VERSION - --- -2.3.5 - diff --git a/meta-networking/recipes-connectivity/freeradius/files/radiusd-volatiles.conf b/meta-networking/recipes-connectivity/freeradius/files/radiusd-volatiles.conf index fa62962975..f3619dddb6 100644 --- a/meta-networking/recipes-connectivity/freeradius/files/radiusd-volatiles.conf +++ b/meta-networking/recipes-connectivity/freeradius/files/radiusd-volatiles.conf @@ -1,2 +1,2 @@ d /var/log/radius 0755 radiusd radiusd - -d /var/run/radiusd 0755 radiusd radiusd - +d /run/radiusd 0755 radiusd radiusd - diff --git a/meta-networking/recipes-connectivity/freeradius/files/radiusd.service b/meta-networking/recipes-connectivity/freeradius/files/radiusd.service index 899c4e4955..7969bfb690 100644 --- a/meta-networking/recipes-connectivity/freeradius/files/radiusd.service +++ b/meta-networking/recipes-connectivity/freeradius/files/radiusd.service @@ -4,11 +4,11 @@ After=syslog.target network.target [Service] Type=forking -PIDFile=@STATEDIR@/run/radiusd/radiusd.pid -ExecStartPre=-@BASE_BINDIR@/chown -R radiusd.radiusd @STATEDIR@/run/radiusd -ExecStartPre=-@BASE_BINDIR@/sh -c "if [ ! -f @SYSCONFDIR@/raddb/certs/server.pem ]; then sudo -u radiusd @SYSCONFDIR@/raddb/certs/bootstrap; fi" +EnvironmentFile=-/etc/sysconfig/radiusd +PIDFile=/run/radiusd/radiusd.pid +ExecStartPre=-@BASE_BINDIR@/chown -R radiusd:radiusd /run/radiusd ExecStartPre=@SBINDIR@/radiusd -C -ExecStart=@SBINDIR@/radiusd -d @SYSCONFDIR@/raddb +ExecStart=@SBINDIR@/radiusd -d @SYSCONFDIR@/${MLPREFIX}raddb ExecReload=@SBINDIR@/radiusd -C ExecReload=@BASE_BINDIR@/kill -HUP $MAINPID diff --git a/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.15.bb b/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.15.bb deleted file mode 100644 index 4155a4059e..0000000000 --- a/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.15.bb +++ /dev/null @@ -1,222 +0,0 @@ -DESCRIPTION = "FreeRADIUS is an Internet authentication daemon, which implements the RADIUS \ -protocol, as defined in RFC 2865 (and others). It allows Network Access \ -Servers (NAS boxes) to perform authentication for dial-up users. There are \ -also RADIUS clients available for Web servers, firewalls, Unix logins, and \ -more. Using RADIUS allows authentication and authorization for a network to \ -be centralized, and minimizes the amount of re-configuration which has to be \ -done when adding or deleting new users." - -SUMMARY = "High-performance and highly configurable RADIUS server" -HOMEPAGE = "http://www.freeradius.org/" -SECTION = "System/Servers" -LICENSE = "GPLv2 & LGPLv2+" -LIC_FILES_CHKSUM = "file://LICENSE;md5=eb723b61539feef013de476e68b5c50a" -DEPENDS = "openssl-native openssl libidn libtool libpcap libtalloc" - -SRC_URI = "ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-${PV}.tar.bz2 \ - file://freeradius \ - file://volatiles.58_radiusd \ - file://freeradius-enble-user-in-conf.patch \ - file://freeradius-configure.ac-allow-cross-compilation.patch \ - file://freeradius-fix-issues-related-to-m4-include-path.patch \ - file://freeradius-libtool-detection.patch \ - file://freeradius-configure.ac-add-option-for-libcap.patch \ - file://freeradius-avoid-searching-host-dirs.patch \ - file://freeradius-rlm_python-add-PY_INC_DIR.patch \ - file://freeradius-libtool-do-not-use-jlibtool.patch \ - file://freeradius-fix-quoting-for-BUILT_WITH.patch \ - file://freeradius-fix-error-for-expansion-of-macro.patch \ - file://0001-rlm_mschap-Use-includedir-instead-of-hardcoding-usr-.patch \ - file://radiusd.service \ - file://radiusd-volatiles.conf \ -" -SRC_URI[md5sum] = "0c81a4464ccf1d04f7ef1218a029d37a" -SRC_URI[sha256sum] = "23267d8505e7b2909f5bdbf3938ca077c1fe122290dc969304d4f3b594f7e3ba" - -PARALLEL_MAKE = "" - -S = "${WORKDIR}/freeradius-server-${PV}" - -EXTRA_OECONF = " --enable-strict-dependencies \ - --with-docdir=${docdir}/freeradius-${PV} \ - --with-openssl-includes=${STAGING_INCDIR} \ - --with-openssl-libraries=${STAGING_LIBDIR} \ - --without-rlm_ippool \ - --without-rlm_cache_memcached \ - --without-rlm_counter \ - --without-rlm_couchbase \ - --without-rlm_dbm \ - --without-rlm_eap_tnc \ - --without-rlm_eap_ikev2 \ - --without-rlm_opendirectory \ - --without-rlm_redis \ - --without-rlm_rediswho \ - --without-rlm_sql_db2 \ - --without-rlm_sql_firebird \ - --without-rlm_sql_freetds \ - --without-rlm_sql_iodbc \ - --without-rlm_sql_oracle \ - --without-rlm_sql_sybase \ - --without-rlm_sqlhpwippool \ - ac_cv_path_PERL=${bindir}/perl \ - ax_cv_cc_builtin_choose_expr=no \ - ax_cv_cc_builtin_types_compatible_p=no \ - ax_cv_cc_builtin_bswap64=no \ - ax_cv_cc_bounded_attribute=no \ -" - -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ - pcre libcap \ -" - -PACKAGECONFIG[krb5] = "--with-rlm_krb5,--without-rlm_krb5,krb5" -PACKAGECONFIG[pam] = "--with-rlm_pam,--without-rlm_pam,libpam" -PACKAGECONFIG[libcap] = "--with-libcap,--without-libcap,libcap" -PACKAGECONFIG[ldap] = "--with-rlm_ldap,--without-rlm_ldap,openldap" -PACKAGECONFIG[mysql] = "--with-rlm_sql_mysql,--without-rlm_sql_mysql,mysql5" -PACKAGECONFIG[sqlite] = "--with-rlm_sql_sqlite,--without-rlm_sql_sqlite,sqlite3" -PACKAGECONFIG[unixodbc] = "--with-rlm_sql_unixodbc,--without-rlm_sql_unixodbc,unixodbc" -PACKAGECONFIG[postgresql] = "--with-rlm_sql_postgresql,--without-rlm_sql_postgresql,postgresql" -PACKAGECONFIG[pcre] = "--with-pcre,--without-pcre,libpcre" -PACKAGECONFIG[perl] = "--with-perl=${STAGING_BINDIR_NATIVE}/perl-native/perl --with-rlm_perl,--without-rlm_perl,perl-native perl,perl" -PACKAGECONFIG[python] = "--with-rlm_python --with-rlm-python-bin=${STAGING_BINDIR_NATIVE}/python-native/python --with-rlm-python-include-dir=${STAGING_INCDIR}/${PYTHON_DIR},--without-rlm_python,python-native python" -PACKAGECONFIG[rest] = "--with-rlm_rest,--without-rlm_rest,curl json-c" -PACKAGECONFIG[ruby] = "--with-rlm_ruby,--without-rlm_ruby,ruby" - -inherit useradd autotools-brokensep update-rc.d systemd - -# This is not a cpan or python based package, but it needs some definitions -# from cpan-base and python-dir bbclasses for building rlm_perl and rlm_python -# correctly. -inherit cpan-base python-dir - -# The modules subdirs also need to be processed by autoreconf. Use autogen.sh -# in order to handle the subdirs correctly. -do_configure () { - ./autogen.sh - - # the configure of rlm_perl needs this to get correct - # mod_cflags and mod_ldflags - if ${@bb.utils.contains('PACKAGECONFIG', 'perl', 'true', 'false', d)}; then - export PERL5LIB="${STAGING_LIBDIR}${PERL_OWN_DIR}/perl/${@get_perl_version(d)}" - fi - - oe_runconf - - # we don't need dhcpclient - sed -i -e 's/dhcpclient.mk//' ${S}/src/modules/proto_dhcp/all.mk -} - -INITSCRIPT_NAME = "radiusd" - -SYSTEMD_SERVICE_${PN} = "radiusd.service" - -USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--system --no-create-home --shell /bin/false --user-group radiusd" - -do_install() { - rm -rf ${D} - mkdir -p ${D}/${sysconfdir}/logrotate.d - mkdir -p ${D}/${sysconfdir}/pam.d - mkdir -p ${D}/${sysconfdir}/init.d - mkdir -p ${D}/${localstatedir}/lib/radiusd - mkdir -p ${D}${sysconfdir}/default/volatiles - - export LD_LIBRARY_PATH=${D}/${libdir} - oe_runmake install R=${D} INSTALLSTRIP="" - - # remove unsupported config files - rm -f ${D}/${sysconfdir}/raddb/experimental.conf - - # remove scripts that required Perl(DBI) - rm -rf ${D}/${bindir}/radsqlrelay - - cp -f ${WORKDIR}/freeradius ${D}/etc/init.d/radiusd - rm -f ${D}/${sbindir}/rc.radiusd - chmod +x ${D}/${sysconfdir}/init.d/radiusd - rm -rf ${D}/${localstatedir}/run/ - install -m 0644 ${WORKDIR}/volatiles.58_radiusd ${D}${sysconfdir}/default/volatiles/58_radiusd - - chown -R radiusd:radiusd ${D}/${sysconfdir}/raddb/ - chown -R radiusd:radiusd ${D}/${localstatedir}/lib/radiusd - - # For systemd - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/radiusd.service ${D}${systemd_unitdir}/system - sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ - -e 's,@SBINDIR@,${sbindir},g' \ - -e 's,@STATEDIR@,${localstatedir},g' \ - -e 's,@SYSCONFDIR@,${sysconfdir},g' \ - ${D}${systemd_unitdir}/system/radiusd.service - - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -d ${D}${sysconfdir}/tmpfiles.d/ - install -m 0644 ${WORKDIR}/radiusd-volatiles.conf ${D}${sysconfdir}/tmpfiles.d/ - fi -} - -# This is only needed when we install/update on a running target. -# -pkg_postinst_${PN} () { - if [ -z "$D" ]; then - if command -v systemd-tmpfiles >/dev/null; then - # create /var/log/radius, /var/run/radiusd - systemd-tmpfiles --create ${sysconfdir}/tmpfiles.d/radiusd-volatiles.conf - elif [ -e ${sysconfdir}/init.d/populate-volatile.sh ]; then - ${sysconfdir}/init.d/populate-volatile.sh update - fi - - # Fix ownership for /etc/raddb/*, /var/lib/radiusd - chown -R radiusd:radiusd ${sysconfdir}/raddb - chown -R radiusd:radiusd ${localstatedir}/lib/radiusd - fi -} - -# We really need the symlink :( -INSANE_SKIP_${PN} = "dev-so" -INSANE_SKIP_${PN}-krb5 = "dev-so" -INSANE_SKIP_${PN}-ldap = "dev-so" -INSANE_SKIP_${PN}-mysql = "dev-so" -INSANE_SKIP_${PN}-perl = "dev-so" -INSANE_SKIP_${PN}-postgresql = "dev-so" -INSANE_SKIP_${PN}-python = "dev-so" -INSANE_SKIP_${PN}-unixodbc = "dev-so" - -PACKAGES =+ "${PN}-utils ${PN}-ldap ${PN}-krb5 ${PN}-perl \ - ${PN}-python ${PN}-mysql ${PN}-postgresql ${PN}-unixodbc" - -FILES_${PN}-utils = "${bindir}/*" - -FILES_${PN}-ldap = "${libdir}/rlm_ldap.so* \ - ${sysconfdir}/raddb/mods-available/ldap \ -" - -FILES_${PN}-krb5 = "${libdir}/rlm_krb5.so* \ - ${sysconfdir}/raddb/mods-available/krb5 \ -" - -FILES_${PN}-perl = "${libdir}/rlm_perl.so* \ - ${sysconfdir}/raddb/mods-config/perl \ - ${sysconfdir}/raddb/mods-available/perl \ -" - -FILES_${PN}-python = "${libdir}/rlm_python.so* \ - ${sysconfdir}/raddb/mods-config/python \ - ${sysconfdir}/raddb/mods-available/python \ -" - -FILES_${PN}-mysql = "${libdir}/rlm_sql_mysql.so* \ - ${sysconfdir}/raddb/mods-config/sql/*/mysql \ - ${sysconfdir}/raddb/mods-available/sql \ -" - -FILES_${PN}-postgresql = "${libdir}/rlm_sql_postgresql.so* \ - ${sysconfdir}/raddb/mods-config/sql/*/postgresql \ -" - -FILES_${PN}-unixodbc = "${libdir}/rlm_sql_unixodbc.so*" - -FILES_${PN} =+ "${libdir}/rlm_*.so* ${libdir}/proto_*so*" - -RDEPENDS_${PN} += "perl" -RDEPENDS_${PN}-utils = "${PN}" diff --git a/meta-networking/recipes-connectivity/freeradius/freeradius_3.2.3.bb b/meta-networking/recipes-connectivity/freeradius/freeradius_3.2.3.bb new file mode 100644 index 0000000000..8397380c1d --- /dev/null +++ b/meta-networking/recipes-connectivity/freeradius/freeradius_3.2.3.bb @@ -0,0 +1,298 @@ +DESCRIPTION = "FreeRADIUS is an Internet authentication daemon, which implements the RADIUS \ +protocol, as defined in RFC 2865 (and others). It allows Network Access \ +Servers (NAS boxes) to perform authentication for dial-up users. There are \ +also RADIUS clients available for Web servers, firewalls, Unix logins, and \ +more. Using RADIUS allows authentication and authorization for a network to \ +be centralized, and minimizes the amount of re-configuration which has to be \ +done when adding or deleting new users." + +SUMMARY = "High-performance and highly configurable RADIUS server" +HOMEPAGE = "http://www.freeradius.org/" +SECTION = "System/Servers" +LICENSE = "GPL-2.0-only & LGPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://LICENSE;md5=eb723b61539feef013de476e68b5c50a" +DEPENDS = "openssl-native openssl libidn libtool libpcap libtalloc" + +SRC_URI = "git://github.com/FreeRADIUS/freeradius-server.git;branch=v3.2.x;lfs=0;;protocol=https \ + file://freeradius \ + file://volatiles.58_radiusd \ + file://radiusd.service \ + file://radiusd-volatiles.conf \ + file://0001-Add-autogen.sh.patch \ + file://0002-Enable-and-change-user-and-group-of-freeradius-serve.patch \ + file://0003-configure.ac-allow-cross-compilation.patch \ + file://0004-Fix-libtool-detection.patch \ + file://0005-configure.ac-add-option-for-libcap.patch \ + file://0006-Avoid-searching-host-dirs.patch \ + file://0007-rlm_python-add-PY_INC_DIR-in-search-dir.patch \ + file://0008-libtool-do-not-use-jlibtool.patch \ + file://0009-Fix-quoting-for-BUILD_WITH.patch \ + file://0010-fix-error-for-expansion-of-macro-in-thread.h.patch \ + file://0011-rlm_mschap-Use-includedir-instead-of-hardcoding-usr-.patch \ + file://0012-raddb-certs-Makefile-fix-the-existed-certificate-err.patch \ + file://0013-raddb-certs-Makefile-fix-the-occasional-verification.patch \ + file://0014-Workaround-error-with-autoconf-2.7.patch \ + file://0015-bootstrap-check-commands-of-openssl-exist.patch \ + file://0016-version.c-don-t-print-build-flags.patch \ + file://0017-Add-acinclude.m4-to-include-required-macros.patch \ +" + +raddbdir = "${sysconfdir}/${MLPREFIX}raddb" + +SRCREV = "db3d1924d9a2e8d37c43872932621f69cfdbb099" + +UPSTREAM_CHECK_GITTAGREGEX = "release_(?P<pver>\d+(\_\d+)+)" + +CVE_STATUS[CVE-2002-0318] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions." +CVE_STATUS[CVE-2011-4966] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions." + +PARALLEL_MAKE = "" + +S = "${WORKDIR}/git" + +LDFLAGS:append:powerpc = " -latomic" +LDFLAGS:append:mipsarch = " -latomic" +LDFLAGS:append:armv5 = " -latomic" + +EXTRA_OECONF = " --enable-strict-dependencies \ + --with-docdir=${docdir}/freeradius-${PV} \ + --with-openssl-includes=${STAGING_INCDIR} \ + --with-openssl-libraries=${STAGING_LIBDIR} \ + --with-raddbdir=${raddbdir} \ + --without-rlm_ippool \ + --without-rlm_cache_memcached \ + --without-rlm_counter \ + --without-rlm_couchbase \ + --without-rlm_dbm \ + --without-rlm_eap_tnc \ + --without-rlm_eap_ikev2 \ + --without-rlm_opendirectory \ + --without-rlm_redis \ + --without-rlm_rediswho \ + --without-rlm_cache_redis \ + --without-rlm_sql_db2 \ + --without-rlm_sql_firebird \ + --without-rlm_sql_freetds \ + --without-rlm_sql_iodbc \ + --without-rlm_sql_oracle \ + --without-rlm_sql_sybase \ + --without-rlm_sql_mongo \ + --without-rlm_sqlhpwippool \ + --without-rlm_securid \ + --without-rlm_unbound \ + --without-rlm_python \ + ac_cv_path_PERL=${bindir}/perl \ + ax_cv_cc_builtin_choose_expr=no \ + ax_cv_cc_builtin_types_compatible_p=no \ + ax_cv_cc_builtin_bswap64=no \ + ax_cv_cc_bounded_attribute=no \ +" + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ + pcre libcap \ + openssl rlm-eap-fast rlm-eap-pwd \ +" + +PACKAGECONFIG[krb5] = "--with-rlm_krb5,--without-rlm_krb5,krb5" +PACKAGECONFIG[pam] = "--with-rlm_pam,--without-rlm_pam,libpam" +PACKAGECONFIG[libcap] = "--with-libcap,--without-libcap,libcap" +PACKAGECONFIG[ldap] = "--with-rlm_ldap,--without-rlm_ldap,openldap" +PACKAGECONFIG[mysql] = "--with-rlm_sql_mysql,--without-rlm_sql_mysql,mysql5" +PACKAGECONFIG[sqlite] = "--with-rlm_sql_sqlite,--without-rlm_sql_sqlite,sqlite3" +PACKAGECONFIG[unixodbc] = "--with-rlm_sql_unixodbc,--without-rlm_sql_unixodbc,unixodbc" +PACKAGECONFIG[postgresql] = "--with-rlm_sql_postgresql,--without-rlm_sql_postgresql,postgresql" +PACKAGECONFIG[pcre] = "--with-pcre,--without-pcre,libpcre" +PACKAGECONFIG[perl] = "--with-perl=${STAGING_BINDIR_NATIVE}/perl-native/perl --with-rlm_perl,--without-rlm_perl,perl-native perl,perl" +PACKAGECONFIG[python3] = "--with-rlm_python3 --with-rlm-python3-bin=${STAGING_BINDIR_NATIVE}/python3-native/python3 --with-rlm-python3-include-dir=${STAGING_INCDIR}/${PYTHON_DIR},--without-rlm_python3,python3-native python3" +PACKAGECONFIG[rest] = "--with-rlm_rest,--without-rlm_rest --without-rlm_json,curl json-c" +PACKAGECONFIG[ruby] = "--with-rlm_ruby,--without-rlm_ruby,ruby" +PACKAGECONFIG[openssl] = "--with-openssl, --without-openssl" +PACKAGECONFIG[rlm-eap-fast] = "--with-rlm_eap_fast, --without-rlm_eap_fast" +PACKAGECONFIG[rlm-eap-pwd] = "--with-rlm_eap_pwd, --without-rlm_eap_pwd" + +inherit useradd autotools-brokensep update-rc.d systemd multilib_script multilib_header + +MULTILIB_SCRIPTS = "${PN}:${sbindir}/checkrad" + +# This is not a cpan or python based package, but it needs some definitions +# from cpan-base and python3-dir bbclasses for building rlm_perl and rlm_python +# correctly. +inherit cpan-base python3-dir + +# The modules subdirs also need to be processed by autoreconf. Use autogen.sh +# in order to handle the subdirs correctly. +do_configure() { + ./autogen.sh + + # the configure of rlm_perl needs this to get correct + # mod_cflags and mod_ldflags + if ${@bb.utils.contains('PACKAGECONFIG', 'perl', 'true', 'false', d)}; then + export PERL5LIB="${STAGING_LIBDIR}${PERL_OWN_DIR}/perl/${@get_perl_version(d)}" + fi + + oe_runconf + + # we don't need dhcpclient + sed -i -e 's/dhcpclient.mk//' ${S}/src/modules/proto_dhcp/all.mk +} + +INITSCRIPT_NAME = "radiusd" + +SYSTEMD_SERVICE:${PN} = "radiusd.service" + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM:${PN} = "--system --no-create-home --shell /bin/false --user-group radiusd" + +do_install() { + rm -rf ${D} + install -d ${D}/${sysconfdir}/logrotate.d + install -d ${D}/${sysconfdir}/pam.d + install -d ${D}/${localstatedir}/lib/radiusd + + export LD_LIBRARY_PATH=${D}/${libdir} + oe_runmake install R=${D} INSTALLSTRIP="" + + # remove unsupported config files + rm -f ${D}/${raddbdir}/experimental.conf + + # remove scripts that required Perl(DBI) + rm -rf ${D}/${bindir}/radsqlrelay + + rm -f ${D}/${sbindir}/rc.radiusd + rm -rf ${D}/${localstatedir}/run/ + rm -rf ${D}/${localstatedir}/log/ + + chown -R radiusd:radiusd ${D}/${raddbdir} + chown -R radiusd:radiusd ${D}/${localstatedir}/lib/radiusd + + # For sysvinit + if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then + install -d ${D}${sysconfdir}/init.d + install -d ${D}${sysconfdir}/default/volatiles + install -m 0755 ${UNPACKDIR}/freeradius ${D}/etc/init.d/radiusd + install -m 0644 ${UNPACKDIR}/volatiles.58_radiusd ${D}${sysconfdir}/default/volatiles/58_radiusd + fi + + # For systemd + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${UNPACKDIR}/radiusd.service ${D}${systemd_unitdir}/system + sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ + -e 's,@SBINDIR@,${sbindir},g' \ + -e 's,@STATEDIR@,${localstatedir},g' \ + -e 's,@SYSCONFDIR@,${sysconfdir},g' \ + ${D}${systemd_unitdir}/system/radiusd.service + + install -d ${D}${sysconfdir}/tmpfiles.d/ + install -m 0644 ${UNPACKDIR}/radiusd-volatiles.conf ${D}${sysconfdir}/tmpfiles.d/radiusd.conf + fi + + oe_multilib_header freeradius/autoconf.h + oe_multilib_header freeradius/missing.h + oe_multilib_header freeradius/radpaths.h +} + +# This is only needed when we install/update on a running target. +# +pkg_postinst:${PN} () { + if [ -z "$D" ]; then + if command -v systemd-tmpfiles >/dev/null; then + # create /var/log/radius, /var/run/radiusd + systemd-tmpfiles --create ${sysconfdir}/tmpfiles.d/radiusd.conf + elif [ -e ${sysconfdir}/init.d/populate-volatile.sh ]; then + ${sysconfdir}/init.d/populate-volatile.sh update + fi + + # Fix ownership for /etc/raddb/*, /var/lib/radiusd + chown -R radiusd:radiusd ${raddbdir} + chown -R radiusd:radiusd ${localstatedir}/lib/radiusd + + # for radiusd.service with multilib + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${sysconfdir}/sysconfig + echo "MLPREFIX=${MLPREFIX}" > ${sysconfdir}/sysconfig/radiusd + fi + else + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d $D${sysconfdir}/sysconfig + echo "MLPREFIX=${MLPREFIX}" > $D${sysconfdir}/sysconfig/radiusd + fi + fi +} + +pkg_postrm:${PN} () { + # only try to remove ${sysconfdir}/sysconfig/radiusd for systemd + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'false', 'true', d)}; then + exit 0 + fi + + if [ -d ${sysconfdir}/raddb ]; then + exit 0 + fi + for variant in ${MULTILIB_GLOBAL_VARIANTS}; do + if [ -d ${sysconfdir}/${variant}-raddb ]; then + exit 0 + fi + done + + rm -f ${sysconfdir}/sysconfig/radiusd + rmdir --ignore-fail-on-non-empty ${sysconfdir}/sysconfig +} + +# We really need the symlink :( +INSANE_SKIP:${PN} = "dev-so" +INSANE_SKIP:${PN}-krb5 = "dev-so" +INSANE_SKIP:${PN}-ldap = "dev-so" +INSANE_SKIP:${PN}-mysql = "dev-so" +INSANE_SKIP:${PN}-perl = "dev-so" +INSANE_SKIP:${PN}-postgresql = "dev-so" +INSANE_SKIP:${PN}-python = "dev-so" +INSANE_SKIP:${PN}-unixodbc = "dev-so" + +PACKAGES =+ "${PN}-utils ${PN}-ldap ${PN}-krb5 ${PN}-perl \ + ${PN}-python ${PN}-mysql ${PN}-postgresql ${PN}-unixodbc" + +FILES:${PN}-utils = "${bindir}/*" + +FILES:${PN}-ldap = "${libdir}/rlm_ldap.so* \ + ${raddbdir}/mods-available/ldap \ +" + +FILES:${PN}-krb5 = "${libdir}/rlm_krb5.so* \ + ${raddbdir}/mods-available/krb5 \ +" + +FILES:${PN}-perl = "${libdir}/rlm_perl.so* \ + ${raddbdir}/mods-config/perl \ + ${raddbdir}/mods-available/perl \ +" + +FILES:${PN}-python = "${libdir}/rlm_python3.so* \ + ${raddbdir}/mods-config/python3 \ + ${raddbdir}/mods-available/python3 \ +" + +FILES:${PN}-mysql = "${libdir}/rlm_sql_mysql.so* \ + ${raddbdir}/mods-config/sql/*/mysql \ + ${raddbdir}/mods-available/sql \ +" + +FILES:${PN}-postgresql = "${libdir}/rlm_sql_postgresql.so* \ + ${raddbdir}/mods-config/sql/*/postgresql \ +" + +FILES:${PN}-unixodbc = "${libdir}/rlm_sql_unixodbc.so*" + +FILES:${PN} =+ "${libdir}/rlm_*.so* ${libdir}/proto_*so*" + +RDEPENDS:${PN} += "perl" +RDEPENDS:${PN}-utils = "${PN} perl" +RDEPENDS:${PN}-krb5 = "${PN}" +RDEPENDS:${PN}-ldap = "${PN}" +RDEPENDS:${PN}-mysql = "${PN}" +RDEPENDS:${PN}-perl = "${PN}" +RDEPENDS:${PN}-postgresql = "${PN}" +RDEPENDS:${PN}-python = "${PN}" +RDEPENDS:${PN}-unixodbc = "${PN}" + +CLEANBROKEN = "1" diff --git a/meta-networking/recipes-connectivity/inetutils/inetutils/0001-rcp-fix-to-work-with-large-files.patch b/meta-networking/recipes-connectivity/inetutils/inetutils/0001-rcp-fix-to-work-with-large-files.patch deleted file mode 100644 index d4764f5867..0000000000 --- a/meta-networking/recipes-connectivity/inetutils/inetutils/0001-rcp-fix-to-work-with-large-files.patch +++ /dev/null @@ -1,31 +0,0 @@ -Upstream-Status: Pending - -Subject: rcp: fix to work with large files - -When we copy file by rcp command, if the file > 2GB, it will fail. -The cause is that it used incorrect data type on file size in sink() of rcp. - -Signed-off-by: Chen Qi <Qi.Chen@windriver.com> ---- - src/rcp.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/rcp.c b/src/rcp.c -index 21f55b6..bafa35f 100644 ---- a/src/rcp.c -+++ b/src/rcp.c -@@ -876,9 +876,9 @@ sink (int argc, char *argv[]) - enum - { YES, NO, DISPLAYED } wrerr; - BUF *bp; -- off_t i, j; -+ off_t i, j, size; - int amt, count, exists, first, mask, mode, ofd, omode; -- int setimes, size, targisdir, wrerrno; -+ int setimes, targisdir, wrerrno; - char ch, *cp, *np, *targ, *vect[1], buf[BUFSIZ]; - const char *why; - --- -1.9.1 - diff --git a/meta-networking/recipes-connectivity/inetutils/inetutils/fix-disable-ipv6.patch b/meta-networking/recipes-connectivity/inetutils/inetutils/fix-disable-ipv6.patch deleted file mode 100644 index 24c134fcac..0000000000 --- a/meta-networking/recipes-connectivity/inetutils/inetutils/fix-disable-ipv6.patch +++ /dev/null @@ -1,83 +0,0 @@ -Upstream: http://www.mail-archive.com/bug-inetutils@gnu.org/msg02103.html - -Upstream-Status: Pending - -Signed-off-by: Jackie Huang <jackie.huang@windriver.com> ---- - ping/ping_common.h | 20 ++++++++++++++++++++ - 1 file changed, 20 insertions(+) - -diff --git a/ping/ping_common.h b/ping/ping_common.h -index 1dfd1b5..3bfbd12 100644 ---- a/ping/ping_common.h -+++ b/ping/ping_common.h -@@ -17,10 +17,14 @@ - You should have received a copy of the GNU General Public License - along with this program. If not, see `http://www.gnu.org/licenses/'. */ - -+#include <config.h> -+ - #include <netinet/in_systm.h> - #include <netinet/in.h> - #include <netinet/ip.h> -+#ifdef HAVE_IPV6 - #include <netinet/icmp6.h> -+#endif - #include <icmp.h> - #include <error.h> - #include <progname.h> -@@ -62,7 +66,12 @@ struct ping_stat - want to follow the traditional behaviour of ping. */ - #define DEFAULT_PING_COUNT 0 - -+#ifdef HAVE_IPV6 - #define PING_HEADER_LEN (USE_IPV6 ? sizeof (struct icmp6_hdr) : ICMP_MINLEN) -+#else -+#define PING_HEADER_LEN (ICMP_MINLEN) -+#endif -+ - #define PING_TIMING(s) ((s) >= sizeof (struct timeval)) - #define PING_DATALEN (64 - PING_HEADER_LEN) /* default data length */ - -@@ -74,13 +83,20 @@ struct ping_stat - (t).tv_usec = ((i)%PING_PRECISION)*(1000000/PING_PRECISION) ;\ - } while (0) - -+#ifdef HAVE_IPV6 - /* FIXME: Adjust IPv6 case for options and their consumption. */ - #define _PING_BUFLEN(p, u) ((u)? ((p)->ping_datalen + sizeof (struct icmp6_hdr)) : \ - (MAXIPLEN + (p)->ping_datalen + ICMP_TSLEN)) - -+#else -+#define _PING_BUFLEN(p, u) (MAXIPLEN + (p)->ping_datalen + ICMP_TSLEN) -+#endif -+ -+#ifdef HAVE_IPV6 - typedef int (*ping_efp6) (int code, void *closure, struct sockaddr_in6 * dest, - struct sockaddr_in6 * from, struct icmp6_hdr * icmp, - int datalen); -+#endif - - typedef int (*ping_efp) (int code, - void *closure, -@@ -89,13 +105,17 @@ typedef int (*ping_efp) (int code, - struct ip * ip, icmphdr_t * icmp, int datalen); - - union event { -+#ifdef HAVE_IPV6 - ping_efp6 handler6; -+#endif - ping_efp handler; - }; - - union ping_address { - struct sockaddr_in ping_sockaddr; -+#ifdef HAVE_IPV6 - struct sockaddr_in6 ping_sockaddr6; -+#endif - }; - - typedef struct ping_data PING; --- -2.8.3 - diff --git a/meta-networking/recipes-connectivity/inetutils/inetutils/inetutils-1.8-0001-printf-parse-pull-in-features.h-for-__GLIBC__.patch b/meta-networking/recipes-connectivity/inetutils/inetutils/inetutils-1.8-0001-printf-parse-pull-in-features.h-for-__GLIBC__.patch deleted file mode 100644 index 3da4e9f55a..0000000000 --- a/meta-networking/recipes-connectivity/inetutils/inetutils/inetutils-1.8-0001-printf-parse-pull-in-features.h-for-__GLIBC__.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 552a7d64ad4a7188a9b7cd89933ae7caf7ebfe90 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier at gentoo.org> -Date: Thu, 18 Nov 2010 16:59:14 -0500 -Subject: [PATCH gnulib] printf-parse: pull in features.h for __GLIBC__ - -Upstream-Status: Pending - -Signed-off-by: Mike Frysinger <vapier at gentoo.org> ---- - lib/printf-parse.h | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/lib/printf-parse.h b/lib/printf-parse.h -index 67a4a2a..3bd6152 100644 ---- a/lib/printf-parse.h -+++ b/lib/printf-parse.h -@@ -25,6 +25,9 @@ - - #include "printf-args.h" - -+#ifdef HAVE_FEATURES_H -+# include <features.h> /* for __GLIBC__ */ -+#endif - - /* Flags */ - #define FLAG_GROUP 1 /* ' flag */ --- -1.7.3.2 - diff --git a/meta-networking/recipes-connectivity/inetutils/inetutils/inetutils-1.8-0003-wchar.patch b/meta-networking/recipes-connectivity/inetutils/inetutils/inetutils-1.8-0003-wchar.patch deleted file mode 100644 index b13bb9229f..0000000000 --- a/meta-networking/recipes-connectivity/inetutils/inetutils/inetutils-1.8-0003-wchar.patch +++ /dev/null @@ -1,14 +0,0 @@ -Upstream-Status: Pending - ---- inetutils-1.8/lib/wchar.in.h -+++ inetutils-1.8/lib/wchar.in.h -@@ -70,6 +70,9 @@ - /* The include_next requires a split double-inclusion guard. */ - #if @HAVE_WCHAR_H@ - # @INCLUDE_NEXT@ @NEXT_WCHAR_H@ -+#else -+# include <stddef.h> -+# define MB_CUR_MAX 1 - #endif - - #undef _GL_ALREADY_INCLUDING_WCHAR_H diff --git a/meta-networking/recipes-connectivity/inetutils/inetutils/inetutils-1.9-PATH_PROCNET_DEV.patch b/meta-networking/recipes-connectivity/inetutils/inetutils/inetutils-1.9-PATH_PROCNET_DEV.patch deleted file mode 100644 index 2592989a90..0000000000 --- a/meta-networking/recipes-connectivity/inetutils/inetutils/inetutils-1.9-PATH_PROCNET_DEV.patch +++ /dev/null @@ -1,26 +0,0 @@ -inetutils: define PATH_PROCNET_DEV if not already defined - -this prevents the following compilation error : -system/linux.c:401:15: error: 'PATH_PROCNET_DEV' undeclared (first use in this function) - -this patch comes from : - http://repository.timesys.com/buildsources/i/inetutils/inetutils-1.9/ - -Upstream-Status: Inappropriate [not author] - -Signed-of-by: Eric Bénard <eric@eukrea.com> ---- -diff -Naur inetutils-1.9.orig/ifconfig/system/linux.c inetutils-1.9/ifconfig/system/linux.c ---- inetutils-1.9.orig/ifconfig/system/linux.c 2012-01-04 16:31:36.000000000 -0500 -+++ inetutils-1.9/ifconfig/system/linux.c 2012-01-04 16:40:53.000000000 -0500 -@@ -49,6 +49,10 @@ - #include "../ifconfig.h" - - -+#ifndef PATH_PROCNET_DEV -+ #define PATH_PROCNET_DEV "/proc/net/dev" -+#endif -+ - /* ARPHRD stuff. */ - - static void diff --git a/meta-networking/recipes-connectivity/inetutils/inetutils/inetutils-only-check-pam_appl.h-when-pam-enabled.patch b/meta-networking/recipes-connectivity/inetutils/inetutils/inetutils-only-check-pam_appl.h-when-pam-enabled.patch deleted file mode 100644 index ff3abd86aa..0000000000 --- a/meta-networking/recipes-connectivity/inetutils/inetutils/inetutils-only-check-pam_appl.h-when-pam-enabled.patch +++ /dev/null @@ -1,40 +0,0 @@ -Only check security/pam_appl.h which is provided by package libpam when pam is -enabled. - -Upstream-Status: Pending - -Signed-off-by: Kai Kang <kai.kang@windriver.com> ---- -diff --git a/configure.ac b/configure.ac -index b35e672..e78a751 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -195,6 +195,19 @@ fi - - # See if we have libpam.a. Investigate PAM versus Linux-PAM. - if test "$with_pam" = yes ; then -+ AC_CHECK_HEADERS([security/pam_appl.h], [], [], [ -+#include <sys/types.h> -+#ifdef HAVE_NETINET_IN_SYSTM_H -+# include <netinet/in_systm.h> -+#endif -+#include <netinet/in.h> -+#ifdef HAVE_NETINET_IP_H -+# include <netinet/ip.h> -+#endif -+#ifdef HAVE_SYS_PARAM_H -+# include <sys/param.h> -+#endif -+]) - AC_CHECK_LIB(dl, dlopen, LIBDL=-ldl) - AC_CHECK_LIB(pam, pam_authenticate, LIBPAM=-lpam) - if test "$ac_cv_lib_pam_pam_authenticate" = yes ; then -@@ -587,7 +600,7 @@ AC_HEADER_DIRENT - AC_CHECK_HEADERS([arpa/nameser.h errno.h fcntl.h features.h \ - glob.h memory.h netinet/ether.h netinet/in_systm.h \ - netinet/ip.h netinet/ip_icmp.h netinet/ip_var.h \ -- security/pam_appl.h shadow.h \ -+ shadow.h \ - stdarg.h stdlib.h string.h stropts.h sys/tty.h \ - sys/utsname.h sys/ptyvar.h sys/msgbuf.h sys/filio.h \ - sys/ioctl_compat.h sys/cdefs.h sys/stream.h sys/mkdev.h \ diff --git a/meta-networking/recipes-connectivity/inetutils/inetutils/rexec.xinetd.inetutils b/meta-networking/recipes-connectivity/inetutils/inetutils/rexec.xinetd.inetutils deleted file mode 100644 index 30e81ef450..0000000000 --- a/meta-networking/recipes-connectivity/inetutils/inetutils/rexec.xinetd.inetutils +++ /dev/null @@ -1,20 +0,0 @@ -# default: off -# description: -# Rexecd is the server for the rexec program. The server provides remote -# execution facilities with authentication based on user names and -# passwords. -# -service exec -{ - socket_type = stream - protocol = tcp - flags = NAMEINARGS - wait = no - user = root - group = root - log_on_success += USERID - log_on_failure += USERID - server = @SBINDIR@/tcpd - server_args = @SBINDIR@/in.rexecd - disable = yes -} diff --git a/meta-networking/recipes-connectivity/inetutils/inetutils/rlogin.xinetd.inetutils b/meta-networking/recipes-connectivity/inetutils/inetutils/rlogin.xinetd.inetutils deleted file mode 100644 index 21b55da9a9..0000000000 --- a/meta-networking/recipes-connectivity/inetutils/inetutils/rlogin.xinetd.inetutils +++ /dev/null @@ -1,23 +0,0 @@ -# default: off -# description: -# Rlogind is a server for the rlogin program. The server provides remote -# execution with authentication based on privileged port numbers from trusted -# host -# -service login -{ - socket_type = stream - protocol = tcp - flags = NAMEINARGS - wait = no - user = root - group = root - log_on_success += USERID - log_on_failure += USERID - server = @SBINDIR@/tcpd - server_args = @SBINDIR@/in.rlogind -a - disable = yes -} - - - diff --git a/meta-networking/recipes-connectivity/inetutils/inetutils/rsh.xinetd.inetutils b/meta-networking/recipes-connectivity/inetutils/inetutils/rsh.xinetd.inetutils deleted file mode 100644 index 2b894a74bd..0000000000 --- a/meta-networking/recipes-connectivity/inetutils/inetutils/rsh.xinetd.inetutils +++ /dev/null @@ -1,21 +0,0 @@ -# default: off -# description: -# The rshd server is a server for the rcmd(3) routine and, -# consequently, for the rsh(1) program. The server provides -# remote execution facilities with authentication based on -# privileged port numbers from trusted hosts. -# -service shell -{ - socket_type = stream - protocol = tcp - flags = NAMEINARGS - wait = no - user = root - group = root - log_on_success += USERID - log_on_failure += USERID - server = @SBINDIR@/tcpd - server_args = @SBINDIR@/in.rshd -aL - disable = yes -} diff --git a/meta-networking/recipes-connectivity/inetutils/inetutils/telnet.xinetd.inetutils b/meta-networking/recipes-connectivity/inetutils/inetutils/telnet.xinetd.inetutils deleted file mode 100644 index 2d9a0408c0..0000000000 --- a/meta-networking/recipes-connectivity/inetutils/inetutils/telnet.xinetd.inetutils +++ /dev/null @@ -1,13 +0,0 @@ -# default: on -# description: The telnet server serves telnet sessions; it uses \ -# unencrypted username/password pairs for authentication. -service telnet -{ - disable = no - flags = REUSE - socket_type = stream - wait = no - user = root - server = @SBINDIR@/in.telnetd - log_on_failure += USERID -} diff --git a/meta-networking/recipes-connectivity/inetutils/inetutils/tftpd.xinetd.inetutils b/meta-networking/recipes-connectivity/inetutils/inetutils/tftpd.xinetd.inetutils deleted file mode 100644 index 67b44c43e8..0000000000 --- a/meta-networking/recipes-connectivity/inetutils/inetutils/tftpd.xinetd.inetutils +++ /dev/null @@ -1,19 +0,0 @@ -# default: off -# description: -# Tftpd is a server which supports the Internet Trivial File Transfer -# Pro-tocol (RFC 783). The TFTP server operates at the port indicated -# in the tftp service description; see services(5). -# -service tftp -{ - disable = yes - socket_type = dgram - protocol = udp - flags = IPv6 - wait = yes - user = root - group = root - server = @SBINDIR@/in.tftpd - server_args = /tftpboot -} - diff --git a/meta-networking/recipes-connectivity/inetutils/inetutils/version.patch b/meta-networking/recipes-connectivity/inetutils/inetutils/version.patch deleted file mode 100644 index 532a0e5c08..0000000000 --- a/meta-networking/recipes-connectivity/inetutils/inetutils/version.patch +++ /dev/null @@ -1,17 +0,0 @@ -Upstream-Status: Pending - -remove m4_esyscmd function - -Signed-off-by: Chunrong Guo <b40290@freescale.com> ---- inetutils-1.9.1/configure.ac 2012-01-06 22:05:05.000000000 +0800 -+++ inetutils-1.9.1/configure.ac 2012-11-12 14:01:11.732957019 +0800 -@@ -20,8 +20,7 @@ - - AC_PREREQ(2.59) - --AC_INIT([GNU inetutils], -- m4_esyscmd([build-aux/git-version-gen .tarball-version 's/inetutils-/v/;s/_/./g']), -+AC_INIT([GNU inetutils],[1.9.4], - [bug-inetutils@gnu.org]) - - AC_CONFIG_SRCDIR([src/inetd.c]) diff --git a/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb b/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb deleted file mode 100644 index 190cd5f142..0000000000 --- a/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb +++ /dev/null @@ -1,206 +0,0 @@ -DESCRIPTION = "The GNU inetutils are a collection of common \ -networking utilities and servers including ftp, ftpd, rcp, \ -rexec, rlogin, rlogind, rsh, rshd, syslog, syslogd, talk, \ -talkd, telnet, telnetd, tftp, tftpd, and uucpd." -HOMEPAGE = "http://www.gnu.org/software/inetutils" -SECTION = "net" -DEPENDS = "ncurses netbase readline" - -LICENSE = "GPLv3" - -LIC_FILES_CHKSUM = "file://COPYING;md5=0c7051aef9219dc7237f206c5c4179a7" - -SRC_URI = "${GNU_MIRROR}/inetutils/inetutils-${PV}.tar.gz \ - file://version.patch \ - file://inetutils-1.8-0001-printf-parse-pull-in-features.h-for-__GLIBC__.patch \ - file://inetutils-1.8-0003-wchar.patch \ - file://rexec.xinetd.inetutils \ - file://rlogin.xinetd.inetutils \ - file://rsh.xinetd.inetutils \ - file://telnet.xinetd.inetutils \ - file://tftpd.xinetd.inetutils \ - file://inetutils-1.9-PATH_PROCNET_DEV.patch \ - file://inetutils-only-check-pam_appl.h-when-pam-enabled.patch \ - file://0001-rcp-fix-to-work-with-large-files.patch \ -" - -SRC_URI[md5sum] = "04852c26c47cc8c6b825f2b74f191f52" -SRC_URI[sha256sum] = "be8f75eff936b8e41b112462db51adf689715658a1b09e0d6b05d11ec92cc616" - -inherit autotools gettext update-alternatives texinfo - -acpaths = "-I ./m4" - -SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '', 'file://fix-disable-ipv6.patch', d)}" - -PACKAGECONFIG ??= "ftp uucpd \ - ${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6 ping6', '', d)} \ - " -PACKAGECONFIG[ftp] = "--enable-ftp,--disable-ftp,readline" -PACKAGECONFIG[uucpd] = "--enable-uucpd,--disable-uucpd,readline" -PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam" -PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6 gl_cv_socket_ipv6=no," -PACKAGECONFIG[ping6] = "--enable-ping6,--disable-ping6," - -EXTRA_OECONF = "--with-ncurses-include-dir=${STAGING_INCDIR} \ - inetutils_cv_path_login=${base_bindir}/login \ - --with-libreadline-prefix=${STAGING_LIBDIR} \ - --enable-rpath=no \ -" - -EXTRA_OECONF_append_libc-musl = " --disable-rsh --disable-rcp --disable-rlogin " - -do_configure_prepend () { - export HELP2MAN='true' - cp ${STAGING_DATADIR_NATIVE}/gettext/config.rpath ${S}/build-aux/config.rpath - rm -f ${S}/glob/configure* -} - -do_install_append () { - install -m 0755 -d ${D}${base_sbindir} - install -m 0755 -d ${D}${sbindir} - install -m 0755 -d ${D}${sysconfdir}/xinetd.d - if [ "${base_bindir}" != "${bindir}" ] ; then - install -m 0755 -d ${D}${base_bindir} - mv ${D}${bindir}/ping* ${D}${base_bindir}/ - mv ${D}${bindir}/hostname ${D}${base_bindir}/ - fi - mv ${D}${bindir}/ifconfig ${D}${base_sbindir}/ - mv ${D}${libexecdir}/syslogd ${D}${base_sbindir}/ - mv ${D}${libexecdir}/tftpd ${D}${sbindir}/in.tftpd - mv ${D}${libexecdir}/telnetd ${D}${sbindir}/in.telnetd - mv ${D}${libexecdir}/rexecd ${D}${sbindir}/in.rexecd - if [ -e ${D}${libexecdir}/rlogind ]; then - mv ${D}${libexecdir}/rlogind ${D}${sbindir}/in.rlogind - fi - if [ -e ${D}${libexecdir}/rshd ]; then - mv ${D}${libexecdir}/rshd ${D}${sbindir}/in.rshd - fi - if [ -e ${D}${libexecdir}/talkd ]; then - mv ${D}${libexecdir}/talkd ${D}${sbindir}/in.talkd - fi - mv ${D}${libexecdir}/uucpd ${D}${sbindir}/in.uucpd - mv ${D}${libexecdir}/* ${D}${bindir}/ - cp ${WORKDIR}/rexec.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/rexec - cp ${WORKDIR}/rlogin.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/rlogin - cp ${WORKDIR}/rsh.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/rsh - cp ${WORKDIR}/telnet.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/telnet - cp ${WORKDIR}/tftpd.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/tftpd - - sed -e 's,@SBINDIR@,${sbindir},g' -i ${D}/${sysconfdir}/xinetd.d/* - if [ -e ${D}${libdir}/charset.alias ]; then - rm -rf ${D}${libdir}/charset.alias - fi - rm -rf ${D}${libexecdir}/ - # remove usr/lib if empty - rmdir ${D}${libdir} || true -} - -PACKAGES =+ "${PN}-ping ${PN}-ping6 ${PN}-hostname ${PN}-ifconfig \ -${PN}-tftp ${PN}-logger ${PN}-traceroute ${PN}-syslogd \ -${PN}-ftp ${PN}-ftpd ${PN}-tftpd ${PN}-telnet ${PN}-telnetd ${PN}-inetd \ -${PN}-rsh ${PN}-rshd" - -# The packages tftpd, telnetd and rshd conflict with the ones -# provided by netkit, so add the corresponding -dbg packages -# for them to avoid the confliction between the dbg package -# of inetutils and netkit. -PACKAGES =+ "${PN}-tftpd-dbg ${PN}-telnetd-dbg ${PN}-rshd-dbg" -NOAUTOPACKAGEDEBUG = "1" - -ALTERNATIVE_PRIORITY = "79" -ALTERNATIVE_${PN} = "talk whois" -ALTERNATIVE_LINK_NAME[talkd] = "${sbindir}/in.talkd" -ALTERNATIVE_LINK_NAME[uucpd] = "${sbindir}/in.uucpd" - -ALTERNATIVE_PRIORITY_${PN}-logger = "60" -ALTERNATIVE_${PN}-logger = "logger" -ALTERNATIVE_${PN}-syslogd = "syslogd" -ALTERNATIVE_LINK_NAME[syslogd] = "${base_sbindir}/syslogd" - -ALTERNATIVE_${PN}-ftp = "ftp" -ALTERNATIVE_${PN}-ftpd = "ftpd" -ALTERNATIVE_${PN}-tftp = "tftp" -ALTERNATIVE_${PN}-tftpd = "tftpd" -ALTERNATIVE_LINK_NAME[tftpd] = "${sbindir}/tftpd" -ALTERNATIVE_TARGET[tftpd] = "${sbindir}/in.tftpd" - -ALTERNATIVE_${PN}-telnet = "telnet" -ALTERNATIVE_${PN}-telnetd = "telnetd" -ALTERNATIVE_LINK_NAME[telnetd] = "${sbindir}/telnetd" -ALTERNATIVE_TARGET[telnetd] = "${sbindir}/in.telnetd" - -ALTERNATIVE_${PN}-rsh = "rcp rexec rlogin rsh" -ALTERNATIVE_${PN}-rshd = "rshd rexecd rlogind" -ALTERNATIVE_LINK_NAME[rshd] = "${sbindir}/rshd" -ALTERNATIVE_TARGET[rshd] = "${sbindir}/in.rshd" -ALTERNATIVE_LINK_NAME[rexecd] = "${sbindir}/rexecd" -ALTERNATIVE_TARGET[rexecd] = "${sbindir}/in.rexecd" -ALTERNATIVE_LINK_NAME[rlogind] = "${sbindir}/rlogind" -ALTERNATIVE_TARGET[rlogind] = "${sbindir}/in.rlogind" - -ALTERNATIVE_${PN}-inetd= "inetd" -ALTERNATIVE_${PN}-traceroute = "traceroute" - -ALTERNATIVE_${PN}-hostname = "hostname" -ALTERNATIVE_LINK_NAME[hostname] = "${base_bindir}/hostname" - -ALTERNATIVE_${PN}-doc = "hostname.1 dnsdomainname.1 logger.1 syslogd.8" -ALTERNATIVE_LINK_NAME[hostname.1] = "${mandir}/man1/hostname.1" -ALTERNATIVE_LINK_NAME[dnsdomainname.1] = "${mandir}/man1/dnsdomainname.1" -ALTERNATIVE_LINK_NAME[logger.1] = "${mandir}/man1/logger.1" -ALTERNATIVE_LINK_NAME[syslogd.8] = "${mandir}/man8/syslogd.8" - -ALTERNATIVE_${PN}-ifconfig = "ifconfig" -ALTERNATIVE_LINK_NAME[ifconfig] = "${base_sbindir}/ifconfig" - -ALTERNATIVE_${PN}-ping = "ping" -ALTERNATIVE_LINK_NAME[ping] = "${base_bindir}/ping" - -ALTERNATIVE_${PN}-ping6 = "${@bb.utils.filter('PACKAGECONFIG', 'ping6', d)}" -ALTERNATIVE_LINK_NAME[ping6] = "${base_bindir}/ping6" - - -FILES_${PN}-dbg += "${base_bindir}/.debug ${base_sbindir}/.debug ${bindir}/.debug ${sbindir}/.debug" -FILES_${PN}-ping = "${base_bindir}/ping.${BPN}" -FILES_${PN}-ping6 = "${base_bindir}/ping6.${BPN}" -FILES_${PN}-hostname = "${base_bindir}/hostname.${BPN}" -FILES_${PN}-ifconfig = "${base_sbindir}/ifconfig.${BPN}" -FILES_${PN}-traceroute = "${bindir}/traceroute.${BPN}" -FILES_${PN}-logger = "${bindir}/logger.${BPN}" - -FILES_${PN}-syslogd = "${base_sbindir}/syslogd.${BPN}" -RCONFLICTS_${PN}-syslogd = "rsyslog busybox-syslog sysklogd syslog-ng" - -FILES_${PN}-ftp = "${bindir}/ftp.${BPN}" - -FILES_${PN}-tftp = "${bindir}/tftp.${BPN}" -FILES_${PN}-telnet = "${bindir}/telnet.${BPN}" -FILES_${PN}-rsh = "${bindir}/rsh.${BPN} ${bindir}/rlogin.${BPN} ${bindir}/rexec.${BPN} ${bindir}/rcp.${BPN}" - -FILES_${PN}-rshd = "${sbindir}/in.rshd ${sbindir}/in.rlogind ${sbindir}/in.rexecd \ - ${sysconfdir}/xinetd.d/rsh ${sysconfdir}/xinetd.d/rlogin ${sysconfdir}/xinetd.d/rexec" -FILES_${PN}-rshd-dbg = "${sbindir}/.debug/in.rshd ${sbindir}/.debug/in.rlogind ${sbindir}/.debug/in.rexecd" -RDEPENDS_${PN}-rshd += "xinetd tcp-wrappers" -RCONFLICTS_${PN}-rshd += "netkit-rshd" -RPROVIDES_${PN}-rshd = "rshd" - -FILES_${PN}-ftpd = "${bindir}/ftpd.${BPN}" -FILES_${PN}-ftpd-dbg = "${bindir}/.debug/ftpd.${BPN}" -RDEPENDS_${PN}-ftpd += "xinetd" - -FILES_${PN}-tftpd = "${sbindir}/in.tftpd ${sysconfdir}/xinetd.d/tftpd" -FILES_${PN}-tftpd-dbg = "${sbindir}/.debug/in.tftpd" -RCONFLICTS_${PN}-tftpd += "netkit-tftpd" -RDEPENDS_${PN}-tftpd += "xinetd" - -FILES_${PN}-telnetd = "${sbindir}/in.telnetd ${sysconfdir}/xinetd.d/telnet" -FILES_${PN}-telnetd-dbg = "${sbindir}/.debug/in.telnetd" -RCONFLICTS_${PN}-telnetd += "netkit-telnetd" -RPROVIDES_${PN}-telnetd = "telnetd" -RDEPENDS_${PN}-telnetd += "xinetd" - -FILES_${PN}-inetd = "${bindir}/inetd.${BPN}" - -RDEPENDS_${PN} = "xinetd" diff --git a/meta-networking/recipes-connectivity/lftp/files/fix-gcc-6-conflicts-signbit.patch b/meta-networking/recipes-connectivity/lftp/files/fix-gcc-6-conflicts-signbit.patch deleted file mode 100644 index 952232b7a7..0000000000 --- a/meta-networking/recipes-connectivity/lftp/files/fix-gcc-6-conflicts-signbit.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- lftp-4.6.3a/src/NetAccess.cc.orig 2016-06-18 10:25:51.063358981 -0400 -+++ lftp-4.6.3a/src/NetAccess.cc 2016-06-18 10:26:04.143359209 -0400 -@@ -21,7 +21,7 @@ - - #include <errno.h> - #include <assert.h> --#include <math.h> -+#include <cmath> - #include <sys/types.h> - - #include "NetAccess.h" ---- lftp-4.6.3a/src/Speedometer.cc.orig 2016-06-18 10:24:58.895358073 -0400 -+++ lftp-4.6.3a/src/Speedometer.cc 2016-06-18 10:25:10.879358281 -0400 -@@ -18,7 +18,7 @@ - */ - - #include <config.h> --#include <math.h> -+#include <cmath> - #include <stdlib.h> - #include "Speedometer.h" - #include "misc.h" ---- lftp-4.6.3a/src/FileCopy.cc.orig 2016-06-18 10:24:15.939357325 -0400 -+++ lftp-4.6.3a/src/FileCopy.cc 2016-06-18 10:24:24.583357475 -0400 -@@ -36,7 +36,7 @@ - #include <sys/types.h> - #include <sys/stat.h> - #include <fcntl.h> --#include <math.h> -+#include <cmath> - #include <stddef.h> - #include "FileCopy.h" - #include "url.h" ---- lftp-4.6.3a/src/ResMgr.cc.orig 2016-06-18 10:23:31.387356549 -0400 -+++ lftp-4.6.3a/src/ResMgr.cc 2016-06-18 10:23:41.771356729 -0400 -@@ -23,7 +23,7 @@ - #include <ctype.h> - #include <unistd.h> - #include <stdlib.h> --#include <math.h> -+#include <cmath> - #include <sys/types.h> - #include <sys/stat.h> - #include <errno.h> diff --git a/meta-networking/recipes-connectivity/lftp/lftp_4.7.7.bb b/meta-networking/recipes-connectivity/lftp/lftp_4.9.2.bb index b6b65da736..bf3e18dce7 100644 --- a/meta-networking/recipes-connectivity/lftp/lftp_4.7.7.bb +++ b/meta-networking/recipes-connectivity/lftp/lftp_4.9.2.bb @@ -3,32 +3,29 @@ DESCRIPTION = "LFTP is a sophisticated file transfer program with \ FISH, SFTP, HTTPS and FTPS protocols" HOMEPAGE = "http://lftp.yar.ru/" SECTION = "console/network" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -SRC_URI = "http://lftp.yar.ru/ftp/lftp-${PV}.tar.bz2 \ - file://fix-gcc-6-conflicts-signbit.patch \ - " -SRC_URI[md5sum] = "3701e7675baa5619c92622eb141c8301" -SRC_URI[sha256sum] = "fe441f20a9a317cfb99a8b8e628ba0457df472b6d93964d17374d5b5ebdf9280" +SRC_URI = "http://lftp.yar.ru/ftp/lftp-${PV}.tar.bz2" +SRC_URI[md5sum] = "42ec1793c386702bc2734ffbc8a5cff1" +SRC_URI[sha256sum] = "8a07cbf4df09b107fe3fc41d133ee2f6cea6ef4c33ccf06c8448ad058cd96b7e" inherit autotools gettext pkgconfig acpaths = "-I ./m4" -EXTRA_OECONF += "--with-modules" +EXTRA_OECONF += "--with-modules --disable-rpath" -PACKAGECONFIG ??= "libidn openssl zlib gnutls readline expat" -PACKAGECONFIG[libidn] = "--with-libidn, --without-libidn, libidn" +PACKAGECONFIG ??= "openssl zlib gnutls readline expat" PACKAGECONFIG[openssl] = "--with-openssl, --without-openssl, openssl" PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_INCDIR}/.., --without-zlib, zlib" PACKAGECONFIG[gnutls] = "--with-gnutls, --without-gnutls, gnutls" PACKAGECONFIG[readline] = "--with-readline=${STAGING_INCDIR}/.. --with-readline-inc=${STAGING_INCDIR} --with-readline-lib=-lreadline, --with-readline=no, readline" PACKAGECONFIG[expat] = "--with-expat=${STAGING_INCDIR}/.. --with-expat-inc=${STAGING_INCDIR} --with-expat-lib=-lexpat, , expat" -do_install_append() { +do_install:append() { rm -rf ${D}${libdir}/charset.alias } - -FILES_${PN}-dbg += "${libdir}/lftp/${PV}/.debug" -RDEPENDS_${PN} = "perl bash readline" +FILES:${PN} += "${datadir}/icons/hicolor" +FILES:${PN}-dbg += "${libdir}/lftp/${PV}/.debug" +RDEPENDS:${PN} = "perl bash readline" diff --git a/meta-networking/recipes-connectivity/libdnet/libdnet_1.12.bb b/meta-networking/recipes-connectivity/libdnet/libdnet_1.12.bb deleted file mode 100644 index e579de5074..0000000000 --- a/meta-networking/recipes-connectivity/libdnet/libdnet_1.12.bb +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "dumb networking library" -HOMEPAGE = "http://code.google.com/p/libdnet/" -SECTION = "libs" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=0036c1b155f4e999f3e0a373490b5db9" - -SRC_URI = "git://github.com/dugsong/libdnet.git;nobranch=1" -SRCREV = "12fca29a6d4e99d1b923d6820887fe7b24226904" - -S = "${WORKDIR}/git" - -inherit autotools - -acpaths = "-I ./config/" - -BBCLASSEXTEND = "native" diff --git a/meta-networking/recipes-connectivity/libdnet/libdnet_1.18.0.bb b/meta-networking/recipes-connectivity/libdnet/libdnet_1.18.0.bb new file mode 100644 index 0000000000..75aaf521c4 --- /dev/null +++ b/meta-networking/recipes-connectivity/libdnet/libdnet_1.18.0.bb @@ -0,0 +1,22 @@ +SUMMARY = "dumb networking library" +HOMEPAGE = "https://github.com/ofalk/libdnet" +SECTION = "libs" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=0036c1b155f4e999f3e0a373490b5db9" + +SRC_URI = "git://github.com/ofalk/libdnet.git;nobranch=1;protocol=https" + +SRCREV = "3dfbe889b1f65077efe579da34fc1d6819fcb7f3" + +UPSTREAM_CHECK_GITTAGREGEX = "libdnet-(?P<pver>\d+(\.\d+)+)" + +S = "${WORKDIR}/git" + +inherit autotools multilib_script pkgconfig + +DEPENDS += "libcheck" + +EXTRA_AUTORECONF += "-I ./config" +BBCLASSEXTEND = "native" + +MULTILIB_SCRIPTS = "${PN}:${bindir}/dnet-config" diff --git a/meta-networking/recipes-connectivity/libiec61850/files/0001-pyiec61850-Use-CMAKE_INSTALL_LIBDIR-from-GNUInstallD.patch b/meta-networking/recipes-connectivity/libiec61850/files/0001-pyiec61850-Use-CMAKE_INSTALL_LIBDIR-from-GNUInstallD.patch new file mode 100644 index 0000000000..e778e8158b --- /dev/null +++ b/meta-networking/recipes-connectivity/libiec61850/files/0001-pyiec61850-Use-CMAKE_INSTALL_LIBDIR-from-GNUInstallD.patch @@ -0,0 +1,29 @@ +From 16d07a82242c3263ec0038c9b4c97355795d2dd9 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 19 Mar 2022 23:16:51 -0700 +Subject: [PATCH] pyiec61850: Use CMAKE_INSTALL_LIBDIR from GNUInstallDirs in + cmake + +This ensures that it gets installed in platform specified system libdir +all platforms do not use /usr/lib as assumed here e.g. ppc64 uses lib64 + +Upstream-Status: Submitted [https://github.com/mz-automation/libiec61850/pull/376] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + pyiec61850/CMakeLists.txt | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +--- a/pyiec61850/CMakeLists.txt ++++ b/pyiec61850/CMakeLists.txt +@@ -31,7 +31,9 @@ endif() + + swig_link_libraries(iec61850 ${PYTHON_LIBRARIES} ${LIBS}) + +-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/iec61850.py DESTINATION /usr/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) +-install(TARGETS _iec61850 LIBRARY DESTINATION /usr/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) ++include(GNUInstallDirs) ++ ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/iec61850.py DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) ++install(TARGETS _iec61850 LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}//python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) + + add_test(test_pyiec61850 ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/test_pyiec61850.py) diff --git a/meta-networking/recipes-connectivity/libiec61850/files/0001-pyiec61850-don-t-break-CMAKE_INSTALL_PATH-by-trying-.patch b/meta-networking/recipes-connectivity/libiec61850/files/0001-pyiec61850-don-t-break-CMAKE_INSTALL_PATH-by-trying-.patch new file mode 100644 index 0000000000..3f0490cb80 --- /dev/null +++ b/meta-networking/recipes-connectivity/libiec61850/files/0001-pyiec61850-don-t-break-CMAKE_INSTALL_PATH-by-trying-.patch @@ -0,0 +1,39 @@ +From d4ddfc7a350011b7944ed8d6bca80f164dfd1387 Mon Sep 17 00:00:00 2001 +From: Romain Naour <romain.naour@smile.fr> +Date: Fri, 10 Jul 2020 17:08:34 +0200 +Subject: [PATCH] pyiec61850: don't break CMAKE_INSTALL_PATH by trying to find + python modules install path (site-packages) + +https://stackoverflow.com/questions/1242904/finding-python-site-packages-directory-with-cmake + +Signed-off-by: Romain Naour <romain.naour@smile.fr> +--- +Upstream-Status: Pending + + pyiec61850/CMakeLists.txt | 11 ++--------- + 1 file changed, 2 insertions(+), 9 deletions(-) + +diff --git a/pyiec61850/CMakeLists.txt b/pyiec61850/CMakeLists.txt +index 159ef4b..d1732a1 100644 +--- a/pyiec61850/CMakeLists.txt ++++ b/pyiec61850/CMakeLists.txt +@@ -31,14 +31,7 @@ endif() + + swig_link_libraries(iec61850 ${PYTHON_LIBRARIES} ${LIBS}) + +-# Finding python modules install path +-execute_process( +- COMMAND ${PYTHON_EXECUTABLE} -c +- "from distutils.sysconfig import get_python_lib; import sys; sys.stdout.write(get_python_lib())" +- OUTPUT_VARIABLE PYTHON_SITE_DIR +-) +- +-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/iec61850.py DESTINATION ${PYTHON_SITE_DIR}) +-install(TARGETS _iec61850 LIBRARY DESTINATION ${PYTHON_SITE_DIR}) ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/iec61850.py DESTINATION /usr/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) ++install(TARGETS _iec61850 LIBRARY DESTINATION /usr/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) + + add_test(test_pyiec61850 ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/test_pyiec61850.py) +-- +2.31.1 + diff --git a/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.5.1.bb b/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.5.1.bb new file mode 100644 index 0000000000..63476d3495 --- /dev/null +++ b/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.5.1.bb @@ -0,0 +1,38 @@ +SUMMARY = "Open source iec61850 implementation" +DESCRIPTION = "IEC 61850 is an international standard for \ +communication systems in Substation Automation Systems \ +(SAS) and management of Decentralized Energy Resources \ +(DER). It is seen as one of the communication standards \ +of the emerging Smart Grid. \ +The project libIEC61850 provides a server and client \ +library for the IEC 61850/MMS, IEC 61850/GOOSE and IEC \ +61850-9-2/Sampled Values communication protocols \ +written in C. It is available under the GPLv3 license." +HOMEPAGE = "http://libiec61850.com" +SECTION = "console/network" +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" +DEPENDS = "swig-native python3" +SRCREV = "210cf30897631fe2006ac50483caf8fd616622a2" + +SRC_URI = "git://github.com/mz-automation/${BPN}.git;branch=v1.5;protocol=https \ + file://0001-pyiec61850-don-t-break-CMAKE_INSTALL_PATH-by-trying-.patch \ + file://0001-pyiec61850-Use-CMAKE_INSTALL_LIBDIR-from-GNUInstallD.patch \ +" + +S = "${WORKDIR}/git" + +inherit cmake pkgconfig python3-dir python3native siteinfo + +EXTRA_OECMAKE = " \ + -DBUILD_EXAMPLES=OFF \ + -DBUILD_PYTHON_BINDINGS=ON \ +" + +RDEPENDS:${PN}-python = " python3-core " +RDEPENDS:${PN} = " python3-core " + +FILES:${PN} += " \ + ${PYTHON_SITEPACKAGES_DIR}/iec61850.py \ + ${PYTHON_SITEPACKAGES_DIR}/_iec61850.so \ +" diff --git a/meta-networking/recipes-connectivity/mbedtls/mbedtls/run-ptest b/meta-networking/recipes-connectivity/mbedtls/mbedtls/run-ptest new file mode 100644 index 0000000000..059ab4ecbb --- /dev/null +++ b/meta-networking/recipes-connectivity/mbedtls/mbedtls/run-ptest @@ -0,0 +1,17 @@ +#!/bin/sh + +ptestdir=$(dirname "$(readlink -f "$0")") +cd "$ptestdir"/tests || exit + +tests=$(find * -type f -name 'test_suite_*') + +for f in $tests +do + if test -x ./"$f"; then + if ./"$f" > ./"$f".out 2> ./"$f".err; then + echo "PASS: $f" + else + echo "FAIL: $f" + fi + fi +done diff --git a/meta-networking/recipes-connectivity/mbedtls/mbedtls_1.3.17.bb b/meta-networking/recipes-connectivity/mbedtls/mbedtls_1.3.17.bb deleted file mode 100644 index fcfec6907d..0000000000 --- a/meta-networking/recipes-connectivity/mbedtls/mbedtls_1.3.17.bb +++ /dev/null @@ -1,37 +0,0 @@ -SUMMARY = "Lightweight crypto and SSL/TLS library" -DESCRIPTION = "mbedtls is a lean open source crypto library \ -for providing SSL and TLS support in your programs. It offers \ -an intuitive API and documented header files, so you can actually \ -understand what the code does. It features: \ - \ - - Symmetric algorithms, like AES, Blowfish, Triple-DES, DES, ARC4, \ - Camellia and XTEA \ - - Hash algorithms, like SHA-1, SHA-2, RIPEMD-160 and MD5 \ - - Entropy pool and random generators, like CTR-DRBG and HMAC-DRBG \ - - Public key algorithms, like RSA, Elliptic Curves, Diffie-Hellman, \ - ECDSA and ECDH \ - - SSL v3 and TLS 1.0, 1.1 and 1.2 \ - - Abstraction layers for ciphers, hashes, public key operations, \ - platform abstraction and threading \ -" - -HOMEPAGE = "https://polarssl.org" -BUGTRACKER = "https://github.com/polarssl/polarssl/issues" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe" - -SECTION = "libdevel" - -SRC_URI = "https://tls.mbed.org/download/mbedtls-${PV}-gpl.tgz" - -SRC_URI[md5sum] = "a6ed92fc377ef60f7c24d42b900e0dad" -SRC_URI[sha256sum] = "f5beb43e850283915e3e0f8d37495eade3bfb5beedfb61e7b8da70d4c68edb82" - -DEPENDS = "openssl" -RDEPENDS_${PN} += "libcrypto" -PROVIDES += "polarssl" -RPROVIDES_${PN} = "polarssl" -EXTRA_OECMAKE = "-DUSE_SHARED_POLARSSL_LIBRARY=on -DLIB_INSTALL_DIR=${baselib}" - -inherit cmake diff --git a/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.28.8.bb b/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.28.8.bb new file mode 100644 index 0000000000..db79241f2a --- /dev/null +++ b/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.28.8.bb @@ -0,0 +1,80 @@ +SUMMARY = "Lightweight crypto and SSL/TLS library" +DESCRIPTION = "mbedtls is a lean open source crypto library \ +for providing SSL and TLS support in your programs. It offers \ +an intuitive API and documented header files, so you can actually \ +understand what the code does. It features: \ + \ + - Symmetric algorithms, like AES, Blowfish, Triple-DES, DES, ARC4, \ + Camellia and XTEA \ + - Hash algorithms, like SHA-1, SHA-2, RIPEMD-160 and MD5 \ + - Entropy pool and random generators, like CTR-DRBG and HMAC-DRBG \ + - Public key algorithms, like RSA, Elliptic Curves, Diffie-Hellman, \ + ECDSA and ECDH \ + - SSL v3 and TLS 1.0, 1.1 and 1.2 \ + - Abstraction layers for ciphers, hashes, public key operations, \ + platform abstraction and threading \ +" + +HOMEPAGE = "https://tls.mbed.org/" + +LICENSE = "Apache-2.0 | GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://LICENSE;md5=379d5819937a6c2f1ef1630d341e026d" + +SECTION = "libs" + +S = "${WORKDIR}/git" +SRCREV = "5a764e5555c64337ed17444410269ff21cb617b1" +SRC_URI = "git://github.com/Mbed-TLS/mbedtls.git;protocol=https;branch=mbedtls-2.28 \ + file://run-ptest \ + " + +inherit cmake update-alternatives ptest + +PACKAGECONFIG ??= "shared-libs programs ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" +PACKAGECONFIG[shared-libs] = "-DUSE_SHARED_MBEDTLS_LIBRARY=ON,-DUSE_SHARED_MBEDTLS_LIBRARY=OFF" +PACKAGECONFIG[programs] = "-DENABLE_PROGRAMS=ON,-DENABLE_PROGRAMS=OFF" +PACKAGECONFIG[werror] = "-DMBEDTLS_FATAL_WARNINGS=ON,-DMBEDTLS_FATAL_WARNINGS=OFF" +# Make X.509 and TLS calls use PSA +# https://github.com/Mbed-TLS/mbedtls/blob/development/docs/use-psa-crypto.md +PACKAGECONFIG[psa] = "" +PACKAGECONFIG[tests] = "-DENABLE_TESTING=ON,-DENABLE_TESTING=OFF" + +EXTRA_OECMAKE = "-DLIB_INSTALL_DIR:STRING=${libdir}" + +# For now the only way to enable PSA is to explicitly pass a -D via CFLAGS +CFLAGS:append = "${@bb.utils.contains('PACKAGECONFIG', 'psa', ' -DMBEDTLS_USE_PSA_CRYPTO', '', d)}" + +PROVIDES += "polarssl" +RPROVIDES:${PN} = "polarssl" + +PACKAGES =+ "${PN}-programs" +FILES:${PN}-programs = "${bindir}/" + +ALTERNATIVE:${PN}-programs = "${@bb.utils.contains('PACKAGECONFIG', 'programs', 'hello', '', d)}" +ALTERNATIVE_LINK_NAME[hello] = "${bindir}/hello" + +BBCLASSEXTEND = "native nativesdk" + +CVE_PRODUCT = "mbed_tls" + +CVE_STATUS[CVE-2021-43666] = "backported-patch: Fix merged upstream https://github.com/Mbed-TLS/mbedtls/pull/5310" +CVE_STATUS[CVE-2021-45451] = "backported-patch: Fix merged upstream https://github.com/Mbed-TLS/mbedtls/commit/9a4a9c66a48edfe9ece03c7e4a53310adf73a86c" + +# Strip host paths from autogenerated test files +do_compile:append() { + sed -i 's+${S}/++g' ${B}/tests/*.c 2>/dev/null || : + sed -i 's+${B}/++g' ${B}/tests/*.c 2>/dev/null || : +} + +# Export source files/headers needed by Arm Trusted Firmware +sysroot_stage_all:append() { + sysroot_stage_dir "${S}/library" "${SYSROOT_DESTDIR}/usr/share/mbedtls-source/library" + sysroot_stage_dir "${S}/include" "${SYSROOT_DESTDIR}/usr/share/mbedtls-source/include" +} + +do_install_ptest () { + install -d ${D}${PTEST_PATH}/tests + cp -f ${B}/tests/test_suite_* ${D}${PTEST_PATH}/tests/ + find ${D}${PTEST_PATH}/tests/ -type f -name "*.c" -delete + cp -fR ${S}/tests/data_files ${D}${PTEST_PATH}/tests/ +} diff --git a/meta-networking/recipes-connectivity/mbedtls/mbedtls_3.6.0.bb b/meta-networking/recipes-connectivity/mbedtls/mbedtls_3.6.0.bb new file mode 100644 index 0000000000..a10fce0ffc --- /dev/null +++ b/meta-networking/recipes-connectivity/mbedtls/mbedtls_3.6.0.bb @@ -0,0 +1,82 @@ +SUMMARY = "Lightweight crypto and SSL/TLS library" +DESCRIPTION = "mbedtls is a lean open source crypto library \ +for providing SSL and TLS support in your programs. It offers \ +an intuitive API and documented header files, so you can actually \ +understand what the code does. It features: \ + \ + - Symmetric algorithms, like AES, Blowfish, Triple-DES, DES, ARC4, \ + Camellia and XTEA \ + - Hash algorithms, like SHA-1, SHA-2, RIPEMD-160 and MD5 \ + - Entropy pool and random generators, like CTR-DRBG and HMAC-DRBG \ + - Public key algorithms, like RSA, Elliptic Curves, Diffie-Hellman, \ + ECDSA and ECDH \ + - SSL v3 and TLS 1.0, 1.1 and 1.2 \ + - Abstraction layers for ciphers, hashes, public key operations, \ + platform abstraction and threading \ +" + +HOMEPAGE = "https://tls.mbed.org/" + +LICENSE = "Apache-2.0 | GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://LICENSE;md5=379d5819937a6c2f1ef1630d341e026d" + +SECTION = "libs" + +S = "${WORKDIR}/git" +SRC_URI = "git://github.com/Mbed-TLS/mbedtls.git;protocol=https;branch=master \ + git://github.com/Mbed-TLS/mbedtls-framework.git;protocol=https;branch=main;destsuffix=git/framework;name=framework \ + file://run-ptest" + +SRCREV = "2ca6c285a0dd3f33982dd57299012dacab1ff206" +SRCREV_framework = "750634d3a51eb9d61b59fd5d801546927c946588" +SRCREV_FORMAT .= "_framework" + +UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" + +inherit cmake update-alternatives ptest + +PACKAGECONFIG ??= "shared-libs programs ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" +PACKAGECONFIG[shared-libs] = "-DUSE_SHARED_MBEDTLS_LIBRARY=ON,-DUSE_SHARED_MBEDTLS_LIBRARY=OFF" +PACKAGECONFIG[programs] = "-DENABLE_PROGRAMS=ON,-DENABLE_PROGRAMS=OFF" +PACKAGECONFIG[werror] = "-DMBEDTLS_FATAL_WARNINGS=ON,-DMBEDTLS_FATAL_WARNINGS=OFF" +# Make X.509 and TLS calls use PSA +# https://github.com/Mbed-TLS/mbedtls/blob/development/docs/use-psa-crypto.md +PACKAGECONFIG[psa] = "" +PACKAGECONFIG[tests] = "-DENABLE_TESTING=ON,-DENABLE_TESTING=OFF" + +EXTRA_OECMAKE = "-DLIB_INSTALL_DIR:STRING=${libdir}" + +# For now the only way to enable PSA is to explicitly pass a -D via CFLAGS +CFLAGS:append = "${@bb.utils.contains('PACKAGECONFIG', 'psa', ' -DMBEDTLS_USE_PSA_CRYPTO', '', d)}" + +PROVIDES += "polarssl" +RPROVIDES:${PN} = "polarssl" + +PACKAGES =+ "${PN}-programs" +FILES:${PN}-programs = "${bindir}/" + +ALTERNATIVE:${PN}-programs = "${@bb.utils.contains('PACKAGECONFIG', 'programs', 'hello', '', d)}" +ALTERNATIVE_LINK_NAME[hello] = "${bindir}/hello" + +BBCLASSEXTEND = "native nativesdk" + +CVE_PRODUCT = "mbed_tls" + +# Strip host paths from autogenerated test files +do_compile:append() { + sed -i 's+${S}/++g' ${B}/tests/*.c 2>/dev/null || : + sed -i 's+${B}/++g' ${B}/tests/*.c 2>/dev/null || : +} + +# Export source files/headers needed by Arm Trusted Firmware +sysroot_stage_all:append() { + sysroot_stage_dir "${S}/library" "${SYSROOT_DESTDIR}/usr/share/mbedtls-source/library" + sysroot_stage_dir "${S}/include" "${SYSROOT_DESTDIR}/usr/share/mbedtls-source/include" +} + +do_install_ptest () { + install -d ${D}${PTEST_PATH}/tests + cp -f ${B}/tests/test_suite_* ${D}${PTEST_PATH}/tests/ + find ${D}${PTEST_PATH}/tests/ -type f -name "*.c" -delete + cp -fR ${S}/tests/data_files ${D}${PTEST_PATH}/tests/ +} diff --git a/meta-networking/recipes-connectivity/miniupnpd/files/0001-Add-OpenEmbedded-cross-compile-case.patch b/meta-networking/recipes-connectivity/miniupnpd/files/0001-Add-OpenEmbedded-cross-compile-case.patch new file mode 100644 index 0000000000..e33d8eac1d --- /dev/null +++ b/meta-networking/recipes-connectivity/miniupnpd/files/0001-Add-OpenEmbedded-cross-compile-case.patch @@ -0,0 +1,38 @@ +From 54698856e5602bbd9d61e855814c854a013b4840 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 22 Dec 2018 18:47:45 -0800 +Subject: [PATCH] Add OpenEmbedded cross compile case + +Upstream-Status: Submitted [https://github.com/miniupnp/miniupnp/pull/410] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + genconfig.sh | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +--- a/genconfig.sh ++++ b/genconfig.sh +@@ -103,6 +103,12 @@ if [ -f ../shared/tomato_version ]; then + OS_VERSION="Tomato $TOMATO_VER" + fi + ++# OpenEmbedded special case ++if [ -f ./os.openembedded ]; then ++ OS_NAME=OpenEmbedded ++ OS_VERSION=$(cat ./os.openembedded) ++fi ++ + ${RM} ${CONFIGFILE} + + echo "/* MiniUPnP Project" >> ${CONFIGFILE} +@@ -346,6 +352,11 @@ case $OS_NAME in + echo "#define USE_IFACEWATCHER 1" >> ${CONFIGFILE} + FW=iptables + ;; ++ OpenEmbedded) ++ OS_URL=http://www.openembedded.org/ ++ echo "#define USE_IFACEWATCHER 1" >> ${CONFIGFILE} ++ FW=iptables ++ ;; + AstLinux) + OS_URL=http://www.astlinux.org/ + echo "#define USE_IFACEWATCHER 1" >> ${CONFIGFILE} diff --git a/meta-networking/recipes-connectivity/miniupnpd/files/miniupnpd.service b/meta-networking/recipes-connectivity/miniupnpd/files/miniupnpd.service new file mode 100644 index 0000000000..e7bfad0a93 --- /dev/null +++ b/meta-networking/recipes-connectivity/miniupnpd/files/miniupnpd.service @@ -0,0 +1,14 @@ +[Unit] +Description=Lightweight UPnP IGD daemon +Documentation=man:miniupnpd(8) +After=network.target + +[Service] +Type=forking +ExecStartPre=/etc/miniupnpd/iptables_init.sh +ExecStart=/usr/sbin/miniupnpd -f /etc/miniupnpd/miniupnpd.conf +ExecStopPost=/etc/miniupnpd/iptables_removeall.sh +PIDFile=/run/miniupnpd.pid + +[Install] +WantedBy=network.target diff --git a/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.0.bb b/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20191006.bb index c6f36e1375..1c2f030f83 100644 --- a/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.0.bb +++ b/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20191006.bb @@ -5,21 +5,28 @@ the network." SECTION = "networking" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=aa71c78c373ccfe0ff207af0cd966d91" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a1ed15843ce66639bcf9f109cf247870" -inherit autotools gettext pkgconfig +inherit autotools gettext pkgconfig systemd DEPENDS += "iptables net-tools util-linux libmnl libnetfilter-conntrack" -SRC_URI = "http://miniupnp.tuxfamily.org/files/download.php?file=${P}.tar.gz;downloadfilename=${P}.tar.gz \ -" -SRC_URI[md5sum] = "1c07a215dd9b362e75a9efc05e2fb3b4" -SRC_URI[sha256sum] = "d96aa3a00e0f5490826bba3cb97e68cd27479e5839adac4b9bcb66eae786bfb7" +SRC_URI = "http://miniupnp.tuxfamily.org/files/download.php?file=${BP}.tar.gz;downloadfilename=${BP}.tar.gz \ + file://miniupnpd.service \ + file://0001-Add-OpenEmbedded-cross-compile-case.patch \ + " +SRC_URI[md5sum] = "340789edd49c113afe37834cc901a1e8" +SRC_URI[sha256sum] = "218fad7af31f3c22fb4c9db28a55a2a8b5067d41f5b38f52008a057a00d2206d" IPV6 = "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '--ipv6', '', d)}" +do_configure:prepend() { + echo "${@d.getVar('DISTRO_VERSION')}" > ${S}/os.openembedded +} + do_compile() { cd ${S} + CONFIG_OPTIONS="${IPV6} --leasefile --vendorcfg" oe_runmake -f Makefile.linux config.h CONFIG_OPTIONS="${IPV6} --leasefile --vendorcfg" oe_runmake -f Makefile.linux } @@ -30,8 +37,14 @@ do_install() { install ${S}/netfilter/iptables_init.sh ${D}/${sysconfdir}/${BPN} install ${S}/netfilter/iptables_removeall.sh ${D}/${sysconfdir}/${BPN} install ${S}/netfilter/ip6tables_init.sh ${D}/${sysconfdir}/${BPN} + install ${S}/netfilter/miniupnpd_functions.sh ${D}/${sysconfdir}/${BPN} install ${S}/netfilter/ip6tables_removeall.sh ${D}/${sysconfdir}/${BPN} install -m 0644 -b ${S}/miniupnpd.conf ${D}/${sysconfdir}/${BPN} install -d ${D}/${sysconfdir}/init.d install ${S}/linux/miniupnpd.init.d.script ${D}/${sysconfdir}/init.d/miniupnpd + + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${UNPACKDIR}/miniupnpd.service ${D}${systemd_unitdir}/system/ } + +SYSTEMD_SERVICE:${PN} = "miniupnpd.service" diff --git a/meta-networking/recipes-connectivity/mosquitto/files/1571.patch b/meta-networking/recipes-connectivity/mosquitto/files/1571.patch new file mode 100644 index 0000000000..627638ec89 --- /dev/null +++ b/meta-networking/recipes-connectivity/mosquitto/files/1571.patch @@ -0,0 +1,22 @@ +Upstream-Status: Submitted [https://github.com/eclipse/mosquitto/pull/1571] +From 3fe5468f1bdca1bff1d18cf43c9e338f41aa9e32 Mon Sep 17 00:00:00 2001 +From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it> +Date: Wed, 22 Jan 2020 12:39:49 +0100 +Subject: [PATCH] Add dynamic symbols linking with cmake too + +Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it> +--- + lib/CMakeLists.txt | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/lib/CMakeLists.txt ++++ b/lib/CMakeLists.txt +@@ -94,6 +94,8 @@ + OUTPUT_NAME mosquitto + VERSION ${VERSION} + SOVERSION 1 ++ LINK_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/linker.version ++ LINK_FLAGS "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/linker.version" + ) + + install(TARGETS libmosquitto diff --git a/meta-networking/recipes-connectivity/mosquitto/files/2894.patch b/meta-networking/recipes-connectivity/mosquitto/files/2894.patch new file mode 100644 index 0000000000..7374cbd26f --- /dev/null +++ b/meta-networking/recipes-connectivity/mosquitto/files/2894.patch @@ -0,0 +1,25 @@ +From: Joachim Zobel <jz-2017@heute-morgen.de> +Date: Wed, 13 Sep 2023 09:55:34 +0200 +Subject: [PATCH] Link correctly with shared websockets library if needed see: + https://github.com/eclipse/mosquitto/pull/2751 + +Patch contributed by Joachim Zobel <jz-2017@heute-morgen.de> and Daniel Engberg <daniel.engberg.lists@pyret.net> +--- +Upstream-Status: Pending + + src/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 9380a04..dce8313 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -200,7 +200,7 @@ if (WITH_WEBSOCKETS) + link_directories(${mosquitto_SOURCE_DIR}) + endif (WIN32) + else (STATIC_WEBSOCKETS) +- set (MOSQ_LIBS ${MOSQ_LIBS} websockets) ++ set (MOSQ_LIBS ${MOSQ_LIBS} websockets_shared) + endif (STATIC_WEBSOCKETS) + endif (WITH_WEBSOCKETS) + diff --git a/meta-networking/recipes-connectivity/mosquitto/files/2895.patch b/meta-networking/recipes-connectivity/mosquitto/files/2895.patch new file mode 100644 index 0000000000..853f881754 --- /dev/null +++ b/meta-networking/recipes-connectivity/mosquitto/files/2895.patch @@ -0,0 +1,27 @@ +From: Joachim Zobel <jz-2017@heute-morgen.de> +Date: Wed, 13 Sep 2023 10:05:43 +0200 +Subject: [PATCH] Mosquitto now waits for network-online when starting + (Closes: #1036450) + +See: https://github.com/eclipse/mosquitto/issues/2878 +--- +Upstream-Status: Pending + + service/systemd/mosquitto.service.simple | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/service/systemd/mosquitto.service.simple b/service/systemd/mosquitto.service.simple +index 15ee0d6..c2a330b 100644 +--- a/service/systemd/mosquitto.service.simple ++++ b/service/systemd/mosquitto.service.simple +@@ -1,8 +1,8 @@ + [Unit] + Description=Mosquitto MQTT Broker + Documentation=man:mosquitto.conf(5) man:mosquitto(8) +-After=network.target +-Wants=network.target ++After=network-online.target ++Wants=network-online.target + + [Service] + ExecStart=/usr/sbin/mosquitto -c /etc/mosquitto/mosquitto.conf diff --git a/meta-networking/recipes-connectivity/mosquitto/files/mosquitto.init b/meta-networking/recipes-connectivity/mosquitto/files/mosquitto.init new file mode 100644 index 0000000000..d0da219d6d --- /dev/null +++ b/meta-networking/recipes-connectivity/mosquitto/files/mosquitto.init @@ -0,0 +1,89 @@ +#!/bin/sh + +# Based on the Debian initscript for mosquitto + +### BEGIN INIT INFO +# Provides: mosquitto +# Required-Start: $remote_fs $syslog +# Required-Stop: $remote_fs $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: mosquitto MQTT 3.1/3.1.1 message broker +# Description: +# This is a message broker that supports version 3.1 of the MQ Telemetry +# Transport (MQTT) protocol. +# +# MQTT provides a method of carrying out messaging using a publish/subscribe +# model. It is lightweight, both in terms of bandwidth usage and ease of +# implementation. This makes it particularly useful at the edge of the network +# where a sensor or other simple device may be implemented using an arduino for +# example. +### END INIT INFO + +set -e + +PIDFILE=@LOCALSTATEDIR@/run/mosquitto.pid +DAEMON=@SBINDIR@/mosquitto + +# start and stop the mosquitto MQTT message broker + +test -x ${DAEMON} || exit 0 + +umask 022 + +. @SYSCONFDIR@/init.d/functions + +export PATH="${PATH:+$PATH:}@SBINDIR@:@BASE_SBINDIR@" + +case "$1" in + start) + echo "Starting Mosquitto message broker" "mosquitto" + if start-stop-daemon --start --quiet --oknodo --background --make-pidfile --pidfile ${PIDFILE} --exec ${DAEMON} -- -c @SYSCONFDIR@/mosquitto/mosquitto.conf ; then + exit 0 + else + exit 1 + fi + ;; + stop) + echo "Stopping Mosquitto message broker" "mosquitto" + if start-stop-daemon --stop --quiet --oknodo --pidfile ${PIDFILE}; then + rm -f ${PIDFILE} + exit 0 + else + exit 1 + fi + ;; + + + reload|force-reload) + if [ -f ${PIDFILE} ] ; then + echo "Reloading configuration for mosquitto" + pid=`cat ${PIDFILE}` + kill -HUP $pid + else + echo "mosquitto does not seem to be running" + fi + ;; + + restart) + echo "Restarting Mosquitto message broker" "mosquitto" + if start-stop-daemon --stop --quiet --oknodo --retry 30 --pidfile ${PIDFILE}; then + rm -f ${PIDFILE} + fi + if start-stop-daemon --start --quiet --oknodo --background --make-pidfile --pidfile ${PIDFILE} --exec ${DAEMON} -- -c @SYSCONFDIR@/mosquitto/mosquitto.conf ; then + exit 0 + else + exit 1 + fi + ;; + + status) + status ${DAEMON} && exit 0 || exit $? + ;; + + *) + echo "Usage: $0 {start|stop|reload|force-reload|restart|status}" + exit 1 +esac + +exit 0 diff --git a/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.18.bb b/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.18.bb new file mode 100644 index 0000000000..4ef0654102 --- /dev/null +++ b/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.18.bb @@ -0,0 +1,92 @@ +SUMMARY = "Open source MQTT implementation" +DESCRIPTION = "Mosquitto is an open source (Eclipse licensed) message broker \ +that implements the MQ Telemetry Transport protocol version 3.1, 3.1.1 and \ +5, providing both an MQTT broker and several command-line clients. MQTT \ +provides a lightweight method of carrying out messaging using a \ +publish/subscribe model. " +HOMEPAGE = "http://mosquitto.org/" +SECTION = "console/network" +LICENSE = "EPL-2.0 | EDL-1.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=ca9a8f366c6babf593e374d0d7d58749 \ + file://edl-v10;md5=9f6accb1afcb570f8be65039e2fcd49e \ + file://epl-v20;md5=2dd765ca47a05140be15ebafddbeadfe \ + file://NOTICE.md;md5=a7a91b4754c6f7995020d1b49bc829c6 \ +" +DEPENDS = "uthash cjson" + +SRC_URI = "http://mosquitto.org/files/source/mosquitto-${PV}.tar.gz \ + file://mosquitto.init \ + file://1571.patch \ + file://2894.patch \ + file://2895.patch \ +" + +SRC_URI[sha256sum] = "d665fe7d0032881b1371a47f34169ee4edab67903b2cd2b4c083822823f4448a" + +inherit systemd update-rc.d useradd cmake pkgconfig + +PACKAGECONFIG ??= "ssl websockets \ + ${@bb.utils.filter('DISTRO_FEATURES','systemd', d)} \ + " + +PACKAGECONFIG[manpages] = "-DDOCUMENTATION=ON,-DDOCUMENTATION=OFF,libxslt-native docbook-xsl-stylesheets-native" +PACKAGECONFIG[dns-srv] = "-DWITH_SRV=ON,-DWITH_SRV=OFF,c-ares" +PACKAGECONFIG[ssl] = "-DWITH_TLS=ON -DWITH_TLS_PSK=ON -DWITH_EC=ON,-DWITH_TLS=OFF -DWITH_TLS_PSK=OFF -DWITH_EC=OFF,openssl" +PACKAGECONFIG[systemd] = "-DWITH_SYSTEMD=ON,-DWITH_SYSTEMD=OFF,systemd" +PACKAGECONFIG[websockets] = "-DWITH_WEBSOCKETS=ON,-DWITH_WEBSOCKETS=OFF,libwebsockets" +PACKAGECONFIG[dlt] = "-DWITH_DLT=ON,-DWITH_DLT=OFF,dlt-daemon" + +EXTRA_OECMAKE = " \ + -DWITH_BUNDLED_DEPS=OFF \ + -DWITH_ADNS=ON \ +" + +do_install:append() { + install -d ${D}${systemd_unitdir}/system/ + install -m 0644 ${S}/service/systemd/mosquitto.service.notify ${D}${systemd_unitdir}/system/mosquitto.service + + install -d ${D}${sysconfdir}/init.d/ + install -m 0755 ${UNPACKDIR}/mosquitto.init ${D}${sysconfdir}/init.d/mosquitto + sed -i -e 's,@SBINDIR@,${sbindir},g' \ + -e 's,@BASE_SBINDIR@,${base_sbindir},g' \ + -e 's,@LOCALSTATEDIR@,${localstatedir},g' \ + -e 's,@SYSCONFDIR@,${sysconfdir},g' \ + ${D}${sysconfdir}/init.d/mosquitto +} + +PACKAGES += "libmosquitto1 libmosquittopp1 ${PN}-clients" + +PACKAGE_BEFORE_PN = "${PN}-examples" + +FILES:${PN} = "${sbindir}/mosquitto \ + ${bindir}/mosquitto_passwd \ + ${bindir}/mosquitto_ctrl \ + ${libdir}/mosquitto_dynamic_security.so \ + ${sysconfdir}/mosquitto \ + ${sysconfdir}/init.d \ + ${systemd_unitdir}/system/mosquitto.service \ +" + +CONFFILES:${PN} += "${sysconfdir}/mosquitto/mosquitto.conf" + +FILES:libmosquitto1 = "${libdir}/libmosquitto.so.*" + +FILES:libmosquittopp1 = "${libdir}/libmosquittopp.so.*" + +FILES:${PN}-clients = "${bindir}/mosquitto_pub \ + ${bindir}/mosquitto_sub \ + ${bindir}/mosquitto_rr \ +" + +FILES:${PN}-examples = "${sysconfdir}/mosquitto/*.example" + +SYSTEMD_SERVICE:${PN} = "mosquitto.service" + +INITSCRIPT_NAME = "mosquitto" +INITSCRIPT_PARAMS = "defaults 30" + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM:${PN} = "--system --no-create-home --shell /bin/false \ + --user-group mosquitto" + +BBCLASSEXTEND = "native" diff --git a/meta-networking/recipes-connectivity/nanomsg/nanomsg_1.2.1.bb b/meta-networking/recipes-connectivity/nanomsg/nanomsg_1.2.1.bb new file mode 100644 index 0000000000..c250ea8779 --- /dev/null +++ b/meta-networking/recipes-connectivity/nanomsg/nanomsg_1.2.1.bb @@ -0,0 +1,28 @@ +SUMMARY = "nanomsg socket library" +DESCRIPTION = "nanomsg is a socket library that provides several common \ +communication patterns. It aims to make the networking layer fast, scalable, \ +and easy to use. Implemented in C, it works on a wide range of operating \ +systems with no further dependencies." +HOMEPAGE = "https://nanomsg.org/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=587b3fd7fd291e418ff4d2b8f3904755" + +SECTION = "libs/networking" + +SRC_URI = "git://github.com/nanomsg/nanomsg.git;protocol=https;branch=master" +SRCREV = "fc3f684a80151a3319446fc96083a9ff384ee4fe" + +S = "${WORKDIR}/git" + +inherit cmake pkgconfig + +# nanomsg documentation generation requires asciidoctor, +# not asciidoc, and currently there's no asciidoctor-native +# recipe anywhere in openembedded-core or meta-openembedded +EXTRA_OECMAKE = " -DNN_ENABLE_DOC=OFF " + +# we don't want nanomsg-tools to be renamed to libnanomsg-tools +DEBIAN_NOAUTONAME:${PN}-tools = "1" + +PACKAGES =+ "${PN}-tools" +FILES:${PN}-tools = "${bindir}/*" diff --git a/meta-networking/recipes-connectivity/nanomsg/nng_1.7.3.bb b/meta-networking/recipes-connectivity/nanomsg/nng_1.7.3.bb new file mode 100644 index 0000000000..a6556249b7 --- /dev/null +++ b/meta-networking/recipes-connectivity/nanomsg/nng_1.7.3.bb @@ -0,0 +1,22 @@ +SUMMARY = "nanomsg-next-generation -- light-weight brokerless messaging" +DESCRIPTION = "NNG, like its predecessors nanomsg (and to some extent ZeroMQ), is a lightweight, broker-less library, offering a simple API to solve common recurring messaging problems, such as publish/subscribe, RPC-style request/reply, or service discovery." +HOMEPAGE = "https://github.com/nanomsg/nng" +SECTION = "libs/networking" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a41e579bb4326c21c774f8e51e41d8a3" + +SRC_URI = "git://github.com/nanomsg/nng.git;branch=master;protocol=https" +SRCREV = "85fbe7f9e4642b554d0d97f2e3ff2aa12978691a" + +S = "${WORKDIR}/git" + +inherit cmake pkgconfig + +EXTRA_OECMAKE = "-DBUILD_SHARED_LIBS=ON -DNNG_ENABLE_NNGCAT=ON" + +PACKAGECONFIG ??= "" + +PACKAGECONFIG[mbedtls] = "-DNNG_ENABLE_TLS=ON,-DNNG_ENABLE_TLS=OFF,mbedtls" + +PACKAGES =+ "${PN}-tools" +FILES:${PN}-tools = "${bindir}/*" diff --git a/meta-networking/recipes-connectivity/nanomsg/nngpp_git.bb b/meta-networking/recipes-connectivity/nanomsg/nngpp_git.bb new file mode 100644 index 0000000000..b52154025b --- /dev/null +++ b/meta-networking/recipes-connectivity/nanomsg/nngpp_git.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "C++ wrapper around the nanomsg NNG API" +HOMEPAGE = "https://github.com/cwzx/nngpp" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://license.txt;md5=6d17d78c3597e0d4452fb1c63bf7c58e" +DEPENDS = "nng" + +SRCREV = "cc5d2641babab165d8a9943817c46d36c6dc17c2" +PV = "1.3.0" + +SRC_URI = "git://github.com/cwzx/nngpp;branch=master;protocol=https" + +S = "${WORKDIR}/git" + +inherit cmake diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager-fortisslvpn/0001-fix-ppp-2.5.0-build.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager-fortisslvpn/0001-fix-ppp-2.5.0-build.patch new file mode 100644 index 0000000000..2e84a334f0 --- /dev/null +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager-fortisslvpn/0001-fix-ppp-2.5.0-build.patch @@ -0,0 +1,306 @@ +From 084ef529c5fb816927ca54866f66b340265aa9f6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Eivind=20N=C3=A6ss?= <eivnaes@yahoo.com> +Date: Sat, 4 Mar 2023 21:20:43 +0000 +Subject: [PATCH] Adding support for compiling against pppd-2.5.0 (or master + branch) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Backport +Signed-off-by: Eivind Næss <eivnaes@yahoo.com> +--- + Makefile.am | 5 +- + configure.ac | 37 +++++++- + src/nm-fortisslvpn-pppd-compat.h | 93 +++++++++++++++++++ + src/nm-fortisslvpn-pppd-plugin.c | 24 ++--- + ...-status.h => nm-fortisslvpn-pppd-status.h} | 0 + src/nm-fortisslvpn-service.c | 2 +- + 6 files changed, 145 insertions(+), 16 deletions(-) + create mode 100644 src/nm-fortisslvpn-pppd-compat.h + rename src/{nm-ppp-status.h => nm-fortisslvpn-pppd-status.h} (100%) + +diff --git a/Makefile.am b/Makefile.am +index b2e5533..e1e5ec9 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -81,7 +81,7 @@ libexec_PROGRAMS += src/nm-fortisslvpn-service + src_nm_fortisslvpn_service_SOURCES = \ + shared/nm-utils/nm-shared-utils.c \ + shared/nm-utils/nm-shared-utils.h \ +- src/nm-ppp-status.h \ ++ src/nm-fortisslvpn-pppd-status.h \ + src/nm-fortisslvpn-service.h \ + src/nm-fortisslvpn-service.c \ + shared/nm-fortissl-properties.c \ +@@ -106,7 +106,8 @@ src_nm_fortisslvpn_pppd_plugin_la_SOURCES = \ + shared/nm-utils/nm-shared-utils.c \ + shared/nm-utils/nm-shared-utils.h \ + src/nm-fortisslvpn-pppd-plugin.c \ +- src/nm-ppp-status.h ++ src/nm-fortisslvpn-pppd-compat.h \ ++ src/nm-fortisslvpn-pppd-status.h + nodist_src_nm_fortisslvpn_pppd_plugin_la_SOURCES = \ + src/nm-fortisslvpn-pppd-service-dbus.h + src_nm_fortisslvpn_pppd_plugin_la_CPPFLAGS = $(src_cppflags) +diff --git a/configure.ac b/configure.ac +index a998707..877493e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -19,7 +19,10 @@ AC_PROG_CC + AM_PROG_CC_C_O + AC_PROG_INSTALL + AC_PROG_LIBTOOL ++AC_PROG_CPP ++AC_PROG_EGREP + AC_PATH_PROG(GLIB_COMPILE_RESOURCES, glib-compile-resources) ++PKG_PROG_PKG_CONFIG() + + AC_GNU_SOURCE + +@@ -37,20 +40,50 @@ dnl + dnl Required headers + dnl + AC_HEADER_STDC +-AC_CHECK_HEADERS(fcntl.h paths.h sys/ioctl.h sys/time.h syslog.h unistd.h) ++AC_CHECK_HEADERS(fcntl.h paths.h stdarg.h stdbool.h sys/ioctl.h sys/time.h syslog.h unistd.h) + + AC_CHECK_HEADERS(pppd/pppd.h,, + AC_MSG_ERROR(couldn't find pppd.h. pppd development headers are required.)) + ++dnl ++dnl Check the presense of other pppd/*.h files ++AC_CHECK_HEADERS([ ++ pppd/chap.h ++ pppd/chap-new.h ++ pppd/chap_ms.h ++ ]) ++ ++dnl ++dnl Versions >= 2.5.0 will have pkg-config support ++PKG_CHECK_EXISTS([pppd], ++ [AS_VAR_SET([pppd_pkgconfig_support],[yes])]) ++ ++dnl ++dnl Get the version of pppd using pkg-config, assume 2.4.9 if not present ++PPPD_VERSION=2.4.5 ++if test x"$pppd_pkgconfig_support" = xyes; then ++ PPPD_VERSION=`$PKG_CONFIG --modversion pppd` ++fi ++ ++ + AC_ARG_WITH([pppd-plugin-dir], AS_HELP_STRING([--with-pppd-plugin-dir=DIR], [path to the pppd plugins directory])) + + if test -n "$with_pppd_plugin_dir" ; then + PPPD_PLUGIN_DIR="$with_pppd_plugin_dir" + else +- PPPD_PLUGIN_DIR="${libdir}/pppd/2.4.5" ++ PPPD_PLUGIN_DIR="${libdir}/pppd/$PPPD_VERSION" + fi + AC_SUBST(PPPD_PLUGIN_DIR) + ++dnl The version of pppd dictates what code can be included, i.e. enable use of ++dnl #if WITH_PPP_VERSION >= PPP_VERSION(2,5,0) in the code ++AC_DEFINE_UNQUOTED([PPP_VERSION(x,y,z)], ++ [((x & 0xFF) << 16 | (y & 0xFF) << 8 | (z & 0xFF) << 0)], ++ [Macro to help determine the particular version of pppd]) ++PPP_VERSION=$(echo $PPPD_VERSION | sed -e "s/\./\,/g") ++AC_DEFINE_UNQUOTED(WITH_PPP_VERSION, PPP_VERSION($PPP_VERSION), ++ [The real version of pppd represented as an int]) ++ + dnl + dnl Checks for typedefs, structures, and compiler characteristics. + dnl +diff --git a/src/nm-fortisslvpn-pppd-compat.h b/src/nm-fortisslvpn-pppd-compat.h +new file mode 100644 +index 0000000..9a02908 +--- /dev/null ++++ b/src/nm-fortisslvpn-pppd-compat.h +@@ -0,0 +1,93 @@ ++/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ ++/* nm-sstp-service - sstp (and other pppd) integration with NetworkManager ++ * ++ * Copyright (C) Eivind Næss, eivnaes@yahoo.com ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License along ++ * with this program; if not, write to the Free Software Foundation, Inc., ++ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ++ * ++ */ ++ ++#ifndef __NM_FORTISSLVPN_PPPD_COMPAT_H__ ++#define __NM_FORTISSLVPN_PPPD_COMPAT_H__ ++ ++#define INET6 1 ++ ++// PPP < 2.5.0 defines and exports VERSION which overlaps with current package VERSION define. ++// this silly macro magic is to work around that. ++ ++#undef VERSION ++#include <pppd/pppd.h> ++ ++#ifndef PPPD_VERSION ++#define PPPD_VERSION VERSION ++#endif ++ ++#include <pppd/fsm.h> ++#include <pppd/ccp.h> ++#include <pppd/eui64.h> ++#include <pppd/ipcp.h> ++#include <pppd/ipv6cp.h> ++#include <pppd/eap.h> ++#include <pppd/upap.h> ++ ++#ifdef HAVE_PPPD_CHAP_H ++ #include <pppd/chap.h> ++#endif ++ ++#ifdef HAVE_PPPD_CHAP_NEW_H ++ #include <pppd/chap-new.h> ++#endif ++ ++#ifdef HAVE_PPPD_CHAP_MS_H ++ #include <pppd/chap_ms.h> ++#endif ++ ++#ifndef PPP_PROTO_CHAP ++#define PPP_PROTO_CHAP 0xc223 ++#endif ++ ++#ifndef PPP_PROTO_EAP ++#define PPP_PROTO_EAP 0xc227 ++#endif ++ ++#if WITH_PPP_VERSION < PPP_VERSION(2,5,0) ++ ++static inline bool debug_on(void) ++{ ++ return debug; ++} ++ ++static inline const char *ppp_ipparam(void) ++{ ++ return ipparam; ++} ++ ++static inline int ppp_ifunit(void) ++{ ++ return ifunit; ++} ++ ++static inline const char *ppp_ifname(void) ++{ ++ return ifname; ++} ++ ++static inline int ppp_get_mtu(int idx) ++{ ++ return netif_get_mtu(idx); ++} ++ ++#endif // #if WITH_PPP_VERSION < PPP_VERSION(2,5,0) ++#endif // #ifdef __NM_FORTISSLVPN_PPPD_COMPAT_H__ +diff --git a/src/nm-fortisslvpn-pppd-plugin.c b/src/nm-fortisslvpn-pppd-plugin.c +index f2ad262..c2efb9a 100644 +--- a/src/nm-fortisslvpn-pppd-plugin.c ++++ b/src/nm-fortisslvpn-pppd-plugin.c +@@ -23,12 +23,6 @@ + #define ___CONFIG_H__ + #include <config.h> + +-#include <pppd/pppd.h> +-#include <pppd/fsm.h> +-#include <pppd/ipcp.h> +- +-#include "nm-default.h" +- + #include <sys/types.h> + #include <string.h> + #include <sys/socket.h> +@@ -42,10 +36,12 @@ + #include <grp.h> + #include <glib/gstdio.h> + ++#include "nm-fortisslvpn-pppd-status.h" ++#include "nm-fortisslvpn-pppd-compat.h" + #include "nm-fortisslvpn-pppd-service-dbus.h" +-#include "nm-fortisslvpn-service.h" +-#include "nm-ppp-status.h" + ++#include "nm-default.h" ++#include "nm-fortisslvpn-service.h" + #include "nm-utils/nm-shared-utils.h" + #include "nm-utils/nm-vpn-plugin-macros.h" + +@@ -80,7 +76,7 @@ static struct { + + int plugin_init (void); + +-char pppd_version[] = VERSION; ++char pppd_version[] = PPPD_VERSION; + + static void + chroot_sandbox (void) +@@ -296,7 +292,7 @@ get_ip4_routes (in_addr_t ouraddr) + static void + nm_ip_up (void *data, int arg) + { +- guint32 pppd_made_up_address = htonl (0x0a404040 + ifunit); ++ guint32 pppd_made_up_address = htonl (0x0a404040 + ppp_ifunit()); + ipcp_options opts = ipcp_gotoptions[0]; + ipcp_options peer_opts = ipcp_hisoptions[0]; + GVariantBuilder builder; +@@ -317,7 +313,7 @@ nm_ip_up (void *data, int arg) + + g_variant_builder_add (&builder, "{sv}", + NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV, +- g_variant_new_string (ifname)); ++ g_variant_new_string (ppp_ifname())); + + str = g_getenv ("VPN_GATEWAY"); + if (str) { +@@ -442,8 +438,14 @@ plugin_init (void) + return -1; + } + ++#if WITH_PPP_VERSION < PPP_VERSION(2,5,0) + add_notifier (&phasechange, nm_phasechange, NULL); + add_notifier (&ip_up_notifier, nm_ip_up, NULL); + add_notifier (&exitnotify, nm_exit_notify, NULL); ++#else ++ ppp_add_notify (NF_PHASE_CHANGE, nm_phasechange, NULL); ++ ppp_add_notify (NF_IP_UP, nm_ip_up, NULL); ++ ppp_add_notify (NF_EXIT, nm_exit_notify, NULL); ++#endif + return 0; + } +diff --git a/src/nm-ppp-status.h b/src/nm-fortisslvpn-pppd-status.h +similarity index 100% +rename from src/nm-ppp-status.h +rename to src/nm-fortisslvpn-pppd-status.h +diff --git a/src/nm-fortisslvpn-service.c b/src/nm-fortisslvpn-service.c +index 6c340d0..a8483c2 100644 +--- a/src/nm-fortisslvpn-service.c ++++ b/src/nm-fortisslvpn-service.c +@@ -40,7 +40,7 @@ + #include <glib/gstdio.h> + + #include "nm-fortissl-properties.h" +-#include "nm-ppp-status.h" ++#include "nm-fortisslvpn-pppd-status.h" + #include "nm-fortisslvpn-pppd-service-dbus.h" + #include "nm-utils/nm-shared-utils.h" + #include "nm-utils/nm-vpn-plugin-macros.h" +-- +GitLab + diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager-fortisslvpn/0002-fix-ppp-2.5.0-build.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager-fortisslvpn/0002-fix-ppp-2.5.0-build.patch new file mode 100644 index 0000000000..6ac8f2b643 --- /dev/null +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager-fortisslvpn/0002-fix-ppp-2.5.0-build.patch @@ -0,0 +1,34 @@ +From 8773f772d39f8eee6edc1fd2e5437c754ed41e1e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Eivind=20N=C3=A6ss?= <eivnaes@yahoo.com> +Date: Sat, 4 Mar 2023 21:29:54 +0000 +Subject: [PATCH] Fixing configure.ac from previous change +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Backport +Signed-off-by: Eivind Næss <eivnaes@yahoo.com> +--- + configure.ac | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 877493e..a5b4abb 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -47,11 +47,7 @@ AC_CHECK_HEADERS(pppd/pppd.h,, + + dnl + dnl Check the presense of other pppd/*.h files +-AC_CHECK_HEADERS([ +- pppd/chap.h +- pppd/chap-new.h +- pppd/chap_ms.h +- ]) ++AC_CHECK_HEADERS(pppd/chap.h pppd/chap-new.h pppd/chap_ms.h) + + dnl + dnl Versions >= 2.5.0 will have pkg-config support +-- +GitLab + diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager-fortisslvpn_1.4.0.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager-fortisslvpn_1.4.0.bb new file mode 100644 index 0000000000..48f50abaf1 --- /dev/null +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager-fortisslvpn_1.4.0.bb @@ -0,0 +1,71 @@ +SUMMARY = "Fortinet SSLVPN support for NetworkManager" +SECTION = "net/misc" + +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + +DEPENDS = "glib-2.0-native libxml2-native networkmanager ppp python3-packaging-native" + +GNOMEBASEBUILDCLASS = "autotools" +inherit gnomebase gettext useradd python3native + +SRC_URI = " \ + ${GNOME_MIRROR}/NetworkManager-fortisslvpn/${@gnome_verdir("${PV}")}/NetworkManager-fortisslvpn-${PV}.tar.xz \ + file://0001-fix-ppp-2.5.0-build.patch \ + file://0002-fix-ppp-2.5.0-build.patch \ +" +SRC_URI[sha256sum] = "b055e26349b516b23585798ab3ef57b436b014800e92a8ac732cfc8e76c5dafa" + +S = "${WORKDIR}/NetworkManager-fortisslvpn-${PV}" + +# meta-gnome in layers is required using gnome: +PACKAGECONFIG[gnome] = "--with-gnome,--without-gnome,gtk+3 libnma libsecret," +PACKAGECONFIG[gtk4] = "--with-gtk4,--without-gtk4,gtk4," + +EXTRA_OECONF = "--with-pppd-plugin-dir=${libdir}/pppd/${@get_ppp_version(d)}" + +def get_ppp_version(d): + import re + + pppd_plugin = d.expand('${STAGING_LIBDIR}/pppd') + if not os.path.isdir(pppd_plugin): + return None + + bb.debug(1, "pppd plugin dir %s" % pppd_plugin) + r = re.compile(r"\d*\.\d*\.\d*") + for f in os.listdir(pppd_plugin): + if os.path.isdir(os.path.join(pppd_plugin, f)): + ma = r.match(f) + if ma: + bb.debug(1, "pppd version dir %s" % f) + return f + else: + bb.debug(1, "under pppd plugin dir %s" % f) + + return None + +# gdbus-codegen requires target directories to exist +do_configure:append() { + mkdir -p ${B}/properties + mkdir -p ${B}/src +} + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM:${PN} = "--system nm-fortisslvpn" + +FILES:${PN} += " \ + ${libdir}/NetworkManager/*.so \ + ${libdir}/pppd/*/*.so \ + ${nonarch_libdir}/NetworkManager/VPN/nm-fortisslvpn-service.name \ +" + +FILES:${PN}-staticdev += " \ + ${libdir}/NetworkManager/*.a \ + ${libdir}/pppd/*/*.a \ +" + +RDEPENDS:${PN} = " \ + networkmanager \ + openfortivpn \ + ppp \ +" diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager-openconnect_1.2.8.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager-openconnect_1.2.8.bb new file mode 100644 index 0000000000..ee19afbd11 --- /dev/null +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager-openconnect_1.2.8.bb @@ -0,0 +1,47 @@ +SUMMARY = "OpenConnect VPN client for NetworkManager" +SECTION = "net/misc" + +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=186e8b54342da4f753a62b7748c947db" + +DEPENDS = "glib-2.0-native intltool-native libxml2 networkmanager openconnect" + +GNOMEBASEBUILDCLASS = "autotools" +inherit gnomebase useradd + +SRC_URI = "${GNOME_MIRROR}/NetworkManager-openconnect/${@gnome_verdir("${PV}")}/NetworkManager-openconnect-${PV}.tar.xz" + +SRC_URI[sha256sum] = "5dedaa785d82d8e239ddd082bfac5250c691e964464be1807b6827263633cdcc" + +S = "${WORKDIR}/NetworkManager-openconnect-${PV}" + +# meta-gnome in layers is required using gnome: +PACKAGECONFIG[gnome] = "--with-gnome,--without-gnome,gtk+3 gcr3 libnma libsecret," +PACKAGECONFIG[gtk4] = "--with-gtk4,--without-gtk4,gtk4," + +do_configure:append() { + # network-manager-openconnect.metainfo.xml is created in source folder but + # compile expects it in build folder. As long as nobody comes up with a + # better solution just support build: + if [ -e ${S}/appdata/network-manager-openconnect.metainfo.xml ]; then + mkdir -p ${B}/appdata + cp -f ${S}/appdata/network-manager-openconnect.metainfo.xml ${B}/appdata/ + fi +} + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM:${PN} = "--system nm-openconnect" + +FILES:${PN} += " \ + ${libdir}/NetworkManager/*.so \ + ${nonarch_libdir}/NetworkManager/VPN/nm-openconnect-service.name \ +" + +FILES:${PN}-staticdev += " \ + ${libdir}/NetworkManager/*.a \ +" + +RDEPENDS:${PN} = " \ + networkmanager \ + openconnect \ +" diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn/0001-linker-scripts-Do-not-export-_IO_stdin_used.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn/0001-linker-scripts-Do-not-export-_IO_stdin_used.patch new file mode 100644 index 0000000000..eafd497ae2 --- /dev/null +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn/0001-linker-scripts-Do-not-export-_IO_stdin_used.patch @@ -0,0 +1,30 @@ +From e09ba80e342b3b24bb2a46e11dae1c30cc61c75c Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 3 Sep 2023 08:48:42 -0700 +Subject: [PATCH] linker-script: Do not export _IO_stdin_used + +This is glibc specific toolhain issue, it should have been handled in +toolchain instead of exposing to applications. This was done to fix + +https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=835550 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + linker-script-binary.ver | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/linker-script-binary.ver b/linker-script-binary.ver +index a2780c0..f030d35 100644 +--- a/linker-script-binary.ver ++++ b/linker-script-binary.ver +@@ -1,6 +1,5 @@ + { + global: +- _IO_stdin_used; + local: + *; + }; +-- +2.42.0 + diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.11.0.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.11.0.bb new file mode 100644 index 0000000000..f44526ff98 --- /dev/null +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.11.0.bb @@ -0,0 +1,55 @@ +SUMMARY = "NetworkManager-openvpn-plugin" +SECTION = "net/misc" + +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=100d5a599bead70ddcd70dcd73f2e29c" + +DEPENDS = "dbus dbus-glib networkmanager openvpn intltool-native glib-2.0-native" + +GNOMEBASEBUILDCLASS = "autotools" +inherit gnomebase useradd gettext systemd + +SRC_URI = "${GNOME_MIRROR}/NetworkManager-openvpn/${@gnome_verdir("${PV}")}/NetworkManager-openvpn-${PV}.tar.xz" + +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)}" + +SRC_URI[sha256sum] = "2128de06f91b33c13d63cdaa6e178bc1ca57fc770cde3bc7c24891f4d9824501" + +S = "${WORKDIR}/NetworkManager-openvpn-${PV}" + +# meta-gnome in layers is required using gnome: +PACKAGECONFIG[gnome] = "--with-gnome,--without-gnome,gtk+3 libnma libsecret" + +do_configure:append() { + # network-manager-openvpn.metainfo.xml is created in source folder but + # compile expects it in build folder. As long as nobody comes up with a + # better solution just support build: + if [ -e ${S}/appdata/network-manager-openvpn.metainfo.xml ]; then + mkdir -p ${B}/appdata + cp -f ${S}/appdata/network-manager-openvpn.metainfo.xml ${B}/appdata/ + fi +} + +do_install:append () { + rm -rf ${D}${libdir}/NetworkManager/*.la +} + +# Create user and group nm-openvpn that are needed since version 1.0.6 +USERADD_PACKAGES = "${PN}" +USERADD_PARAM:${PN} = "--system nm-openvpn" + +FILES:${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/metainfo \ + ${libdir}/NetworkManager/*.so \ + ${nonarch_libdir}/NetworkManager/VPN/nm-openvpn-service.name \ +" + +FILES:${PN}-staticdev += " \ + ${libdir}/NetworkManager/*.a \ +" + +RDEPENDS:${PN} = " \ + networkmanager \ + openvpn \ +" diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.2.8.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.2.8.bb deleted file mode 100644 index cce3f91880..0000000000 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.2.8.bb +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "NetworkManager-openvpn-plugin" -SECTION = "net/misc" - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=100d5a599bead70ddcd70dcd73f2e29c" - -DEPENDS = "dbus dbus-glib networkmanager openvpn intltool-native glib-2.0-native" - -inherit gnomebase useradd gettext systemd - -SRC_URI = "${GNOME_MIRROR}/NetworkManager-openvpn/${@gnome_verdir("${PV}")}/NetworkManager-openvpn-${PV}.tar.xz" -SRC_URI[md5sum] = "9f325be386aa906ff9b0b7c0bdf2a59a" -SRC_URI[sha256sum] = "3e0b4007f248d96df4b8eb5d0f937536044af7053debbbf525e67c9bc5d30654" - -S = "${WORKDIR}/NetworkManager-openvpn-${PV}" - -PACKAGECONFIG[gnome] = "--with-gnome,--without-gnome" - -do_install_append () { - rm -rf ${D}${libdir}/NetworkManager/*.la -} - -# Create user and group nm-openvpn that are needed since version 1.0.6 -USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--system nm-openvpn" - -FILES_${PN} += " \ - ${libdir}/NetworkManager/*.so \ - ${libdir}/NetworkManager/VPN/nm-openvpn-service.name \ -" - -FILES_${PN}-staticdev += " \ - ${libdir}/NetworkManager/*.a \ -" - -RDEPENDS_${PN} = " \ - networkmanager \ - openvpn \ -" diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-adjust-net-headers-for-musl-compatibility.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-adjust-net-headers-for-musl-compatibility.patch deleted file mode 100644 index ced0c7cfff..0000000000 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-adjust-net-headers-for-musl-compatibility.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 047d3bf96b510740f64687480333c378e414995f Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 31 Mar 2017 15:57:05 -0700 -Subject: [PATCH 1/5] adjust net/ headers for musl compatibility - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - libnm-core/nm-utils.c | 12 +++++++----- - libnm-core/nm-utils.h | 5 ++--- - src/platform/wifi/wifi-utils.h | 2 +- - 3 files changed, 10 insertions(+), 9 deletions(-) - -diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c -index df75d56..868224e 100644 ---- a/libnm-core/nm-utils.c -+++ b/libnm-core/nm-utils.c -@@ -19,24 +19,26 @@ - * Copyright 2005 - 2014 Red Hat, Inc. - */ - --#include "nm-default.h" -- --#include "nm-utils.h" -- - #include <string.h> - #include <errno.h> - #include <stdlib.h> --#include <netinet/ether.h> - #include <arpa/inet.h> - #include <uuid/uuid.h> - #include <libintl.h> - #include <gmodule.h> - #include <sys/stat.h> -+//#include <net/if_arp.h> -+//#include <net/ethernet.h> -+#include <netinet/ether.h> -+ -+#include "nm-default.h" - -+#include "nm-utils.h" - #if WITH_JANSSON - #include <jansson.h> - #endif - -+ - #include "nm-common-macros.h" - #include "nm-utils-private.h" - #include "nm-setting-private.h" -diff --git a/libnm-core/nm-utils.h b/libnm-core/nm-utils.h -index 407c14e..156ccae 100644 ---- a/libnm-core/nm-utils.h -+++ b/libnm-core/nm-utils.h -@@ -27,11 +27,10 @@ - - #include <glib.h> - --#include <netinet/in.h> -- - /* For ETH_ALEN and INFINIBAND_ALEN */ --#include <linux/if_ether.h> -+//#include <linux/if_ether.h> - #include <linux/if_infiniband.h> -+#include <netinet/in.h> - - #include "nm-core-enum-types.h" - #include "nm-setting-wireless-security.h" -diff --git a/src/platform/wifi/wifi-utils.h b/src/platform/wifi/wifi-utils.h -index 8e2b93f..84f5ce9 100644 ---- a/src/platform/wifi/wifi-utils.h -+++ b/src/platform/wifi/wifi-utils.h -@@ -22,7 +22,7 @@ - #ifndef __WIFI_UTILS_H__ - #define __WIFI_UTILS_H__ - --#include <net/ethernet.h> -+//#include <net/ethernet.h> - - #include "nm-dbus-interface.h" - --- -2.12.1 - diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-check-for-strndupa-before-using-it.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-check-for-strndupa-before-using-it.patch deleted file mode 100644 index 26f380bf98..0000000000 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-check-for-strndupa-before-using-it.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 05e8bd664d0244cb8ab4376b962830b97860f6bf Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 31 Mar 2017 18:37:19 -0700 -Subject: [PATCH] check for strndupa before using it - -musl does not have strndupa - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - config.h.in | 4 ++++ - configure.ac | 1 + - src/systemd/src/basic/alloc-util.h | 12 ++++++++++++ - 3 files changed, 17 insertions(+) - -diff --git a/config.h.in b/config.h.in -index db8c135..c4229ed 100644 ---- a/config.h.in -+++ b/config.h.in -@@ -41,6 +41,10 @@ - */ - #undef HAVE_DCGETTEXT - -+/* Define to 1 if you have the declaration of `strndupa', and to 0 if you -+ don't. */ -+#undef HAVE_DECL_STRNDUPA -+ - /* Define to 1 if you have the <dlfcn.h> header file. */ - #undef HAVE_DLFCN_H - -diff --git a/configure.ac b/configure.ac -index 2630f8d..d0a57fd 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -54,6 +54,7 @@ AC_SUBST(NM_VERSION) - - GIT_SHA_RECORD(NM_GIT_SHA) - -+AC_CHECK_DECLS([strndupa], [], [], [[#include <string.h>]]) - dnl - dnl Checks for typedefs, structures, and compiler characteristics. - dnl -diff --git a/src/systemd/src/basic/alloc-util.h b/src/systemd/src/basic/alloc-util.h -index ceeee51..924b59c 100644 ---- a/src/systemd/src/basic/alloc-util.h -+++ b/src/systemd/src/basic/alloc-util.h -@@ -25,6 +25,18 @@ - #include <string.h> - - #include "macro.h" -+#include "config.h" -+ -+#if !HAVE_DECL_STRNDUPA -+#define strndupa(s, n) \ -+ ({ \ -+ const char *__old = (s); \ -+ size_t __len = strnlen(__old, (n)); \ -+ char *__new = (char *)alloca(__len + 1); \ -+ __new[__len] = '\0'; \ -+ (char *)memcpy(__new, __old, __len); \ -+ }) -+#endif - - #define new(t, n) ((t*) malloc_multiply(sizeof(t), (n))) - --- -2.12.1 - diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-dns-resolved-add-systemd-resolved-backend.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-dns-resolved-add-systemd-resolved-backend.patch deleted file mode 100644 index bd194a61d2..0000000000 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-dns-resolved-add-systemd-resolved-backend.patch +++ /dev/null @@ -1,621 +0,0 @@ -From: Sjoerd Simons <sjoerd@luon.net> -Date: Sun, 21 Aug 2016 21:46:02 +0200 -Subject: [PATCH] dns/resolved: add systemd-resolved backend - -Add initial DNS backend that pushes DNS information into -systemd-resolved. Backend is choosen by default if the systems -resolv.conv is setup to pointing to one of the standard resolved -locations. - -This doesn't handle global dns configuration. - -Signed-off-by: Sjoerd Simons <sjoerd@luon.net> - -https://bugzilla.gnome.org/show_bug.cgi?id=762540 - -Upstream-Status: Backport - ---- - man/NetworkManager.conf.xml | 10 +- - src/Makefile.am | 2 + - src/dns-manager/nm-dns-manager.c | 43 ++- - src/dns-manager/nm-dns-systemd-resolved.c | 427 ++++++++++++++++++++++++++++++ - src/dns-manager/nm-dns-systemd-resolved.h | 45 ++++ - 5 files changed, 523 insertions(+), 4 deletions(-) - create mode 100644 src/dns-manager/nm-dns-systemd-resolved.c - create mode 100644 src/dns-manager/nm-dns-systemd-resolved.h - -diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml -index 6295b82..0a67ae5 100644 ---- a/man/NetworkManager.conf.xml -+++ b/man/NetworkManager.conf.xml -@@ -275,10 +275,12 @@ no-auto-default=* - <varlistentry> - <term><varname>dns</varname></term> - <listitem><para>Set the DNS (<filename>resolv.conf</filename>) processing mode.</para> -- <para><literal>default</literal>: The default if the key is -- not specified. NetworkManager will update -+ <para><literal>default</literal>: NetworkManager will update - <filename>resolv.conf</filename> to reflect the nameservers -- provided by currently active connections.</para> -+ provided by currently active connections. This is the default -+ if the key is not specified, unless the system is configured -+ to use systemd-resolved; in this case the default is -+ <literal>systemd-resolved</literal></para> - <para><literal>dnsmasq</literal>: NetworkManager will run - dnsmasq as a local caching nameserver, using a "split DNS" - configuration if you are connected to a VPN, and then update -@@ -288,6 +290,8 @@ no-auto-default=* - to unbound and dnssec-triggerd, providing a "split DNS" - configuration with DNSSEC support. The <filename>/etc/resolv.conf</filename> - will be managed by dnssec-trigger daemon.</para> -+ <para><literal>systemd-resolved</literal>: NetworkManager will -+ push the DNS configuration to systemd-resolved</para> - <para><literal>none</literal>: NetworkManager will not - modify resolv.conf. This implies - <literal>rc-manager</literal> <literal>unmanaged</literal></para> -diff --git a/src/Makefile.am b/src/Makefile.am -index 8d29b19..10f63de 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -345,6 +345,8 @@ libNetworkManager_la_SOURCES = \ - \ - dns-manager/nm-dns-dnsmasq.c \ - dns-manager/nm-dns-dnsmasq.h \ -+ dns-manager/nm-dns-systemd-resolved.c \ -+ dns-manager/nm-dns-systemd-resolved.h \ - dns-manager/nm-dns-unbound.c \ - dns-manager/nm-dns-unbound.h \ - dns-manager/nm-dns-manager.c \ -diff --git a/src/dns-manager/nm-dns-manager.c b/src/dns-manager/nm-dns-manager.c -index 5a758a9..38bc786 100644 ---- a/src/dns-manager/nm-dns-manager.c -+++ b/src/dns-manager/nm-dns-manager.c -@@ -45,6 +45,7 @@ - - #include "nm-dns-plugin.h" - #include "nm-dns-dnsmasq.h" -+#include "nm-dns-systemd-resolved.h" - #include "nm-dns-unbound.h" - - #if WITH_LIBSOUP -@@ -1588,6 +1589,37 @@ _check_resconf_immutable (NMDnsManagerResolvConfManager rc_manager) - - NM_DEFINE_SINGLETON_GETTER (NMDnsManager, nm_dns_manager_get, NM_TYPE_DNS_MANAGER); - -+static gboolean -+_resolvconf_resolved_managed (void) -+{ -+ static const char *const resolved_paths[] = { -+ "/run/systemd/resolve/resolv.conf", -+ "/lib/systemd/resolv.conf", -+ "/usr/lib/systemd/resolv.conf", -+ }; -+ GFile *f; -+ GFileInfo *info; -+ gboolean ret = FALSE; -+ -+ f = g_file_new_for_path (_PATH_RESCONF); -+ info = g_file_query_info (f, -+ G_FILE_ATTRIBUTE_STANDARD_IS_SYMLINK","\ -+ G_FILE_ATTRIBUTE_STANDARD_SYMLINK_TARGET, -+ G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, -+ NULL, NULL); -+ -+ if (info && g_file_info_get_is_symlink (info)) { -+ ret = _nm_utils_strv_find_first ((gchar **) resolved_paths, -+ G_N_ELEMENTS (resolved_paths), -+ g_file_info_get_symlink_target (info)) >= 0; -+ } -+ -+ g_clear_object(&info); -+ g_clear_object(&f); -+ -+ return ret; -+} -+ - static void - init_resolv_conf_mode (NMDnsManager *self, gboolean force_reload_plugin) - { -@@ -1633,7 +1665,16 @@ again: - - rc_manager = _check_resconf_immutable (rc_manager); - -- if (nm_streq0 (mode, "dnsmasq")) { -+ if ( (!mode && _resolvconf_resolved_managed ()) -+ || nm_streq0 (mode, "systemd-resolved")) { -+ if ( force_reload_plugin -+ || !NM_IS_DNS_SYSTEMD_RESOLVED (priv->plugin)) { -+ _clear_plugin (self); -+ priv->plugin = nm_dns_systemd_resolved_new (); -+ plugin_changed = TRUE; -+ } -+ mode = "systemd-resolved"; -+ } else if (nm_streq0 (mode, "dnsmasq")) { - if (force_reload_plugin || !NM_IS_DNS_DNSMASQ (priv->plugin)) { - _clear_plugin (self); - priv->plugin = nm_dns_dnsmasq_new (); -diff --git a/src/dns-manager/nm-dns-systemd-resolved.c b/src/dns-manager/nm-dns-systemd-resolved.c -new file mode 100644 -index 0000000..6bdd5f6 ---- /dev/null -+++ b/src/dns-manager/nm-dns-systemd-resolved.c -@@ -0,0 +1,427 @@ -+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -+/* -+ * Copyright (C) 2010 Dan Williams <dcbw@redhat.com> -+ * Copyright (C) 2016 Sjoerd Simons <sjoerd@luon.net> -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2, or (at your option) -+ * any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License along -+ * with this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ */ -+ -+#include "nm-default.h" -+ -+#include "nm-dns-systemd-resolved.h" -+ -+#include <stdlib.h> -+#include <unistd.h> -+#include <sys/types.h> -+#include <sys/wait.h> -+#include <arpa/inet.h> -+#include <sys/stat.h> -+#include <linux/if.h> -+ -+#include "nm-core-internal.h" -+#include "nm-platform.h" -+#include "nm-utils.h" -+#include "nm-ip4-config.h" -+#include "nm-ip6-config.h" -+#include "nm-bus-manager.h" -+#include "nm-manager.h" -+#include "nm-device.h" -+#include "NetworkManagerUtils.h" -+ -+G_DEFINE_TYPE (NMDnsSystemdResolved, nm_dns_systemd_resolved, NM_TYPE_DNS_PLUGIN) -+ -+#define NM_DNS_SYSTEMD_RESOLVED_GET_PRIVATE(o) \ -+ (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DNS_SYSTEMD_RESOLVED, \ -+ NMDnsSystemdResolvedPrivate)) -+ -+#define SYSTEMD_RESOLVED_DBUS_SERVICE "org.freedesktop.resolve1" -+#define SYSTEMD_RESOLVED_DBUS_PATH "/org/freedesktop/resolve1" -+ -+typedef struct { -+ int ifindex; -+ GList *configs; -+} InterfaceConfig; -+ -+typedef struct { -+ GDBusProxy *resolve; -+ GCancellable *init_cancellable; -+ GCancellable *update_cancellable; -+ GQueue dns_updates; -+ GQueue domain_updates; -+} NMDnsSystemdResolvedPrivate; -+ -+/*****************************************************************************/ -+ -+#define _NMLOG_DOMAIN LOGD_DNS -+#define _NMLOG_PREFIX_NAME "systemd-resolved" -+#define _NMLOG(level, ...) \ -+ G_STMT_START { \ -+ nm_log ((level), _NMLOG_DOMAIN, \ -+ "%s[%p]: " _NM_UTILS_MACRO_FIRST(__VA_ARGS__), \ -+ _NMLOG_PREFIX_NAME, \ -+ (self) \ -+ _NM_UTILS_MACRO_REST(__VA_ARGS__)); \ -+ } G_STMT_END -+ -+/*****************************************************************************/ -+ -+static void -+call_done (GObject *source, GAsyncResult *r, gpointer user_data) -+{ -+ GVariant *v; -+ GError *error = NULL; -+ NMDnsSystemdResolved *self = (NMDnsSystemdResolved *) user_data; -+ -+ v = g_dbus_proxy_call_finish (G_DBUS_PROXY (source), r, &error); -+ -+ if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) -+ return; -+ -+ if (error != NULL) { -+ _LOGW ("Failed: %s\n", error->message); -+ g_error_free (error); -+ } -+} -+ -+static void -+add_interface_configuration (NMDnsSystemdResolved *self, -+ GArray *interfaces, -+ const NMDnsIPConfigData *data) -+{ -+ int i; -+ InterfaceConfig *ic = NULL; -+ int ifindex; -+ NMDevice *device; -+ -+ if (NM_IS_IP4_CONFIG (data->config)) -+ ifindex = nm_ip4_config_get_ifindex (data->config); -+ else if (NM_IS_IP6_CONFIG (data->config)) -+ ifindex = nm_ip6_config_get_ifindex (data->config); -+ else -+ g_return_if_reached (); -+ -+ device = nm_manager_get_device_by_ifindex (nm_manager_get (), ifindex); -+ -+ if (!nm_device_get_managed (device, FALSE)) -+ return; -+ -+ for (i = 0; i < interfaces->len; i++) { -+ InterfaceConfig *tic = &g_array_index (interfaces, InterfaceConfig, i); -+ if (ifindex == tic->ifindex) { -+ ic = tic; -+ break; -+ } -+ } -+ -+ if (!ic) { -+ g_array_set_size (interfaces, interfaces->len + 1); -+ ic = &g_array_index (interfaces, InterfaceConfig, -+ interfaces->len - 1); -+ ic->ifindex = ifindex; -+ } -+ -+ ic->configs = g_list_append (ic->configs, data->config); -+} -+ -+static void -+add_domain (GVariantBuilder *domains, -+ const char *domain, -+ gboolean never_default) -+{ -+ /* If this link is never the default (e.g. only used for resources on this -+ * network) add a routing domain. */ -+ g_variant_builder_add (domains, "(sb)", domain, never_default); -+} -+ -+static void -+update_add_ip6_config (NMDnsSystemdResolved *self, -+ GVariantBuilder *dns, -+ GVariantBuilder *domains, -+ const NMIP6Config *config) -+{ -+ guint i, n; -+ -+ n = nm_ip6_config_get_num_nameservers (config); -+ for (i = 0 ; i < n; i++) { -+ const struct in6_addr *ip; -+ -+ g_variant_builder_open (dns, G_VARIANT_TYPE ("(iay)")); -+ g_variant_builder_add (dns, "i", AF_INET6); -+ ip = nm_ip6_config_get_nameserver (config, i), -+ -+ g_variant_builder_add_value (dns, g_variant_new_fixed_array (G_VARIANT_TYPE_BYTE, ip, 16, 1)); -+ g_variant_builder_close (dns); -+ } -+ -+ n = nm_ip6_config_get_num_searches (config); -+ if (n > 0) { -+ for (i = 0; i < n; i++) { -+ add_domain (domains, nm_ip6_config_get_search (config, i), -+ nm_ip6_config_get_never_default (config)); -+ } -+ } else { -+ n = nm_ip6_config_get_num_domains (config); -+ for (i = 0; i < n; i++) { -+ add_domain (domains, nm_ip6_config_get_domain (config, i), -+ nm_ip6_config_get_never_default (config)); -+ } -+ } -+} -+ -+static void -+update_add_ip4_config (NMDnsSystemdResolved *self, -+ GVariantBuilder *dns, -+ GVariantBuilder *domains, -+ const NMIP4Config *config) -+{ -+ guint i, n; -+ -+ n = nm_ip4_config_get_num_nameservers (config); -+ for (i = 0 ; i < n; i++) { -+ guint32 ns; -+ -+ g_variant_builder_open (dns, G_VARIANT_TYPE ("(iay)")); -+ g_variant_builder_add (dns, "i", AF_INET); -+ ns = nm_ip4_config_get_nameserver (config, i), -+ -+ g_variant_builder_add_value (dns, g_variant_new_fixed_array (G_VARIANT_TYPE_BYTE, &ns, 4, 1)); -+ g_variant_builder_close (dns); -+ } -+ -+ n = nm_ip4_config_get_num_searches (config); -+ if (n > 0) { -+ for (i = 0; i < n; i++) { -+ add_domain (domains, nm_ip4_config_get_search (config, i), -+ nm_ip4_config_get_never_default (config)); -+ } -+ } else { -+ n = nm_ip4_config_get_num_domains (config); -+ for (i = 0; i < n; i++) { -+ add_domain (domains, nm_ip4_config_get_domain (config, i), -+ nm_ip4_config_get_never_default (config)); -+ } -+ } -+} -+ -+static void -+free_pending_updates (NMDnsSystemdResolved *self) -+{ -+ NMDnsSystemdResolvedPrivate *priv = NM_DNS_SYSTEMD_RESOLVED_GET_PRIVATE (self); -+ GVariant *v; -+ -+ while ((v = g_queue_pop_head (&priv->dns_updates)) != NULL) -+ g_variant_unref (v); -+ -+ while ((v = g_queue_pop_head (&priv->domain_updates)) != NULL) -+ g_variant_unref (v); -+} -+ -+static void -+prepare_one_interface (NMDnsSystemdResolved *self, InterfaceConfig *ic) -+{ -+ NMDnsSystemdResolvedPrivate *priv = NM_DNS_SYSTEMD_RESOLVED_GET_PRIVATE (self); -+ GVariantBuilder dns, domains; -+ GList *l; -+ -+ g_variant_builder_init (&dns, G_VARIANT_TYPE ("(ia(iay))")); -+ g_variant_builder_add (&dns, "i", ic->ifindex); -+ g_variant_builder_open (&dns, G_VARIANT_TYPE ("a(iay)")); -+ -+ g_variant_builder_init (&domains, G_VARIANT_TYPE ("(ia(sb))")); -+ g_variant_builder_add (&domains, "i", ic->ifindex); -+ g_variant_builder_open (&domains, G_VARIANT_TYPE ("a(sb)")); -+ -+ for (l = ic->configs ; l != NULL ; l = g_list_next (l)) { -+ if (NM_IS_IP4_CONFIG (l->data)) -+ update_add_ip4_config (self, &dns, &domains, l->data); -+ else if (NM_IS_IP6_CONFIG (l->data)) -+ update_add_ip6_config (self, &dns, &domains, l->data); -+ else -+ g_assert_not_reached (); -+ } -+ g_variant_builder_close (&dns); -+ g_variant_builder_close (&domains); -+ -+ g_queue_push_tail (&priv->dns_updates, -+ g_variant_ref_sink (g_variant_builder_end (&dns))); -+ g_queue_push_tail (&priv->domain_updates, -+ g_variant_ref_sink (g_variant_builder_end (&domains))); -+} -+ -+static void -+send_updates (NMDnsSystemdResolved *self) -+{ -+ NMDnsSystemdResolvedPrivate *priv = NM_DNS_SYSTEMD_RESOLVED_GET_PRIVATE (self); -+ GVariant *v; -+ -+ nm_clear_g_cancellable (&priv->update_cancellable); -+ -+ if (!priv->resolve) -+ return; -+ -+ priv->update_cancellable = g_cancellable_new (); -+ -+ while ((v = g_queue_pop_head (&priv->dns_updates)) != NULL) { -+ g_dbus_proxy_call (priv->resolve, "SetLinkDNS", v, -+ G_DBUS_CALL_FLAGS_NONE, -+ -1, priv->update_cancellable, call_done, self); -+ g_variant_unref (v); -+ } -+ -+ while ((v = g_queue_pop_head (&priv->domain_updates)) != NULL) { -+ g_dbus_proxy_call (priv->resolve, "SetLinkDomains", v, -+ G_DBUS_CALL_FLAGS_NONE, -+ -1, priv->update_cancellable, call_done, self); -+ g_variant_unref (v); -+ } -+} -+ -+static gboolean -+update (NMDnsPlugin *plugin, -+ const NMDnsIPConfigData **configs, -+ const NMGlobalDnsConfig *global_config, -+ const char *hostname) -+{ -+ NMDnsSystemdResolved *self = NM_DNS_SYSTEMD_RESOLVED (plugin); -+ GArray *interfaces = g_array_new (TRUE, TRUE, sizeof (InterfaceConfig)); -+ const NMDnsIPConfigData **c; -+ int i; -+ -+ for (c = configs; *c != NULL; c++) -+ add_interface_configuration (self, interfaces, *c); -+ -+ free_pending_updates (self); -+ -+ for (i = 0; i < interfaces->len; i++) { -+ InterfaceConfig *ic = &g_array_index (interfaces, InterfaceConfig, i); -+ -+ prepare_one_interface (self, ic); -+ g_list_free (ic->configs); -+ } -+ -+ g_array_free (interfaces, TRUE); -+ -+ send_updates (self); -+ -+ return TRUE; -+} -+ -+/****************************************************************/ -+ -+static gboolean -+is_caching (NMDnsPlugin *plugin) -+{ -+ return TRUE; -+} -+ -+static const char * -+get_name (NMDnsPlugin *plugin) -+{ -+ return "systemd-resolved"; -+} -+ -+/****************************************************************/ -+ -+NMDnsPlugin * -+nm_dns_systemd_resolved_new (void) -+{ -+ return g_object_new (NM_TYPE_DNS_SYSTEMD_RESOLVED, NULL); -+} -+ -+static void -+resolved_proxy_created (GObject *source, GAsyncResult *r, gpointer user_data) -+{ -+ NMDnsSystemdResolved *self = (NMDnsSystemdResolved *) user_data; -+ NMDnsSystemdResolvedPrivate *priv; -+ gs_free_error GError *error = NULL; -+ GDBusProxy *resolve; -+ -+ resolve = g_dbus_proxy_new_finish (r, &error); -+ if ( !resolve -+ && g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) -+ return; -+ -+ priv = NM_DNS_SYSTEMD_RESOLVED_GET_PRIVATE (self); -+ g_clear_object (&priv->init_cancellable); -+ if (!resolve) { -+ _LOGW ("failed to connect to resolved via DBus: %s", error->message); -+ g_signal_emit_by_name (self, NM_DNS_PLUGIN_FAILED); -+ return; -+ } -+ -+ priv->resolve = resolve; -+ send_updates (self); -+} -+ -+ -+static void -+nm_dns_systemd_resolved_init (NMDnsSystemdResolved *self) -+{ -+ NMDnsSystemdResolvedPrivate *priv = NM_DNS_SYSTEMD_RESOLVED_GET_PRIVATE (self); -+ NMBusManager *dbus_mgr; -+ GDBusConnection *connection; -+ -+ g_queue_init (&priv->dns_updates); -+ g_queue_init (&priv->domain_updates); -+ -+ dbus_mgr = nm_bus_manager_get (); -+ g_return_if_fail (dbus_mgr); -+ -+ connection = nm_bus_manager_get_connection (dbus_mgr); -+ g_return_if_fail (connection); -+ -+ priv->init_cancellable = g_cancellable_new (); -+ g_dbus_proxy_new (connection, -+ G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES | -+ G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS, -+ NULL, -+ SYSTEMD_RESOLVED_DBUS_SERVICE, -+ SYSTEMD_RESOLVED_DBUS_PATH, -+ SYSTEMD_RESOLVED_DBUS_SERVICE ".Manager", -+ priv->init_cancellable, -+ resolved_proxy_created, -+ self); -+} -+ -+static void -+dispose (GObject *object) -+{ -+ NMDnsSystemdResolved *self = NM_DNS_SYSTEMD_RESOLVED (object); -+ NMDnsSystemdResolvedPrivate *priv = NM_DNS_SYSTEMD_RESOLVED_GET_PRIVATE (self); -+ -+ free_pending_updates (self); -+ g_clear_object (&priv->resolve); -+ nm_clear_g_cancellable (&priv->init_cancellable); -+ nm_clear_g_cancellable (&priv->update_cancellable); -+ -+ G_OBJECT_CLASS (nm_dns_systemd_resolved_parent_class)->dispose (object); -+} -+ -+static void -+nm_dns_systemd_resolved_class_init (NMDnsSystemdResolvedClass *dns_class) -+{ -+ NMDnsPluginClass *plugin_class = NM_DNS_PLUGIN_CLASS (dns_class); -+ GObjectClass *object_class = G_OBJECT_CLASS (dns_class); -+ -+ g_type_class_add_private (dns_class, sizeof (NMDnsSystemdResolvedPrivate)); -+ -+ object_class->dispose = dispose; -+ -+ plugin_class->is_caching = is_caching; -+ plugin_class->update = update; -+ plugin_class->get_name = get_name; -+} -+ -diff --git a/src/dns-manager/nm-dns-systemd-resolved.h b/src/dns-manager/nm-dns-systemd-resolved.h -new file mode 100644 -index 0000000..45c64b3 ---- /dev/null -+++ b/src/dns-manager/nm-dns-systemd-resolved.h -@@ -0,0 +1,45 @@ -+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -+/* This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2, or (at your option) -+ * any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License along -+ * with this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * Copyright (C) 2010 Red Hat, Inc. -+ * Copyright (C) 2016 Sjoerd Simons <sjoerd@luon.net> -+ */ -+ -+#ifndef __NETWORKMANAGER_DNS_SYSTEMD_RESOLVED_H__ -+#define __NETWORKMANAGER_DNS_SYSTEMD_RESOLVED_H__ -+ -+#include "nm-dns-plugin.h" -+ -+#define NM_TYPE_DNS_SYSTEMD_RESOLVED (nm_dns_systemd_resolved_get_type ()) -+#define NM_DNS_SYSTEMD_RESOLVED(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DNS_SYSTEMD_RESOLVED, NMDnsSystemdResolved)) -+#define NM_DNS_SYSTEMD_RESOLVED_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DNS_SYSTEMD_RESOLVED, NMDnsSystemdResolvedClass)) -+#define NM_IS_DNS_SYSTEMD_RESOLVED(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DNS_SYSTEMD_RESOLVED)) -+#define NM_IS_DNS_SYSTEMD_RESOLVED_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DNS_SYSTEMD_RESOLVED)) -+#define NM_DNS_SYSTEMD_RESOLVED_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DNS_SYSTEMD_RESOLVED, NMDnsSystemdResolvedClass)) -+ -+typedef struct { -+ NMDnsPlugin parent; -+} NMDnsSystemdResolved; -+ -+typedef struct { -+ NMDnsPluginClass parent; -+} NMDnsSystemdResolvedClass; -+ -+GType nm_dns_systemd_resolved_get_type (void); -+ -+NMDnsPlugin *nm_dns_systemd_resolved_new (void); -+ -+#endif /* __NETWORKMANAGER_DNS_SYSTEMD_RESOLVED_H__ */ -+ diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-dns-resolved-also-check-for-etc-resolv-conf.systemd.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-dns-resolved-also-check-for-etc-resolv-conf.systemd.patch deleted file mode 100644 index ca7e4a496f..0000000000 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-dns-resolved-also-check-for-etc-resolv-conf.systemd.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 6f799f1f0e68cc7bf89c0a56aec5ecf46937619d Mon Sep 17 00:00:00 2001 -From: Ricardo Salveti <rsalveti@rsalveti.net> -Date: Thu, 15 Jun 2017 10:02:38 -0300 -Subject: [PATCH] dns/resolved: also check for /etc/resolv-conf.systemd - -OE specific resolv.conf path, so it can be enabled by default if available. - -Upstream-Status: Inappropriate [OE config specific] - -Signed-off-by: Ricardo Salveti <rsalveti@rsalveti.net> ---- - src/dns-manager/nm-dns-manager.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/dns-manager/nm-dns-manager.c b/src/dns-manager/nm-dns-manager.c -index c1d2bf7..d70d4b4 100644 ---- a/src/dns-manager/nm-dns-manager.c -+++ b/src/dns-manager/nm-dns-manager.c -@@ -1596,6 +1596,7 @@ _resolvconf_resolved_managed (void) - "/run/systemd/resolve/resolv.conf", - "/lib/systemd/resolv.conf", - "/usr/lib/systemd/resolv.conf", -+ "/etc/resolv-conf.systemd", - }; - GFile *f; - GFileInfo *info; --- -2.7.4 - diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-don-t-try-to-run-sbin-dhclient-to-get-the-version-nu.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-don-t-try-to-run-sbin-dhclient-to-get-the-version-nu.patch deleted file mode 100644 index 5c9ed92b80..0000000000 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-don-t-try-to-run-sbin-dhclient-to-get-the-version-nu.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 7dd40db6606c3b3559365a03944cb99aee5ceabc Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Thu, 4 Apr 2013 12:57:58 +0200 -Subject: [PATCH] don't try to run /sbin/dhclient to get the version number, - this break cross-compiling -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Inappropriate [build system specific] - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- - configure.ac | 6 ------ - 1 files changed, 0 insertions(+), 6 deletions(-) - -diff --git a/configure.ac b/configure.ac -index cc66e9b..7163287 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -488,12 +488,6 @@ AS_IF([test -z "$with_dhcpcd"], with_dhcpcd=yes) - # Search and check the executables - if test "$with_dhclient" = "yes"; then - AC_PATH_PROGS(with_dhclient, dhclient, no, /sbin:/usr/sbin:/usr/local/sbin) -- if test "$with_dhclient" != "no"; then -- if ! $with_dhclient --version 2>&1 | grep -q "^isc-dhclient-4\."; then -- AC_MSG_WARN([Cannot use dhclient, version 4.x is required]) -- with_dhclient=no -- fi -- fi - fi - if test "$with_dhcpcd" = "yes"; then - AC_PATH_PROGS(with_dhcpcd, dhcpcd, no, /sbin:/usr/sbin:/usr/local/sbin) --- -1.7.6.5 - diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-linker-scripts-Do-not-export-_IO_stdin_used.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-linker-scripts-Do-not-export-_IO_stdin_used.patch new file mode 100644 index 0000000000..71ad01f51c --- /dev/null +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-linker-scripts-Do-not-export-_IO_stdin_used.patch @@ -0,0 +1,41 @@ +From 3ee6967689b3da30cc4551885d8bcdd44a7a9b52 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 31 Aug 2023 21:16:55 -0700 +Subject: [PATCH] linker-scripts: Do not export _IO_stdin_used + +This is glibc specific and it is not needed with musl. +See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=835550 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + linker-script-binary.ver | 1 - + tools/create-exports-NetworkManager.sh | 1 - + 2 files changed, 2 deletions(-) + +diff --git a/linker-script-binary.ver b/linker-script-binary.ver +index a2780c0..f030d35 100644 +--- a/linker-script-binary.ver ++++ b/linker-script-binary.ver +@@ -1,6 +1,5 @@ + { + global: +- _IO_stdin_used; + local: + *; + }; +diff --git a/tools/create-exports-NetworkManager.sh b/tools/create-exports-NetworkManager.sh +index ef4b381..60865ad 100755 +--- a/tools/create-exports-NetworkManager.sh ++++ b/tools/create-exports-NetworkManager.sh +@@ -54,7 +54,6 @@ get_symbols_nm () { + + get_symbols_explicit() { + cat <<EOF | _sort +-_IO_stdin_used + EOF + } + +-- +2.42.0 + diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-systemd-xlocale.h-is-dropped-by-newer-glibc.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-systemd-xlocale.h-is-dropped-by-newer-glibc.patch deleted file mode 100644 index 4234e2be2d..0000000000 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-systemd-xlocale.h-is-dropped-by-newer-glibc.patch +++ /dev/null @@ -1,29 +0,0 @@ -From a9bfe6f2029d75caf28fcdf3e740843cf6359615 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 27 Jun 2017 07:31:25 -0700 -Subject: [PATCH 1/2] systemd: xlocale.h is dropped by newer glibc - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/systemd/src/basic/parse-util.c | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/src/systemd/src/basic/parse-util.c b/src/systemd/src/basic/parse-util.c -index 9c21e5a..dd95d1f 100644 ---- a/src/systemd/src/basic/parse-util.c -+++ b/src/systemd/src/basic/parse-util.c -@@ -25,11 +25,7 @@ - #include <stdio.h> - #include <stdlib.h> - #include <string.h> --#ifdef __GLIBC__ --#include <xlocale.h> --#else - #include <locale.h> --#endif - #include "alloc-util.h" - #include "extract-word.h" - #include "macro.h" --- -2.13.2 - diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Fix-nm-version-macro-includes.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Fix-nm-version-macro-includes.patch deleted file mode 100644 index aa57c832cb..0000000000 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Fix-nm-version-macro-includes.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 7274bbadd398a69b8babf47431f80d35e0228c42 Mon Sep 17 00:00:00 2001 -From: Adrian Freihofer <adrian.freihofer@gmail.com> -Date: Mon, 18 Jan 2016 08:53:26 +0100 -Subject: [PATCH] Fix nm-version-macro includes - -nm-version-macros.h cannot be found since include directive has -been changed from " to <. This breaks for example gnome-panel -build: -/usr/include/NetworkManager/NetworkManager.h:31:31: -fatal error: nm-version-macros.h: No such file or directory. ---- - libnm-core/nm-version.h | 2 +- - libnm-util/NetworkManager.h | 2 +- - libnm-util/nm-version.h | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/libnm-core/nm-version.h b/libnm-core/nm-version.h -index 730330a..d751bc1 100644 ---- a/libnm-core/nm-version.h -+++ b/libnm-core/nm-version.h -@@ -23,7 +23,7 @@ - - #include <glib.h> - --#include <nm-version-macros.h> -+#include "nm-version-macros.h" - - /* Deprecation / Availability macros */ - -diff --git a/libnm-util/NetworkManager.h b/libnm-util/NetworkManager.h -index d83e4ab..3a964fc 100644 ---- a/libnm-util/NetworkManager.h -+++ b/libnm-util/NetworkManager.h -@@ -28,7 +28,7 @@ - - /* This header must not include glib or libnm. */ - --#include <nm-version-macros.h> -+#include "nm-version-macros.h" - - /* - * dbus services details -diff --git a/libnm-util/nm-version.h b/libnm-util/nm-version.h -index 63895dd..41101a4 100644 ---- a/libnm-util/nm-version.h -+++ b/libnm-util/nm-version.h -@@ -23,7 +23,7 @@ - - #include <glib.h> - --#include <nm-version-macros.h> -+#include "nm-version-macros.h" - - /* Deprecation / Availability macros */ - --- -2.5.0 - diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-socket-util.h-Include-linux-sockios.h-on-musl.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-socket-util.h-Include-linux-sockios.h-on-musl.patch deleted file mode 100644 index 22bc6e8bda..0000000000 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-socket-util.h-Include-linux-sockios.h-on-musl.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 98d7e3ae5b15e30af1bf5dd1d279e1a774bf2b86 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 31 Mar 2017 16:05:05 -0700 -Subject: [PATCH 2/5] socket-util.h: Include linux/sockios.h on musl - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/systemd/src/basic/socket-util.h | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/src/systemd/src/basic/socket-util.h b/src/systemd/src/basic/socket-util.h -index 2536b08..76d6107 100644 ---- a/src/systemd/src/basic/socket-util.h -+++ b/src/systemd/src/basic/socket-util.h -@@ -29,6 +29,12 @@ - #include <linux/netlink.h> - #include <linux/if_packet.h> - -+#if !defined(__GLIBC__) -+/* SIOCGSTAMPNS from linux/asm-generic.h -+ * for src/systemd/src/libsystemd-network/sd-lldp.c */ -+#include <linux/sockios.h> -+#endif -+ - #include "macro.h" - #include "util.h" - --- -2.12.1 - diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-user-format-string-in-g_dbus_message_new_method_erro.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-user-format-string-in-g_dbus_message_new_method_erro.patch deleted file mode 100644 index e32b5c00dd..0000000000 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-user-format-string-in-g_dbus_message_new_method_erro.patch +++ /dev/null @@ -1,67 +0,0 @@ -From adc0668b854289a11cfc29597b5566ba1869d17e Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 27 Jun 2017 07:32:09 -0700 -Subject: [PATCH 2/2] user format string in g_dbus_message_new_method_error () - -This fixes format errors with -Werror=format-security - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/nm-manager.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/src/nm-manager.c b/src/nm-manager.c -index c3d65cd..e814912 100644 ---- a/src/nm-manager.c -+++ b/src/nm-manager.c -@@ -4871,6 +4871,7 @@ prop_set_auth_done_cb (NMAuthChain *chain, - if (error || (result != NM_AUTH_CALL_RESULT_YES)) { - reply = g_dbus_message_new_method_error (pfd->message, - NM_PERM_DENIED_ERROR, -+ "%s", - (error_message = "Not authorized to perform this operation")); - if (error) - error_message = error->message; -@@ -4882,6 +4883,7 @@ prop_set_auth_done_cb (NMAuthChain *chain, - if (!object) { - reply = g_dbus_message_new_method_error (pfd->message, - "org.freedesktop.DBus.Error.UnknownObject", -+ "%s", - (error_message = "Object doesn't exist.")); - goto done; - } -@@ -4890,6 +4892,7 @@ prop_set_auth_done_cb (NMAuthChain *chain, - if (!nm_exported_object_get_interface_by_type (object, pfd->interface_type)) { - reply = g_dbus_message_new_method_error (pfd->message, - "org.freedesktop.DBus.Error.InvalidArgs", -+ "%s", - (error_message = "Object is of unexpected type.")); - goto done; - } -@@ -4905,6 +4908,7 @@ prop_set_auth_done_cb (NMAuthChain *chain, - if (global_dns && !nm_global_dns_config_is_internal (global_dns)) { - reply = g_dbus_message_new_method_error (pfd->message, - NM_PERM_DENIED_ERROR, -+ "%s", - (error_message = "Global DNS configuration already set via configuration file")); - goto done; - } -@@ -4949,6 +4953,7 @@ do_set_property_check (gpointer user_data) - if (!pfd->subject) { - reply = g_dbus_message_new_method_error (pfd->message, - NM_PERM_DENIED_ERROR, -+ "%s", - (error_message = "Could not determine request UID.")); - goto out; - } -@@ -4958,6 +4963,7 @@ do_set_property_check (gpointer user_data) - if (!chain) { - reply = g_dbus_message_new_method_error (pfd->message, - NM_PERM_DENIED_ERROR, -+ "%s", - (error_message = "Could not authenticate request.")); - goto out; - } --- -2.13.2 - diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-Define-ETH_ALEN.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-Define-ETH_ALEN.patch deleted file mode 100644 index 236914f756..0000000000 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-Define-ETH_ALEN.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 16c3dc7a407101243d2056d2c93e61dce1a05350 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 31 Mar 2017 16:08:45 -0700 -Subject: [PATCH 3/5] Define ETH_ALEN - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - libnm-core/nm-utils.h | 1 + - src/platform/wifi/wifi-utils.h | 2 ++ - 2 files changed, 3 insertions(+) - -diff --git a/libnm-core/nm-utils.h b/libnm-core/nm-utils.h -index 156ccae..68e222b 100644 ---- a/libnm-core/nm-utils.h -+++ b/libnm-core/nm-utils.h -@@ -29,6 +29,7 @@ - - /* For ETH_ALEN and INFINIBAND_ALEN */ - //#include <linux/if_ether.h> -+#define ETH_ALEN 6 /* Octets in one ethernet addr */ - #include <linux/if_infiniband.h> - #include <netinet/in.h> - -diff --git a/src/platform/wifi/wifi-utils.h b/src/platform/wifi/wifi-utils.h -index 84f5ce9..33a838d 100644 ---- a/src/platform/wifi/wifi-utils.h -+++ b/src/platform/wifi/wifi-utils.h -@@ -24,6 +24,8 @@ - - //#include <net/ethernet.h> - -+#define ETH_ALEN 6 /* Octets in one ethernet addr */ -+ - #include "nm-dbus-interface.h" - - typedef struct WifiData WifiData; --- -2.12.1 - diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0004-Define-missing-features-to-cater-for-musl.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0004-Define-missing-features-to-cater-for-musl.patch deleted file mode 100644 index 27c9ae9624..0000000000 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0004-Define-missing-features-to-cater-for-musl.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 2153109e60e362e0d09215d529bf00176f31a3e7 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 31 Mar 2017 16:09:41 -0700 -Subject: [PATCH 4/5] Define missing features to cater for musl - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/systemd/sd-adapt/nm-sd-adapt.h | 2 +- - src/systemd/src/basic/parse-util.c | 5 ++++- - src/systemd/src/basic/stdio-util.h | 2 ++ - src/systemd/src/basic/util.h | 5 +++++ - src/systemd/src/systemd/sd-event.h | 4 ---- - 5 files changed, 12 insertions(+), 6 deletions(-) - -diff --git a/src/systemd/sd-adapt/nm-sd-adapt.h b/src/systemd/sd-adapt/nm-sd-adapt.h -index cf27c1a..72c1b89 100644 ---- a/src/systemd/sd-adapt/nm-sd-adapt.h -+++ b/src/systemd/sd-adapt/nm-sd-adapt.h -@@ -119,7 +119,7 @@ G_STMT_START { \ - # ifdef HAVE___SECURE_GETENV - # define secure_getenv __secure_getenv - # else --# error neither secure_getenv nor __secure_getenv is available -+# define secure_getenv getenv - # endif - #endif - -diff --git a/src/systemd/src/basic/parse-util.c b/src/systemd/src/basic/parse-util.c -index 2738663..9c21e5a 100644 ---- a/src/systemd/src/basic/parse-util.c -+++ b/src/systemd/src/basic/parse-util.c -@@ -25,8 +25,11 @@ - #include <stdio.h> - #include <stdlib.h> - #include <string.h> -+#ifdef __GLIBC__ - #include <xlocale.h> -- -+#else -+#include <locale.h> -+#endif - #include "alloc-util.h" - #include "extract-word.h" - #include "macro.h" -diff --git a/src/systemd/src/basic/stdio-util.h b/src/systemd/src/basic/stdio-util.h -index bd1144b..c92e935 100644 ---- a/src/systemd/src/basic/stdio-util.h -+++ b/src/systemd/src/basic/stdio-util.h -@@ -19,7 +19,9 @@ - along with systemd; If not, see <http://www.gnu.org/licenses/>. - ***/ - -+#ifdef __GLIBC__ - #include <printf.h> -+#endif - #include <stdarg.h> - #include <stdio.h> - #include <sys/types.h> -diff --git a/src/systemd/src/basic/util.h b/src/systemd/src/basic/util.h -index bb2fc31..fe074a5 100644 ---- a/src/systemd/src/basic/util.h -+++ b/src/systemd/src/basic/util.h -@@ -46,6 +46,11 @@ - #include "missing.h" - #include "time-util.h" - -+#if !defined(__GLIBC__) -+typedef int (*__compar_fn_t) (const void*, const void*); -+typedef __compar_fn_t comparison_fn_t; -+#endif -+ - size_t page_size(void) _pure_; - #define PAGE_ALIGN(l) ALIGN_TO((l), page_size()) - -diff --git a/src/systemd/src/systemd/sd-event.h b/src/systemd/src/systemd/sd-event.h -index cc26b7d..c7e0004 100644 ---- a/src/systemd/src/systemd/sd-event.h -+++ b/src/systemd/src/systemd/sd-event.h -@@ -69,11 +69,7 @@ typedef int (*sd_event_handler_t)(sd_event_source *s, void *userdata); - typedef int (*sd_event_io_handler_t)(sd_event_source *s, int fd, uint32_t revents, void *userdata); - typedef int (*sd_event_time_handler_t)(sd_event_source *s, uint64_t usec, void *userdata); - typedef int (*sd_event_signal_handler_t)(sd_event_source *s, const struct signalfd_siginfo *si, void *userdata); --#if defined __USE_POSIX199309 || defined __USE_XOPEN_EXTENDED - typedef int (*sd_event_child_handler_t)(sd_event_source *s, const siginfo_t *si, void *userdata); --#else --typedef void* sd_event_child_handler_t; --#endif - - int sd_event_default(sd_event **e); - --- -2.12.1 - diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0005-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0005-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch deleted file mode 100644 index f4a04c782c..0000000000 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0005-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 9e9e5814456ec23b9fc669d342bf9d8f7ee49fc2 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 31 Mar 2017 16:48:00 -0700 -Subject: [PATCH 5/5] sd-lldp.h: Remove net/ethernet.h seems to be over - specified - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/systemd/src/systemd/sd-lldp.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: NetworkManager-1.4.2/src/systemd/src/systemd/sd-lldp.h -=================================================================== ---- NetworkManager-1.4.2.orig/src/systemd/src/systemd/sd-lldp.h -+++ NetworkManager-1.4.2/src/systemd/src/systemd/sd-lldp.h -@@ -22,7 +22,7 @@ - ***/ - - #include <inttypes.h> --#include <net/ethernet.h> -+//#include <net/ethernet.h> - #include <sys/types.h> - - #include "sd-event.h" -Index: NetworkManager-1.4.2/src/systemd/src/libsystemd-network/sd-lldp.c -=================================================================== ---- NetworkManager-1.4.2.orig/src/systemd/src/libsystemd-network/sd-lldp.c -+++ NetworkManager-1.4.2/src/systemd/src/libsystemd-network/sd-lldp.c -@@ -21,6 +21,7 @@ - #include "nm-sd-adapt.h" - - #include <arpa/inet.h> -+#include <net/ethernet.h> - - #include "sd-lldp.h" - diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/enable-dhcpcd.conf b/meta-networking/recipes-connectivity/networkmanager/networkmanager/enable-dhcpcd.conf new file mode 100644 index 0000000000..8da4fe0487 --- /dev/null +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/enable-dhcpcd.conf @@ -0,0 +1,2 @@ +[main] +dhcp=dhcpcd diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/enable-iwd.conf b/meta-networking/recipes-connectivity/networkmanager/networkmanager/enable-iwd.conf new file mode 100644 index 0000000000..abb5937341 --- /dev/null +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/enable-iwd.conf @@ -0,0 +1,3 @@ +[device] +wifi.iwd.autoconnect=yes +wifi.backend=iwd diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/networkmanager.initd b/meta-networking/recipes-connectivity/networkmanager/networkmanager/networkmanager.initd new file mode 100644 index 0000000000..4fdd80d410 --- /dev/null +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/networkmanager.initd @@ -0,0 +1,110 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: network-manager +# Required-Start: $remote_fs dbus udev +# Required-Stop: $remote_fs dbus udev +# Should-Start: $syslog +# Should-Stop: $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: network connection manager +# Description: Daemon for automatically switching network +# connections to the best available connection. +### END INIT INFO + +PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin +DESC="network connection manager" +NAME="NetworkManager" + +DAEMON=/usr/sbin/$NAME + +PIDFILE=/run/$NAME/$NAME.pid + +SCRIPTNAME=/etc/init.d/network-manager + +. /etc/init.d/functions || exit 1 + +# Exit if the package is not installed +[ -x "$DAEMON" ] || exit 0 + +log_daemon_msg() { + echo -n $* +} + +log_end_msg() { + if [ $1 -eq 0 ]; then + success + else + failure + fi + echo +} + +log_progress_msg () { + if [ -z "${1:-}" ]; then + return 1 + fi + echo -n " $@" +} + +# +# Function that starts the daemon/service. +# +d_start() { + start-stop-daemon --start --quiet --pidfile $PIDFILE \ + --exec $DAEMON -- $DAEMON_OPTS +} + +# +# Function that stops the daemon/service. +# +d_stop() { + start-stop-daemon --stop --retry 5 --quiet --pidfile $PIDFILE \ + --exec $DAEMON +} + +d_reload() { + start-stop-daemon --stop --signal HUP --quiet --pidfile $PIDFILE \ + --exec $DAEMON +} + +case "$1" in + start) + log_daemon_msg "Starting $DESC" "$NAME" + d_start + case "$?" in + 0) log_end_msg 0 ;; + 1) log_progress_msg "already started" + log_end_msg 0 ;; + *) log_end_msg 1 ;; + esac + ;; + stop) + log_daemon_msg "Stopping $DESC" "$NAME" + d_stop + case "$?" in + 0) log_end_msg 0 ;; + 1) log_progress_msg "already stopped" + log_end_msg 0 ;; + *) log_end_msg 1 ;; + esac + ;; + reload|force-reload) + log_daemon_msg "Reloading $DESC" "$NAME" + d_reload + log_end_msg $? + ;; + restart) + $0 stop + $0 start + ;; + status) + status_of_proc -p $PIDFILE $DAEMON $NAME && exit 0 || exit $? + ;; + *) + echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload|status}" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.4.4.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.4.4.bb deleted file mode 100644 index d5f456f37b..0000000000 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.4.4.bb +++ /dev/null @@ -1,136 +0,0 @@ -SUMMARY = "NetworkManager" -HOMEPAGE = "https://wiki.gnome.org/Projects/NetworkManager" -SECTION = "net/misc" - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b \ - file://libnm-util/COPYING;md5=1c4fa765d6eb3cd2fbd84344a1b816cd \ - file://docs/api/html/license.html;md5=8eb8e72bab097b9d11763002cb003697 \ -" - -DEPENDS = " \ - intltool-native \ - libnl \ - dbus \ - dbus-glib \ - dbus-glib-native \ - libgudev \ - util-linux \ - libndp \ - libnewt \ - polkit \ - jansson \ -" - -inherit gnomebase gettext systemd bluetooth bash-completion vala gobject-introspection - -GI_DATA_ENABLED_libc-musl = "False" - -SRC_URI = "${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \ - file://0001-don-t-try-to-run-sbin-dhclient-to-get-the-version-nu.patch \ - file://0002-Fix-nm-version-macro-includes.patch \ - file://0001-adjust-net-headers-for-musl-compatibility.patch \ - file://0002-socket-util.h-Include-linux-sockios.h-on-musl.patch \ - file://0003-Define-ETH_ALEN.patch \ - file://0004-Define-missing-features-to-cater-for-musl.patch \ - file://0005-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch \ - file://0001-check-for-strndupa-before-using-it.patch \ - file://0001-dns-resolved-add-systemd-resolved-backend.patch \ - file://0001-dns-resolved-also-check-for-etc-resolv-conf.systemd.patch \ - file://0001-systemd-xlocale.h-is-dropped-by-newer-glibc.patch \ - file://0002-user-format-string-in-g_dbus_message_new_method_erro.patch \ - " -SRC_URI[md5sum] = "63f1e0d6d7e9099499d062c84c927a75" -SRC_URI[sha256sum] = "829378f318cc008d138a23ca6a9191928ce75344e7e47a2f2c35f4ac82133309" - -S = "${WORKDIR}/NetworkManager-${PV}" - -EXTRA_OECONF = " \ - --disable-ifcfg-rh \ - --disable-ifnet \ - --disable-ifcfg-suse \ - --disable-more-warnings \ - --with-iptables=${sbindir}/iptables \ - --with-tests \ - --with-nmtui=yes \ -" - -do_compile_prepend() { - export GIR_EXTRA_LIBS_PATH="${B}/libnm-util/.libs" -} - -PACKAGECONFIG ??= "nss ifupdown netconfig dhclient dnsmasq \ - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', \ - bb.utils.contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d), d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \ - ${@bb.utils.filter('DISTRO_FEATURES', 'wifi', d)} \ -" -PACKAGECONFIG[systemd] = " \ - --with-systemdsystemunitdir=${systemd_unitdir}/system --with-session-tracking=systemd --enable-polkit, \ - --without-systemdsystemunitdir, \ - polkit \ -" -PACKAGECONFIG[bluez5] = "--enable-bluez5-dun,--disable-bluez5-dun,bluez5" -# consolekit is not picked by shlibs, so add it to RDEPENDS too -PACKAGECONFIG[consolekit] = "--with-session-tracking=consolekit,,consolekit,consolekit" -PACKAGECONFIG[concheck] = "--with-libsoup=yes,--with-libsoup=no,libsoup-2.4" -PACKAGECONFIG[modemmanager] = "--with-modem-manager-1=yes,--with-modem-manager-1=no,modemmanager" -PACKAGECONFIG[ppp] = "--enable-ppp,--disable-ppp,ppp,ppp" -# Use full featured dhcp client instead of internal one -PACKAGECONFIG[dhclient] = "--with-dhclient=${base_sbindir}/dhclient,,,dhcp-client" -PACKAGECONFIG[dnsmasq] = "--with-dnsmasq=${bindir}/dnsmasq" -PACKAGECONFIG[nss] = "--with-crypto=nss,,nss" -PACKAGECONFIG[gnutls] = "--with-crypto=gnutls,,gnutls" -PACKAGECONFIG[wifi] = "--enable-wifi=yes,--enable-wifi=no,wireless-tools,wpa-supplicant wireless-tools" -PACKAGECONFIG[ifupdown] = "--enable-ifupdown,--disable-ifupdown" -PACKAGECONFIG[netconfig] = "--with-netconfig=yes,--with-netconfig=no" -PACKAGECONFIG[qt4-x11-free] = "--enable-qt,--disable-qt,qt4-x11-free" - -PACKAGES =+ "libnmutil libnmglib libnmglib-vpn \ - ${PN}-nmtui ${PN}-nmtui-doc \ - ${PN}-adsl \ -" - -FILES_libnmutil += "${libdir}/libnm-util.so.*" -FILES_libnmglib += "${libdir}/libnm-glib.so.*" -FILES_libnmglib-vpn += "${libdir}/libnm-glib-vpn.so.*" - -FILES_${PN}-adsl = "${libdir}/NetworkManager/libnm-device-plugin-adsl.so" - -FILES_${PN} += " \ - ${libexecdir} \ - ${libdir}/pppd/*/nm-pppd-plugin.so \ - ${libdir}/NetworkManager/*.so \ - ${datadir}/polkit-1 \ - ${datadir}/dbus-1 \ - ${base_libdir}/udev/* \ - ${systemd_unitdir}/system \ -" - -RRECOMMENDS_${PN} += "iptables \ - ${@bb.utils.filter('PACKAGECONFIG', 'dnsmasq', d)} \ -" -RCONFLICTS_${PN} = "connman" - -FILES_${PN}-dev += " \ - ${datadir}/NetworkManager/gdb-cmd \ - ${libdir}/pppd/*/*.la \ - ${libdir}/NetworkManager/*.la \ -" - -FILES_${PN}-nmtui = " \ - ${bindir}/nmtui \ - ${bindir}/nmtui-edit \ - ${bindir}/nmtui-connect \ - ${bindir}/nmtui-hostname \ -" - -FILES_${PN}-nmtui-doc = " \ - ${mandir}/man1/nmtui* \ -" - -SYSTEMD_SERVICE_${PN} = "NetworkManager.service NetworkManager-dispatcher.service" - -do_install_append() { - rm -rf ${D}/run ${D}${localstatedir}/run -} diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.46.0.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.46.0.bb new file mode 100644 index 0000000000..487ef08475 --- /dev/null +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.46.0.bb @@ -0,0 +1,325 @@ +SUMMARY = "NetworkManager is a program for providing detection and \ +configuration for systems to automatically connect to networks." + +DESCRIPTION = "NetworkManager is a program for providing detection and \ +configuration for systems to automatically connect to networks. \ +NetworkManager's functionality can be useful for both wireless and wired \ +networks. For wireless networks, NetworkManager prefers known wireless \ +networks and has the ability to switch to the most reliable network. \ +NetworkManager-aware applications can switch from online and offline mode. \ +NetworkManager also prefers wired connections over wireless ones, has support \ +for modem connections and certain types of VPN." + +HOMEPAGE = "https://wiki.gnome.org/Projects/NetworkManager" +SECTION = "net/misc" + +LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \ +" + +DEPENDS = " \ + glib-2.0 \ + python3-pygobject-native \ + coreutils-native \ + intltool-native \ + libxslt-native \ + libnl \ + udev \ + util-linux \ + libndp \ + curl \ + dbus \ +" +DEPENDS:append:class-target = " bash-completion" + +inherit gnomebase gettext update-rc.d systemd gobject-introspection gtk-doc update-alternatives upstream-version-is-even + +SRC_URI = " \ + ${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \ + file://${BPN}.initd \ + file://enable-dhcpcd.conf \ + file://enable-iwd.conf \ +" +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)}" + +SRC_URI[sha256sum] = "722649e25362693b334371473802a729b0ec9ee283375096905f868808e74068" + +S = "${WORKDIR}/NetworkManager-${PV}" + +# ['auto', 'symlink', 'file', 'netconfig', 'resolvconf'] +NETWORKMANAGER_DNS_RC_MANAGER_DEFAULT ??= "auto" + +# ['dhcpcanon', 'dhclient', 'dhcpcd', 'internal', 'nettools'] +NETWORKMANAGER_DHCP_DEFAULT ??= "internal" + +# The default gets detected based on whether /usr/sbin/nft or /usr/sbin/iptables is installed, with nftables preferred. +# ['', 'iptables', 'nftables'] +NETWORKMANAGER_FIREWALL_DEFAULT ??= "nftables" + +EXTRA_OEMESON = "\ + -Difcfg_rh=false \ + -Dtests=yes \ + -Dnmtui=true \ + -Dudev_dir=${nonarch_base_libdir}/udev \ + -Dlibpsl=false \ + -Dqt=false \ + -Dconfig_dns_rc_manager_default=${NETWORKMANAGER_DNS_RC_MANAGER_DEFAULT} \ + -Dconfig_dhcp_default=${NETWORKMANAGER_DHCP_DEFAULT} \ + -Ddhcpcanon=false \ + -Diptables=${sbindir}/iptables \ + -Dnft=${sbindir}/nft \ +" + +# stolen from https://github.com/void-linux/void-packages/blob/master/srcpkgs/NetworkManager/template +# avoids: +# | ../NetworkManager-1.16.0/libnm-core/nm-json.c:106:50: error: 'RTLD_DEEPBIND' undeclared (first use in this function); did you mean 'RTLD_DEFAULT'? +CFLAGS:append:libc-musl = " \ + -DRTLD_DEEPBIND=0 \ +" +do_configure:prepend() { + cp -f ${STAGING_LIBDIR}/girepository-1.0/GLib*typelib ${STAGING_LIBDIR_NATIVE}/girepository-1.0/ + cp -f ${STAGING_LIBDIR}/girepository-1.0/GObject*typelib ${STAGING_LIBDIR_NATIVE}/girepository-1.0/ + cp -f ${STAGING_LIBDIR}/girepository-1.0/Gio*typelib ${STAGING_LIBDIR_NATIVE}/girepository-1.0/ + cp -f ${STAGING_LIBDIR}/girepository-1.0/GModule*typelib ${STAGING_LIBDIR_NATIVE}/girepository-1.0/ +} + +PACKAGECONFIG ??= "readline nss ifupdown dnsmasq nmcli vala \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', bb.utils.contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d), d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez5', '', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'wifi polkit ppp', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux audit', '', d)} \ +" + +inherit ${@bb.utils.contains('PACKAGECONFIG', 'vala', 'vala', '', d)} + +PACKAGECONFIG[systemd] = "\ + -Dsystemdsystemunitdir=${systemd_unitdir}/system -Dsession_tracking=systemd,\ + -Dsystemdsystemunitdir=no -Dsystemd_journal=false -Dsession_tracking=no\ +" +PACKAGECONFIG[polkit] = "-Dpolkit=true,-Dpolkit=false,polkit" +PACKAGECONFIG[bluez5] = "-Dbluez5_dun=true,-Dbluez5_dun=false,bluez5" +# consolekit is not picked by shlibs, so add it to RDEPENDS too +PACKAGECONFIG[consolekit] = "-Dsession_tracking_consolekit=true,-Dsession_tracking_consolekit=false,consolekit,consolekit" +PACKAGECONFIG[modemmanager] = "-Dmodem_manager=true,-Dmodem_manager=false,modemmanager mobile-broadband-provider-info,modemmanager mobile-broadband-provider-info" +PACKAGECONFIG[ppp] = "-Dppp=true -Dpppd=${sbindir}/pppd,-Dppp=false,ppp" +PACKAGECONFIG[dnsmasq] = "-Ddnsmasq=${bindir}/dnsmasq" +PACKAGECONFIG[nss] = "-Dcrypto=nss,,nss" +PACKAGECONFIG[resolvconf] = "-Dresolvconf=${base_sbindir}/resolvconf,-Dresolvconf=no,,resolvconf" +PACKAGECONFIG[gnutls] = "-Dcrypto=gnutls,,gnutls" +PACKAGECONFIG[crypto-null] = "-Dcrypto=null" +PACKAGECONFIG[wifi] = "-Dwext=true -Dwifi=true,-Dwext=false -Dwifi=false" +PACKAGECONFIG[iwd] = "-Diwd=true,-Diwd=false" +PACKAGECONFIG[ifupdown] = "-Difupdown=true,-Difupdown=false" +PACKAGECONFIG[cloud-setup] = "-Dnm_cloud_setup=true,-Dnm_cloud_setup=false" +PACKAGECONFIG[nmcli] = "-Dnmcli=true,-Dnmcli=false" +PACKAGECONFIG[nmtui] = "-Dnmtui=true,-Dnmtui=false,libnewt" +PACKAGECONFIG[readline] = "-Dreadline=libreadline,,readline" +PACKAGECONFIG[libedit] = "-Dreadline=libedit,,libedit" +PACKAGECONFIG[ovs] = "-Dovs=true,-Dovs=false,jansson" +PACKAGECONFIG[audit] = "-Dlibaudit=yes,-Dlibaudit=no" +PACKAGECONFIG[selinux] = "-Dselinux=true,-Dselinux=false,libselinux" +PACKAGECONFIG[vala] = "-Dvapi=true,-Dvapi=false" +PACKAGECONFIG[dhcpcd] = "-Ddhcpcd=${base_sbindir}/dhcpcd,-Ddhcpcd=no,,dhcpcd" +PACKAGECONFIG[dhclient] = "-Ddhclient=yes,-Ddhclient=no,,dhcp" +PACKAGECONFIG[concheck] = "-Dconcheck=true,-Dconcheck=false" +PACKAGECONFIG[adsl] = ",," +PACKAGECONFIG[wwan] = ",," +# The following PACKAGECONFIG is used to determine whether NM is managing /etc/resolv.conf itself or not +PACKAGECONFIG[man-resolv-conf] = ",," + + +PACKAGES =+ " \ + libnm \ + ${PN}-adsl \ + ${PN}-bluetooth \ + ${PN}-cloud-setup \ + ${PN}-nmcli \ + ${PN}-nmcli-bash-completion \ + ${PN}-nmtui \ + ${PN}-wifi \ + ${PN}-wwan \ + ${PN}-ovs \ + ${PN}-ppp \ + ${PN}-daemon \ +" + +SYSTEMD_PACKAGES = "${PN}-daemon ${PN}-cloud-setup" +INITSCRIPT_PACKAGES = "${PN}-daemon" + +NETWORKMANAGER_PLUGINDIR = "${libdir}/NetworkManager/${PV}" +NETWORKMANAGER_DISPATCHERDIR = "${nonarch_libdir}/NetworkManager/dispatcher.d" + + +SUMMARY:libnm = "Libraries for adding NetworkManager support to applications" +FILES:libnm = "\ + ${libdir}/libnm.so.* \ + ${libdir}/girepository-1.0/NM-1.0.typelib \ +" + +SUMMARY:${PN}-adsl = "ADSL device plugin for NetworkManager" +FILES:${PN}-adsl = "${NETWORKMANAGER_PLUGINDIR}/libnm-device-plugin-adsl.so" +RDEPENDS:${PN}-adsl += "${PN}-daemon" + +SUMMARY:${PN}-bluetooth = "Bluetooth device plugin for NetworkManager" +FILES:${PN}-bluetooth = "${NETWORKMANAGER_PLUGINDIR}/libnm-device-plugin-bluetooth.so" +RDEPENDS:${PN}-bluetooth += "${PN}-daemon ${@bb.utils.contains('PACKAGECONFIG', 'bluez5', '${PN}-wwan bluez5', '', d)}" + +SUMMARY:${PN}-cloud-setup = "Automatically configure NetworkManager in cloud" +FILES:${PN}-cloud-setup = " \ + ${libexecdir}/nm-cloud-setup \ + ${systemd_system_unitdir}/nm-cloud-setup.service \ + ${systemd_system_unitdir}/nm-cloud-setup.timer \ + ${libdir}/NetworkManager/dispatcher.d/90-nm-cloud-setup.sh \ + ${libdir}/NetworkManager/dispatcher.d/no-wait.d/90-nm-cloud-setup.sh \ +" +RDEPENDS:${PN}-cloud-setup += "${PN}-daemon" +ALLOW_EMPTY:${PN}-cloud-setup = "1" +SYSTEMD_SERVICE:${PN}-cloud-setup = "${@bb.utils.contains('PACKAGECONFIG', 'cloud-setup', 'nm-cloud-setup.service nm-cloud-setup.timer', '', d)}" + +SUMMARY:${PN}-nmcli = "NetworkManager command line client" +FILES:${PN}-nmcli = " \ + ${bindir}/nmcli \ +" +RDEPENDS:${PN}-nmcli += "${PN}-daemon" + +SUMMARY:${PN}-nmcli-bash-completion = "NetworkManager command line client bash completion" +FILES:${PN}-nmcli-bash-completion = "${datadir}/bash-completion/completions/nmcli" +RDEPENDS:${PN}-nmcli-bash-completion = "bash-completion" + +SUMMARY:${PN}-nmtui = "NetworkManager curses-based UI" +FILES:${PN}-nmtui = " \ + ${bindir}/nmtui \ + ${bindir}/nmtui-edit \ + ${bindir}/nmtui-connect \ + ${bindir}/nmtui-hostname \ +" +RDEPENDS:${PN}-nmtui += "${PN}-daemon" + +SUMMARY:${PN}-wifi = "Wifi plugin for NetworkManager" +FILES:${PN}-wifi = "\ + ${NETWORKMANAGER_PLUGINDIR}/libnm-device-plugin-wifi.so \ + ${libdir}/NetworkManager/conf.d/enable-iwd.conf \ +" +def get_wifi_deps(d): + packageconfig = (d.getVar('PACKAGECONFIG') or "").split() + if 'wifi' in packageconfig: + if 'iwd' in packageconfig: + return 'iwd' + else: + return 'wpa-supplicant' + else: + return '' +RDEPENDS:${PN}-wifi += "${PN}-daemon ${@get_wifi_deps(d)}" + +SUMMARY:${PN}-wwan = "Mobile broadband device plugin for NetworkManager" +FILES:${PN}-wwan = "\ + ${NETWORKMANAGER_PLUGINDIR}/libnm-device-plugin-wwan.so \ + ${NETWORKMANAGER_PLUGINDIR}/libnm-wwan.so \ +" +RDEPENDS:${PN}-wwan += "${PN}-daemon ${@bb.utils.contains('PACKAGECONFIG','modemmanager','modemmanager','',d)}" + +SUMMARY:${PN}-ovs = "Open vSwitch device plugin for NetworkManager" +FILES:${PN}-ovs = "\ + ${NETWORKMANAGER_PLUGINDIR}/libnm-device-plugin-ovs.so \ + ${systemd_system_unitdir}/NetworkManager.service.d/NetworkManager-ovs.conf \ +" +RDEPENDS:${PN}-ovs += "${PN}-daemon" + +SUMMARY:${PN}-ppp = "PPP plugin for NetworkManager" +FILES:${PN}-ppp = "\ + ${NETWORKMANAGER_PLUGINDIR}/libnm-ppp-plugin.so \ + ${libdir}/pppd/*/nm-pppd-plugin.so \ +" +RDEPENDS:${PN}-ppp += "${PN}-daemon ${@bb.utils.contains('PACKAGECONFIG','ppp','ppp','',d)}" + +FILES:${PN}-dev += " \ + ${libdir}/pppd/*/*.la \ + ${libdir}/NetworkManager/*.la \ + ${NETWORKMANAGER_PLUGINDIR}/*.la \ + ${datadir}/dbus-1/interfaces/*.xml \ +" + +SUMMARY:${PN}-daemon += "The NetworkManager daemon" +FILES:${PN}-daemon += " \ + ${bindir}/nm-online \ + ${datadir}/dbus-1 \ + ${datadir}/polkit-1 \ + ${libdir}/NetworkManager \ + ${libexecdir} \ + ${localstatedir}/lib/NetworkManager \ + ${NETWORKMANAGER_DISPATCHERDIR} \ + ${nonarch_base_libdir}/udev/* \ + ${nonarch_libdir}/firewalld \ + ${nonarch_libdir}/NetworkManager/conf.d \ + ${nonarch_libdir}/NetworkManager/dispatcher.d/no-wait.d \ + ${nonarch_libdir}/NetworkManager/dispatcher.d/pre-down.d \ + ${nonarch_libdir}/NetworkManager/dispatcher.d/pre-up.d \ + ${nonarch_libdir}/NetworkManager/system-connections \ + ${nonarch_libdir}/NetworkManager/VPN \ + ${sbindir}/NetworkManager \ + ${sysconfdir}/init.d/network-manager \ + ${sysconfdir}/NetworkManager \ + ${sysconfdir}/resolv-conf.NetworkManager \ + ${sysconfdir}/sysconfig/network-scripts \ + ${systemd_system_unitdir} \ +" +RDEPENDS:${PN}-daemon += "\ + ${@bb.utils.contains('PACKAGECONFIG', 'ifupdown', 'bash', '', d)} \ +" +RRECOMMENDS:${PN}-daemon += "\ + ${NETWORKMANAGER_FIREWALL_DEFAULT} \ + ${@bb.utils.filter('PACKAGECONFIG', 'dnsmasq', d)} \ +" +INITSCRIPT_NAME:${PN}-daemon = "network-manager" +SYSTEMD_SERVICE:${PN}-daemon = "\ + NetworkManager.service \ + NetworkManager-dispatcher.service \ +" +RCONFLICTS:${PN}-daemon += "connman" +ALTERNATIVE_PRIORITY = "100" +ALTERNATIVE:${PN}-daemon = "${@bb.utils.contains('PACKAGECONFIG','man-resolv-conf','resolv-conf','',d)}" +ALTERNATIVE_TARGET[resolv-conf] = "${@bb.utils.contains('PACKAGECONFIG','man-resolv-conf','${sysconfdir}/resolv-conf.NetworkManager','',d)}" +ALTERNATIVE_LINK_NAME[resolv-conf] = "${@bb.utils.contains('PACKAGECONFIG','man-resolv-conf','${sysconfdir}/resolv.conf','',d)}" + + +# The networkmanager package is an empty meta package which weakly depends on all the compiled features. +# Install this package to get all plugins and related dependencies installed. Alternatively just install +# plugins and related dependencies e.g. by installing networkmanager-wifi or networkmanager-wwan +# packages to the firmware. +ALLOW_EMPTY:${PN} = "1" +RRECOMMENDS:${PN} += "\ + ${@bb.utils.contains('PACKAGECONFIG','adsl','${PN}-adsl','',d)} \ + ${@bb.utils.contains('PACKAGECONFIG','bluez5','${PN}-bluetooth','',d)} \ + ${@bb.utils.contains('PACKAGECONFIG','cloud-setup','${PN}-cloud-setup','',d)} \ + ${@bb.utils.contains('PACKAGECONFIG','nmcli','${PN}-nmcli','',d)} \ + ${@bb.utils.contains('PACKAGECONFIG','nmtui','${PN}-nmtui','',d)} \ + ${@bb.utils.contains('PACKAGECONFIG','wifi','${PN}-wifi','',d)} \ + ${@bb.utils.contains('PACKAGECONFIG','wwan','${PN}-wwan','',d)} \ + ${@bb.utils.contains('PACKAGECONFIG','ovs','${PN}-ovs','',d)} \ + ${@bb.utils.contains('PACKAGECONFIG','ppp','${PN}-ppp','',d)} \ +" + +do_install:append() { + install -Dm 0755 ${UNPACKDIR}/${BPN}.initd ${D}${sysconfdir}/init.d/network-manager + + rm -rf ${D}/run ${D}${localstatedir}/run + + if ${@bb.utils.contains('PACKAGECONFIG','man-resolv-conf','true','false',d)}; then + # For read-only filesystem, do not create links during bootup + ln -sf ../run/NetworkManager/resolv.conf ${D}${sysconfdir}/resolv-conf.NetworkManager + + # systemd v210 and newer do not need this rule file + rm ${D}/${nonarch_base_libdir}/udev/rules.d/84-nm-drivers.rules + fi + + # Enable iwd if compiled + if ${@bb.utils.contains('PACKAGECONFIG','iwd','true','false',d)}; then + install -Dm 0644 ${UNPACKDIR}/enable-iwd.conf ${D}${nonarch_libdir}/NetworkManager/conf.d/enable-iwd.conf + fi + + # Enable dhcpd if compiled + if ${@bb.utils.contains('PACKAGECONFIG','dhcpcd','true','false',d)}; then + install -Dm 0644 ${UNPACKDIR}/enable-dhcpcd.conf ${D}${nonarch_libdir}/NetworkManager/conf.d/enable-dhcpcd.conf + fi +} diff --git a/meta-networking/recipes-connectivity/openconnect/openconnect/0001-Shim-for-renaming-of-GNUTLS_NO_EXTENSIONS-in-GnuTLS-.patch b/meta-networking/recipes-connectivity/openconnect/openconnect/0001-Shim-for-renaming-of-GNUTLS_NO_EXTENSIONS-in-GnuTLS-.patch new file mode 100644 index 0000000000..9dd3da75ad --- /dev/null +++ b/meta-networking/recipes-connectivity/openconnect/openconnect/0001-Shim-for-renaming-of-GNUTLS_NO_EXTENSIONS-in-GnuTLS-.patch @@ -0,0 +1,43 @@ +From e4ea64134cfe3763332c16dcac52dd894b935880 Mon Sep 17 00:00:00 2001 +From: Daniel Lenski <dlenski@gmail.com> +Date: Tue, 22 Aug 2023 12:02:19 -0700 +Subject: [PATCH] Shim for renaming of GNUTLS_NO_EXTENSIONS in GnuTLS v3.8.1 + +The constant `GNUTLS_NO_EXTENSIONS` was renamed in +https://gitlab.com/gnutls/gnutls/-/commit/a7c4a04e (released in v3.8.1), and +then a backwards-compatibility shim was belatedly added in +https://gitlab.com/gnutls/gnutls/-/commit/abfa8634, which has not yet been +released. + +We need to re-add the constant ourselves in order to build correctly with +GnuTLS v3.8.1. This should fix +https://gitlab.com/openconnect/openconnect/-/issues/650. + +Upstream-Status: Backport [https://git.infradead.org/users/dwmw2/openconnect.git/commit/7512698217c4104aade7a2df669a20de68f3bb8c] +Signed-off-by: Daniel Lenski <dlenski@gmail.com> +--- + gnutls-dtls.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/gnutls-dtls.c b/gnutls-dtls.c +index 3fd78e95..50a4bb4e 100644 +--- a/gnutls-dtls.c ++++ b/gnutls-dtls.c +@@ -39,6 +39,14 @@ + # define GNUTLS_CIPHER_CHACHA20_POLY1305 23 + #endif + ++#if GNUTLS_VERSION_NUMBER >= 0x030801 && !defined(GNUTLS_NO_EXTENSIONS) ++/* XX: GNUTLS_NO_EXTENSIONS was renamed in GnuTLS v3.8.1. A ++ * backwards-compatibility shim was added in a subsequent commit, but ++ * not yet released. ++ */ ++# define GNUTLS_NO_EXTENSIONS GNUTLS_NO_DEFAULT_EXTENSIONS ++#endif ++ + /* sets the DTLS MTU and returns the actual tunnel MTU */ + unsigned dtls_set_mtu(struct openconnect_info *vpninfo, unsigned mtu) + { +-- +2.42.0 + diff --git a/meta-networking/recipes-connectivity/openconnect/openconnect_9.12.bb b/meta-networking/recipes-connectivity/openconnect/openconnect_9.12.bb new file mode 100644 index 0000000000..7d0e5f2052 --- /dev/null +++ b/meta-networking/recipes-connectivity/openconnect/openconnect_9.12.bb @@ -0,0 +1,33 @@ +SUMMARY = "Open client for Cisco AnyConnect VPN" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c" + +SRC_URI = " \ + git://git.infradead.org/users/dwmw2/openconnect.git;branch=master \ + file://0001-Shim-for-renaming-of-GNUTLS_NO_EXTENSIONS-in-GnuTLS-.patch \ +" +SRCREV = "59f2e59eb3e436364ef82e630e5a2f88f32acd58" + +DEPENDS = "vpnc libxml2 krb5 gettext-native" +RDEPENDS:${PN} = "bash python3-core vpnc-script" + +PACKAGECONFIG ??= "gnutls lz4 libproxy" + +# config defaults +PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls," +PACKAGECONFIG[lz4] = "--with-lz4,--without-lz4,lz4," +PACKAGECONFIG[libproxy] = "--with-libproxy,--without-libproxy,libproxy," + +# not config defaults +PACKAGECONFIG[pcsc-lite] = "--with-libpcsclite,--without-libpcsclite,pcsc-lite," + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig bash-completion + +EXTRA_OECONF += "--with-vpnc-script=${sysconfdir}/vpnc/vpnc-script \ + --disable-static" + +do_install:append() { + rm ${D}/usr/libexec/openconnect/hipreport-android.sh +} diff --git a/meta-networking/recipes-connectivity/openconnect/openconnect_git.bb b/meta-networking/recipes-connectivity/openconnect/openconnect_git.bb deleted file mode 100644 index c944144e22..0000000000 --- a/meta-networking/recipes-connectivity/openconnect/openconnect_git.bb +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "Open client for Cisco AnyConnect VPN" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING.LGPL;md5=243b725d71bb5df4a1e5920b344b86ad" - -DEPENDS = "vpnc libxml2 krb5 gettext-native" - -PACKAGECONFIG ??= "gnutls lz4 libproxy" - -# config defaults -PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls," -PACKAGECONFIG[lz4] = "--with-lz4,--without-lz4,lz4," -PACKAGECONFIG[libproxy] = "--with-libproxy,--without-libproxy,libproxy," - -# not config defaults -PACKAGECONFIG[pcsc-lite] = "--with-libpcsclite,--without-libpcsclite,pcsc-lite," - -PV = "7.08" - -SRCREV = "9697bea0e50952cab57063238b43a7099e498cbb" -SRC_URI = "git://git.infradead.org/users/dwmw2/openconnect.git" - -S = "${WORKDIR}/git" - -inherit autotools pkgconfig - -EXTRA_OECONF += "--with-vpnc-script=${SYSROOT_DESTDIR}${sysconfdir}/vpnc/vpnc-script \ - --disable-static" diff --git a/meta-networking/recipes-connectivity/openfortivpn/openfortivpn_1.22.0.bb b/meta-networking/recipes-connectivity/openfortivpn/openfortivpn_1.22.0.bb new file mode 100644 index 0000000000..568593b2d4 --- /dev/null +++ b/meta-networking/recipes-connectivity/openfortivpn/openfortivpn_1.22.0.bb @@ -0,0 +1,26 @@ +SUMMARY = "Client for PPP+SSL VPN tunnel services" +LICENSE = "GPL-3.0-or-later" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3d575262a651a6f1a17210ce41bf907d" + +SRC_URI = "git://github.com/adrienverge/openfortivpn.git;protocol=https;branch=master" +SRCREV = "82e4401162fc65efad8267f4cb3287c6ab6fc088" + +DEPENDS = "openssl" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" + +PACKAGECONFIG[resolvconf] = "--with-resolvconf=${base_sbindir}/resolvconf --enable-resolvconf,--with-resolvconf=DISABLED,," +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir,," + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig systemd + +EXTRA_OECONF = " \ + --with-pppd=${sbindir}/pppd \ + --disable-proc \ +" + +SYSTEMD_SERVICE:${PN} = "openfortivpn@.service" + +RDEPENDS:${PN} = "ppp" diff --git a/meta-networking/recipes-connectivity/openthread/ot-br-posix/0001-cmake-Disable-nonnull-compare-warning-on-gcc.patch b/meta-networking/recipes-connectivity/openthread/ot-br-posix/0001-cmake-Disable-nonnull-compare-warning-on-gcc.patch new file mode 100644 index 0000000000..7c32166797 --- /dev/null +++ b/meta-networking/recipes-connectivity/openthread/ot-br-posix/0001-cmake-Disable-nonnull-compare-warning-on-gcc.patch @@ -0,0 +1,35 @@ +From aa706d714294b83db696de2beca9a722a512796f Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 19 Apr 2022 14:04:40 -0700 +Subject: [PATCH] cmake: Disable nonnull-compare warning on gcc + +GCC finds a legit warning which clang does not on code like this + +class Message; +void SendResponse(Message & aMessage) +{ + if ((&aMessage) != nullptr) { return; } +} + +Perhaps it should be fixed upstream but for now disable treating this +warning as error when using gcc + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + CMakeLists.txt | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -59,6 +59,10 @@ endif() + set(CMAKE_CXX_EXTENSIONS OFF) + set(CMAKE_EXE_LINKER_FLAGS "-rdynamic ${CMAKE_EXE_LINKER_FLAGS}") + ++if (CMAKE_CXX_COMPILER_ID MATCHES "GNU") ++ add_compile_options(-Wno-error=nonnull-compare) ++endif() ++ + if (OTBR_COVERAGE AND CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") + message(STATUS "Coverage: ON") + target_compile_options(otbr-config INTERFACE -g -O0 --coverage) diff --git a/meta-networking/recipes-connectivity/openthread/ot-br-posix/0001-otbr-agent.service.in-remove-pre-exec-hook-for-mdns-.patch b/meta-networking/recipes-connectivity/openthread/ot-br-posix/0001-otbr-agent.service.in-remove-pre-exec-hook-for-mdns-.patch new file mode 100644 index 0000000000..250de4bdd8 --- /dev/null +++ b/meta-networking/recipes-connectivity/openthread/ot-br-posix/0001-otbr-agent.service.in-remove-pre-exec-hook-for-mdns-.patch @@ -0,0 +1,35 @@ +From ed60d4605b81c43b9ba9504a37835109c247c6f8 Mon Sep 17 00:00:00 2001 +From: Stefan Schmidt <stefan.schmidt@huawei.com> +Date: Fri, 1 Apr 2022 21:46:03 +0200 +Subject: [PATCH] otbr-agent.service.in: remove pre exec hook for mdns service + +It uses the service command which is not available in all cases under +Yocto/OE. The upstream project uses this mainly with Ubuntu and Raspian +as testbeds. + +In our case we simply ensure that avahi-daemon is installed on the +system inside the recipe. + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Stefan Schmidt <stefan.schmidt@huawei.com> +--- + src/agent/otbr-agent.service.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/agent/otbr-agent.service.in b/src/agent/otbr-agent.service.in +index 8314121347..4c97869def 100644 +--- a/src/agent/otbr-agent.service.in ++++ b/src/agent/otbr-agent.service.in +@@ -6,7 +6,7 @@ After=dbus.socket + + [Service] + EnvironmentFile=-@CMAKE_INSTALL_FULL_SYSCONFDIR@/default/otbr-agent +-@EXEC_START_PRE@ExecStart=@CMAKE_INSTALL_FULL_SBINDIR@/otbr-agent $OTBR_AGENT_OPTS ++ExecStart=@CMAKE_INSTALL_FULL_SBINDIR@/otbr-agent $OTBR_AGENT_OPTS + KillMode=mixed + Restart=on-failure + RestartSec=5 +-- +2.35.1 + diff --git a/meta-networking/recipes-connectivity/openthread/ot-br-posix/default-cxx-std.patch b/meta-networking/recipes-connectivity/openthread/ot-br-posix/default-cxx-std.patch new file mode 100644 index 0000000000..4118887cb9 --- /dev/null +++ b/meta-networking/recipes-connectivity/openthread/ot-br-posix/default-cxx-std.patch @@ -0,0 +1,35 @@ +Do not hardcode C std to C99 or C++ std to C++11 if not set +OE compilers are using newer than these standards and absl needs C++14 minimum + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -46,16 +46,6 @@ set_property(CACHE OTBR_MDNS PROPERTY ST + + include("${PROJECT_SOURCE_DIR}/etc/cmake/options.cmake") + +-if(NOT CMAKE_C_STANDARD) +- set(CMAKE_C_STANDARD 99) +- set(CMAKE_C_STANDARD_REQUIRED ON) +-endif() +- +-if(NOT CMAKE_CXX_STANDARD) +- set(CMAKE_CXX_STANDARD 11) +- set(CMAKE_CXX_STANDARD_REQUIRED ON) +-endif() +- + set(CMAKE_CXX_EXTENSIONS OFF) + set(CMAKE_EXE_LINKER_FLAGS "-rdynamic ${CMAKE_EXE_LINKER_FLAGS}") + +@@ -63,6 +53,10 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "GNU") + add_compile_options(-Wno-error=nonnull-compare) + endif() + ++if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 18.1) ++ add_compile_options(-Wno-error=vla-cxx-extension) ++endif() ++ + if (OTBR_COVERAGE AND CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") + message(STATUS "Coverage: ON") + target_compile_options(otbr-config INTERFACE -g -O0 --coverage) diff --git a/meta-networking/recipes-connectivity/openthread/ot-br-posix/musl-fixes.patch b/meta-networking/recipes-connectivity/openthread/ot-br-posix/musl-fixes.patch new file mode 100644 index 0000000000..279a60741f --- /dev/null +++ b/meta-networking/recipes-connectivity/openthread/ot-br-posix/musl-fixes.patch @@ -0,0 +1,26 @@ +Musl fixes, which should be applied upstream too + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- a/src/dbus/common/types.hpp ++++ b/src/dbus/common/types.hpp +@@ -715,7 +715,7 @@ struct TrelInfo + }; + + bool mEnabled; ///< Whether TREL is enabled. +- u_int16_t mNumTrelPeers; ///< The number of TREL peers. ++ uint16_t mNumTrelPeers; ///< The number of TREL peers. + TrelPacketCounters mTrelCounters; ///< The TREL counters. + }; + +--- a/third_party/openthread/repo/src/posix/platform/CMakeLists.txt ++++ b/third_party/openthread/repo/src/posix/platform/CMakeLists.txt +@@ -172,7 +172,7 @@ target_link_libraries(openthread-posix + ) + + option(OT_TARGET_OPENWRT "enable openthread posix for OpenWRT" OFF) +-if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux" AND NOT OT_TARGET_OPENWRT) ++if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux" AND NOT OT_TARGET_OPENWRT AND NOT OT_TARGET_MUSL) + target_compile_definitions(ot-posix-config + INTERFACE "OPENTHREAD_POSIX_CONFIG_NAT64_AIL_PREFIX_ENABLE=1" + ) diff --git a/meta-networking/recipes-connectivity/openthread/ot-br-posix_git.bb b/meta-networking/recipes-connectivity/openthread/ot-br-posix_git.bb new file mode 100644 index 0000000000..0ec9db9e18 --- /dev/null +++ b/meta-networking/recipes-connectivity/openthread/ot-br-posix_git.bb @@ -0,0 +1,69 @@ +# SPDX-FileCopyrightText: Huawei Inc. +# +# SPDX-License-Identifier: Apache-2.0 +SUMMARY = "OpenThread Border Router" +SECTION = "net" +LICENSE = "BSD-3-Clause & MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=87109e44b2fda96a8991f27684a7349c \ + file://third_party/Simple-web-server/repo/LICENSE;md5=091ac9fd29d87ad1ae5bf765d95278b0 \ + file://third_party/cJSON/repo/LICENSE;md5=218947f77e8cb8e2fa02918dc41c50d0 \ + file://third_party/http-parser/repo/LICENSE-MIT;md5=9bfa835d048c194ab30487af8d7b3778 \ + file://third_party/openthread/repo/LICENSE;md5=543b6fe90ec5901a683320a36390c65f \ + " +DEPENDS = "autoconf-archive dbus readline avahi jsoncpp boost libnetfilter-queue protobuf protobuf-native" +SRCREV = "a35cc682305bb2201c314472adf06a4960536750" +PV = "0.3.0+git" + +SRC_URI = "gitsm://github.com/openthread/ot-br-posix.git;protocol=https;branch=main \ + file://0001-otbr-agent.service.in-remove-pre-exec-hook-for-mdns-.patch \ + file://0001-cmake-Disable-nonnull-compare-warning-on-gcc.patch \ + file://default-cxx-std.patch \ + file://musl-fixes.patch \ + " + +S = "${WORKDIR}/git" +SYSTEMD_SERVICE:${PN} = "otbr-agent.service" + +inherit pkgconfig cmake systemd +# openthread/repo/src/cli/cli.cpp:1786:18: fatal error: variable 'i' set but not used [-Wunused-but-set-variable] +# for (uint8_t i = 0;; i++) +CXXFLAGS:append:libc-musl:toolchain-clang = " -Wno-error=sign-compare -Wno-error=unused-but-set-variable" + +EXTRA_OECMAKE = "-DBUILD_TESTING=OFF \ + -DOTBR_DBUS=ON \ + -DOTBR_REST=ON \ + -DOTBR_WEB=OFF \ + -DCMAKE_LIBRARY_PATH=${libdir} \ + -DOTBR_MDNS=avahi \ + -DOTBR_BACKBONE_ROUTER=ON \ + -DOTBR_BORDER_ROUTING=ON \ + -DOTBR_SRP_ADVERTISING_PROXY=ON \ + -DOTBR_BORDER_AGENT=ON \ + -DOT_SPINEL_RESET_CONNECTION=ON \ + -DOT_TREL=ON \ + -DOT_MLR=ON \ + -DOT_SRP_SERVER=ON \ + -DOT_ECDSA=ON \ + -DOT_SERVICE=ON \ + -DOTBR_DUA_ROUTING=ON \ + -DOT_DUA=ON \ + -DOT_BORDER_ROUTING_NAT64=ON \ + -DOTBR_DNSSD_DISCOVERY_PROXY=ON \ + -DOTBR_INFRA_IF_NAME=eth0 \ + -DOTBR_NO_AUTO_ATTACH=1 \ + -DOT_REFERENCE_DEVICE=ON \ + -DOT_DHCP6_CLIENT=ON \ + -DOT_DHCP6_SERVER=ON \ + " +EXTRA_OECMAKE:append:libc-musl = " -DOT_TARGET_MUSL=ON" + +RDEPENDS:${PN} = "iproute2 ipset avahi-daemon" + +RCONFLICTS:${PN} = "ot-daemon" + +FILES:${PN} += "${systemd_unitdir}/*" +FILES:${PN} += "${datadir}/*" + +# http://errors.yoctoproject.org/Errors/Details/766903/ +# git/third_party/openthread/repo/src/core/border_router/routing_manager.hpp:615:11: error: 'ot::BorderRouter::RoutingManager::DiscoveredPrefixTable' declared with greater visibility than the type of its field 'ot::BorderRouter::RoutingManager::DiscoveredPrefixTable::mEntryTimer' [-Werror=attributes] +CXXFLAGS += "-Wno-error=attributes" diff --git a/meta-networking/recipes-connectivity/openthread/ot-daemon_git.bb b/meta-networking/recipes-connectivity/openthread/ot-daemon_git.bb new file mode 100644 index 0000000000..4456835410 --- /dev/null +++ b/meta-networking/recipes-connectivity/openthread/ot-daemon_git.bb @@ -0,0 +1,29 @@ +# SPDX-FileCopyrightText: Huawei Inc. +# +# SPDX-License-Identifier: Apache-2.0 +SUMMARY = "OpenThread Daemon is an OpenThread POSIX build mode that runs OpenThread as a service." +SECTION = "net" +LICENSE = "BSD-3-Clause & Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=543b6fe90ec5901a683320a36390c65f \ + file://third_party/mbedtls/repo/LICENSE;md5=379d5819937a6c2f1ef1630d341e026d \ + " +DEPENDS = "readline" +SRCREV = "90adc86d34e21a9e8f86d093c2190030042c4a59" +PV = "0.1+git" + +SRC_URI = "git://github.com/openthread/openthread.git;protocol=https;branch=main \ + " + +S = "${WORKDIR}/git" + +inherit cmake + +EXTRA_OECMAKE = "-DOT_DAEMON=ON \ + -DOT_SPINEL_RESET_CONNECTION=ON \ + -DOT_THREAD_VERSION=1.2 \ + -DOT_COVERAGE=OFF \ + -DOT_PLATFORM=posix \ + -DCMAKE_BUILD_TYPE=Release \ + " + +EXTRA_OECMAKE:append:libc-musl = " -DOT_TARGET_OPENWRT=ON" diff --git a/meta-networking/recipes-connectivity/openthread/wpantund/basename.patch b/meta-networking/recipes-connectivity/openthread/wpantund/basename.patch new file mode 100644 index 0000000000..30bd9e59cf --- /dev/null +++ b/meta-networking/recipes-connectivity/openthread/wpantund/basename.patch @@ -0,0 +1,19 @@ +include libgen.h for getting prototype for basename() +Newer musl has remove prototype from string.h [1] +which renders a compile error with newer compilers like +clang 18+ about missing prototype. + +[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- a/third_party/openthread/tools/spi-hdlc-adapter/spi-hdlc-adapter.c ++++ b/third_party/openthread/tools/spi-hdlc-adapter/spi-hdlc-adapter.c +@@ -32,6 +32,7 @@ + #endif + + #include <assert.h> ++#include <libgen.h> + #include <stdio.h> + #include <stdlib.h> + #include <stdint.h> diff --git a/meta-networking/recipes-connectivity/openthread/wpantund_git.bb b/meta-networking/recipes-connectivity/openthread/wpantund_git.bb new file mode 100644 index 0000000000..6a84897426 --- /dev/null +++ b/meta-networking/recipes-connectivity/openthread/wpantund_git.bb @@ -0,0 +1,30 @@ +# SPDX-FileCopyrightText: Huawei Inc. +# +# SPDX-License-Identifier: Apache-2.0 +SUMMARY = "wpantund, Userspace WPAN Network Daemon" +SECTION = "net" +LICENSE = "Apache-2.0 & MIT & BSL-1.0 & BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e7820bc7f7d1638a6b54fc2e8d7fb103 \ + file://third_party/assert-macros/LICENSE;md5=cbf35ecdc8161026afe4da2906fab204 \ + file://third_party/boost/LICENSE;md5=e4224ccaecb14d942c71d31bef20d78c \ + file://third_party/fgetln/LICENSE;md5=389e03d2254ecad45d0d9bbdefef7129 \ + file://third_party/openthread/LICENSE;md5=543b6fe90ec5901a683320a36390c65f \ + file://third_party/pt/LICENSE;md5=dcd598b69cad786beea33da7b1ae14b7 \ + " +DEPENDS = "autoconf-archive dbus readline boost" +SRCREV = "8b5ce64c2f5bbf106cabfd015bcb3bdb2e0248d3" +PV = "0.07.01+git" + +SRC_URI = "gitsm://github.com/openthread/wpantund.git;protocol=https;branch=master \ + file://basename.patch \ + " + +S = "${WORKDIR}/git" + +inherit pkgconfig perlnative autotools + +# There has not been a wpantund release as of yet that includes these fixes. +# That means cve-check can not match them. Once a new release comes we can +# remove the statement. +CVE_STATUS[CVE-2020-8916] = "backported-patch: fixed via 3f108441e23e033b936e85be5b6877dd0a1fbf1c" +CVE_STATUS[CVE-2021-33889] = "backported-patch: fixed via 3f108441e23e033b936e85be5b6877dd0a1fbf1c" diff --git a/meta-networking/recipes-connectivity/python-networkmanager/python-networkmanager_2.0.1.bb b/meta-networking/recipes-connectivity/python-networkmanager/python-networkmanager_2.0.1.bb deleted file mode 100644 index 4e41aa5765..0000000000 --- a/meta-networking/recipes-connectivity/python-networkmanager/python-networkmanager_2.0.1.bb +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "Easy communication with NetworkManager from Python" -HOMEPAGE = "https://github.com/seveas/python-networkmanager" -LICENSE = "Zlib" - -LIC_FILES_CHKSUM = "file://COPYING;md5=8d8bac174bf8422b151200e6cc78ebe4" - -SRC_URI[md5sum] = "5fc644a65463031295c6b7dd51a0f1bd" -SRC_URI[sha256sum] = "bc36507506ad29bfdac941b0987ebd1cc9633c9a9291d7378e229e4515a0a517" - -PYPI_PACKAGE = "python-networkmanager" -inherit pypi setuptools - -RDEPENDS_${PN} = "networkmanager python-dbus python-six" diff --git a/meta-networking/recipes-connectivity/python-networkmanager/python3-networkmanager_2.2.bb b/meta-networking/recipes-connectivity/python-networkmanager/python3-networkmanager_2.2.bb new file mode 100644 index 0000000000..60cf3c2525 --- /dev/null +++ b/meta-networking/recipes-connectivity/python-networkmanager/python3-networkmanager_2.2.bb @@ -0,0 +1,13 @@ +SUMMARY = "Easy communication with NetworkManager from Python" +HOMEPAGE = "https://github.com/seveas/python-networkmanager" +LICENSE = "Zlib" + +LIC_FILES_CHKSUM = "file://COPYING;md5=9f8a5b5844f027357ab19ef3e3c6a956" + +SRC_URI[md5sum] = "7e05d3ca40a4fa50222ba93cda3d0d02" +SRC_URI[sha256sum] = "de6eb921d94aba7549f428ed2b3aa482a5d543ecb6965cbaa0fbb555ab31b9d5" + +PYPI_PACKAGE = "python-networkmanager" +inherit pypi setuptools3 + +RDEPENDS:${PN} = "networkmanager python3-dbus python3-six" diff --git a/meta-networking/recipes-connectivity/rdate/rdate/0001-rdate-define-logwtmp-on-libc-glibc.patch b/meta-networking/recipes-connectivity/rdate/rdate/0001-rdate-define-logwtmp-on-libc-glibc.patch index 08ba2c31e9..5fc21808f9 100644 --- a/meta-networking/recipes-connectivity/rdate/rdate/0001-rdate-define-logwtmp-on-libc-glibc.patch +++ b/meta-networking/recipes-connectivity/rdate/rdate/0001-rdate-define-logwtmp-on-libc-glibc.patch @@ -5,6 +5,8 @@ Subject: [PATCH] rdate: define logwtmp on libc != glibc Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + src/rdate.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/meta-networking/recipes-connectivity/rdate/rdate_1.5.bb b/meta-networking/recipes-connectivity/rdate/rdate_1.5.bb index cd4db12c08..67e7c1c615 100644 --- a/meta-networking/recipes-connectivity/rdate/rdate_1.5.bb +++ b/meta-networking/recipes-connectivity/rdate/rdate_1.5.bb @@ -8,7 +8,7 @@ DESCRIPTION = "The rdate utility retrieves the date and time from \ HOMEPAGE= "https://www.aelius.com/njh/rdate/" SECTION = "Applications/System" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" SRC_URI = "https://www.aelius.com/njh/${BPN}/${BP}.tar.gz \ diff --git a/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-fix-parallel-build.patch b/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-fix-parallel-build.patch new file mode 100644 index 0000000000..f35e96a34f --- /dev/null +++ b/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-fix-parallel-build.patch @@ -0,0 +1,31 @@ +It fails to produce common.o when system load is high: + +| In file included from common.c:57: +| ../include/defs.h:49:10: fatal error: y.tab.h: No such file or directory +| 49 | #include "y.tab.h" +| | ^~~~~~~~~ +| compilation terminated. + +Make $(COMMONOBJS) which include common.o to depends on related header files +and y.tab.h to fix the parallel build failure. + +Upstream-Status: Inappropriate [no upstream] + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- + src/Makefile.real | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Makefile.real b/src/Makefile.real +index e0f0dfc..53d4944 100644 +--- a/src/Makefile.real ++++ b/src/Makefile.real +@@ -41,7 +41,7 @@ $(SERVER_BIN): $(SERVEROBJS) $(COMMONOBJS) $(MISSINGOBJS) + $(CLIENT_BIN): $(CLIENTOBJS) $(COMMONOBJS) $(MISSINGOBJS) + $(CC) -o $@ $(CLIENTOBJS) $(COMMONOBJS) $(MISSINGOBJS) $(LIBS) $(LDFLAGS) + +-$(CLIENTOBJS) $(SERVEROBJS): $(HFILES) y.tab.h ++$(COMMONOBJS) $(CLIENTOBJS) $(SERVEROBJS): $(HFILES) y.tab.h + + y.tab.h: gram.c + diff --git a/meta-networking/recipes-connectivity/rdist/rdist_6.1.5.bb b/meta-networking/recipes-connectivity/rdist/rdist_6.1.5.bb index cea1f08f9d..d81cc9a3d1 100644 --- a/meta-networking/recipes-connectivity/rdist/rdist_6.1.5.bb +++ b/meta-networking/recipes-connectivity/rdist/rdist_6.1.5.bb @@ -28,10 +28,17 @@ SRC_URI += "file://rdist-6.1.5-linux.patch \ file://rdist-6.1.5-fix-msgsndnotify-loop.patch \ file://rdist-6.1.5-bb-build.patch \ file://rdist-6.1.5-makefile-add-ldflags.patch \ + file://rdist-6.1.5-fix-parallel-build.patch \ " +UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/rdist/files/rdist/" +UPSTREAM_CHECK_REGEX = "/rdist/(?P<pver>\d+(\.\d+)+)" + DEPENDS = "bison-native" inherit autotools-brokensep EXTRA_OEMAKE = "BIN_GROUP=root MAN_GROUP=root RDIST_MODE=755 RDISTD_MODE=755 MAN_MODE=644" + +# http://errors.yoctoproject.org/Errors/Details/186972/ +COMPATIBLE_HOST:libc-musl = 'null' diff --git a/meta-networking/recipes-connectivity/relayd/relayd/0001-rtnl_flush-Error-on-failed-write.patch b/meta-networking/recipes-connectivity/relayd/relayd/0001-rtnl_flush-Error-on-failed-write.patch deleted file mode 100644 index eaaf30460f..0000000000 --- a/meta-networking/recipes-connectivity/relayd/relayd/0001-rtnl_flush-Error-on-failed-write.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 2fa326b26dc479942367dc4283e2f87372403988 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 17 Jun 2017 09:32:04 -0700 -Subject: [PATCH] rtnl_flush: Error on failed write() - -Fixes -route.c:45:2: error: ignoring return value of 'write', declared with attribute warn_unused_result [-Werror=unused-result] -| write(fd, "-1", 2); -| ^~~~~~~~~~~~~~~~~~ - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Submitted - - route.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/route.c b/route.c -index c552d1f..fc5c31e 100644 ---- a/route.c -+++ b/route.c -@@ -42,7 +42,8 @@ static void rtnl_flush(void) - if (fd < 0) - return; - -- write(fd, "-1", 2); -+ if (write(fd, "-1", 2) < 0 ) -+ perror("write"); - close(fd); - } - --- -2.13.1 - diff --git a/meta-networking/recipes-connectivity/relayd/relayd_git.bb b/meta-networking/recipes-connectivity/relayd/relayd_git.bb index 98dc41a093..871df69909 100644 --- a/meta-networking/recipes-connectivity/relayd/relayd_git.bb +++ b/meta-networking/recipes-connectivity/relayd/relayd_git.bb @@ -1,17 +1,19 @@ DESCRIPTION = "Layer 3 relay daemon" SECTION = "console/network" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://main.c;endline=17;md5=86aad799085683e0a2e1c2684a20bab2" DEPENDS = "libubox" -SRC_URI = "git://git.openwrt.org/project/relayd.git \ - file://0001-rtnl_flush-Error-on-failed-write.patch \ -" +SRC_URI = "git://git.openwrt.org/project/relayd.git;branch=master" -SRCREV = "ad0b25ad74345d367c62311e14b279f5ccb8ef13" -PV = "0.0.1+git${SRCPV}" +SRCREV = "f646ba40489371e69f624f2dee2fc4e19ceec00e" +PV = "0.0.1+git" + +UPSTREAM_CHECK_COMMITS = "1" S = "${WORKDIR}/git" inherit cmake + +CFLAGS:append:toolchain-clang = " -Wno-error=gnu-variable-sized-type-not-at-end" diff --git a/meta-networking/recipes-connectivity/restinio/restinio_0.6.13.bb b/meta-networking/recipes-connectivity/restinio/restinio_0.6.13.bb new file mode 100644 index 0000000000..9239bd81c2 --- /dev/null +++ b/meta-networking/recipes-connectivity/restinio/restinio_0.6.13.bb @@ -0,0 +1,30 @@ +SUMMARY = "Header-only C++14 library that gives you an embedded HTTP server" +DESCRIPTION = "Cross-platform, efficient, customizable, and robust \ + asynchronous HTTP/WebSocket server C++14 library with the \ + right balance between performance and ease of use" +HOMEPAGE = "https://stiffstream.com/en/products/restinio.html" +SECTION = "libs" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://../LICENSE;md5=f399b62ce0a152525d1589a5a40c0ff6" +DEPENDS = "asio fmt http-parser" + +SRC_URI = "https://github.com/Stiffstream/restinio/releases/download/v.${PV}/${BP}.tar.bz2" +SRC_URI[md5sum] = "37a4310e98912030a74bdd4ed789f33c" +SRC_URI[sha256sum] = "b35d696e6fafd4563ca708fcecf9d0cf6705c846d417b5000f5252e0188848e7" + +S = "${WORKDIR}/${BP}/dev" + +inherit cmake + +EXTRA_OECMAKE += "\ + -DRESTINIO_TEST=OFF \ + -DRESTINIO_SAMPLE=OFF \ + -DRESTINIO_BENCH=OFF \ + -DRESTINIO_FIND_DEPS=ON \ + -DRESTINIO_ALLOW_SOBJECTIZER=OFF \ + -DRESTINIO_USE_EXTERNAL_HTTP_PARSER=ON \ + " + +# Header-only library +RDEPENDS:${PN}-dev = "" +RRECOMMENDS:${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" diff --git a/meta-networking/recipes-connectivity/samba/samba/0001-Don-t-check-xsltproc-manpages.patch b/meta-networking/recipes-connectivity/samba/samba/0001-Don-t-check-xsltproc-manpages.patch new file mode 100644 index 0000000000..a498348c20 --- /dev/null +++ b/meta-networking/recipes-connectivity/samba/samba/0001-Don-t-check-xsltproc-manpages.patch @@ -0,0 +1,59 @@ +From 5c5418038e392cc00d3293e00ea0cd20b5e19c9a Mon Sep 17 00:00:00 2001 +From: Bian Naimeng <biannm@cn.fujitsu.com> +Date: Mon, 18 Apr 2016 17:00:53 -0400 +Subject: [PATCH] Don't check xsltproc manpages + +Upstream-Status: Pending + +Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com> + +Rebase to 4.14.4 +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + lib/ldb/wscript | 2 +- + lib/talloc/wscript | 2 +- + lib/tdb/wscript | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/lib/ldb/wscript b/lib/ldb/wscript +index ed5d45f..de3c648 100644 +--- a/lib/ldb/wscript ++++ b/lib/ldb/wscript +@@ -144,7 +144,7 @@ def configure(conf): + conf.DEFINE('EXPECTED_SYSTEM_LDB_VERSION_RELEASE', int(v[2])) + + if conf.env.standalone_ldb: +- conf.CHECK_XSLTPROC_MANPAGES() ++ #conf.CHECK_XSLTPROC_MANPAGES() + + # we need this for the ldap backend + if conf.CHECK_FUNCS_IN('ber_flush ldap_open ldap_initialize', 'lber ldap', headers='lber.h ldap.h'): +diff --git a/lib/talloc/wscript b/lib/talloc/wscript +index 075f1ec..9bd9f73 100644 +--- a/lib/talloc/wscript ++++ b/lib/talloc/wscript +@@ -48,7 +48,7 @@ def configure(conf): + conf.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig' + conf.env.TALLOC_VERSION = VERSION + +- conf.CHECK_XSLTPROC_MANPAGES() ++ #conf.CHECK_XSLTPROC_MANPAGES() + + conf.CHECK_HEADERS('sys/auxv.h') + conf.CHECK_FUNCS('getauxval') +diff --git a/lib/tdb/wscript b/lib/tdb/wscript +index 5e6a928..f13cf2a 100644 +--- a/lib/tdb/wscript ++++ b/lib/tdb/wscript +@@ -95,7 +95,7 @@ def configure(conf): + not conf.env.disable_tdb_mutex_locking): + conf.define('USE_TDB_MUTEX_LOCKING', 1) + +- conf.CHECK_XSLTPROC_MANPAGES() ++ #conf.CHECK_XSLTPROC_MANPAGES() + + conf.SAMBA_CHECK_PYTHON() + conf.SAMBA_CHECK_PYTHON_HEADERS() +-- +2.25.1 + diff --git a/meta-networking/recipes-connectivity/samba/samba/0001-packaging-Avoid-timeout-for-nmbd-if-started-offline-.patch b/meta-networking/recipes-connectivity/samba/samba/0001-packaging-Avoid-timeout-for-nmbd-if-started-offline-.patch deleted file mode 100644 index 0ab3436fc5..0000000000 --- a/meta-networking/recipes-connectivity/samba/samba/0001-packaging-Avoid-timeout-for-nmbd-if-started-offline-.patch +++ /dev/null @@ -1,31 +0,0 @@ -Upstream-Status: Submitted [https://github.com/samba-team/samba/pull/70] - -Signed-off-by: Andreas Oberritter <obi@opendreambox.org> - -From 50eac4fd30944e5e1d83060757633fe0ed572723 Mon Sep 17 00:00:00 2001 -From: Andreas Oberritter <obi@opendreambox.org> -Date: Wed, 30 Nov 2016 16:25:06 +0100 -Subject: [PATCH] packaging: Avoid timeout for nmbd if started offline with - systemd - -If no network connection appears within DefaultTimeoutStartSec -(~ 90s) after startup, nmbd fails to notify systemd and will -therefore get killed. - -Signed-off-by: Andreas Oberritter <obi@opendreambox.org> ---- - packaging/systemd/nmb.service | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/packaging/systemd/nmb.service b/packaging/systemd/nmb.service -index 992c0cd..555c9ab 100644 ---- a/packaging/systemd/nmb.service -+++ b/packaging/systemd/nmb.service -@@ -10,6 +10,7 @@ EnvironmentFile=-/etc/sysconfig/samba - ExecStart=/usr/sbin/nmbd $NMBDOPTIONS - ExecReload=/usr/bin/kill -HUP $MAINPID - LimitCORE=infinity -+TimeoutStartSec=0 - - [Install] - WantedBy=multi-user.target diff --git a/meta-networking/recipes-connectivity/samba/samba/0002-do-not-import-target-module-while-cross-compile.patch b/meta-networking/recipes-connectivity/samba/samba/0002-do-not-import-target-module-while-cross-compile.patch new file mode 100644 index 0000000000..b0ad5c4142 --- /dev/null +++ b/meta-networking/recipes-connectivity/samba/samba/0002-do-not-import-target-module-while-cross-compile.patch @@ -0,0 +1,69 @@ +From ba492aead265edfd1da2a6c45dd7661c248309cb Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Tue, 25 Jun 2019 14:25:08 +0800 +Subject: [PATCH] do not import target module while cross compile + +Some modules such as dynamic library maybe cann't be imported +while cross compile, we just check whether does the module exist. + +Upstream-Status: Pending + +Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com> + +update to version 4.10.5, and switch to python3 +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + buildtools/wafsamba/samba_bundled.py | 27 +++++++++++++++++++-------- + 1 file changed, 19 insertions(+), 8 deletions(-) + +diff --git a/buildtools/wafsamba/samba_bundled.py b/buildtools/wafsamba/samba_bundled.py +index 2300565..26d9e8c 100644 +--- a/buildtools/wafsamba/samba_bundled.py ++++ b/buildtools/wafsamba/samba_bundled.py +@@ -4,6 +4,7 @@ import sys + from waflib import Build, Options, Logs + from waflib.Configure import conf + from wafsamba import samba_utils ++import importlib.util, os + + def PRIVATE_NAME(bld, name): + '''possibly rename a library to include a bundled extension''' +@@ -245,17 +246,27 @@ def CHECK_BUNDLED_SYSTEM_PYTHON(conf, libname, modulename, minversion='0.0.0'): + # versions + minversion = minimum_library_version(conf, libname, minversion) + +- try: +- m = __import__(modulename) +- except ImportError: +- found = False +- else: ++ # Find module in PYTHONPATH ++ spec = importlib.util._find_spec_from_path(modulename, [os.environ["PYTHONPATH"]]) ++ if spec: + try: +- version = m.__version__ +- except AttributeError: ++ module = importlib.util.module_from_spec(spec) ++ spec.loader.load_module(module) ++ except ImportError: + found = False ++ ++ if conf.env.CROSS_COMPILE: ++ # Some modules such as dynamic library maybe cann't be imported ++ # while cross compile, we just check whether the module exist ++ Logs.warn('Cross module[%s] has been found, but can not be loaded.' % (spec.name)) ++ found = True + else: +- found = tuplize_version(version) >= tuplize_version(minversion) ++ try: ++ version = module.__version__ ++ except AttributeError: ++ found = False ++ else: ++ found = tuplize_version(version) >= tuplize_version(minversion) + if not found and not conf.LIB_MAY_BE_BUNDLED(libname): + Logs.error('ERROR: Python module %s of version %s not found, and bundling disabled' % (libname, minversion)) + sys.exit(1) +-- +2.25.1 + diff --git a/meta-networking/recipes-connectivity/samba/samba/0003-Add-config-option-without-valgrind.patch b/meta-networking/recipes-connectivity/samba/samba/0003-Add-config-option-without-valgrind.patch new file mode 100644 index 0000000000..2c9d29c9fe --- /dev/null +++ b/meta-networking/recipes-connectivity/samba/samba/0003-Add-config-option-without-valgrind.patch @@ -0,0 +1,56 @@ +From cceee20e91af751469872b71155b23f0dec290a7 Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Thu, 20 Jun 2019 14:11:16 +0800 +Subject: [PATCH] Add config option without-valgrind + +Upstream-Status: Pending + +Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> + +Update patch to version 4.10.5 +Signed-off-by: Changqing Li <changqing.li@windriver.com> + +Rebase to 4.19.3 +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + lib/replace/wscript | 5 +++-- + wscript | 7 +++++++ + 2 files changed, 10 insertions(+), 2 deletions(-) + +diff --git a/lib/replace/wscript b/lib/replace/wscript +index 37d7759..9dd9b48 100644 +--- a/lib/replace/wscript ++++ b/lib/replace/wscript +@@ -113,8 +113,9 @@ def configure(conf): + conf.CHECK_HEADERS('sys/fileio.h sys/filesys.h sys/dustat.h sys/sysmacros.h') + conf.CHECK_HEADERS('xfs/libxfs.h netgroup.h') + +- conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h') +- conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h valgrind/callgrind.h') ++ if Options.options.enable_valgrind: ++ conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h') ++ conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h valgrind/callgrind.h') + conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h') + conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h') + conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h') +diff --git a/wscript b/wscript +index 95ddd9e..6d9577a 100644 +--- a/wscript ++++ b/wscript +@@ -123,6 +123,13 @@ def options(opt): + help=('Disable kernely keyring support for credential storage'), + action='store_false', dest='enable_keyring') + ++ opt.add_option('--with-valgrind', ++ help=("Enable use of valgrind"), ++ action="store_true", dest='enable_valgrind') ++ opt.add_option('--without-valgrind', ++ help=("Disable use of valgrind"), ++ action="store_false", dest='enable_valgrind', default=False) ++ + gr = opt.option_group('developer options') + + opt.load('python') # options for disabling pyc or pyo compilation +-- +2.25.1 + diff --git a/meta-networking/recipes-connectivity/samba/samba/0004-Add-options-to-configure-the-use-of-libbsd.patch b/meta-networking/recipes-connectivity/samba/samba/0004-Add-options-to-configure-the-use-of-libbsd.patch new file mode 100644 index 0000000000..c72bd133ee --- /dev/null +++ b/meta-networking/recipes-connectivity/samba/samba/0004-Add-options-to-configure-the-use-of-libbsd.patch @@ -0,0 +1,97 @@ +From d302d9a4ac6eb2bbafd248064a878ba287d636b8 Mon Sep 17 00:00:00 2001 +From: Peter Kjellerstedt <pkj@axis.com> +Date: Tue, 28 Apr 2020 02:05:33 +0200 +Subject: [PATCH] Add options to configure the use of libbsd + +Upstream-Status: Inappropriate [oe deterministic build specific] + +Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> + +Rebase to 4.14.4 +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + buildtools/wafsamba/wscript | 7 +++++++ + lib/replace/wscript | 29 +++++++++++++++-------------- + lib/texpect/wscript | 8 +++++++- + 3 files changed, 29 insertions(+), 15 deletions(-) + +diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript +index 30cb366..d167551 100644 +--- a/buildtools/wafsamba/wscript ++++ b/buildtools/wafsamba/wscript +@@ -145,6 +145,13 @@ Currently the only tested value is 'smbtorture,smbd/smbd' for Samba'''), + help=("Disable use of gettext"), + action="store_true", dest='disable_gettext', default=False) + ++ opt.add_option('--with-libbsd', ++ help=("Enable use of libbsd"), ++ action="store_true", dest='enable_libbsd') ++ opt.add_option('--without-libbsd', ++ help=("Disable use of libbsd"), ++ action="store_false", dest='enable_libbsd', default=False) ++ + gr = opt.option_group('developer options') + + gr.add_option('-C', +diff --git a/lib/replace/wscript b/lib/replace/wscript +index 9dd9b48..a22ae59 100644 +--- a/lib/replace/wscript ++++ b/lib/replace/wscript +@@ -444,20 +444,21 @@ def configure(conf): + + strlcpy_in_bsd = False + +- # libbsd on some platforms provides strlcpy and strlcat +- if not conf.CHECK_FUNCS('strlcpy strlcat'): +- if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', +- checklibc=True): +- strlcpy_in_bsd = True +- if not conf.CHECK_FUNCS('getpeereid'): +- conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') +- if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): +- conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h') +- if not conf.CHECK_FUNCS('setproctitle_init'): +- conf.CHECK_FUNCS_IN('setproctitle_init', 'bsd', headers='sys/types.h bsd/unistd.h') +- +- if not conf.CHECK_FUNCS('closefrom'): +- conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') ++ if Options.options.enable_libbsd: ++ # libbsd on some platforms provides strlcpy and strlcat ++ if not conf.CHECK_FUNCS('strlcpy strlcat'): ++ if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', ++ checklibc=True): ++ strlcpy_in_bsd = True ++ if not conf.CHECK_FUNCS('getpeereid'): ++ conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') ++ if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): ++ conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h') ++ if not conf.CHECK_FUNCS('setproctitle_init'): ++ conf.CHECK_FUNCS_IN('setproctitle_init', 'bsd', headers='sys/types.h bsd/unistd.h') ++ ++ if not conf.CHECK_FUNCS('closefrom'): ++ conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') + + conf.CHECK_CODE(''' + struct ucred cred; +diff --git a/lib/texpect/wscript b/lib/texpect/wscript +index 44f92a8..79e8d09 100644 +--- a/lib/texpect/wscript ++++ b/lib/texpect/wscript +@@ -1,7 +1,13 @@ + #!/usr/bin/env python + ++from waflib import Options ++ + def configure(conf): +- conf.CHECK_FUNCS_IN('openpty', 'util', checklibc=True, headers='pty.h util.h bsd/libutil.h libutil.h') ++ hdrs = 'pty.h util.h' ++ if Options.options.enable_libbsd: ++ hdrs += ' bsd/libutil.h' ++ hdrs += ' libutil.h' ++ conf.CHECK_FUNCS_IN('openpty', 'util', checklibc=True, headers=hdrs) + + def build(bld): + bld.SAMBA_BINARY('texpect', +-- +2.25.1 + diff --git a/meta-networking/recipes-connectivity/samba/samba/0005-Fix-pyext_PATTERN-for-cross-compilation.patch b/meta-networking/recipes-connectivity/samba/samba/0005-Fix-pyext_PATTERN-for-cross-compilation.patch new file mode 100644 index 0000000000..53ef21948a --- /dev/null +++ b/meta-networking/recipes-connectivity/samba/samba/0005-Fix-pyext_PATTERN-for-cross-compilation.patch @@ -0,0 +1,63 @@ +From d2a2d0f82a37d0bf21123671774b0b03ffa976cf Mon Sep 17 00:00:00 2001 +From: Yi Zhao <yi.zhao@windriver.com> +Date: Wed, 24 Nov 2021 13:33:35 +0800 +Subject: [PATCH] Fix pyext_PATTERN for cross compilation + +The pyext_PATTERN will add native arch as suffix when cross compiling. +For example, on qemuarm64, it is expanded to: +pyext_PATTERN ='%s.cpython-310-x86_64-linux-gnu.so' +which will result in the incorrect library name. + +root@qemuarm64:~# find /usr/lib -name \*cpython\* +/usr/lib/pkgconfig/samba-policy.cpython-310-x86_64-linux-gnu.pc +/usr/lib/libsamba-policy.cpython-310-x86-64-linux-gnu.so +/usr/lib/samba/libsamba-python.cpython-310-x86-64-linux-gnu-samba4.so +/usr/lib/samba/libsamba-net.cpython-310-x86-64-linux-gnu-samba4.so +/usr/lib/libsamba-policy.cpython-310-x86-64-linux-gnu.so.0 +/usr/lib/libsamba-policy.cpython-310-x86-64-linux-gnu.so.0.0.1 +/usr/lib/python3.10/site-packages/samba/dsdb_dns.cpython-310-x86_64-linux-gnu.so +/usr/lib/python3.10/site-packages/samba/dsdb.cpython-310-x86_64-linux-gnu.so +/usr/lib/python3.10/site-packages/samba/xattr_tdb.cpython-310-x86_64-linux-gnu.so +/usr/lib/python3.10/site-packages/samba/_ldb.cpython-310-x86_64-linux-gnu.so +/usr/lib/python3.10/site-packages/samba/gensec.cpython-310-x86_64-linux-gnu.so +[snip] + +Set pyext_PATTERN to '%s.so' to remove the suffix. +After the patch: +root@qemuarm64:~# find /usr/lib/ +/usr/lib/pkgconfig/samba-policy.pc +/usr/lib/libsamba-policy.so +/usr/lib/samba/libsamba-python-samba4.so +/usr/lib/samba/libsamba-net-samba4.so +/usr/lib/libsamba-policy.so.0 +/usr/lib/libsamba-policy.so.0.0.1 +/usr/lib/python3.10/site-packages/samba/dsdb_dns.so +/usr/lib/python3.10/site-packages/samba/dsdb.so +/usr/lib/python3.10/site-packages/samba/xattr_tdb.so +/usr/lib/python3.10/site-packages/samba/_ldb.so +/usr/lib/python3.10/site-packages/samba/gensec.so +[snip] + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + third_party/waf/waflib/Tools/python.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/third_party/waf/waflib/Tools/python.py b/third_party/waf/waflib/Tools/python.py +index b2dd1a9..2bd3545 100644 +--- a/third_party/waf/waflib/Tools/python.py ++++ b/third_party/waf/waflib/Tools/python.py +@@ -339,7 +339,7 @@ def check_python_headers(conf, features='pyembed pyext'): + x = 'MACOSX_DEPLOYMENT_TARGET' + if dct[x]: + env[x] = conf.environ[x] = str(dct[x]) +- env.pyext_PATTERN = '%s' + (dct['EXT_SUFFIX'] or dct['SO']) # SO is deprecated in 3.5 and removed in 3.11 ++ env.pyext_PATTERN = '%s.so' + + + # Try to get pythonX.Y-config +-- +2.25.1 + diff --git a/meta-networking/recipes-connectivity/samba/samba/0006-avoid-using-colon-in-the-checking-msg.patch b/meta-networking/recipes-connectivity/samba/samba/0006-avoid-using-colon-in-the-checking-msg.patch deleted file mode 100644 index cdf7a38c18..0000000000 --- a/meta-networking/recipes-connectivity/samba/samba/0006-avoid-using-colon-in-the-checking-msg.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 5413f97290d3126262eb309ecbcf7769509f2a11 Mon Sep 17 00:00:00 2001 -From: Jackie Huang <jackie.huang@windriver.com> -Date: Tue, 10 Nov 2015 00:48:35 -0500 -Subject: [PATCH 6/7] avoid using colon in the checking msg - -Upstream-Status: Pending - -colon is used as the separator when parse from -a answers file, the colon here makes it never -get the right answer. - -Signed-off-by: Jackie Huang <jackie.huang@windriver.com> ---- - wscript_configure_system_mitkrb5 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/wscript_configure_system_mitkrb5 b/wscript_configure_system_mitkrb5 -index a62d00b..a2d89f0 100644 ---- a/wscript_configure_system_mitkrb5 -+++ b/wscript_configure_system_mitkrb5 -@@ -240,7 +240,7 @@ conf.CHECK_CODE(''' - ''', - 'HAVE_WRFILE_KEYTAB', - headers='krb5.h', lib='krb5', execute=True, -- msg="Checking whether the WRFILE:-keytab is supported"); -+ msg="Checking whether the WRFILE -keytab is supported"); - # Check for KRB5_DEPRECATED handling - conf.CHECK_CODE('''#define KRB5_DEPRECATED 1 - #include <krb5.h>''', --- -1.9.1 - diff --git a/meta-networking/recipes-connectivity/samba/samba/0006-smbtorture-skip-test-case-tfork_cmd_send.patch b/meta-networking/recipes-connectivity/samba/samba/0006-smbtorture-skip-test-case-tfork_cmd_send.patch new file mode 100644 index 0000000000..13fbd35950 --- /dev/null +++ b/meta-networking/recipes-connectivity/samba/samba/0006-smbtorture-skip-test-case-tfork_cmd_send.patch @@ -0,0 +1,38 @@ +From 4fd04fc7c94d6981f3409d088ab8d32c48460010 Mon Sep 17 00:00:00 2001 +From: Yi Zhao <yi.zhao@windriver.com> +Date: Thu, 25 Aug 2022 16:46:04 +0800 +Subject: [PATCH] smbtorture: skip test case tfork_cmd_send + +The test case tfork_cmd_send fails on target as it requires a script +located in the source directory: + +$ smbtorture ncalrpc:localhost local.tfork.tfork_cmd_send +test: tfork_cmd_send +/buildarea/build/tmp/work/core2-64-poky-linux/samba/4.14.14-r0/samba-4.14.14/testprogs/blackbox/tfork.sh: +Failed to exec child - No such file or directory + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + lib/util/tests/tfork.c | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/lib/util/tests/tfork.c b/lib/util/tests/tfork.c +index 70ae975..4826ce6 100644 +--- a/lib/util/tests/tfork.c ++++ b/lib/util/tests/tfork.c +@@ -839,10 +839,6 @@ struct torture_suite *torture_local_tfork(TALLOC_CTX *mem_ctx) + "tfork_threads", + test_tfork_threads); + +- torture_suite_add_simple_test(suite, +- "tfork_cmd_send", +- test_tfork_cmd_send); +- + torture_suite_add_simple_test(suite, + "tfork_event_file_handle", + test_tfork_event_file_handle); +-- +2.25.1 + diff --git a/meta-networking/recipes-connectivity/samba/samba/0007-Deleted-settiong-of-python-to-fix-the-install-confli.patch b/meta-networking/recipes-connectivity/samba/samba/0007-Deleted-settiong-of-python-to-fix-the-install-confli.patch new file mode 100644 index 0000000000..e3506adfb7 --- /dev/null +++ b/meta-networking/recipes-connectivity/samba/samba/0007-Deleted-settiong-of-python-to-fix-the-install-confli.patch @@ -0,0 +1,124 @@ +From bf5552f937c745940081e29ef32d52ae26bfd8c1 Mon Sep 17 00:00:00 2001 +From: Lei Maohui <leimaohui@fujitsu.com> +Date: Sun, 30 Oct 2022 11:59:31 +0900 +Subject: [PATCH] Deleted settiong of python to fix the install conflict error + when enable multilib. + + file /usr/bin/samba-tool conflicts between attempted installs of samba-4.14.14-r0.core2_64 and lib32-samba-4.14.14-r0.i686 + file /usr/sbin/samba-gpupdate conflicts between attempted installs of samba-4.14.14-r0.core2_64 and lib32-samba-4.14.14-r0.i686 + file /usr/sbin/samba_dnsupdate conflicts between attempted installs of samba-4.14.14-r0.core2_64 and lib32-samba-4.14.14-r0.i686 + file /usr/sbin/samba_downgrade_db conflicts between attempted installs of samba-4.14.14-r0.core2_64 and lib32-samba-4.14.14-r0.i686 + file /usr/sbin/samba_kcc conflicts between attempted installs of samba-4.14.14-r0.core2_64 and lib32-samba-4.14.14-r0.i686 + file /usr/sbin/samba_spnupdate conflicts between attempted installs of samba-4.14.14-r0.core2_64 and lib32-samba-4.14.14-r0.i686 + file /usr/sbin/samba_upgradedns conflicts between attempted installs of samba-4.14.14-r0.core2_64 and lib32-samba-4.14.14-r0.i686 + +The conflict is because there is a difference between of lib32-samba-* and samba-* as the following: +64bit: +sys.path.insert(0, "/usr/lib64/python3.10/site-packages") + +32bit: +sys.path.insert(0, "/usr/lib/python3.10/site-packages") + +But this setting is for environment when running from source tree. There +is no necessary on target. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Lei Maohui <leimaohui@fujitsu.com> +--- + source4/scripting/bin/samba-gpupdate | 1 - + source4/scripting/bin/samba-tool | 1 - + source4/scripting/bin/samba_dnsupdate | 1 - + source4/scripting/bin/samba_downgrade_db | 1 - + source4/scripting/bin/samba_kcc | 1 - + source4/scripting/bin/samba_spnupdate | 1 - + source4/scripting/bin/samba_upgradedns | 1 - + 7 files changed, 7 deletions(-) + +diff --git a/source4/scripting/bin/samba-gpupdate b/source4/scripting/bin/samba-gpupdate +index 4b3f057..08fec2d 100755 +--- a/source4/scripting/bin/samba-gpupdate ++++ b/source4/scripting/bin/samba-gpupdate +@@ -25,7 +25,6 @@ applied, have changed, or is in the right container''' + import os + import sys + +-sys.path.insert(0, "bin/python") + + import optparse + from samba import getopt as options +diff --git a/source4/scripting/bin/samba-tool b/source4/scripting/bin/samba-tool +index b02ad4d..f69ae10 100755 +--- a/source4/scripting/bin/samba-tool ++++ b/source4/scripting/bin/samba-tool +@@ -22,7 +22,6 @@ + import sys + + # Find right direction when running from source tree +-sys.path.insert(0, "bin/python") + + # make sure the script dies immediately when hitting control-C, + # rather than raising KeyboardInterrupt. As we do all database +diff --git a/source4/scripting/bin/samba_dnsupdate b/source4/scripting/bin/samba_dnsupdate +index 69821e2..4037870 100755 +--- a/source4/scripting/bin/samba_dnsupdate ++++ b/source4/scripting/bin/samba_dnsupdate +@@ -36,7 +36,6 @@ os.environ['PYTHONUNBUFFERED'] = '1' + os.environ["TZ"] = "GMT" + + # Find right directory when running from source tree +-sys.path.insert(0, "bin/python") + + import samba + import optparse +diff --git a/source4/scripting/bin/samba_downgrade_db b/source4/scripting/bin/samba_downgrade_db +index b9a0909..80f581e 100755 +--- a/source4/scripting/bin/samba_downgrade_db ++++ b/source4/scripting/bin/samba_downgrade_db +@@ -23,7 +23,6 @@ import optparse + import sys + + # Find right directory when running from source tree +-sys.path.insert(0, "bin/python") + + + import samba +diff --git a/source4/scripting/bin/samba_kcc b/source4/scripting/bin/samba_kcc +index 67d801e..2fc0d6a 100755 +--- a/source4/scripting/bin/samba_kcc ++++ b/source4/scripting/bin/samba_kcc +@@ -36,7 +36,6 @@ os.environ['PYTHONUNBUFFERED'] = '1' + os.environ["TZ"] = "GMT" + + # Find right directory when running from source tree +-sys.path.insert(0, "bin/python") + + import optparse + import time +diff --git a/source4/scripting/bin/samba_spnupdate b/source4/scripting/bin/samba_spnupdate +index b421886..5e18ad9 100755 +--- a/source4/scripting/bin/samba_spnupdate ++++ b/source4/scripting/bin/samba_spnupdate +@@ -32,7 +32,6 @@ os.environ['PYTHONUNBUFFERED'] = '1' + os.environ["TZ"] = "GMT" + + # Find right directory when running from source tree +-sys.path.insert(0, "bin/python") + + import samba, ldb + import optparse +diff --git a/source4/scripting/bin/samba_upgradedns b/source4/scripting/bin/samba_upgradedns +index afc5807..727a3cc 100755 +--- a/source4/scripting/bin/samba_upgradedns ++++ b/source4/scripting/bin/samba_upgradedns +@@ -27,7 +27,6 @@ import grp + from base64 import b64encode + import shlex + +-sys.path.insert(0, "bin/python") + + import ldb + import samba +-- +2.25.1 + diff --git a/meta-networking/recipes-connectivity/samba/samba/16-do-not-check-xsltproc-manpages.patch b/meta-networking/recipes-connectivity/samba/samba/16-do-not-check-xsltproc-manpages.patch deleted file mode 100644 index c37cfcde44..0000000000 --- a/meta-networking/recipes-connectivity/samba/samba/16-do-not-check-xsltproc-manpages.patch +++ /dev/null @@ -1,43 +0,0 @@ -Don't check xsltproc manpages - -Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com> - -Index: samba-4.4.2/lib/ldb/wscript -=================================================================== ---- samba-4.4.2.orig/lib/ldb/wscript -+++ samba-4.4.2/lib/ldb/wscript -@@ -65,7 +65,7 @@ def configure(conf): - conf.define('USING_SYSTEM_LDB', 1) - - if conf.env.standalone_ldb: -- conf.CHECK_XSLTPROC_MANPAGES() -+ #conf.CHECK_XSLTPROC_MANPAGES() - - # we need this for the ldap backend - if conf.CHECK_FUNCS_IN('ber_flush ldap_open ldap_initialize', 'lber ldap', headers='lber.h ldap.h'): -Index: samba-4.4.2/lib/talloc/wscript -=================================================================== ---- samba-4.4.2.orig/lib/talloc/wscript -+++ samba-4.4.2/lib/talloc/wscript -@@ -56,7 +56,7 @@ def configure(conf): - if conf.env.standalone_talloc: - conf.env.TALLOC_COMPAT1 = Options.options.TALLOC_COMPAT1 - -- conf.CHECK_XSLTPROC_MANPAGES() -+ #conf.CHECK_XSLTPROC_MANPAGES() - - if not conf.env.disable_python: - # also disable if we don't have the python libs installed -Index: samba-4.4.2/lib/tdb/wscript -=================================================================== ---- samba-4.4.2.orig/lib/tdb/wscript -+++ samba-4.4.2/lib/tdb/wscript -@@ -92,7 +92,7 @@ def configure(conf): - not conf.env.disable_tdb_mutex_locking): - conf.define('USE_TDB_MUTEX_LOCKING', 1) - -- conf.CHECK_XSLTPROC_MANPAGES() -+ #conf.CHECK_XSLTPROC_MANPAGES() - - if not conf.env.disable_python: - # also disable if we don't have the python libs installed diff --git a/meta-networking/recipes-connectivity/samba/samba/20-do-not-import-target-module-while-cross-compile.patch b/meta-networking/recipes-connectivity/samba/samba/20-do-not-import-target-module-while-cross-compile.patch deleted file mode 100644 index e112b3b40b..0000000000 --- a/meta-networking/recipes-connectivity/samba/samba/20-do-not-import-target-module-while-cross-compile.patch +++ /dev/null @@ -1,58 +0,0 @@ -Some modules such as dynamic library maybe cann't be imported while cross compile, -we just check whether does the module exist. - -Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com> - -Index: samba-4.4.2/buildtools/wafsamba/samba_bundled.py -=================================================================== ---- samba-4.4.2.orig/buildtools/wafsamba/samba_bundled.py -+++ samba-4.4.2/buildtools/wafsamba/samba_bundled.py -@@ -2,6 +2,7 @@ - - import sys - import Build, Options, Logs -+import imp, os - from Configure import conf - from samba_utils import TO_LIST - -@@ -230,17 +231,32 @@ def CHECK_BUNDLED_SYSTEM_PYTHON(conf, li - # versions - minversion = minimum_library_version(conf, libname, minversion) - -- try: -- m = __import__(modulename) -- except ImportError: -- found = False -- else: -+ # Find module in PYTHONPATH -+ stuff = imp.find_module(modulename, [os.environ["PYTHONPATH"]]) -+ if stuff: - try: -- version = m.__version__ -- except AttributeError: -+ m = imp.load_module(modulename, stuff[0], stuff[1], stuff[2]) -+ except ImportError: - found = False -+ -+ if conf.env.CROSS_COMPILE: -+ # Some modules such as dynamic library maybe cann't be imported -+ # while cross compile, we just check whether the module exist -+ Logs.warn('Cross module[%s] has been found, but can not be loaded.' % (stuff[1])) -+ found = True - else: -- found = tuplize_version(version) >= tuplize_version(minversion) -+ try: -+ version = m.__version__ -+ except AttributeError: -+ found = False -+ else: -+ found = tuplize_version(version) >= tuplize_version(minversion) -+ finally: -+ if stuff[0]: -+ stuff[0].close() -+ else: -+ found = False -+ - if not found and not conf.LIB_MAY_BE_BUNDLED(libname): - Logs.error('ERROR: Python module %s of version %s not found, and bundling disabled' % (libname, minversion)) - sys.exit(1) diff --git a/meta-networking/recipes-connectivity/samba/samba/21-add-config-option-without-valgrind.patch b/meta-networking/recipes-connectivity/samba/samba/21-add-config-option-without-valgrind.patch deleted file mode 100644 index 025ac2775f..0000000000 --- a/meta-networking/recipes-connectivity/samba/samba/21-add-config-option-without-valgrind.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 9a2d6315ff206b2a47100dfd85afe3af56576995 Mon Sep 17 00:00:00 2001 -From: Wenzong Fan <wenzong.fan@windriver.com> -Date: Thu, 10 Dec 2015 04:20:51 -0500 -Subject: [PATCH] Add config option without-valgrind - -Upstream-Status: Pending - -Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> ---- - lib/replace/wscript | 4 +++- - source3/wscript | 5 ++++- - wscript | 4 ++++ - 3 files changed, 11 insertions(+), 2 deletions(-) - -diff --git a/lib/replace/wscript b/lib/replace/wscript -index f0040b1..aca73af 100644 ---- a/lib/replace/wscript -+++ b/lib/replace/wscript -@@ -101,7 +101,9 @@ struct foo bar = { .y = 'X', .x = 1 }; - - conf.CHECK_CODE('', headers='rpc/rpc.h rpcsvc/yp_prot.h', define='HAVE_RPCSVC_YP_PROT_H') - -- conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h valgrind/memcheck.h') -+ if not Options.options.disable_valgrind: -+ conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h valgrind/memcheck.h') -+ - conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h') - conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h') - conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h malloc.h') -diff --git a/source3/wscript b/source3/wscript -index bac3dd5..a5c51ea 100644 ---- a/source3/wscript -+++ b/source3/wscript -@@ -1016,7 +1016,10 @@ syscall(SYS_setgroups32, 0, NULL); - Logs.warn("--with-dnsupdate=yes but gssapi support not sufficient") - else: - conf.DEFINE('WITH_DNS_UPDATES', 1) -- conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h valgrind/memcheck.h') -+ -+ if not Options.options.disable_valgrind: -+ conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h valgrind/memcheck.h') -+ - if Options.options.developer: - if conf.CONFIG_SET('HAVE_VALGRIND_H') or conf.CONFIG_SET('HAVE_VALGRIND_VALGRIND_H'): - conf.DEFINE('VALGRIND', '1') -diff --git a/wscript b/wscript -index 7679c0f..681ac17 100644 ---- a/wscript -+++ b/wscript -@@ -72,6 +72,10 @@ def set_options(opt): - help=("Disable systemd integration"), - action='store_false', dest='enable_systemd') - -+ opt.add_option('--without-valgrind', -+ help=("Disable use of the valgrind headers"), -+ action="store_true", dest='disable_valgrind', default=False) -+ - gr = opt.option_group('developer options') - - opt.tool_options('python') # options for disabling pyc or pyo compilation --- -1.9.1 - diff --git a/meta-networking/recipes-connectivity/samba/samba/dnsserver-4.7.0.patch b/meta-networking/recipes-connectivity/samba/samba/dnsserver-4.7.0.patch deleted file mode 100644 index 0c7592f8e2..0000000000 --- a/meta-networking/recipes-connectivity/samba/samba/dnsserver-4.7.0.patch +++ /dev/null @@ -1,19 +0,0 @@ -samba: build dnsserver_common code - -Just 'install' does not seem to do it. - -Upstream-Status: Pending - -Signed-off-by: Joe Slater <joe.slater@windriver.com> - ---- a/source4/dns_server/wscript_build -+++ b/source4/dns_server/wscript_build -@@ -4,7 +4,7 @@ bld.SAMBA_LIBRARY('dnsserver_common', - source='dnsserver_common.c', - deps='samba-util samba-errors ldbsamba clidns', - private_library=True, -- install=bld.AD_DC_BUILD_IS_ENABLED() -+ enabled=bld.AD_DC_BUILD_IS_ENABLED() - ) - - bld.SAMBA_MODULE('service_dns', diff --git a/meta-networking/recipes-connectivity/samba/samba/glibc_only.patch b/meta-networking/recipes-connectivity/samba/samba/glibc_only.patch deleted file mode 100644 index 894bc8bb2c..0000000000 --- a/meta-networking/recipes-connectivity/samba/samba/glibc_only.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: samba-4.6.2/ctdb/tests/src/test_mutex_raw.c -=================================================================== ---- samba-4.6.2.orig/ctdb/tests/src/test_mutex_raw.c -+++ samba-4.6.2/ctdb/tests/src/test_mutex_raw.c -@@ -166,8 +166,10 @@ int main(int argc, const char **argv) - if (ret == 0) { - pthread_mutex_unlock(mutex); - } -+#ifdef __GLIBC__ - } else if (ret == EBUSY) { - printf("pid=%u\n", mutex->__data.__owner); -+#endif - } else if (ret == 0) { - pthread_mutex_unlock(mutex); - } diff --git a/meta-networking/recipes-connectivity/samba/samba/iconv-4.7.0.patch b/meta-networking/recipes-connectivity/samba/samba/iconv-4.7.0.patch deleted file mode 100644 index 5ae8c59783..0000000000 --- a/meta-networking/recipes-connectivity/samba/samba/iconv-4.7.0.patch +++ /dev/null @@ -1,25 +0,0 @@ -samba: defeat iconv test - -A test was added when configuring samba which requires target code -to be executed. In general, this will not work, so we eliminate it. - -Upstream-Status: Pending - -Signed-off-by: Joe Slater <joe.slater@windriver.com> - ---- a/lib/util/charset/wscript_configure -+++ b/lib/util/charset/wscript_configure -@@ -17,6 +17,8 @@ if (conf.CHECK_FUNCS_IN('iconv_open', 'i - - conf.DEFINE('HAVE_NATIVE_ICONV', 1) - -+""" -+[added for 4.7.0, but breaks cross-compilation] - conf.CHECK_CODE(''' - uint8_t inbuf[2] = { 0x30, 0xdf }; - uint8_t outbuf[4] = { 0 }; -@@ -36,3 +38,4 @@ conf.CHECK_CODE(''' - msg='Checking errno of iconv for illegal multibyte sequence', - lib='iconv', - headers='errno.h iconv.h') -+""" diff --git a/meta-networking/recipes-connectivity/samba/samba/netdb_defines.patch b/meta-networking/recipes-connectivity/samba/samba/netdb_defines.patch deleted file mode 100644 index eb06866f46..0000000000 --- a/meta-networking/recipes-connectivity/samba/samba/netdb_defines.patch +++ /dev/null @@ -1,19 +0,0 @@ -Index: samba-4.6.2/nsswitch/wins.c -=================================================================== ---- samba-4.6.2.orig/nsswitch/wins.c -+++ samba-4.6.2/nsswitch/wins.c -@@ -39,6 +39,14 @@ static pthread_mutex_t wins_nss_mutex = - #define INADDRSZ 4 - #endif - -+#ifndef NETDB_INTERNAL -+#define NETDB_INTERNAL (-1) -+#endif -+ -+#ifndef NETDB_SUCCESS -+#define NETDB_SUCCESS 0 -+#endif -+ - NSS_STATUS _nss_wins_gethostbyname_r(const char *hostname, - struct hostent *he, - char *buffer, diff --git a/meta-networking/recipes-connectivity/samba/samba/samba-4.3.9-remove-getpwent_r.patch b/meta-networking/recipes-connectivity/samba/samba/samba-4.3.9-remove-getpwent_r.patch index 71db99c5d2..0c967be62f 100644 --- a/meta-networking/recipes-connectivity/samba/samba/samba-4.3.9-remove-getpwent_r.patch +++ b/meta-networking/recipes-connectivity/samba/samba/samba-4.3.9-remove-getpwent_r.patch @@ -1,15 +1,24 @@ -Musl does not have _r versions of getent() and getpwent() APIs +From e5d9527e6b3b386229747f799c725fcd68bc5228 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 6 Nov 2016 23:40:54 -0800 +Subject: [PATCH] Musl does not have _r versions of getent() and getpwent() + APIs Taken from gentoo http://data.gpo.zugaina.org/musl/net-fs/samba/files/samba-4.3.9-remove-getpwent_r.patch +Upstream-Status: Pending + Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + source4/torture/local/nss_tests.c | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) -Index: samba-4.4.5/source4/torture/local/nss_tests.c -=================================================================== ---- samba-4.4.5.orig/source4/torture/local/nss_tests.c -+++ samba-4.4.5/source4/torture/local/nss_tests.c -@@ -247,7 +247,6 @@ static bool test_getgrnam_r(struct tortu +diff --git a/source4/torture/local/nss_tests.c b/source4/torture/local/nss_tests.c +index e911aa2..2b39b74 100644 +--- a/source4/torture/local/nss_tests.c ++++ b/source4/torture/local/nss_tests.c +@@ -247,7 +247,6 @@ static bool test_getgrnam_r(struct torture_context *tctx, return true; } @@ -17,7 +26,7 @@ Index: samba-4.4.5/source4/torture/local/nss_tests.c static bool test_getgrgid(struct torture_context *tctx, gid_t gid, struct group *grp_p) -@@ -333,6 +332,7 @@ static bool test_enum_passwd(struct tort +@@ -333,6 +332,7 @@ static bool test_enum_passwd(struct torture_context *tctx, return true; } @@ -25,7 +34,7 @@ Index: samba-4.4.5/source4/torture/local/nss_tests.c static bool test_enum_r_passwd(struct torture_context *tctx, struct passwd **pwd_array_p, size_t *num_pwd_p) -@@ -381,6 +381,7 @@ static bool test_enum_r_passwd(struct to +@@ -383,6 +383,7 @@ static bool test_enum_r_passwd(struct torture_context *tctx, return true; } @@ -33,7 +42,7 @@ Index: samba-4.4.5/source4/torture/local/nss_tests.c static bool torture_assert_passwd_equal(struct torture_context *tctx, const struct passwd *p1, -@@ -432,7 +433,7 @@ static bool test_passwd_r(struct torture +@@ -434,7 +435,7 @@ static bool test_passwd_r(struct torture_context *tctx) struct passwd *pwd, pwd1, pwd2; size_t num_pwd; @@ -42,7 +51,7 @@ Index: samba-4.4.5/source4/torture/local/nss_tests.c "failed to enumerate passwd"); for (i=0; i < num_pwd; i++) { -@@ -460,7 +461,7 @@ static bool test_passwd_r_cross(struct t +@@ -462,7 +463,7 @@ static bool test_passwd_r_cross(struct torture_context *tctx) struct passwd *pwd, pwd1, pwd2, pwd3, pwd4; size_t num_pwd; @@ -51,7 +60,7 @@ Index: samba-4.4.5/source4/torture/local/nss_tests.c "failed to enumerate passwd"); for (i=0; i < num_pwd; i++) { -@@ -531,6 +532,7 @@ static bool test_enum_group(struct tortu +@@ -533,6 +534,7 @@ static bool test_enum_group(struct torture_context *tctx, return true; } @@ -59,7 +68,7 @@ Index: samba-4.4.5/source4/torture/local/nss_tests.c static bool test_enum_r_group(struct torture_context *tctx, struct group **grp_array_p, size_t *num_grp_p) -@@ -579,6 +581,7 @@ static bool test_enum_r_group(struct tor +@@ -583,6 +585,7 @@ static bool test_enum_r_group(struct torture_context *tctx, return true; } @@ -67,7 +76,7 @@ Index: samba-4.4.5/source4/torture/local/nss_tests.c static bool torture_assert_group_equal(struct torture_context *tctx, const struct group *g1, -@@ -635,7 +638,7 @@ static bool test_group_r(struct torture_ +@@ -639,7 +642,7 @@ static bool test_group_r(struct torture_context *tctx) struct group *grp, grp1, grp2; size_t num_grp; @@ -76,7 +85,7 @@ Index: samba-4.4.5/source4/torture/local/nss_tests.c "failed to enumerate group"); for (i=0; i < num_grp; i++) { -@@ -663,7 +666,7 @@ static bool test_group_r_cross(struct to +@@ -667,7 +670,7 @@ static bool test_group_r_cross(struct torture_context *tctx) struct group *grp, grp1, grp2, grp3, grp4; size_t num_grp; @@ -85,3 +94,6 @@ Index: samba-4.4.5/source4/torture/local/nss_tests.c "failed to enumerate group"); for (i=0; i < num_grp; i++) { +-- +2.25.1 + diff --git a/meta-networking/recipes-connectivity/samba/samba/samba-4.2.7-pam.patch b/meta-networking/recipes-connectivity/samba/samba/samba-pam.patch index 6b9ade920e..4fcbb47572 100644 --- a/meta-networking/recipes-connectivity/samba/samba/samba-4.2.7-pam.patch +++ b/meta-networking/recipes-connectivity/samba/samba/samba-pam.patch @@ -1,15 +1,22 @@ -Lifted from gentoo and ported to 4.4.5 +From c533bdced677e2104565fc06602e7e63d9c79ac0 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 6 Nov 2016 23:40:54 -0800 +Subject: [PATCH] Lifted from gentoo and ported to 4.4.5 http://data.gpo.zugaina.org/musl/net-fs/samba/files/samba-4.2.7-pam.patch -Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + source3/wscript | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) -Index: samba-4.4.5/source3/wscript -=================================================================== ---- samba-4.4.5.orig/source3/wscript -+++ samba-4.4.5/source3/wscript -@@ -873,7 +873,7 @@ msg.msg_accrightslen = sizeof(fd); +diff --git a/source3/wscript b/source3/wscript +index b7f96f3..ed12b1e 100644 +--- a/source3/wscript ++++ b/source3/wscript +@@ -863,7 +863,7 @@ msg.msg_accrightslen = sizeof(fd); if conf.env.with_iconv: conf.DEFINE('HAVE_ICONV', 1) @@ -18,10 +25,10 @@ Index: samba-4.4.5/source3/wscript use_pam=True conf.CHECK_HEADERS('security/pam_appl.h pam/pam_appl.h') if not conf.CONFIG_SET('HAVE_SECURITY_PAM_APPL_H') and not conf.CONFIG_SET('HAVE_PAM_PAM_APPL_H'): -@@ -945,6 +945,15 @@ int i; i = PAM_RADIO_TYPE; - if use_pam: - conf.DEFINE('WITH_PAM', 1) - conf.DEFINE('WITH_PAM_MODULES', 1) +@@ -940,6 +940,17 @@ int i; i = PAM_RADIO_TYPE; + "or headers not found. Use --without-pam to disable " + "PAM support."); + + else: + Logs.warn("PAM disabled") + use_pam=False @@ -31,6 +38,11 @@ Index: samba-4.4.5/source3/wscript + conf.undefine('PAM_RHOST') + conf.undefine('PAM_TTY') + conf.undefine('HAVE_PAM_PAM_APPL_H') - ++ ++ seteuid = False + # +-- +2.25.1 + diff --git a/meta-networking/recipes-connectivity/samba/samba/smb.conf b/meta-networking/recipes-connectivity/samba/samba/smb.conf new file mode 100644 index 0000000000..588491ee68 --- /dev/null +++ b/meta-networking/recipes-connectivity/samba/samba/smb.conf @@ -0,0 +1,240 @@ +# +# Sample configuration file for the Samba suite for Debian GNU/Linux. +# +# +# This is the main Samba configuration file. You should read the +# smb.conf(5) manual page in order to understand the options listed +# here. Samba has a huge number of configurable options most of which +# are not shown in this example +# +# Some options that are often worth tuning have been included as +# commented-out examples in this file. +# - When such options are commented with ";", the proposed setting +# differs from the default Samba behaviour +# - When commented with "#", the proposed setting is the default +# behaviour of Samba but the option is considered important +# enough to be mentioned here +# +# NOTE: Whenever you modify this file you should run the command +# "testparm" to check that you have not made any basic syntactic +# errors. + +#======================= Global Settings ======================= + +[global] + +## Browsing/Identification ### + +# Prevent anonymous connections. Overriden if the user sets guest ok = yes +# on any share + restrict anonymous = 1 + +# Change this to the workgroup/NT-domain name your Samba server will part of + workgroup = WORKGROUP + +#### Networking #### + +# The specific set of interfaces / networks to bind to +# This can be either the interface name or an IP address/netmask; +# interface names are normally preferred +; interfaces = 127.0.0.0/8 eth0 + +# Only bind to the named interfaces and/or networks; you must use the +# 'interfaces' option above to use this. +# It is recommended that you enable this feature if your Samba machine is +# not protected by a firewall or is a firewall itself. However, this +# option cannot handle dynamic or non-broadcast interfaces correctly. +; bind interfaces only = yes + + + +#### Debugging/Accounting #### + +# This tells Samba to use a separate log file for each machine +# that connects + log file = /var/log/samba/log.%m + +# Cap the size of the individual log files (in KiB). + max log size = 1000 + +# We want Samba to only log to /var/log/samba/log.{smbd,nmbd}. +# Append syslog@1 if you want important messages to be sent to syslog too. + logging = file + +# Do something sensible when Samba crashes: mail the admin a backtrace + panic action = /usr/share/samba/panic-action %d + + +####### Authentication ####### + +# Server role. Defines in which mode Samba will operate. Possible +# values are "standalone server", "member server", "classic primary +# domain controller", "classic backup domain controller", "active +# directory domain controller". +# +# Most people will want "standalone server" or "member server". +# Running as "active directory domain controller" will require first +# running "samba-tool domain provision" to wipe databases and create a +# new domain. + server role = standalone server + + obey pam restrictions = yes + +# This boolean parameter controls whether Samba attempts to sync the Unix +# password with the SMB password when the encrypted SMB password in the +# passdb is changed. + unix password sync = yes + +# For Unix password sync to work on a Debian GNU/Linux system, the following +# parameters must be set (thanks to Ian Kahan <<kahan@informatik.tu-muenchen.de> for +# sending the correct chat script for the passwd program in Debian Sarge). + passwd program = /usr/bin/passwd %u + passwd chat = *Enter\snew\s*\spassword:* %n\n *Retype\snew\s*\spassword:* %n\n *password\supdated\ssuccessfully* . + +# This boolean controls whether PAM will be used for password changes +# when requested by an SMB client instead of the program listed in +# 'passwd program'. The default is 'no'. + pam password change = yes + +# This option controls how unsuccessful authentication attempts are mapped +# to anonymous connections + map to guest = never + +########## Domains ########### + +# +# The following settings only takes effect if 'server role = classic +# primary domain controller', 'server role = classic backup domain controller' +# or 'domain logons' is set +# + +# It specifies the location of the user's +# profile directory from the client point of view) The following +# required a [profiles] share to be setup on the samba server (see +# below) +; logon path = \\%N\profiles\%U +# Another common choice is storing the profile in the user's home directory +# (this is Samba's default) +# logon path = \\%N\%U\profile + +# The following setting only takes effect if 'domain logons' is set +# It specifies the location of a user's home directory (from the client +# point of view) +; logon drive = H: +# logon home = \\%N\%U + +# The following setting only takes effect if 'domain logons' is set +# It specifies the script to run during logon. The script must be stored +# in the [netlogon] share +# NOTE: Must be store in 'DOS' file format convention +; logon script = logon.cmd + +# This allows Unix users to be created on the domain controller via the SAMR +# RPC pipe. The example command creates a user account with a disabled Unix +# password; please adapt to your needs +; add user script = /usr/sbin/adduser --quiet --disabled-password --gecos "" %u + +# This allows machine accounts to be created on the domain controller via the +# SAMR RPC pipe. +# The following assumes a "machines" group exists on the system +; add machine script = /usr/sbin/useradd -g machines -c "%u machine account" -d /var/lib/samba -s /bin/false %u + +# This allows Unix groups to be created on the domain controller via the SAMR +# RPC pipe. +; add group script = /usr/sbin/addgroup --force-badname %g + +############ Misc ############ + +# Using the following line enables you to customise your configuration +# on a per machine basis. The %m gets replaced with the netbios name +# of the machine that is connecting +; include = /home/samba/etc/smb.conf.%m + +# Some defaults for winbind (make sure you're not using the ranges +# for something else.) +; idmap config * : backend = tdb +; idmap config * : range = 3000-7999 +; idmap config YOURDOMAINHERE : backend = tdb +; idmap config YOURDOMAINHERE : range = 100000-999999 +; template shell = /bin/bash + +# Setup usershare options to enable non-root users to share folders +# with the net usershare command. + +# Maximum number of usershare. 0 means that usershare is disabled. +# usershare max shares = 100 + +# Allow users who've been granted usershare privileges to create +# public shares, not just authenticated ones + usershare allow guests = yes + +#======================= Share Definitions ======================= + +[homes] + comment = Home Directories + browseable = no + +# By default, the home directories are exported read-only. Change the +# next parameter to 'no' if you want to be able to write to them. + read only = yes + +# File creation mask is set to 0700 for security reasons. If you want to +# create files with group=rw permissions, set next parameter to 0775. + create mask = 0700 + +# Directory creation mask is set to 0700 for security reasons. If you want to +# create dirs. with group=rw permissions, set next parameter to 0775. + directory mask = 0700 + +# By default, \\server\username shares can be connected to by anyone +# with access to the samba server. +# The following parameter makes sure that only "username" can connect +# to \\server\username +# This might need tweaking when using external authentication schemes + valid users = %S + +# Un-comment the following and create the netlogon directory for Domain Logons +# (you need to configure Samba to act as a domain controller too.) +;[netlogon] +; comment = Network Logon Service +; path = /home/samba/netlogon +; guest ok = yes +; read only = yes + +# Un-comment the following and create the profiles directory to store +# users profiles (see the "logon path" option above) +# (you need to configure Samba to act as a domain controller too.) +# The path below should be writable by all users so that their +# profile directory may be created the first time they log on +;[profiles] +; comment = Users profiles +; path = /home/samba/profiles +; guest ok = no +; browseable = no +; create mask = 0600 +; directory mask = 0700 + +[printers] + comment = All Printers + browseable = no + path = /var/spool/samba + printable = yes + guest ok = no + read only = yes + create mask = 0700 + +# Windows clients look for this share name as a source of downloadable +# printer drivers +[print$] + comment = Printer Drivers + path = /var/lib/samba/printers + browseable = yes + read only = yes + guest ok = no +# Uncomment to allow remote administration of Windows print drivers. +# You may need to replace 'lpadmin' with the name of the group your +# admin users are members of. +# Please note that you also need to set appropriate Unix permissions +# to the drivers directory for these users to have write rights in it +; write list = root, @lpadmin + diff --git a/meta-networking/recipes-connectivity/samba/samba/smb_conf-4.7.0.patch b/meta-networking/recipes-connectivity/samba/samba/smb_conf-4.7.0.patch deleted file mode 100644 index 77c8b3626b..0000000000 --- a/meta-networking/recipes-connectivity/samba/samba/smb_conf-4.7.0.patch +++ /dev/null @@ -1,19 +0,0 @@ -samba: correct log files location - -We use /var/log/samba. - -Upstream-Status: Pending - -Signed-off-by: Joe Slater <joe.slater@windriver.com> - ---- a/packaging/RHEL/setup/smb.conf -+++ b/packaging/RHEL/setup/smb.conf -@@ -63,7 +63,7 @@ - - # this tells Samba to use a separate log file for each machine - # that connects -- log file = /usr/local/samba/var/log.%m -+ log file = /var/log/samba/log.%m - - # Put a capping on the size of the log files (in Kb). - max log size = 50 diff --git a/meta-networking/recipes-connectivity/samba/samba_4.19.6.bb b/meta-networking/recipes-connectivity/samba/samba_4.19.6.bb new file mode 100644 index 0000000000..7bdcfd35c0 --- /dev/null +++ b/meta-networking/recipes-connectivity/samba/samba_4.19.6.bb @@ -0,0 +1,356 @@ +HOMEPAGE = "https://www.samba.org/" +SECTION = "console/network" + +LICENSE = "GPL-3.0-or-later & LGPL-3.0-or-later & GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://${COREBASE}/meta/files/common-licenses/LGPL-3.0-or-later;md5=c51d3eef3be114124d11349ca0d7e117 \ + file://${COREBASE}/meta/files/common-licenses/GPL-2.0-or-later;md5=fed54355545ffd980b814dab4a3b312c" + +SAMBA_MIRROR = "http://samba.org/samba/ftp" +MIRRORS += "\ +${SAMBA_MIRROR} http://mirror.internode.on.net/pub/samba \n \ +${SAMBA_MIRROR} http://www.mirrorservice.org/sites/ftp.samba.org \n \ +" + +export PYTHONHASHSEED="1" + +SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \ + file://smb.conf \ + file://volatiles.03_samba \ + file://0001-Don-t-check-xsltproc-manpages.patch \ + file://0002-do-not-import-target-module-while-cross-compile.patch \ + file://0003-Add-config-option-without-valgrind.patch \ + file://0004-Add-options-to-configure-the-use-of-libbsd.patch \ + file://0005-Fix-pyext_PATTERN-for-cross-compilation.patch \ + file://0006-smbtorture-skip-test-case-tfork_cmd_send.patch \ + file://0007-Deleted-settiong-of-python-to-fix-the-install-confli.patch \ + " + +SRC_URI:append:libc-musl = " \ + file://samba-pam.patch \ + file://samba-4.3.9-remove-getpwent_r.patch \ + " + +SRC_URI[sha256sum] = "653b52095554dbc223c63b96af5cdf9e98c3e048549c5f56143d3b33dce1cef1" + +UPSTREAM_CHECK_REGEX = "samba\-(?P<pver>4\.19(\.\d+)+).tar.gz" + +inherit systemd waf-samba cpan-base perlnative update-rc.d perl-version pkgconfig + +CVE_STATUS[CVE-2011-2411] = "not-applicable-platform: vulnerable only on HP NonStop Servers" + +# remove default added RDEPENDS on perl +RDEPENDS:${PN}:remove = "perl" + +DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdb libtevent libldb libaio libpam libtasn1 libtasn1-native jansson libparse-yapp-perl-native gnutls cmocka" + +inherit features_check +REQUIRED_DISTRO_FEATURES = "pam" + +DEPENDS:append:libc-musl = " libtirpc" +CFLAGS:append:libc-musl = " -I${STAGING_INCDIR}/tirpc" +LDFLAGS:append:libc-musl = " -ltirpc" + +COMPATIBLE_HOST:riscv32 = "null" + +INITSCRIPT_NAME = "samba" +INITSCRIPT_PARAMS = "start 20 3 5 . stop 20 0 1 6 ." + +SYSTEMD_PACKAGES = "${PN}-base ${PN}-ad-dc winbind ctdb" +SYSTEMD_SERVICE:${PN}-base = "nmb.service smb.service" +SYSTEMD_SERVICE:${PN}-ad-dc = "${@bb.utils.contains('PACKAGECONFIG', 'ad-dc', 'samba.service', '', d)}" +SYSTEMD_SERVICE:winbind = "winbind.service" +SYSTEMD_SERVICE:ctdb = "ctdb.service" + +# There are prerequisite settings to enable ad-dc, so disable the service by default. +# Reference: +# https://wiki.samba.org/index.php/Setting_up_Samba_as_an_Active_Directory_Domain_Controller +SYSTEMD_AUTO_ENABLE:${PN}-ad-dc = "disable" + +#cross_compile cannot use preforked process, since fork process earlier than point subproces.popen +#to cross Popen +export WAF_NO_PREFORK="yes" + +# Use krb5. Build active domain controller. +# +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd zeroconf', d)} \ + acl cups ldap mitkrb5 \ +" + +PACKAGECONFIG[acl] = "--with-acl-support,--without-acl-support,acl" +PACKAGECONFIG[fam] = "--with-fam,--without-fam,gamin" +PACKAGECONFIG[cups] = "--enable-cups,--disable-cups,cups" +PACKAGECONFIG[ldap] = "--with-ldap,--without-ldap,openldap" +PACKAGECONFIG[sasl] = ",,cyrus-sasl" +PACKAGECONFIG[systemd] = "--with-systemd,--without-systemd,systemd" +PACKAGECONFIG[dmapi] = "--with-dmapi,--without-dmapi,dmapi" +PACKAGECONFIG[zeroconf] = "--enable-avahi,--disable-avahi,avahi" +PACKAGECONFIG[valgrind] = "--with-valgrind,--without-valgrind,valgrind" +PACKAGECONFIG[lttng] = "--with-lttng,--without-lttng,lttng-ust" +PACKAGECONFIG[archive] = "--with-libarchive,--without-libarchive,libarchive" +PACKAGECONFIG[libunwind] = "--with-libunwind,--without-libunwind,libunwind" +PACKAGECONFIG[gpgme] = "--with-gpgme,--without-gpgme,gpgme" +PACKAGECONFIG[lmdb] = ",--without-ldb-lmdb,lmdb" +PACKAGECONFIG[libbsd] = "--with-libbsd,--without-libbsd,libbsd" +PACKAGECONFIG[ad-dc] = "--with-experimental-mit-ad-dc,--without-ad-dc,python3-markdown python3-dnspython," +PACKAGECONFIG[mitkrb5] = "--with-system-mitkrb5 --with-system-mitkdc=/usr/sbin/krb5kdc,,krb5," + +SAMBA4_IDMAP_MODULES="idmap_ad,idmap_rid,idmap_adex,idmap_hash,idmap_tdb2" +SAMBA4_PDB_MODULES="pdb_tdbsam,${@bb.utils.contains('PACKAGECONFIG', 'ldap', 'pdb_ldap,', '', d)}pdb_ads,pdb_smbpasswd,pdb_wbc_sam,pdb_samba4" +SAMBA4_AUTH_MODULES="auth_unix,auth_wbc,auth_server,auth_netlogond,auth_script,auth_samba4" +SAMBA4_MODULES="${SAMBA4_IDMAP_MODULES},${SAMBA4_PDB_MODULES},${SAMBA4_AUTH_MODULES}" + +# These libraries are supposed to replace others supplied by packages, but decorate the names of +# .so files so there will not be a conflict. This is not done consistantly, so be very careful +# when adding to this list. +# +SAMBA4_LIBS="heimdal,NONE" + +EXTRA_OECONF += "--enable-fhs \ + --with-piddir=/run \ + --with-sockets-dir=/run/samba \ + --with-modulesdir=${libdir}/samba \ + --with-privatelibdir=${libdir}/samba \ + --with-lockdir=${localstatedir}/lib/samba \ + --with-cachedir=${localstatedir}/lib/samba \ + --disable-rpath-install \ + --disable-rpath \ + --with-shared-modules=${SAMBA4_MODULES} \ + --bundled-libraries=${SAMBA4_LIBS} \ + ${@oe.utils.conditional('TARGET_ARCH', 'x86_64', '', '--disable-glusterfs', d)} \ + --with-cluster-support \ + --with-profiling-data \ + --with-libiconv=${STAGING_DIR_HOST}${prefix} \ + --with-pam --with-pammodulesdir=${base_libdir}/security \ + --pythondir=${PYTHON_SITEPACKAGES_DIR} \ + " + +LDFLAGS += "-Wl,-z,relro,-z,now ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" + +do_configure:append() { + cd ${S}/pidl/ + perl Makefile.PL PREFIX=${prefix} + sed -e 's,VENDORPREFIX)/lib/perl,VENDORPREFIX)/${baselib}/perl,g' \ + -e 's,PERLPREFIX)/lib/perl,PERLPREFIX)/${baselib}/perl,g' -i Makefile +} + +do_compile:append() { + oe_runmake -C ${S}/pidl +} + +do_install:append() { + for section in 1 5 7; do + install -d ${D}${mandir}/man$section + install -m 0644 ctdb/doc/*.$section ${D}${mandir}/man$section + done + for section in 1 5 7 8; do + install -d ${D}${mandir}/man$section + install -m 0644 docs/manpages/*.$section ${D}${mandir}/man$section + done + + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${S}/bin/default/packaging/systemd/*.service ${D}${systemd_system_unitdir}/ + sed -e 's,\(ExecReload=\).*\(/kill\),\1${base_bindir}\2,' \ + -e 's,/etc/sysconfig/samba,${sysconfdir}/default/samba,' \ + -i ${D}${systemd_system_unitdir}/*.service + + if [ "${@bb.utils.contains('PACKAGECONFIG', 'ad-dc', 'yes', 'no', d)}" = "no" ]; then + rm -f ${D}${systemd_system_unitdir}/samba.service + fi + + install -d ${D}${sysconfdir}/tmpfiles.d + install -m644 packaging/systemd/samba.conf.tmp ${D}${sysconfdir}/tmpfiles.d/samba.conf + echo "d ${localstatedir}/log/samba 0755 root root -" \ + >> ${D}${sysconfdir}/tmpfiles.d/samba.conf + install -d ${D}${sysconfdir}/init.d + install -m 0755 packaging/sysv/samba.init ${D}${sysconfdir}/init.d/samba + sed -e 's,/opt/samba/bin,${sbindir},g' \ + -e 's,/opt/samba/smb.conf,${sysconfdir}/samba/smb.conf,g' \ + -e 's,/opt/samba/log,${localstatedir}/log/samba,g' \ + -e 's,/etc/init.d/samba.server,${sysconfdir}/init.d/samba,g' \ + -e 's,/usr/bin,${base_bindir},g' \ + -i ${D}${sysconfdir}/init.d/samba + + install -d ${D}${sysconfdir}/samba + echo "127.0.0.1 localhost" > ${D}${sysconfdir}/samba/lmhosts + install -m644 ${UNPACKDIR}/smb.conf ${D}${sysconfdir}/samba/smb.conf + install -D -m 644 ${UNPACKDIR}/volatiles.03_samba ${D}${sysconfdir}/default/volatiles/03_samba + + install -d ${D}${sysconfdir}/default + install -m644 packaging/systemd/samba.sysconfig ${D}${sysconfdir}/default/samba + + # the items are from ctdb/tests/run_tests.sh + for d in cunit eventd eventscripts onnode shellcheck takeover takeover_helper tool; do + testdir=${D}${datadir}/ctdb-tests/UNIT/$d + install -d $testdir + cp ${S}/ctdb/tests/UNIT/$d/*.sh $testdir + cp -r ${S}/ctdb/tests/UNIT/$d/scripts ${S}/ctdb/tests/UNIT/$d/stubs $testdir || true + done + + # fix file-rdeps qa warning + if [ -f ${D}${bindir}/onnode ]; then + sed -i 's:\(#!/bin/\)bash:\1sh:' ${D}${bindir}/onnode + fi + + chmod 0750 ${D}${sysconfdir}/sudoers.d || true + rm -rf ${D}/run ${D}${localstatedir}/run ${D}${localstatedir}/log + + for f in samba-gpupdate samba_upgradedns samba_spnupdate samba_kcc samba_dnsupdate samba_downgrade_db; do + if [ -f "${D}${sbindir}/$f" ]; then + sed -i -e 's,${PYTHON},/usr/bin/env python3,g' ${D}${sbindir}/$f + fi + done + if [ -f "${D}${bindir}/samba-tool" ]; then + sed -i -e 's,${PYTHON},/usr/bin/env python3,g' ${D}${bindir}/samba-tool + fi + + oe_runmake -C ${S}/pidl DESTDIR=${D} install_vendor + find ${D}${libdir}/perl5/ -type f -name "perllocal.pod" -delete + find ${D}${libdir}/perl5/ -type f -name ".packlist" -delete + sed -i -e '1s,#!.*perl,#!${bindir}/env perl,' ${D}${bindir}/pidl +} + +PACKAGES =+ "${PN}-python3 ${PN}-pidl \ + ${PN}-dsdb-modules ${PN}-testsuite registry-tools \ + winbind ctdb ctdb-tests \ + ${PN}-common ${PN}-base ${PN}-ad-dc \ + smbclient ${PN}-client ${PN}-server ${PN}-test" + +python samba_populate_packages() { + def module_hook(file, pkg, pattern, format, basename): + pn = d.getVar('PN') + d.appendVar('RRECOMMENDS:%s-base' % pn, ' %s' % pkg) + + mlprefix = d.getVar('MLPREFIX') or '' + pam_libdir = d.expand('${base_libdir}/security') + pam_pkgname = mlprefix + 'pam-plugin%s' + do_split_packages(d, pam_libdir, r'^pam_(.*)\.so$', pam_pkgname, 'PAM plugin for %s', extra_depends='', prepend=True) + + libdir = d.getVar('libdir') + do_split_packages(d, libdir, r'^lib(.*)\.so\..*$', 'lib%s', 'Samba %s library', extra_depends='${PN}-common', prepend=True, allow_links=True) + pkglibdir = '%s/samba' % libdir + do_split_packages(d, pkglibdir, r'^lib(.*)\.so$', 'lib%s', 'Samba %s library', extra_depends='${PN}-common', prepend=True) + moduledir = '%s/samba/auth' % libdir + do_split_packages(d, moduledir, r'^(.*)\.so$', 'samba-auth-%s', 'Samba %s authentication backend', hook=module_hook, extra_depends='', prepend=True) + moduledir = '%s/samba/pdb' % libdir + do_split_packages(d, moduledir, r'^(.*)\.so$', 'samba-pdb-%s', 'Samba %s password backend', hook=module_hook, extra_depends='', prepend=True) +} + +PACKAGESPLITFUNCS:prepend = "samba_populate_packages " +PACKAGES_DYNAMIC = "samba-auth-.* samba-pdb-.*" + +RDEPENDS:${PN} += "${PN}-base ${PN}-python3 ${PN}-dsdb-modules python3" +RDEPENDS:${PN}-python3 += "pytalloc python3-tdb pyldb" + +FILES:${PN}-base = "${sbindir}/nmbd \ + ${sbindir}/smbd \ + ${sysconfdir}/init.d \ + ${systemd_system_unitdir}/nmb.service \ + ${systemd_system_unitdir}/smb.service" + +FILES:${PN}-ad-dc = "${sbindir}/samba \ + ${systemd_system_unitdir}/samba.service \ + ${libdir}/krb5/plugins/kdb/samba.so \ +" + +RDEPENDS:${PN}-ad-dc = "krb5-kdc" + +FILES:ctdb = "${bindir}/ctdb \ + ${bindir}/ctdb_diagnostics \ + ${bindir}/ltdbtool \ + ${bindir}/onnode \ + ${bindir}/ping_pong \ + ${sbindir}/ctdbd \ + ${datadir}/ctdb \ + ${libexecdir}/ctdb \ + ${localstatedir}/lib/ctdb \ + ${sysconfdir}/ctdb \ + ${sysconfdir}/sudoers.d/ctdb \ + ${systemd_system_unitdir}/ctdb.service \ +" + +FILES:ctdb-tests = "${bindir}/ctdb_run_tests \ + ${bindir}/ctdb_run_cluster_tests \ + ${datadir}/ctdb-tests \ + ${datadir}/ctdb/tests \ +" + +RDEPENDS:ctdb-tests += "bash util-linux-getopt ctdb" + +FILES:${BPN}-common = "${sysconfdir}/default \ + ${sysconfdir}/samba \ + ${sysconfdir}/tmpfiles.d \ + ${localstatedir}/lib/samba \ + ${localstatedir}/spool/samba \ +" + +FILES:${PN} += "${libdir}/vfs/*.so \ + ${libdir}/charset/*.so \ + ${libdir}/*.dat \ + ${libdir}/auth/*.so \ +" + +FILES:${PN}-dsdb-modules = "${libdir}/samba/ldb" + +FILES:${PN}-testsuite = "${bindir}/gentest \ + ${bindir}/locktest \ + ${bindir}/masktest \ + ${bindir}/ndrdump \ + ${bindir}/smbtorture" + +FILES:registry-tools = "${bindir}/regdiff \ + ${bindir}/regpatch \ + ${bindir}/regshell \ + ${bindir}/regtree" + +FILES:winbind = "${sbindir}/winbindd \ + ${bindir}/wbinfo \ + ${bindir}/ntlm_auth \ + ${libdir}/samba/idmap \ + ${libdir}/samba/nss_info \ + ${libdir}/winbind_krb5_locator.so \ + ${libdir}/winbind-krb5-localauth.so \ + ${sysconfdir}/init.d/winbind \ + ${systemd_system_unitdir}/winbind.service" + +FILES:${PN}-python3 = "${PYTHON_SITEPACKAGES_DIR}" + +FILES:smbclient = "${bindir}/cifsdd \ + ${bindir}/rpcclient \ + ${bindir}/smbcacls \ + ${bindir}/smbclient \ + ${bindir}/smbcquotas \ + ${bindir}/smbget \ + ${bindir}/smbspool \ + ${bindir}/smbtar \ + ${bindir}/smbtree \ + ${libexecdir}/samba/smbspool_krb5_wrapper" + +FILES:${PN}-pidl = "${bindir}/pidl \ + ${libdir}/perl5 \ + " +RDEPENDS:${PN}-pidl += "perl perl-modules libparse-yapp-perl" + +RDEPENDS:${PN}-client = "\ + smbclient \ + winbind \ + registry-tools \ + ${PN}-pidl \ + " + +ALLOW_EMPTY:${PN}-client = "1" + +RDEPENDS:${PN}-server = "\ + ${PN} \ + winbind \ + registry-tools \ + " + +ALLOW_EMPTY:${PN}-server = "1" + +RDEPENDS:${PN}-test = "\ + ctdb-tests \ + ${PN}-testsuite \ + " + +ALLOW_EMPTY:${PN}-test = "1" diff --git a/meta-networking/recipes-connectivity/samba/samba_4.7.0.bb b/meta-networking/recipes-connectivity/samba/samba_4.7.0.bb deleted file mode 100644 index f33c1384bf..0000000000 --- a/meta-networking/recipes-connectivity/samba/samba_4.7.0.bb +++ /dev/null @@ -1,296 +0,0 @@ -HOMEPAGE = "https://www.samba.org/" -SECTION = "console/network" - -LICENSE = "GPL-3.0+ & LGPL-3.0+ & GPL-2.0+" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://${COREBASE}/meta/files/common-licenses/LGPL-3.0;md5=bfccfe952269fff2b407dd11f2f3083b \ - file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6 " - -SAMBA_MIRROR = "http://samba.org/samba/ftp" -MIRRORS += "\ -${SAMBA_MIRROR} http://mirror.internode.on.net/pub/samba \n \ -${SAMBA_MIRROR} http://www.mirrorservice.org/sites/ftp.samba.org \n \ -" - -SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \ - file://16-do-not-check-xsltproc-manpages.patch \ - file://20-do-not-import-target-module-while-cross-compile.patch \ - file://21-add-config-option-without-valgrind.patch \ - file://0001-packaging-Avoid-timeout-for-nmbd-if-started-offline-.patch \ - file://0006-avoid-using-colon-in-the-checking-msg.patch \ - file://netdb_defines.patch \ - file://glibc_only.patch \ - file://iconv-4.7.0.patch \ - file://dnsserver-4.7.0.patch \ - file://smb_conf-4.7.0.patch \ - file://volatiles.03_samba \ - " -SRC_URI_append_libc-musl = " \ - file://samba-4.2.7-pam.patch \ - file://samba-4.3.9-remove-getpwent_r.patch \ - " - -SRC_URI[md5sum] = "cf5eaf34f510e3d5643c0dcfd49fcc40" -SRC_URI[sha256sum] = "bd16d169988eb513e685a87e9964a5210482498fa9b3a22aaa8287a061e3c936" - -#SRC_URI[md5sum] = "c6ee5c766016d59908c8fb672fbbd445" -#SRC_URI[sha256sum] = "9ef24393de08390f236cabccd6a420b5cea304e959cbf1a99ff317325db3ddfa" - -inherit systemd waf-samba cpan-base perlnative update-rc.d -# remove default added RDEPENDS on perl -RDEPENDS_${PN}_remove = "perl" - -#DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdb libtevent libldb libbsd libaio libpam" -DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdb libtevent libbsd libaio libpam" -DEPENDS += "libldb" - -DEPENDS_append_libc-musl = " libtirpc" -CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc" -LDFLAGS_append_libc-musl = " -ltirpc" - -LSB = "" -LSB_linuxstdbase = "lsb" - -INITSCRIPT_NAME = "samba" -INITSCRIPT_PARAMS = "start 20 3 5 . stop 20 0 1 6 ." - -SYSTEMD_PACKAGES = "${PN}-base ${PN}-ad-dc winbind" -SYSTEMD_SERVICE_${PN}-base = "nmb.service smb.service" -SYSTEMD_SERVICE_${PN}-ad-dc = "${@bb.utils.contains('PACKAGECONFIG', 'ad-dc', 'samba.service', '', d)}" -SYSTEMD_SERVICE_winbind = "winbind.service" - -# There are prerequisite settings to enable ad-dc, so disable the service by default. -# Reference: -# https://wiki.samba.org/index.php/Setting_up_Samba_as_an_Active_Directory_Domain_Controller -SYSTEMD_AUTO_ENABLE_${PN}-ad-dc = "disable" - -# Use krb5. Build active domain controller. -# -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd zeroconf', d)} \ - acl ad-dc cups gnutls ldap mitkrb5 \ -" - -RDEPENDS_${PN}-base += "${LSB}" -RDEPENDS_${PN}-ctdb-tests += "bash util-linux-getopt" - -PACKAGECONFIG[acl] = "--with-acl-support,--without-acl-support,acl" -PACKAGECONFIG[fam] = "--with-fam,--without-fam,gamin" -PACKAGECONFIG[cups] = "--enable-cups,--disable-cups,cups" -PACKAGECONFIG[ldap] = "--with-ldap,--without-ldap,openldap" -PACKAGECONFIG[sasl] = ",,cyrus-sasl" -PACKAGECONFIG[systemd] = "--with-systemd,--without-systemd,systemd" -PACKAGECONFIG[dmapi] = "--with-dmapi,--without-dmapi,dmapi" -PACKAGECONFIG[zeroconf] = "--enable-avahi,--disable-avahi,avahi" -PACKAGECONFIG[valgrind] = ",--without-valgrind,valgrind," -PACKAGECONFIG[lttng] = "--with-lttng, --without-lttng,lttng-ust" -PACKAGECONFIG[archive] = "--with-libarchive, --without-libarchive, libarchive" - -# Building the AD (Active Directory) DC (Domain Controller) requires GnuTLS, -# And ad-dc doesn't work with mitkrb5 for versions prior to 4.7.0 according to: -# http://samba.2283325.n4.nabble.com/samba-4-6-6-Unknown-dependency-kdc-in-service-kdc-objlist-td4722096.html -# So the working combination is: -# 1) ad-dc: enable, gnutls: enable, mitkrb5: disable -# 2) ad-dc: disable, gnutls: enable/disable, mitkrb5: enable -# -# We are now at 4.7.0, so take the above with a grain of salt. We do not need to know where -# krb5kdc is unless ad-dc is enabled, but we tell configure anyhow. -# -PACKAGECONFIG[ad-dc] = ",--without-ad-dc,," -PACKAGECONFIG[gnutls] = "--enable-gnutls,--disable-gnutls,gnutls," -PACKAGECONFIG[mitkrb5] = "--with-system-mitkrb5 --with-system-mitkdc=/usr/sbin/krb5kdc,,krb5," - -SAMBA4_IDMAP_MODULES="idmap_ad,idmap_rid,idmap_adex,idmap_hash,idmap_tdb2" -SAMBA4_PDB_MODULES="pdb_tdbsam,${@bb.utils.contains('PACKAGECONFIG', 'ldap', 'pdb_ldap,', '', d)}pdb_ads,pdb_smbpasswd,pdb_wbc_sam,pdb_samba4" -SAMBA4_AUTH_MODULES="auth_unix,auth_wbc,auth_server,auth_netlogond,auth_script,auth_samba4" -SAMBA4_MODULES="${SAMBA4_IDMAP_MODULES},${SAMBA4_PDB_MODULES},${SAMBA4_AUTH_MODULES}" - -# These libraries are supposed to replace others supplied by packages, but decorate the names of -# .so files so there will not be a conflict. This is not done consistantly, so be very careful -# when adding to this list. -# -SAMBA4_LIBS="heimdal,cmocka,NONE" - -EXTRA_OECONF += "--enable-fhs \ - --with-piddir=/run \ - --with-sockets-dir=/run/samba \ - --with-modulesdir=${libdir}/samba \ - --with-lockdir=${localstatedir}/lib/samba \ - --with-cachedir=${localstatedir}/lib/samba \ - --disable-rpath-install \ - --with-shared-modules=${SAMBA4_MODULES} \ - --bundled-libraries=${SAMBA4_LIBS} \ - ${@base_conditional('TARGET_ARCH', 'x86_64', '', '--disable-glusterfs', d)} \ - --with-cluster-support \ - --with-profiling-data \ - --with-libiconv=${STAGING_DIR_HOST}${prefix} \ - --with-pam --with-pammodulesdir=${base_libdir}/security \ - " - -LDFLAGS += "-Wl,-z,relro,-z,now ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" - -do_install_append() { - for section in 1 5 7; do - install -d ${D}${mandir}/man$section - install -m 0644 ctdb/doc/*.$section ${D}${mandir}/man$section - done - for section in 1 5 7 8; do - install -d ${D}${mandir}/man$section - install -m 0644 docs/manpages/*.$section ${D}${mandir}/man$section - done - - install -d ${D}${systemd_system_unitdir} - install -m 0644 packaging/systemd/*.service ${D}${systemd_system_unitdir} - sed -e 's,\(ExecReload=\).*\(/kill\),\1${base_bindir}\2,' \ - -e 's,/etc/sysconfig/samba,${sysconfdir}/default/samba,' \ - -i ${D}${systemd_system_unitdir}/*.service - - if [ "${@bb.utils.contains('PACKAGECONFIG', 'ad-dc', 'yes', 'no', d)}" = "no" ]; then - rm -f ${D}${systemd_system_unitdir}/samba.service - fi - - install -d ${D}${sysconfdir}/tmpfiles.d - install -m644 packaging/systemd/samba.conf.tmp ${D}${sysconfdir}/tmpfiles.d/samba.conf - echo "d ${localstatedir}/log/samba 0755 root root -" \ - >> ${D}${sysconfdir}/tmpfiles.d/samba.conf - if [ "${LSB}" = "lsb" ]; then - install -d ${D}${sysconfdir}/init.d - install -m 0755 packaging/LSB/samba.sh ${D}${sysconfdir}/init.d/samba - else - install -d ${D}${sysconfdir}/init.d - install -m 0755 packaging/sysv/samba.init ${D}${sysconfdir}/init.d/samba - sed -e 's,/opt/samba/bin,${sbindir},g' \ - -e 's,/opt/samba/smb.conf,${sysconfdir}/samba/smb.conf,g' \ - -e 's,/opt/samba/log,${localstatedir}/log/samba,g' \ - -e 's,/etc/init.d/samba.server,${sysconfdir}/init.d/samba,g' \ - -e 's,/usr/bin,${base_bindir},g' \ - -i ${D}${sysconfdir}/init.d/samba - fi - - install -d ${D}${sysconfdir}/samba - echo "127.0.0.1 localhost" > ${D}${sysconfdir}/samba/lmhosts - install -m644 packaging/RHEL/setup/smb.conf ${D}${sysconfdir}/samba/smb.conf - install -D -m 644 ${WORKDIR}/volatiles.03_samba ${D}${sysconfdir}/default/volatiles/03_samba - - install -d ${D}${sysconfdir}/default - install -m644 packaging/systemd/samba.sysconfig ${D}${sysconfdir}/default/samba - - # install ctdb config file and test cases - install -D -m 0644 ${S}/ctdb/tests/onnode/nodes ${D}${sysconfdir}/ctdb/nodes - # the items are from ctdb/tests/run_tests.sh - for d in onnode takeover tool eventscripts cunit simple complex; do - testdir=${D}${datadir}/ctdb-tests/$d - install -d $testdir - cp ${S}/ctdb/tests/$d/*.sh $testdir - cp -r ${S}/ctdb/tests/$d/scripts ${S}/ctdb/tests/$d/stubs $testdir || true - done - - # fix file-rdeps qa warning - if [ -f ${D}${bindir}/onnode ]; then - sed -i 's:\(#!/bin/\)bash:\1sh:' ${D}${bindir}/onnode - fi - - chmod 0750 ${D}${sysconfdir}/sudoers.d - rm -rf ${D}/run ${D}${localstatedir}/run ${D}${localstatedir}/log -} - -PACKAGES =+ "${PN}-python ${PN}-pidl \ - ${PN}-dsdb-modules ${PN}-testsuite registry-tools \ - winbind \ - ${PN}-common ${PN}-base ${PN}-ad-dc ${PN}-ctdb-tests \ - smbclient" - -python samba_populate_packages() { - def module_hook(file, pkg, pattern, format, basename): - pn = d.getVar('PN', True) - d.appendVar('RRECOMMENDS_%s-base' % pn, ' %s' % pkg) - - mlprefix = d.getVar('MLPREFIX', True) or '' - pam_libdir = d.expand('${base_libdir}/security') - pam_pkgname = mlprefix + 'pam-plugin%s' - do_split_packages(d, pam_libdir, '^pam_(.*)\.so$', pam_pkgname, 'PAM plugin for %s', extra_depends='', prepend=True) - - libdir = d.getVar('libdir', True) - do_split_packages(d, libdir, '^lib(.*)\.so\..*$', 'lib%s', 'Samba %s library', extra_depends='${PN}-common', prepend=True, allow_links=True) - pkglibdir = '%s/samba' % libdir - do_split_packages(d, pkglibdir, '^lib(.*)\.so$', 'lib%s', 'Samba %s library', extra_depends='${PN}-common', prepend=True) - moduledir = '%s/samba/auth' % libdir - do_split_packages(d, moduledir, '^(.*)\.so$', 'samba-auth-%s', 'Samba %s authentication backend', hook=module_hook, extra_depends='', prepend=True) - moduledir = '%s/samba/pdb' % libdir - do_split_packages(d, moduledir, '^(.*)\.so$', 'samba-pdb-%s', 'Samba %s password backend', hook=module_hook, extra_depends='', prepend=True) -} - -PACKAGESPLITFUNCS_prepend = "samba_populate_packages " - -RDEPENDS_${PN} += "${PN}-base ${PN}-python ${PN}-dsdb-modules" -RDEPENDS_${PN}-python += "pytalloc python-tdb" - -FILES_${PN}-base = "${sbindir}/nmbd \ - ${sbindir}/smbd \ - ${sysconfdir}/init.d \ - ${localstatedir}/lib/samba \ - ${localstatedir}/nmbd \ - ${localstatedir}/spool/samba \ - ${systemd_system_unitdir}/nmb.service \ - ${systemd_system_unitdir}/smb.service" - -FILES_${PN}-ad-dc = "${sbindir}/samba \ - ${systemd_system_unitdir}/samba.service \ - ${libdir}/krb5/plugins/kdb/samba.so \ - " -RDEPENDS_${PN}-ad-dc = "krb5-kdc" - -FILES_${PN}-ctdb-tests = "${bindir}/ctdb_run_tests \ - ${bindir}/ctdb_run_cluster_tests \ - ${sysconfdir}/ctdb/nodes \ - ${datadir}/ctdb-tests \ - ${datadir}/ctdb/tests \ - " - -FILES_${BPN}-common = "${sysconfdir}/default \ - ${sysconfdir}/samba \ - ${sysconfdir}/tmpfiles.d \ -" - -FILES_${PN} += "${libdir}/vfs/*.so \ - ${libdir}/charset/*.so \ - ${libdir}/*.dat \ - ${libdir}/auth/*.so \ -" - -FILES_${PN}-dsdb-modules = "${libdir}/samba/ldb" - -FILES_${PN}-testsuite = "${bindir}/gentest \ - ${bindir}/locktest \ - ${bindir}/masktest \ - ${bindir}/ndrdump \ - ${bindir}/smbtorture" - -FILES_registry-tools = "${bindir}/regdiff \ - ${bindir}/regpatch \ - ${bindir}/regshell \ - ${bindir}/regtree" - -FILES_winbind = "${sbindir}/winbindd \ - ${bindir}/wbinfo \ - ${bindir}/ntlm_auth \ - ${libdir}/samba/idmap \ - ${libdir}/samba/nss_info \ - ${libdir}/winbind_krb5_locator.so \ - ${sysconfdir}/init.d/winbind \ - ${systemd_system_unitdir}/winbind.service" - -FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}" - -FILES_smbclient = "${bindir}/cifsdd \ - ${bindir}/rpcclient \ - ${bindir}/smbcacls \ - ${bindir}/smbclient \ - ${bindir}/smbcquotas \ - ${bindir}/smbget \ - ${bindir}/smbspool \ - ${bindir}/smbtar \ - ${bindir}/smbtree \ - ${libdir}/samba/smbspool_krb5_wrapper" - -RDEPENDS_${PN}-pidl_append = " perl" -FILES_${PN}-pidl = "${bindir}/pidl ${datadir}/perl5/Parse" diff --git a/meta-networking/recipes-connectivity/sethdlc/sethdlc.bb b/meta-networking/recipes-connectivity/sethdlc/sethdlc_1.18.bb index fc304fae72..4e3c157713 100644 --- a/meta-networking/recipes-connectivity/sethdlc/sethdlc.bb +++ b/meta-networking/recipes-connectivity/sethdlc/sethdlc_1.18.bb @@ -1,26 +1,24 @@ DESCRIPTION = "set Linux HDLC packet radio modem driver port information" HOMEPAGE = "https://www.kernel.org/pub/linux/utils/net/hdlc" SECTION = "comm" -LICENSE = "GPLv2 & GPLv2+ " +LICENSE = "GPL-2.0-only & GPL-2.0-or-later " LIC_FILES_CHKSUM = "file://sethdlc.c;endline=10;md5=90f936879e9f8b755a138aeb348782eb" -SRC_URI = "https://www.kernel.org/pub/linux/utils/net/hdlc/${BPN}-1.18.tar.gz \ +SRC_URI = "https://www.kernel.org/pub/linux/utils/net/hdlc/${BP}.tar.gz \ file://sethdlc-fix-host-contamination.patch \ " SRC_URI[md5sum] = "9016878156a5eadb06c0bae71cc5c9ab" SRC_URI[sha256sum] = "21b1e2e1cb0e288b0ec8fcfd9fed449914e0f8e6fc273706bd5b3d4f6ab6b04e" -S = "${WORKDIR}/${BPN}-1.18" - PACKAGE_ARCH = "${MACHINE_ARCH}" DEPENDS = "virtual/kernel" EXTRA_OEMAKE="CROSS_COMPILE=${TARGET_PREFIX} CC='${CC} ${LDFLAGS}' \ KERNEL_DIR=${STAGING_KERNEL_DIR} " -do_compile_prepend () { +do_compile:prepend () { oe_runmake clean } @@ -30,4 +28,4 @@ do_install() { install sethdlc ${D}/${bindir}/ } -FILES_${PN} += "${bindir}/sethdlc" +FILES:${PN} += "${bindir}/sethdlc" diff --git a/meta-networking/recipes-connectivity/snort/snort/0001-fix-do_package-failed-since-snort-2.9.7.0.patch b/meta-networking/recipes-connectivity/snort/snort/0001-fix-do_package-failed-since-snort-2.9.7.0.patch deleted file mode 100644 index 1520553a45..0000000000 --- a/meta-networking/recipes-connectivity/snort/snort/0001-fix-do_package-failed-since-snort-2.9.7.0.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 815e861721a9c43efddb78521147145ebc7569ca Mon Sep 17 00:00:00 2001 -From: Zhiquan Li <zhiquan.li@windriver.com> -Date: Fri, 13 Nov 2015 17:40:24 +0800 -Subject: [PATCH] fix do_package failed since snort 2.9.7.0 - -Remove redundant '/' as a workround for below error: -/lib/rpm/bin/debugedit: canonicalization unexpectedly shrank by one character - -It's a rpm debugedit bug: -* http://sourceforge.net/p/snort/mailman/message/34130268/ -* https://bugzilla.redhat.com/show_bug.cgi?id=304121 - -Upstream-Status:Inappropriate [embedded specific] - -Signed-off-by: Zhiquan Li <zhiquan.li@windriver.com> ---- - src/snort.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/snort.h b/src/snort.h -index 8308e57..499d157 100644 ---- a/src/snort.h -+++ b/src/snort.h -@@ -39,7 +39,7 @@ - #include "sfdaq.h" - #include "sf_types.h" - #include "sfutil/sflsq.h" --#include "sfutil//sfActionQueue.h" -+#include "sfutil/sfActionQueue.h" - #include "profiler.h" - #include "rules.h" - #include "treenodes.h" --- -1.9.1 - diff --git a/meta-networking/recipes-connectivity/snort/snort/0001-libpcap-search-sysroot-for-headers.patch b/meta-networking/recipes-connectivity/snort/snort/0001-libpcap-search-sysroot-for-headers.patch index 54c2a9521b..2e28cd0486 100644 --- a/meta-networking/recipes-connectivity/snort/snort/0001-libpcap-search-sysroot-for-headers.patch +++ b/meta-networking/recipes-connectivity/snort/snort/0001-libpcap-search-sysroot-for-headers.patch @@ -1,4 +1,4 @@ -From 4d7ebe3ed6cee72bc7db98bd408d22c10ef5dd82 Mon Sep 17 00:00:00 2001 +From 5875dea90f71350b7205788fbc67e3759077cefe Mon Sep 17 00:00:00 2001 From: Joe MacDonald <joe@deserted.net> Date: Wed, 20 Nov 2013 16:06:07 -0500 Subject: [PATCH] libpcap: search sysroot for headers @@ -9,15 +9,16 @@ the search path at the sysroot instead. Upstream-Status: Pending Signed-off-by: Joe MacDonald <joe@deserted.net> + --- - configure.in | 2 +- + configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.in b/configure.in -index e52bb6c..8ded35d 100644 +index 62573a8..fded45b 100644 --- a/configure.in +++ b/configure.in -@@ -78,7 +78,7 @@ case "$host" in +@@ -69,7 +69,7 @@ case "$host" in linux="yes" AC_DEFINE([LINUX],[1],[Define if Linux]) AC_SUBST(extra_incl) @@ -26,6 +27,3 @@ index e52bb6c..8ded35d 100644 ;; *-hpux10*|*-hpux11*) AC_DEFINE([HPUX],[1],[Define if HP-UX 10 or 11]) --- -1.7.10.4 - diff --git a/meta-networking/recipes-connectivity/snort/snort/configure.in-disable-tirpc-checking-for-fedora.patch b/meta-networking/recipes-connectivity/snort/snort/configure.in-disable-tirpc-checking-for-fedora.patch new file mode 100644 index 0000000000..d8c945a481 --- /dev/null +++ b/meta-networking/recipes-connectivity/snort/snort/configure.in-disable-tirpc-checking-for-fedora.patch @@ -0,0 +1,60 @@ +From 65463a7c5cb2514b1523a81911810effffb75a79 Mon Sep 17 00:00:00 2001 +From: Yi Zhao <yi.zhao@windriver.com> +Date: Fri, 28 Jun 2019 15:05:31 +0800 +Subject: [PATCH] configure.in: disable tirpc checking for fedora + +The Fedora 28+ does not have inbuilt SunRPC support in glibc and is +separately availble in tirpc package. So it enables tirpc checking for +fedora in configure. + +Drop this piece of code since we had specify '-ltirpc' in LDFLAGS +explicitly. Otherwise it will cause a compile-host-path QA issue if the +host is Fedora 28+: +cc1: warning: include location "/usr/include/tirpc" is unsafe for +cross-compilation [-Wpoison-system-directories] + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + configure.in | 24 ------------------------ + 1 file changed, 24 deletions(-) + +diff --git a/configure.in b/configure.in +index 8662cdd..0ff7e27 100644 +--- a/configure.in ++++ b/configure.in +@@ -895,30 +895,6 @@ if test "x$enable_dlclose" = "xno"; then + AC_DEFINE([DISABLE_DLCLOSE_FOR_VALGRIND_TESTING],[1],[Don't close opened shared objects for valgrind leak testing of dynamic libraries]) + fi + +-################################################## +-# Fedora 28+ does not have inbuilt SunRPC support# +-# in glibc and is separately availble in tirpc # +-# package. Make sure we've got the library and # +-# link it # +-################################################## +- +-if test -f /etc/fedora-release ; then +- DISTRO_VERSION=$(awk '{ print $3 }' /etc/fedora-release) +- if test $DISTRO_VERSION -ge 28 ; then +- TIRPC="" +- AC_CHECK_LIB(tirpc,bindresvport,, TIRPC="no") +- echo "$TIRPC" +- if test "x$TIRPC" = "xno"; then +- echo +- echo " ERROR! tirpc not found, get it by running " +- echo " yum install libtirpc-devel " +- exit +- fi +- LIBS="${LIBS} -ltirpc" +- extra_incl="-I/usr/include/tirpc" +- fi +-fi +- + ################################################## + # Centos 8+ does not have inbuilt SunRPC support # + # in glibc and is separately availble in tirpc # +-- +2.7.4 + diff --git a/meta-networking/recipes-connectivity/snort/snort/disable-dap-address-space-id.patch b/meta-networking/recipes-connectivity/snort/snort/disable-dap-address-space-id.patch deleted file mode 100644 index 39e5c9c03a..0000000000 --- a/meta-networking/recipes-connectivity/snort/snort/disable-dap-address-space-id.patch +++ /dev/null @@ -1,52 +0,0 @@ -Upstream-Status:Inappropriate [embedded specific] - -fix the below error: -checking for dap address space id... configure: -configure: error: cannot run test program while cross compiling - - -Signed-off-by: Chunrong Guo <B40290@freescale.com> - ---- a/configure.in 2013-08-23 00:06:37.239361932 -0500 -+++ b/configure.in 2013-08-23 00:07:32.860266534 -0500 -@@ -679,23 +679,23 @@ - - AC_CHECK_FUNCS([daq_hup_apply] [daq_acquire_with_meta]) - --AC_MSG_CHECKING([for daq address space ID]) --AC_RUN_IFELSE( --[AC_LANG_PROGRAM( --[[ --#include <daq.h> --]], --[[ -- DAQ_PktHdr_t hdr; -- hdr.address_space_id = 0; --]])], --[have_daq_address_space_id="yes"], --[have_daq_address_space_id="no"]) --AC_MSG_RESULT($have_daq_address_space_id) --if test "x$have_daq_address_space_id" = "xyes"; then -- AC_DEFINE([HAVE_DAQ_ADDRESS_SPACE_ID],[1], -- [DAQ version supports address space ID in header.]) --fi -+#AC_MSG_CHECKING([for daq address space ID]) -+#AC_RUN_IFELSE( -+#[AC_LANG_PROGRAM( -+#[[ -+##include <daq.h> -+#]], -+#[[ -+# DAQ_PktHdr_t hdr; -+# hdr.address_space_id = 0; -+#]])], -+have_daq_address_space_id="yes" -+#[have_daq_address_space_id="no"]) -+#AC_MSG_RESULT($have_daq_address_space_id) -+#if test "x$have_daq_address_space_id" = "xyes"; then -+# AC_DEFINE([HAVE_DAQ_ADDRESS_SPACE_ID],[1], -+# [DAQ version supports address space ID in header.]) -+#fi - - # any sparc platform has to have this one defined. - AC_MSG_CHECKING(for sparc) diff --git a/meta-networking/recipes-connectivity/snort/snort/disable-daq-flow-id.patch b/meta-networking/recipes-connectivity/snort/snort/disable-daq-flow-id.patch deleted file mode 100644 index e6afcabaa8..0000000000 --- a/meta-networking/recipes-connectivity/snort/snort/disable-daq-flow-id.patch +++ /dev/null @@ -1,50 +0,0 @@ -Upstream-Status:Inappropriate [embedded specific] - -fix the below error: -checking for daq flow ID... configure: -configure: error: cannot run test program while cross compiling - - ---- a/configure.in 2015-10-28 10:36:42.918512690 +0800 -+++ b/configure.in 2015-10-28 10:37:36.738510048 +0800 -@@ -716,23 +716,23 @@ - # [DAQ version supports address space ID in header.]) - #fi - --AC_MSG_CHECKING([for daq flow ID]) --AC_RUN_IFELSE( --[AC_LANG_PROGRAM( --[[ --#include <daq.h> --]], --[[ -- DAQ_PktHdr_t hdr; -- hdr.flow_id = 0; --]])], --[have_daq_flow_id="yes"], --[have_daq_flow_id="no"]) --AC_MSG_RESULT($have_daq_flow_id) --if test "x$have_daq_flow_id" = "xyes"; then -- AC_DEFINE([HAVE_DAQ_FLOW_ID],[1], -- [DAQ version supports flow ID in header.]) --fi -+#AC_MSG_CHECKING([for daq flow ID]) -+#AC_RUN_IFELSE( -+#[AC_LANG_PROGRAM( -+#[[ -+##include <daq.h> -+#]], -+#[[ -+# DAQ_PktHdr_t hdr; -+# hdr.flow_id = 0; -+#]])], -+have_daq_flow_id="yes" -+#[have_daq_flow_id="no"]) -+#AC_MSG_RESULT($have_daq_flow_id) -+#if test "x$have_daq_flow_id" = "xyes"; then -+# AC_DEFINE([HAVE_DAQ_FLOW_ID],[1], -+# [DAQ version supports flow ID in header.]) -+#fi - - AC_MSG_CHECKING([for DAQ_VERDICT_RETRY]) - AC_RUN_IFELSE( diff --git a/meta-networking/recipes-connectivity/snort/snort/disable-daq-verdict-retry.patch b/meta-networking/recipes-connectivity/snort/snort/disable-daq-verdict-retry.patch deleted file mode 100644 index 1a13298ca2..0000000000 --- a/meta-networking/recipes-connectivity/snort/snort/disable-daq-verdict-retry.patch +++ /dev/null @@ -1,51 +0,0 @@ -Upstream-Status:Inappropriate [embedded specific] - -fix the below error: -checking for DAQ_VERDICT_RETRY... configure: -configure: error: cannot run test program while cross compiling - - ---- a/configure.in 2015-10-28 10:45:18.174487395 +0800 -+++ b/configure.in 2015-10-28 10:45:47.586485951 +0800 -@@ -734,23 +734,23 @@ - # [DAQ version supports flow ID in header.]) - #fi - --AC_MSG_CHECKING([for DAQ_VERDICT_RETRY]) --AC_RUN_IFELSE( --[AC_LANG_PROGRAM( --[[ --#include <daq.h> --]], --[[ -- DAQ_Verdict verdict; -- verdict = DAQ_VERDICT_RETRY; --]])], --[have_daq_verdict_retry="yes"], --[have_daq_verdict_retry="no"]) --AC_MSG_RESULT($have_daq_verdict_retry) --if test "x$have_daq_verdict_retry" = "xyes"; then -- AC_DEFINE([HAVE_DAQ_VERDICT_RETRY],[1], -- [DAQ version supports DAQ_VERDICT_RETRY in DAQ_Verdict.]) --fi -+#AC_MSG_CHECKING([for DAQ_VERDICT_RETRY]) -+#AC_RUN_IFELSE( -+#[AC_LANG_PROGRAM( -+#[[ -+##include <daq.h> -+#]], -+#[[ -+# DAQ_Verdict verdict; -+# verdict = DAQ_VERDICT_RETRY; -+#]])], -+have_daq_verdict_retry="yes" -+#[have_daq_verdict_retry="no"]) -+#AC_MSG_RESULT($have_daq_verdict_retry) -+#if test "x$have_daq_verdict_retry" = "xyes"; then -+# AC_DEFINE([HAVE_DAQ_VERDICT_RETRY],[1], -+# [DAQ version supports DAQ_VERDICT_RETRY in DAQ_Verdict.]) -+#fi - - # any sparc platform has to have this one defined. - AC_MSG_CHECKING(for sparc) - diff --git a/meta-networking/recipes-connectivity/snort/snort/disable-inaddr-none.patch b/meta-networking/recipes-connectivity/snort/snort/disable-inaddr-none.patch deleted file mode 100644 index 9dafe63459..0000000000 --- a/meta-networking/recipes-connectivity/snort/snort/disable-inaddr-none.patch +++ /dev/null @@ -1,75 +0,0 @@ -Upstream-Status: Inappropriate [embedded specific] - -fix the below error: -checking for INADDR_NONE... configure: -configure: error: cannot run test program while cross compiling - -Signed-off-by: Chunrong Guo <B40290@freescale.com> - - ---- a/configure.in 2013-08-21 03:56:17.197414789 -0500 -+++ b/configure.in 2013-08-21 23:19:05.298553560 -0500 -@@ -281,25 +281,7 @@ - AC_CHECK_TYPES([boolean]) - - # In case INADDR_NONE is not defined (like on Solaris) --have_inaddr_none="no" --AC_MSG_CHECKING([for INADDR_NONE]) --AC_RUN_IFELSE( --[AC_LANG_PROGRAM( --[[ --#include <sys/types.h> --#include <netinet/in.h> --#include <arpa/inet.h> --]], --[[ -- if (inet_addr("10,5,2") == INADDR_NONE); -- return 0; --]])], --[have_inaddr_none="yes"], --[have_inaddr_none="no"]) --AC_MSG_RESULT($have_inaddr_none) --if test "x$have_inaddr_none" = "xno"; then -- AC_DEFINE([INADDR_NONE],[-1],[For INADDR_NONE definition]) --fi -+have_inaddr_none="yes" - - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #include <stdio.h> -@@ -397,21 +379,21 @@ - fi - fi - --AC_MSG_CHECKING([for pcap_lex_destroy]) --AC_RUN_IFELSE( --[AC_LANG_PROGRAM( --[[ --#include <pcap.h> --]], --[[ -- pcap_lex_destroy(); --]])], --[have_pcap_lex_destroy="yes"], --[have_pcap_lex_destroy="no"]) --AC_MSG_RESULT($have_pcap_lex_destroy) --if test "x$have_pcap_lex_destroy" = "xyes"; then -- AC_DEFINE([HAVE_PCAP_LEX_DESTROY],[1],[Can cleanup lex buffer stack created by pcap bpf filter]) --fi -+#AC_MSG_CHECKING([for pcap_lex_destroy]) -+#AC_RUN_IFELSE( -+#[AC_LANG_PROGRAM( -+#[[ -+##include <pcap.h> -+#]], -+#[[ -+# pcap_lex_destroy(); -+#]])], -+have_pcap_lex_destroy="yes" -+#[have_pcap_lex_destroy="no"]) -+#AC_MSG_RESULT($have_pcap_lex_destroy) -+#if test "x$have_pcap_lex_destroy" = "xyes"; then -+# AC_DEFINE([HAVE_PCAP_LEX_DESTROY],[1],[Can cleanup lex buffer stack created by pcap bpf filter]) -+#fi - - AC_MSG_CHECKING([for pcap_lib_version]) - AC_LINK_IFELSE( diff --git a/meta-networking/recipes-connectivity/snort/snort/disable-run-test-program-while-cross-compiling.patch b/meta-networking/recipes-connectivity/snort/snort/disable-run-test-program-while-cross-compiling.patch new file mode 100644 index 0000000000..98c20b6ecf --- /dev/null +++ b/meta-networking/recipes-connectivity/snort/snort/disable-run-test-program-while-cross-compiling.patch @@ -0,0 +1,254 @@ +From dc390837bc7adc205bb955d0922040a7e365d8dd Mon Sep 17 00:00:00 2001 +From: Yi Zhao <yi.zhao@windriver.com> +Date: Mon, 23 Jul 2018 13:54:07 +0800 +Subject: [PATCH] Disable run test program while cross compiling + +fix configure error: +configure: error: cannot run test program while cross compiling + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + configure.in | 148 +++++------------------------------------------------------ + 1 file changed, 12 insertions(+), 136 deletions(-) + +diff --git a/configure.in b/configure.in +index 4b3a5db..a6c5498 100644 +--- a/configure.in ++++ b/configure.in +@@ -284,19 +284,7 @@ AC_CHECK_TYPES([boolean]) + # In case INADDR_NONE is not defined (like on Solaris) + have_inaddr_none="no" + AC_MSG_CHECKING([for INADDR_NONE]) +-AC_RUN_IFELSE( +-[AC_LANG_PROGRAM( +-[[ +-#include <sys/types.h> +-#include <netinet/in.h> +-#include <arpa/inet.h> +-]], +-[[ +- if (inet_addr("10,5,2") == INADDR_NONE); +- return 0; +-]])], +-[have_inaddr_none="yes"], +-[have_inaddr_none="no"]) ++have_inaddr_none="yes" + AC_MSG_RESULT($have_inaddr_none) + if test "x$have_inaddr_none" = "xno"; then + AC_DEFINE([INADDR_NONE],[-1],[For INADDR_NONE definition]) +@@ -429,16 +417,7 @@ if test "x$LPCAP" = "xno"; then + fi + + AC_MSG_CHECKING([for pcap_lex_destroy]) +-AC_RUN_IFELSE( +-[AC_LANG_PROGRAM( +-[[ +-#include <pcap.h> +-]], +-[[ +- pcap_lex_destroy(); +-]])], +-[have_pcap_lex_destroy="yes"], +-[have_pcap_lex_destroy="no"]) ++have_pcap_lex_destroy="yes" + AC_MSG_RESULT($have_pcap_lex_destroy) + if test "x$have_pcap_lex_destroy" = "xyes"; then + AC_DEFINE([HAVE_PCAP_LEX_DESTROY],[1],[Can cleanup lex buffer stack created by pcap bpf filter]) +@@ -716,17 +695,7 @@ fi + AC_CHECK_FUNCS([daq_hup_apply] [daq_acquire_with_meta] [daq_dp_add_dc]) + + AC_MSG_CHECKING([for daq real addresses]) +-AC_RUN_IFELSE( +-[AC_LANG_PROGRAM( +-[[ +-#include <daq.h> +-]], +-[[ +- DAQ_PktHdr_t hdr; +- hdr.n_real_dPort = 0; +-]])], +-[have_daq_real_addresses="yes"], +-[have_daq_real_addresses="no"]) ++have_daq_real_addresses="no" + AC_MSG_RESULT($have_daq_real_addresses) + if test "x$have_daq_real_addresses" = "xyes"; then + AC_DEFINE([HAVE_DAQ_REAL_ADDRESSES],[1], +@@ -754,17 +723,7 @@ if test "x$ac_cv_func_daq_dp_add_dc" = "xyes"; then + fi + + AC_MSG_CHECKING([for daq address space ID]) +-AC_RUN_IFELSE( +-[AC_LANG_PROGRAM( +-[[ +-#include <daq.h> +-]], +-[[ +- DAQ_PktHdr_t hdr; +- hdr.address_space_id = 0; +-]])], +-[have_daq_address_space_id="yes"], +-[have_daq_address_space_id="no"]) ++have_daq_address_space_id="yes" + AC_MSG_RESULT($have_daq_address_space_id) + if test "x$have_daq_address_space_id" = "xyes"; then + AC_DEFINE([HAVE_DAQ_ADDRESS_SPACE_ID],[1], +@@ -772,17 +731,7 @@ if test "x$have_daq_address_space_id" = "xyes"; then + fi + + AC_MSG_CHECKING([for daq flow ID]) +-AC_RUN_IFELSE( +-[AC_LANG_PROGRAM( +-[[ +-#include <daq.h> +-]], +-[[ +- DAQ_PktHdr_t hdr; +- hdr.flow_id = 0; +-]])], +-[have_daq_flow_id="yes"], +-[have_daq_flow_id="no"]) ++have_daq_flow_id="yes" + AC_MSG_RESULT($have_daq_flow_id) + if test "x$have_daq_flow_id" = "xyes"; then + AC_DEFINE([HAVE_DAQ_FLOW_ID],[1], +@@ -790,19 +739,7 @@ if test "x$have_daq_flow_id" = "xyes"; then + fi + + AC_MSG_CHECKING([for daq extended flow modifiers]) +-AC_RUN_IFELSE( +-[AC_LANG_PROGRAM( +-[[ +-#include <daq.h> +-]], +-[[ +- DAQ_ModFlow_t mod; +- mod.type = 0; +- mod.length = 0; +- mod.value = NULL; +-]])], +-[have_daq_ext_modflow="yes"], +-[have_daq_ext_modflow="no"]) ++have_daq_ext_modflow="no" + AC_MSG_RESULT($have_daq_ext_modflow) + if test "x$have_daq_ext_modflow" = "xyes"; then + CCONFIGFLAGS="${CCONFIGFLAGS} -DHAVE_DAQ_EXT_MODFLOW" +@@ -811,19 +748,7 @@ if test "x$have_daq_ext_modflow" = "xyes"; then + fi + + AC_MSG_CHECKING([for daq query flow]) +-AC_RUN_IFELSE( +-[AC_LANG_PROGRAM( +-[[ +-#include <daq.h> +-]], +-[[ +- DAQ_QueryFlow_t mod; +- mod.type = 0; +- mod.length = 0; +- mod.value = NULL; +-]])], +-[have_daq_queryflow="yes"], +-[have_daq_queryflow="no"]) ++have_daq_queryflow="no" + AC_MSG_RESULT($have_daq_queryflow) + if test "x$have_daq_queryflow" = "xyes"; then + CCONFIGFLAGS="${CCONFIGFLAGS} -DHAVE_DAQ_QUERYFLOW" +@@ -832,16 +757,7 @@ if test "x$have_daq_queryflow" = "xyes"; then + fi + + AC_MSG_CHECKING([for daq data channel flags]) +-AC_RUN_IFELSE( +-[AC_LANG_PROGRAM( +-[[ +-#include <daq.h> +-]], +-[[ +- DAQ_Data_Channel_Params_t params; +-]])], +-[have_daq_data_channel_flags="yes"], +-[have_daq_data_channel_flags="no"]) ++have_daq_data_channel_flags="no" + AC_MSG_RESULT($have_daq_data_channel_flags) + if test "x$have_daq_data_channel_flags" = "xyes"; then + CCONFIGFLAGS="${CCONFIGFLAGS} -DHAVE_DAQ_DATA_CHANNEL_PARAMS" +@@ -850,17 +766,7 @@ if test "x$have_daq_data_channel_flags" = "xyes"; then + fi + + AC_MSG_CHECKING([for separate IP versions on pinhole endpoints]) +-AC_RUN_IFELSE( +-[AC_LANG_PROGRAM( +-[[ +-#include <daq.h> +-]], +-[[ +- DAQ_DP_key_t dpKey; +- dpKey.src_af = 0; +-]])], +-[have_daq_data_channel_separate_ip_versions="yes"], +-[have_daq_data_channel_separate_ip_versions="no"]) ++have_daq_data_channel_separate_ip_versions="no" + AC_MSG_RESULT($have_daq_data_channel_separate_ip_versions) + if test "x$have_daq_data_channel_separate_ip_versions" = "xyes"; then + CCONFIGFLAGS="${CCONFIGFLAGS} -DHAVE_DAQ_DATA_CHANNEL_SEPARATE_IP_VERSIONS" +@@ -869,17 +775,7 @@ if test "x$have_daq_data_channel_separate_ip_versions" = "xyes"; then + fi + + AC_MSG_CHECKING([for DAQ_VERDICT_RETRY]) +-AC_RUN_IFELSE( +-[AC_LANG_PROGRAM( +-[[ +-#include <daq.h> +-]], +-[[ +- DAQ_Verdict verdict; +- verdict = DAQ_VERDICT_RETRY; +-]])], +-[have_daq_verdict_retry="yes"], +-[have_daq_verdict_retry="no"]) ++have_daq_verdict_retry="yes" + AC_MSG_RESULT($have_daq_verdict_retry) + if test "x$have_daq_verdict_retry" = "xyes"; then + AC_DEFINE([HAVE_DAQ_VERDICT_RETRY],[1], +@@ -887,17 +783,7 @@ if test "x$have_daq_verdict_retry" = "xyes"; then + fi + + AC_MSG_CHECKING([for daq packet trace]) +-AC_RUN_IFELSE( +-[AC_LANG_PROGRAM( +-[[ +-#include <daq.h> +-]], +-[[ +- DAQ_PktHdr_t hdr; +- hdr.flags = DAQ_PKT_FLAG_TRACE_ENABLED; +-]])], +-[have_daq_packet_trace="yes"], +-[have_daq_packet_trace="no"]) ++have_daq_packet_trace="no" + AC_MSG_RESULT($have_daq_packet_trace) + if test "x$have_daq_packet_trace" = "xyes"; then + AC_DEFINE([HAVE_DAQ_PKT_TRACE],[1], +@@ -907,17 +793,7 @@ else + fi + + AC_MSG_CHECKING([for daq verdict reason]) +-AC_RUN_IFELSE( +-[AC_LANG_PROGRAM( +-[[ +-#include <daq.h> +-]], +-[[ +- DAQ_ModFlow_t fl; +- fl.type = DAQ_MODFLOW_TYPE_VER_REASON; +-]])], +-[have_daq_verdict_reason="yes"], +-[have_daq_verdict_reason="no"]) ++have_daq_verdict_reason="no" + AC_MSG_RESULT($have_daq_verdict_reason) + if test "x$have_daq_verdict_reason" = "xyes"; then + AC_DEFINE([HAVE_DAQ_VERDICT_REASON],[1], +-- +2.7.4 + diff --git a/meta-networking/recipes-connectivity/snort/snort/fix-host-contamination-when-enable-static-daq.patch b/meta-networking/recipes-connectivity/snort/snort/fix-host-contamination-when-enable-static-daq.patch index 2becc06244..0404ea0fab 100644 --- a/meta-networking/recipes-connectivity/snort/snort/fix-host-contamination-when-enable-static-daq.patch +++ b/meta-networking/recipes-connectivity/snort/snort/fix-host-contamination-when-enable-static-daq.patch @@ -1,3 +1,8 @@ +From f46d096015d7402a37a59eb66b8f6b7fbf0cdff0 Mon Sep 17 00:00:00 2001 +From: Kai Kang <kai.kang@windriver.com> +Date: Wed, 24 May 2017 17:38:53 +0800 +Subject: [PATCH] snort: enable static daq + Upstream-Status: Inappropriate [embedded specific] When enable static daq for snort, it calls to daq-modules-config to get link @@ -5,7 +10,11 @@ library and library path. Library path is useless for oe and cause host contamination issue. So filter it. Signed-off-by: Kai Kang <kai.kang@windriver.com> + --- + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + diff --git a/configure.in b/configure.in index fded45b..a247bb9 100644 --- a/configure.in diff --git a/meta-networking/recipes-connectivity/snort/snort/snort.default b/meta-networking/recipes-connectivity/snort/snort/snort.default new file mode 100644 index 0000000000..f1f67c55c0 --- /dev/null +++ b/meta-networking/recipes-connectivity/snort/snort/snort.default @@ -0,0 +1 @@ +INTERFACES="eth0" diff --git a/meta-networking/recipes-connectivity/snort/snort/snort.init b/meta-networking/recipes-connectivity/snort/snort/snort.init index d8a00c43fc..0d90c9af03 100644 --- a/meta-networking/recipes-connectivity/snort/snort/snort.init +++ b/meta-networking/recipes-connectivity/snort/snort/snort.init @@ -1,6 +1,6 @@ #!/bin/sh # -# Snort Startup Script modified for OpenEmbedded +# Snort Startup Script modified for OpenEmbedded # # Script variables @@ -30,16 +30,16 @@ fi start() { - [ -n "$LAN_INTERFACE" ] || return 0 # Check if log diratory is present. Otherwise, create it. if [ ! -d $LOGDIR/$DATE ]; then - mkdir -d $LOGDIR/$DATE + mkdir -p $LOGDIR/$DATE /bin/chown -R $USER:$USER $LOGDIR/$DATE - /bin/chmod -R 700 $LOGDIR/$DATE + /bin/chmod -R 700 $LOGDIR/$DATE fi /bin/echo "Starting $PROG: " + # Snort parameters # -D Run Snort in background (daemon) mode # -i <if> Listen on interface <if> @@ -64,7 +64,7 @@ stop() RETURN_VAL=$? /bin/echo "$PROG shutdown complete." [ -e $DEL_PID ] && rm -f $DEL_PID - [ -e $DEL_PID.lck ] && rm -f $DEL_PID.lck + [ -e $DEL_PID.lck ] && rm -f $DEL_PID.lck else /bin/echo "ERROR: PID in $PID file not found." RETURN_VAL=1 @@ -72,12 +72,13 @@ stop() return $RETURN_VAL } -status() { - if [ -s $PID ]; then - echo "$PROG is running as pid `cat $PID`:" - else - echo "$PROG is not running." - fi +status() +{ + if [ -s $PID ]; then + echo "$PROG is running as pid `cat $PID`:" + else + echo "$PROG is not running." + fi } restart() @@ -89,21 +90,21 @@ restart() } case "$1" in - start) - start - ;; - stop) - stop - ;; - status) - status - ;; - restart|reload) - restart - ;; - *) - /bin/echo "Usage: $0 {start|stop|status|restart|reload}" - RETURN_VAL=1 + start) + start + ;; + stop) + stop + ;; + status) + status + ;; + restart|reload) + restart + ;; + *) + /bin/echo "Usage: $0 {start|stop|status|restart|reload}" + RETURN_VAL=1 esac exit $RETURN_VAL diff --git a/meta-networking/recipes-connectivity/snort/snort/snort.service b/meta-networking/recipes-connectivity/snort/snort/snort.service new file mode 100644 index 0000000000..487328c1b0 --- /dev/null +++ b/meta-networking/recipes-connectivity/snort/snort/snort.service @@ -0,0 +1,12 @@ +[Unit] +Description=Snort NIDS Daemon +After=syslog.target network.target + +[Service] +Type=simple +EnvironmentFile=/etc/default/snort +ExecStartPre=/bin/mkdir -p /var/log/snort +ExecStart=/usr/bin/snort -q -c /etc/snort/snort.conf -l /var/log/snort -i $INTERFACES + +[Install] +WantedBy=multi-user.target diff --git a/meta-networking/recipes-connectivity/snort/snort/volatiles.99_snort b/meta-networking/recipes-connectivity/snort/snort/volatiles.99_snort new file mode 100644 index 0000000000..acf5f61ab6 --- /dev/null +++ b/meta-networking/recipes-connectivity/snort/snort/volatiles.99_snort @@ -0,0 +1,2 @@ +# <type> <owner> <group> <mode> <path> <linksource> +d root root 0755 /var/log/snort none diff --git a/meta-networking/recipes-connectivity/snort/snort3/0001-cmake-Check-for-HP-libunwind.patch b/meta-networking/recipes-connectivity/snort/snort3/0001-cmake-Check-for-HP-libunwind.patch new file mode 100644 index 0000000000..7b7a0d098f --- /dev/null +++ b/meta-networking/recipes-connectivity/snort/snort3/0001-cmake-Check-for-HP-libunwind.patch @@ -0,0 +1,33 @@ +From 433a412fad2ab0383ac3c625d183a71684f2b97b Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 20 Feb 2024 15:35:14 -0800 +Subject: [PATCH] cmake: Check for HP libunwind + +This is to ensure that cmake does not detect LLVM unwinder, which +can provide the support for some HP unwinder functionality but not all +e.g. unw_strerror goes missing. By checking for libunwind-common.h in +tests we ensure that this test passes only with HP libunwind. + +Upstream-Status: Inappropriate [OE-Specific] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + cmake/FindLibunwind.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/FindLibunwind.cmake b/cmake/FindLibunwind.cmake +index f66800a18..1ad66fc83 100644 +--- a/cmake/FindLibunwind.cmake ++++ b/cmake/FindLibunwind.cmake +@@ -22,7 +22,7 @@ find_package(PkgConfig QUIET) + pkg_check_modules(PC_LIBUNWIND libunwind) + + find_path(LIBUNWIND_INCLUDE_DIRS +- NAMES libunwind.h ++ NAMES libunwind-common.h + HINTS ${PC_LIBUNWIND_INCLUDE_DIRS} + ) + +-- +2.43.2 + diff --git a/meta-networking/recipes-connectivity/snort/snort3/0001-cmake-Pass-noline-flag-to-flex.patch b/meta-networking/recipes-connectivity/snort/snort3/0001-cmake-Pass-noline-flag-to-flex.patch new file mode 100644 index 0000000000..ec7b90cfb4 --- /dev/null +++ b/meta-networking/recipes-connectivity/snort/snort3/0001-cmake-Pass-noline-flag-to-flex.patch @@ -0,0 +1,31 @@ +From 417ed0045b3d04f539a8eb18b07a208c75f6c7e1 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 20 Feb 2024 16:08:20 -0800 +Subject: [PATCH] cmake: Pass --noline flag to flex + +This ensures that line directive is not emitted into lexer output which +could be absolute build paths, since these files end up in dbg packages +this can be flagged as a build/packaging warning. + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + cmake/configure_options.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/configure_options.cmake b/cmake/configure_options.cmake +index f3673f399..fbd0bd2c3 100644 +--- a/cmake/configure_options.cmake ++++ b/cmake/configure_options.cmake +@@ -28,7 +28,7 @@ if ( ENABLE_LARGE_PCAP ) + endif ( ENABLE_LARGE_PCAP ) + + # Flex Lexer +-set ( FLEX_FLAGS "-Ca" ) ++set ( FLEX_FLAGS "-Ca --noline" ) + + # documentation + +-- +2.43.2 + diff --git a/meta-networking/recipes-connectivity/snort/snort3_3.1.84.0.bb b/meta-networking/recipes-connectivity/snort/snort3_3.1.84.0.bb new file mode 100644 index 0000000000..ee84aa17e7 --- /dev/null +++ b/meta-networking/recipes-connectivity/snort/snort3_3.1.84.0.bb @@ -0,0 +1,38 @@ +SUMMARY = "snort3" +DESCRIPTION = "snort3 - a free lightweight network intrusion detection system for UNIX and Windows." +HOMEPAGE = "http://www.snort.org/" +SECTION = "net" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=78fa8ef966b48fbf9095e13cc92377c5" + +DEPENDS = "flex-native hwloc libdaq libdnet libpcap libpcre libtirpc libunwind luajit zlib" + +SRC_URI = "git://github.com/snort3/snort3.git;protocol=https;branch=master \ + file://0001-cmake-Check-for-HP-libunwind.patch \ + file://0001-cmake-Pass-noline-flag-to-flex.patch" +SRCREV = "e7312efd840d66a52a2019abe1db7cc89ca0f39a" + +S = "${WORKDIR}/git" + +PACKAGES =+ "${PN}-scripts" + +inherit cmake pkgconfig + +do_install:append() { + sed -i "s#${RECIPE_SYSROOT_NATIVE}##g; s#${RECIPE_SYSROOT}##g" ${D}${libdir}/pkgconfig/snort.pc +} + +FILES:${PN} += "${libdir}/snort/daq/*.so" + +FILES:${PN}-scripts = "${bindir}/appid_detector_builder.sh" + +RDEPENDS:${PN}-scripts += "bash" + +# mips64/ppc/ppc64/riscv64/riscv32 is not supported in this release +COMPATIBLE_HOST:mipsarchn32 = "null" +COMPATIBLE_HOST:mipsarchn64 = "null" +COMPATIBLE_HOST:powerpc = "null" +COMPATIBLE_HOST:powerpc64 = "null" +COMPATIBLE_HOST:powerpc64le = "null" +COMPATIBLE_HOST:riscv64 = "null" +COMPATIBLE_HOST:riscv32 = "null" diff --git a/meta-networking/recipes-connectivity/snort/snort_2.9.7.5.bb b/meta-networking/recipes-connectivity/snort/snort_2.9.20.bb index 2034b85fb5..9bc14fc56f 100644 --- a/meta-networking/recipes-connectivity/snort/snort_2.9.7.5.bb +++ b/meta-networking/recipes-connectivity/snort/snort_2.9.20.bb @@ -1,31 +1,35 @@ DESCRIPTION = "snort - a free lightweight network intrusion detection system for UNIX and Windows." HOMEPAGE = "http://www.snort.org/" SECTION = "net" -LICENSE = "GPL-2.0" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=78fa8ef966b48fbf9095e13cc92377c5" -DEPENDS = "xz libpcap libpcre daq libdnet util-linux daq-native" -DEPENDS_append_libc-musl = " libtirpc" +DEPENDS = "xz libpcap libpcre daq libdnet util-linux daq-native libtirpc bison-native" -SRC_URI = " ${GENTOO_MIRROR}/${BP}.tar.gz;name=tarball \ +SRC_URI = "https://www.snort.org/downloads/archive/snort/${BP}.tar.gz \ file://snort.init \ - file://disable-inaddr-none.patch \ - file://disable-dap-address-space-id.patch \ - file://disable-daq-flow-id.patch \ - file://disable-daq-verdict-retry.patch \ + file://snort.service \ + file://snort.default \ + file://volatiles.99_snort \ file://0001-libpcap-search-sysroot-for-headers.patch \ - file://0001-fix-do_package-failed-since-snort-2.9.7.0.patch \ file://fix-host-contamination-when-enable-static-daq.patch \ + file://disable-run-test-program-while-cross-compiling.patch \ + file://configure.in-disable-tirpc-checking-for-fedora.patch \ " +SRC_URI[sha256sum] = "29400e13f53b1831e0b8b10ec1224a1cbaa6dc1533a5322a20dd80bb84b4981c" -SRC_URI[tarball.md5sum] = "fd271788c0f8876be87a858a9142f202" -SRC_URI[tarball.sha256sum] = "ad03f11b5301b16642199a86aa90388eaa53f5003f83b0c5595745a490047be1" +UPSTREAM_CHECK_URI = "https://www.snort.org/downloads" +UPSTREAM_CHECK_REGEX = "snort-(?P<pver>\d+(\.\d+)+)\.tar" -inherit autotools gettext update-rc.d pkgconfig +inherit autotools gettext update-rc.d pkgconfig systemd INITSCRIPT_NAME = "snort" INITSCRIPT_PARAMS = "defaults" +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE:${PN} = "snort.service" +SYSTEMD_AUTO_ENABLE = "disable" + EXTRA_OECONF = " \ --enable-gre \ --enable-linux-smp-stats \ @@ -47,11 +51,12 @@ EXTRA_OECONF = " \ PACKAGECONFIG ?= "openssl lzma" PACKAGECONFIG[openssl] = "--with-openssl-includes=${STAGING_INCDIR} --with-openssl-libraries=${STAGING_LIBDIR}, --without-openssl-includes --without-openssl-libraries, openssl," PACKAGECONFIG[lzma] = "--with-lzma-includes=${STAGING_INCDIR} --with-lzma-libraries=${STAGING_LIBDIR}, --without-lzma-includes --without-lzma-libraries, xz," +PACKAGECONFIG[appid] = "--enable-open-appid, --disable-open-appid, luajit, bash" -CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc" -LDFLAGS_append_libc-musl = " -ltirpc" +CFLAGS += "-I${STAGING_INCDIR}/tirpc" +LDFLAGS += " -ltirpc" -do_install_append() { +do_install:append() { install -d ${D}${sysconfdir}/snort/rules install -d ${D}${sysconfdir}/snort/preproc_rules install -d ${D}${sysconfdir}/init.d @@ -70,31 +75,48 @@ do_install_append() { ${D}${sysconfdir}/snort/snort.conf cp ${S}/preproc_rules/*.rules ${D}${sysconfdir}/snort/preproc_rules/ - install -m 755 ${WORKDIR}/snort.init ${D}${sysconfdir}/init.d/snort - mkdir -p ${D}${localstatedir}/log/snort - install -d ${D}/var/log/snort + if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then + install -m 755 ${UNPACKDIR}/snort.init ${D}${sysconfdir}/init.d/snort + fi + + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}/${systemd_system_unitdir} + install -m 644 ${UNPACKDIR}/snort.service ${D}/${systemd_system_unitdir} + # Install default environment file + install -d ${D}/${sysconfdir}/default + install -m 0644 ${UNPACKDIR}/snort.default ${D}${sysconfdir}/default/snort + fi + install -d ${D}${sysconfdir}/default/volatiles + install -m 0644 ${UNPACKDIR}/volatiles.99_snort ${D}${sysconfdir}/default/volatiles/99_snort + + 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 +} - sed -i 's/-fdebug-prefix-map[^ ]*//g; s#${STAGING_DIR_TARGET}##g' ${D}${libdir}/pkgconfig/*.pc +pkg_postinst:${PN}() { + if [ -z "$D" ] && [ -e ${sysconfdir}/init.d/populate-volatile.sh ]; then + ${sysconfdir}/init.d/populate-volatile.sh update + fi } -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/snort_dynamicengine/*.so.* \ ${libdir}/snort_dynamicpreprocessor/*.so.* \ ${libdir}/snort_dynamicrules/*.so.* \ + ${systemd_system_unitdir}/snort.service \ " -FILES_${PN}-dbg += " \ +FILES:${PN}-dbg += " \ ${libdir}/snort_dynamicengine/.debug \ ${libdir}/snort_dynamicpreprocessor/.debug \ ${libdir}/snort_dynamicrules/.debug \ " -FILES_${PN}-staticdev += " \ +FILES:${PN}-staticdev += " \ ${libdir}/snort_dynamicengine/*.a \ ${libdir}/snort_dynamicpreprocessor/*.a \ ${libdir}/snort_dynamicrules/*.a \ ${libdir}/snort/dynamic_preproc/*.a \ ${libdir}/snort/dynamic_output/*.a \ " -FILES_${PN}-dev += " \ +FILES:${PN}-dev += " \ ${libdir}/snort_dynamicengine/*.la \ ${libdir}/snort_dynamicpreprocessor/*.la \ ${libdir}/snort_dynamicrules/*.la \ diff --git a/meta-networking/recipes-connectivity/sshpass/sshpass_1.10.bb b/meta-networking/recipes-connectivity/sshpass/sshpass_1.10.bb new file mode 100644 index 0000000000..81c5e48008 --- /dev/null +++ b/meta-networking/recipes-connectivity/sshpass/sshpass_1.10.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "Non-interactive ssh password auth" +HOMEPAGE = "http://sshpass.sourceforge.net/" +SECTION = "console/network" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz" + +SRC_URI[sha256sum] = "ad1106c203cbb56185ca3bad8c6ccafca3b4064696194da879f81c8d7bdfeeda" + +inherit autotools diff --git a/meta-networking/recipes-connectivity/tayga/files/0001-include-sys-uio.patch b/meta-networking/recipes-connectivity/tayga/files/0001-include-sys-uio.patch new file mode 100644 index 0000000000..0c6f1609af --- /dev/null +++ b/meta-networking/recipes-connectivity/tayga/files/0001-include-sys-uio.patch @@ -0,0 +1,18 @@ + +This patch addresses the following clang failure: tayga-0.9.2/nat64.c:119:6: +error: call to undeclared function 'writev'; ISO C99 and later do not support +implicit function declarations [-Wimplicit-function-declaration] + +Upstream-Status: Pending +Signed-off-by: Pawel Langowski <pawel.langowski@3mdeb.com> + +--- tayga.h 2023-09-29 14:38:05.005837695 +0200 ++++ tayga-2.h 2023-09-29 14:37:45.560837257 +0200 +@@ -20,6 +20,7 @@ + #include <sys/stat.h> + #include <sys/ioctl.h> + #include <sys/socket.h> ++#include <sys/uio.h> + #include <netinet/in.h> + #include <arpa/inet.h> + #include <unistd.h> diff --git a/meta-networking/recipes-connectivity/tayga/files/tayga.conf b/meta-networking/recipes-connectivity/tayga/files/tayga.conf new file mode 100644 index 0000000000..c1b6163a45 --- /dev/null +++ b/meta-networking/recipes-connectivity/tayga/files/tayga.conf @@ -0,0 +1,103 @@ +# +# Sample configuration file for TAYGA 0.9.2 +# +# Modify this to use your own addresses!! +# + +# +# TUN device that TAYGA will use to exchange IPv4 and IPv6 packets with the +# kernel. You may use any name you like, but `nat64' is recommended. +# +# This device may be created before starting the tayga daemon by running +# `tayga --mktun`. This allows routing and firewall rules to be set up prior +# to commencement of packet translation. +# +# Mandatory. +# +tun-device nat64 + +# +# TAYGA's IPv4 address. This is NOT your router's IPv4 address! TAYGA +# requires its own address because it acts as an IPv4 and IPv6 router, and +# needs to be able to send ICMP messages. TAYGA will also respond to ICMP +# echo requests (ping) at this address. +# +# This address can safely be located inside the dynamic-pool prefix. +# +# Mandatory. +# +ipv4-addr 192.168.254.1 + +# +# TAYGA's IPv6 address. This is NOT your router's IPv6 address! TAYGA +# requires its own address because it acts as an IPv4 and IPv6 router, and +# needs to be able to send ICMP messages. TAYGA will also respond to ICMP +# echo requests (ping6) at this address. +# +# You can leave ipv6-addr unspecified and TAYGA will construct its IPv6 +# address using ipv4-addr and the NAT64 prefix. +# +# Optional if the NAT64 prefix is specified, otherwise mandatory. It is also +# mandatory if the NAT64 prefix is 64:ff9b::/96 and ipv4-addr is a private +# (RFC1918) address. +# +#ipv6-addr 2001:db8:1::2 +ipv6-addr fdaa:bb:1::1 + +# +# The NAT64 prefix. The IPv4 address space is mapped into the IPv6 address +# space by prepending this prefix to the IPv4 address. Using a /96 prefix is +# recommended in most situations, but all lengths specified in RFC 6052 are +# supported. +# +# This must be a prefix selected from your organization's IPv6 address space +# or the Well-Known Prefix 64:ff9b::/96. Note that using the Well-Known +# Prefix will prohibit IPv6 hosts from contacting IPv4 hosts that have private +# (RFC1918) addresses, per RFC 6052. +# +# The NAT64 prefix need not be specified if all required address mappings are +# listed in `map' directives. (See below.) +# +# Optional. +# +##prefix 2001:db8:1:ffff::/96 +prefix 64:ff9b::/96 + +# +# Dynamic pool prefix. IPv6 hosts which send traffic through TAYGA (and do +# not correspond to a static map or an IPv4-translatable address in the NAT64 +# prefix) will be assigned an IPv4 address from the dynamic pool. Dynamic +# maps are valid for 124 minutes after the last matching packet is seen. +# +# If no unassigned addresses remain in the dynamic pool (or no dynamic pool is +# configured), packets from unknown IPv6 hosts will be rejected with an ICMP +# unreachable error. +# +# Optional. +# +dynamic-pool 192.168.254.0/24 + +# +# Persistent data storage directory. The dynamic.map file, which saves the +# dynamic maps that are created from dynamic-pool, is stored in this +# directory. Omit if you do not need these maps to be persistent between +# instances of TAYGA. +# +# Optional. +# +data-dir /var/spool/tayga + +# +# Establishes a single-host map. If an IPv6 host should be consistently +# reachable at a specific IPv4 address, the mapping can be specified in a +# `map' directive. (IPv6 hosts numbered with an IPv4-translatable address do +# not need map directives.) +# +# IPv4 addresses specified in the `map' directive can safely be located inside +# the dynamic-pool prefix. +# +# Optional. +# +#map 192.168.5.42 2001:db8:1:4444::1 +#map 192.168.5.43 2001:db8:1:4444::2 +#map 192.168.255.2 2001:db8:1:569::143 diff --git a/meta-networking/recipes-connectivity/tayga/files/tayga.service b/meta-networking/recipes-connectivity/tayga/files/tayga.service new file mode 100644 index 0000000000..0bffeb92a5 --- /dev/null +++ b/meta-networking/recipes-connectivity/tayga/files/tayga.service @@ -0,0 +1,12 @@ +[Unit] +SourcePath=/usr/sbin/tayga +Description=LSB: userspace NAT64 + +[Service] +Type=forking +ExecStart=/usr/sbin/tayga -d --config /etc/tayga.conf +RemainAfterExit=yes +TimeoutStopSec=infinity + +[Install] +WantedBy=multi-user.target diff --git a/meta-networking/recipes-connectivity/tayga/tayga_0.9.2.bb b/meta-networking/recipes-connectivity/tayga/tayga_0.9.2.bb new file mode 100644 index 0000000000..f6b58559d4 --- /dev/null +++ b/meta-networking/recipes-connectivity/tayga/tayga_0.9.2.bb @@ -0,0 +1,21 @@ +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +SRC_URI = " \ + http://www.litech.org/tayga/tayga-${PV}.tar.bz2 \ + file://tayga.conf \ + file://tayga.service \ + file://0001-include-sys-uio.patch;striplevel=0 \ + " +SRC_URI[sha256sum] = "2b1f7927a9d2dcff9095aff3c271924b052ccfd2faca9588b277431a44f0009c" + +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE:${PN} = "tayga.service" + +do_install:append() { + install -m 0644 ${UNPACKDIR}/tayga.conf ${D}${sysconfdir}/tayga.conf + install -d ${D}${systemd_unitdir}/system/ + install -m 0644 ${UNPACKDIR}/tayga.service ${D}${systemd_unitdir}/system/ +} + +inherit autotools systemd diff --git a/meta-networking/recipes-connectivity/ufw/ufw/0001-optimize-boot.patch b/meta-networking/recipes-connectivity/ufw/ufw/0001-optimize-boot.patch index a1e56b7cac..28068bba11 100644 --- a/meta-networking/recipes-connectivity/ufw/ufw/0001-optimize-boot.patch +++ b/meta-networking/recipes-connectivity/ufw/ufw/0001-optimize-boot.patch @@ -1,18 +1,31 @@ -Author: Jamie Strandboge <jamie@canonical.com> -Description: to improve boot speed when disabled, don't source all of - ufw-init-functions (which also sources in other files). +From 92fcdbc1a57086e4decc1597217c0739dc16342a Mon Sep 17 00:00:00 2001 +From: Silcet <camorga1@gmail.com> +Date: Tue, 27 Apr 2021 05:34:59 +0000 +Subject: [PATCH] Author: Jamie Strandboge <jamie@canonical.com> +Description: +to improve boot speed when disabled, don't source all of ufw-init-functions +(which also sources in other files). Upstream-Status: Inappropriate [ not author ] Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> -Index: ufw-0.31/src/ufw-init -=================================================================== ---- ufw-0.31.orig/src/ufw-init 2012-03-09 17:07:11.000000000 -0600 -+++ ufw-0.31/src/ufw-init 2012-03-17 09:37:51.000000000 -0500 -@@ -18,6 +18,12 @@ - # - set -e +The patch was imported from the OpenEmbedded git server +(git://git.openembedded.org/openembedded) as of commit id +2cc1bd9dd060f5002c2fde7aacba86fe230c12af. + +Signed-off-by: Silcet <camorga1@gmail.com> +--- + src/ufw-init | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/ufw-init b/src/ufw-init +index 3505a02..dde37f0 100755 +--- a/src/ufw-init ++++ b/src/ufw-init +@@ -31,6 +31,12 @@ if [ "$1" = "--datadir" ] && [ -s "$2" ]; then + fi + export DATA_DIR="$datadir" +# Debian/Ubuntu: small boot speed improvement +. "#CONFIG_PREFIX#/ufw/ufw.conf" @@ -20,6 +33,6 @@ Index: ufw-0.31/src/ufw-init + exit 0 +fi + - if [ -s "#STATE_PREFIX#/ufw-init-functions" ]; then - . "#STATE_PREFIX#/ufw-init-functions" + if [ -s "${rootdir}#STATE_PREFIX#/ufw-init-functions" ]; then + . "${rootdir}#STATE_PREFIX#/ufw-init-functions" else diff --git a/meta-networking/recipes-connectivity/ufw/ufw/setup-add-an-option-to-specify-iptables-location.patch b/meta-networking/recipes-connectivity/ufw/ufw/0002-add-an-option-to-specify-iptables-location.patch index 5117423387..ee935eb615 100644 --- a/meta-networking/recipes-connectivity/ufw/ufw/setup-add-an-option-to-specify-iptables-location.patch +++ b/meta-networking/recipes-connectivity/ufw/ufw/0002-add-an-option-to-specify-iptables-location.patch @@ -1,6 +1,6 @@ -From c54d36d0582a60fd281cd9287077cea205fd849d Mon Sep 17 00:00:00 2001 -From: Joe MacDonald <joe_macdonald@mentor.com> -Date: Thu, 27 Nov 2014 15:20:34 -0500 +From 808577f8464f542076840d0d93fe168a5f79442c Mon Sep 17 00:00:00 2001 +From: Silcet <camorga1@gmail.com> +Date: Tue, 27 Apr 2021 05:40:03 +0000 Subject: [PATCH] setup: add an option to specify iptables location When cross-compiling it isn't certain that the location of iptables on the @@ -13,15 +13,19 @@ version of iptables to be used. Upstream-Status: Pending Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> + +The patch was imported from the OpenEmbedded git server +(git://git.openembedded.org/openembedded) as of commit id +2cc1bd9dd060f5002c2fde7aacba86fe230c12af. + +Signed-off-by: Silcet <camorga1@gmail.com> --- - setup.py | 69 ++++++++++++++++++++++++++++++++++++---------------------------- - 1 file changed, 39 insertions(+), 30 deletions(-) + setup.py | 65 ++++++++++++++++++++++++++++++++------------------------ + 1 file changed, 37 insertions(+), 28 deletions(-) -diff --git a/setup.py b/setup.py -index 6fb3751..b13d11c 100644 --- a/setup.py +++ b/setup.py -@@ -225,41 +225,50 @@ shutil.copytree('src', 'staging') +@@ -245,45 +245,50 @@ shutil.copytree('src', 'staging') os.unlink(os.path.join('staging', 'ufw-init')) os.unlink(os.path.join('staging', 'ufw-init-functions')) @@ -30,7 +34,11 @@ index 6fb3751..b13d11c 100644 iptables_dir = '' -for e in ['iptables']: -- for dir in ['/sbin', '/bin', '/usr/sbin', '/usr/bin', '/usr/local/sbin', \ +- # Historically iptables was in /sbin, then later also symlinked from +- # /usr/sbin/iptables to /sbin/iptables. Debian bullseye moves iptables +- # to /usr/sbin with no symlink in /sbin except on upgrades. To accomodate +- # buildds that may still have the old iptables, search /usr/sbin first +- for dir in ['/usr/sbin', '/sbin', '/usr/bin', '/bin', '/usr/local/sbin', \ - '/usr/local/bin']: - if e == "iptables": - if os.path.exists(os.path.join(dir, e)): @@ -61,7 +69,7 @@ index 6fb3751..b13d11c 100644 + +if not iptables_set: + for e in ['iptables']: -+ for dir in ['/sbin', '/bin', '/usr/sbin', '/usr/bin', '/usr/local/sbin', \ ++ for dir in ['/usr/sbin', '/sbin', '/usr/bin', '/bin', '/usr/local/sbin', \ + '/usr/local/bin']: + if e == "iptables": + if os.path.exists(os.path.join(dir, e)): @@ -102,6 +110,3 @@ index 6fb3751..b13d11c 100644 setup (name='ufw', version=ufw_version, --- -1.9.1 - diff --git a/meta-networking/recipes-connectivity/ufw/ufw/0002-lp1044361.patch b/meta-networking/recipes-connectivity/ufw/ufw/0002-lp1044361.patch deleted file mode 100644 index 804c18bc9e..0000000000 --- a/meta-networking/recipes-connectivity/ufw/ufw/0002-lp1044361.patch +++ /dev/null @@ -1,118 +0,0 @@ -Origin: r795, r796 -Description: move netfilter capabilities checking into initcaps(), and call - initcaps() only when we need it. -Bug-Ubuntu: https://launchpad.net/bugs/1044361 - -Upstream-Status: Inappropriate [ not author ] - -Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> - -Index: ufw-0.33/src/backend_iptables.py -=================================================================== ---- ufw-0.33.orig/src/backend_iptables.py 2012-09-23 09:58:34.000000000 -0500 -+++ ufw-0.33/src/backend_iptables.py 2012-09-23 09:58:36.000000000 -0500 -@@ -160,6 +160,9 @@ - out += "> " + _("Checking raw ip6tables\n") - return out - -+ # Initialize the capabilities database -+ self.initcaps() -+ - args = ['-n', '-v', '-x', '-L'] - items = [] - items6 = [] -@@ -470,6 +473,9 @@ - if self.dryrun: - return False - -+ # Initialize the capabilities database -+ self.initcaps() -+ - prefix = "ufw" - exe = self.iptables - if v6: -@@ -684,6 +690,9 @@ - except Exception: - raise - -+ # Initialize the capabilities database -+ self.initcaps() -+ - chain_prefix = "ufw" - rules = self.rules - if v6: -@@ -830,6 +839,10 @@ - * updating user rules file - * reloading the user rules file if rule is modified - ''' -+ -+ # Initialize the capabilities database -+ self.initcaps() -+ - rstr = "" - - if rule.v6: -@@ -1073,6 +1086,9 @@ - if self.dryrun: - return - -+ # Initialize the capabilities database -+ self.initcaps() -+ - rules_t = [] - try: - rules_t = self._get_logging_rules(level) -Index: ufw-0.33/src/backend.py -=================================================================== ---- ufw-0.33.orig/src/backend.py 2012-09-23 09:58:34.000000000 -0500 -+++ ufw-0.33/src/backend.py 2012-09-23 09:59:03.000000000 -0500 -@@ -21,7 +21,7 @@ - import stat - import sys - import ufw.util --from ufw.util import warn, debug -+from ufw.util import error, warn, debug - from ufw.common import UFWError, config_dir, iptables_dir, UFWRule - import ufw.applications - -@@ -68,6 +68,17 @@ - err_msg = _("Couldn't determine iptables version") - raise UFWError(err_msg) - -+ # Initialize via initcaps only when we need it (LP: #1044361) -+ self.caps = None -+ -+ def initcaps(self): -+ '''Initialize the capabilities database. This needs to be called -+ before accessing the database.''' -+ -+ # Only initialize if not initialized already -+ if self.caps != None: -+ return -+ - self.caps = {} - self.caps['limit'] = {} - -@@ -78,14 +89,20 @@ - # Try to get capabilities from the running system if root - if self.do_checks and os.getuid() == 0 and not self.dryrun: - # v4 -- nf_caps = ufw.util.get_netfilter_capabilities(self.iptables) -+ try: -+ nf_caps = ufw.util.get_netfilter_capabilities(self.iptables) -+ except OSError as e: -+ error("initcaps\n%s" % e) - if 'recent-set' in nf_caps and 'recent-update' in nf_caps: - self.caps['limit']['4'] = True - else: - self.caps['limit']['4'] = False - - # v6 -- nf_caps = ufw.util.get_netfilter_capabilities(self.ip6tables) -+ try: -+ nf_caps = ufw.util.get_netfilter_capabilities(self.ip6tables) -+ except OSError as e: -+ error("initcaps\n%s" % e) - if 'recent-set' in nf_caps and 'recent-update' in nf_caps: - self.caps['limit']['6'] = True - else: diff --git a/meta-networking/recipes-connectivity/ufw/ufw/0003-fix-typeerror-on-error.patch b/meta-networking/recipes-connectivity/ufw/ufw/0003-fix-typeerror-on-error.patch deleted file mode 100644 index b259fdf781..0000000000 --- a/meta-networking/recipes-connectivity/ufw/ufw/0003-fix-typeerror-on-error.patch +++ /dev/null @@ -1,20 +0,0 @@ -Origin: r797 -Description: src/backend_iptables.py: fix misplaced parenthesis - -Upstream-Status: Inappropriate [ not author ] - -Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> - -Index: ufw-0.33/src/backend_iptables.py -=================================================================== ---- ufw-0.33.orig/src/backend_iptables.py 2012-09-24 08:51:13.000000000 -0500 -+++ ufw-0.33/src/backend_iptables.py 2012-09-24 08:52:00.000000000 -0500 -@@ -1075,7 +1075,7 @@ - exe = self.ip6tables - (rc, out) = cmd([exe] + args) - if rc != 0: -- err_msg = _("Could not perform '%s'") % (args) -+ err_msg = _("Could not perform '%s'" % (args)) - if fail_ok: - debug("FAILOK: " + err_msg) - else: diff --git a/meta-networking/recipes-connectivity/ufw/ufw/0003-only-make-one-reference-to-env.patch b/meta-networking/recipes-connectivity/ufw/ufw/0003-only-make-one-reference-to-env.patch new file mode 100644 index 0000000000..556d4459d0 --- /dev/null +++ b/meta-networking/recipes-connectivity/ufw/ufw/0003-only-make-one-reference-to-env.patch @@ -0,0 +1,73 @@ +From 42170d379eddc12bd2d1fe84dc268882d8eb4d64 Mon Sep 17 00:00:00 2001 +From: Silcet <camorga1@gmail.com> +Date: Mon, 3 May 2021 08:59:28 +0000 +Subject: [PATCH] setup: only make one reference to env + +If sys.executable happens to be '/usr/bin/env python' or something +similar, the setup script will result in 'ufw' getting /usr/bin/env +repeated on the top line. This causes an error at runtime. Perform a +quick sanity check on sys.executable before doing the substitution. + +While we're at it, change the default value of 'exe' to the one we either +detected or specified on the build line. + +Upstream-Status: Inappropriate [ embedded specific ] + +Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> + +The patch was imported from the OpenEmbedded git server +(git://git.openembedded.org/openembedded) as of commit id +2cc1bd9dd060f5002c2fde7aacba86fe230c12af. + +A previous change had modified the way the python shebang was updated to +follow the same version as the one used to call setup.py. However, it +used a regex that was not matching anymore. To fix this, the regex +condition is removed so the shebang line is substituted with the sys.executable +value. Later in the installation distutils finds the string with the path +of sys.executable and replaces it with "#! /usr/bin/env python3". + +Signed-off-by: Silcet <camorga1@gmail.com> +--- + setup.py | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +diff --git a/setup.py b/setup.py +index 2343bc9..f8a638b 100644 +--- a/setup.py ++++ b/setup.py +@@ -64,7 +64,7 @@ class Install(_install, object): + real_sharedir = os.path.join(real_prefix, 'share', 'ufw') + + # Update the modules' paths +- for fn in [ 'common.py' ]: ++ for fn in [ 'common.py', 'util.py' ]: + # 'staging' is used with just 'install' but build_lib is used when + # using 'build'. We could probably override 'def build()' but this + # at least works +@@ -97,6 +97,12 @@ class Install(_install, object): + "-i", + "s%#SHARE_DIR#%" + real_sharedir + "%g", + f]) ++ ++ subprocess.call(["sed", ++ "-i.jjm", ++ "s%/sbin/iptables%" + iptables_exe + "%g", ++ f]) ++ + + if fn == 'common.py' and 'UFW_SKIP_CHECKS' in os.environ and \ + os.environ['UFW_SKIP_CHECKS'] != '': +@@ -123,10 +129,12 @@ class Install(_install, object): + self.mkpath(os.path.dirname(f)) + + # update the interpreter to that of the one the user specified for setup ++ # Distutils searches for the string of sys.executable and replaces it ++ # with the "#! /usr/bin/env pythonX" shebang on a later step + print("Updating staging/ufw to use %s" % (sys.executable)) + subprocess.call(["sed", + "-i", +- "1s%^#.*python.*%#! /usr/bin/env " + sys.executable + "%g", ++ "1s%/.*python.*%" + sys.executable + "%g", + 'staging/ufw']) + self.copy_file('staging/ufw', script) + self.copy_file('doc/ufw.8', manpage) diff --git a/meta-networking/recipes-connectivity/ufw/ufw/0004-lp1039729.patch b/meta-networking/recipes-connectivity/ufw/ufw/0004-lp1039729.patch deleted file mode 100644 index 695b265671..0000000000 --- a/meta-networking/recipes-connectivity/ufw/ufw/0004-lp1039729.patch +++ /dev/null @@ -1,40 +0,0 @@ -Origin: r803, r804 -Description: Don't call get_netfilter_capabilities() with ipv6 if ipv6 is - disabled. -Bug-Ubuntu: https://launchpad.net/ufw/bugs/1039729 - -Upstream-Status: Inappropriate [ not author ] - -Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> - -Index: ufw-0.33/src/backend.py -=================================================================== ---- ufw-0.33.orig/src/backend.py 2012-12-04 09:21:57.000000000 -0600 -+++ ufw-0.33/src/backend.py 2012-12-04 09:22:40.000000000 -0600 -@@ -98,15 +98,17 @@ - else: - self.caps['limit']['4'] = False - -- # v6 -- try: -- nf_caps = ufw.util.get_netfilter_capabilities(self.ip6tables) -- except OSError as e: -- error("initcaps\n%s" % e) -- if 'recent-set' in nf_caps and 'recent-update' in nf_caps: -- self.caps['limit']['6'] = True -- else: -- self.caps['limit']['6'] = False -+ # v6 (skip capabilities check for ipv6 if ipv6 is disabled in ufw -+ # because the system may not have ipv6 support (LP: #1039729) -+ if self.use_ipv6(): -+ try: -+ nf_caps = ufw.util.get_netfilter_capabilities(self.ip6tables) -+ except OSError as e: -+ error("initcaps\n%s" % e) -+ if 'recent-set' in nf_caps and 'recent-update' in nf_caps: -+ self.caps['limit']['6'] = True -+ else: -+ self.caps['limit']['6'] = False - - def is_enabled(self): - '''Is firewall configured as enabled''' diff --git a/meta-networking/recipes-connectivity/ufw/ufw/0005-lp1191197.patch b/meta-networking/recipes-connectivity/ufw/ufw/0005-lp1191197.patch deleted file mode 100644 index b760d3fd33..0000000000 --- a/meta-networking/recipes-connectivity/ufw/ufw/0005-lp1191197.patch +++ /dev/null @@ -1,32 +0,0 @@ -Origin: r816 -Description: add check for -m rt --rt-type 0 -Bug-Ubuntu: https://launchpad.net/bugs/1191197 -Forwarded: yes - -Upstream-Status: Inappropriate [ not author ] - -Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> - -Index: ufw-0.33/tests/check-requirements -=================================================================== ---- ufw-0.33.orig/tests/check-requirements 2012-08-17 16:12:49.000000000 -0500 -+++ ufw-0.33/tests/check-requirements 2013-06-15 07:47:00.000000000 -0500 -@@ -3,7 +3,7 @@ - # check-requirements: verify all the required iptables functionality is - # available - # --# Copyright 2008-2012 Canonical Ltd. -+# Copyright 2008-2013 Canonical Ltd. - # - # This program is free software: you can redistribute it and/or modify - # it under the terms of the GNU General Public License version 3, -@@ -218,6 +218,9 @@ - echo -n "icmpv6 with hl ($j): " - runcmd $exe -A $c -p icmpv6 --icmpv6-type $j -m hl --hl-eq 255 -j ACCEPT - done -+ -+ echo -n "ipv6 rt: " -+ runcmd $exe -A $c -m rt --rt-type 0 -j ACCEPT - fi - - echo "" diff --git a/meta-networking/recipes-connectivity/ufw/ufw/setup-only-make-one-reference-to-env.patch b/meta-networking/recipes-connectivity/ufw/ufw/setup-only-make-one-reference-to-env.patch deleted file mode 100644 index ff704b5a46..0000000000 --- a/meta-networking/recipes-connectivity/ufw/ufw/setup-only-make-one-reference-to-env.patch +++ /dev/null @@ -1,77 +0,0 @@ -From be53eea06a5655fdc98f47a73be8277b65bb42ed Mon Sep 17 00:00:00 2001 -From: Joe MacDonald <joe_macdonald@mentor.com> -Date: Tue, 11 Nov 2014 21:41:14 -0500 -Subject: [PATCH] setup: only make one reference to env - -If sys.executable happens to be '/usr/bin/env python' or something -similar, the setup script will result in 'ufw' getting /usr/bin/env -repeated on the top line. This causes an error at runtime. Perform a -quick sanity check on sys.executable before doing the substitution. - -While we're at it, change the default value of 'exe' to the one we either -detected or specified on the build line. - -Upstream-Status: Inappropriate [ embedded specific ] - -Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> ---- - setup.py | 34 ++++++++++++++++++++++++++++------ - 1 file changed, 28 insertions(+), 6 deletions(-) - -diff --git a/setup.py b/setup.py -index b13d11c..73acdef 100644 ---- a/setup.py -+++ b/setup.py -@@ -64,7 +64,7 @@ class Install(_install, object): - real_sharedir = os.path.join(real_prefix, 'share', 'ufw') - - # Update the modules' paths -- for file in [ 'common.py' ]: -+ for file in [ 'common.py', 'util.py' ]: - print("Updating " + file) - subprocess.call(["sed", - "-i", -@@ -91,6 +91,11 @@ class Install(_install, object): - "s%#SHARE_DIR#%" + real_sharedir + "%g", - os.path.join('staging', file)]) - -+ subprocess.call(["sed", -+ "-i.jjm", -+ "s%/sbin/iptables%" + iptables_exe + "%g", -+ os.path.join('staging', file)]) -+ - # Now byte-compile everything - super(Install, self).run() - -@@ -107,12 +112,23 @@ class Install(_install, object): - for f in [ script, manpage, manpage_f ]: - self.mkpath(os.path.dirname(f)) - -+ # if sys.executable == /usr/bin/env python* the result will be the top -+ # of ufw getting: -+ # -+ # #! /usr/bin/env /usr/bin/env python -+ # -+ # which is not ideal -+ # - # update the interpreter to that of the one the user specified for setup -- print("Updating staging/ufw to use %s" % (sys.executable)) -- subprocess.call(["sed", -- "-i", -- "1s%^#.*python.*%#! /usr/bin/env " + sys.executable + "%g", -- 'staging/ufw']) -+ print("Updating staging/ufw to use (%s)" % (sys.executable)) -+ -+ if re.search("(/usr/bin/env)", sys.executable): -+ print("found 'env' in sys.executable (%s)" % (sys.executable)) -+ subprocess.call(["sed", -+ "-i.jjm", -+ "1s%^#.*python.*%#! " + sys.executable + "%g", -+ 'staging/ufw']) -+ - self.copy_file('staging/ufw', script) - self.copy_file('doc/ufw.8', manpage) - self.copy_file('doc/ufw-framework.8', manpage_f) --- -1.9.1 - diff --git a/meta-networking/recipes-connectivity/ufw/ufw/setuptools.patch b/meta-networking/recipes-connectivity/ufw/ufw/setuptools.patch new file mode 100644 index 0000000000..ad5391cb98 --- /dev/null +++ b/meta-networking/recipes-connectivity/ufw/ufw/setuptools.patch @@ -0,0 +1,20 @@ +Move to setuptools as distutils is now deprecated. + +Upstream-Status: Submitted [https://code.launchpad.net/~tgamblin/ufw/distutils-to-setuptools] +Signed-off-by: Ross Burton <ross.burton@arm.com> + +diff --git a/setup.py b/setup.py +index cb67a6a..de648d3 100644 +--- a/setup.py ++++ b/setup.py +@@ -25,8 +25,8 @@ + # + + from __future__ import print_function +-from distutils.command.install import install as _install +-from distutils.core import setup ++from setuptools.command.install import install as _install ++from setuptools import setup + import errno + import os + import re diff --git a/meta-networking/recipes-connectivity/ufw/ufw_0.33.bb b/meta-networking/recipes-connectivity/ufw/ufw_0.33.bb deleted file mode 100644 index 19cfe46b7b..0000000000 --- a/meta-networking/recipes-connectivity/ufw/ufw_0.33.bb +++ /dev/null @@ -1,56 +0,0 @@ -SUMMARY = "Uncomplicated Firewall" -DESCRIPTION = "UFW stands for Uncomplicated Firewall, and is program for \ -managing a netfilter firewall. It provides a command line interface and aims \ -to be uncomplicated and easy to use." -HOMEPAGE = "https://launchpad.net/ufw" -SECTION = "net" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" - -SRC_URI = " \ - https://launchpad.net/ufw/0.33/0.33/+download/ufw-0.33.tar.gz \ - file://setup-add-an-option-to-specify-iptables-location.patch \ - file://setup-only-make-one-reference-to-env.patch \ - file://0001-optimize-boot.patch \ - file://0002-lp1044361.patch \ - file://0003-fix-typeerror-on-error.patch \ - file://0004-lp1039729.patch \ - file://0005-lp1191197.patch \ -" -SRC_URI[md5sum] = "3747b453d76709e5a99da209fc0bb5f5" -SRC_URI[sha256sum] = "5f85a8084ad3539b547bec097286948233188c971f498890316dec170bdd1da8" - -inherit setuptools distro_features_check - -RDEPENDS_${PN} = " \ - iptables \ - python \ - python-modules \ - " - -RRECOMMENDS_${PN} = " \ - kernel-module-ipv6 \ - kernel-module-nf-conntrack-ipv6 \ - kernel-module-nf-log-common \ - kernel-module-nf-log-ipv4 \ - kernel-module-nf-log-ipv6 \ - kernel-module-nf-addrtype \ - kernel-module-nf-limit \ - kernel-module-nf-log \ - kernel-module-nf-recent \ -" - -# Certain items are explicitly put under /lib, not base_libdir when installed. -# -FILES_${PN} += " \ - ${sbindir}/* \ - ${datadir}/ufw/* \ - /lib/ufw/* \ - ${sysconfdir}/ufw/* \ - ${sysconfdir}/default/ufw \ -" - -REQUIRED_DISTRO_FEATURES = "ipv6" - -DISTUTILS_BUILD_ARGS_append = " --iptables-dir /usr/sbin" -DISTUTILS_INSTALL_ARGS_append = " --iptables-dir /usr/sbin" diff --git a/meta-networking/recipes-connectivity/ufw/ufw_0.36.1.bb b/meta-networking/recipes-connectivity/ufw/ufw_0.36.1.bb new file mode 100644 index 0000000000..c479eefba0 --- /dev/null +++ b/meta-networking/recipes-connectivity/ufw/ufw_0.36.1.bb @@ -0,0 +1,74 @@ + +SUMMARY = "Uncomplicated Firewall" +DESCRIPTION = "UFW stands for Uncomplicated Firewall, and is program for \ +managing a netfilter firewall. It provides a command line interface and aims \ +to be uncomplicated and easy to use." +HOMEPAGE = "https://launchpad.net/ufw" +SECTION = "net" +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" + +SRC_URI = "https://launchpad.net/ufw/0.36/0.36.1/+download/ufw-0.36.1.tar.gz \ + file://0001-optimize-boot.patch \ + file://0002-add-an-option-to-specify-iptables-location.patch \ + file://0003-only-make-one-reference-to-env.patch \ + file://setuptools.patch \ + " +SRC_URI[sha256sum] = "1c57e78fbf2970f0cc9c56ea87a231e6d83d825e55b9e31e2c88b91b0ea03c8c" + +UPSTREAM_CHECK_URI = "https://launchpad.net/ufw" + +inherit setuptools3_legacy features_check systemd update-rc.d + +RDEPENDS:${PN} = " \ + iptables \ + python3 \ + python3-modules \ + " + +RRECOMMENDS:${PN} = " \ + kernel-module-ipv6 \ + kernel-module-nf-conntrack-ipv6 \ + kernel-module-nf-log-common \ + kernel-module-nf-log-ipv4 \ + kernel-module-nf-log-ipv6 \ + kernel-module-nf-addrtype \ + kernel-module-nf-limit \ + kernel-module-nf-log \ + kernel-module-nf-recent \ +" + + +do_configure:prepend() { + if ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','true','false',d)}; then + sed -i -e 's|/lib|${nonarch_base_libdir}|' ${S}/setup.py + fi +} + +do_install:append() { + install -d ${D}${systemd_unitdir}/system/ + install -m 0644 ${S}/doc/systemd.example ${D}${systemd_unitdir}/system/ufw.service + + install -d ${D}${sysconfdir}/init.d/ + install -m 0755 ${S}/doc/initscript.example ${D}${sysconfdir}/init.d/ufw +} + +SYSTEMD_SERVICE:${PN} = "ufw.service" + +INITSCRIPT_NAME = "ufw" +INITSCRIPT_PARAMS = "defaults" + +# Certain items are explicitly put under /lib, not base_libdir when installed. +# +FILES:${PN} += " \ + ${sbindir}/* \ + ${datadir}/ufw/* \ + ${nonarch_base_libdir}/ufw/* \ + ${sysconfdir}/ufw/* \ + ${sysconfdir}/default/ufw \ +" + +REQUIRED_DISTRO_FEATURES = "ipv6" + +SETUPTOOLS_BUILD_ARGS:append = " --iptables-dir /usr/sbin" +SETUPTOOLS_INSTALL_ARGS:append = " --iptables-dir /usr/sbin" diff --git a/meta-networking/recipes-connectivity/vlan/vlan-1.9/no-HOME-includes.patch b/meta-networking/recipes-connectivity/vlan/vlan-1.9/no-HOME-includes.patch index b7ab7d97c8..fd7a14adc9 100644 --- a/meta-networking/recipes-connectivity/vlan/vlan-1.9/no-HOME-includes.patch +++ b/meta-networking/recipes-connectivity/vlan/vlan-1.9/no-HOME-includes.patch @@ -5,7 +5,7 @@ Subject: vlan: do not include ${HOME}/linux/include dir in front of sanitized kernel headers in OE chroot. Drop this include option. -Upstream-Status: not-applicable +Upstream-Status: Inappropriate [embedded specific] Index: vlan/MakeInclude =================================================================== diff --git a/meta-networking/recipes-connectivity/vlan/vlan_1.9.bb b/meta-networking/recipes-connectivity/vlan/vlan_1.9.bb index bd55efce27..b478692e39 100644 --- a/meta-networking/recipes-connectivity/vlan/vlan_1.9.bb +++ b/meta-networking/recipes-connectivity/vlan/vlan_1.9.bb @@ -1,10 +1,10 @@ SUMMARY = "VLAN provides vconfig utility" HOMEPAGE = "http://www.candelatech.com/~greear/vlan.html" SECTION = "misc" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://vconfig.c;beginline=1;endline=19;md5=094ca47de36c20c598b15b32c270ce0a" -SRC_URI = "http://${BPN}.sourcearchive.com/downloads/${PV}-3ubuntu9/${BPN}_${PV}.orig.tar.gz \ +SRC_URI = "https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/vlan/1.9-3ubuntu10.6/${BPN}_${PV}.orig.tar.gz \ file://no-HOME-includes.patch \ file://0001-Add-printf-format-and-silence-format-security-warnin.patch \ " @@ -12,21 +12,30 @@ SRC_URI = "http://${BPN}.sourcearchive.com/downloads/${PV}-3ubuntu9/${BPN}_${PV} SRC_URI[md5sum] = "5f0c6060b33956fb16e11a15467dd394" SRC_URI[sha256sum] = "3b8f0a1bf0d3642764e5f646e1f3bbc8b1eeec474a77392d9aeb4868842b4cca" +UPSTREAM_CHECK_URI = "http://vlan.sourcearchive.com/" +UPSTREAM_CHECK_REGEX = "/(?P<pver>\d+(\.\d+)+)/" + S = "${WORKDIR}/${BPN}" +inherit update-alternatives + EXTRA_OEMAKE = "-e MAKEFLAGS=" # comment out MakeInclude in Makefile which sets build environment -do_configure_append () { +do_configure:append () { sed -i 's/^ include/#^include/' ${S}/Makefile } # ignore strip to avoid yocto errors in stripping do_compile () { - oe_runmake PLATFORM=ARM 'STRIP=echo' all + oe_runmake PLATFORM=ARM 'STRIP=echo' CCFLAGS="${CFLAGS}" all } do_install () { install -d ${D}/${base_sbindir} install -m 0755 ${S}/vconfig ${D}/${base_sbindir}/ } + +ALTERNATIVE_PRIORITY = "100" +ALTERNATIVE:${PN} = "vconfig" +ALTERNATIVE_LINK_NAME[vconfig] = "${base_sbindir}/vconfig" diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/0001-search-for-log-help-in-build-dir.patch b/meta-networking/recipes-connectivity/vpnc/vpnc/0001-search-for-log-help-in-build-dir.patch index 184c7943b5..735edb582e 100644 --- a/meta-networking/recipes-connectivity/vpnc/vpnc/0001-search-for-log-help-in-build-dir.patch +++ b/meta-networking/recipes-connectivity/vpnc/vpnc/0001-search-for-log-help-in-build-dir.patch @@ -5,6 +5,8 @@ Subject: [PATCH 1/8] search for log-help in build dir Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + makeman.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/0002-Fix-vpnc-install-for-cross-compile.patch b/meta-networking/recipes-connectivity/vpnc/vpnc/0002-Fix-vpnc-install-for-cross-compile.patch index 6f00d3b894..6380804368 100644 --- a/meta-networking/recipes-connectivity/vpnc/vpnc/0002-Fix-vpnc-install-for-cross-compile.patch +++ b/meta-networking/recipes-connectivity/vpnc/vpnc/0002-Fix-vpnc-install-for-cross-compile.patch @@ -4,6 +4,8 @@ Date: Sun, 2 Dec 2012 02:16:54 +0100 Subject: [PATCH 2/8] Fix vpnc install for cross compile --- +Upstream-Status: Pending + Makefile | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/0003-error.h-is-specific-to-glibc-on-linux.patch b/meta-networking/recipes-connectivity/vpnc/vpnc/0003-error.h-is-specific-to-glibc-on-linux.patch index bb7730647b..60c28cef31 100644 --- a/meta-networking/recipes-connectivity/vpnc/vpnc/0003-error.h-is-specific-to-glibc-on-linux.patch +++ b/meta-networking/recipes-connectivity/vpnc/vpnc/0003-error.h-is-specific-to-glibc-on-linux.patch @@ -5,6 +5,8 @@ Subject: [PATCH 3/8] error.h is specific to glibc on linux Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + sysdep.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/0004-Use-pkgconfig-instead-of-libgcrypt-config.patch b/meta-networking/recipes-connectivity/vpnc/vpnc/0004-Use-pkgconfig-instead-of-libgcrypt-config.patch index f70a13898f..305e9aabb1 100644 --- a/meta-networking/recipes-connectivity/vpnc/vpnc/0004-Use-pkgconfig-instead-of-libgcrypt-config.patch +++ b/meta-networking/recipes-connectivity/vpnc/vpnc/0004-Use-pkgconfig-instead-of-libgcrypt-config.patch @@ -5,6 +5,8 @@ Subject: [PATCH 4/8] Use pkgconfig instead of libgcrypt-config Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/0005-include-sys-ttydefaults.h-for-CEOT-definition.patch b/meta-networking/recipes-connectivity/vpnc/vpnc/0005-include-sys-ttydefaults.h-for-CEOT-definition.patch index 01783f45b7..af63433c0f 100644 --- a/meta-networking/recipes-connectivity/vpnc/vpnc/0005-include-sys-ttydefaults.h-for-CEOT-definition.patch +++ b/meta-networking/recipes-connectivity/vpnc/vpnc/0005-include-sys-ttydefaults.h-for-CEOT-definition.patch @@ -10,6 +10,8 @@ config.c:146:25: error: use of undeclared identifier 'CEOT' Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + config.c | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/0006-sysdep-Add-header-include-sequence-to-adjust-for-mus.patch b/meta-networking/recipes-connectivity/vpnc/vpnc/0006-sysdep-Add-header-include-sequence-to-adjust-for-mus.patch index fa89df2796..664c73a713 100644 --- a/meta-networking/recipes-connectivity/vpnc/vpnc/0006-sysdep-Add-header-include-sequence-to-adjust-for-mus.patch +++ b/meta-networking/recipes-connectivity/vpnc/vpnc/0006-sysdep-Add-header-include-sequence-to-adjust-for-mus.patch @@ -4,6 +4,8 @@ Date: Wed, 29 Mar 2017 23:09:47 -0700 Subject: [PATCH 6/8] sysdep: Add header include sequence to adjust for musl --- +Upstream-Status: Pending + sysdep.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/0007-add-error-API-when-error.h-is-not-on-platform.patch b/meta-networking/recipes-connectivity/vpnc/vpnc/0007-add-error-API-when-error.h-is-not-on-platform.patch index de67b47a43..f7d7b0aec3 100644 --- a/meta-networking/recipes-connectivity/vpnc/vpnc/0007-add-error-API-when-error.h-is-not-on-platform.patch +++ b/meta-networking/recipes-connectivity/vpnc/vpnc/0007-add-error-API-when-error.h-is-not-on-platform.patch @@ -5,6 +5,8 @@ Subject: [PATCH 7/8] add error() API when error.h is not on platform sign-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + sysdep.c | 24 ++++++++++++++++++++++++ sysdep.h | 2 ++ 2 files changed, 26 insertions(+) diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/0008-include-sysdep.h-before-net-if_tun.h.patch b/meta-networking/recipes-connectivity/vpnc/vpnc/0008-include-sysdep.h-before-net-if_tun.h.patch index 62ffdb7c9f..6c63011997 100644 --- a/meta-networking/recipes-connectivity/vpnc/vpnc/0008-include-sysdep.h-before-net-if_tun.h.patch +++ b/meta-networking/recipes-connectivity/vpnc/vpnc/0008-include-sysdep.h-before-net-if_tun.h.patch @@ -7,6 +7,8 @@ Fixes duplicate defines in header errors Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + sysdep.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/0009-reduce-lifetime-value.patch b/meta-networking/recipes-connectivity/vpnc/vpnc/0009-reduce-lifetime-value.patch index 2bed550415..3da2efe479 100644 --- a/meta-networking/recipes-connectivity/vpnc/vpnc/0009-reduce-lifetime-value.patch +++ b/meta-networking/recipes-connectivity/vpnc/vpnc/0009-reduce-lifetime-value.patch @@ -12,6 +12,8 @@ don't. Reducing the lifetime from its current value to 28800 (exactly 8 hours) causes it to start working with fortigate devices. --- +Upstream-Status: Pending + vpnc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ea21799853..5876b58273 100644 --- a/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb +++ b/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb @@ -1,15 +1,14 @@ SUMMARY = "A client for the Cisco3000 VPN Concentrator" HOMEPAGE = "http://www.unix-ag.uni-kl.de/~massar/vpnc/" -AUTHOR = "Maurice Massar vpnc@unix-ag.uni-kl.de" SECTION = "net" -LICENSE = "GPL-2.0+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=173b74cb8ac640a9992c03f3bce22a33" DEPENDS += "libgcrypt" PV .= "r550-2jnpr1" SRCREV = "b1243d29e0c00312ead038b04a2cf5e2fa31d740" -SRC_URI = "git://github.com/ndpgroup/vpnc \ +SRC_URI = "git://github.com/ndpgroup/vpnc;branch=master;protocol=https \ file://long-help \ file://default.conf \ file://0001-search-for-log-help-in-build-dir.patch \ @@ -28,23 +27,25 @@ PACKAGECONFIG ?= "gnutls" PACKAGECONFIG[gnutls] = ",,gnutls" PACKAGECONFIG[openssl] = ",,openssl" +PACKAGES =+ "${PN}-script" + S = "${WORKDIR}/git" inherit perlnative pkgconfig #EXTRA_OEMAKE = "-e MAKEFLAGS=" -do_configure_append () { +do_configure:append () { # Make sure we use our nativeperl wrapper sed -i "1s:#!.*:#!/usr/bin/env nativeperl:" ${S}/*.pl - cp ${WORKDIR}/long-help ${S} + cp ${UNPACKDIR}/long-help ${S} } do_install () { sed -i s:m600:m\ 600:g Makefile oe_runmake 'DESTDIR=${D}' 'PREFIX=/usr' install rm -f ${D}${sysconfdir}/vpnc/vpnc.conf #This file is useless - install ${WORKDIR}/default.conf ${D}${sysconfdir}/vpnc/default.conf + install ${UNPACKDIR}/default.conf ${D}${sysconfdir}/vpnc/default.conf } SYSROOT_PREPROCESS_FUNCS += "vpnc_sysroot_preprocess" @@ -54,6 +55,8 @@ vpnc_sysroot_preprocess () { install -m 755 ${D}${sysconfdir}/vpnc/vpnc-script ${SYSROOT_DESTDIR}${sysconfdir}/vpnc } -CONFFILES_${PN} = "${sysconfdir}/vpnc/default.conf" -RDEPENDS_${PN} = "perl-module-io-file" -RRECOMMENDS_${PN} = "kernel-module-tun" +FILES:${PN}-script = "${sysconfdir}/vpnc/vpnc-script" + +CONFFILES:${PN} = "${sysconfdir}/vpnc/default.conf" +RDEPENDS:${PN} = "perl-module-io-file ${PN}-script" +RRECOMMENDS:${PN} = "kernel-module-tun" diff --git a/meta-networking/recipes-connectivity/wireless-regdb/wireless-regdb_2016.06.10.bb b/meta-networking/recipes-connectivity/wireless-regdb/wireless-regdb_2016.06.10.bb deleted file mode 100644 index 64e9401e7a..0000000000 --- a/meta-networking/recipes-connectivity/wireless-regdb/wireless-regdb_2016.06.10.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "Wireless Central Regulatory Domain Database" -HOMEPAGE = "http://wireless.kernel.org/en/developers/Regulatory/CRDA" -SECTION = "net" -LICENSE = "ISC" -LIC_FILES_CHKSUM = "file://LICENSE;md5=07c4f6dea3845b02a18dc00c8c87699c" - -SRC_URI = "https://www.kernel.org/pub/software/network/${BPN}/${BP}.tar.xz" -SRC_URI[md5sum] = "d282cce92b6e692e8673e2bd97adf33b" -SRC_URI[sha256sum] = "cfedf1c3521b3c8f32602f25ed796e96e687c3441a00e7c050fedf7fd4f1b8b7" - -inherit bin_package - -do_install() { - install -d -m0755 ${D}${libdir}/crda - install -d -m0755 ${D}${sysconfdir}/wireless-regdb/pubkeys - install -m 0644 regulatory.bin ${D}${libdir}/crda/regulatory.bin - install -m 0644 sforshee.key.pub.pem ${D}${sysconfdir}/wireless-regdb/pubkeys/sforshee.key.pub.pem -} - -RSUGGESTS_${PN} = "crda" diff --git a/meta-networking/recipes-connectivity/wolfssl/files/0001-fix-no-rule-to-make-cyassl-options.h.patch b/meta-networking/recipes-connectivity/wolfssl/files/0001-fix-no-rule-to-make-cyassl-options.h.patch deleted file mode 100644 index f304d933da..0000000000 --- a/meta-networking/recipes-connectivity/wolfssl/files/0001-fix-no-rule-to-make-cyassl-options.h.patch +++ /dev/null @@ -1,27 +0,0 @@ -From fb490136cf8f2456cfe13b0b4f796e6c155e75dc Mon Sep 17 00:00:00 2001 -From: Dengke Du <dengke.du@windriver.com> -Date: Wed, 30 Aug 2017 03:02:32 -0400 -Subject: [PATCH] fix no rule to make cyassl/options.h - -Upstream-Status: Pending - -Signed-off-by: Dengke Du <dengke.du@windriver.com> ---- - configure.ac | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/configure.ac b/configure.ac -index 395d75d..d4a3880 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3684,6 +3684,7 @@ AC_CONFIG_FILES([wolfssl/options.h]) - #fi - AC_CONFIG_FILES([support/wolfssl.pc]) - AC_CONFIG_FILES([rpm/spec]) -+AC_CONFIG_FILES([cyassl/options.h]) - - AX_CREATE_GENERIC_CONFIG - AX_AM_JOBSERVER([yes]) --- -2.8.1 - diff --git a/meta-networking/recipes-connectivity/wolfssl/wolfssl_3.12.0.bb b/meta-networking/recipes-connectivity/wolfssl/wolfssl_3.12.0.bb deleted file mode 100644 index 512619098a..0000000000 --- a/meta-networking/recipes-connectivity/wolfssl/wolfssl_3.12.0.bb +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "wolfSSL Lightweight, Embedded SSL Library" -DESCRIPTION = "wolfSSL, formerly CyaSSL, is a lightweight SSL library written in C and \ - optimized for embedded and RTOS environments. It can be \ - Up to 20 times smaller than OpenSSL while still supporting \ - a full TLS 1.2 client and server." -HOMEPAGE = "http://www.wolfssl.com/yaSSL/Products-wolfssl.html" -BUGTRACKER = "http://github.com/wolfssl/wolfssl/issues" -SECTION = "libs" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -PROVIDES += "cyassl" -RPROVIDES_${PN} = "cyassl" - -SRC_URI = "https://github.com/wolfSSL/wolfssl/archive/v${PV}-stable.zip \ - file://0001-fix-no-rule-to-make-cyassl-options.h.patch \ - " - -SRC_URI[md5sum] = "f9caf558169ab650dc8200708799ebeb" -SRC_URI[sha256sum] = "b6d87d3e2c8757177d69aff373c91cf162f4a3944fae90fa10d086fd5f9542e7" - -S = "${WORKDIR}/wolfssl-${PV}-stable" - -inherit autotools - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" -PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," diff --git a/meta-networking/recipes-connectivity/wolfssl/wolfssl_5.7.0.bb b/meta-networking/recipes-connectivity/wolfssl/wolfssl_5.7.0.bb new file mode 100644 index 0000000000..47c14dd1a1 --- /dev/null +++ b/meta-networking/recipes-connectivity/wolfssl/wolfssl_5.7.0.bb @@ -0,0 +1,22 @@ +SUMMARY = "wolfSSL Lightweight Embedded SSL/TLS Library" +DESCRIPTION = "wolfSSL, formerly CyaSSL, is a lightweight SSL library written \ + in C and optimized for embedded and RTOS environments. It can \ + be up to 20 times smaller than OpenSSL while still supporting \ + a full TLS client and server, up to TLS 1.3" +HOMEPAGE = "https://www.wolfssl.com/products/wolfssl" +BUGTRACKER = "https://github.com/wolfssl/wolfssl/issues" +SECTION = "libs" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +PROVIDES += "cyassl" +RPROVIDES:${PN} = "cyassl" + +SRC_URI = "git://github.com/wolfSSL/wolfssl.git;protocol=https;branch=master" +SRCREV = "8970ff4c34034dbb3594943d11f8c9d4c5512bd5" + +S = "${WORKDIR}/git" + +inherit autotools + +BBCLASSEXTEND += "native nativesdk" diff --git a/meta-networking/recipes-core/images/meta-networking-image-all.bb b/meta-networking/recipes-core/images/meta-networking-image-all.bb new file mode 100644 index 0000000000..20d3271c94 --- /dev/null +++ b/meta-networking/recipes-core/images/meta-networking-image-all.bb @@ -0,0 +1,3 @@ +require recipes-core/images/core-image-base.bb + +IMAGE_INSTALL += "packagegroup-meta-networking" diff --git a/meta-networking/recipes-core/images/meta-networking-image-ptest-all.bb b/meta-networking/recipes-core/images/meta-networking-image-ptest-all.bb new file mode 100644 index 0000000000..6d96d4a876 --- /dev/null +++ b/meta-networking/recipes-core/images/meta-networking-image-ptest-all.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "Recipe to trigger execution of all meta-networking ptest images." +HOMEPAGE = "https://www.openembedded.org/" + +LICENSE = "MIT" + +inherit features_check nopackages +REQUIRED_DISTRO_FEATURES = "ptest" + +require conf/include/ptest-packagelists-meta-networking.inc + +# Include the full set of ptests +PTESTS_META_NETWORKING = "${PTESTS_FAST_META_NETWORKING} ${PTESTS_SLOW_META_NETWORKING} ${PTESTS_PROBLEMS_META_NETWORKING}" + +do_testimage[noexec] = "1" +do_testimage[depends] = "${@' '.join(['meta-networking-image-ptest-'+x+':do_testimage' for x in d.getVar('PTESTS_META_NETWORKING').split()])}" + +do_build[depends] = "${@' '.join(['meta-networking-image-ptest-'+x+':do_build' for x in d.getVar('PTESTS_META_NETWORKING').split()])}" + +# normally image.bbclass would do this +EXCLUDE_FROM_WORLD = "1" + +python () { + if bb.utils.contains('IMAGE_CLASSES', 'testimage', True, False, d): + bb.build.addtask("do_testimage", "", "", d) +} diff --git a/meta-networking/recipes-core/images/meta-networking-image-ptest-fast.bb b/meta-networking/recipes-core/images/meta-networking-image-ptest-fast.bb new file mode 100644 index 0000000000..9f46ac8c1d --- /dev/null +++ b/meta-networking/recipes-core/images/meta-networking-image-ptest-fast.bb @@ -0,0 +1,5 @@ +require meta-networking-image-ptest-all.bb + +DESCRIPTION = "Recipe to trigger execution of all fast meta-networking ptest images." + +PTESTS_META_NETWORKING = "${PTESTS_FAST_META_NETWORKING}" diff --git a/meta-networking/recipes-core/images/meta-networking-image-ptest.bb b/meta-networking/recipes-core/images/meta-networking-image-ptest.bb new file mode 100644 index 0000000000..295da982ec --- /dev/null +++ b/meta-networking/recipes-core/images/meta-networking-image-ptest.bb @@ -0,0 +1,41 @@ +inherit features_check +REQUIRED_DISTRO_FEATURES = "ptest" + +require recipes-core/images/core-image-minimal.bb +require conf/include/ptest-packagelists-meta-networking.inc + +SUMMARY = "meta-networking ptest test image" + +DESCRIPTION += "Also including the ${MCNAME} ptest package." +HOMEPAGE = "https://www.openembedded.org/" + +PTESTS_META_NETWORKING = "${PTESTS_SLOW_META_NETWORKING} ${PTESTS_FAST_META_NETWORKING} ${PTESTS_PROBLEMS_META_NETWORKING}" + +IMAGE_INSTALL:append = " ${MCNAME}-ptest openssh" + +BBCLASSEXTEND = "${@' '.join(['mcextend:'+x for x in d.getVar('PTESTS_META_NETWORKING').split()])}" + +# The image can be sufficiently large (~1.8GB) that we need to be careful that it fits in a live +# image (which has a 4GB limit), so nullify the overhead factor (1.3x out of the +# box) and explicitly add up to 1500MB. +IMAGE_OVERHEAD_FACTOR = "1.0" +IMAGE_ROOTFS_EXTRA_SPACE = "324288" +# If a particular ptest needs more space, it can be customized: +#IMAGE_ROOTFS_EXTRA_SPACE:virtclass-mcextend-<pn> = "1024288" + +# ptests need more memory than standard to avoid the OOM killer +QB_MEM = "-m 1024" +# If a particular ptest needs more memroy, it can be customized: +#QB_MEM:virtclass-mcextend-<pn> = "-m 4096" +QB_MEM:virtclass-mcextend-nftables = "-m 2048" + +TEST_SUITES = "ping ssh parselogs ptest" + +# Sadly at the moment the full set of ptests is not robust enough and sporadically fails in random places +PTEST_EXPECT_FAILURE = "1" + +python () { + if not d.getVar("MCNAME"): + raise bb.parse.SkipRecipe("No class extension set") +} + diff --git a/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb b/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb new file mode 100644 index 0000000000..2e3aa54411 --- /dev/null +++ b/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb @@ -0,0 +1,253 @@ +SUMMARY = "Meta-networking packagegroups" + +PACKAGE_ARCH = "${MACHINE_ARCH}" +inherit packagegroup + +PROVIDES = "${PACKAGES}" +PACKAGES = ' \ + packagegroup-meta-networking \ + packagegroup-meta-networking-connectivity \ + packagegroup-meta-networking-daemons \ + packagegroup-meta-networking-devtools \ + packagegroup-meta-networking-extended \ + packagegroup-meta-networking-filter \ + packagegroup-meta-networking-irc \ + packagegroup-meta-networking-kernel \ + packagegroup-meta-networking-protocols \ + packagegroup-meta-networking-support \ +' + +RDEPENDS:packagegroup-meta-networking = "\ + packagegroup-meta-networking-connectivity \ + packagegroup-meta-networking-daemons \ + packagegroup-meta-networking-devtools \ + packagegroup-meta-networking-extended \ + packagegroup-meta-networking-filter \ + packagegroup-meta-networking-irc \ + packagegroup-meta-networking-kernel \ + packagegroup-meta-networking-protocols \ + packagegroup-meta-networking-support \ + " + +RDEPENDS:packagegroup-meta-networking-connectivity = "\ + daq \ + adcli \ + ${@bb.utils.contains("DISTRO_FEATURES", "bluetooth x11", "blueman", "", d)} \ + cannelloni \ + civetweb \ + libdnet \ + dibbler-client \ + dibbler-relay \ + dibbler-server \ + relayd \ + lftp \ + sethdlc \ + snort \ + ufw \ + vlan \ + vpnc \ + ez-ipupdate \ + ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python", "firewalld", "", d)} \ + freeradius \ + mbedtls \ + miniupnpd \ + mosquitto \ + nanomsg \ + nng \ + networkmanager-openvpn \ + networkmanager \ + openconnect \ + python3-networkmanager \ + rdate \ + rdist \ + ${@bb.utils.contains("DISTRO_FEATURES", "pam", "samba", "", d)} \ + wolfssl \ + autossh \ + bearssl \ + dhcp-relay \ +" + +RDEPENDS:packagegroup-meta-networking-connectivity:remove:libc-musl = "rdist" + +RDEPENDS:packagegroup-meta-networking-daemons = "\ + atftp \ + autofs \ + cyrus-sasl \ + ippool \ + iscsi-initiator-utils \ + lldpd \ + ncftp \ + igmpproxy \ + postfix \ + proftpd \ + ptpd \ + pure-ftpd \ + radvd \ + squid \ + tftp-hpa \ + tftp-hpa-server \ + vblade \ + vsftpd \ + keepalived \ + ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "networkd-dispatcher", "", d)} \ + openhpi \ + opensaf \ +" + +RDEPENDS:packagegroup-meta-networking-daemons:remove:libc-musl = "opensaf" + +RDEPENDS:packagegroup-meta-networking-devtools = "\ + python3-scapy \ +" + +RDEPENDS:packagegroup-meta-networking-extended = "\ + corosync \ + ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "dlm", "", d)} \ + kronosnet \ +" + +RDEPENDS:packagegroup-meta-networking-filter = "\ + libnftnl \ + conntrack-tools \ + ebtables \ + ipset \ + libnetfilter-acct \ + libnetfilter-conntrack \ + libnetfilter-cthelper \ + libnetfilter-cttimeout \ + libnetfilter-log \ + libnetfilter-queue \ + libnfnetlink \ + arno-iptables-firewall \ + nfacct \ + nftables \ +" + +RDEPENDS:packagegroup-meta-networking-irc = "\ + weechat \ + znc \ +" + +RDEPENDS:packagegroup-meta-networking-kernel = "\ + wireguard-tools \ +" + +RDEPENDS:packagegroup-meta-networking-protocols = "\ + babeld \ + ${@bb.utils.contains("DISTRO_FEATURES", "pam", "dante", "", d)} \ + freediameter \ + frr \ + net-snmp \ + openflow \ + openflow \ + openl2tp \ + mdns \ + nopoll \ + radiusclient-ng \ + tsocks \ + openlldp \ + zeroconf \ + pptp-linux \ + rp-pppoe \ + usrsctp \ + xl2tpd \ +" + +RDEPENDS:packagegroup-meta-networking-support = "\ + aoetools \ + arptables \ + bmon \ + bridge-utils \ + celt051 \ + cim-schema-docs \ + cim-schema-final \ + cifs-utils \ + dnsmasq \ + curlpp \ + drbd-utils \ + dovecot \ + fping \ + esmtp \ + fetchmail \ + geoip-perl \ + geoip \ + geoipupdate \ + fwknop \ + htpdate \ + http-parser \ + iftop \ + ifmetric \ + ipvsadm \ + libesmtp \ + ${@bb.utils.contains("DISTRO_FEATURES", "pam", "libldb", "", d)} \ + libmemcached \ + libtalloc \ + ipcalc \ + libtevent \ + linux-atm \ + lksctp-tools \ + mctp \ + memcached \ + ifenslave \ + netcat \ + netcat-openbsd \ + libtdb \ + ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "non-commercial", "netperf", "", d)} \ + yp-tools \ + ypbind-mt \ + yp-tools \ + mtr \ + netsniff-ng \ + ntp sntp ntpdc ntpq ntp-tickadj ntp-utils \ + ${@bb.utils.contains("DISTRO_FEATURES", "x11", "ntpsec", "", d)} \ + nbd-client \ + nbd-server \ + nbd-trplay \ + nbd-trdump \ + openvpn \ + macchanger \ + nbdkit \ + ssmping \ + libmaxminddb \ + libowfat \ + ncp \ + strongswan \ + ndisc6 \ + tcpdump \ + tcpslice \ + netcf \ + tnftp \ + traceroute \ + tunctl \ + wireshark \ + ndpi \ + ntopng \ + nuttcp \ + open-isns \ + openipmi \ + phytool \ + pimd \ + ruli \ + smcroute \ + ${@bb.utils.contains_any("TRANSLATED_TARGET_ARCH", "i586 x86-64", "spice-protocol spice", "", d)} \ + usbredir \ + ssmtp \ + stunnel \ + rdma-core \ + tcpreplay \ + tinyproxy \ + uftp \ + unbound \ + vnstat \ + wpan-tools \ + ettercap \ + libcpr \ +" +RDEPENDS:packagegroup-meta-networking-support:remove:mipsarch = "memcached" +RDEPENDS:packagegroup-meta-networking-support:remove:riscv64 = "memcached" +RDEPENDS:packagegroup-meta-networking-support:remove:libc-musl = "ypbind-mt" + +EXCLUDE_FROM_WORLD = "1" +# Empty packages, only devel headers and libs +# nngpp +# Use ntp and not chrony or ntimed diff --git a/meta-networking/recipes-daemons/atftp/atftp/0001-argz.h-fix-musl-compile-add-missing-defines.patch b/meta-networking/recipes-daemons/atftp/atftp/0001-argz.h-fix-musl-compile-add-missing-defines.patch deleted file mode 100644 index cfa8a7325f..0000000000 --- a/meta-networking/recipes-daemons/atftp/atftp/0001-argz.h-fix-musl-compile-add-missing-defines.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 543e67919f5cacf309ac88ab091331e41af4224b Mon Sep 17 00:00:00 2001 -From: Peter Seiderer <ps.report@gmx.net> -Date: Thu, 16 Apr 2015 22:41:57 +0200 -Subject: [PATCH] argz.h: fix musl compile (add missing defines) - -Upstream-Status: Pending - -Add __THROW, __BEGIN_DECLS, __END_DECLS and __attribute_pure__ defines. - -Signed-off-by: Peter Seiderer <ps.report@gmx.net> -Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com> ---- - argz.h | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - -diff --git a/argz.h b/argz.h -index 582be55..bdf9f62 100644 ---- a/argz.h -+++ b/argz.h -@@ -48,6 +48,22 @@ - # define __const const - #endif - -+#ifndef __THROW -+# define __THROW -+#endif -+ -+#ifndef __BEGIN_DECLS -+# define __BEGIN_DECLS -+#endif -+ -+#ifndef __END_DECLS -+# define __END_DECLS -+#endif -+ -+#ifndef __attribute_pure__ -+# define __attribute_pure__ -+#endif -+ - #ifndef __error_t_defined - typedef int error_t; - #endif --- -2.1.4 - diff --git a/meta-networking/recipes-daemons/atftp/atftp/0002-tftp.h-tftpd.h-fix-musl-compile-missing-include.patch b/meta-networking/recipes-daemons/atftp/atftp/0002-tftp.h-tftpd.h-fix-musl-compile-missing-include.patch deleted file mode 100644 index 093054ce80..0000000000 --- a/meta-networking/recipes-daemons/atftp/atftp/0002-tftp.h-tftpd.h-fix-musl-compile-missing-include.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 77e399899d9d7297d23c321811b628febdf0fd92 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer <ps.report@gmx.net> -Date: Thu, 16 Apr 2015 22:43:49 +0200 -Subject: [PATCH] tftp.h/tftpd.h: fix musl compile (missing include) - -Upstream-Status: Pending - -Add sys/types.h include for u_char typedef. - -Signed-off-by: Peter Seiderer <ps.report@gmx.net> -Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com> ---- - tftp.h | 1 + - tftpd.h | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/tftp.h b/tftp.h -index 12bd6aa..32a3f63 100644 ---- a/tftp.h -+++ b/tftp.h -@@ -19,6 +19,7 @@ - - #include <sys/time.h> - #include <sys/times.h> -+#include <sys/types.h> - #include "tftp_def.h" - #include "config.h" - -diff --git a/tftpd.h b/tftpd.h -index 945065e..60d3a49 100644 ---- a/tftpd.h -+++ b/tftpd.h -@@ -20,6 +20,7 @@ - #include <pthread.h> - #include <arpa/tftp.h> - #include <arpa/inet.h> -+#include <sys/types.h> - #include "tftp_io.h" - - /* --- -2.1.4 - diff --git a/meta-networking/recipes-daemons/atftp/files/atftpd.init b/meta-networking/recipes-daemons/atftp/atftp/atftpd.init index 161d97aca7..161d97aca7 100644 --- a/meta-networking/recipes-daemons/atftp/files/atftpd.init +++ b/meta-networking/recipes-daemons/atftp/atftp/atftpd.init diff --git a/meta-networking/recipes-daemons/atftp/atftp_0.8.0.bb b/meta-networking/recipes-daemons/atftp/atftp_0.8.0.bb new file mode 100644 index 0000000000..41b7cf0878 --- /dev/null +++ b/meta-networking/recipes-daemons/atftp/atftp_0.8.0.bb @@ -0,0 +1,56 @@ +SUMMARY = "Advanced TFTP server and client" +SECTION = "net" +HOMEPAGE = "http://packages.debian.org/atftp" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=f65159f73e603f89d6867d43191900e5" + +SRCREV = "d5c27eb7a9695d83569767e27ef69674173db39a" + +SRC_URI = "git://git.code.sf.net/p/atftp/code;branch=master;protocol=https \ + file://atftpd.init \ + file://atftpd.service \ +" + +S = "${WORKDIR}/git" + +inherit autotools update-rc.d systemd + +PACKAGECONFIG ??= "tcp-wrappers" +PACKAGECONFIG[pcre] = "--enable-libpcre,--disable-libpcre,libpcre" +PACKAGECONFIG[tcp-wrappers] = "--enable-libwrap,--disable-libwrap,tcp-wrappers" +PACKAGECONFIG[readline] = "--enable-libreadline,--disable-libreadline,readline" + +INITSCRIPT_PACKAGES = "${PN}d" +INITSCRIPT_NAME:${PN}d = "atftpd" +INITSCRIPT_PARAMS:${PN}d = "defaults 80" + + +EXTRA_OEMAKE = "CFLAGS='${CFLAGS} -std=gnu89'" + +do_install:append() { + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${UNPACKDIR}/atftpd.init ${D}${sysconfdir}/init.d/atftpd + + install -d ${D}/srv/tftp + + rm ${D}${sbindir}/in.tftpd + + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${UNPACKDIR}/atftpd.service ${D}${systemd_unitdir}/system +} + +PACKAGES =+ "${PN}d" + +FILES:${PN} = "${bindir}/*" + +FILES:${PN}d = "${sbindir}/* \ + ${sysconfdir} \ + /srv/tftp \ + ${systemd_unitdir}/system/atftpd.service \ +" + +SYSTEMD_PACKAGES = "${PN}d" +SYSTEMD_SERVICE:${PN}d = "atftpd.service" +RPROVIDES:${PN}d += "${PN}d-systemd" +RREPLACES:${PN}d += "${PN}d-systemd" +RCONFLICTS:${PN}d += "${PN}d-systemd" diff --git a/meta-networking/recipes-daemons/atftp/atftp_git.bb b/meta-networking/recipes-daemons/atftp/atftp_git.bb deleted file mode 100644 index a9949d59ae..0000000000 --- a/meta-networking/recipes-daemons/atftp/atftp_git.bb +++ /dev/null @@ -1,64 +0,0 @@ -SUMMARY = "Advanced TFTP server and client" -SECTION = "net" -HOMEPAGE = "http://packages.debian.org/atftp" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f" -PV = "0.7.1+git${SRCPV}" -PR = "r3" - -SRCREV = "be3291a18c069ae23a124ffdc56d64a5ff0bbec7" - -SRC_URI = "git://git.code.sf.net/p/atftp/code \ - file://atftpd-0.7_circumvent_tftp_size_restrictions.patch \ - file://atftpd-0.7_unprotected_assignments_crash.patch \ - file://atftpd.init \ - file://atftpd.service \ - file://atftp-0.7-sorcerers_apprentice.patch \ -" -SRC_URI_append_libc-musl = " file://0001-argz.h-fix-musl-compile-add-missing-defines.patch \ - file://0002-tftp.h-tftpd.h-fix-musl-compile-missing-include.patch \ - " - -S = "${WORKDIR}/git" - -inherit autotools update-rc.d systemd - -PACKAGECONFIG ??= "tcp-wrappers" -PACKAGECONFIG[pcre] = "--enable-libpcre,--disable-libpcre,libpcre" -PACKAGECONFIG[tcp-wrappers] = "--enable-libwrap,--disable-libwrap,tcp-wrappers" -PACKAGECONFIG[readline] = "--enable-libreadline,--disable-libreadline,readline" - -INITSCRIPT_PACKAGES = "${PN}d" -INITSCRIPT_NAME_${PN}d = "atftpd" -INITSCRIPT_PARAMS_${PN}d = "defaults 80" - - -EXTRA_OEMAKE = "CFLAGS='${CFLAGS} -std=gnu89'" - -do_install_append() { - install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/atftpd.init ${D}${sysconfdir}/init.d/atftpd - - install -d ${D}/srv/tftp - - rm ${D}${sbindir}/in.tftpd - - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/atftpd.service ${D}${systemd_unitdir}/system -} - -PACKAGES =+ "${PN}d" - -FILES_${PN} = "${bindir}/*" - -FILES_${PN}d = "${sbindir}/* \ - ${sysconfdir} \ - /srv/tftp \ - ${systemd_unitdir}/system/atftpd.service \ -" - -SYSTEMD_PACKAGES = "${PN}d" -SYSTEMD_SERVICE_${PN}d = "atftpd.service" -RPROVIDES_${PN}d += "${PN}d-systemd" -RREPLACES_${PN}d += "${PN}d-systemd" -RCONFLICTS_${PN}d += "${PN}d-systemd" diff --git a/meta-networking/recipes-daemons/atftp/files/atftp-0.7-sorcerers_apprentice.patch b/meta-networking/recipes-daemons/atftp/files/atftp-0.7-sorcerers_apprentice.patch deleted file mode 100644 index fc64291cd3..0000000000 --- a/meta-networking/recipes-daemons/atftp/files/atftp-0.7-sorcerers_apprentice.patch +++ /dev/null @@ -1,94 +0,0 @@ -atftp exhibits the well known "Sorcerer's Apprentice Syndrome"(SAS) problem. -According to RFC 1350, the fix to SAS is quite simple: further copies of the -acknowledgment for a particular data block would be ignored. - -Patch originally from OpenSUSE: -https://build.opensuse.org/package/view_file?file=atftp-0.7-sorcerers_apprentice.patch&package=atftp.539&project=openSUSE%3A12.1%3AUpdate&rev=84569792975e00573d7df597d2a6e895 - -Upstream-Status: Pending - -Signed-off-by: Roy.Li <rongqing.li@windriver.com> -Index: atftp-0.7/tftp_file.c -=================================================================== ---- atftp-0.7.orig/tftp_file.c 2011-11-22 15:12:53.792744083 +0100 -+++ atftp-0.7/tftp_file.c 2011-11-22 15:13:51.706421893 +0100 -@@ -605,6 +605,7 @@ - int timeout_state = state; /* what state should we go on when timeout */ - int result; - long block_number = 0; -+ long last_requested_block = -1; - long last_block = -1; - int data_size; /* size of data received */ - int sockfd = data->sockfd; /* just to simplify calls */ -@@ -765,6 +766,17 @@ - connected = 1; - } - block_number = ntohs(tftphdr->th_block); -+ -+ if (last_requested_block >= block_number) -+ { -+ if (data->trace) -+ fprintf(stderr, "received duplicated ACK <block: %ld >= %ld>\n", -+ last_requested_block, block_number); -+ break; -+ } -+ else -+ last_requested_block = block_number; -+ - if (data->trace) - fprintf(stderr, "received ACK <block: %ld>\n", - block_number); -Index: atftp-0.7/tftpd_file.c -=================================================================== ---- atftp-0.7.orig/tftpd_file.c 2011-11-22 15:12:53.793744112 +0100 -+++ atftp-0.7/tftpd_file.c 2011-11-22 15:15:04.617534260 +0100 -@@ -403,6 +403,7 @@ - int timeout_state = state; - int result; - long block_number = 0; -+ long last_requested_block = -1; - long last_block = -1; - int block_loops = 0; - int data_size; -@@ -859,6 +860,32 @@ - { - logger(LOG_DEBUG, "received ACK <block: %d>", block_number); - } -+ -+ /* check whether the block request isn't already fulfilled */ -+ -+ /* multicast, block numbers could contain gaps */ -+ if (multicast) { -+ if (last_requested_block >= block_number) -+ { -+ if (data->trace) -+ logger(LOG_DEBUG, "received duplicated ACK <block: %d >= %d>", last_requested_block, block_number); -+ break; -+ } -+ else -+ last_requested_block = block_number; -+ /* unicast, blocks should be requested one after another */ -+ } else { -+ if (last_requested_block + 1 != block_number && last_requested_block != -1) -+ { -+ if (data->trace) -+ logger(LOG_DEBUG, "received out of order ACK <block: %d != %d>", last_requested_block + 1, block_number); -+ break; -+ } -+ else -+ last_requested_block = block_number; -+ } -+ -+ - if (ntohs(tftphdr->th_block) == 65535) - { - block_loops++; -@@ -958,6 +985,8 @@ - /* nedd to send an oack to that client */ - state = S_SEND_OACK; - fseek(fp, 0, SEEK_SET); -+ /* reset the last block received counter */ -+ last_requested_block = -1; - } - else - { diff --git a/meta-networking/recipes-daemons/atftp/files/atftpd-0.7_circumvent_tftp_size_restrictions.patch b/meta-networking/recipes-daemons/atftp/files/atftpd-0.7_circumvent_tftp_size_restrictions.patch deleted file mode 100644 index 280b570b22..0000000000 --- a/meta-networking/recipes-daemons/atftp/files/atftpd-0.7_circumvent_tftp_size_restrictions.patch +++ /dev/null @@ -1,163 +0,0 @@ -Fate #303031: Circumvent TFTP size restrictions in atftpd -The size of a single image file that can be transferred with TFTP is limited to -2^(2*8) *BLOCKSIZE (as per RFC 1350 there are only two bytes for the block -counter). This is problematic for one of our customers who needs to transfer -100+ MB Windows images using a TFTP client (NT bootloader) which has a -hardwared BLOCKSIZE setting of 1432). - -block rollover -http://www.compuphase.com/tftp.htm - -Patch originally from OpenSUSE: -https://build.opensuse.org/package/show?package=atftp&project=openSUSE%3A12.2 - -Upstream-Status: Pending - -Index: git/tftp_def.h -=================================================================== ---- git.orig/tftp_def.h 2012-11-19 16:28:50.221027144 -0800 -+++ git/tftp_def.h 2012-11-20 17:40:54.391206979 -0800 -@@ -32,6 +32,7 @@ - #define TIMEOUT 5 /* Client timeout */ - #define S_TIMEOUT 5 /* Server timout. */ - #define NB_OF_RETRY 5 -+#define MAXBLOCKS 1000000 /* maximum number of blocks in a download */ - - /* definition to use tftp_options structure */ - #define OPT_FILENAME 0 -Index: git/tftp_file.c -=================================================================== ---- git.orig/tftp_file.c 2012-11-19 16:28:50.221027144 -0800 -+++ git/tftp_file.c 2012-11-19 16:28:51.201027167 -0800 -@@ -622,8 +622,8 @@ - int state = S_SEND_REQ; /* current state in the state machine */ - int timeout_state = state; /* what state should we go on when timeout */ - int result; -- int block_number = 0; -- int last_block = -1; -+ long block_number = 0; -+ long last_block = -1; - int data_size; /* size of data received */ - int sockfd = data->sockfd; /* just to simplify calls */ - struct sockaddr_storage sa; /* a copy of data.sa_peer */ -@@ -637,8 +637,8 @@ - int convert = 0; /* if true, do netascii convertion */ - char string[MAXLEN]; - -- int prev_block_number = 0; /* needed to support netascii convertion */ -- int prev_file_pos = 0; -+ long prev_block_number = 0; /* needed to support netascii convertion */ -+ long prev_file_pos = 0; - int temp = 0; - - data->file_size = 0; -@@ -745,7 +745,7 @@ - data_size, data->data_buffer); - data->file_size += data_size; - if (data->trace) -- fprintf(stderr, "sent DATA <block: %d, size: %d>\n", -+ fprintf(stderr, "sent DATA <block: %ld, size: %d>\n", - block_number + 1, data_size - 4); - state = S_WAIT_PACKET; - break; -@@ -785,7 +785,7 @@ - } - block_number = ntohs(tftphdr->th_block); - if (data->trace) -- fprintf(stderr, "received ACK <block: %d>\n", -+ fprintf(stderr, "received ACK <block: %ld>\n", - block_number); - if ((last_block != -1) && (block_number > last_block)) - { -Index: git/tftp_io.c -=================================================================== ---- git.orig/tftp_io.c 2012-11-19 16:28:50.221027144 -0800 -+++ git/tftp_io.c 2012-11-19 16:28:51.201027167 -0800 -@@ -350,8 +350,8 @@ - /* - * Read from file and do netascii conversion if needed - */ --int tftp_file_read(FILE *fp, char *data_buffer, int data_buffer_size, int block_number, -- int convert, int *prev_block_number, int *prev_file_pos, int *temp) -+int tftp_file_read(FILE *fp, char *data_buffer, int data_buffer_size, long block_number, -+ int convert, long *prev_block_number, long *prev_file_pos, int *temp) - { - int i; - int c; -Index: git/tftp_io.h -=================================================================== ---- git.orig/tftp_io.h 2012-11-19 16:28:50.221027144 -0800 -+++ git/tftp_io.h 2012-11-19 16:28:51.201027167 -0800 -@@ -52,8 +52,8 @@ - int tftp_get_packet(int sock1, int sock2, int *sock, struct sockaddr_storage *sa, - struct sockaddr_storage *from, struct sockaddr_storage *to, - int timeout, int *size, char *data); --int tftp_file_read(FILE *fp, char *buffer, int buffer_size, int block_number, int convert, -- int *prev_block_number, int *prev_file_pos, int *temp); -+int tftp_file_read(FILE *fp, char *buffer, int buffer_size, long block_number, int convert, -+ long *prev_block_number, long *prev_file_pos, int *temp); - int tftp_file_write(FILE *fp, char *data_buffer, int data_buffer_size, int block_number, - int data_size, int convert, int *prev_block_number, int *temp); - #endif -Index: git/tftpd_file.c -=================================================================== ---- git.orig/tftpd_file.c 2012-11-19 16:28:50.225027144 -0800 -+++ git/tftpd_file.c 2012-11-19 16:28:51.201027167 -0800 -@@ -407,8 +407,9 @@ - int state = S_BEGIN; - int timeout_state = state; - int result; -- int block_number = 0; -- int last_block = -1; -+ long block_number = 0; -+ long last_block = -1; -+ int block_loops = 0; - int data_size; - struct sockaddr_storage *sa = &data->client_info->client; - struct sockaddr_storage from; -@@ -431,8 +432,8 @@ - struct client_info *client_old = NULL; - struct tftp_opt options[OPT_NUMBER]; - -- int prev_block_number = 0; /* needed to support netascii convertion */ -- int prev_file_pos = 0; -+ long prev_block_number = 0; /* needed to support netascii convertion */ -+ long prev_file_pos = 0; - int temp = 0; - - /* look for mode option */ -@@ -565,11 +566,12 @@ - logger(LOG_INFO, "blksize option -> %d", result); - } - -- /* Verify that the file can be sent in 2^16 block of BLKSIZE octets */ -- if ((file_stat.st_size / (data->data_buffer_size - 4)) > 65535) -+ /* Verify that the file can be sent in MAXBLOCKS blocks of BLKSIZE octets */ -+ if ((file_stat.st_size / (data->data_buffer_size - 4)) > MAXBLOCKS) - { - tftp_send_error(sockfd, sa, EUNDEF, data->data_buffer, data->data_buffer_size); -- logger(LOG_NOTICE, "Requested file to big, increase BLKSIZE"); -+ logger(LOG_NOTICE, "Requested file too big, increase BLKSIZE"); -+ logger(LOG_NOTICE, "Only %d blocks of %d bytes can be served.", MAXBLOCKS, data->data_buffer_size); - if (data->trace) - logger(LOG_DEBUG, "sent ERROR <code: %d, msg: %s>", EUNDEF, - tftp_errmsg[EUNDEF]); -@@ -880,10 +882,15 @@ - } - /* The ACK is from the current client */ - number_of_timeout = 0; -- block_number = ntohs(tftphdr->th_block); -+ block_number = (block_loops * 65536) + ntohs(tftphdr->th_block); - if (data->trace) -- logger(LOG_DEBUG, "received ACK <block: %d>", -- block_number); -+ { -+ logger(LOG_DEBUG, "received ACK <block: %d>", block_number); -+ } -+ if (ntohs(tftphdr->th_block) == 65535) -+ { -+ block_loops++; -+ }; - if ((last_block != -1) && (block_number > last_block)) - { - state = S_END; diff --git a/meta-networking/recipes-daemons/atftp/files/atftpd-0.7_unprotected_assignments_crash.patch b/meta-networking/recipes-daemons/atftp/files/atftpd-0.7_unprotected_assignments_crash.patch deleted file mode 100644 index 28fba6cf50..0000000000 --- a/meta-networking/recipes-daemons/atftp/files/atftpd-0.7_unprotected_assignments_crash.patch +++ /dev/null @@ -1,152 +0,0 @@ -Avoid assigning thread data outside of mutex lock - -Patch originally from OpenSUSE: -https://build.opensuse.org/package/show?package=atftp&project=openSUSE%3A12.2 - -Upstream-Status: Pending - -Index: git/tftpd_list.c -=================================================================== ---- git.orig/tftpd_list.c 2012-10-24 21:48:47.000000000 -0700 -+++ git/tftpd_list.c 2012-10-24 21:52:04.266205076 -0700 -@@ -49,11 +49,11 @@ - */ - int tftpd_list_add(struct thread_data *new) - { -- struct thread_data *current = thread_data; -+ struct thread_data *current; - int ret; - - pthread_mutex_lock(&thread_list_mutex); -- -+ current = thread_data; - number_of_thread++; - - ret = number_of_thread; -@@ -81,11 +81,13 @@ - */ - int tftpd_list_remove(struct thread_data *old) - { -- struct thread_data *current = thread_data; -+ struct thread_data *current; - int ret; - - pthread_mutex_lock(&thread_list_mutex); - -+ current = thread_data; -+ - number_of_thread--; - ret = number_of_thread; - -@@ -137,23 +139,26 @@ - struct thread_data *data, - struct client_info *client) - { -- struct thread_data *current = thread_data; /* head of the list */ -- struct tftp_opt *tftp_options = data->tftp_options; -+ struct thread_data *current; /* head of the list */ -+ struct tftp_opt *tftp_options; - struct client_info *tmp; - char options[MAXLEN]; - char string[MAXLEN]; - char *index; - int len; - -+ /* lock the whole list before walking it */ -+ pthread_mutex_lock(&thread_list_mutex); -+ - *thread = NULL; - -+ current = thread_data; -+ tftp_options = data->tftp_options; -+ - opt_request_to_string(tftp_options, options, MAXLEN); - index = strstr(options, "multicast"); - len = (int)index - (int)options; - -- /* lock the whole list before walking it */ -- pthread_mutex_lock(&thread_list_mutex); -- - while (current) - { - if (current != data) -@@ -214,9 +219,10 @@ - void tftpd_clientlist_remove(struct thread_data *thread, - struct client_info *client) - { -- struct client_info *tmp = thread->client_info; -+ struct client_info *tmp; - - pthread_mutex_lock(&thread->client_mutex); -+ tmp = thread->client_info; - while ((tmp->next != client) && (tmp->next != NULL)) - tmp = tmp->next; - if (tmp->next == NULL) -@@ -231,9 +237,11 @@ - void tftpd_clientlist_free(struct thread_data *thread) - { - struct client_info *tmp; -- struct client_info *head = thread->client_info; -+ struct client_info *head; - - pthread_mutex_lock(&thread->client_mutex); -+ head = thread->client_info; -+ - while (head) - { - tmp = head; -@@ -250,9 +258,10 @@ - struct client_info *client, - struct sockaddr_storage *sock) - { -- struct client_info *head = thread->client_info; -+ struct client_info *head; - - pthread_mutex_lock(&thread->client_mutex); -+ head = thread->client_info; - - if (client) - { -@@ -334,10 +343,10 @@ - - void tftpd_list_kill_threads(void) - { -- struct thread_data *current = thread_data; /* head of list */ -+ struct thread_data *current; /* head of list */ - - pthread_mutex_lock(&thread_list_mutex); -- -+ current = thread_data; - - while (current != NULL) - { -Index: git/tftpd_mcast.c -=================================================================== ---- git.orig/tftpd_mcast.c 2012-10-24 21:48:47.000000000 -0700 -+++ git/tftpd_mcast.c 2012-10-24 21:49:11.570201582 -0700 -@@ -51,9 +51,11 @@ - */ - int tftpd_mcast_get_tid(char **addr, short *port) - { -- struct tid *current = tid_list; -+ struct tid *current; - - pthread_mutex_lock(&mcast_tid_list); -+ current = tid_list; -+ - /* walk the list for a free tid */ - while (current != NULL) - { -@@ -74,9 +76,11 @@ - - int tftpd_mcast_free_tid(char *addr, short port) - { -- struct tid *current = tid_list; -+ struct tid *current; - - pthread_mutex_lock(&mcast_tid_list); -+ current = tid_list; -+ - while (current != NULL) - { - if ((current->used == 1) && (current->port == port) && diff --git a/meta-networking/recipes-daemons/autofs/autofs/0001-Bug-fix-for-pid_t-not-found-on-musl.patch b/meta-networking/recipes-daemons/autofs/autofs/0001-Bug-fix-for-pid_t-not-found-on-musl.patch new file mode 100644 index 0000000000..2a583466e3 --- /dev/null +++ b/meta-networking/recipes-daemons/autofs/autofs/0001-Bug-fix-for-pid_t-not-found-on-musl.patch @@ -0,0 +1,30 @@ +From d0d5ac317dab11610a5fc91ca3e7f5ad72ce2236 Mon Sep 17 00:00:00 2001 +From: Zang Ruochen <zangrc.fnst@cn.fujitsu.com> +Date: Tue, 29 Oct 2019 13:19:37 +0800 +Subject: [PATCH] Bug fix for pid_t not found on musl. + +When compiling version 5.1.6 on musl, the following error occurs: +log.h:49:8: error: unknown type name 'pid_t' + +Upstream-Status: Pending + +Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com> +--- + lib/defaults.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lib/defaults.c b/lib/defaults.c +index a6ea116..b3ecfa5 100644 +--- a/lib/defaults.c ++++ b/lib/defaults.c +@@ -21,6 +21,7 @@ + #include <string.h> + #include <sys/utsname.h> + #include <sys/stat.h> ++#include <sys/types.h> + #include <stdarg.h> + + #include "config.h" +-- +2.20.1 + diff --git a/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-and-_PATH_NSSWITCH_CONF.patch b/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-and-_PATH_NSSWITCH_CONF.patch index 075af5707b..6128f3d0ed 100644 --- a/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-and-_PATH_NSSWITCH_CONF.patch +++ b/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-and-_PATH_NSSWITCH_CONF.patch @@ -1,19 +1,22 @@ -From 933e065cf8aecfa0cce5f8f92abbed5baaaf3f77 Mon Sep 17 00:00:00 2001 +From 987c8f4a718cdd6b764592ba7510090a59623959 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 31 Mar 2017 19:10:57 -0700 -Subject: [PATCH 1/2] Define __SWORD_TYPE and _PATH_NSSWITCH_CONF +Subject: [PATCH] Define __SWORD_TYPE and _PATH_NSSWITCH_CONF if they are not defined as is in musl then define them here Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- +Upstream-Status: Pending + include/automount.h | 8 ++++++++ include/nsswitch.h | 3 +++ 2 files changed, 11 insertions(+) diff --git a/include/automount.h b/include/automount.h -index 219b07d..b12c22a 100644 +index cc336ad..8bdcf12 100644 --- a/include/automount.h +++ b/include/automount.h @@ -42,6 +42,14 @@ @@ -32,7 +35,7 @@ index 219b07d..b12c22a 100644 #ifndef HAVE_MOUNT #error Failed to locate mount(8)! diff --git a/include/nsswitch.h b/include/nsswitch.h -index 2b445a9..3db77b2 100644 +index d3e4027..7a0c38f 100644 --- a/include/nsswitch.h +++ b/include/nsswitch.h @@ -24,6 +24,9 @@ @@ -45,6 +48,3 @@ index 2b445a9..3db77b2 100644 #define NSSWITCH_FILE _PATH_NSSWITCH_CONF enum nsswitch_status { --- -2.12.1 - diff --git a/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-if-undefined.patch b/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-if-undefined.patch new file mode 100644 index 0000000000..f16ae5277e --- /dev/null +++ b/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-if-undefined.patch @@ -0,0 +1,115 @@ +From 9fe90ab1e333b2e2bed370ff13ba552eb54c3aaf Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 17 Jul 2021 09:56:28 -0700 +Subject: [PATCH] Define __SWORD_TYPE if undefined + +These fixes are inspired when building autofs on musl + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + daemon/automount.c | 20 ++++++++++++++------ + include/hash.h | 5 +++++ + lib/log.c | 6 +++++- + 3 files changed, 24 insertions(+), 7 deletions(-) + +--- a/daemon/automount.c ++++ b/daemon/automount.c +@@ -1,7 +1,7 @@ + /* ----------------------------------------------------------------------- * + * + * automount.c - Linux automounter daemon +- * ++ * + * Copyright 1997 Transmeta Corporation - All Rights Reserved + * Copyright 1999-2000 Jeremy Fitzhardinge <jeremy@goop.org> + * Copyright 2001-2005 Ian Kent <raven@themaw.net> +@@ -11,7 +11,7 @@ + * the Free Software Foundation, Inc., 675 Mass Ave, Cambridge MA 02139, + * USA; either version 2 of the License, or (at your option) any later + * version. +- * ++ * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +@@ -40,6 +40,14 @@ + #include <systemd/sd-daemon.h> + #endif + ++#ifndef __SWORD_TYPE ++# if __WORDSIZE == 32 /* System word size */ ++# define __SWORD_TYPE int ++# else /* __WORDSIZE == 64 */ ++# define __SWORD_TYPE long int ++# endif ++#endif ++ + #include "automount.h" + #if defined(LIBXML2_WORKAROUND) || defined(TIRPC_WORKAROUND) + #include <dlfcn.h> +@@ -282,7 +290,7 @@ int rmdir_path(struct autofs_point *ap, + dev, buf, st.st_dev); + return -1; + } +- ++ + /* + * Last element of path may be a symbolic link; all others + * are directories (and the last directory element is +@@ -455,7 +463,7 @@ int count_mounts(struct autofs_point *ap + + counter.count = 0; + counter.dev = dev; +- ++ + if (walk_tree(path, counter_fn, 1, ap, &counter) == -1) + return -1; + +@@ -811,7 +819,7 @@ static char *automount_path_to_fifo(unsi + /* + * An automount path can be made up of subdirectories. So, to + * create the fifo name, we will just replace instances of '/' with +- * '-'. ++ * '-'. + */ + p = fifo_name + strlen(fifodir); + while (*p != '\0') { +@@ -1640,7 +1648,7 @@ static void return_start_status(void *ar + sc->done = 1; + + /* +- * Startup condition mutex must be locked during ++ * Startup condition mutex must be locked during + * the startup process. + */ + status = pthread_cond_signal(&sc->cond); +--- a/include/hash.h ++++ b/include/hash.h +@@ -5,6 +5,11 @@ + + #include <sys/types.h> + #include <stdint.h> ++#include <linux/stddef.h> ++ ++#ifndef __GLIBC__ ++#include <sys/reg.h> ++#endif + + /* + * The "GOLDEN_RATIO_PRIME" is used in ifs/btrfs/brtfs_inode.h and +--- a/lib/log.c ++++ b/lib/log.c +@@ -38,7 +38,11 @@ static char *prepare_attempt_prefix(cons + char buffer[ATTEMPT_ID_SIZE + 1]; + char *prefixed_msg = NULL; + +- attempt_id = pthread_getspecific(key_thread_attempt_id); ++ if (key_thread_attempt_id) { ++ attempt_id = pthread_getspecific(key_thread_attempt_id); ++ } else { ++ attempt_id = 0; ++ } + if (attempt_id) { + int len = sizeof(buffer) + 1 + strlen(msg) + 1; + diff --git a/meta-networking/recipes-daemons/autofs/autofs/0001-Do-not-hardcode-path-for-pkg.m4.patch b/meta-networking/recipes-daemons/autofs/autofs/0001-Do-not-hardcode-path-for-pkg.m4.patch new file mode 100644 index 0000000000..f18f237d98 --- /dev/null +++ b/meta-networking/recipes-daemons/autofs/autofs/0001-Do-not-hardcode-path-for-pkg.m4.patch @@ -0,0 +1,31 @@ +From d7a34bb388e33d16260b67275cdb58f9c877d324 Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Tue, 27 Nov 2018 15:27:47 +0800 +Subject: [PATCH] From 6d24365f0828185fd1bb4d199209ca07eb95c41d Mon Sep 17 + 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 24 Aug 2018 + 06:24:36 +0000 Subject: [PATCH] Do not hardcode path for pkg.m4 + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +update patch to version 5.1.6 +Signed-off-by: Changqing Li <changqing.li@windriver.com> + +--- + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.in b/configure.in +index 07c2051..e85d718 100644 +--- a/configure.in ++++ b/configure.in +@@ -12,7 +12,7 @@ define([AC_CACHE_SAVE], )dnl + AC_INIT(.autofs-5.1.8) + + # for pkg-config macros +-m4_include([/usr/share/aclocal/pkg.m4]) ++m4_include([pkg.m4]) + + # + # autofs installs by default in /usr diff --git a/meta-networking/recipes-daemons/autofs/autofs/0001-autofs-5.1.8-add-autofs_strerror_r-helper-for-musl.patch b/meta-networking/recipes-daemons/autofs/autofs/0001-autofs-5.1.8-add-autofs_strerror_r-helper-for-musl.patch new file mode 100644 index 0000000000..caf0105118 --- /dev/null +++ b/meta-networking/recipes-daemons/autofs/autofs/0001-autofs-5.1.8-add-autofs_strerror_r-helper-for-musl.patch @@ -0,0 +1,56 @@ +From 88f991b0ebb6fb8fcaad3d0eb8fb51a7439d053e Mon Sep 17 00:00:00 2001 +From: Fabian Groffen <grobian@gentoo.org> +Date: Wed, 2 Feb 2022 09:27:13 +0800 +Subject: [PATCH 1/2] autofs-5.1.8 - add autofs_strerror_r() helper for musl + +If using musl libc the XSI-compliant variant strerror_r() which returns +an integer instead of a pointer so add a helper function to handle this +case. + +Signed-off-by: Fabian Groffen <grobian@gentoo.org> +Signed-off-by: Ian Kent <raven@themaw.net> +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + include/automount.h | 5 +++++ + lib/log.c | 10 ++++++++++ + 2 files changed, 15 insertions(+) + +diff --git a/include/automount.h b/include/automount.h +index 8cd8b3a..f759e59 100644 +--- a/include/automount.h ++++ b/include/automount.h +@@ -51,6 +51,11 @@ + # endif + #endif + ++#ifndef __GLIBC__ ++# define strerror_r(N,B,S) autofs_strerror_r(N,B,S) ++char *autofs_strerror_r(int errnum, char *buf, size_t buflen); /* GNU */ ++#endif ++ + /* We MUST have the paths to mount(8) and umount(8) */ + #ifndef HAVE_MOUNT + #error Failed to locate mount(8)! +diff --git a/lib/log.c b/lib/log.c +index 39b1e3b..b99fa39 100644 +--- a/lib/log.c ++++ b/lib/log.c +@@ -368,3 +368,13 @@ pid_t log_pidinfo(struct autofs_point *ap, pid_t pid, char *label) { + + return ppid; + } ++ ++#ifndef __GLIBC__ ++# undef strerror_r ++char *autofs_strerror_r(int errnum, char *buf, size_t buflen) { ++ int s = strerror_r(errnum, buf, buflen); ++ if (s) ++ return NULL; ++ return buf; ++} ++#endif +-- +2.37.3 + diff --git a/meta-networking/recipes-daemons/autofs/autofs/0001-include-libgen.h-for-basename.patch b/meta-networking/recipes-daemons/autofs/autofs/0001-include-libgen.h-for-basename.patch new file mode 100644 index 0000000000..4c8b4ef779 --- /dev/null +++ b/meta-networking/recipes-daemons/autofs/autofs/0001-include-libgen.h-for-basename.patch @@ -0,0 +1,58 @@ +From 1651e7a35be8b3e2fa90ca57b073f6944664fa62 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 25 Mar 2024 12:04:03 -0700 +Subject: [PATCH] include libgen.h for basename + +basename prototype has been removed from string.h from latest musl [1] +compilers e.g. clang-18 flags the absense of prototype as error. therefore +include libgen.h for providing it. + +[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + daemon/automount.c | 1 + + daemon/master.c | 1 + + modules/lookup_file.c | 1 + + 3 files changed, 3 insertions(+) + +diff --git a/daemon/automount.c b/daemon/automount.c +index 3d9461d..61b3478 100644 +--- a/daemon/automount.c ++++ b/daemon/automount.c +@@ -21,6 +21,7 @@ + + #include <dirent.h> + #include <getopt.h> ++#include <libgen.h> + #include <signal.h> + #include <stdio.h> + #include <stdlib.h> +diff --git a/daemon/master.c b/daemon/master.c +index f99359c..3f56499 100644 +--- a/daemon/master.c ++++ b/daemon/master.c +@@ -21,6 +21,7 @@ + #include <string.h> + #include <memory.h> + #include <limits.h> ++#include <libgen.h> + #include <signal.h> + #include <sys/types.h> + #include <sys/stat.h> +diff --git a/modules/lookup_file.c b/modules/lookup_file.c +index 6afc558..82b1f28 100644 +--- a/modules/lookup_file.c ++++ b/modules/lookup_file.c +@@ -15,6 +15,7 @@ + + #include <stdio.h> + #include <malloc.h> ++#include <libgen.h> + #include <stdlib.h> + #include <string.h> + #include <time.h> +-- +2.44.0 + diff --git a/meta-networking/recipes-daemons/autofs/autofs/0001-modules-lookup_multi.c-Replace-__S_IEXEC-with-S_IEXE.patch b/meta-networking/recipes-daemons/autofs/autofs/0001-modules-lookup_multi.c-Replace-__S_IEXEC-with-S_IEXE.patch index 7ac1456748..8eec3014a0 100644 --- a/meta-networking/recipes-daemons/autofs/autofs/0001-modules-lookup_multi.c-Replace-__S_IEXEC-with-S_IEXE.patch +++ b/meta-networking/recipes-daemons/autofs/autofs/0001-modules-lookup_multi.c-Replace-__S_IEXEC-with-S_IEXE.patch @@ -1,4 +1,4 @@ -From e4ee00e08acd7c0912a3264ad32e4de861c7416f Mon Sep 17 00:00:00 2001 +From 745e355ac8b595a27e1fcca75bf01d3e244f4a5f Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Thu, 7 Sep 2017 22:22:31 -0700 Subject: [PATCH] modules/lookup_multi.c: Replace __S_IEXEC with S_IEXEC @@ -7,7 +7,10 @@ __S_IEXEC is internal to libc and may not be available on all libc e.g. musl Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- +Upstream-Status: Pending + modules/lookup_multi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -24,6 +27,3 @@ index 3ecda6d..cf109de 100644 type = src_prog; else type = src_file; --- -2.14.1 - diff --git a/meta-networking/recipes-daemons/autofs/autofs/0002-Replace-__S_IEXEC-with-S_IEXEC.patch b/meta-networking/recipes-daemons/autofs/autofs/0002-Replace-__S_IEXEC-with-S_IEXEC.patch index 6b6ba6d855..d67f6300c8 100644 --- a/meta-networking/recipes-daemons/autofs/autofs/0002-Replace-__S_IEXEC-with-S_IEXEC.patch +++ b/meta-networking/recipes-daemons/autofs/autofs/0002-Replace-__S_IEXEC-with-S_IEXEC.patch @@ -1,43 +1,55 @@ -From 8fd74ddb3369572c594b22b396346131af00faee Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 31 Mar 2017 19:12:10 -0700 -Subject: [PATCH 2/2] Replace __S_IEXEC with S_IEXEC +From 096e33743158e0e8c04d60d01cc66e2945d79777 Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Tue, 27 Nov 2018 16:52:35 +0800 +Subject: [PATCH] From 557ca399f4b3a397f20bb147ec6dc4ab9732dd1e Mon Sep 17 + 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 31 Mar 2017 + 19:12:10 -0700 Subject: [PATCH] Replace __S_IEXEC with S_IEXEC S_IEXEC is portable Signed-off-by: Khem Raj <raj.khem@gmail.com> + +update patch to version 5.1.5 +Signed-off-by: Changqing Li <changqing.li@windriver.com> --- - daemon/lookup.c | 4 ++-- +Upstream-Status: Pending + + daemon/lookup.c | 6 +++--- modules/lookup_multi.c | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) + 2 files changed, 4 insertions(+), 4 deletions(-) -diff --git a/daemon/lookup.c b/daemon/lookup.c -index 62071df..1bec97f 100644 --- a/daemon/lookup.c +++ b/daemon/lookup.c -@@ -400,7 +400,7 @@ static int read_file_source_instance(struct autofs_point *ap, struct map_source - if (!S_ISREG(st.st_mode)) +@@ -397,7 +397,7 @@ static int read_file_source_instance(str return NSS_STATUS_NOTFOUND; + } - if (st.st_mode & __S_IEXEC) + if (st.st_mode & S_IEXEC) type = src_prog; else type = src_file; -@@ -890,7 +890,7 @@ static int lookup_name_file_source_instance(struct autofs_point *ap, struct map_ - if (!S_ISREG(st.st_mode)) +@@ -930,7 +930,7 @@ static int lookup_name_file_source_insta return NSS_STATUS_NOTFOUND; + } - if (st.st_mode & __S_IEXEC) + if (st.st_mode & S_IEXEC) type = src_prog; else type = src_file; -diff --git a/modules/lookup_multi.c b/modules/lookup_multi.c -index 6ec8434..88d081f 100644 +@@ -1077,7 +1077,7 @@ static struct map_source *lookup_get_map + if (!S_ISREG(st.st_mode)) + return NULL; + +- if (st.st_mode & __S_IEXEC) ++ if (st.st_mode & S_IEXEC) + type = "program"; + else + type = "file"; --- a/modules/lookup_multi.c +++ b/modules/lookup_multi.c -@@ -104,7 +104,7 @@ static struct lookup_mod *nss_open_lookup(const char *format, int argc, const ch +@@ -247,7 +247,7 @@ static struct lookup_mod *nss_open_looku continue; } @@ -46,6 +58,3 @@ index 6ec8434..88d081f 100644 type = src_prog; else type = src_file; --- -2.12.1 - diff --git a/meta-networking/recipes-daemons/autofs/autofs/0002-autofs-5.1.8-handle-innetgr-not-present-in-musl.patch b/meta-networking/recipes-daemons/autofs/autofs/0002-autofs-5.1.8-handle-innetgr-not-present-in-musl.patch new file mode 100644 index 0000000000..9d0caae312 --- /dev/null +++ b/meta-networking/recipes-daemons/autofs/autofs/0002-autofs-5.1.8-handle-innetgr-not-present-in-musl.patch @@ -0,0 +1,106 @@ +From 1c0b0b70a276280f431d72319109a0bbc0267970 Mon Sep 17 00:00:00 2001 +From: Fabian Groffen <grobian@gentoo.org> +Date: Wed, 2 Feb 2022 10:15:22 +0800 +Subject: [PATCH 2/2] autofs-5.1.8 - handle innetgr() not present in musl + +The function innetgr(3) may not be present in musl libc, add a check +for this. + +Originally contributed by Fabian, modified by me. + +Upstream-Status: Backport [https://git.kernel.org/pub/scm/linux/storage/autofs/autofs.git/commit/?id=f60e40af3c038b8955325a11b7294ad38c15c9e8] +Signed-off-by: Fabian Groffen <grobian@gentoo.org> +Signed-off-by: Ian Kent <raven@themaw.net> +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure | 6 ++++++ + configure.in | 2 +- + include/config.h.in | 3 +++ + modules/parse_amd.c | 7 +++++++ + 4 files changed, 17 insertions(+), 1 deletion(-) + +--- a/configure.in ++++ b/configure.in +@@ -169,7 +169,7 @@ AF_CHECK_SSS_LIB(SSS_AUTOFS, libsss_auto + AC_SUBST(HAVE_SSS_AUTOFS) + AC_SUBST(sssldir) + +-AC_CHECK_FUNCS(pipe2) ++AC_CHECK_FUNCS(pipe2 innetgr) + + # + # Newer mounts have the -s (sloppy) option to ignore unknown options, +--- a/include/config.h.in ++++ b/include/config.h.in +@@ -30,6 +30,9 @@ + /* Define to 1 if you have the `getservbyname' function. */ + #undef HAVE_GETSERVBYNAME + ++/* Define to 1 if you have the `innetgr' function. */ ++#undef HAVE_INNETGR ++ + /* Define to 1 if you have the <inttypes.h> header file. */ + #undef HAVE_INTTYPES_H + +@@ -45,9 +48,6 @@ + /* Define if you have the Linux /proc filesystem. */ + #undef HAVE_LINUX_PROCFS + +-/* Define to 1 if you have the <memory.h> header file. */ +-#undef HAVE_MEMORY_H +- + /* define if you have MOUNT */ + #undef HAVE_MOUNT + +@@ -69,6 +69,9 @@ + /* Define to 1 if you have the <stdint.h> header file. */ + #undef HAVE_STDINT_H + ++/* Define to 1 if you have the <stdio.h> header file. */ ++#undef HAVE_STDIO_H ++ + /* Define to 1 if you have the <stdlib.h> header file. */ + #undef HAVE_STDLIB_H + +@@ -141,7 +144,9 @@ + /* define if you have YACC */ + #undef PATH_YACC + +-/* Define to 1 if you have the ANSI C header files. */ ++/* Define to 1 if all of the C90 standard headers exist (not just the ones ++ required in a freestanding environment). This macro is provided for ++ backward compatibility; new code need not use it. */ + #undef STDC_HEADERS + + /* Define to 1 to use the libtirpc tsd usage workaround */ +--- a/modules/parse_amd.c ++++ b/modules/parse_amd.c +@@ -424,6 +424,7 @@ static int sel_in_network(struct autofs_ + return ret; + } + ++#ifdef HAVE_INNETGR + static int sel_netgrp(struct autofs_point *ap, + struct selector *s, struct substvar *sv) + { +@@ -488,6 +489,7 @@ out: + + return ret; + } ++#endif + + static int eval_selector(struct autofs_point *ap, + struct amd_entry *this, struct substvar *sv) +@@ -627,7 +629,12 @@ static int eval_selector(struct autofs_p + switch (s->sel->selector) { + case SEL_NETGRP: + case SEL_NETGRPD: ++#ifndef HAVE_INNETGR ++ error(logopt, MODPREFIX ++ "netgroups not available, function innetgr(3) not available"); ++#else + ret = sel_netgrp(ap, s, sv); ++#endif + break; + + default: diff --git a/meta-networking/recipes-daemons/autofs/autofs/add-the-needed-stdarg.h.patch b/meta-networking/recipes-daemons/autofs/autofs/add-the-needed-stdarg.h.patch index fdb906b22b..4cfd8edf9f 100644 --- a/meta-networking/recipes-daemons/autofs/autofs/add-the-needed-stdarg.h.patch +++ b/meta-networking/recipes-daemons/autofs/autofs/add-the-needed-stdarg.h.patch @@ -1,14 +1,18 @@ -[PATCH] add the needed stdarg.h +From df5d45b2d7ad7e7b5f0542a816d08b0409a529a1 Mon Sep 17 00:00:00 2001 +From: Roy Li <rongqing.li@windriver.com> +Date: Tue, 19 Aug 2014 11:31:35 +0800 +Subject: [PATCH] [PATCH] add the needed stdarg.h -Upstream-status: Pending +Upstream-Status: Pending Signed-off-by: Roy Li <rongqing.li@windriver.com> + --- - lib/defaults.c | 1 + + lib/defaults.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/defaults.c b/lib/defaults.c -index 2b03ea2..5728e67 100644 +index 0e48a78..667f35d 100644 --- a/lib/defaults.c +++ b/lib/defaults.c @@ -16,6 +16,7 @@ @@ -19,6 +23,3 @@ index 2b03ea2..5728e67 100644 #include <ctype.h> #include <string.h> #include <sys/utsname.h> --- -1.7.10.4 - diff --git a/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-do-not-check-for-modprobe.patch b/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-do-not-check-for-modprobe.patch deleted file mode 100644 index af5be6a830..0000000000 --- a/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-do-not-check-for-modprobe.patch +++ /dev/null @@ -1,75 +0,0 @@ -Description: Loading autofs module is #ifdef'ed in the source, so - there is no need to check for /proc (which is only used - to load module) or modprobe. Both modprobe and /proc - are always in the fixed location so there's no need to - check for these to start with. - -Upstream-Status: Backport [1] -[1] http://www.spinics.net/lists/autofs/msg00139.html - -diff -urpN a/configure.in b/configure.in ---- a/configure.in 2013-01-15 11:30:22.000000000 +0800 -+++ b/configure.in 2013-01-15 11:31:45.000000000 +0800 -@@ -34,11 +34,6 @@ AC_MSG_CHECKING([for binaries in]) - AC_MSG_RESULT([$searchpath]) - - # --# Make sure we have "/proc" --# --AF_LINUX_PROCFS() -- --# - # Location of init.d directory? - # - AF_INIT_D() -@@ -142,7 +137,6 @@ AF_PATH_INCLUDE(UMOUNT, umount, /bin/umo - AF_PATH_INCLUDE(E2FSCK, fsck.ext2 e2fsck, , $searchpath) - AF_PATH_INCLUDE(E3FSCK, fsck.ext3 e3fsck, , $searchpath) - AF_PATH_INCLUDE(E4FSCK, fsck.ext4 e4fsck, , $searchpath) --AF_PATH_INCLUDE(MODPROBE, modprobe, , $searchpath) - - AF_CHECK_PROG(LEX, flex lex, , $searchpath) - AF_CHECK_PROG(YACC, bison, , $searchpath) -diff -urpN a/daemon/module.c b/daemon/module.c ---- a/daemon/module.c 2013-01-15 11:30:49.000000000 +0800 -+++ b/daemon/module.c 2013-01-15 11:32:00.000000000 +0800 -@@ -18,6 +18,8 @@ - #include <stdlib.h> - #include "automount.h" - -+#if 0 -+/* see comment in daemon/automount.c around load_autofs4_module() call */ - int load_autofs4_module(void) - { - FILE *fp; -@@ -52,6 +54,7 @@ int load_autofs4_module(void) - - return 1; - } -+#endif - - struct lookup_mod *open_lookup(const char *name, const char *err_prefix, - const char *mapfmt, int argc, const char *const *argv) -diff -urpN a/include/automount.h b/include/automount.h ---- a/include/automount.h 2013-01-15 11:31:10.000000000 +0800 -+++ b/include/automount.h 2013-01-15 11:32:06.000000000 +0800 -@@ -50,16 +50,11 @@ - #error Failed to locate umount(8)! - #endif - --#ifndef HAVE_MODPROBE --#error Failed to locate modprobe(8)! --#endif -- --#ifndef HAVE_LINUX_PROCFS --#error Failed to verify existence of procfs filesystem! --#endif -- -+#if 0 -+/* see comment in daemon/automount.c around load_autofs4_module() call */ - #define FS_MODULE_NAME "autofs4" - int load_autofs4_module(void); -+#endif - - /* The -s (sloppy) option to mount is good, if we have it... */ - diff --git a/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-fix-lib-deps.patch b/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-fix-lib-deps.patch index 09fea495df..8e06db6e4a 100644 --- a/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-fix-lib-deps.patch +++ b/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-fix-lib-deps.patch @@ -1,4 +1,4 @@ -From 54a9bd28a307dd74df044d779ca85adcf36aa202 Mon Sep 17 00:00:00 2001 +From 080626108c9ab70e2489752ef2a14006d0564b0c Mon Sep 17 00:00:00 2001 From: Joe MacDonald <joe.macdonald@windriver.com> Date: Tue, 18 Jun 2013 10:05:21 -0400 Subject: [PATCH] Fix the dependency issue @@ -10,19 +10,17 @@ generated by rpcgen during buildtime Signed-off-by: Roy.Li <rongqing.li@windriver.com> Signed-off-by: Joe MacDonald <joe.macdonald@windriver.com> + --- - lib/Makefile | 1 + + lib/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/Makefile b/lib/Makefile -index 5418009..bff4e1d 100644 +index 518b483..4798a4b 100644 --- a/lib/Makefile +++ b/lib/Makefile -@@ -75,3 +75,4 @@ install: all +@@ -81,3 +81,4 @@ install: all clean: rm -f $(LIB) $(RPCS) $(OBJS) $(YACCSRC) *.output *~ +$(OBJS): $(RPCS) --- -1.7.10.4 - diff --git a/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-include-linux-nfs.h-directly-in-rpc_sub.patch b/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-include-linux-nfs.h-directly-in-rpc_sub.patch deleted file mode 100644 index 3a878980a4..0000000000 --- a/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-include-linux-nfs.h-directly-in-rpc_sub.patch +++ /dev/null @@ -1,32 +0,0 @@ -Upstream-Status: Pending - -From 44bdce8c6ed9b30c1643e5981172a4f9025f013c Mon Sep 17 00:00:00 2001 -From: Andreas Oberritter <obi@opendreambox.org> -Date: Wed, 13 Mar 2013 16:17:08 +0100 -Subject: [PATCH] autofs-5.0.7: include linux/nfs.h directly in rpc_subs.h - -Fixes compile error with uclibc. Glibc's nfs/nfs.h contains -nothing but "#include linux/nfs.h". rpc_subs.h already includes -other linux/nfs*.h files directly. - -Signed-off-by: Andreas Oberritter <obi@opendreambox.org> ---- - include/rpc_subs.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/rpc_subs.h b/include/rpc_subs.h -index b6d59f9..a2d9648 100644 ---- a/include/rpc_subs.h -+++ b/include/rpc_subs.h -@@ -18,7 +18,7 @@ - - #include <rpc/rpc.h> - #include <rpc/pmap_prot.h> --#include <nfs/nfs.h> -+#include <linux/nfs.h> - #include <linux/nfs2.h> - #include <linux/nfs3.h> - --- -1.7.10.4 - diff --git a/meta-networking/recipes-daemons/autofs/autofs/autofs-5.1.2-libtirpc-as-need.patch b/meta-networking/recipes-daemons/autofs/autofs/autofs-5.1.2-libtirpc-as-need.patch deleted file mode 100644 index cbf2bf8047..0000000000 --- a/meta-networking/recipes-daemons/autofs/autofs/autofs-5.1.2-libtirpc-as-need.patch +++ /dev/null @@ -1,30 +0,0 @@ -Make configure compatible with -Wl,--as-needed following -https://wiki.gentoo.org/wiki/Project:Quality_Assurance/As-needed#Failure_in_..2Fconfigure - -2016-07-05 Martin von Gagern - -Index: autofs-5.1.2/aclocal.m4 -=================================================================== ---- autofs-5.1.2.orig/aclocal.m4 -+++ autofs-5.1.2/aclocal.m4 -@@ -415,9 +415,9 @@ AC_DEFUN([AF_CHECK_LIBTIRPC], - [ - # save current flags - af_check_libtirpc_save_cflags="$CFLAGS" --af_check_libtirpc_save_ldflags="$LDFLAGS" -+af_check_libtirpc_save_libs="$LIBS" - CFLAGS="$CFLAGS -I=/usr/include/tirpc" --LDFLAGS="$LDFLAGS -ltirpc" -+LIBS="$LIBS -ltirpc" - - AC_TRY_LINK( - [ #include <rpc/rpc.h> ], -@@ -440,7 +440,7 @@ AC_CHECK_FUNCS([getrpcbyname getservbyna - - # restore flags - CFLAGS="$af_check_libtirpc_save_cflags" --LDFLAGS="$af_check_libtirpc_save_ldflags" -+LIBS="$af_check_libtirpc_save_libs" - ]) - - AC_DEFUN([AF_WITH_LIBTIRPC], diff --git a/meta-networking/recipes-daemons/autofs/autofs/cross.patch b/meta-networking/recipes-daemons/autofs/autofs/cross.patch index 8f1af625f0..2a4f4fd0dd 100644 --- a/meta-networking/recipes-daemons/autofs/autofs/cross.patch +++ b/meta-networking/recipes-daemons/autofs/autofs/cross.patch @@ -1,8 +1,19 @@ -Index: autofs-5.0.7/aclocal.m4 -=================================================================== ---- autofs-5.0.7.orig/aclocal.m4 2012-10-28 04:45:07.000000000 -0700 -+++ autofs-5.0.7/aclocal.m4 2012-10-28 10:47:53.263996910 -0700 -@@ -7,6 +7,8 @@ +From b9b44cd82caceeb638cc6a862b5bb90b93ad6c6a Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 5 Jan 2013 19:53:10 -0800 + +--- +Upstream-Status: Pending + + aclocal.m4 | 2 ++ + configure.in | 8 ++++++-- + 2 files changed, 8 insertions(+), 2 deletions(-) + +diff --git a/aclocal.m4 b/aclocal.m4 +index 2115204..2a9a802 100644 +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -7,6 +7,8 @@ dnl -------------------------------------------------------------------------- AC_DEFUN(AF_PATH_INCLUDE, [AC_PATH_PROGS($1,$2,$3,$4) if test -n "$$1"; then @@ -11,11 +22,11 @@ Index: autofs-5.0.7/aclocal.m4 AC_DEFINE(HAVE_$1,1,[define if you have $1]) AC_DEFINE_UNQUOTED(PATH_$1, "$$1", [define if you have $1]) HAVE_$1=1 -Index: autofs-5.0.7/configure.in -=================================================================== ---- autofs-5.0.7.orig/configure.in 2012-10-28 04:45:06.000000000 -0700 -+++ autofs-5.0.7/configure.in 2012-10-28 10:50:07.580000628 -0700 -@@ -301,13 +301,15 @@ +diff --git a/configure.in b/configure.in +index 25d7c4e..44a1c8b 100644 +--- a/configure.in ++++ b/configure.in +@@ -324,13 +324,15 @@ AC_PROG_CC cat > pietest.c <<EOF int main(void) { return 0; } EOF @@ -33,7 +44,7 @@ Index: autofs-5.0.7/configure.in AC_MSG_RESULT([$gcc_supports_pie]) if test $gcc_supports_pie = yes ; then DAEMON_CFLAGS="-fPIE" -@@ -316,6 +318,8 @@ +@@ -339,6 +341,8 @@ fi rm -f pietest.c AC_SUBST(DAEMON_CFLAGS) AC_SUBST(DAEMON_LDFLAGS) diff --git a/meta-networking/recipes-daemons/autofs/autofs/fix-the-YACC-rule-to-fix-a-building-failure.patch b/meta-networking/recipes-daemons/autofs/autofs/fix-the-YACC-rule-to-fix-a-building-failure.patch index 9b641838fa..fd736296a5 100644 --- a/meta-networking/recipes-daemons/autofs/autofs/fix-the-YACC-rule-to-fix-a-building-failure.patch +++ b/meta-networking/recipes-daemons/autofs/autofs/fix-the-YACC-rule-to-fix-a-building-failure.patch @@ -1,4 +1,7 @@ -[PATCH] fix the YACC rule to fix a building failure +From 971d48a00ef82880c34e89778bf430a01360ebd5 Mon Sep 17 00:00:00 2001 +From: Roy Li <rongqing.li@windriver.com> +Date: Mon, 18 May 2015 16:28:36 +0800 +Subject: [PATCH] [PATCH] fix the YACC rule to fix a building failure Upstream-Statu: Pending @@ -14,26 +17,17 @@ This lead to a race when compile amd_tok.o, the header file maybe rewritten. |../Makefile.rules:64: recipe for target 'amd_tok.o' failed |---------------------- Signed-off-by: Roy Li <rongqing.li@windriver.com> + --- +Upstream-Status: Pending + lib/Makefile | 6 ++++-- modules/Makefile | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) -diff --git a/lib/Makefile b/lib/Makefile -index 4798a4b..c40cf86 100644 --- a/lib/Makefile +++ b/lib/Makefile -@@ -57,7 +57,8 @@ mount_xdr.o: mount_xdr.c - master_tok.c: master_tok.l - $(LEX) -o$@ -Pmaster_ $? - --master_parse.tab.c master_parse.tab.h: master_parse.y -+master_parse.tab.h: master_parse.tab.c -+master_parse.tab.c: master_parse.y - $(YACC) -v -d -p master_ -b master_parse $? - - master_tok.o: master_tok.c master_parse.tab.h -@@ -67,7 +68,8 @@ master_parse.tab.o: master_parse.tab.c master_parse.tab.h +@@ -53,7 +53,8 @@ mount_xdr.o: mount_xdr.c nss_tok.c: nss_tok.l $(LEX) -o$@ -Pnss_ $? @@ -43,8 +37,6 @@ index 4798a4b..c40cf86 100644 $(YACC) -v -d -p nss_ -b nss_parse $? nss_tok.o: nss_tok.c nss_parse.tab.h -diff --git a/modules/Makefile b/modules/Makefile -index 237b70b..71415d0 100644 --- a/modules/Makefile +++ b/modules/Makefile @@ -103,7 +103,8 @@ amd_tok.c: amd_tok.l @@ -57,6 +49,30 @@ index 237b70b..71415d0 100644 $(YACC) -v -d -p amd_ -b amd_parse $? amd_parse.tab.o: amd_parse.tab.c amd_parse.tab.h --- -1.9.1 - +--- a/daemon/Makefile ++++ b/daemon/Makefile +@@ -16,7 +16,7 @@ YACCSRC = master_tok.c master_parse.tab. + version := $(shell cat ../.version) + + CFLAGS += -rdynamic $(DAEMON_CFLAGS) -D_GNU_SOURCE -I../include +-CFLAGS += -DAUTOFS_LIB_DIR=\"$(autofslibdir)\" ++CFLAGS += -DAUTOFS_LIB_DIR=\"$(autofslibdir)\" + CFLAGS += -DAUTOFS_MAP_DIR=\"$(autofsmapdir)\" + CFLAGS += -DAUTOFS_CONF_DIR=\"$(autofsconfdir)\" + CFLAGS += -DAUTOFS_FIFO_DIR=\"$(autofsfifodir)\" +@@ -44,7 +44,8 @@ automount: $(OBJS) $(AUTOFS_LIB) + master_tok.c: master_tok.l + $(LEX) -o$@ -Pmaster_ $? + +-master_parse.tab.c master_parse.tab.h: master_parse.y ++master_parse.tab.h: master_parse.tab.c ++master_parse.tab.c: master_parse.y + $(YACC) -v -d -p master_ -b master_parse $? + + master_tok.o: master_tok.c master_parse.tab.h +@@ -57,5 +58,3 @@ clean: + install: all + install -d -m 755 $(INSTALLROOT)$(sbindir) + install -c automount -m 755 $(INSTALLROOT)$(sbindir) +- +- diff --git a/meta-networking/recipes-daemons/autofs/autofs/fix_disable_ldap.patch b/meta-networking/recipes-daemons/autofs/autofs/fix_disable_ldap.patch index 94750b257c..414325974d 100644 --- a/meta-networking/recipes-daemons/autofs/autofs/fix_disable_ldap.patch +++ b/meta-networking/recipes-daemons/autofs/autofs/fix_disable_ldap.patch @@ -1,6 +1,9 @@ -autofs: fails to compile with openldap disabled +From c500d9906f163bf716c872d37403b9de02ef0a86 Mon Sep 17 00:00:00 2001 +From: Amy Fong <amy.fong@windriver.com> +Date: Fri, 18 Jan 2013 12:13:32 -0500 +Subject: [PATCH] autofs: fails to compile with openldap disabled -As of 5.0.6, it appears that changes were introduced so that +As of 5.0.6, it appears that changes were introduced so that if you compile with openldap disabled and openldap headers are not available, then autofs fails to build. @@ -12,13 +15,13 @@ Signed-off-by: Amy Fong <amy.fong@windriver.com> 1 file changed, 4 insertions(+) --- - include/lookup_ldap.h | 4 ++++ + include/lookup_ldap.h | 4 ++++ 1 file changed, 4 insertions(+) -Index: autofs-5.1.2/include/lookup_ldap.h -=================================================================== ---- autofs-5.1.2.orig/include/lookup_ldap.h -+++ autofs-5.1.2/include/lookup_ldap.h +diff --git a/include/lookup_ldap.h b/include/lookup_ldap.h +index 3a7aba7..bfdb0b3 100644 +--- a/include/lookup_ldap.h ++++ b/include/lookup_ldap.h @@ -1,7 +1,9 @@ #ifndef LOOKUP_LDAP_H #define LOOKUP_LDAP_H diff --git a/meta-networking/recipes-daemons/autofs/autofs/force-STRIP-to-emtpy.patch b/meta-networking/recipes-daemons/autofs/autofs/force-STRIP-to-emtpy.patch index 634005bd27..1fc500319e 100644 --- a/meta-networking/recipes-daemons/autofs/autofs/force-STRIP-to-emtpy.patch +++ b/meta-networking/recipes-daemons/autofs/autofs/force-STRIP-to-emtpy.patch @@ -1,14 +1,20 @@ -[PATCH] force STRIP to emtpy +From 3cbee00fe5725b87abdae80cfa2ee735e4513ca6 Mon Sep 17 00:00:00 2001 +From: Roy Li <rongqing.li@windriver.com> +Date: Tue, 19 Aug 2014 11:31:35 +0800 +Subject: [PATCH] [PATCH] force STRIP to emtpy otherwise the generate file will be stripped Signed-off-by: Roy Li <rongqing.li@windriver.com> + --- - Makefile.rules | 2 +- +Upstream-Status: Pending + + Makefile.rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.rules b/Makefile.rules -index 710a2c9..e4334db 100644 +index 709dd04..b1f7e50 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -31,7 +31,7 @@ LDFLAGS ?= -s @@ -20,6 +26,3 @@ index 710a2c9..e4334db 100644 else STRIP ?= strip --strip-debug endif --- -1.7.10.4 - diff --git a/meta-networking/recipes-daemons/autofs/autofs/libtirpc.patch b/meta-networking/recipes-daemons/autofs/autofs/libtirpc.patch deleted file mode 100644 index d68944b459..0000000000 --- a/meta-networking/recipes-daemons/autofs/autofs/libtirpc.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: autofs-5.0.7/aclocal.m4 -=================================================================== ---- autofs-5.0.7.orig/aclocal.m4 2012-10-28 13:17:45.504237027 -0700 -+++ autofs-5.0.7/aclocal.m4 2012-10-28 13:20:50.108242739 -0700 -@@ -403,7 +403,7 @@ - # save current flags - af_check_libtirpc_save_cflags="$CFLAGS" - af_check_libtirpc_save_ldflags="$LDFLAGS" --CFLAGS="$CFLAGS -I/usr/include/tirpc" -+CFLAGS="$CFLAGS -I=/usr/include/tirpc" - LDFLAGS="$LDFLAGS -ltirpc" - - AC_TRY_LINK( -Index: autofs-5.0.7/Makefile.rules -=================================================================== ---- autofs-5.0.7.orig/Makefile.rules 2012-10-28 13:17:45.308237022 -0700 -+++ autofs-5.0.7/Makefile.rules 2012-10-28 13:21:25.720242803 -0700 -@@ -48,7 +48,7 @@ - LIBS += -lpthread - - ifdef TIRPCLIB --CFLAGS += -I/usr/include/tirpc -+CFLAGS += -I=/usr/include/tirpc - LIBS += $(TIRPCLIB) - endif - diff --git a/meta-networking/recipes-daemons/autofs/autofs/mount_conflict.patch b/meta-networking/recipes-daemons/autofs/autofs/mount_conflict.patch new file mode 100644 index 0000000000..e2a94bf825 --- /dev/null +++ b/meta-networking/recipes-daemons/autofs/autofs/mount_conflict.patch @@ -0,0 +1,30 @@ +Avoid conflicts between sys/mount.h and linux/mount.h + +linux/fs.h includes linux/mount.h and this include file is unused so +do not include it and avoid conflict too with glibc 2.36+ see [1] + +[1] https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- a/modules/parse_amd.c ++++ b/modules/parse_amd.c +@@ -27,7 +27,6 @@ + #include <sys/utsname.h> + #include <netinet/in.h> + #include <sys/mount.h> +-#include <linux/fs.h> + + #define MODULE_PARSE + #include "automount.h" +--- a/modules/parse_sun.c ++++ b/modules/parse_sun.c +@@ -30,7 +30,6 @@ + #include <sys/utsname.h> + #include <netinet/in.h> + #include <sys/mount.h> +-#include <linux/fs.h> + + #define MODULE_PARSE + #include "automount.h" diff --git a/meta-networking/recipes-daemons/autofs/autofs/no-bash.patch b/meta-networking/recipes-daemons/autofs/autofs/no-bash.patch index cf03635270..f91c307d34 100644 --- a/meta-networking/recipes-daemons/autofs/autofs/no-bash.patch +++ b/meta-networking/recipes-daemons/autofs/autofs/no-bash.patch @@ -1,17 +1,28 @@ -Index: autofs-5.0.7/samples/auto.net -=================================================================== ---- autofs-5.0.7.orig/samples/auto.net 2012-07-24 23:05:26.000000000 -0700 -+++ autofs-5.0.7/samples/auto.net 2012-10-28 10:44:25.035991715 -0700 +From a3007d7ea930823926611081bb873ddd771325cb Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 5 Jan 2013 19:53:10 -0800 + +--- +Upstream-Status: Pending + + samples/auto.net | 2 +- + samples/auto.smb | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/samples/auto.net b/samples/auto.net +index 0384f61..61215f6 100755 +--- a/samples/auto.net ++++ b/samples/auto.net @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # This file must be executable to work! chmod 755! -Index: autofs-5.0.7/samples/auto.smb -=================================================================== ---- autofs-5.0.7.orig/samples/auto.smb 2012-07-24 23:05:26.000000000 -0700 -+++ autofs-5.0.7/samples/auto.smb 2012-10-28 10:44:25.035991715 -0700 +diff --git a/samples/auto.smb b/samples/auto.smb +index 6af5d85..d296b81 100755 +--- a/samples/auto.smb ++++ b/samples/auto.smb @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh diff --git a/meta-networking/recipes-daemons/autofs/autofs/pkgconfig-libnsl.patch b/meta-networking/recipes-daemons/autofs/autofs/pkgconfig-libnsl.patch index bf2c964a0e..be750ab897 100644 --- a/meta-networking/recipes-daemons/autofs/autofs/pkgconfig-libnsl.patch +++ b/meta-networking/recipes-daemons/autofs/autofs/pkgconfig-libnsl.patch @@ -1,19 +1,37 @@ +From 602f9ca83c2bdbf511bcb178fcb4b9fc54da955f Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Tue, 27 Nov 2018 15:20:46 +0800 +Subject: [PATCH] From e3ae56cf0bb4063c31295f45d04e3c504f4b6cc7 Mon Sep 17 + 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Mon, 24 Apr 2017 + 20:41:25 -0700 Subject: [PATCH] autofs: Upgrade to 5.1.2 release + Use pkg-config first to look for external libnsl which is now split out from glibc, if it does not exist then see if its provided by glibc itself. -Khem -Index: autofs-5.1.2/configure.in -=================================================================== ---- autofs-5.1.2.orig/configure.in -+++ autofs-5.1.2/configure.in -@@ -186,7 +186,7 @@ fi - # - # glibc/libc 6 new libraries - # --AC_CHECK_LIB(nsl, yp_match, LIBNSL="-lnsl") -+PKG_CHECK_MODULES([NSL], [libnsl], [], [AC_CHECK_LIB([nsl],[yp_match],[LIBNSL="-lnsl"],[LIBNSL=""])]) - AC_SUBST(LIBNSL) +Upstream-Status: Pending + +update patch to version 5.1.5 +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.in b/configure.in +index 76ecb40..493b9f1 100644 +--- a/configure.in ++++ b/configure.in +@@ -238,7 +238,7 @@ AC_SUBST(LIBCLOCK_GETTIME) - AC_CHECK_LIB(resolv, res_query, LIBRESOLV="-lresolv") + PKG_CHECK_MODULES([NSL],[libnsl],, + [ +-AC_CHECK_LIB(nsl, yp_match, NSL_LIBS="-lnsl") ++PKG_CHECK_MODULES([NSL], [libnsl], [], [AC_CHECK_LIB([nsl],[yp_match],[LIBNSL="-lnsl"],[LIBNSL=""])]) + AC_SUBST(NSL_LIBS) + NSL_CFLAGS="" + ]) +-- +2.7.4 + diff --git a/meta-networking/recipes-daemons/autofs/autofs/remove-bashism.patch b/meta-networking/recipes-daemons/autofs/autofs/remove-bashism.patch index 282d6f0ad2..4183069bb1 100644 --- a/meta-networking/recipes-daemons/autofs/autofs/remove-bashism.patch +++ b/meta-networking/recipes-daemons/autofs/autofs/remove-bashism.patch @@ -1,4 +1,4 @@ -From 79034f969bbd12215d65b4337dfd38a13d02d4ef Mon Sep 17 00:00:00 2001 +From cfacbb917f87b903b50132a5025f86b0cc522e9c Mon Sep 17 00:00:00 2001 From: Robert Yang <liezhi.yang@windriver.com> Date: Sat, 13 Sep 2014 20:19:28 -0700 Subject: [PATCH] autofs.init.in: remove bashism @@ -9,9 +9,10 @@ Upstream-Status: Pending Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> + --- - redhat/autofs.init.in | 12 ++++++------ - samples/rc.autofs.in | 10 +++++----- + redhat/autofs.init.in | 12 ++++++------ + samples/rc.autofs.in | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/redhat/autofs.init.in b/redhat/autofs.init.in @@ -115,6 +116,3 @@ index 487669f..e96cde1 100644 pid=`pidof $prog` if [ -z $pid ]; then echo $"$prog not running" --- -1.7.9.5 - diff --git a/meta-networking/recipes-daemons/autofs/autofs/using-pkg-config-to-detect-libxml-2.0-and-krb5.patch b/meta-networking/recipes-daemons/autofs/autofs/using-pkg-config-to-detect-libxml-2.0-and-krb5.patch index 93b76bd66e..41de373fd4 100644 --- a/meta-networking/recipes-daemons/autofs/autofs/using-pkg-config-to-detect-libxml-2.0-and-krb5.patch +++ b/meta-networking/recipes-daemons/autofs/autofs/using-pkg-config-to-detect-libxml-2.0-and-krb5.patch @@ -1,39 +1,36 @@ -using pkg-config to detect libxml-2.0 and krb5 +From dd90a690f95569b999b8ac9ab57e834b3421dcbb Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Tue, 27 Nov 2018 15:19:07 +0800 +Subject: [PATCH] From dabcbdae38038a8e4ad2c4286112381c407c5ce7 Mon Sep 17 + 00:00:00 2001 From: Roy Li <rongqing.li@windriver.com> Date: Tue, 19 Aug 2014 + 11:31:35 +0800 Subject: [PATCH] using pkg-config to detect libxml-2.0 and + krb5 -Upstream-status: Pending +Upstream-Status: Pending Signed-off-by: Roy Li <rongqing.li@windriver.com> + +update patch to 5.1.5 +Signed-off-by: Changqing Li <changqing.li@windriver.com> --- - configure.in | 16 ++++++++++++++-- - 2 files changed, 14 insertions(+), 2 deletions(-) + configure.in | 16 ++++++++++++++-- + 1 file changed, 14 insertions(+), 2 deletions(-) -diff --git a/configure.in b/configure.in -index 392d122..a3028aa 100644 --- a/configure.in +++ b/configure.in -@@ -162,8 +162,20 @@ if test x$enable_sloppy_mount = xyes; then - fi - - # LDAP SASL auth needs libxml and Kerberos --AF_CHECK_LIBXML() +@@ -215,7 +215,14 @@ PKG_CHECK_MODULES([XML], [libxml-2.0], [ + AC_DEFINE(LIBXML2_WORKAROUND, 1, [Use libxml2 tsd usage workaround]) + ], [HAVE_LIBXML=0]) + -AF_CHECK_KRB5() -+PKG_CHECK_MODULES(XML, [libxml-2.0],HAVE_LIBXML=1,HAVE_LIBXML=0) -+AC_SUBST([HAVE_LIBXML]) -+XML_FLAGS=$XML_CFLAGS -+ -+PKG_CHECK_MODULES(KRB5, [krb5],HAVE_KRB5=1,HAVE_KRB5=0) -+AC_SUBST([HAVE_KRB5]) -+if test "x$HAVE_KRB5" = "x1"; then ++PKG_CHECK_MODULES(KRB5, [krb5], [ ++ HAVE_KRB5=1 + SAVE_CFLAGS=$CFLAGS + SAVE_LIBS=$LIBS + CFLAGS="$CFLAGS $KRB5_FLAGS" + LIBS="$LIBS $KRB5_LIBS" -+ + AC_CHECK_FUNCS([krb5_principal_get_realm]) -+fi - ++], [HAVE_KRB5=0]) + AC_SEARCH_LIBS([versionsort],[]) if test "$ac_cv_search_versionsort" = "no"; then --- -1.7.10.4 - diff --git a/meta-networking/recipes-daemons/autofs/autofs_5.1.2.bb b/meta-networking/recipes-daemons/autofs/autofs_5.1.8.bb index 68c64fdb04..e3f9777380 100644 --- a/meta-networking/recipes-daemons/autofs/autofs_5.1.2.bb +++ b/meta-networking/recipes-daemons/autofs/autofs_5.1.8.bb @@ -1,7 +1,7 @@ SUMMARY = "Kernel based automounter for linux" SECTION = "utils" -LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=ee9324a6f564bb2376b63878ac396798" DEPENDS += "libtirpc flex-native bison-native e2fsprogs openssl libxml2 util-linux cyrus-sasl libnsl2" @@ -10,11 +10,8 @@ CFLAGS += "-I${STAGING_INCDIR}/tirpc" inherit autotools-brokensep systemd update-rc.d pkgconfig SRC_URI = "${KERNELORG_MIRROR}/linux/daemons/autofs/v5/autofs-${PV}.tar.gz \ - file://autofs-5.0.7-include-linux-nfs.h-directly-in-rpc_sub.patch \ file://no-bash.patch \ file://cross.patch \ - file://libtirpc.patch \ - file://autofs-5.0.7-do-not-check-for-modprobe.patch \ file://fix_disable_ldap.patch \ file://autofs-5.0.7-fix-lib-deps.patch \ file://add-the-needed-stdarg.h.patch \ @@ -24,12 +21,19 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/daemons/autofs/v5/autofs-${PV}.tar.gz \ file://fix-the-YACC-rule-to-fix-a-building-failure.patch \ file://0001-Define-__SWORD_TYPE-and-_PATH_NSSWITCH_CONF.patch \ file://0002-Replace-__S_IEXEC-with-S_IEXEC.patch \ - file://autofs-5.1.2-libtirpc-as-need.patch \ file://pkgconfig-libnsl.patch \ file://0001-modules-lookup_multi.c-Replace-__S_IEXEC-with-S_IEXE.patch \ + file://0001-Do-not-hardcode-path-for-pkg.m4.patch \ + file://0001-Bug-fix-for-pid_t-not-found-on-musl.patch \ + file://0001-Define-__SWORD_TYPE-if-undefined.patch \ + file://mount_conflict.patch \ + file://0001-autofs-5.1.8-add-autofs_strerror_r-helper-for-musl.patch \ + file://0002-autofs-5.1.8-handle-innetgr-not-present-in-musl.patch \ + file://0001-include-libgen.h-for-basename.patch \ " -SRC_URI[md5sum] = "28cf88f99eff553a8500659ba5d45a76" -SRC_URI[sha256sum] = "0d57e4138c2ec8058ca92164d035546f68ce4af93acb893369993d67c7056a10" +SRC_URI[sha256sum] = "0bd401c56f0eb1ca6251344c3a3d70bface3eccf9c67117cd184422c4cace30c" + +UPSTREAM_CHECK_URI = "${KERNELORG_MIRROR}/linux/daemons/autofs/v5/" INITSCRIPT_NAME = "autofs" INITSCRIPT_PARAMS = "defaults" @@ -44,34 +48,54 @@ PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" EXTRA_OEMAKE = "DONTSTRIP=1" EXTRA_OECONF += "--disable-mount-locking \ --enable-ignore-busy --with-openldap=no \ + --with-confdir=${sysconfdir}/default \ + --with-fifodir=/run \ + --with-flagdir=/run \ --with-sasl=no --with-libtirpc \ + --with-mapdir=${sysconfdir} \ --with-path=${STAGING_BINDIR_NATIVE} \ + --with-fifodir=${localstatedir}/run \ + --with-flagdir=${localstatedir}/run \ " CACHED_CONFIGUREVARS = "ac_cv_path_RANLIB=${RANLIB} \ ac_cv_path_RPCGEN=rpcgen \ + initdir=${INIT_D_DIR} \ + piddir=/run \ " -do_configure_prepend () { - sed -e "s:filagdir:flagdir:" -i ${S}/configure.in +do_configure:prepend () { if [ ! -e ${S}/acinclude.m4 ]; then cp ${S}/aclocal.m4 ${S}/acinclude.m4 fi + cp ${STAGING_DATADIR_NATIVE}/aclocal/pkg.m4 . } -do_install_append () { +do_install:append () { + # samples have been removed from SUBDIRS from 5.1.5, need to install separately + oe_runmake 'DESTDIR=${D}' install_samples + if [ -d ${D}/run ]; then rmdir ${D}/run fi if [ -d ${D}${localstatedir}/run ]; then rmdir ${D}${localstatedir}/run fi + # On hybrid systemd/sysvinit builds, we need to install the sysvinit script by hand. + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + install -d -m 755 ${D}${INIT_D_DIR} + install -m 755 ${S}/samples/rc.autofs ${D}${INIT_D_DIR}/autofs + fi } SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" -INSANE_SKIP_${PN} = "dev-so" - -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -RCONFLICTS_${PN} += "${PN}-systemd" -SYSTEMD_SERVICE_${PN} = "autofs.service" +# all the libraries are unversioned, so don't pack it on PN-dev +SOLIBS = ".so" +FILES_SOLIBSDEV = "" +# Some symlinks are created in plugins dir e.g. +# mount_nfs4.so -> mount_nfs.so +INSANE_SKIP:${PN} = "dev-so" +RPROVIDES:${PN} += "${PN}-systemd" +RREPLACES:${PN} += "${PN}-systemd" +RCONFLICTS:${PN} += "${PN}-systemd" +SYSTEMD_SERVICE:${PN} = "autofs.service" diff --git a/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/Fix-hardcoded-libdir.patch b/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/Fix-hardcoded-libdir.patch deleted file mode 100644 index 3fa8431c34..0000000000 --- a/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/Fix-hardcoded-libdir.patch +++ /dev/null @@ -1,25 +0,0 @@ -Fix hardcoded libdir. - -Upstream-Status: Pending - -Signed-off-by: Roy.Li <rongqing.li@windriver.com> ---- - plugins/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/plugins/Makefile.am b/plugins/Makefile.am -index b00915f..25262a1 100644 ---- a/plugins/Makefile.am -+++ b/plugins/Makefile.am -@@ -62,7 +62,7 @@ plugindir = @plugindir@ - - common_sources = plugin_common.c plugin_common.h - --sasldir = $(prefix)/lib/sasl2 -+sasldir = $(libdir)/sasl2 - sasl_LTLIBRARIES = @SASL_MECHS@ - EXTRA_LTLIBRARIES = libplain.la libanonymous.la libkerberos4.la libcrammd5.la \ - libgs2.la libgssapiv2.la libdigestmd5.la liblogin.la libsrp.la libotp.la \ --- -1.7.4.1 - diff --git a/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/avoid-to-call-AC_TRY_RUN.patch b/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/avoid-to-call-AC_TRY_RUN.patch deleted file mode 100644 index 6407721ae3..0000000000 --- a/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/avoid-to-call-AC_TRY_RUN.patch +++ /dev/null @@ -1,46 +0,0 @@ -Avoid to call AC_TRY_RUN - -Upstream-Status: Inappropriate [configuration] - -Avoid to call AC_TRY_RUN to check if GSSAPI libraries support SPNEGO -on cross-compile environment by definition AC_ARG_ENABLE enable-spnego - -Signed-off-by: Roy.Li <rongqing.li@windriver.com> ---- - cmulocal/sasl2.m4 | 13 ++++++++++++- - 1 file changed, 12 insertions(+), 1 deletion(-) - -diff --git a/cmulocal/sasl2.m4 b/cmulocal/sasl2.m4 -index 3c2841a..a5ecf81 100644 ---- a/cmulocal/sasl2.m4 -+++ b/cmulocal/sasl2.m4 -@@ -281,6 +281,17 @@ if test "$gssapi" != no; then - - cmu_save_LIBS="$LIBS" - LIBS="$LIBS $GSSAPIBASE_LIBS" -+ AC_ARG_ENABLE([spnego], -+ [AC_HELP_STRING([--enable-spnego=<DIR>], -+ [enable SPNEGO support in GSSAPI libraries [no]])], -+ [spnego=$enableval], -+ [spnego=no]) -+ -+ if test "$spnego" = no; then -+ echo "no" -+ elif test "$spnego" = yes; then -+ AC_DEFINE(HAVE_GSS_SPNEGO,,[Define if your GSSAPI implementation supports SPNEGO]) -+ else - AC_MSG_CHECKING([for SPNEGO support in GSSAPI libraries]) - AC_TRY_RUN([ - #ifdef HAVE_GSSAPI_H -@@ -308,7 +319,7 @@ int main(void) - AC_MSG_RESULT(yes) ], - AC_MSG_RESULT(no)) - LIBS="$cmu_save_LIBS" -- -+ fi - else - AC_MSG_RESULT([disabled]) - fi --- -1.7.10.4 - diff --git a/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/debian_patches_0009_sasldb_al.diff b/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/debian_patches_0009_sasldb_al.diff deleted file mode 100644 index 8eff5a8bdd..0000000000 --- a/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/debian_patches_0009_sasldb_al.diff +++ /dev/null @@ -1,14 +0,0 @@ -Author: Fabian Fagerholm <fabbe@debian.org> -Description: Fix linking with libsasldb.a when saslauthd is built with sasldb -support. ---- a/saslauthd/configure.in -+++ b/saslauthd/configure.in -@@ -77,7 +77,7 @@ if test "$authsasldb" != no; then - AC_DEFINE(AUTH_SASLDB,[],[Include SASLdb Support]) - SASL_DB_PATH_CHECK() - SASL_DB_CHECK() -- SASL_DB_LIB="$SASL_DB_LIB ../sasldb/.libs/libsasldb.al" -+ SASL_DB_LIB="$SASL_DB_LIB ../sasldb/.libs/libsasldb.a" - fi - - AC_ARG_ENABLE(httpform, [ --enable-httpform enable HTTP form authentication [[no]] ], diff --git a/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/debian_patches_0014_avoid_pic_overwrite.diff b/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/debian_patches_0014_avoid_pic_overwrite.diff deleted file mode 100644 index 2e5b1750d0..0000000000 --- a/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/debian_patches_0014_avoid_pic_overwrite.diff +++ /dev/null @@ -1,27 +0,0 @@ -Author: Fabian Fagerholm <fabbe@debian.org> -Description: This patch makes sure the non-PIC version of libsasldb.a, which -is created out of non-PIC objects, is not going to overwrite the PIC version, -which is created out of PIC objects. The PIC version is placed in .libs, and -the non-PIC version in the current directory. This ensures that both non-PIC -and PIC versions are available in the correct locations. ---- a/lib/Makefile.am -+++ b/lib/Makefile.am -@@ -78,7 +78,7 @@ endif - - libsasl2.a: libsasl2.la $(SASL_STATIC_OBJS) - @echo adding static plugins and dependencies -- $(AR) cru .libs/$@ $(SASL_STATIC_OBJS) -+ $(AR) cru $@ $(SASL_STATIC_OBJS) - @for i in ./libsasl2.la ../sasldb/libsasldb.la ../plugins/lib*.la; do \ - if test ! -f $$i; then continue; fi; . $$i; \ - for j in $$dependency_libs foo; do \ ---- a/sasldb/Makefile.am -+++ b/sasldb/Makefile.am -@@ -63,6 +63,6 @@ libsasldb_a_SOURCES = - EXTRA_libsasldb_a_SOURCES = - - libsasldb.a: libsasldb.la $(SASL_DB_BACKEND_STATIC) -- $(AR) cru .libs/$@ $(SASL_DB_BACKEND_STATIC) -+ $(AR) cru $@ $(SASL_DB_BACKEND_STATIC) - - diff --git a/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/sasl.h-include-stddef.h-for-size_t-on-NetBSD.patch b/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/sasl.h-include-stddef.h-for-size_t-on-NetBSD.patch deleted file mode 100644 index ecbab845d0..0000000000 --- a/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/sasl.h-include-stddef.h-for-size_t-on-NetBSD.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 92d72789c811b0d55f624a8bac5ccc4412f5996e Mon Sep 17 00:00:00 2001 -From: Ken Murchison <murch@andrew.cmu.edu> -Date: Thu, 20 Dec 2012 18:14:50 -0500 -Subject: [PATCH] sasl.h: #include <stddef.h> for size_t on NetBSD - -This patch was imported from git://git.cyrusimap.org/cyrus-sasl -commit 67a188693796a14e3a76ac603104807fbbfddfc4 - -Upstream-Status: Backport - -Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> ---- - include/sasl.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/include/sasl.h b/include/sasl.h -index fef4d51..8b8a63f 100755 ---- a/include/sasl.h -+++ b/include/sasl.h -@@ -121,6 +121,8 @@ - #ifndef SASL_H - #define SASL_H 1 - -+#include <stddef.h> /* For size_t */ -+ - /* Keep in sync with win32/common.mak */ - #define SASL_VERSION_MAJOR 2 - #define SASL_VERSION_MINOR 1 --- -1.8.3.2 - diff --git a/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/saslauthd.conf b/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/saslauthd.conf deleted file mode 100644 index a91a9d3340..0000000000 --- a/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/saslauthd.conf +++ /dev/null @@ -1,11 +0,0 @@ -# Directory in which to place saslauthd's listening socket, pid file, and so -# on. This directory must already exist. -SOCKETDIR=@LOCALSTATEDIR@/run/saslauthd - -# Mechanism to use when checking passwords. Run "saslauthd -v" to get a list -# of which mechanism your installation was compiled with the ablity to use. -MECH=pam - -# Additional flags to pass to saslauthd on the command line. See saslauthd(8) -# for the list of accepted flags. -FLAGS= diff --git a/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/saslauthd.service b/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/saslauthd.service deleted file mode 100644 index 96dbae3782..0000000000 --- a/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/saslauthd.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=SASL authentication daemon. -After=syslog.target - -[Service] -Type=forking -PIDFile=@LOCALSTATEDIR@/run/saslauthd/saslauthd.pid -EnvironmentFile=@SYSCONFDIR@/default/saslauthd -ExecStart=@SBINDIR@/saslauthd -m $SOCKETDIR -a $MECH $FLAGS - -[Install] -WantedBy=multi-user.target diff --git a/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb b/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb deleted file mode 100644 index 64d1a76d6f..0000000000 --- a/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb +++ /dev/null @@ -1,96 +0,0 @@ -SUMMARY = "Generic client/server library for SASL authentication" -SECTION = "libs" -HOMEPAGE = "http://asg.web.cmu.edu/sasl/" -DEPENDS = "openssl db" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=3f55e0974e3d6db00ca6f57f2d206396" - -SRC_URI = "ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-${PV}.tar.gz \ - file://avoid-to-call-AC_TRY_RUN.patch \ - file://Fix-hardcoded-libdir.patch \ - file://debian_patches_0009_sasldb_al.diff \ - file://debian_patches_0014_avoid_pic_overwrite.diff \ - file://sasl.h-include-stddef.h-for-size_t-on-NetBSD.patch \ - file://saslauthd.service \ - file://saslauthd.conf \ -" - -inherit autotools-brokensep pkgconfig useradd systemd - -EXTRA_OECONF += "--with-dblib=berkeley \ - --with-bdb-libdir=${STAGING_LIBDIR} \ - --with-bdb-incdir=${STAGING_INCDIR} \ - --with-bdb=db-5.3 \ - --with-plugindir="${libdir}/sasl2" \ - andrew_cv_runpath_switch=none" - -PACKAGECONFIG ??= "ntlm \ - ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 ldap pam', d)} \ -" -PACKAGECONFIG[gssapi] = "--enable-gssapi=yes,--enable-gssapi=no,krb5," -PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam," -PACKAGECONFIG[opie] = "--with-opie,--without-opie,opie," -PACKAGECONFIG[des] = "--with-des,--without-des,," -PACKAGECONFIG[ldap] = "--with-ldap=${STAGING_LIBDIR} --enable-ldapdb,--without-ldap --disable-ldapdb,openldap," -PACKAGECONFIG[ntlm] = "--with-ntlm,--without-ntlm,," -PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," - -CFLAGS += "-fPIC" - -do_configure_prepend () { - rm -f acinclude.m4 config/libtool.m4 - - # make it be able to work with db 5.0 version - local sed_files="sasldb/db_berkeley.c utils/dbconverter-2.c" - for sed_file in $sed_files; do - sed -i 's#DB_VERSION_MAJOR == 4.*#(&) || DB_VERSION_MAJOR == 5#' $sed_file - done -} - -do_compile_prepend () { - cd include - ${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} makemd5.c -o makemd5 - touch makemd5.o makemd5.lo makemd5 - cd .. -} - -do_install_append() { - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/saslauthd.service ${D}${systemd_unitdir}/system - - sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/saslauthd.service - sed -i -e 's#@LOCALSTATEDIR@#${localstatedir}#g' ${D}${systemd_unitdir}/system/saslauthd.service - sed -i -e 's#@SYSCONFDIR@#${sysconfdir}#g' ${D}${systemd_unitdir}/system/saslauthd.service - - install -d ${D}${sysconfdir}/tmpfiles.d - echo "d /run/saslauthd/ - - - -" > ${D}${sysconfdir}/tmpfiles.d/saslauthd.conf - - install -d ${D}${sysconfdir}/default/ - install -m 0644 ${WORKDIR}/saslauthd.conf ${D}${sysconfdir}/default/saslauthd - sed -i -e 's#@LOCALSTATEDIR@#${localstatedir}#g' ${D}${sysconfdir}/default/saslauthd - fi -} - -USERADD_PACKAGES = "${PN}-bin" -USERADD_PARAM_${PN}-bin = "--system --home=/var/spool/mail -g mail cyrus" - -SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "saslauthd.service" -SYSTEMD_AUTO_ENABLE = "disable" - -SRC_URI[md5sum] = "a7f4e5e559a0e37b3ffc438c9456e425" -SRC_URI[sha256sum] = "8fbc5136512b59bb793657f36fadda6359cae3b08f01fd16b3d406f1345b7bc3" - -PACKAGES =+ "${PN}-bin" - -FILES_${PN} += "${libdir}/sasl2/*.so*" -FILES_${PN}-bin += "${bindir} \ - ${sysconfdir}/default/saslauthd \ - ${systemd_unitdir}/system/saslauthd.service \ - ${sysconfdir}/tmpfiles.d/saslauthd.conf" -FILES_${PN}-dev += "${libdir}/sasl2/*.la" -FILES_${PN}-dbg += "${libdir}/sasl2/.debug" -FILES_${PN}-staticdev += "${libdir}/sasl2/*.a" - -INSANE_SKIP_${PN} += "dev-so" diff --git a/meta-networking/recipes-daemons/dnrd/dnrd/dnrd.conf.sample b/meta-networking/recipes-daemons/dnrd/dnrd/dnrd.conf.sample deleted file mode 100644 index ec0584193d..0000000000 --- a/meta-networking/recipes-daemons/dnrd/dnrd/dnrd.conf.sample +++ /dev/null @@ -1,21 +0,0 @@ -# options to dnrd - -# example: two default dns servers and dns servers for exampledomain.com. The -# latter are load balanced (-b) -# -# - -# DNRD_OPTS=" -# -s XXX.XXX.XX.XXX -# -s XXX.XXX.XX.XXX -# -b -# -s XXX.XXX.XX.XXX:exampledomain.com -# -s XXX.XXX.XX.XXX:exampledomain.com" - -# example: dnrd user -# - -# DNRD_USER="user" -# - - diff --git a/meta-networking/recipes-daemons/dnrd/dnrd/dnrd.init b/meta-networking/recipes-daemons/dnrd/dnrd/dnrd.init deleted file mode 100644 index 2fe583fcf9..0000000000 --- a/meta-networking/recipes-daemons/dnrd/dnrd/dnrd.init +++ /dev/null @@ -1,94 +0,0 @@ -#!/bin/sh -# -# Startup script for dnrd -# -# Copyright 2008, Rakesh Pandit <rakesh.pandit@gmail.com> -# -# This source is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This source is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# -# chkconfig: - 85 15 -# description: dnrd is a proxying nameserver. It forwards DNS queries to the -# appropriate nameserver, but can also act as the primary nameserver for -# a subnet behind a firewall. It also has features such as caching DNS -# requests, support for DNS servers, cache poisoning prevention, TCP -# support, etc.. - -# processname: dnrd -# pidfile: /var/run/dnrd.pid -# config: /etc/dnrd/dnrd.conf - -# Provides: dnrd -# Required-Start: -# Should-Start: -# Required-Stop: -# Default-Stop: 0 1 2 6 -# Short-Description: Start dnrd daemon -# Description: Domain Name Relay Daemon -# END INIT INFO - -exe=/usr/sbin/dnrd -pfile=/etc/passwd - -# Source function library. -. /etc/init.d/functions - -# Source conf file -. /etc/dnrd/dnrd.conf - -[ -x $exe ] || exit 1 -[ -r "/etc/dnrd/dnrd.conf" ] || exit 1 -if [ $DNRD_USER ] -then - grep "^${LOGIN}:" $pfile >/dev/null 2>&1 - if [ $? -eq 0 ];then - echo "$DNRD_USER specified in /etc/dnrd/dnrd.conf does not exist!" - fi -else - echo "DNRD_USER not set at /etc/dnrd/dnrd.conf!" - exit 1 -fi - -case "$1" in - start) - echo -n "Starting dnrd: " - daemon dnrd $DNRD_OPTS -u $DNRD_USER - echo - touch /var/lock/subsys/dnrd - ;; - stop) - echo -n "Shutting down dnrd: " - killproc dnrd - echo - rm -f /var/lock/subsys/dnrd - rm -f /var/run/dnrd.pid - ;; - status) - status dnrd - ;; - restart) - $0 stop - $0 start - ;; - reload) - echo -n "Reloading dnrd: " - killproc dnrd -HUP - echo - ;; - *) - echo "Usage: $0 {start|stop|restart|reload|status}" - exit 1 -esac - -exit 0 diff --git a/meta-networking/recipes-daemons/dnrd/dnrd/dnrd.service b/meta-networking/recipes-daemons/dnrd/dnrd/dnrd.service deleted file mode 100644 index 9c9fa66394..0000000000 --- a/meta-networking/recipes-daemons/dnrd/dnrd/dnrd.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Domain Name Relay Daemon -After=network.target - -[Service] -Type=forking -PIDFile=/var/run/dnrd.pid -EnvironmentFile=/etc/dnrd/dnrd.conf -ExecStart=/usr/sbin/dnrd $DNRD_OPTS -u $DNRD_USER - -[Install] -WantedBy=multi-user.target diff --git a/meta-networking/recipes-daemons/igmpproxy/igmpproxy/0001-src-igmpproxy.h-Include-sys-types.h-for-u_short-u_in.patch b/meta-networking/recipes-daemons/igmpproxy/igmpproxy/0001-src-igmpproxy.h-Include-sys-types.h-for-u_short-u_in.patch deleted file mode 100644 index 82cdc36ac4..0000000000 --- a/meta-networking/recipes-daemons/igmpproxy/igmpproxy/0001-src-igmpproxy.h-Include-sys-types.h-for-u_short-u_in.patch +++ /dev/null @@ -1,25 +0,0 @@ -From a557651a08e21e3c7c7f5eca9f5405f86624903f Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 14 Jul 2017 22:42:51 -0700 -Subject: [PATCH] src/igmpproxy.h: Include sys/types.h for u_short/u_init - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/igmpproxy.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/igmpproxy.h b/src/igmpproxy.h -index 4dabd1c..4454729 100644 ---- a/src/igmpproxy.h -+++ b/src/igmpproxy.h -@@ -46,6 +46,7 @@ - #include <stdbool.h> - - #include <sys/socket.h> -+#include <sys/types.h> - #include <sys/un.h> - #include <sys/time.h> - #include <sys/ioctl.h> --- -2.13.3 - diff --git a/meta-networking/recipes-daemons/igmpproxy/igmpproxy_0.1.bb b/meta-networking/recipes-daemons/igmpproxy/igmpproxy_0.1.bb deleted file mode 100644 index 5424dc455e..0000000000 --- a/meta-networking/recipes-daemons/igmpproxy/igmpproxy_0.1.bb +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "simple dynamic multicast routing daemon that only uses IGMP signalling" -HOMEPAGE = "http://sourceforge.net/projects/igmpproxy/" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=1e995e2799bb0d27d63069b97f805420" - -SRC_URI = "http://sourceforge.net/projects/igmpproxy/files/${BPN}/${PV}/${BPN}-${PV}.tar.gz \ - file://0001-src-igmpproxy.h-Include-sys-types.h-for-u_short-u_in.patch \ - " - -SRC_URI[md5sum] = "c56f41ec195bc1fe016369bf74efc5a1" -SRC_URI[sha256sum] = "ee18ff3d8c3ae3a29dccb7e5eedf332337330020168bd95a11cece8d7d7ee6ae" - -inherit autotools pkgconfig - -CFLAGS += "-D_GNU_SOURCE" diff --git a/meta-networking/recipes-daemons/igmpproxy/igmpproxy_0.3.bb b/meta-networking/recipes-daemons/igmpproxy/igmpproxy_0.3.bb new file mode 100644 index 0000000000..e8567ccebf --- /dev/null +++ b/meta-networking/recipes-daemons/igmpproxy/igmpproxy_0.3.bb @@ -0,0 +1,13 @@ +SUMMARY = "simple dynamic multicast routing daemon that only uses IGMP signalling" +HOMEPAGE = "http://sourceforge.net/projects/igmpproxy/" + +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=432040ff3a55670c1dec0c32b209ad69" + +SRC_URI = "https://github.com/pali/igmpproxy/releases/download/${PV}/${BP}.tar.gz" +SRC_URI[md5sum] = "5565874d9631103109a72452cecb5ce7" +SRC_URI[sha256sum] = "d1fc244cb2fbbf99f720bda3e841fe59ece9b6919073790b4b892739b1b844eb" + +UPSTREAM_CHECK_URI = "https://github.com/pali/${BPN}/releases" + +inherit autotools pkgconfig diff --git a/meta-networking/recipes-daemons/ippool/ippool/0001-Respect-flags-from-env.patch b/meta-networking/recipes-daemons/ippool/ippool/0001-Respect-flags-from-env.patch index e967621259..5555d464c1 100644 --- a/meta-networking/recipes-daemons/ippool/ippool/0001-Respect-flags-from-env.patch +++ b/meta-networking/recipes-daemons/ippool/ippool/0001-Respect-flags-from-env.patch @@ -5,6 +5,8 @@ Subject: [PATCH 1/3] Respect flags from env Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + Makefile | 4 ++-- cli/Makefile | 2 +- pppd/Makefile | 2 +- diff --git a/meta-networking/recipes-daemons/ippool/ippool/0001-Use-unsigned-int-type-for-1-bit-integer-bitfield.patch b/meta-networking/recipes-daemons/ippool/ippool/0001-Use-unsigned-int-type-for-1-bit-integer-bitfield.patch new file mode 100644 index 0000000000..0533616722 --- /dev/null +++ b/meta-networking/recipes-daemons/ippool/ippool/0001-Use-unsigned-int-type-for-1-bit-integer-bitfield.patch @@ -0,0 +1,42 @@ +From 4788ce6ec602f6441970e1095572c4ff0e90c7c5 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 17 Jan 2023 22:33:52 -0800 +Subject: [PATCH] Use unsigned int type for 1-bit integer bitfield + +In C++, signed integers are represented in two's complement. This also applies to signed bitfields. +A signed bitfield composed of one bit can therefore store a value in the range -1 to 0. +Assigning a value of 1 to such a bitfield should produce a warning since it is out of range of representable values. +Therefore fix this case by using unsigned int instead of signed int + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + usl/usl_signal.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/usl/usl_signal.c b/usl/usl_signal.c +index 45ddd94..8c1d4d0 100644 +--- a/usl/usl_signal.c ++++ b/usl/usl_signal.c +@@ -39,12 +39,12 @@ struct usl_notifier { + }; + + typedef struct { +- volatile int sighup:1; +- volatile int sigterm:1; +- volatile int sigchld:1; +- volatile int sigusr1:1; +- volatile int sigusr2:1; +- volatile int running:1; ++ volatile unsigned int sighup:1; ++ volatile unsigned int sigterm:1; ++ volatile unsigned int sigchld:1; ++ volatile unsigned int sigusr1:1; ++ volatile unsigned int sigusr2:1; ++ volatile unsigned int running:1; + sig_atomic_t waiting; + sigjmp_buf sigjmp; + } usl_signal_data_t; +-- +2.39.1 + diff --git a/meta-networking/recipes-daemons/ippool/ippool/0001-ippool-Port-to-ppp-2.5-APIs.patch b/meta-networking/recipes-daemons/ippool/ippool/0001-ippool-Port-to-ppp-2.5-APIs.patch new file mode 100644 index 0000000000..59d7b1e847 --- /dev/null +++ b/meta-networking/recipes-daemons/ippool/ippool/0001-ippool-Port-to-ppp-2.5-APIs.patch @@ -0,0 +1,60 @@ +From e1b93db6a13d955c6bab6358a7fa27fecb59479f Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 11 May 2023 17:24:46 -0700 +Subject: [PATCH] ippool: Port to ppp 2.5 APIs + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + pppd/ippool.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/pppd/ippool.c b/pppd/ippool.c +index 88cb901..d4b5c97 100644 +--- a/pppd/ippool.c ++++ b/pppd/ippool.c +@@ -6,7 +6,7 @@ + #include <stdlib.h> + #include <errno.h> + #include "pppd.h" +-#include "pathnames.h" ++#include "options.h" + #include "fsm.h" /* Needed for lcp.h to include cleanly */ + #include "lcp.h" + #include "ccp.h" +@@ -23,7 +23,7 @@ + + #include "ippool_rpc.h" + +-const char pppd_version[] = VERSION; ++const char pppd_version[] = PPPD_VERSION; + + static char *ippool_pool_name = NULL; + static char *ippool_pool_name2 = NULL; +@@ -205,13 +205,13 @@ void plugin_init(void) + { + #if defined(__linux__) + extern int new_style_driver; /* From sys-linux.c */ +- if (!ppp_available() && !new_style_driver) ++ if (!ppp_check_kernel_support() && !new_style_driver) + fatal("Kernel doesn't support ppp_generic - " + "needed for Ippool"); + #else + fatal("No IP pool support on this OS"); + #endif +- add_options(ippool_options); ++ ppp_add_options(ippool_options); + + memset(&ippool_addr, 0, sizeof(ippool_addr)); + +@@ -219,6 +219,6 @@ void plugin_init(void) + ip_down_hook = ippool_release_ip; + + /* brute force, just in case ip_down_hook doesn't get called */ +- add_notifier(&exitnotify, ippool_cleanup, 0); ++ ppp_add_notify(NF_EXIT, ippool_cleanup, 0); + } + +-- +2.40.1 + diff --git a/meta-networking/recipes-daemons/ippool/ippool/0001-pppd-ippool.c-Fix-type-casting-issues-between-in_add.patch b/meta-networking/recipes-daemons/ippool/ippool/0001-pppd-ippool.c-Fix-type-casting-issues-between-in_add.patch new file mode 100644 index 0000000000..a98c179290 --- /dev/null +++ b/meta-networking/recipes-daemons/ippool/ippool/0001-pppd-ippool.c-Fix-type-casting-issues-between-in_add.patch @@ -0,0 +1,72 @@ +From da67444994bde603c7ff1483a6803bdab24e1f14 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 29 Aug 2022 09:36:55 -0700 +Subject: [PATCH 1/2] pppd/ippool.c: Fix type casting issues between in_addr + and ippool_api_ip_addr + +Also remove unused variabled + +Upstream-Status: Inappropriate [No upstream] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + pppd/ippool.c | 13 ++++++------- + 1 file changed, 6 insertions(+), 7 deletions(-) + +--- a/pppd/ippool.c ++++ b/pppd/ippool.c +@@ -16,6 +16,7 @@ + #include <sys/ioctl.h> + #include <sys/socket.h> + #include <netinet/in.h> ++#include <arpa/inet.h> + #include <signal.h> + + #include <linux/types.h> +@@ -24,7 +25,6 @@ + + const char pppd_version[] = VERSION; + +-static int ippool_fd = -1; + static char *ippool_pool_name = NULL; + static char *ippool_pool_name2 = NULL; + static char *ippool_server = "localhost"; +@@ -64,9 +64,9 @@ static int ippool_addr_alloc(CLIENT *cl, + } + + *addr = clnt_res.addr.s_addr; +- ++ struct in_addr temp_addr = {*addr}; + if (ippool_debug) { +- dbglog("Allocated address %s from pool %s", inet_ntoa(clnt_res.addr.s_addr), pool_name); ++ dbglog("Allocated address %s from pool %s", inet_ntoa(temp_addr), pool_name); + } + out: + return result; +@@ -85,14 +85,16 @@ static void ippool_addr_free(CLIENT *cl, + } + if (clnt_res < 0) { + if (ippool_debug) { ++ struct in_addr temp_addr = {free_addr.s_addr}; + warn("IP address %s free to pool %s failed: %s", +- inet_ntoa(free_addr), pool_name, strerror(-clnt_res)); ++ inet_ntoa(temp_addr), pool_name, strerror(-clnt_res)); + } + goto out; + } + + if (ippool_debug) { +- dbglog("Freed address %s to pool %s", inet_ntoa(free_addr), pool_name); ++ struct in_addr temp_addr = {free_addr.s_addr}; ++ dbglog("Freed address %s to pool %s", inet_ntoa(temp_addr), pool_name); + } + out: + return; +@@ -138,8 +140,6 @@ static void ippool_choose_ip(u_int32_t * + { + ipcp_options *wo = &ipcp_wantoptions[0]; + ipcp_options *go = &ipcp_gotoptions[0]; +- ipcp_options *ao = &ipcp_allowoptions[0]; +- ipcp_options *ho = &ipcp_hisoptions[0]; + CLIENT *cl; + int result = 0; + diff --git a/meta-networking/recipes-daemons/ippool/ippool/0001-read-returns-ssize_t.patch b/meta-networking/recipes-daemons/ippool/ippool/0001-read-returns-ssize_t.patch index 7d3f9acb65..1b8de349cf 100644 --- a/meta-networking/recipes-daemons/ippool/ippool/0001-read-returns-ssize_t.patch +++ b/meta-networking/recipes-daemons/ippool/ippool/0001-read-returns-ssize_t.patch @@ -10,6 +10,8 @@ usl_fd.c:284:10: error: comparison of unsigned expression < 0 is always false [- Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + usl/usl_fd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-networking/recipes-daemons/ippool/ippool/0001-usl_timer-Check-for-return-value-of-write-API.patch b/meta-networking/recipes-daemons/ippool/ippool/0001-usl_timer-Check-for-return-value-of-write-API.patch index 6fb7cc5c46..2c612e42fe 100644 --- a/meta-networking/recipes-daemons/ippool/ippool/0001-usl_timer-Check-for-return-value-of-write-API.patch +++ b/meta-networking/recipes-daemons/ippool/ippool/0001-usl_timer-Check-for-return-value-of-write-API.patch @@ -5,6 +5,8 @@ Subject: [PATCH] usl_timer: Check for return value of write() API Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + usl/usl_timer.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta-networking/recipes-daemons/ippool/ippool/0002-Mark-first-element-of-a-string-as-null.patch b/meta-networking/recipes-daemons/ippool/ippool/0002-Mark-first-element-of-a-string-as-null.patch index 6e2bd523da..f21c68f0d1 100644 --- a/meta-networking/recipes-daemons/ippool/ippool/0002-Mark-first-element-of-a-string-as-null.patch +++ b/meta-networking/recipes-daemons/ippool/ippool/0002-Mark-first-element-of-a-string-as-null.patch @@ -10,6 +10,8 @@ cli_lib.c:427:20: error: expression which evaluates to zero treated as a null po Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + cli/cli_lib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-networking/recipes-daemons/ippool/ippool/0002-ippool_rpc_server.c-Add-missing-prototype-for-ippool.patch b/meta-networking/recipes-daemons/ippool/ippool/0002-ippool_rpc_server.c-Add-missing-prototype-for-ippool.patch new file mode 100644 index 0000000000..b8fdedf0c8 --- /dev/null +++ b/meta-networking/recipes-daemons/ippool/ippool/0002-ippool_rpc_server.c-Add-missing-prototype-for-ippool.patch @@ -0,0 +1,22 @@ +From f9ea91771f0d3c984e7d5fe9e15962db1ee686ad Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 29 Aug 2022 09:39:16 -0700 +Subject: [PATCH 2/2] ippool_rpc_server.c: Add missing prototype for + ippool_api_rpc_check_request + +Upstream-Status: Inappropriate [no upstream] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + ippool_rpc_server.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/Makefile ++++ b/Makefile +@@ -123,6 +123,7 @@ $(IPPOOL_RPC_STEM)_server.c: $(IPPOOL_RP + -$(RM) $@ $@.tmp + rpcgen $(RPCGENFLAGS) -m -o $@.tmp $< + cat $@.tmp | sed -e 's/switch (rqstp->rq_proc) {/if (ippool_api_rpc_check_request(transp) < 0) return; switch (rqstp->rq_proc) {/' > $@ ++ sed -i '20i int ippool_api_rpc_check_request(SVCXPRT *xprt);' $@ + + $(IPPOOL_RPC_STEM)_client.c: $(IPPOOL_RPC_STEM).x + -$(RM) $@ diff --git a/meta-networking/recipes-daemons/ippool/ippool/0002-link-with-libtirpc.patch b/meta-networking/recipes-daemons/ippool/ippool/0002-link-with-libtirpc.patch index d80f7b4362..75bb825302 100644 --- a/meta-networking/recipes-daemons/ippool/ippool/0002-link-with-libtirpc.patch +++ b/meta-networking/recipes-daemons/ippool/ippool/0002-link-with-libtirpc.patch @@ -7,6 +7,8 @@ musl needs it Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-networking/recipes-daemons/ippool/ippool/0003-cli-Mark-return-of-strtol-as-long-int.patch b/meta-networking/recipes-daemons/ippool/ippool/0003-cli-Mark-return-of-strtol-as-long-int.patch index 3854b1133c..f6a8d62b98 100644 --- a/meta-networking/recipes-daemons/ippool/ippool/0003-cli-Mark-return-of-strtol-as-long-int.patch +++ b/meta-networking/recipes-daemons/ippool/ippool/0003-cli-Mark-return-of-strtol-as-long-int.patch @@ -10,6 +10,8 @@ error: taking the absolute value of unsigned type 'unsigned long' has no effect Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + cli/cli_lib.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta-networking/recipes-daemons/ippool/ippool/0003-musl-fixes.patch b/meta-networking/recipes-daemons/ippool/ippool/0003-musl-fixes.patch index 3cd5259fa6..8c42ebe30b 100644 --- a/meta-networking/recipes-daemons/ippool/ippool/0003-musl-fixes.patch +++ b/meta-networking/recipes-daemons/ippool/ippool/0003-musl-fixes.patch @@ -5,6 +5,8 @@ Subject: [PATCH 3/3] musl fixes Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + cli/cli_readline.c | 7 +- ippool_api.c | 9 ++- net/ppp_defs.h | 194 +++++++++++++++++++++++++++++++++++++++++++++++++++++ @@ -12,10 +14,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 4 files changed, 208 insertions(+), 6 deletions(-) create mode 100644 net/ppp_defs.h -diff --git a/cli/cli_readline.c b/cli/cli_readline.c -index 2812e6e..542935c 100644 ---- a/cli/cli_readline.c -+++ b/cli/cli_readline.c +Index: ippool-1.3/cli/cli_readline.c +=================================================================== +--- ippool-1.3.orig/cli/cli_readline.c ++++ ippool-1.3/cli/cli_readline.c @@ -17,13 +17,14 @@ * Boston, MA 02110-1301 USA * @@ -33,7 +35,7 @@ index 2812e6e..542935c 100644 #include <signal.h> #include <readline/readline.h> -@@ -630,7 +631,7 @@ static void cli_rl_uninstall_signal_handlers(void) +@@ -630,7 +631,7 @@ static void cli_rl_uninstall_signal_hand static int cli_rl_install_signal_handlers(void) { @@ -42,11 +44,11 @@ index 2812e6e..542935c 100644 rl_catch_signals = 0; rl_clear_signals(); -diff --git a/ippool_api.c b/ippool_api.c -index 2c10c47..d1127a9 100644 ---- a/ippool_api.c -+++ b/ippool_api.c -@@ -181,10 +181,13 @@ int ippool_api_rpc_check_request(SVCXPRT *xprt) +Index: ippool-1.3/ippool_api.c +=================================================================== +--- ippool-1.3.orig/ippool_api.c ++++ ippool-1.3/ippool_api.c +@@ -181,10 +181,13 @@ int ippool_api_rpc_check_request(SVCXPRT * non-loopback interface, reject the request. */ if ((!ippool_opt_remote_rpc) && @@ -63,210 +65,10 @@ index 2c10c47..d1127a9 100644 } svcerr_auth(xprt, AUTH_TOOWEAK); return -EPERM; -diff --git a/net/ppp_defs.h b/net/ppp_defs.h -new file mode 100644 -index 0000000..b06eda5 ---- /dev/null -+++ b/net/ppp_defs.h -@@ -0,0 +1,194 @@ -+/* $Id: ppp_defs.h,v 1.17 2002/12/06 09:49:15 paulus Exp $ */ -+ -+/* -+ * ppp_defs.h - PPP definitions. -+ * -+ * Copyright (c) 1984 Paul Mackerras. All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in -+ * the documentation and/or other materials provided with the -+ * distribution. -+ * -+ * 3. The name(s) of the authors of this software must not be used to -+ * endorse or promote products derived from this software without -+ * prior written permission. -+ * -+ * 4. Redistributions of any form whatsoever must retain the following -+ * acknowledgment: -+ * "This product includes software developed by Paul Mackerras -+ * <paulus@samba.org>". -+ * -+ * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO -+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY -+ * AND FITNESS, IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY -+ * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN -+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING -+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -+ */ -+ -+#ifndef _PPP_DEFS_H_ -+#define _PPP_DEFS_H_ -+ -+/* -+ * The basic PPP frame. -+ */ -+#define PPP_HDRLEN 4 /* octets for standard ppp header */ -+#define PPP_FCSLEN 2 /* octets for FCS */ -+ -+/* -+ * Packet sizes -+ * -+ * Note - lcp shouldn't be allowed to negotiate stuff outside these -+ * limits. See lcp.h in the pppd directory. -+ * (XXX - these constants should simply be shared by lcp.c instead -+ * of living in lcp.h) -+ */ -+#define PPP_MTU 1500 /* Default MTU (size of Info field) */ -+#define PPP_MAXMTU 65535 - (PPP_HDRLEN + PPP_FCSLEN) -+#define PPP_MINMTU 64 -+#define PPP_MRU 1500 /* default MRU = max length of info field */ -+#define PPP_MAXMRU 65000 /* Largest MRU we allow */ -+#define PPP_MINMRU 128 -+ -+#define PPP_ADDRESS(p) (((u_char *)(p))[0]) -+#define PPP_CONTROL(p) (((u_char *)(p))[1]) -+#define PPP_PROTOCOL(p) ((((u_char *)(p))[2] << 8) + ((u_char *)(p))[3]) -+ -+/* -+ * Significant octet values. -+ */ -+#define PPP_ALLSTATIONS 0xff /* All-Stations broadcast address */ -+#define PPP_UI 0x03 /* Unnumbered Information */ -+#define PPP_FLAG 0x7e /* Flag Sequence */ -+#define PPP_ESCAPE 0x7d /* Asynchronous Control Escape */ -+#define PPP_TRANS 0x20 /* Asynchronous transparency modifier */ -+ -+/* -+ * Protocol field values. -+ */ -+#define PPP_IP 0x21 /* Internet Protocol */ -+#define PPP_AT 0x29 /* AppleTalk Protocol */ -+#define PPP_IPX 0x2b /* IPX protocol */ -+#define PPP_VJC_COMP 0x2d /* VJ compressed TCP */ -+#define PPP_VJC_UNCOMP 0x2f /* VJ uncompressed TCP */ -+#define PPP_IPV6 0x57 /* Internet Protocol Version 6 */ -+#define PPP_COMP 0xfd /* compressed packet */ -+#define PPP_IPCP 0x8021 /* IP Control Protocol */ -+#define PPP_ATCP 0x8029 /* AppleTalk Control Protocol */ -+#define PPP_IPXCP 0x802b /* IPX Control Protocol */ -+#define PPP_IPV6CP 0x8057 /* IPv6 Control Protocol */ -+#define PPP_CCP 0x80fd /* Compression Control Protocol */ -+#define PPP_ECP 0x8053 /* Encryption Control Protocol */ -+#define PPP_LCP 0xc021 /* Link Control Protocol */ -+#define PPP_PAP 0xc023 /* Password Authentication Protocol */ -+#define PPP_LQR 0xc025 /* Link Quality Report protocol */ -+#define PPP_CHAP 0xc223 /* Cryptographic Handshake Auth. Protocol */ -+#define PPP_CBCP 0xc029 /* Callback Control Protocol */ -+#define PPP_EAP 0xc227 /* Extensible Authentication Protocol */ -+ -+/* -+ * Values for FCS calculations. -+ */ -+#define PPP_INITFCS 0xffff /* Initial FCS value */ -+#define PPP_GOODFCS 0xf0b8 /* Good final FCS value */ -+#define PPP_FCS(fcs, c) (((fcs) >> 8) ^ fcstab[((fcs) ^ (c)) & 0xff]) -+ -+/* -+ * A 32-bit unsigned integral type. -+ */ -+ -+#if !defined(__BIT_TYPES_DEFINED__) && !defined(_BITYPES) \ -+ && !defined(__FreeBSD__) && (NS_TARGET < 40) -+#ifdef UINT32_T -+typedef UINT32_T u_int32_t; -+#else -+typedef unsigned int u_int32_t; -+typedef unsigned short u_int16_t; -+#endif -+#endif -+ -+/* -+ * Extended asyncmap - allows any character to be escaped. -+ */ -+typedef u_int32_t ext_accm[8]; -+ -+/* -+ * What to do with network protocol (NP) packets. -+ */ -+enum NPmode { -+ NPMODE_PASS, /* pass the packet through */ -+ NPMODE_DROP, /* silently drop the packet */ -+ NPMODE_ERROR, /* return an error */ -+ NPMODE_QUEUE /* save it up for later. */ -+}; -+ -+/* -+ * Statistics. -+ */ -+struct pppstat { -+ unsigned int ppp_ibytes; /* bytes received */ -+ unsigned int ppp_ipackets; /* packets received */ -+ unsigned int ppp_ierrors; /* receive errors */ -+ unsigned int ppp_obytes; /* bytes sent */ -+ unsigned int ppp_opackets; /* packets sent */ -+ unsigned int ppp_oerrors; /* transmit errors */ -+}; -+ -+struct vjstat { -+ unsigned int vjs_packets; /* outbound packets */ -+ unsigned int vjs_compressed; /* outbound compressed packets */ -+ unsigned int vjs_searches; /* searches for connection state */ -+ unsigned int vjs_misses; /* times couldn't find conn. state */ -+ unsigned int vjs_uncompressedin; /* inbound uncompressed packets */ -+ unsigned int vjs_compressedin; /* inbound compressed packets */ -+ unsigned int vjs_errorin; /* inbound unknown type packets */ -+ unsigned int vjs_tossed; /* inbound packets tossed because of error */ -+}; -+ -+struct ppp_stats { -+ struct pppstat p; /* basic PPP statistics */ -+ struct vjstat vj; /* VJ header compression statistics */ -+}; -+ -+struct compstat { -+ unsigned int unc_bytes; /* total uncompressed bytes */ -+ unsigned int unc_packets; /* total uncompressed packets */ -+ unsigned int comp_bytes; /* compressed bytes */ -+ unsigned int comp_packets; /* compressed packets */ -+ unsigned int inc_bytes; /* incompressible bytes */ -+ unsigned int inc_packets; /* incompressible packets */ -+ unsigned int ratio; /* recent compression ratio << 8 */ -+}; -+ -+struct ppp_comp_stats { -+ struct compstat c; /* packet compression statistics */ -+ struct compstat d; /* packet decompression statistics */ -+}; -+ -+/* -+ * The following structure records the time in seconds since -+ * the last NP packet was sent or received. -+ */ -+struct ppp_idle { -+ time_t xmit_idle; /* time since last NP packet sent */ -+ time_t recv_idle; /* time since last NP packet received */ -+}; -+ -+#ifndef __P -+#ifdef __STDC__ -+#define __P(x) x -+#else -+#define __P(x) () -+#endif -+#endif -+ -+#endif /* _PPP_DEFS_H_ */ -diff --git a/usl/usl.h b/usl/usl.h -index cdc16db..88d2714 100644 ---- a/usl/usl.h -+++ b/usl/usl.h +Index: ippool-1.3/usl/usl.h +=================================================================== +--- ippool-1.3.orig/usl/usl.h ++++ ippool-1.3/usl/usl.h @@ -38,6 +38,10 @@ #include "usl_fsm.h" #include "usl_list.h" @@ -278,6 +80,3 @@ index cdc16db..88d2714 100644 #define USL_VERSION "0.6" #ifdef DEBUG --- -2.13.3 - diff --git a/meta-networking/recipes-daemons/ippool/ippool/ippool.service b/meta-networking/recipes-daemons/ippool/ippool/ippool.service index e5917fc141..f168e4ccb6 100644 --- a/meta-networking/recipes-daemons/ippool/ippool/ippool.service +++ b/meta-networking/recipes-daemons/ippool/ippool/ippool.service @@ -5,11 +5,10 @@ After=rpcbind.service [Service] Type=simple -# Start ippoold in the foreground! -ExecStart=@SBINDIR@/ippoold -f +# Start ippoold in the foreground! and enable RPC +ExecStart=@SBINDIR@/ippoold -R -f # Normal output will go to syslog, so suppress stdout. StandardOutput=null -StandardError=syslog # ExecStop is not needed. systemd will send SIGTERM # and ippoold will exit status 1. SuccessExitStatus=1 diff --git a/meta-networking/recipes-daemons/ippool/ippool/strncpy-truncation.patch b/meta-networking/recipes-daemons/ippool/ippool/strncpy-truncation.patch new file mode 100644 index 0000000000..01e1da8703 --- /dev/null +++ b/meta-networking/recipes-daemons/ippool/ippool/strncpy-truncation.patch @@ -0,0 +1,39 @@ +Replace strncpy with memcpy + +since the length of data to +be copied has already been determined with strlen(). Replace strncpy() +with memcpy() to address the warning and optimize the code a little. + +| ippool_config.c:112:2: note: 'snprintf' output between 8 and 55 bytes into a destination of size 48 +| 112 | snprintf(prompt, sizeof(prompt), "ippool-%s", server_name); +| | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- a/cli/cli_readline.c ++++ b/cli/cli_readline.c +@@ -257,10 +257,15 @@ static void cli_rl_display_wrapped_text( + int pos; + int in_ws; + int i; ++ int bufsize = sizeof(text_buf)/sizeof(text_buf[0]); + + if (left_margin == 0) { + left_margin = 3; + } ++ if (left_margin > bufsize) { ++ left_margin = bufsize; ++ } ++ + if (right_margin == 0) { + right_margin = 78;; + } +@@ -271,7 +276,7 @@ static void cli_rl_display_wrapped_text( + /* First copy the text heading to the buffer and add a "-", accounting for + * the specified left margin. + */ +- strncpy(&text_buf[0], text1, left_margin - 3); ++ memcpy(&text_buf[0], text1, left_margin - 3); + for (pos = strlen(text1); pos < left_margin - 3; pos++) { + text_buf[pos] = ' '; + } diff --git a/meta-networking/recipes-daemons/ippool/ippool_1.3.bb b/meta-networking/recipes-daemons/ippool/ippool_1.3.bb index 6e47483570..7947ffe457 100644 --- a/meta-networking/recipes-daemons/ippool/ippool_1.3.bb +++ b/meta-networking/recipes-daemons/ippool/ippool_1.3.bb @@ -9,7 +9,7 @@ addresses from ippoold. \ " HOMEPAGE = "http://www.openl2tp.org/" SECTION = "console/network" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" SRC_URI = "https://sourceforge.net/projects/openl2tp/files/${BPN}/${PV}/${BPN}-${PV}.tar.gz \ file://runtest.sh \ @@ -24,10 +24,13 @@ SRC_URI = "https://sourceforge.net/projects/openl2tp/files/${BPN}/${PV}/${BPN}-$ file://0001-read-returns-ssize_t.patch \ file://0002-Mark-first-element-of-a-string-as-null.patch \ file://0003-cli-Mark-return-of-strtol-as-long-int.patch \ - " -SRC_URI_append_libc-musl = "\ file://0002-link-with-libtirpc.patch \ file://0003-musl-fixes.patch \ + file://strncpy-truncation.patch \ + file://0001-pppd-ippool.c-Fix-type-casting-issues-between-in_add.patch \ + file://0002-ippool_rpc_server.c-Add-missing-prototype-for-ippool.patch \ + file://0001-Use-unsigned-int-type-for-1-bit-integer-bitfield.patch \ + file://0001-ippool-Port-to-ppp-2.5-APIs.patch \ " LIC_FILES_CHKSUM = "file://LICENSE;md5=4c59283b82fc2b166455e0fc23c71c6f" @@ -36,23 +39,19 @@ SRC_URI[sha256sum] = "d3eab7d6cad5da8ccc9d1e31d5303e27a39622c07bdb8fa3618eea3144 inherit systemd -DEPENDS = "readline ppp ncurses gzip-native" -DEPENDS_append_libc-musl = " libtirpc" -RDEPENDS_${PN} = "rpcbind" +DEPENDS = "readline ppp ncurses gzip-native rpcsvc-proto-native libtirpc" +RDEPENDS:${PN} = "rpcbind" EXTRA_OEMAKE = "CC='${CC}' AS='${AS}' LD='${LD}' AR='${AR}' NM='${NM}' STRIP='${STRIP}'" EXTRA_OEMAKE += "PPPD_VERSION=${PPPD_VERSION} SYS_LIBDIR=${libdir}" # enable self tests EXTRA_OEMAKE += "IPPOOL_TEST=y" -CPPFLAGS += "${SELECTED_OPTIMIZATION}" -CPPFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc" - -SYSTEMD_SERVICE_${PN} = "ippool.service" -SYSTEMD_AUTO_ENABLE = "disable" +CPPFLAGS += "${SELECTED_OPTIMIZATION} -I${STAGING_INCDIR}/tirpc" +SYSTEMD_SERVICE:${PN} = "ippool.service" -do_compile_prepend() { +do_compile:prepend() { # fix the CFLAGS= and CPPFLAGS= in main Makefile, to have the extra CFLAGS in env sed -i -e "s/^CFLAGS=/CFLAGS+=/" ${S}/Makefile sed -i -e "s/^CPPFLAGS=/CPPFLAGS+=/" ${S}/Makefile @@ -66,14 +65,14 @@ do_install() { oe_runmake DESTDIR=${D} install install -D -m 0755 ${S}/debian/init.d ${D}${sysconfdir}/init.d/ippoold - install -D -m 0644 ${WORKDIR}/ippool.service ${D}${systemd_system_unitdir}/ippool.service + install -D -m 0644 ${UNPACKDIR}/ippool.service ${D}${systemd_system_unitdir}/ippool.service sed -i -e 's:@SBINDIR@:${sbindir}:g' ${D}${systemd_system_unitdir}/ippool.service # install self test install -d ${D}/opt/${BPN} install ${S}/test/all.tcl ${S}/test/ippool.test \ ${S}/test/test_procs.tcl ${D}/opt/${BPN} - install ${WORKDIR}/runtest.sh ${D}/opt/${BPN} + install ${UNPACKDIR}/runtest.sh ${D}/opt/${BPN} # fix the ../ippoolconfig in test_procs.tcl sed -i -e "s:../ippoolconfig:ippoolconfig:" \ ${D}/opt/${BPN}/test_procs.tcl @@ -82,12 +81,12 @@ do_install() { PACKAGES =+ "${PN}-test" -FILES_${PN} += "${libdir}/pppd/${PPPD_VERSION}/ippool.so" -FILES_${PN}-dbg += "${libdir}/pppd/${PPPD_VERSION}/.debug/ippool.so" -FILES_${PN}-test = "/opt/${BPN}" +FILES:${PN} += "${libdir}/pppd/${PPPD_VERSION}/ippool.so" +FILES:${PN}-dbg += "${libdir}/pppd/${PPPD_VERSION}/.debug/ippool.so" +FILES:${PN}-test = "/opt/${BPN}" # needs tcl to run tests -RDEPENDS_${PN}-test += "tcl ${BPN}" +RDEPENDS:${PN}-test += "tcl ${BPN}" PPPD_VERSION="${@get_ppp_version(d)}" @@ -99,7 +98,7 @@ def get_ppp_version(d): return None bb.debug(1, "pppd plugin dir %s" % pppd_plugin) - r = re.compile("\d*\.\d*\.\d*") + r = re.compile(r"\d*\.\d*\.\d*") for f in os.listdir(pppd_plugin): if os.path.isdir(os.path.join(pppd_plugin, f)): ma = r.match(f) diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Makefile-Do-not-set-Werror.patch b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Makefile-Do-not-set-Werror.patch new file mode 100644 index 0000000000..d720a1adb0 --- /dev/null +++ b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Makefile-Do-not-set-Werror.patch @@ -0,0 +1,31 @@ +From 6afdfbdf1ecf3e7e9158734a3994a57ea151d680 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 12 Aug 2020 12:00:29 -0700 +Subject: [PATCH] Makefile: Do not set -Werror + +clang finds more warnings which causes build to fail, disable treating +warning as errors + +Upstream-Status: Inappropriate [OE-Specific] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + usr/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/usr/Makefile b/usr/Makefile +index 84f33bc..9e7b839 100644 +--- a/usr/Makefile ++++ b/usr/Makefile +@@ -44,7 +44,7 @@ HOMEDIR ?= $(etcdir)/iscsi + PKG_CONFIG ?= /usr/bin/pkg-config + + CFLAGS ?= -O2 -g +-WARNFLAGS ?= -Wall -Wextra -Werror -Wstrict-prototypes -fno-common ++WARNFLAGS ?= -Wall -Wextra -Wstrict-prototypes -fno-common + CFLAGS += $(WARNFLAGS) -I../include -I. -D_GNU_SOURCE \ + -I$(TOPDIR)/libopeniscsiusr \ + -DISCSI_VERSION_STR=\"$(ISCSI_VERSION_STR)\" +-- +2.34.1 + diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator-utils-Do-not-clean-kernel-source.patch b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator-utils-Do-not-clean-kernel-source.patch deleted file mode 100644 index 2c466119cd..0000000000 --- a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator-utils-Do-not-clean-kernel-source.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 4ebab8add4a549c16ab8b124137546c0a7b46a9b Mon Sep 17 00:00:00 2001 -From: Joe MacDonald <joe_macdonald@mentor.com> -Date: Tue, 15 Nov 2016 11:11:30 -0500 -Subject: [PATCH] Do not clean kernel source - -The default behaviour should not be to attempt to clean the kernel source -tree when building userspace. When not cross-compiling, however, this action is -harmless, but when attempting to build within the sysroot and since this package -is purely userspace, the clean step will fail. - -Removing the clean step eliminates an unnecessary dependency on the kernel build -infrastructure. - -Upstream-status: Inappropriate (embedded specific) - -Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> ---- - Makefile | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index c8cd00e..9576bba 100644 ---- a/Makefile -+++ b/Makefile -@@ -37,7 +37,7 @@ endif - - all: user - --user: iscsiuio/Makefile -+user: - $(MAKE) -C utils/sysdeps - $(MAKE) -C utils/fwparam_ibft - $(MAKE) -C usr -@@ -75,7 +75,6 @@ clean: - $(MAKE) -C utils/fwparam_ibft clean - $(MAKE) -C utils clean - $(MAKE) -C usr clean -- $(MAKE) -C kernel clean - [ ! -f iscsiuio/Makefile ] || $(MAKE) -C iscsiuio clean - [ ! -f iscsiuio/Makefile ] || $(MAKE) -C iscsiuio distclean - --- -1.9.1 - diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator-utils-fw_context-add-include-for-NI_MAXHOST-definiton.patch b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator-utils-fw_context-add-include-for-NI_MAXHOST-definiton.patch deleted file mode 100644 index 37d695f49d..0000000000 --- a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator-utils-fw_context-add-include-for-NI_MAXHOST-definiton.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 79bea58a554205dd185509fbc4e76b5fc40f9038 Mon Sep 17 00:00:00 2001 -From: Joe MacDonald <joe_macdonald@mentor.com> -Date: Tue, 15 Nov 2016 12:36:45 -0500 -Subject: [PATCH] fw_context: add include for NI_MAXHOST definiton - -This appears to build successfully with gcc 4.x but fails on gcc 5+, though it's -not immediately clear why NI_MAXHOST isn't being defined from the include -chain. Currently engaging with the upstream devs to determine the best course -of action, but this is an adequate workaround. - -Upstream-status: Pending - -Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> ---- - include/fw_context.h | 4 + - 1 file changed, 1 insertion(+) - -diff --git a/include/fw_context.h b/include/fw_context.h -index 44053d8..0b05cea 100644 ---- a/include/fw_context.h -+++ b/include/fw_context.h -@@ -21,6 +21,10 @@ - #ifndef FWPARAM_CONTEXT_H_ - #define FWPARAM_CONTEXT_H_ - -+#include <sys/socket.h> -+#ifndef NI_MAXHOST -+#define NI_MAXHOST 1025 -+#endif - #include <netdb.h> - #include <net/if.h> - --- -2.1.4 - diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.874.bb b/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.8.bb index 95848d0b33..0f9f34f1f2 100644 --- a/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.874.bb +++ b/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.8.bb @@ -5,51 +5,45 @@ provides the server daemon for the iSCSI protocol, as well as the utility \ programs used to manage it. iSCSI is a protocol for distributed \ disk access using SCSI commands sent over Internet Protocol networks." HOMEPAGE = "http://www.open-iscsi.com/" -LICENSE = "GPLv2 & LGPLv2.1" +LICENSE = "GPL-2.0-only & LGPL-2.1-only" SECTION = "net" -DEPENDS = "openssl flex-native bison-native open-isns util-linux" - -LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" - -SRCREV ?= "8db9717e73d32d2c5131da4f9ad86dfd9065f74b" - -SRC_URI = "git://github.com/open-iscsi/open-iscsi \ - file://iscsi-initiator-utils-Do-not-clean-kernel-source.patch \ - file://iscsi-initiator-utils-fw_context-add-include-for-NI_MAXHOST-definiton.patch \ - file://initd.debian \ - file://99_iscsi-initiator-utils \ - file://iscsi-initiator \ - file://iscsi-initiator.service \ - file://iscsi-initiator-targets.service \ - file://set_initiatorname \ -" - +DEPENDS = "openssl flex-native bison-native open-isns util-linux kmod" +DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" + +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRCREV = "543ba0f15d340b97f30782308cec424a6738fec3" + +SRC_URI = "git://github.com/open-iscsi/open-iscsi;branch=master;protocol=https \ + file://0001-Makefile-Do-not-set-Werror.patch \ + file://initd.debian \ + file://99_iscsi-initiator-utils \ + file://iscsi-initiator \ + file://iscsi-initiator.service \ + file://iscsi-initiator-targets.service \ + file://set_initiatorname \ + " S = "${WORKDIR}/git" -B = "${WORKDIR}/build" -inherit update-rc.d systemd autotools +inherit update-rc.d systemd autotools pkgconfig EXTRA_OECONF = " \ --target=${TARGET_SYS} \ --host=${BUILD_SYS} \ - --prefix=${prefix} \ - --libdir=${libdir} \ " +EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', '--without-systemd NO_SYSTEMD=1', d)}" + EXTRA_OEMAKE = ' \ - CC="${CC}" \ - AR="${AR}" \ - RANLIB="${RANLIB}" \ - CFLAGS="${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE -I. -I../include -I../../include -I../usr -I../../usr" \ - LDFLAGS="${LDFLAGS}" \ - LD="${LD}" \ OS="${TARGET_SYS}" \ TARGET="${TARGET_OS}" \ BASE="${prefix}" \ MANDIR="${mandir}" \ + OPTFLAGS="-DNO_SYSTEMD ${CFLAGS}" \ + PKG_CONFIG="${STAGING_BINDIR_NATIVE}/pkg-config" \ + SED=sed \ ' -TARGET_CC_ARCH += "${LDFLAGS}" do_configure () { cd ${S}/iscsiuio ; autoreconf --install; ./configure ${EXTRA_OECONF} @@ -74,15 +68,17 @@ do_install () { ${D}${localstatedir}/lib/iscsi/isns \ ${D}${localstatedir}/lib/iscsi/slp \ ${D}${localstatedir}/lib/iscsi/ifaces \ - ${D}/${mandir}/man8 + ${D}${libdir} \ + ${D}${mandir}/man8 install -p -m 755 ${S}/usr/iscsid ${S}/usr/iscsiadm \ ${S}/utils/iscsi-iname \ ${S}/usr/iscsistart ${D}/${sbindir} + cp -dR ${S}/libopeniscsiusr/libopeniscsiusr.so* ${D}${libdir} install -p -m 644 ${S}/doc/iscsiadm.8 ${S}/doc/iscsid.8 ${D}/${mandir}/man8 install -p -m 644 ${S}/etc/iscsid.conf ${D}${sysconfdir}/iscsi - install -p -m 755 ${WORKDIR}/initd.debian ${D}${sysconfdir}/init.d/iscsid + install -p -m 755 ${UNPACKDIR}/initd.debian ${D}${sysconfdir}/init.d/iscsid sed -i -e "s:= /sbin/iscsid:= ${sbindir}/iscsid:" ${D}${sysconfdir}/iscsi/iscsid.conf @@ -91,21 +87,21 @@ do_install () { echo "d /run/${BPN}/lock - - - -" \ > ${D}${sysconfdir}/tmpfiles.d/iscsi.conf install -d ${D}/etc/default/ - install -p -m 755 ${WORKDIR}/iscsi-initiator ${D}${sysconfdir}/default/ + install -p -m 755 ${UNPACKDIR}/iscsi-initiator ${D}${sysconfdir}/default/ install -d ${D}${systemd_unitdir}/system/ - install -m 0644 ${WORKDIR}/iscsi-initiator.service \ - ${WORKDIR}/iscsi-initiator-targets.service \ + install -m 0644 ${UNPACKDIR}/iscsi-initiator.service \ + ${UNPACKDIR}/iscsi-initiator-targets.service \ ${D}${systemd_unitdir}/system/ install -d ${D}${nonarch_libdir}/iscsi - install -m 0755 ${WORKDIR}/set_initiatorname ${D}${nonarch_libdir}/iscsi + install -m 0755 ${UNPACKDIR}/set_initiatorname ${D}${nonarch_libdir}/iscsi else install -d ${D}/etc/default/volatiles - install -m 0644 ${WORKDIR}/99_iscsi-initiator-utils ${D}/etc/default/volatiles + install -m 0644 ${UNPACKDIR}/99_iscsi-initiator-utils ${D}/etc/default/volatiles fi } -pkg_postinst_${PN}() { +pkg_postinst:${PN}() { if [ "x$D" = "x" ]; then if [ -e /etc/init.d/populate-volatile.sh ]; then /etc/init.d/populate-volatile.sh update @@ -119,4 +115,4 @@ SYSTEMD_SERVICE = " iscsi-initiator.service iscsi-initiator-targets.service " INITSCRIPT_NAME = "iscsid" INITSCRIPT_PARAMS = "start 30 1 2 3 4 5 . stop 70 0 1 2 3 4 5 6 ." -FILES_${PN} += "${nonarch_libdir}/iscsi" +FILES:${PN} += "${nonarch_libdir}/iscsi" diff --git a/meta-networking/recipes-daemons/keepalived/keepalived_1.3.5.bb b/meta-networking/recipes-daemons/keepalived/keepalived_2.2.8.bb index 5e7e6e49f5..85f4a6aa59 100644 --- a/meta-networking/recipes-daemons/keepalived/keepalived_1.3.5.bb +++ b/meta-networking/recipes-daemons/keepalived/keepalived_2.2.8.bb @@ -7,17 +7,17 @@ Server (IPVS) kernel module providing Layer4 loadbalancing \ " HOMEPAGE = "http://www.keepalived.org/" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRC_URI = "http://www.keepalived.org/software/${BP}.tar.gz" - -SRC_URI[md5sum] = "9964d295ec9d34ed3408b57d28847b68" -SRC_URI[sha256sum] = "c0114d86ea4c896557beb0d9367819a423ffba772bc5d7c548dc455e6b3bd048" +SRC_URI = "http://www.keepalived.org/software/${BP}.tar.gz \ + " +SRC_URI[sha256sum] = "85882eb62974f395d4c631be990a41a839594a7e62fbfebcb5649a937a7a1bb6" +UPSTREAM_CHECK_URI = "https://github.com/acassen/keepalived/releases" DEPENDS = "libnfnetlink openssl" -inherit autotools pkgconfig systemd update-rc.d +inherit autotools pkgconfig systemd PACKAGECONFIG ??= "libnl snmp \ ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ @@ -26,10 +26,11 @@ PACKAGECONFIG[libnl] = "--enable-libnl,--disable-libnl,libnl" PACKAGECONFIG[snmp] = "--enable-snmp,--disable-snmp,net-snmp" PACKAGECONFIG[systemd] = "--with-init=systemd --with-systemdsystemunitdir=${systemd_system_unitdir},--with-init=SYSV,systemd" -EXTRA_OECONF = "--disable-libiptc" EXTRA_OEMAKE = "initdir=${sysconfdir}/init.d" -do_install_append() { +export EXTRA_CFLAGS = "${CFLAGS}" + +do_install:append() { if [ -f ${D}${sysconfdir}/init.d/${BPN} ]; then chmod 0755 ${D}${sysconfdir}/init.d/${BPN} sed -i 's#rc.d/##' ${D}${sysconfdir}/init.d/${BPN} @@ -40,10 +41,11 @@ do_install_append() { fi } -FILES_${PN} += "${datadir}/snmp/mibs/KEEPALIVED-MIB.txt" +PACKAGE_BEFORE_PN = "${PN}-samples" + +FILES:${PN} += "${datadir}/snmp/mibs/KEEPALIVED-MIB.txt" -INITSCRIPT_NAME = "keepalived" -INITSCRIPT_PARAMS = "remove" +FILES:${PN}-samples = "${sysconfdir}/keepalived/samples ${sysconfdir}/keepalived/keepalived.conf.sample" -SYSTEMD_SERVICE_${PN} = "keepalived.service" +SYSTEMD_SERVICE:${PN} = "keepalived.service" SYSTEMD_AUTO_ENABLE ?= "disable" diff --git a/meta-networking/recipes-daemons/lldpd/files/run-ptest b/meta-networking/recipes-daemons/lldpd/files/run-ptest new file mode 100755 index 0000000000..da686eb465 --- /dev/null +++ b/meta-networking/recipes-daemons/lldpd/files/run-ptest @@ -0,0 +1,16 @@ +#!/bin/sh + +num_fail=0 + +for test in tests/check* +do + ./"$test" \ + && echo "PASS: $test" \ + || { + echo "FAIL: $test" + num_fail=$(( ${num_fail} + 1)) + } + +done + +exit $num_fail diff --git a/meta-networking/recipes-daemons/lldpd/files/src-daemon-lldpd.service.in-Use-fixed-path-for-mkdir.patch b/meta-networking/recipes-daemons/lldpd/files/src-daemon-lldpd.service.in-Use-fixed-path-for-mkdir.patch deleted file mode 100644 index 4876e17945..0000000000 --- a/meta-networking/recipes-daemons/lldpd/files/src-daemon-lldpd.service.in-Use-fixed-path-for-mkdir.patch +++ /dev/null @@ -1,32 +0,0 @@ -From f9f3e4dd31588cce5f655730da7b5c3f56a9bdc1 Mon Sep 17 00:00:00 2001 -From: Fabio Berton <fabio.berton@ossystems.com.br> -Date: Tue, 26 Sep 2017 09:19:51 -0300 -Subject: [PATCH] src/daemon/lldpd.service.in: Use fixed path for mkdir command -Organization: O.S. Systems Software LTDA. - -@mkdir_p@ is expanded to host tools path ../build/tmp/hosttools/mkdir that -doesn't exist on target. Remove @mkdir_p@ and use /bin/mkdir -p to -create /var/run/lldpd directory. - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> ---- - src/daemon/lldpd.service.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/daemon/lldpd.service.in b/src/daemon/lldpd.service.in -index fdb7338..4291830 100644 ---- a/src/daemon/lldpd.service.in -+++ b/src/daemon/lldpd.service.in -@@ -9,7 +9,7 @@ Type=notify - NotifyAccess=main - EnvironmentFile=-/etc/default/lldpd - EnvironmentFile=-/etc/sysconfig/lldpd --ExecStartPre=@mkdir_p@ @PRIVSEP_CHROOT@ -+ExecStartPre=/bin/mkdir -p @PRIVSEP_CHROOT@ - ExecStart=@sbindir@/lldpd $DAEMON_ARGS $LLDPD_OPTIONS - Restart=on-failure - PrivateTmp=yes --- -2.14.2 diff --git a/meta-networking/recipes-daemons/lldpd/lldpd_0.9.8.bb b/meta-networking/recipes-daemons/lldpd/lldpd_1.0.18.bb index dbd84cf673..4deab153c4 100644 --- a/meta-networking/recipes-daemons/lldpd/lldpd_0.9.8.bb +++ b/meta-networking/recipes-daemons/lldpd/lldpd_1.0.18.bb @@ -6,20 +6,19 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/ISC;md5=f3b90e DEPENDS = "libbsd libevent" SRC_URI = "\ - http://media.luffy.cx/files/${BPN}/${BPN}-${PV}.tar.gz \ + http://media.luffy.cx/files/${BPN}/${BP}.tar.gz \ file://lldpd.init.d \ file://lldpd.default \ - file://src-daemon-lldpd.service.in-Use-fixed-path-for-mkdir.patch \ + file://run-ptest \ " -SRC_URI[md5sum] = "8809600492f6b73149eb19158e819c1f" -SRC_URI[sha256sum] = "9ee494e91bc33938575b2c09b26188c486ef8eac6e2155d250c189cc4e988c4f" +SRC_URI[sha256sum] = "4b320675d608901a4a0d4feff8f96bb846d4913d914b0cf75b7d0ae80490f2f7" -inherit autotools update-rc.d useradd systemd pkgconfig bash-completion +inherit autotools update-rc.d useradd systemd pkgconfig bash-completion github-releases ptest USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--system -g lldpd --shell /bin/false lldpd" -GROUPADD_PARAM_${PN} = "--system lldpd" +USERADD_PARAM:${PN} = "--system -g lldpd --shell /bin/false lldpd" +GROUPADD_PARAM:${PN} = "--system lldpd" EXTRA_OECONF += "--without-embedded-libevent \ --disable-oldies \ @@ -46,20 +45,37 @@ PACKAGECONFIG[custom] = "--enable-custom,--disable-custom" INITSCRIPT_NAME = "lldpd" INITSCRIPT_PARAMS = "defaults" -SYSTEMD_SERVICE_${PN} = "lldpd.service" +SYSTEMD_SERVICE:${PN} = "lldpd.service" -do_install_append() { - install -Dm 0755 ${WORKDIR}/lldpd.init.d ${D}${sysconfdir}/init.d/lldpd - install -Dm 0644 ${WORKDIR}/lldpd.default ${D}${sysconfdir}/default/lldpd +do_install:append() { + install -Dm 0755 ${UNPACKDIR}/lldpd.init.d ${D}${sysconfdir}/init.d/lldpd + install -Dm 0644 ${UNPACKDIR}/lldpd.default ${D}${sysconfdir}/default/lldpd # Make an empty configuration file touch ${D}${sysconfdir}/lldpd.conf } PACKAGES =+ "${PN}-zsh-completion" -FILES_${PN} += "${libdir}/sysusers.d" -RDEPENDS_${PN} += "os-release" +FILES:${PN} += "${libdir}/sysusers.d" +RDEPENDS:${PN} += "os-release" -FILES_${PN}-zsh-completion += "${datadir}/zsh/" +FILES:${PN}-zsh-completion += "${datadir}/zsh/" # FIXME: zsh is broken in meta-oe so this cannot be enabled for now -#RDEPENDS_${PN}-zsh-completion += "zsh" +#RDEPENDS:${PN}-zsh-completion += "zsh" + +RDEPENDS:${PN}-ptest = "libcheck" +DEPENDS += "${@bb.utils.contains('PTEST_ENABLED', '1', 'libcheck', '', d)}" + +TESTDIR = "tests" +do_compile_ptest () { + # hack to remove the call to `make check-TESTS` + sed -i 's/$(MAKE) $(AM_MAKEFLAGS) check-TESTS//g' ${TESTDIR}/Makefile + oe_runmake check +} + +do_install_ptest () { + # install the tests + cp -rf ${B}/${TESTDIR} ${D}${PTEST_PATH} + # remove the object files + rm ${D}${PTEST_PATH}/${TESTDIR}/*.o +} diff --git a/meta-networking/recipes-daemons/ncftp/ncftp/0001-Forward-port-defining-PREFIX_BINDIR-to-use-new-autoc.patch b/meta-networking/recipes-daemons/ncftp/ncftp/0001-Forward-port-defining-PREFIX_BINDIR-to-use-new-autoc.patch new file mode 100644 index 0000000000..efd1f345e6 --- /dev/null +++ b/meta-networking/recipes-daemons/ncftp/ncftp/0001-Forward-port-defining-PREFIX_BINDIR-to-use-new-autoc.patch @@ -0,0 +1,25 @@ +From 53ca110d53ca82f6c4224e4c29dbcf7dfe6914cd Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 23 Aug 2022 00:25:06 -0700 +Subject: [PATCH] Forward port defining PREFIX_BINDIR to use new autoconf + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.in b/configure.in +index c3ef568..a320c56 100644 +--- a/configure.in ++++ b/configure.in +@@ -44,7 +44,7 @@ wi_EXTRA_SYSV_SUNOS_DIRS dnl For better curses library on SunOS 4 + + dnl Try to use PATH rather than hardcode the installation path, if possible. + if test "${prefix-NONE}" != "NONE" && test "$prefix" != "/usr/local" && test "$prefix" != "/usr"; then +- AC_DEFINE_UNQUOTED(PREFIX_BINDIR, "$prefix/bin") ++ AC_DEFINE([PREFIX_BINDIR], [${prefix}/bin], [Install bindir]) + fi + + diff --git a/meta-networking/recipes-daemons/ncftp/ncftp/unistd.patch b/meta-networking/recipes-daemons/ncftp/ncftp/unistd.patch index 1c8146edaf..22e4f7837b 100644 --- a/meta-networking/recipes-daemons/ncftp/ncftp/unistd.patch +++ b/meta-networking/recipes-daemons/ncftp/ncftp/unistd.patch @@ -16,13 +16,9 @@ Other solution would to fix sed.sh to ignore double definitions Upstream-Status: Pending Signed-of-by: Khem Raj <raj.khem@gmail.com> - - -Index: ncftp-3.2.6/configure -=================================================================== ---- ncftp-3.2.6.orig/configure -+++ ncftp-3.2.6/configure -@@ -7859,7 +7859,6 @@ chmod 755 "$wi_tmpdir/prpp.pl" +--- a/autoconf_local/aclocal.m4 ++++ b/autoconf_local/aclocal.m4 +@@ -4220,7 +4220,6 @@ changequote({{, }})dnl cat << 'EOF' > "$wi_tmpdir/unistd.c" #include <confdefs.h> diff --git a/meta-networking/recipes-daemons/ncftp/ncftp_3.2.6.bb b/meta-networking/recipes-daemons/ncftp/ncftp_3.2.7.bb index 5f92f27fdf..de111cac05 100644 --- a/meta-networking/recipes-daemons/ncftp/ncftp_3.2.6.bb +++ b/meta-networking/recipes-daemons/ncftp/ncftp_3.2.7.bb @@ -5,12 +5,12 @@ LICENSE = "ClArtistic" LIC_FILES_CHKSUM = "file://ncftp/cmds.c;beginline=3;endline=4;md5=9c2390809f71465aa7ff76e03dc14d91" DEPENDS = "ncurses" -SRC_URI = "ftp://ftp.ncftp.com/${BPN}/${BP}-src.tar.xz \ +SRC_URI = "https://www.ncftp.com/public_ftp/ncftp/${BP}-src.tar.xz \ file://ncftp-configure-use-BUILD_CC-for-ccdv.patch \ file://unistd.patch \ -" -SRC_URI[md5sum] = "42d0f896d69a4d603ec097546444245f" -SRC_URI[sha256sum] = "5f200687c05d0807690d9fb770327b226f02dd86155b49e750853fce4e31098d" + file://0001-Forward-port-defining-PREFIX_BINDIR-to-use-new-autoc.patch \ + " +SRC_URI[sha256sum] = "d41c5c4d6614a8eae2ed4e4d7ada6b6d3afcc9fb65a4ed9b8711344bef24f7e8" inherit autotools-brokensep pkgconfig @@ -19,17 +19,16 @@ CFLAGS += "-DNO_SSLv2 -D_FILE_OFFSET_BITS=64 -Wall" PACKAGECONFIG ??= "" PACKAGECONFIG[ccdv] = "--enable-ccdv,--disable-ccdv,," -EXTRA_OECONF = "--disable-precomp" -TARGET_CC_ARCH_append = " ${SELECTED_OPTIMIZATION}" +EXTRA_OECONF = "--disable-precomp --disable-universal ac_cv_path_TAR=tar" +ACLOCALEXTRAPATH:append = " -I ${S}/autoconf_local" -do_configure() { - install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S} - install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S} - oe_runconf -} do_install () { install -d ${D}${bindir} ${D}${sysconfdir} ${D}${mandir} oe_runmake 'prefix=${D}${prefix}' 'BINDIR=${D}${bindir}' \ 'SYSCONFDIR=${D}${sysconfdir}' 'mandir=${D}${mandir}' \ install } + +# http://errors.yoctoproject.org/Errors/Details/766888/ +# ncftp/3.2.7/ncftp-3.2.7/config.h:358:28: error: passing argument 2 of 'select' from incompatible pointer type [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" 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 new file mode 100644 index 0000000000..7f06e0ebf3 --- /dev/null +++ b/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.2.4.bb @@ -0,0 +1,31 @@ +SUMMARY = "Dispatcher service for systemd-networkd connection status changes" +DESCRIPTION = "This daemon is similar to NetworkManager-dispatcher, but is much \ +more limited in the types of events it supports due to the limited nature of \ +systemd-networkd(8)." + +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d" + +inherit features_check systemd + +RDEPENDS:${PN} = "python3-pygobject python3-dbus python3-json" +REQUIRED_DISTRO_FEATURES = "systemd gobject-introspection-data" + +SRCREV = "dfd26d72793914eb3da910ef8c71de6d7c8942a2" +SRC_URI = "git://gitlab.com/craftyguy/networkd-dispatcher;protocol=https;nobranch=1" + +S = "${WORKDIR}/git" + +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE:${PN} = "networkd-dispatcher.service" +SYSTEMD_AUTO_ENABLE = "disable" + +# Nothing to build, just a python script to install +do_configure[noexec] = "1" +do_compile[noexec] = "1" + +do_install() { + install -D -m 0755 ${S}/networkd-dispatcher ${D}${bindir}/networkd-dispatcher + install -D -m 0644 ${S}/networkd-dispatcher.service ${D}/${systemd_system_unitdir}/networkd-dispatcher.service + install -D -m 0644 ${S}/networkd-dispatcher.conf ${D}/${sysconfdir}/conf.d/networkd-dispatcher.conf +} diff --git a/meta-networking/recipes-daemons/openhpi/files/0001-Do-not-poke-at-build-host-s-etc-os-release.patch b/meta-networking/recipes-daemons/openhpi/files/0001-Do-not-poke-at-build-host-s-etc-os-release.patch new file mode 100644 index 0000000000..ab9b25fed0 --- /dev/null +++ b/meta-networking/recipes-daemons/openhpi/files/0001-Do-not-poke-at-build-host-s-etc-os-release.patch @@ -0,0 +1,27 @@ +From 2bc5c6367a7f70ca5bff177ec95bcad3b1c2b66b Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 6 Sep 2018 18:15:10 -0700 +Subject: [PATCH] Do not poke at build host's /etc/os-release + +During cross compile we are interested in target distro and not host +distro therefore do not check for it. + +Upstream-Status: Inappropriate [Cross compile specific] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: openhpi-3.8.0/configure.ac +=================================================================== +--- openhpi-3.8.0.orig/configure.ac ++++ openhpi-3.8.0/configure.ac +@@ -194,7 +194,6 @@ AC_SUBST(JSON_C_LIB) + AC_SUBST(JSON_C_INCLUDE) + AC_CHECK_LIB([rabbitmq],[amqp_new_connection],[RABBITMQ_LIB=-lrabbitmq],[RABBITMQ_LIB=]) + AC_SUBST(RABBITMQ_LIB) +-AC_CHECK_FILE([/etc/os-release],[DISTRO=`grep "^ID=" /etc/os-release | awk -F"\"" '{ print $2 }'`]) + + AC_CHECK_HEADERS([amqp.h],[have_rabbitmq=yes],[have_rabbitmq=no]) + diff --git a/meta-networking/recipes-daemons/openhpi/files/0001-Fix-build-failures-with-gcc7.patch b/meta-networking/recipes-daemons/openhpi/files/0001-Fix-build-failures-with-gcc7.patch deleted file mode 100644 index 4f493f7b8f..0000000000 --- a/meta-networking/recipes-daemons/openhpi/files/0001-Fix-build-failures-with-gcc7.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 398c6db66c643ed6133cc2b028ab1e27a17c5295 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 1 May 2017 19:10:09 +0000 -Subject: [PATCH] Fix build failures with gcc7 - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - plugins/ipmidirect/ipmi_mc_vendor.cpp | 2 +- - plugins/ipmidirect/ipmi_resource.cpp | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/plugins/ipmidirect/ipmi_mc_vendor.cpp b/plugins/ipmidirect/ipmi_mc_vendor.cpp -index 2c6c090..557771c 100644 ---- a/plugins/ipmidirect/ipmi_mc_vendor.cpp -+++ b/plugins/ipmidirect/ipmi_mc_vendor.cpp -@@ -322,7 +322,7 @@ cIpmiMcVendor::CreateResources( cIpmiDomain *domain, cIpmiMc *source_mc, cIpmiSd - if ( addr.m_channel != source_mc->GetChannel() ) - stdlog << "WARNING : SDR channel " << addr.m_channel << " NOT equal to MC channel " << source_mc->GetChannel() << "\n"; - -- if ( FindOrCreateResource( domain, source_mc, fru_id, sdr, sdrs ) == false ) { -+ if ( !FindOrCreateResource( domain, source_mc, fru_id, sdr, sdrs ) ) { - return false; - } - } -diff --git a/plugins/ipmidirect/ipmi_resource.cpp b/plugins/ipmidirect/ipmi_resource.cpp -index c438e74..2552673 100644 ---- a/plugins/ipmidirect/ipmi_resource.cpp -+++ b/plugins/ipmidirect/ipmi_resource.cpp -@@ -73,7 +73,7 @@ cIpmiResource::SendCommandReadLock( const cIpmiMsg &msg, cIpmiMsg &rsp, - - domain->ReadLock(); - -- if ( domain->VerifyResource( resource ) == false ) -+ if ( !domain->VerifyResource( resource ) ) - return SA_ERR_HPI_NOT_PRESENT; - - return rv; -@@ -91,7 +91,7 @@ cIpmiResource::SendCommandReadLock( cIpmiRdr *rdr, const cIpmiMsg &msg, cIpmiMsg - - domain->ReadLock(); - -- if ( domain->VerifyRdr( rdr ) == false ) -+ if ( !domain->VerifyRdr( rdr ) ) - return SA_ERR_HPI_NOT_PRESENT; - - return rv; --- -1.9.1 - diff --git a/meta-networking/recipes-daemons/openhpi/files/0001-include-iostream-for-cout.patch b/meta-networking/recipes-daemons/openhpi/files/0001-include-iostream-for-cout.patch new file mode 100644 index 0000000000..c78ec28de7 --- /dev/null +++ b/meta-networking/recipes-daemons/openhpi/files/0001-include-iostream-for-cout.patch @@ -0,0 +1,41 @@ +From 8f47adc3b9085d589e62cb5eb560dd23a703036a Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 8 Sep 2018 12:47:49 -0700 +Subject: [PATCH] include iostream for cout + +End cout with endl + +Fixes +plugins/dynamic_simulator/thread.cpp:241:3: error: 'cout' was not declared in this scope + cout<<"PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP is Defined" + ^~~~ + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + plugins/dynamic_simulator/thread.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/plugins/dynamic_simulator/thread.cpp b/plugins/dynamic_simulator/thread.cpp +index b971502..61eaf42 100644 +--- a/plugins/dynamic_simulator/thread.cpp ++++ b/plugins/dynamic_simulator/thread.cpp +@@ -26,7 +26,7 @@ + */ + + #include "thread.h" +-#include <stdio.h> ++#include <iostream> + #include <sys/time.h> + #include <errno.h> + +@@ -238,7 +238,7 @@ cThreadLock::cThreadLock() + pthread_mutexattr_settype( &attr, PTHREAD_MUTEX_RECURSIVE ); + pthread_mutex_init( &m_lock, &attr ); + pthread_mutexattr_destroy( &attr ); +- cout<<"PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP is Defined" ++ std::cout<<"PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP is Defined"<<std::endl; + } + #else + static pthread_mutex_t lock_tmpl = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP; diff --git a/meta-networking/recipes-daemons/openhpi/files/0001-ipmidirect-Replace-__STRING.patch b/meta-networking/recipes-daemons/openhpi/files/0001-ipmidirect-Replace-__STRING.patch deleted file mode 100644 index 4d56f6535c..0000000000 --- a/meta-networking/recipes-daemons/openhpi/files/0001-ipmidirect-Replace-__STRING.patch +++ /dev/null @@ -1,31 +0,0 @@ -From be40b3f11460cf495bbbef45692e7763afda0c2b Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 14 Sep 2017 17:56:31 -0700 -Subject: [PATCH] ipmidirect: Replace __STRING - -__STRING is not universally available e.g. -musl does not define it - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending - - plugins/ipmidirect/t/test.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/plugins/ipmidirect/t/test.h b/plugins/ipmidirect/t/test.h -index 8d71381..978d5ff 100644 ---- a/plugins/ipmidirect/t/test.h -+++ b/plugins/ipmidirect/t/test.h -@@ -22,7 +22,7 @@ TestFunction( const char *str, const char *file, int line, bool expr ) - } - - --#define Test(expr) TestFunction( __STRING(expr), __FILE__, __LINE__, expr ) -+#define Test(expr) TestFunction( #expr, __FILE__, __LINE__, expr ) - - - static int --- -2.14.1 - diff --git a/meta-networking/recipes-daemons/openhpi/files/0001-plugins-Check-for-PTHREAD_RECURSIVE_MUTEX_INITIALIZE.patch b/meta-networking/recipes-daemons/openhpi/files/0001-plugins-Check-for-PTHREAD_RECURSIVE_MUTEX_INITIALIZE.patch deleted file mode 100644 index 0f033ac855..0000000000 --- a/meta-networking/recipes-daemons/openhpi/files/0001-plugins-Check-for-PTHREAD_RECURSIVE_MUTEX_INITIALIZE.patch +++ /dev/null @@ -1,47 +0,0 @@ -From be665d9513cca7e8b64c79ae424cf44ac166b052 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 14 Sep 2017 17:07:58 -0700 -Subject: [PATCH] plugins: Check for PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP - before use - -musl does not define PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP -so we can not assume that all Linux systems support PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP -its a glibc specific define so check for it being defined before using it - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending - - plugins/dynamic_simulator/thread.cpp | 2 +- - plugins/ipmidirect/thread.cpp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/plugins/dynamic_simulator/thread.cpp b/plugins/dynamic_simulator/thread.cpp -index d663be0..9210fd7 100644 ---- a/plugins/dynamic_simulator/thread.cpp -+++ b/plugins/dynamic_simulator/thread.cpp -@@ -229,7 +229,7 @@ cThread::Exit( void *rv ) - /** - * Constructor - **/ --#if ( defined(__sun) && defined(__SVR4) ) || defined(__FreeBSD__) -+#ifndef PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP - cThreadLock::cThreadLock() - { - pthread_mutexattr_t attr; -diff --git a/plugins/ipmidirect/thread.cpp b/plugins/ipmidirect/thread.cpp -index 5c52557..48e83fa 100644 ---- a/plugins/ipmidirect/thread.cpp -+++ b/plugins/ipmidirect/thread.cpp -@@ -167,7 +167,7 @@ cThread::Exit( void *rv ) - // cThreadLock - ////////////////////////////////////////////////// - --#if ( defined(__sun) && defined(__SVR4) ) || defined(__FreeBSD__) -+#ifndef PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP - cThreadLock::cThreadLock() - { - pthread_mutexattr_t attr; --- -2.14.1 - diff --git a/meta-networking/recipes-daemons/openhpi/files/0001-session-close-socket.patch b/meta-networking/recipes-daemons/openhpi/files/0001-session-close-socket.patch new file mode 100644 index 0000000000..2cefd55be2 --- /dev/null +++ b/meta-networking/recipes-daemons/openhpi/files/0001-session-close-socket.patch @@ -0,0 +1,37 @@ +From b8bc6bfdb5e7fb5b46d3a830e04632939bee6b98 Mon Sep 17 00:00:00 2001 +From: Catalin Enache <catalin.enache@windriver.com> +Date: Fri, 9 Feb 2018 16:35:11 +0200 +Subject: [PATCH] saHpiSessionClose: close socket + +saHpiSessionClose leaks file descriptors + +Upstream issue: https://github.com/open-hpi/openhpi/issues/1918 + +Upstream-Status: Pending + +Signed-off-by: Catalin Enache <catalin.enache@windriver.com> +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + baselib/session.cpp | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/baselib/session.cpp b/baselib/session.cpp +index c5edfc8..4ece1b7 100644 +--- a/baselib/session.cpp ++++ b/baselib/session.cpp +@@ -126,6 +126,12 @@ cSession::cSession() + + cSession::~cSession() + { ++ cClientStreamSock * sock; ++ gpointer ptr = wrap_g_static_private_get( &m_sockets ); ++ if ( ptr ) { ++ sock = reinterpret_cast<cClientStreamSock *>(ptr); ++ sock->Close(); ++ } + wrap_g_static_private_free( &m_sockets ); + } + +-- +2.10.2 + diff --git a/meta-networking/recipes-daemons/openhpi/files/c++11.patch b/meta-networking/recipes-daemons/openhpi/files/c++11.patch index 0549d59777..5eff86b4d5 100644 --- a/meta-networking/recipes-daemons/openhpi/files/c++11.patch +++ b/meta-networking/recipes-daemons/openhpi/files/c++11.patch @@ -1,11 +1,21 @@ -Index: openhpi-3.6.1/configure.ac -=================================================================== ---- openhpi-3.6.1.orig/configure.ac -+++ openhpi-3.6.1/configure.ac -@@ -44,6 +44,7 @@ AC_PROG_CPP - AC_PROG_INSTALL - AC_PROG_LN_S +From ed51168dfd6844deeaebf7d5f6c65898aafb6299 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 27 Aug 2017 12:12:04 -0700 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configure.ac b/configure.ac +index c29a31f..f7fe0f7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -46,6 +46,7 @@ AC_PROG_LN_S AC_PROG_MAKE_SET + AC_PROG_AWK + AC_PROG_GREP +AX_CXX_COMPILE_STDCXX_11([noext],[mandatory]) enabled_non32bit="no" diff --git a/meta-networking/recipes-daemons/openhpi/files/clang-c++11.patch b/meta-networking/recipes-daemons/openhpi/files/clang-c++11.patch index 9b35a0cced..7958a07c67 100644 --- a/meta-networking/recipes-daemons/openhpi/files/clang-c++11.patch +++ b/meta-networking/recipes-daemons/openhpi/files/clang-c++11.patch @@ -1,3 +1,7 @@ +Support build with Clang + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> Index: openhpi-3.6.1/plugins/dynamic_simulator/new_sim.cpp =================================================================== --- openhpi-3.6.1.orig/plugins/dynamic_simulator/new_sim.cpp @@ -1273,16 +1277,3 @@ Index: openhpi-3.6.1/plugins/ipmidirect/ipmi.cpp static SaErrorT IpmiResetWatchdog(void *hnd, -Index: openhpi-3.6.1/plugins/ipmidirect/ipmi_auth.h -=================================================================== ---- openhpi-3.6.1.orig/plugins/ipmidirect/ipmi_auth.h -+++ openhpi-3.6.1/plugins/ipmidirect/ipmi_auth.h -@@ -32,7 +32,7 @@ class cIpmiAuthSg - { - public: - void *data; /* NULL to terminate. */ -- int len; -+ unsigned int len; - }; - - diff --git a/meta-networking/recipes-daemons/openhpi/files/cross_899198.patch b/meta-networking/recipes-daemons/openhpi/files/cross_899198.patch new file mode 100644 index 0000000000..3161140df9 --- /dev/null +++ b/meta-networking/recipes-daemons/openhpi/files/cross_899198.patch @@ -0,0 +1,98 @@ +From: Helmut Grohne <helmut@subdivi.de> +Subject: fix cross compilation + +The OH_SET_SIZES macro relies on the usual autoconf sizeof cache variables +during cross compilation, but it never ensure that they are initialized. + +pkg-config must be called with $ac_tool_prefix and PKG_PROG_PKG_CONFIG takes +care of that. Setting PKG_CONFIG_PATH breaks the pkg-config-cross-wrapper. +Don't do that. + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +Index: openhpi-3.8.0/acinclude.m4 +=================================================================== +--- openhpi-3.8.0.orig/acinclude.m4 ++++ openhpi-3.8.0/acinclude.m4 +@@ -22,30 +22,39 @@ AC_DEFUN([OH_SET_SIZES], + + if test "x$cross_compiling" != "xno"; then + if test "x$OH_SIZEOF_UCHAR" = x; then ++ AC_CHECK_SIZEOF([unsigned char]) + OH_SIZEOF_UCHAR=$ac_cv_sizeof_uchar + fi + if test "x$OH_SIZEOF_USHORT" = x; then ++ AC_CHECK_SIZEOF([unsigned short]) + OH_SIZEOF_USHORT=$ac_cv_sizeof_ushort + fi + if test "x$OH_SIZEOF_UINT" = x; then ++ AC_CHECK_SIZEOF([unsigned int]) + OH_SIZEOF_UINT=$ac_cv_sizeof_uint + fi + if test "x$OH_SIZEOF_CHAR" = x; then ++ AC_CHECK_SIZEOF([char]) + OH_SIZEOF_CHAR=$ac_cv_sizeof_char + fi + if test "x$OH_SIZEOF_SHORT" = x; then ++ AC_CHECK_SIZEOF([short]) + OH_SIZEOF_SHORT=$ac_cv_sizeof_short + fi + if test "x$OH_SIZEOF_INT" = x; then ++ AC_CHECK_SIZEOF([int]) + OH_SIZEOF_INT=$ac_cv_sizeof_int + fi + if test "x$OH_SIZEOF_LLONG" = x; then ++ AC_CHECK_SIZEOF([long long]) + OH_SIZEOF_LLONG=$ac_cv_sizeof_longlong + fi + if test "x$OH_SIZEOF_FLOAT" = x; then ++ AC_CHECK_SIZEOF([float]) + OH_SIZEOF_FLOAT=$ac_cv_sizeof_float + fi + if test "x$OH_SIZEOF_DOUBLE" = x; then ++ AC_CHECK_SIZEOF([double]) + OH_SIZEOF_DOUBLE=$ac_cv_sizeof_double + fi + else +Index: openhpi-3.8.0/configure.ac +=================================================================== +--- openhpi-3.8.0.orig/configure.ac ++++ openhpi-3.8.0/configure.ac +@@ -87,9 +87,9 @@ have_rtas_lib=no + + dnl Check for GLIB + +-AC_CHECK_PROG([found_pkg_config],[pkg-config],[yes]) ++PKG_PROG_PKG_CONFIG + +-if test "x$found_pkg_config" != "xyes"; then ++if test "x$PKG_CONFIG" = "x"; then + OH_CHECK_FAIL(pkg-config,pkg-config) + fi + PKG_CFG_SETPATH +@@ -105,7 +105,7 @@ GLIB=glib-2.0 + GTHREAD=gthread-2.0 + GMODULE=gmodule-2.0 + +-if pkg-config --atleast-version $GLIB_REQUIRED_VERSION $GLIB; then ++if $PKG_CONFIG --atleast-version $GLIB_REQUIRED_VERSION $GLIB; then + : + else + AC_MSG_ERROR([ +@@ -268,12 +268,12 @@ dnl + dnl We really need to make ipmi enablement be contigent on OpenIPMI + dnl + +-if PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig pkg-config --atleast-version 1.4.20 OpenIPMI; then ++if $PKG_CONFIG --atleast-version 1.4.20 OpenIPMI; then + have_openipmi=yes + AC_CHECK_LIB([OpenIPMI], [ipmi_smi_setup_con], [have_openipmi=yes]) +- OPENIPMI_CFLAGS=`PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig pkg-config --cflags OpenIPMI` ++ OPENIPMI_CFLAGS=`$PKG_CONFIG --cflags OpenIPMI` + AC_SUBST(OPENIPMI_CFLAGS) +- OPENIPMI_LIBS=`PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig pkg-config --libs OpenIPMI` ++ OPENIPMI_LIBS=`$PKG_CONFIG --libs OpenIPMI` + AC_SUBST(OPENIPMI_LIBS) + fi + diff --git a/meta-networking/recipes-daemons/openhpi/files/fix-narrowing-warning.patch b/meta-networking/recipes-daemons/openhpi/files/fix-narrowing-warning.patch index 4c545708fc..eabffa7d9c 100644 --- a/meta-networking/recipes-daemons/openhpi/files/fix-narrowing-warning.patch +++ b/meta-networking/recipes-daemons/openhpi/files/fix-narrowing-warning.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Fix sensor_factors_000.cpp:66:5: error: non-constant-expression cannot be narrowed from type 'int' to 'unsigned char' in initializer list [-Wc++11-narrowing] diff --git a/meta-networking/recipes-daemons/openhpi/files/no-md2.patch b/meta-networking/recipes-daemons/openhpi/files/no-md2.patch new file mode 100644 index 0000000000..c4dd23e790 --- /dev/null +++ b/meta-networking/recipes-daemons/openhpi/files/no-md2.patch @@ -0,0 +1,37 @@ +Description: Fix FTBFS with OpenSSL 1.1 by honouring OPENSSL_NO_MD2 +Author: Adrian Bunk <bunk@debian.org> +Bug-Debian: https://bugs.debian.org/859543 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +Index: openhpi-3.8.0/plugins/ipmidirect/ipmi_auth.cpp +=================================================================== +--- openhpi-3.8.0.orig/plugins/ipmidirect/ipmi_auth.cpp ++++ openhpi-3.8.0/plugins/ipmidirect/ipmi_auth.cpp +@@ -21,6 +21,7 @@ + #include "ipmi_auth.h" + #include <string.h> + #include <errno.h> ++#include <openssl/opensslconf.h> + + + cIpmiAuth * +@@ -32,7 +33,7 @@ IpmiAuthFactory( tIpmiAuthType type ) + return new cIpmiAuthNone; + + case eIpmiAuthTypeMd2: +-#ifdef HAVE_OPENSSL_MD2_H ++#if defined(HAVE_OPENSSL_MD2_H) && !defined(OPENSSL_NO_MD2) + return new cIpmiAuthMd2; + #else + break; +@@ -78,7 +79,7 @@ cIpmiAuthNone::Check( cIpmiAuthSg /*d*/[ + } + + +-#ifdef HAVE_OPENSSL_MD2_H ++#if defined(HAVE_OPENSSL_MD2_H) && !defined(OPENSSL_NO_MD2) + #include <openssl/md2.h> + + diff --git a/meta-networking/recipes-daemons/openhpi/files/openhpi-3.6.1-ssl.patch b/meta-networking/recipes-daemons/openhpi/files/openhpi-3.6.1-ssl.patch new file mode 100644 index 0000000000..68f972fc51 --- /dev/null +++ b/meta-networking/recipes-daemons/openhpi/files/openhpi-3.6.1-ssl.patch @@ -0,0 +1,20 @@ +Link with libssl + +fixed build with openssl-1.1.x + +Taken from Fedora +https://src.fedoraproject.org/rpms/openhpi/c/be77f5484b0206f8946a85b29424ea10bf863063 + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Pending [Unknown] + +diff -up openhpi-3.6.1/ssl/Makefile.am.than openhpi-3.6.1/ssl/Makefile.am +--- openhpi-3.6.1/ssl/Makefile.am.than 2017-02-21 12:21:12.114814698 -0500 ++++ openhpi-3.6.1/ssl/Makefile.am 2017-02-21 12:22:44.576454262 -0500 +@@ -19,5 +19,5 @@ lib_LTLIBRARIES = libopenhpi_ssl.la + libopenhpi_ssl_la_SOURCES = oh_ssl.c oh_ssl.h + + libopenhpi_ssl_la_LDFLAGS = -version-info @HPI_LIB_VERSION@ +-libopenhpi_ssl_la_LIBADD = @CRYPTO_LIB@ ++libopenhpi_ssl_la_LIBADD = -lssl @CRYPTO_LIB@ + diff --git a/meta-networking/recipes-daemons/openhpi/files/openhpi-fix-function-saHpiSensorThresholds.patch b/meta-networking/recipes-daemons/openhpi/files/openhpi-fix-function-saHpiSensorThresholds.patch new file mode 100644 index 0000000000..b2771c0c92 --- /dev/null +++ b/meta-networking/recipes-daemons/openhpi/files/openhpi-fix-function-saHpiSensorThresholds.patch @@ -0,0 +1,35 @@ +From e0b2be7a1fce0fed63bac8c350b711b69edfe30e Mon Sep 17 00:00:00 2001 +From: "yanjun.zhu" <yanjun.zhu@windriver.com> +Date: Tue, 30 Apr 2019 10:04:58 +0800 +Subject: [PATCH] openhpid/safhpi.c: fix function saHpiSensorThresholdsSet + +In COPY_TH the SensorThresholds->TH will be copied to tmp.TH only if +TH.IsSupported == SAHPI_TRUE. So we should pass &tmp but not +SensorThresholds as the argument to OH_CALL_ABI. Otherwise the TH will +be set even if TH.IsSupported == SAHPI_FALSE. + +Upstream-Status: Submitted +[https://github.com/open-hpi/openhpi/pull/2744/commits/77a78bb1ada56e55c5ba6d7a5987c214705bf035] + +Signed-off-by: yanjun.zhu <yanjun.zhu@windriver.com> +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + openhpid/safhpi.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/openhpid/safhpi.c b/openhpid/safhpi.c +index 28a2632..61b7f03 100644 +--- a/openhpid/safhpi.c ++++ b/openhpid/safhpi.c +@@ -1933,7 +1933,7 @@ SaErrorT SAHPI_API saHpiSensorThresholdsSet ( + oh_release_domain(d); /* Unlock domain */ + + OH_CALL_ABI(h, set_sensor_thresholds, SA_ERR_HPI_INVALID_CMD, rv, +- ResourceId, SensorNum, SensorThresholds); ++ ResourceId, SensorNum, &tmp); + oh_release_handler(h); + + return rv; +-- +2.7.4 + diff --git a/meta-networking/recipes-daemons/openhpi/files/openhpi-fix-host-gcc.patch b/meta-networking/recipes-daemons/openhpi/files/openhpi-fix-host-gcc.patch index 029b857bc1..97c515e00b 100644 --- a/meta-networking/recipes-daemons/openhpi/files/openhpi-fix-host-gcc.patch +++ b/meta-networking/recipes-daemons/openhpi/files/openhpi-fix-host-gcc.patch @@ -6,11 +6,11 @@ Upstream-Status: Pending Signed-of-by: Aws Ismail <aws.ismail@windriver.com> -diff --git a/configure.ac b/configure.ac -index f5a5b74..4a20154 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -605,11 +605,6 @@ AC_ARG_ENABLE([werror], +Index: openhpi-3.6.1/configure.ac +=================================================================== +--- openhpi-3.6.1.orig/configure.ac ++++ openhpi-3.6.1/configure.ac +@@ -656,11 +656,6 @@ AC_ARG_ENABLE([werror], fi], []) diff --git a/meta-networking/recipes-daemons/openhpi/files/openhpi-fix-testfail-errors.patch b/meta-networking/recipes-daemons/openhpi/files/openhpi-fix-testfail-errors.patch deleted file mode 100644 index 205696e651..0000000000 --- a/meta-networking/recipes-daemons/openhpi/files/openhpi-fix-testfail-errors.patch +++ /dev/null @@ -1,31 +0,0 @@ -Fix for saftest failures. - -Upstream-Status: Pending - -Signed-off-by: yanjun.zhu <yanjun.zhu@windriver.com> - -diff -urpN a/openhpid/safhpi.c b/openhpid/safhpi.c ---- a/openhpid/safhpi.c -+++ b/openhpid/safhpi.c -@@ -1976,7 +1976,7 @@ SaErrorT SAHPI_API saHpiSensorThresholds - oh_release_domain(d); /* Unlock domain */ - - OH_CALL_ABI(h, set_sensor_thresholds, SA_ERR_HPI_INVALID_CMD, rv, -- ResourceId, SensorNum, SensorThresholds); -+ ResourceId, SensorNum, &tmp); - oh_release_handler(h); - - return rv; -diff -urpN a/utils/sahpi_struct_utils.c b/utils/sahpi_struct_utils.c ---- a/utils/sahpi_struct_utils.c -+++ b/utils/sahpi_struct_utils.c -@@ -3855,6 +3855,9 @@ SaHpiBoolT oh_valid_textbuffer(SaHpiText - /* found a unpaired surrogate */ - return SAHPI_FALSE; - } -+ } else { -+ /*the first 2 bytes wrong*/ -+ return SAHPI_FALSE; - } - } - break; diff --git a/meta-networking/recipes-daemons/openhpi/files/openhpi-hpi-shell-thread-fix.patch b/meta-networking/recipes-daemons/openhpi/files/openhpi-hpi-shell-thread-fix.patch deleted file mode 100644 index 7dac453189..0000000000 --- a/meta-networking/recipes-daemons/openhpi/files/openhpi-hpi-shell-thread-fix.patch +++ /dev/null @@ -1,29 +0,0 @@ -commit e9f9a73c9dba8dd59f3d6c3acd9988ec8361d55a -Author: Aws Ismail <aws.ismail@windriver.com> -Date: Mon Dec 17 16:23:45 2012 -0500 - - Correct dangling g_thread_exit in session.c - - hpi_shell's session.c has its progress_bar - thread created using pthread_create but - exited using g_thread_exit. Use pthread_exit - instead to avoid unpredictable GLIB thread - errors. - - Upstream-Status: Pending - - Signed-off-by: Aws Ismail <aws.ismail@windriver.com> - -diff --git a/hpi_shell/session.c b/hpi_shell/session.c -index 85c31bf..187da4c 100644 ---- a/hpi_shell/session.c -+++ b/hpi_shell/session.c -@@ -66,7 +66,7 @@ static void* progress_bar(void *unused) - if (i < (PROGRESS_BUF_SIZE - mes_len - 1)) i++; - t++; - }; -- g_thread_exit(0); -+ pthread_exit(0); - return (void *)1; - } - diff --git a/meta-networking/recipes-daemons/openhpi/files/openhpi-libxml2-cross-compile.patch b/meta-networking/recipes-daemons/openhpi/files/openhpi-libxml2-cross-compile.patch index 6d3b6648a8..160eeede69 100644 --- a/meta-networking/recipes-daemons/openhpi/files/openhpi-libxml2-cross-compile.patch +++ b/meta-networking/recipes-daemons/openhpi/files/openhpi-libxml2-cross-compile.patch @@ -1,4 +1,7 @@ -Fix libxml2 for cross-compiling +From afe545e77f9d841b7777d859e7e8108492fece96 Mon Sep 17 00:00:00 2001 +From: Jackie Huang <jackie.huang@windriver.com> +Date: Wed, 26 Apr 2017 16:22:00 +0800 +Subject: [PATCH] Fix libxml2 for cross-compiling Use proper XML2_INCLUDE path when cross-compiling @@ -6,16 +9,20 @@ Upstream-Status: Pending Signed-of-by: Aws Ismail <aws.ismail@windriver.com> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + diff --git a/configure.ac b/configure.ac -index 30a792c..b5f5aad 100644 +index 6242cbf..4fb6b69 100644 --- a/configure.ac +++ b/configure.ac -@@ -175,7 +175,7 @@ AC_CHECK_HEADERS([openssl/md2.h openssl/md5.h openssl/bio.h openssl/ssl.h openss +@@ -179,7 +179,7 @@ AC_CHECK_HEADERS([openssl/md2.h openssl/md5.h openssl/bio.h openssl/ssl.h openss dnl xml is used for XML-based communication in ilo2_ribcl and oa_soap AC_CHECK_LIB([xml2],[xmlParseMemory],[XML2_LIB=-lxml2],[XML2_LIB=]) --AC_CHECK_HEADERS([libxml2/libxml/xmlexports.h],[XML2_INCLUDE="-I/usr/include/libxml2"],[XML2_INCLUDE]) -+AC_CHECK_HEADERS([libxml2/libxml/xmlexports.h],[XML2_INCLUDE="$XML2_INCLUDE"],[XML2_INCLUDE]) +-AC_CHECK_HEADERS([libxml2/libxml/xmlexports.h],[XML2_INCLUDE="-I/usr/include/libxml2"],[XML2_INCLUDE=]) ++AC_CHECK_HEADERS([libxml2/libxml/xmlexports.h],[XML2_INCLUDE="$XML2_INCLUDE"],[XML2_INCLUDE=]) AC_SUBST(XML2_LIB) AC_SUBST(XML2_INCLUDE) diff --git a/meta-networking/recipes-daemons/openhpi/files/openhpi-netsnmp-cross-compile.patch b/meta-networking/recipes-daemons/openhpi/files/openhpi-netsnmp-cross-compile.patch index 95b0abc913..293c8d91f5 100644 --- a/meta-networking/recipes-daemons/openhpi/files/openhpi-netsnmp-cross-compile.patch +++ b/meta-networking/recipes-daemons/openhpi/files/openhpi-netsnmp-cross-compile.patch @@ -13,36 +13,33 @@ Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> configure | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) -diff --git a/acinclude.m4 b/acinclude.m4 -index 82c33f6..727e461 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 +Index: openhpi-3.8.0/acinclude.m4 +=================================================================== +--- openhpi-3.8.0.orig/acinclude.m4 ++++ openhpi-3.8.0/acinclude.m4 @@ -160,8 +160,8 @@ AC_DEFUN([OH_CHECK_NETSNMP], ], [ have_netsnmp=yes -- SNMPFLAGS=`${net_snmp_config:-net-snmp-config} --cflags | perl -p -e 's/-O\S*//g'` +- SNMPFLAGS=`${net_snmp_config:-net-snmp-config} --cflags | perl -p -e 's/ -O\S*//g'` - SNMPLIBS=`${net_snmp_config:-net-snmp-config} --libs` + SNMPFLAGS="" + SNMPLIBS="" AC_MSG_RESULT(yes) ], [AC_MSG_RESULT(no. No SNMP based plugins can be built!)]) -diff --git a/configure b/configure -index 00067bc..36b913c 100755 ---- a/configure -+++ b/configure -@@ -15949,8 +15949,8 @@ _ACEOF +Index: openhpi-3.8.0/configure +=================================================================== +--- openhpi-3.8.0.orig/configure ++++ openhpi-3.8.0/configure +@@ -16062,8 +16062,8 @@ _ACEOF if ac_fn_c_try_link "$LINENO"; then : have_netsnmp=yes -- SNMPFLAGS=`${net_snmp_config:-net-snmp-config} --cflags | perl -p -e 's/-O\S*//g'` +- SNMPFLAGS=`${net_snmp_config:-net-snmp-config} --cflags | perl -p -e 's/ -O\S*//g'` - SNMPLIBS=`${net_snmp_config:-net-snmp-config} --libs` + SNMPFLAGS="" + SNMPLIBS="" { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } --- -1.9.1 - diff --git a/meta-networking/recipes-daemons/openhpi/files/openhpi-use-serial-tests-config-needed-by-ptest.patch b/meta-networking/recipes-daemons/openhpi/files/openhpi-use-serial-tests-config-needed-by-ptest.patch index 51537ef128..472318b808 100644 --- a/meta-networking/recipes-daemons/openhpi/files/openhpi-use-serial-tests-config-needed-by-ptest.patch +++ b/meta-networking/recipes-daemons/openhpi/files/openhpi-use-serial-tests-config-needed-by-ptest.patch @@ -1,4 +1,4 @@ -From 36fbaa27e7299f63c1324b0ad22b970e9365d6a7 Mon Sep 17 00:00:00 2001 +From 5e0ae172586f5aeb270a8f9b012dd3e36536a2a9 Mon Sep 17 00:00:00 2001 From: Jackie Huang <jackie.huang@windriver.com> Date: Wed, 24 Dec 2014 10:54:59 +0800 Subject: [PATCH] openhpi: use serial-tests config needed by ptest @@ -9,23 +9,21 @@ serial-tests is required to generate those targets. Upstream-Status: Inappropriate [default automake behavior incompatible with ptest] Signed-off-by: Jackie Huang <jackie.huang@windriver.com> + --- - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 4b51971..16136b3 100644 +index 89d8104..c29a31f 100644 --- a/configure.ac +++ b/configure.ac @@ -7,7 +7,7 @@ dnl various hacks by Sean Dague <http://dague.net/sean> 4/23/03 AC_PREREQ(2.57) - AC_INIT(openhpi, 3.5.0) + AC_INIT(openhpi, 3.8.0) AC_CONFIG_SRCDIR(openhpi.spec.in) -AM_INIT_AUTOMAKE([1.8]) +AM_INIT_AUTOMAKE([1.8 serial-tests]) AM_CONFIG_HEADER(config.h) AH_TOP([#ifndef __OPENHPI_CONFIG_H --- -1.7.1 - diff --git a/meta-networking/recipes-daemons/openhpi/files/openhpid.service b/meta-networking/recipes-daemons/openhpi/files/openhpid.service index cd4168f8e5..816e44f822 100644 --- a/meta-networking/recipes-daemons/openhpi/files/openhpid.service +++ b/meta-networking/recipes-daemons/openhpi/files/openhpid.service @@ -4,7 +4,7 @@ After=syslog.target [Service] Type=forking -PIDFile=/var/run/openhpid.pid +PIDFile=/run/openhpid.pid ExecStart=@SBINDIR@/openhpid -c @SYSCONFDIR@/openhpi/openhpi.conf [Install] diff --git a/meta-networking/recipes-daemons/openhpi/openhpi_3.6.1.bb b/meta-networking/recipes-daemons/openhpi/openhpi_3.8.0.bb index ecf71d70f6..ac13d7a196 100644 --- a/meta-networking/recipes-daemons/openhpi/openhpi_3.6.1.bb +++ b/meta-networking/recipes-daemons/openhpi/openhpi_3.8.0.bb @@ -17,10 +17,11 @@ servers, Blade Center, and machines which export data via sysfs. \ HOMEPAGE = "http://openhpi.sourceforge.net/Home" SECTION = "net" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=e3c772a32386888ccb5ae1c0ba95f1a4" -DEPENDS = "net-snmp libxml2 ncurses openssl glib-2.0 popt e2fsprogs autoconf-archive-native" +DEPENDS = "net-snmp libxml2 ncurses openssl glib-2.0 popt e2fsprogs \ + autoconf-archive-native os-release" SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz \ file://openhpi.init \ @@ -32,47 +33,52 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz \ file://openhpi-glib-cross-compile.patch \ file://openhpi-linkfix.patch \ file://openhpi-fix-host-gcc.patch \ - file://openhpi-hpi-shell-thread-fix.patch \ - file://openhpi-fix-testfail-errors.patch \ + file://openhpi-fix-function-saHpiSensorThresholds.patch \ file://openhpi-add-libnetsnmp-when-link.patch \ file://openhpi-invalide-session.patch \ file://openhpi-use-serial-tests-config-needed-by-ptest.patch \ file://openhpi-fix-alignment-issue.patch \ - file://0001-Fix-build-failures-with-gcc7.patch \ file://c++11.patch \ file://clang-c++11.patch \ file://fix-narrowing-warning.patch \ - file://0001-plugins-Check-for-PTHREAD_RECURSIVE_MUTEX_INITIALIZE.patch \ - file://0001-ipmidirect-Replace-__STRING.patch \ + file://0001-session-close-socket.patch \ + file://openhpi-3.6.1-ssl.patch \ + file://0001-Do-not-poke-at-build-host-s-etc-os-release.patch \ + file://cross_899198.patch \ + file://no-md2.patch \ + file://0001-include-iostream-for-cout.patch \ " - -SRC_URI[md5sum] = "4718b16e0f749b5ad214a9b04f45dd23" -SRC_URI[sha256sum] = "e0a810cb401c4bdcfc9551f2e6afd5a8ca4b411f5ee3bc60c19f82fd6e84a3dc" +SRC_URI[md5sum] = "fffda3deea8a0d3671a72eea9d13a4df" +SRC_URI[sha256sum] = "c94332a29160dd75cb799c027e614690c00263b0fabed87417707bec04c38723" inherit autotools pkgconfig ptest update-rc.d systemd PACKAGES =+ "${PN}-libs" -FILES_${PN}-libs = "${libdir}/${BPN}/*.so /usr/lib/${BPN}/*.so" +FILES:${PN}-libs = "${libdir}/${BPN}/*.so /usr/lib/${BPN}/*.so" -INSANE_SKIP_${PN}-libs = "dev-so" -RDEPENDS_${PN} += "${PN}-libs" +INSANE_SKIP:${PN}-libs = "dev-so" +RDEPENDS:${PN} += "${PN}-libs" +RDEPENDS:${PN}-ptest += "packagegroup-core-buildessential" -PACKAGECONFIG ??= "libgcrypt non32bit" +PACKAGECONFIG ??= "libgcrypt non32bit snmp-bc" PACKAGECONFIG[sysfs] = "--enable-sysfs,--disable-sysfs,sysfsutils," PACKAGECONFIG[libgcrypt] = "--enable-encryption,--disable-encryption,libgcrypt," PACKAGECONFIG[non32bit] = "--enable-non32bit-int,--disable-non32bit-int,," +PACKAGECONFIG[snmp-bc] = "--enable-snmp_bc,--disable-snmp_bc" + +export DISTRO -do_install_append () { +do_install:append () { install -m 0755 -d ${D}${sysconfdir}/${BPN} - install -m 0755 ${S}/openhpiclient.conf.example ${D}${sysconfdir}/${BPN}/openhpiclient.conf - install -m 0700 ${S}/openhpi.conf.example ${D}${sysconfdir}/${BPN}/openhpi.conf - install -m 0755 ${S}/simulation.data.example ${D}${sysconfdir}/${BPN}/simulation.data - install -m 0755 ${S}/test_agent.data.example ${D}${sysconfdir}/${BPN}/test_agent.data - install -m 0755 ${WORKDIR}/openhpi.init ${D}${sysconfdir}/init.d/openhpid + install -m 0644 ${S}/openhpiclient.conf.example ${D}${sysconfdir}/${BPN}/openhpiclient.conf + install -m 0600 ${S}/openhpi.conf.example ${D}${sysconfdir}/${BPN}/openhpi.conf + install -m 0644 ${S}/simulation.data.example ${D}${sysconfdir}/${BPN}/simulation.data + install -m 0644 ${S}/test_agent.data.example ${D}${sysconfdir}/${BPN}/test_agent.data + install -m 0755 ${UNPACKDIR}/openhpi.init ${D}${sysconfdir}/init.d/openhpid install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/openhpid.service ${D}${systemd_unitdir}/system + install -m 0644 ${UNPACKDIR}/openhpid.service ${D}${systemd_unitdir}/system sed -i -e "s,@SBINDIR@,${sbindir},g" -e "s,@SYSCONFDIR@,${sysconfdir},g" \ ${D}${systemd_unitdir}/system/openhpid.service } @@ -80,6 +86,21 @@ do_install_append () { do_compile_ptest () { for x in `find ${B} -name Makefile -exec grep -l buildtest-TESTS {} \;`; do dir=`dirname ${x}` + case $dir in + *cpp/t) ;; + *snmp_bc/t) if ${@bb.utils.contains('PACKAGECONFIG','snmp-bc','true','false',d)} + then + oe_runmake -C ${dir} buildtest-TESTS + fi + ;; + *) oe_runmake -C ${dir} buildtest-TESTS ;; + esac + done +} + +ack_do_compile_ptest () { + for x in `find ${B} -name Makefile -exec grep -l buildtest-TESTS {} \;`; do + dir=`dirname ${x}` upper=`dirname ${dir}` if [ `basename ${upper}` != "cpp" ]; then oe_runmake -C ${dir} buildtest-TESTS @@ -100,6 +121,9 @@ do_install_ptest () { sed -i "s/^Makefile:/MM:/g" ${x}; done; + install -m 644 ${S}/openhpid/t/ohpi/openhpi.conf ${D}${PTEST_PATH}/openhpid/t/ohpi/ + sed -i "s:OPENHPI_CONF=[^ ]*:OPENHPI_CONF=./openhpi.conf:g" ${D}${PTEST_PATH}/openhpid/t/ohpi/Makefile + mkdir -p ${D}${PTEST_PATH}/plugins/watchdog/ cp -L ${D}/${libdir}/${BPN}/libwatchdog.so ${D}${PTEST_PATH}/plugins/watchdog/ cp -L ${D}/${libdir}/${BPN}/libsimulator.so ${D}${PTEST_PATH}/plugins/watchdog/ @@ -111,5 +135,5 @@ do_install_ptest () { INITSCRIPT_NAME = "openhpid" INITSCRIPT_PARAMS = "start 30 . stop 70 0 1 2 3 4 5 6 ." -SYSTEMD_SERVICE_${PN} = "openhpid.service" +SYSTEMD_SERVICE:${PN} = "openhpid.service" SYSTEMD_AUTO_ENABLE = "disable" diff --git a/meta-networking/recipes-daemons/opensaf/opensaf/0001-Fix-build-with-fno-common.patch b/meta-networking/recipes-daemons/opensaf/opensaf/0001-Fix-build-with-fno-common.patch new file mode 100644 index 0000000000..b581c571bb --- /dev/null +++ b/meta-networking/recipes-daemons/opensaf/opensaf/0001-Fix-build-with-fno-common.patch @@ -0,0 +1,311 @@ +From 9a46462f08535e946d97fd40c79229a7ee8b7336 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 17 Aug 2020 00:00:00 -0700 +Subject: [PATCH] Fix build with -fno-common + +Mark the declarations with extern where needed in header files + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/ckpt/agent/cpa_cb.h | 2 +- + src/ckpt/ckptd/cpd_init.h | 2 +- + src/evt/agent/eda.h | 2 +- + src/evt/evtd/eds.h | 2 +- + src/evt/evtd/eds_amf.c | 2 ++ + src/evt/evtd/eds_amf.h | 2 +- + src/evt/evtd/eds_cb.h | 2 +- + src/imm/immd/immd.h | 2 +- + src/lck/lckd/gld_dl_api.h | 4 ++-- + src/lck/lcknd/glnd_cb.h | 4 ++-- + src/mds/mds_core.h | 34 +++++++++++++++++++--------------- + src/mds/mds_dt_tcp.c | 2 ++ + src/mds/mds_dt_tcp.h | 2 +- + src/mds/mds_main.c | 2 +- + src/msg/msgnd/mqnd_db.h | 2 +- + 15 files changed, 37 insertions(+), 29 deletions(-) + +diff --git a/src/ckpt/agent/cpa_cb.h b/src/ckpt/agent/cpa_cb.h +index ac48c6c..d633583 100644 +--- a/src/ckpt/agent/cpa_cb.h ++++ b/src/ckpt/agent/cpa_cb.h +@@ -119,7 +119,7 @@ typedef struct cpa_cb { + + } CPA_CB; + +-uint32_t gl_cpa_hdl; ++extern uint32_t gl_cpa_hdl; + + typedef struct cpa_prcess_evt_sync { + NCS_QELEM qelem; +diff --git a/src/ckpt/ckptd/cpd_init.h b/src/ckpt/ckptd/cpd_init.h +index 0c02642..cf3466b 100644 +--- a/src/ckpt/ckptd/cpd_init.h ++++ b/src/ckpt/ckptd/cpd_init.h +@@ -33,7 +33,7 @@ + #include <saAmf.h> + #include "cpd_cb.h" + +-uint32_t gl_cpd_cb_hdl; ++extern uint32_t gl_cpd_cb_hdl; + + /* Macro to get the component name for the component type */ + #define m_CPD_TASKNAME "CPD" +diff --git a/src/evt/agent/eda.h b/src/evt/agent/eda.h +index 4d1991c..138c910 100644 +--- a/src/evt/agent/eda.h ++++ b/src/evt/agent/eda.h +@@ -39,7 +39,7 @@ + #include "base/logtrace.h" + + /* EDA CB global handle declaration */ +-uint32_t gl_eda_hdl; ++extern uint32_t gl_eda_hdl; + + /* EDA Default MDS timeout value */ + #define EDA_MDS_DEF_TIMEOUT 100 +diff --git a/src/evt/evtd/eds.h b/src/evt/evtd/eds.h +index bc9c429..3545d77 100644 +--- a/src/evt/evtd/eds.h ++++ b/src/evt/evtd/eds.h +@@ -72,6 +72,6 @@ + #include "base/daemon.h" + + /* EDS CB global handle declaration */ +-uint32_t gl_eds_hdl; ++extern uint32_t gl_eds_hdl; + + #endif // EVT_EVTD_EDS_H_ +diff --git a/src/evt/evtd/eds_amf.c b/src/evt/evtd/eds_amf.c +index 97b71a5..adebf0c 100644 +--- a/src/evt/evtd/eds_amf.c ++++ b/src/evt/evtd/eds_amf.c +@@ -30,6 +30,8 @@ stuff. + #include "eds.h" + #include "eds_dl_api.h" + ++struct next_HAState nextStateInfo; ++ + /* HA AMF statemachine & State handler definitions */ + + /**************************************************************************** +diff --git a/src/evt/evtd/eds_amf.h b/src/evt/evtd/eds_amf.h +index e9aeaa6..f9803b4 100644 +--- a/src/evt/evtd/eds_amf.h ++++ b/src/evt/evtd/eds_amf.h +@@ -49,7 +49,7 @@ uint32_t eds_quiesced_state_handler(EDS_CB *cb, SaInvocationT invocation); + struct next_HAState { + uint8_t nextState1; + uint8_t nextState2; +-} nextStateInfo; /* AMF HA state can transit to a maximum of the two defined ++}; /* AMF HA state can transit to a maximum of the two defined + states */ + + #define VALIDATE_STATE(curr, next) \ +diff --git a/src/evt/evtd/eds_cb.h b/src/evt/evtd/eds_cb.h +index c127ead..19c48cd 100644 +--- a/src/evt/evtd/eds_cb.h ++++ b/src/evt/evtd/eds_cb.h +@@ -40,7 +40,7 @@ + #include "base/ncssysf_tmr.h" + + /* global variables */ +-uint32_t gl_eds_hdl; ++extern uint32_t gl_eds_hdl; + + struct eda_reg_list_tag; + +diff --git a/src/imm/immd/immd.h b/src/imm/immd/immd.h +index 7dc1da6..bab3945 100644 +--- a/src/imm/immd/immd.h ++++ b/src/imm/immd/immd.h +@@ -42,7 +42,7 @@ + #include "immd_sbedu.h" + #include "base/ncs_mda_pvt.h" + +-IMMD_CB *immd_cb; ++extern IMMD_CB *immd_cb; + + extern uint32_t initialize_for_assignment(IMMD_CB *cb, SaAmfHAStateT ha_state); + +diff --git a/src/lck/lckd/gld_dl_api.h b/src/lck/lckd/gld_dl_api.h +index 6476a71..3a67fd1 100644 +--- a/src/lck/lckd/gld_dl_api.h ++++ b/src/lck/lckd/gld_dl_api.h +@@ -33,7 +33,7 @@ + #include "base/ncsgl_defs.h" + #include "base/ncs_lib.h" + +-uint32_t gl_gld_hdl; +-uint32_t gld_lib_req(NCS_LIB_REQ_INFO *req_info); ++extern uint32_t gl_gld_hdl; ++extern uint32_t gld_lib_req(NCS_LIB_REQ_INFO *req_info); + + #endif // LCK_LCKD_GLD_DL_API_H_ +diff --git a/src/lck/lcknd/glnd_cb.h b/src/lck/lcknd/glnd_cb.h +index 3b82f60..77a1f88 100644 +--- a/src/lck/lcknd/glnd_cb.h ++++ b/src/lck/lcknd/glnd_cb.h +@@ -28,8 +28,8 @@ extern "C" { + #endif + + /* global variables */ +-uint32_t gl_glnd_hdl; +-NCSCONTEXT gl_glnd_task_hdl; ++extern uint32_t gl_glnd_hdl; ++extern NCSCONTEXT gl_glnd_task_hdl; + + /* macros for the global varibales */ + #define m_GLND_RETRIEVE_GLND_CB_HDL gl_glnd_hdl +diff --git a/src/mds/mds_core.h b/src/mds/mds_core.h +index dad62cd..ed69d3a 100644 +--- a/src/mds/mds_core.h ++++ b/src/mds/mds_core.h +@@ -26,6 +26,10 @@ + #ifndef MDS_MDS_CORE_H_ + #define MDS_MDS_CORE_H_ + ++#ifndef EXTERN ++#define EXTERN extern ++#endif ++ + #include <pthread.h> + #include "base/ncsgl_defs.h" + #include "mds/mds_papi.h" +@@ -600,65 +604,65 @@ extern "C" { + /* ******************************************** */ + + /* Initialization of MDTM Module */ +-uint32_t (*mds_mdtm_init)(NODE_ID node_id, uint32_t *mds_tipc_ref); ++EXTERN uint32_t (*mds_mdtm_init)(NODE_ID node_id, uint32_t *mds_tipc_ref); + + /* Destroying the MDTM Module*/ +-uint32_t (*mds_mdtm_destroy)(void); ++EXTERN uint32_t (*mds_mdtm_destroy)(void); + +-uint32_t (*mds_mdtm_send)(MDTM_SEND_REQ *req); ++EXTERN uint32_t (*mds_mdtm_send)(MDTM_SEND_REQ *req); + + /* SVC Install */ +-uint32_t (*mds_mdtm_svc_install)(PW_ENV_ID pwe_id, MDS_SVC_ID svc_id, ++EXTERN uint32_t (*mds_mdtm_svc_install)(PW_ENV_ID pwe_id, MDS_SVC_ID svc_id, + NCSMDS_SCOPE_TYPE install_scope, + V_DEST_RL role, MDS_VDEST_ID vdest_id, + NCS_VDEST_TYPE vdest_policy, + MDS_SVC_PVT_SUB_PART_VER mds_svc_pvt_ver); + + /* SVC Uninstall */ +-uint32_t (*mds_mdtm_svc_uninstall)(PW_ENV_ID pwe_id, MDS_SVC_ID svc_id, ++EXTERN uint32_t (*mds_mdtm_svc_uninstall)(PW_ENV_ID pwe_id, MDS_SVC_ID svc_id, + NCSMDS_SCOPE_TYPE install_scope, + V_DEST_RL role, MDS_VDEST_ID vdest_id, + NCS_VDEST_TYPE vdest_policy, + MDS_SVC_PVT_SUB_PART_VER mds_svc_pvt_ver); + + /* SVC Subscribe */ +-uint32_t (*mds_mdtm_svc_subscribe)(PW_ENV_ID pwe_id, MDS_SVC_ID svc_id, ++EXTERN uint32_t (*mds_mdtm_svc_subscribe)(PW_ENV_ID pwe_id, MDS_SVC_ID svc_id, + NCSMDS_SCOPE_TYPE subscribe_scope, + MDS_SVC_HDL local_svc_hdl, + MDS_SUBTN_REF_VAL *subtn_ref_val); + + /* added svc_hdl */ + /* SVC Unsubscribe */ +-uint32_t (*mds_mdtm_svc_unsubscribe)(PW_ENV_ID pwe_id, MDS_SVC_ID svc_id, ++EXTERN uint32_t (*mds_mdtm_svc_unsubscribe)(PW_ENV_ID pwe_id, MDS_SVC_ID svc_id, + NCSMDS_SCOPE_TYPE subscribe_scope, + MDS_SUBTN_REF_VAL subtn_ref_val); + + /* VDEST Install */ +-uint32_t (*mds_mdtm_vdest_install)(MDS_VDEST_ID vdest_id); ++EXTERN uint32_t (*mds_mdtm_vdest_install)(MDS_VDEST_ID vdest_id); + + /* VDEST Uninstall */ +-uint32_t (*mds_mdtm_vdest_uninstall)(MDS_VDEST_ID vdest_id); ++EXTERN uint32_t (*mds_mdtm_vdest_uninstall)(MDS_VDEST_ID vdest_id); + + /* VDEST Subscribe */ +-uint32_t (*mds_mdtm_vdest_subscribe)(MDS_VDEST_ID vdest_id, ++EXTERN uint32_t (*mds_mdtm_vdest_subscribe)(MDS_VDEST_ID vdest_id, + MDS_SUBTN_REF_VAL *subtn_ref_val); + + /* VDEST Unsubscribe */ +-uint32_t (*mds_mdtm_vdest_unsubscribe)(MDS_VDEST_ID vdest_id, ++EXTERN uint32_t (*mds_mdtm_vdest_unsubscribe)(MDS_VDEST_ID vdest_id, + MDS_SUBTN_REF_VAL subtn_ref_val); + + /* Tx Register (For incrementing the use count) */ +-uint32_t (*mds_mdtm_tx_hdl_register)(MDS_DEST adest); ++EXTERN uint32_t (*mds_mdtm_tx_hdl_register)(MDS_DEST adest); + + /* Tx Unregister (For decrementing the use count) */ +-uint32_t (*mds_mdtm_tx_hdl_unregister)(MDS_DEST adest); ++EXTERN uint32_t (*mds_mdtm_tx_hdl_unregister)(MDS_DEST adest); + + /* Node subscription */ +-uint32_t (*mds_mdtm_node_subscribe)(MDS_SVC_HDL svc_hdl, ++EXTERN uint32_t (*mds_mdtm_node_subscribe)(MDS_SVC_HDL svc_hdl, + MDS_SUBTN_REF_VAL *subtn_ref_val); + + /* Node unsubscription */ +-uint32_t (*mds_mdtm_node_unsubscribe)(MDS_SUBTN_REF_VAL subtn_ref_val); ++EXTERN uint32_t (*mds_mdtm_node_unsubscribe)(MDS_SUBTN_REF_VAL subtn_ref_val); + + #ifdef __cplusplus + } +diff --git a/src/mds/mds_dt_tcp.c b/src/mds/mds_dt_tcp.c +index 4a37246..e73cef4 100644 +--- a/src/mds/mds_dt_tcp.c ++++ b/src/mds/mds_dt_tcp.c +@@ -70,6 +70,8 @@ NCS_PATRICIA_TREE mdtm_reassembly_list; + + /* Get the pid of the process */ + pid_t mdtm_pid; ++ ++MDTM_TCP_CB *tcp_cb; + + static void mds_mdtm_enc_init(MDS_MDTM_DTM_MSG *init, uint8_t *buff); + static uint32_t mdtm_create_rcv_task(void); +diff --git a/src/mds/mds_dt_tcp.h b/src/mds/mds_dt_tcp.h +index 1065464..350d534 100644 +--- a/src/mds/mds_dt_tcp.h ++++ b/src/mds/mds_dt_tcp.h +@@ -50,7 +50,7 @@ typedef struct mdtm_tcp_cb { + + } MDTM_TCP_CB; + +-MDTM_TCP_CB *tcp_cb; ++extern MDTM_TCP_CB *tcp_cb; + + typedef enum mds_mdtm_dtm_msg_types { + MDS_MDTM_DTM_PID_TYPE = 1, +diff --git a/src/mds/mds_main.c b/src/mds/mds_main.c +index 0bcb2f9..5671ed3 100644 +--- a/src/mds/mds_main.c ++++ b/src/mds/mds_main.c +@@ -20,7 +20,7 @@ + #endif + + #include "osaf/configmake.h" +- ++#define EXTERN + /***************************************************************************** + .............................................................................. + +diff --git a/src/msg/msgnd/mqnd_db.h b/src/msg/msgnd/mqnd_db.h +index b78024e..fee43e5 100644 +--- a/src/msg/msgnd/mqnd_db.h ++++ b/src/msg/msgnd/mqnd_db.h +@@ -33,7 +33,7 @@ + #include <saClm.h> + #include <saImmOi.h> + /* Decleration for global variable */ +-uint32_t gl_mqnd_cb_hdl; ++extern uint32_t gl_mqnd_cb_hdl; + + /* Macros for reading global database */ + #define m_MQND_STORE_HDL(hdl) (gl_mqnd_cb_hdl = (hdl)) +-- +2.28.0 + diff --git a/meta-networking/recipes-daemons/opensaf/opensaf/0001-Use-correct-printf-format-for-__fsblkcnt_t.patch b/meta-networking/recipes-daemons/opensaf/opensaf/0001-Use-correct-printf-format-for-__fsblkcnt_t.patch new file mode 100644 index 0000000000..7e88c498ee --- /dev/null +++ b/meta-networking/recipes-daemons/opensaf/opensaf/0001-Use-correct-printf-format-for-__fsblkcnt_t.patch @@ -0,0 +1,31 @@ +From 90f81c1fb3e560cfc99ee7ab9a48a1736e3929cd Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 15 Nov 2020 13:22:31 -0800 +Subject: [PATCH] Use correct printf format for __fsblkcnt_t + +This depends on time_t size and on some 32bit architectures e.g. riscv32 +this would be a 64bit value + +Fixes +os_defs.c:920:40: error: format '%ld' expects argument of type 'long int', but argument 3 has type '__fsblkcnt_t' {aka 'long long unsigned int'} [-Werror=format=] + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/base/os_defs.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/src/base/os_defs.c ++++ b/src/base/os_defs.c +@@ -917,7 +917,11 @@ uint32_t ncs_os_posix_shm(NCS_OS_POSIX_S + ((statsvfs.f_bfree - 1) * statsvfs.f_frsize)) { + syslog( + LOG_ERR, ++#if (_FILE_OFFSET_BITS == 64 || __TIMESIZE == 64) && __WORDSIZE == 32 ++ "Insufficient shared memory (%lld) to write the data of size: %" PRId64 ++#else + "Insufficient shared memory (%ld) to write the data of size: %" PRId64 ++#endif + "\n", + (statsvfs.f_bfree * statsvfs.f_frsize), + req->info.write.i_write_size); diff --git a/meta-networking/recipes-daemons/opensaf/opensaf/0001-configure-Disable-format-overflow-if-supported-by-gc.patch b/meta-networking/recipes-daemons/opensaf/opensaf/0001-configure-Disable-format-overflow-if-supported-by-gc.patch index 512e246c56..c5264e5e7a 100644 --- a/meta-networking/recipes-daemons/opensaf/opensaf/0001-configure-Disable-format-overflow-if-supported-by-gc.patch +++ b/meta-networking/recipes-daemons/opensaf/opensaf/0001-configure-Disable-format-overflow-if-supported-by-gc.patch @@ -1,18 +1,21 @@ -From ab00d6f5793b2d850f975bcb6d5d0aa6d7a9eaa4 Mon Sep 17 00:00:00 2001 +From c2668f7f2ea82a61115b7cae56ed081b41ff5153 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sat, 22 Apr 2017 12:34:37 -0700 Subject: [PATCH] configure: Disable format-overflow if supported by gcc Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- - Makefile.am | 6 ++-- - configure.ac | 2 ++ - m4/ax_check_compile_flag.m4 | 74 +++++++++++++++++++++++++++++++++++++++++++++ +Upstream-Status: Pending + + Makefile.am | 6 +-- + configure.ac | 2 + + m4/ax_check_compile_flag.m4 | 74 +++++++++++++++++++++++++++++++++++++ 3 files changed, 79 insertions(+), 3 deletions(-) create mode 100644 m4/ax_check_compile_flag.m4 diff --git a/Makefile.am b/Makefile.am -index d63fbbb..1012a2c 100644 +index b3d6553..5607fc2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -52,10 +52,10 @@ AM_CPPFLAGS = \ @@ -26,14 +29,14 @@ index d63fbbb..1012a2c 100644 -AM_CXXFLAGS = -pipe -std=gnu++11 @OSAF_HARDEN_FLAGS@ -Wall -Wformat=2 -Werror +AM_CFLAGS = -pipe -std=gnu11 @OSAF_HARDEN_FLAGS@ -Wall -Wformat=2 -Werror @NOWARNINGS@ +AM_CXXFLAGS = -pipe -std=gnu++11 @OSAF_HARDEN_FLAGS@ -Wall -Wformat=2 -Werror @NOWARNINGS@ - AM_LDFLAGS = @OSAF_HARDEN_FLAGS@ -Wl,--as-needed -ldl -lrt -pthread -rdynamic - ACLOCAL_AMFLAGS = -I m4 - OSAF_LIB_FLAGS = + + if ENABLE_GCOV + AM_CFLAGS += --coverage diff --git a/configure.ac b/configure.ac -index 02771c6..b76b0fe 100644 +index 5b86730..47d1002 100644 --- a/configure.ac +++ b/configure.ac -@@ -557,6 +557,8 @@ if test -z "$OSAF_HARDEN_FLAGS"; then +@@ -600,6 +600,8 @@ if test -z "$OSAF_HARDEN_FLAGS"; then fi AC_SUBST(OSAF_HARDEN_FLAGS) @@ -122,6 +125,3 @@ index 0000000..dcabb92 + [m4_default([$3], :)]) +AS_VAR_POPDEF([CACHEVAR])dnl +])dnl AX_CHECK_COMPILE_FLAGS --- -2.12.2 - diff --git a/meta-networking/recipes-daemons/opensaf/opensaf/0001-configure-Pass-linker-specific-options-with-Wl.patch b/meta-networking/recipes-daemons/opensaf/opensaf/0001-configure-Pass-linker-specific-options-with-Wl.patch index 5756a027b4..daf06d38fb 100644 --- a/meta-networking/recipes-daemons/opensaf/opensaf/0001-configure-Pass-linker-specific-options-with-Wl.patch +++ b/meta-networking/recipes-daemons/opensaf/opensaf/0001-configure-Pass-linker-specific-options-with-Wl.patch @@ -1,4 +1,4 @@ -From 6248b717b4861d16b80235fd8e57d64e4f636428 Mon Sep 17 00:00:00 2001 +From 979b2b6a1aa574a26e8b736049c4207d568f60f3 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Thu, 13 Apr 2017 17:39:07 -0700 Subject: [PATCH] configure: Pass linker specific options with -Wl @@ -7,15 +7,18 @@ This helps make it pass the options to linker correctly and we can use non-gcc compilers Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- +Upstream-Status: Pending + configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index df4fc58..02771c6 100644 +index 12a5d5c..5b86730 100644 --- a/configure.ac +++ b/configure.ac -@@ -553,7 +553,7 @@ if test -z "$OSAF_HARDEN_FLAGS"; then +@@ -596,7 +596,7 @@ if test -z "$OSAF_HARDEN_FLAGS"; then if echo "${CFLAGS} ${CXXFLAGS}" | grep -q -- -O0; then OSAF_HARDEN_FLAGS="" fi @@ -24,6 +27,3 @@ index df4fc58..02771c6 100644 fi AC_SUBST(OSAF_HARDEN_FLAGS) --- -2.12.2 - diff --git a/meta-networking/recipes-daemons/opensaf/opensaf/0001-create_empty_library-Use-CC-variable-intead-of-hardc.patch b/meta-networking/recipes-daemons/opensaf/opensaf/0001-create_empty_library-Use-CC-variable-intead-of-hardc.patch new file mode 100644 index 0000000000..21abcf75b5 --- /dev/null +++ b/meta-networking/recipes-daemons/opensaf/opensaf/0001-create_empty_library-Use-CC-variable-intead-of-hardc.patch @@ -0,0 +1,23 @@ +From 300fd3e27e71a91fc52d3f985ed4fde548852853 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 27 Sep 2019 12:50:11 -0700 +Subject: [PATCH] create_empty_library: Use CC variable intead of hardcoding + gcc + +This ensures that cross-compiles can succeed, otherwise we get wrong +architecture on these stub libraries + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + scripts/create_empty_library | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/scripts/create_empty_library ++++ b/scripts/create_empty_library +@@ -66,4 +66,4 @@ for s in $symbols; do + echo "SaAisErrorT $s() { return SA_AIS_ERR_UNAVAILABLE; }" >> "$tmpdir/lib.c" + done + rm -f "$1" +-gcc -O2 -shared -fPIC "$tmpdir/lib.c" -Wl,-version-script="$2" -Wl,-soname="$libbase.so.$version1" -o "$1" ++$CC -O2 -shared -fPIC "$tmpdir/lib.c" -Wl,-version-script="$2" -Wl,-soname="$libbase.so.$version1" -o "$1" $LDFLAGS diff --git a/meta-networking/recipes-daemons/opensaf/opensaf/0001-immom_python-convert-to-python3.patch b/meta-networking/recipes-daemons/opensaf/opensaf/0001-immom_python-convert-to-python3.patch new file mode 100644 index 0000000000..f45874680d --- /dev/null +++ b/meta-networking/recipes-daemons/opensaf/opensaf/0001-immom_python-convert-to-python3.patch @@ -0,0 +1,50 @@ +From ffc829603a2c50674c8e04de5221e43f80bfc1b2 Mon Sep 17 00:00:00 2001 +From: Andrey Zhizhikin <andrey.z@gmail.com> +Date: Mon, 27 Jan 2020 13:00:53 +0000 +Subject: [PATCH] immom_python: convert to python3 + +Convert immom_python to use python3, python2 is EOL and is not supported +by all distributions anymore. + +Upstream-Status: Pending + +Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com> +--- + samples/immsv/immom_python/immom.py | 2 +- + samples/immsv/immom_python/immomexamples.py | 2 +- + samples/immsv/immom_python/immomtest.py | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/samples/immsv/immom_python/immom.py b/samples/immsv/immom_python/immom.py +index 4f68625ed..f88197000 100755 +--- a/samples/immsv/immom_python/immom.py ++++ b/samples/immsv/immom_python/immom.py +@@ -1,4 +1,4 @@ +-#! /usr/bin/python ++#!/usr/bin/env python3 + """ + immom -- An IMM Object Manager in Python + +diff --git a/samples/immsv/immom_python/immomexamples.py b/samples/immsv/immom_python/immomexamples.py +index 70c579265..bd693c25f 100755 +--- a/samples/immsv/immom_python/immomexamples.py ++++ b/samples/immsv/immom_python/immomexamples.py +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#!/usr/bin/env python3 + + import immom + +diff --git a/samples/immsv/immom_python/immomtest.py b/samples/immsv/immom_python/immomtest.py +index 4b98bea8c..ed2463ba9 100755 +--- a/samples/immsv/immom_python/immomtest.py ++++ b/samples/immsv/immom_python/immomtest.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # -*- coding: utf-8 -*- + + import immom +-- +2.17.1 + diff --git a/meta-networking/recipes-daemons/opensaf/opensaf/0001-immpbe_dump.cc-Use-sys-wait.h-instead-of-wait.h.patch b/meta-networking/recipes-daemons/opensaf/opensaf/0001-immpbe_dump.cc-Use-sys-wait.h-instead-of-wait.h.patch index 76c47c6584..99fab3b034 100644 --- a/meta-networking/recipes-daemons/opensaf/opensaf/0001-immpbe_dump.cc-Use-sys-wait.h-instead-of-wait.h.patch +++ b/meta-networking/recipes-daemons/opensaf/opensaf/0001-immpbe_dump.cc-Use-sys-wait.h-instead-of-wait.h.patch @@ -1,4 +1,4 @@ -From 508ea7c0d67243feb1684eaa83569cb687561d64 Mon Sep 17 00:00:00 2001 +From c21f77d592415f316138c05f581192a1f061e735 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 15 Sep 2017 10:09:03 -0700 Subject: [PATCH] immpbe_dump.cc: Use sys/wait.h instead of wait.h @@ -7,12 +7,15 @@ Fixes redirecting incorrect #include <wait.h> to <sys/wait.h> Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- +Upstream-Status: Pending + src/imm/common/immpbe_dump.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/imm/common/immpbe_dump.cc b/src/imm/common/immpbe_dump.cc -index 100222f37..33e47ce3c 100644 +index e6b3cc5..3956028 100644 --- a/src/imm/common/immpbe_dump.cc +++ b/src/imm/common/immpbe_dump.cc @@ -26,12 +26,12 @@ @@ -27,8 +30,5 @@ index 100222f37..33e47ce3c 100644 #include <sys/stat.h> +#include <sys/wait.h> #include <libgen.h> - - #include <saAis.h> --- -2.14.1 - + #include <set> + #include <vector> diff --git a/meta-networking/recipes-daemons/opensaf/opensaf/0001-include-cstdint-for-uintXX_t-types.patch b/meta-networking/recipes-daemons/opensaf/opensaf/0001-include-cstdint-for-uintXX_t-types.patch new file mode 100644 index 0000000000..e36d4e0cdc --- /dev/null +++ b/meta-networking/recipes-daemons/opensaf/opensaf/0001-include-cstdint-for-uintXX_t-types.patch @@ -0,0 +1,43 @@ +From 225891675b80beaa9d74ce56809e52c4451df72c Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 25 Jan 2023 21:46:22 -0800 +Subject: [PATCH 1/2] include cstdint for uintXX_t types + +GCC-13 needs it [1] + +[1] https://www.gnu.org/software/gcc/gcc-13/porting_to.html + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/imm/immnd/ImmModel.h | 1 + + src/osaf/consensus/consensus_env.h | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/src/imm/immnd/ImmModel.h b/src/imm/immnd/ImmModel.h +index 44da470..0660431 100644 +--- a/src/imm/immnd/ImmModel.h ++++ b/src/imm/immnd/ImmModel.h +@@ -22,6 +22,7 @@ + #include <saImmOm.h> + #include <cstdarg> + #include <sys/types.h> ++#include <cstdint> + #include <string> + #include <vector> + #include <map> +diff --git a/src/osaf/consensus/consensus_env.h b/src/osaf/consensus/consensus_env.h +index df4f93a..89ccf46 100644 +--- a/src/osaf/consensus/consensus_env.h ++++ b/src/osaf/consensus/consensus_env.h +@@ -15,6 +15,7 @@ + #ifndef OSAF_CONSENSUS_CONSENSUS_ENV_H_ + #define OSAF_CONSENSUS_CONSENSUS_ENV_H_ + ++#include <cstdint> + #include <string> + #include "base/mutex.h" + +-- +2.39.1 + diff --git a/meta-networking/recipes-daemons/opensaf/opensaf/0001-include-missing-array-header.patch b/meta-networking/recipes-daemons/opensaf/opensaf/0001-include-missing-array-header.patch new file mode 100644 index 0000000000..e735d432a7 --- /dev/null +++ b/meta-networking/recipes-daemons/opensaf/opensaf/0001-include-missing-array-header.patch @@ -0,0 +1,32 @@ +From 6168d43ddd353b92ad8bcd5c49dc68f18caa8a00 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 12 Apr 2022 17:07:49 -0700 +Subject: [PATCH 1/2] include missing <array> header + +Fixes +src/osaf/consensus/key_value.cc:25:30: error: aggregate 'std::array<char, 128> buffer' has incomplete type and cannot be defined + 25 | std::array<char, buf_size> buffer; + | ^~~~~~ + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/osaf/consensus/key_value.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/osaf/consensus/key_value.cc b/src/osaf/consensus/key_value.cc +index 692dd3f..6e16cbf 100644 +--- a/src/osaf/consensus/key_value.cc ++++ b/src/osaf/consensus/key_value.cc +@@ -18,7 +18,7 @@ + #include "base/getenv.h" + #include "base/logtrace.h" + #include "osaf/consensus/consensus.h" +- ++#include <array> + int KeyValue::Execute(const std::string& command, std::string& output) { + TRACE_ENTER(); + constexpr size_t buf_size = 128; +-- +2.35.1 + diff --git a/meta-networking/recipes-daemons/opensaf/opensaf/0001-src-Add-missing-header-limits.h-for-_POSIX_HOST_NAME.patch b/meta-networking/recipes-daemons/opensaf/opensaf/0001-src-Add-missing-header-limits.h-for-_POSIX_HOST_NAME.patch index 4a2a825f99..2521839c73 100644 --- a/meta-networking/recipes-daemons/opensaf/opensaf/0001-src-Add-missing-header-limits.h-for-_POSIX_HOST_NAME.patch +++ b/meta-networking/recipes-daemons/opensaf/opensaf/0001-src-Add-missing-header-limits.h-for-_POSIX_HOST_NAME.patch @@ -1,4 +1,4 @@ -From 6442b57a855e273aa5a3d93e8596783cea128073 Mon Sep 17 00:00:00 2001 +From 7fb393c66df33110fef0cbabac7d304f12eb82e4 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 15 Sep 2017 09:39:40 -0700 Subject: [PATCH] src: Add missing header limits.h for _POSIX_HOST_NAME_MAX @@ -7,7 +7,10 @@ Use _GNU_SOURCE instead of libc internal __USE_GNU Do not use the deprecated headers under include/sys Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- +Upstream-Status: Pending + src/base/os_defs.h | 5 +++-- src/mds/mds_dt_tcp.c | 1 - src/mds/mds_dt_tcp_disc.h | 2 +- @@ -18,7 +21,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 7 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/base/os_defs.h b/src/base/os_defs.h -index 50a9bf5fc..af6842863 100644 +index a570c43..3559b19 100644 --- a/src/base/os_defs.h +++ b/src/base/os_defs.h @@ -47,17 +47,18 @@ @@ -43,7 +46,7 @@ index 50a9bf5fc..af6842863 100644 #include <pthread.h> diff --git a/src/mds/mds_dt_tcp.c b/src/mds/mds_dt_tcp.c -index 1407eb1ab..a87c22faa 100644 +index 1407eb1..a87c22f 100644 --- a/src/mds/mds_dt_tcp.c +++ b/src/mds/mds_dt_tcp.c @@ -27,7 +27,6 @@ @@ -55,7 +58,7 @@ index 1407eb1ab..a87c22faa 100644 #include <sys/types.h> #include <unistd.h> diff --git a/src/mds/mds_dt_tcp_disc.h b/src/mds/mds_dt_tcp_disc.h -index a6249d73e..574f52681 100644 +index a6249d7..574f526 100644 --- a/src/mds/mds_dt_tcp_disc.h +++ b/src/mds/mds_dt_tcp_disc.h @@ -24,7 +24,7 @@ @@ -68,7 +71,7 @@ index a6249d73e..574f52681 100644 /* mds_indentifire + mds_version + msg_type + scope_type + server_type + server_instance_lower + server_instance_upper + sub_ref_val + sub_ref_val + diff --git a/src/mds/mds_dt_tipc.c b/src/mds/mds_dt_tipc.c -index 37745e7f0..9b3255567 100644 +index 7714175..a0ed3b6 100644 --- a/src/mds/mds_dt_tipc.c +++ b/src/mds/mds_dt_tipc.c @@ -35,7 +35,6 @@ @@ -80,7 +83,7 @@ index 37745e7f0..9b3255567 100644 #include <sys/types.h> #include <unistd.h> diff --git a/src/mds/mds_dt_tipc.h b/src/mds/mds_dt_tipc.h -index e73a11b09..401d208c2 100644 +index e73a11b..401d208 100644 --- a/src/mds/mds_dt_tipc.h +++ b/src/mds/mds_dt_tipc.h @@ -32,7 +32,7 @@ @@ -93,7 +96,7 @@ index e73a11b09..401d208c2 100644 #include <errno.h> #include <fcntl.h> diff --git a/src/mds/mds_dt_trans.c b/src/mds/mds_dt_trans.c -index 6f621e04e..5aacbd33e 100644 +index 6f621e0..5aacbd3 100644 --- a/src/mds/mds_dt_trans.c +++ b/src/mds/mds_dt_trans.c @@ -26,7 +26,6 @@ @@ -105,7 +108,7 @@ index 6f621e04e..5aacbd33e 100644 #define MDS_PROT_TCP 0xA0 diff --git a/src/ntf/ntfd/NtfLogger.cc b/src/ntf/ntfd/NtfLogger.cc -index 84014b578..31b1ccc6c 100644 +index fd17c58..1120008 100644 --- a/src/ntf/ntfd/NtfLogger.cc +++ b/src/ntf/ntfd/NtfLogger.cc @@ -20,7 +20,7 @@ @@ -117,6 +120,3 @@ index 84014b578..31b1ccc6c 100644 #include "base/osaf_utility.h" #include <saAis.h> --- -2.14.1 - diff --git a/meta-networking/recipes-daemons/opensaf/opensaf/0002-Fix-Werror-enum-int-mismatch-with-gcc13.patch b/meta-networking/recipes-daemons/opensaf/opensaf/0002-Fix-Werror-enum-int-mismatch-with-gcc13.patch new file mode 100644 index 0000000000..a6aa2c3d07 --- /dev/null +++ b/meta-networking/recipes-daemons/opensaf/opensaf/0002-Fix-Werror-enum-int-mismatch-with-gcc13.patch @@ -0,0 +1,61 @@ +From 5e5686de677c884d5d785254412ced3c9d2d1b08 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 25 Jan 2023 21:47:45 -0800 +Subject: [PATCH 2/2] Fix -Werror=enum-int-mismatch with gcc13 + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + src/evt/agent/eda_hdl.h | 5 +++-- + src/evt/evtd/eds_mds.h | 3 +-- + src/smf/smfnd/smfnd.h | 8 ++++---- + 3 files changed, 8 insertions(+), 8 deletions(-) + +--- a/src/evt/agent/eda_hdl.h ++++ b/src/evt/agent/eda_hdl.h +@@ -31,6 +31,7 @@ + #define EVT_AGENT_EDA_HDL_H_ + + #include "evt/agent/eda.h" ++#include "ais/include/saAis.h" + + uint32_t eda_hdl_cbk_dispatch(EDA_CB *, EDA_CLIENT_HDL_REC *, SaDispatchFlagsT); + +@@ -68,11 +69,11 @@ EDA_CHANNEL_HDL_REC *eda_find_chan_hdl_r + + void eda_msg_destroy(EDSV_MSG *msg); + +-uint32_t eda_extract_pattern_from_event( ++SaAisErrorT eda_extract_pattern_from_event( + SaEvtEventPatternArrayT *from_pattern_array, + SaEvtEventPatternArrayT **to_pattern_array); + +-uint32_t eda_allocate_and_extract_pattern_from_event( ++SaAisErrorT eda_allocate_and_extract_pattern_from_event( + SaEvtEventPatternArrayT *from_pattern_array, + SaEvtEventPatternArrayT **to_pattern_array); + +--- a/src/evt/evtd/eds_mds.h ++++ b/src/evt/evtd/eds_mds.h +@@ -49,8 +49,7 @@ uint32_t eds_mds_msg_send(EDS_CB *cb, ED + MDS_SEND_PRIORITY_TYPE prio); + + uint32_t eds_mds_ack_send(EDS_CB *cb, EDSV_MSG *msg, MDS_DEST dest, +- SaTimeT timeout, MDS_SEND_PRIORITY_TYPE prio); +- ++ SaTimeT timeout, uint32_t prio); + uint32_t eds_dec_subscribe_msg(NCS_UBAID *uba, long msg_hdl, uint8_t ckpt_flag); + + uint32_t eds_dec_publish_msg(NCS_UBAID *uba, long msg_hdl, uint8_t ckpt_flag); +--- a/src/smf/smfnd/smfnd.h ++++ b/src/smf/smfnd/smfnd.h +@@ -76,7 +76,7 @@ extern "C" { + #endif + + /* smfnd_amf.c */ +-extern uint32_t smfnd_amf_init(smfnd_cb_t *cb); ++extern SaAisErrorT smfnd_amf_init(smfnd_cb_t *cb); + + /* smfnd_mds.c */ + extern uint32_t smfnd_mds_init(smfnd_cb_t *cb); diff --git a/meta-networking/recipes-daemons/opensaf/opensaf/0002-configure-Disable-selected-warnings.patch b/meta-networking/recipes-daemons/opensaf/opensaf/0002-configure-Disable-selected-warnings.patch new file mode 100644 index 0000000000..a9953259ce --- /dev/null +++ b/meta-networking/recipes-daemons/opensaf/opensaf/0002-configure-Disable-selected-warnings.patch @@ -0,0 +1,28 @@ +From fe654d5340d18f04e4689ba19f843554909a0c00 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 12 Apr 2022 17:16:37 -0700 +Subject: [PATCH 2/2] configure: Disable selected warnings + +These warnings are emitted when compiling with gcc 11 and gcc 12 +Do not treat them as errors + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +--- a/configure.ac ++++ b/configure.ac +@@ -601,7 +601,10 @@ if test -z "$OSAF_HARDEN_FLAGS"; then + fi + AC_SUBST(OSAF_HARDEN_FLAGS) + +-AX_CHECK_COMPILE_FLAG([-Werror=format-overflow],[NOWARNINGS=-Wno-error=format-overflow]) ++AX_CHECK_COMPILE_FLAG([-Werror=format-overflow],[NOWARNINGS='-Wno-error=format-overflow']) ++AX_CHECK_COMPILE_FLAG([-Wuse-after-free],[NOWARNINGS+=' -Wno-error=use-after-free']) ++AX_CHECK_COMPILE_FLAG([-Wstringop-truncation],[NOWARNINGS+=' -Wno-error=stringop-truncation']) ++AX_CHECK_COMPILE_FLAG([-Warray-bounds],[NOWARNINGS+=' -Wno-error=array-bounds']) + AC_SUBST(NOWARNINGS) + ############################################# + # List the output Makefiles diff --git a/meta-networking/recipes-daemons/opensaf/opensaf_5.17.07.bb b/meta-networking/recipes-daemons/opensaf/opensaf_5.17.07.bb deleted file mode 100644 index 74483d7786..0000000000 --- a/meta-networking/recipes-daemons/opensaf/opensaf_5.17.07.bb +++ /dev/null @@ -1,67 +0,0 @@ -SUMMARY = "OpenSAF is an open source implementation of the SAF AIS specification" -DESCRIPTION = "OpenSAF is an open source project established to develop a base platform \ -middleware consistent with Service Availability Forum (SA Forum) \ -specifications, under the LGPLv2.1 license. The OpenSAF Foundation was \ -established by leading Communications and Enterprise Computing Companies to \ -facilitate the OpenSAF Project and to accelerate the adoption of the OpenSAF \ -code base in commercial products. \ -The OpenSAF project was launched in mid 2007 and has been under development by \ -an informal group of supporters of the OpenSAF initiative. The OpenSAF \ -Foundation was founded on January 22nd 2008 with Emerson Network Power, \ -Ericsson, Nokia Siemens Networks, HP and Sun Microsystems as founding members." -HOMEPAGE = "http://www.opensaf.org" -SECTION = "admin" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=a916467b91076e631dd8edb7424769c7" - -DEPENDS = "libxml2 python" -TOOLCHAIN = "gcc" - -SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" - -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/releases/${BPN}-${PV}.tar.gz \ - file://0001-configure-Pass-linker-specific-options-with-Wl.patch \ - file://0001-configure-Disable-format-overflow-if-supported-by-gc.patch \ - file://0001-src-Add-missing-header-limits.h-for-_POSIX_HOST_NAME.patch \ - file://0001-immpbe_dump.cc-Use-sys-wait.h-instead-of-wait.h.patch \ -" -SRC_URI[md5sum] = "125bcd9aabd7412aedcbfbf73f4e6196" -SRC_URI[sha256sum] = "3fb2239bb2c9328c8b45368ff8d8de979ea286a27edc9871d218200e88bb91cc" - -inherit autotools useradd systemd pkgconfig - -USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "-f -r opensaf" -USERADD_PARAM_${PN} = "-r -g opensaf -d ${datadir}/opensaf/ -s ${sbindir}/nologin -c \"OpenSAF\" opensaf" - -SYSTEMD_SERVICE_${PN} += "opensafd.service" -SYSTEMD_AUTO_ENABLE = "disable" - -PACKAGECONFIG[systemd] = ",,systemd" -PACKAGECONFIG[openhpi] = "--with-hpi-interface=B03 --enable-ais-plm,,openhpi" - -PACKAGECONFIG_append = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd', '', d)}" - -PKGLIBDIR="${libdir}" - -LDFLAGS += "-Wl,--as-needed -latomic -Wl,--no-as-needed" - -do_install_append() { - cp -av --no-preserve=ownership ${B}/lib/.libs/*.so* ${D}${libdir} - rm -fr "${D}${localstatedir}/lock" - rm -fr "${D}${localstatedir}/run" - rmdir --ignore-fail-on-non-empty "${D}${localstatedir}" - rmdir --ignore-fail-on-non-empty "${D}${datadir}/java" - if [ ! -d "${D}${sysconfdir}/init.d" ]; then - install -d ${D}${sysconfdir}/init.d - install -m 0755 ${B}/osaf/services/infrastructure/nid/scripts/opensafd ${D}${sysconfdir}/init.d/ - fi -} - -FILES_${PN} += "${systemd_unitdir}/system/*.service" -FILES_${PN}-staticdev += "${PKGLIBDIR}/*.a" - -INSANE_SKIP_${PN} = "dev-so" - -RDEPENDS_${PN} += "bash python" - diff --git a/meta-networking/recipes-daemons/opensaf/opensaf_5.22.01.bb b/meta-networking/recipes-daemons/opensaf/opensaf_5.22.01.bb new file mode 100644 index 0000000000..3dd950c720 --- /dev/null +++ b/meta-networking/recipes-daemons/opensaf/opensaf_5.22.01.bb @@ -0,0 +1,99 @@ +SUMMARY = "OpenSAF is an open source implementation of the SAF AIS specification" +DESCRIPTION = "OpenSAF is an open source project established to develop a base platform \ +middleware consistent with Service Availability Forum (SA Forum) \ +specifications, under the LGPLv2.1 license. The OpenSAF Foundation was \ +established by leading Communications and Enterprise Computing Companies to \ +facilitate the OpenSAF Project and to accelerate the adoption of the OpenSAF \ +code base in commercial products. \ +The OpenSAF project was launched in mid 2007 and has been under development by \ +an informal group of supporters of the OpenSAF initiative. The OpenSAF \ +Foundation was founded on January 22nd 2008 with Emerson Network Power, \ +Ericsson, Nokia Siemens Networks, HP and Sun Microsystems as founding members." +HOMEPAGE = "http://www.opensaf.org" +SECTION = "admin" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=a916467b91076e631dd8edb7424769c7" + +DEPENDS = "libxml2 python3" +TOOLCHAIN = "gcc" + +SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/releases/${BPN}-${PV}.tar.gz \ + file://0001-configure-Pass-linker-specific-options-with-Wl.patch \ + file://0001-configure-Disable-format-overflow-if-supported-by-gc.patch \ + file://0001-src-Add-missing-header-limits.h-for-_POSIX_HOST_NAME.patch \ + file://0001-immpbe_dump.cc-Use-sys-wait.h-instead-of-wait.h.patch \ + file://0001-create_empty_library-Use-CC-variable-intead-of-hardc.patch \ + file://0001-immom_python-convert-to-python3.patch \ + file://0001-Fix-build-with-fno-common.patch \ + file://0001-Use-correct-printf-format-for-__fsblkcnt_t.patch \ + file://0001-include-missing-array-header.patch \ + file://0002-configure-Disable-selected-warnings.patch \ + file://0001-include-cstdint-for-uintXX_t-types.patch \ + file://0002-Fix-Werror-enum-int-mismatch-with-gcc13.patch \ + " +SRC_URI[sha256sum] = "f008d53c83087ce2014c6089bc4ef08e14c1b4091298b943f4ceade1aa6bf61e" + +UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/opensaf/files/releases" + +inherit autotools useradd systemd pkgconfig + +USERADD_PACKAGES = "${PN}" +GROUPADD_PARAM:${PN} = "-f -r opensaf" +USERADD_PARAM:${PN} = "-r -g opensaf -d ${datadir}/opensaf/ -s ${sbindir}/nologin -c \"OpenSAF\" opensaf" + +SYSTEMD_SERVICE:${PN} += "opensafd.service" +SYSTEMD_AUTO_ENABLE = "disable" + +PACKAGECONFIG[systemd] = ",,systemd" +PACKAGECONFIG[openhpi] = "--with-hpi-interface=B03,,openhpi" +PACKAGECONFIG[plm] = "--enable-ais-plm,--disable-ais-plm,libvirt openhpi" + +PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd', '', d)}" + +CPPFLAGS += "-Wno-error" +CXXFLAGS += "-Wno-error" +LDFLAGS += "-Wl,--as-needed -latomic -Wl,--no-as-needed" + +do_install:append() { + rm -fr "${D}${localstatedir}/lock" + rm -fr "${D}${localstatedir}/run" + rmdir "${D}${localstatedir}/log/${BPN}/saflog" + rmdir "${D}${localstatedir}/log/${BPN}" + rmdir "${D}${localstatedir}/log" + rmdir --ignore-fail-on-non-empty "${D}${localstatedir}" + rmdir --ignore-fail-on-non-empty "${D}${datadir}/java" + + # Rename /etc/init.d/opensafd to /usr/lib/opensaf/opensafd-init as it is + # needed by opensafd.service, but /etc/init.d is removed by systemd.bbclass + # if sysvinit is not in DISTRO_FEATURES. + mv ${D}${sysconfdir}/init.d/opensafd ${D}${libdir}/${BPN}/opensafd-init + ln -srf ${D}${libdir}/${BPN}/opensafd-init ${D}${sysconfdir}/init.d/opensafd + [ ! -f ${D}${systemd_system_unitdir}/opensafd.service ] || + sed -ri -e "s|/etc/init.d/opensafd|${libdir}/${BPN}/opensafd-init|" ${D}${systemd_system_unitdir}/opensafd.service + + # Create /var/log/opensaf/saflog in runtime. + if [ "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" ]; then + install -d ${D}${nonarch_libdir}/tmpfiles.d + echo "d ${localstatedir}/log/${BPN}/saflog - - - -" > ${D}${nonarch_libdir}/tmpfiles.d/${BPN}.conf + fi + if [ "${@bb.utils.filter('DISTRO_FEATURES', 'sysvinit', d)}" ]; then + install -d ${D}${sysconfdir}/default/volatiles + echo "d root root 0755 ${localstatedir}/log/${BPN}/saflog none" > ${D}${sysconfdir}/default/volatiles/99_${BPN} + fi +} + +FILES:${PN} += "${libdir}/libSa*.so ${systemd_unitdir}/system/*.service" +FILES:${PN} += "${nonarch_libdir}/tmpfiles.d" +FILES:${PN}-dev += "${libdir}/libopensaf_core.so" +FILES:${PN}-staticdev += "${PKGLIBDIR}/*.a" + +INSANE_SKIP:${PN} = "dev-so" + +RDEPENDS:${PN} += "bash python3-core" + +# http://errors.yoctoproject.org/Errors/Details/186970/ +COMPATIBLE_HOST:libc-musl = 'null' + +FILES_SOLIBSDEV = "" diff --git a/meta-networking/recipes-daemons/postfix/files/0001-Check-for-glibc-before-setting-CANT_USE_SEND_RECV_MS.patch b/meta-networking/recipes-daemons/postfix/files/0001-Check-for-glibc-before-setting-CANT_USE_SEND_RECV_MS.patch deleted file mode 100644 index 6b86e39259..0000000000 --- a/meta-networking/recipes-daemons/postfix/files/0001-Check-for-glibc-before-setting-CANT_USE_SEND_RECV_MS.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 63619acf25151d4dade6d65732722ec4a710a5ac Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 15 Jul 2017 09:54:25 -0700 -Subject: [PATCH] Check for glibc before setting CANT_USE_SEND_RECV_MSG - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/util/sys_defs.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/util/sys_defs.h b/src/util/sys_defs.h -index f720e2a..7314c63 100644 ---- a/src/util/sys_defs.h -+++ b/src/util/sys_defs.h -@@ -813,7 +813,7 @@ extern int initgroups(const char *, int); - #define KERNEL_VERSION(a,b,c) (LINUX_VERSION_CODE + 1) - #endif - #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,2,0)) \ -- || (__GLIBC__ < 2) -+ || (defined(__GLIBC__) && (__GLIBC__ < 2)) - #define CANT_USE_SEND_RECV_MSG - #define DEF_SMTP_CACHE_DEMAND 0 - #else --- -2.13.3 - diff --git a/meta-networking/recipes-daemons/postfix/files/makedefs.patch b/meta-networking/recipes-daemons/postfix/files/0001-Fix-makedefs.patch index 98d5f7ed60..8c9c13b1c4 100644 --- a/meta-networking/recipes-daemons/postfix/files/makedefs.patch +++ b/meta-networking/recipes-daemons/postfix/files/0001-Fix-makedefs.patch @@ -1,8 +1,9 @@ -From 4f49e2ce420fb3c17415937530493158ef312733 Mon Sep 17 00:00:00 2001 +From 9000ee4d8bb5c5e0bcc588e9bec86eb56f4285e1 Mon Sep 17 00:00:00 2001 From: Li xin <lixin.fnst@cn.fujitsu.com> Date: Fri, 19 Jun 2015 16:45:54 +0900 -Subject: [PATCH] 1)remove RANLIB, SYSLIBS, AR and get them from env. +Subject: [PATCH] Fix makedefs +1)remove RANLIB, SYSLIBS, AR and get them from env. 2)reference sysroot when searching header files 3)include sysroot path instead of absolute include path for Linux2 and Linux3 systems. @@ -10,7 +11,7 @@ for Linux2 and Linux3 systems. native build, search host library path for nsl and resolv library which comes from libc -Upstreamstatus: Inappropriate [embedded specific] +Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Yao Zhao <yao.zhao@windriver.com> --- @@ -18,10 +19,10 @@ Signed-off-by: Yao Zhao <yao.zhao@windriver.com> 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/makedefs b/makedefs -index 8b84e47..893fb0d 100644 +index 3448c1e..78e0717 100644 --- a/makedefs +++ b/makedefs -@@ -170,9 +170,6 @@ echo "# pie=$pie" +@@ -197,9 +197,6 @@ echo "# pie=$pie" # Defaults for most sane systems @@ -31,7 +32,7 @@ index 8b84e47..893fb0d 100644 ARFL=rv # Ugly function to make our error message more visible among the -@@ -424,12 +421,12 @@ case "$SYSTEM.$RELEASE" in +@@ -492,12 +489,12 @@ case "$SYSTEM.$RELEASE" in case "$CCARGS" in *-DNO_DB*) ;; *-DHAS_DB*) ;; @@ -47,7 +48,7 @@ index 8b84e47..893fb0d 100644 else # No, we're not going to try db1 db2 db3 etc. # On a properly installed system, Postfix builds -@@ -438,12 +435,12 @@ case "$SYSTEM.$RELEASE" in +@@ -506,12 +503,12 @@ case "$SYSTEM.$RELEASE" in echo "Install the appropriate db*-devel package first." 1>&2 exit 1 fi @@ -62,7 +63,7 @@ index 8b84e47..893fb0d 100644 do test -e $lib/lib$name.a -o -e $lib/lib$name.so && { SYSLIBS="$SYSLIBS -l$name" -@@ -463,7 +460,7 @@ case "$SYSTEM.$RELEASE" in +@@ -531,7 +528,7 @@ case "$SYSTEM.$RELEASE" in if [ `expr "X$CCARGS" : "X.*-DNO_EPOLL"` -gt 0 ] then : @@ -71,7 +72,7 @@ index 8b84e47..893fb0d 100644 then echo CCARGS="$CCARGS -DNO_EPOLL" else -@@ -487,8 +484,6 @@ int main(int argc, char **argv) +@@ -555,8 +552,6 @@ int main(int argc, char **argv) } EOF ${CC-gcc} -o makedefs.test makedefs.test.c || exit 1 @@ -80,7 +81,7 @@ index 8b84e47..893fb0d 100644 rm -f makedefs.test makedefs.test.[co] fi;; esac -@@ -504,12 +499,12 @@ EOF +@@ -572,12 +567,12 @@ EOF case "$CCARGS" in *-DNO_DB*) ;; *-DHAS_DB*) ;; @@ -96,7 +97,7 @@ index 8b84e47..893fb0d 100644 else # On a properly installed system, Postfix builds # by including <db.h> and by linking with -ldb -@@ -517,12 +512,12 @@ EOF +@@ -585,12 +580,12 @@ EOF echo "Install the appropriate db*-devel package first." 1>&2 exit 1 fi @@ -112,5 +113,5 @@ index 8b84e47..893fb0d 100644 test -e $lib/lib$name.a -o -e $lib/lib$name.so && { SYSLIBS="$SYSLIBS -l$name" -- -1.8.4.2 +2.17.1 diff --git a/meta-networking/recipes-daemons/postfix/files/install.patch b/meta-networking/recipes-daemons/postfix/files/0002-Change-fixed-postconf-to-a-variable-for-cross-compil.patch index d023680f3b..28199ccdd2 100644 --- a/meta-networking/recipes-daemons/postfix/files/install.patch +++ b/meta-networking/recipes-daemons/postfix/files/0002-Change-fixed-postconf-to-a-variable-for-cross-compil.patch @@ -1,20 +1,34 @@ -From 190650e1cd5700cd6950ead3fcb17ebcec192a2e Mon Sep 17 00:00:00 2001 +From cb69ffda0c2cbde6acdc8b01c8d5ff78d81a84fc Mon Sep 17 00:00:00 2001 From: Li xin <lixin.fnst@cn.fujitsu.com> Date: Fri, 19 Jun 2015 17:14:58 +0900 Subject: [PATCH] Change fixed postconf to a variable for cross-compiling -Upstreamstatus: Inappropriate [embedded specific] +Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Yao Zhao <yao.zhao@windriver.com> --- + Makefile.in | 2 +- postfix-install | 18 ++++++++++-------- - 1 file changed, 10 insertions(+), 8 deletions(-) + 2 files changed, 11 insertions(+), 9 deletions(-) +diff --git a/Makefile.in b/Makefile.in +index 65e7911..40295be 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -22,7 +22,7 @@ META = meta/main.cf.proto meta/master.cf.proto meta/postfix-files \ + EXPAND = sed -e "s;\$${LIB_PREFIX};$(LIB_PREFIX);" \ + -e "s;\$${LIB_SUFFIX};$(LIB_SUFFIX);" + SHLIB_DIR_OVERRIDE = \ +- $${shlib_directory:-`$(SHLIB_ENV) bin/postconf -dhx shlib_directory`} ++ $${shlib_directory:-`$(SHLIB_ENV) $(POSTCONF) -dhx shlib_directory`} + + default: update + diff --git a/postfix-install b/postfix-install -index 1662c3d..d11fa12 100644 +index e498cd3..8049f43 100644 --- a/postfix-install +++ b/postfix-install -@@ -226,8 +226,8 @@ test -z "$non_interactive" -a ! -t 0 && { +@@ -244,8 +244,8 @@ test -z "$non_interactive" -a ! -t 0 && { exit 1 } @@ -25,7 +39,7 @@ index 1662c3d..d11fa12 100644 exit 1 } -@@ -248,7 +248,7 @@ do +@@ -266,7 +266,7 @@ do case "$junk" in *MAIL_VERSION*) case "$mail_version" in @@ -34,7 +48,7 @@ index 1662c3d..d11fa12 100644 esac val=`echo "$junk" | sed 's/MAIL_VERSION$/'"$mail_version/g"` || exit 1 case "$val" in -@@ -434,7 +434,7 @@ template files main.cf.proto and master.cf.proto." +@@ -454,7 +454,7 @@ template files main.cf.proto and master.cf.proto." : ${install_root=/} : ${tempdir=`pwd`} @@ -43,7 +57,7 @@ index 1662c3d..d11fa12 100644 # Find out the location of installed configuration files. -@@ -500,7 +500,7 @@ test -f $CONFIG_DIRECTORY/main.cf && { +@@ -520,7 +520,7 @@ test -f $CONFIG_DIRECTORY/main.cf && { case "$junk" in "") eval unset $name;; esac @@ -52,7 +66,7 @@ index 1662c3d..d11fa12 100644 exit 1 done } -@@ -513,7 +513,7 @@ do +@@ -533,7 +533,7 @@ do case "$junk" in "") eval unset $name;; esac @@ -61,7 +75,7 @@ index 1662c3d..d11fa12 100644 done # Override settings manually. -@@ -639,6 +639,8 @@ README_DIRECTORY=$install_root$readme_directory +@@ -670,6 +670,8 @@ README_DIRECTORY=$install_root$readme_directory SHLIB_DIRECTORY=$install_root$shlib_directory META_DIRECTORY=$install_root$meta_directory @@ -70,16 +84,16 @@ index 1662c3d..d11fa12 100644 # Avoid repeated tests for existence of these; default permissions suffice. test -d $DAEMON_DIRECTORY || mkdir -p $DAEMON_DIRECTORY || exit 1 -@@ -810,7 +812,7 @@ IFS="$BACKUP_IFS" +@@ -841,7 +843,7 @@ IFS="$BACKUP_IFS" # the wrong place when Postfix is being upgraded. case "$mail_version" in -"") mail_version="`bin/postconf -dhx mail_version`" || exit 1 -+"") mail_version="`$POSTCONF -dhx mail_version`" || exit 1 ++"") mail_version="`$POSTCONF -c $CONFIG_DIRECTORY -dhx mail_version`" || exit 1 esac # Undo MAIL_VERSION expansion at the end of a parameter value. If -@@ -830,7 +832,7 @@ do +@@ -861,7 +863,7 @@ do esac done @@ -89,5 +103,5 @@ index 1662c3d..d11fa12 100644 "data_directory = $data_directory" \ "command_directory = $command_directory" \ -- -1.8.4.2 +2.17.1 diff --git a/meta-networking/recipes-daemons/postfix/files/0001-makedefs-Use-native-compiler-to-build-makedefs.test.patch b/meta-networking/recipes-daemons/postfix/files/0003-makedefs-Use-native-compiler-to-build-makedefs.test.patch index 763a4a9b98..1545f21637 100644 --- a/meta-networking/recipes-daemons/postfix/files/0001-makedefs-Use-native-compiler-to-build-makedefs.test.patch +++ b/meta-networking/recipes-daemons/postfix/files/0003-makedefs-Use-native-compiler-to-build-makedefs.test.patch @@ -1,4 +1,4 @@ -From a0d0de10e4c5ab55bc2fa48798079e2876b1211d Mon Sep 17 00:00:00 2001 +From 995bddd9563b1aecca2369f2f9c675f88bdc0053 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sat, 26 Aug 2017 10:29:37 -0700 Subject: [PATCH] makedefs: Use native compiler to build makedefs.test @@ -7,14 +7,16 @@ Its a binary used during build Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + makedefs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/makedefs b/makedefs -index 9fd4bc2..5ee7747 100644 +index 78e0717..3299eba 100644 --- a/makedefs +++ b/makedefs -@@ -526,7 +526,7 @@ int main(int argc, char **argv) +@@ -551,7 +551,7 @@ int main(int argc, char **argv) exit(0); } EOF @@ -23,7 +25,7 @@ index 9fd4bc2..5ee7747 100644 rm -f makedefs.test makedefs.test.[co] fi;; esac -@@ -762,7 +762,7 @@ int main(int argc, char **argv) +@@ -787,7 +787,7 @@ int main(int argc, char **argv) exit(0); } EOF @@ -32,7 +34,7 @@ index 9fd4bc2..5ee7747 100644 ./makedefs.test 2>/dev/null || CCARGS="$CCARGS -DNO_SIGSETJMP" rm -f makedefs.test makedefs.test.[co] -@@ -796,7 +796,7 @@ int main(int argc, char **argv) +@@ -823,7 +823,7 @@ int main(int argc, char **argv) &error) != 14); } EOF @@ -41,7 +43,7 @@ index 9fd4bc2..5ee7747 100644 $icu_ldflags >/dev/null 2>&1 if ./makedefs.test 2>/dev/null ; then CCARGS="$CCARGS $icu_cppflags" -@@ -911,7 +911,7 @@ int main(void) +@@ -938,7 +938,7 @@ int main(void) exit(ferror(stdout) ? 1 : 0); } EOF @@ -50,7 +52,7 @@ index 9fd4bc2..5ee7747 100644 ./makedefs.test || exit 1 rm -f makedefs.test makedefs.test.[co] } -@@ -1067,7 +1067,7 @@ int main(void) +@@ -1094,7 +1094,7 @@ int main(void) exit(ferror(stdout) ? 1 : 0); } EOF @@ -60,5 +62,5 @@ index 9fd4bc2..5ee7747 100644 rm -f makedefs.test makedefs.test.[co] eval ${parm_name}=\""\$parm_val"\" -- -2.14.1 +2.17.1 diff --git a/meta-networking/recipes-daemons/postfix/files/icu-config.patch b/meta-networking/recipes-daemons/postfix/files/0004-Fix-icu-config.patch index 9bd9c2f03e..a38e783309 100644 --- a/meta-networking/recipes-daemons/postfix/files/icu-config.patch +++ b/meta-networking/recipes-daemons/postfix/files/0004-Fix-icu-config.patch @@ -1,3 +1,8 @@ +From afef4a9391e6bb1a6c3e73d370f240577ed8b0dd Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 16 Jan 2022 11:21:54 +0800 +Subject: [PATCH] Fix icu config + do not entertain cppflags from icu, this is because icu-config feeds the -I path without sysroot which caused native headers to be included and build is @@ -6,12 +11,17 @@ to the CCARGS which we loose nothing if its not entertained. Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + makedefs | 1 - + 1 file changed, 1 deletion(-) -Index: postfix-3.2.2/makedefs -=================================================================== ---- postfix-3.2.2.orig/makedefs -+++ postfix-3.2.2/makedefs -@@ -799,7 +799,6 @@ EOF +diff --git a/makedefs b/makedefs +index 3299eba..2a76f20 100644 +--- a/makedefs ++++ b/makedefs +@@ -826,7 +826,6 @@ EOF ${BUILD_CC-gcc} -o makedefs.test makedefs.test.c $icu_cppflags \ $icu_ldflags >/dev/null 2>&1 if ./makedefs.test 2>/dev/null ; then @@ -19,3 +29,6 @@ Index: postfix-3.2.2/makedefs SYSLIBS="$SYSLIBS $icu_ldflags" else CCARGS="$CCARGS -DNO_EAI" +-- +2.17.1 + diff --git a/meta-networking/recipes-daemons/postfix/files/0005-makedefs-add-lnsl-and-lresolv-to-SYSLIBS-by-default.patch b/meta-networking/recipes-daemons/postfix/files/0005-makedefs-add-lnsl-and-lresolv-to-SYSLIBS-by-default.patch new file mode 100644 index 0000000000..b425cf8432 --- /dev/null +++ b/meta-networking/recipes-daemons/postfix/files/0005-makedefs-add-lnsl-and-lresolv-to-SYSLIBS-by-default.patch @@ -0,0 +1,58 @@ +From 545d4a79b50caa5698622c0c1905ae154197a16f Mon Sep 17 00:00:00 2001 +From: Yi Zhao <yi.zhao@windriver.com> +Date: Fri, 12 Oct 2018 12:38:02 +0800 +Subject: [PATCH] makedefs: add -lnsl and -lresolv to SYSLIBS by default + +We don't need to check libnsl.so and libresolv.so since the libnsl2 is +specified in DEPENDS and libresolv.so is from c libarary. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + makedefs | 22 ++-------------------- + 1 file changed, 2 insertions(+), 20 deletions(-) + +diff --git a/makedefs b/makedefs +index 2a76f20..9d5db9f 100644 +--- a/makedefs ++++ b/makedefs +@@ -506,16 +506,7 @@ case "$SYSTEM.$RELEASE" in + SYSLIBS="$SYSLIBS -ldb" + ;; + esac +- for name in nsl resolv $GDBM_LIBS +- do +- for lib in $BUILD_SYSROOT_NSL_PATH +- do +- test -e $lib/lib$name.a -o -e $lib/lib$name.so && { +- SYSLIBS="$SYSLIBS -l$name" +- break +- } +- done +- done ++ SYSLIBS="$SYSLIBS -lnsl -lresolv" + # Kernel 2.4 added IPv6 + case "$RELEASE" in + 2.[0-3].*) CCARGS="$CCARGS -DNO_IPV6";; +@@ -583,16 +574,7 @@ EOF + SYSLIBS="$SYSLIBS -ldb" + ;; + esac +- for name in nsl resolv +- do +- for lib in $BUILD_SYSROOT_NSL_PATH +- do +- test -e $lib/lib$name.a -o -e $lib/lib$name.so && { +- SYSLIBS="$SYSLIBS -l$name" +- break +- } +- done +- done ++ SYSLIBS="$SYSLIBS -lnsl -lresolv" + SYSLIBS="$SYSLIBS -ldl" + : ${SHLIB_SUFFIX=.so} + : ${SHLIB_CFLAGS=-fPIC} +-- +2.17.1 + diff --git a/meta-networking/recipes-daemons/postfix/files/aliasesdb b/meta-networking/recipes-daemons/postfix/files/aliasesdb index 855a64f705..855a64f705 100755..100644 --- a/meta-networking/recipes-daemons/postfix/files/aliasesdb +++ b/meta-networking/recipes-daemons/postfix/files/aliasesdb diff --git a/meta-networking/recipes-daemons/postfix/files/check_hostname.sh b/meta-networking/recipes-daemons/postfix/files/check_hostname.sh index 37a0dd088c..37a0dd088c 100755..100644 --- a/meta-networking/recipes-daemons/postfix/files/check_hostname.sh +++ b/meta-networking/recipes-daemons/postfix/files/check_hostname.sh diff --git a/meta-networking/recipes-daemons/postfix/files/main.cf b/meta-networking/recipes-daemons/postfix/files/main.cf index 2371ace6e4..22c57485d7 100644 --- a/meta-networking/recipes-daemons/postfix/files/main.cf +++ b/meta-networking/recipes-daemons/postfix/files/main.cf @@ -1,4 +1,4 @@ -compatibility_level = 2 +compatibility_level = 3.6 smtputf8_enable = no # Configure your domain and accounts @@ -33,7 +33,7 @@ queue_directory = /var/spool/postfix mail_spool_directory = /var/spool/mail readme_directory = no command_directory = /usr/sbin -daemon_directory = @LIBEXECDIR@ +daemon_directory = @LIBEXECDIR@/postfix mail_owner = postfix setgid_group = postdrop unknown_local_recipient_reject_code = 450 diff --git a/meta-networking/recipes-daemons/postfix/files/postfix b/meta-networking/recipes-daemons/postfix/files/postfix index 8c7a60175a..8c7a60175a 100755..100644 --- a/meta-networking/recipes-daemons/postfix/files/postfix +++ b/meta-networking/recipes-daemons/postfix/files/postfix diff --git a/meta-networking/recipes-daemons/postfix/files/postfix-install.patch b/meta-networking/recipes-daemons/postfix/files/postfix-install.patch deleted file mode 100644 index 45479bd52a..0000000000 --- a/meta-networking/recipes-daemons/postfix/files/postfix-install.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: postfix-3.2.2/postfix-install -=================================================================== ---- postfix-3.2.2.orig/postfix-install -+++ postfix-3.2.2/postfix-install -@@ -843,7 +843,7 @@ IFS="$BACKUP_IFS" - # the wrong place when Postfix is being upgraded. - - case "$mail_version" in --"") mail_version="`$POSTCONF -dhx mail_version`" || exit 1 -+"") mail_version="`$POSTCONF -c $CONFIG_DIRECTORY -dhx mail_version`" || exit 1 - esac - - # Undo MAIL_VERSION expansion at the end of a parameter value. If -Index: postfix-3.2.2/Makefile.in -=================================================================== ---- postfix-3.2.2.orig/Makefile.in -+++ postfix-3.2.2/Makefile.in -@@ -20,7 +20,7 @@ META = meta/main.cf.proto meta/master.cf - EXPAND = sed -e "s;\$${LIB_PREFIX};$(LIB_PREFIX);" \ - -e "s;\$${LIB_SUFFIX};$(LIB_SUFFIX);" - SHLIB_DIR_OVERRIDE = \ -- $${shlib_directory:-`$(SHLIB_ENV) bin/postconf -dhx shlib_directory`} -+ $${shlib_directory:-`$(SHLIB_ENV) $(POSTCONF) -dhx shlib_directory`} - - default: update - diff --git a/meta-networking/recipes-daemons/postfix/files/postfix.service b/meta-networking/recipes-daemons/postfix/files/postfix.service index 3a9a0a1813..30d54a4405 100644 --- a/meta-networking/recipes-daemons/postfix/files/postfix.service +++ b/meta-networking/recipes-daemons/postfix/files/postfix.service @@ -7,7 +7,7 @@ Conflicts=sendmail.service exim.service Type=forking PIDFile=@LOCALSTATEDIR@/spool/postfix/pid/master.pid ExecStartPre=-@SBINDIR@/check_hostname.sh -ExecStartPre=-@LIBEXECDIR@/aliasesdb +ExecStartPre=-@LIBEXECDIR@/postfix/aliasesdb ExecStart=@SBINDIR@/postfix start ExecReload=@SBINDIR@/postfix reload ExecStop=@SBINDIR@/postfix stop diff --git a/meta-networking/recipes-daemons/postfix/postfix_3.2.2.bb b/meta-networking/recipes-daemons/postfix/postfix_3.2.2.bb deleted file mode 100644 index 89af406ac3..0000000000 --- a/meta-networking/recipes-daemons/postfix/postfix_3.2.2.bb +++ /dev/null @@ -1,9 +0,0 @@ -require postfix.inc - -SRC_URI += "file://0001-Check-for-glibc-before-setting-CANT_USE_SEND_RECV_MS.patch \ - file://0001-makedefs-Use-native-compiler-to-build-makedefs.test.patch \ - file://postfix-install.patch \ - file://icu-config.patch \ - " -SRC_URI[md5sum] = "aea073a9b0bea5bdb590460a270a4aa0" -SRC_URI[sha256sum] = "d06849418d119d09366997b2b481bb23f737629769b4e4a52da42fb3ad8b0576" diff --git a/meta-networking/recipes-daemons/postfix/postfix.inc b/meta-networking/recipes-daemons/postfix/postfix_3.8.6.bb index e48fc39f2e..d48e9145f8 100644 --- a/meta-networking/recipes-daemons/postfix/postfix.inc +++ b/meta-networking/recipes-daemons/postfix/postfix_3.8.6.bb @@ -6,25 +6,31 @@ has a definite Sendmail-ish flavor, but the inside is completely different." HOMEPAGE= "http://www.postfix.org" SECTION = "mail" -DEPENDS = "db icu libpcre openssl postfix-native \ +DEPENDS = "db icu libpcre libnsl2 m4-native openssl postfix-native \ ${@bb.utils.contains('DISTRO_FEATURES', 'ldap', 'openldap', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'sasl', 'cyrus-sasl', '', d)} \ " -DEPENDS_class-native = "db-native icu-native openssl-native libpcre-native" - -LICENSE = "IPL-1.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=64375f37431336ea1b1b3005fe3fa354" - -SRC_URI = "ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-${PV}.tar.gz \ - file://makedefs.patch \ - file://install.patch \ - file://main.cf \ - file://postfix \ - file://internal_recipient \ - file://postfix.service \ - file://aliasesdb \ - file://check_hostname.sh \ -" + +LICENSE = "IPL-1.0 | EPL-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b181651ad99a7dc4cc8c4ce2f491ed1a" + +SRC_URI = "http://ftp.porcupine.org/mirrors/postfix-release/official/postfix-${PV}.tar.gz \ + file://main.cf \ + file://postfix \ + file://internal_recipient \ + file://postfix.service \ + file://aliasesdb \ + file://check_hostname.sh \ + file://0001-Fix-makedefs.patch \ + file://0002-Change-fixed-postconf-to-a-variable-for-cross-compil.patch \ + file://0003-makedefs-Use-native-compiler-to-build-makedefs.test.patch \ + file://0004-Fix-icu-config.patch \ + file://0005-makedefs-add-lnsl-and-lresolv-to-SYSLIBS-by-default.patch \ + " + +SRC_URI[sha256sum] = "4b6e17c826cc438cc3016a9c0a55ea7e77c6cbafba7dd57241d81b690b0e9774" + +UPSTREAM_CHECK_REGEX = "postfix\-(?P<pver>3\.8(\.\d+)+).tar.gz" S = "${WORKDIR}/postfix-${PV}" @@ -32,16 +38,16 @@ CLEANBROKEN = "1" BBCLASSEXTEND = "native" -inherit update-rc.d useradd update-alternatives systemd +inherit pkgconfig update-rc.d useradd update-alternatives systemd lib_package INITSCRIPT_NAME = "postfix" INITSCRIPT_PARAMS = "start 58 3 4 5 . stop 13 0 1 6 ." -USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = \ +USERADD_PACKAGES = "${PN}-bin" +USERADD_PARAM:${PN}-bin = \ "-d /var/spool/postfix -r -g postfix --shell /bin/false postfix; \ -d /var/spool/vmail -r -g vmail --shell /bin/false vmail \ " -GROUPADD_PARAM_${PN} = "--system postfix;--system postdrop;--system vmail" +GROUPADD_PARAM:${PN}-bin = "--system postfix;--system postdrop;--system vmail" export SYSLIBS = "${LDFLAGS}" @@ -57,10 +63,10 @@ export AUXLIBS-ldap = "\ ${@bb.utils.contains('DISTRO_FEATURES', 'ldap', '-lldap -llber', '', d)}" # no native openldap -export CCARGS-ldap_class-native = "" -export AUXLIBS-ldap_class-native = "" +export CCARGS-ldap:class-native = "" +export AUXLIBS-ldap:class-native = "" -export CCARGS-nonis_libc-musl = "-DNO_NIS" +export CCARGS-nonis:libc-musl = "-DNO_NIS" export CCARGS-nonis = "" # SASL support -DUSE_LDAP_SASL -DUSE_SASL_AUTH @@ -69,15 +75,14 @@ export CCARGS-sasl = "\ ${@bb.utils.contains('DISTRO_FEATURES', 'sasl', '-DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I${STAGING_INCDIR}/sasl', '', d)}" export AUXLIBS-sasl = "\ ${@bb.utils.contains('DISTRO_FEATURES', 'sasl', '-lsasl2', '', d)}" -export CCARGS-sasl_class-native = "" -export AUXLIBS-sasl_class-native = "" +export CCARGS-sasl:class-native = "" +export AUXLIBS-sasl:class-native = "" # PCRE, TLS support default export CCARGS = "${CFLAGS} -DHAS_PCRE -DUSE_TLS -I${STAGING_INCDIR}/openssl ${CCARGS-ldap} ${CCARGS-sasl} ${CCARGS-nonis}" export AUXLIBS = "-lpcre -lssl -lcrypto ${AUXLIBS-sasl} ${AUXLIBS-ldap}" export POSTCONF = "${STAGING_DIR_NATIVE}${sbindir_native}/postconf" -export CCARGS-nonis_libc-musl = "-DNO_NIS" # OPT,DEBUG is aready in CFLAGS # ignore the OPTS="CC=$CC" in Makefile it will not use the CC=$CC $CCARGS EXTRA_OEMAKE += "OPT= DEBUG= OPTS= " @@ -99,38 +104,20 @@ do_compile () { "s:\$(SHELL) makedefs):\$(SHELL) makedefs $SYSTEM $RELEASE):" \ ${S}/Makefile.in export BUILD_SYSROOT="${STAGING_DIR_HOST}" - export BUILD_SYSROOT_NSL_PATH="${STAGING_BASELIBDIR} \ - ${STAGING_LIBDIR}" else # native build export BUILD_SYSROOT="${STAGING_DIR_NATIVE}" - - # ubuntu x86 host: /lib/x86_64-linux-gnu(64) /lib/i386-linux-gnu (32) - # on 64 bits, 32 libs in i386-linux-gnu - # let makedefs finds nsl and resolv libs, host CC will link - # the correct libraries - BUILD_SYSROOT_NSL_PATH="$(${CC} -print-search-dirs 2>/dev/null | \ - sed -n '/^libraries: =/s/libraries: =//p' | \ - sed -e 's/:/\n/g' | xargs -n1 readlink -f | \ - grep -v 'gcc\|/[0-9.]\+$' | sort -u)" - if [ -z "$BUILD_SYSROOT_NSL_PATH" ]; then - BUILD_SYSROOT_NSL_PATH="/usr/lib64 /lib64 \ - /lib/x86_64-linux-gnu \ - /usr/lib /lib \ - /lib/i386-linux-gnu" - fi - export BUILD_SYSROOT_NSL_PATH fi oe_runmake makefiles oe_runmake } -do_install_prepend_class-native() { +do_install:prepend:class-native() { export POSTCONF="bin/postconf" } -SYSTEMD_SERVICE_${PN} = "postfix.service" +SYSTEMD_SERVICE:${PN} = "postfix.service" do_install () { sh ./postfix-install 'install_root=${D}' \ @@ -146,24 +133,24 @@ do_install () { 'data_directory=${localstatedir}/lib/postfix' \ -non-interactive rm -rf ${D}${localstatedir}/spool/postfix - mv ${D}${sysconfdir}/postfix/main.cf ${D}${sysconfdir}/postfix/sample-main.cf + mv ${D}${sysconfdir}/postfix/main.cf ${D}${sysconfdir}/postfix/${MLPREFIX}sample-main.cf install -m 755 ${S}/bin/smtp-sink ${D}/${sbindir}/ install -d ${D}${sysconfdir}/init.d - install -m 644 ${WORKDIR}/main.cf ${D}${sysconfdir}/postfix/main.cf - sed -i 's#@LIBEXECDIR@#${libexecdir}/postfix#' ${D}${sysconfdir}/postfix/main.cf + install -m 644 ${UNPACKDIR}/main.cf ${D}${sysconfdir}/postfix/main.cf + sed -i 's#@LIBEXECDIR@#${libexecdir}#' ${D}${sysconfdir}/postfix/main.cf - install -m 755 ${WORKDIR}/check_hostname.sh ${D}${sbindir}/ + install -m 755 ${UNPACKDIR}/check_hostname.sh ${D}${sbindir}/ - install -m 755 ${WORKDIR}/postfix ${D}${sysconfdir}/init.d/postfix - install -m 644 ${WORKDIR}/internal_recipient ${D}${sysconfdir}/postfix/internal_recipient + install -m 755 ${UNPACKDIR}/postfix ${D}${sysconfdir}/init.d/postfix + install -m 644 ${UNPACKDIR}/internal_recipient ${D}${sysconfdir}/postfix/internal_recipient install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/postfix.service ${D}${systemd_unitdir}/system - sed -i -e 's#@LIBEXECDIR@#${libexecdir}/postfix#g' ${D}${systemd_unitdir}/system/postfix.service + install -m 0644 ${UNPACKDIR}/postfix.service ${D}${systemd_unitdir}/system + sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}${systemd_unitdir}/system/postfix.service sed -i -e 's#@LOCALSTATEDIR@#${localstatedir}#g' ${D}${systemd_unitdir}/system/postfix.service sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/postfix.service - install -m 0755 ${WORKDIR}/aliasesdb ${D}${libexecdir}/postfix + install -m 0755 ${UNPACKDIR}/aliasesdb ${D}${libexecdir}/postfix install -m 770 -d ${D}${localstatedir}/spool/postfix chown postfix:postfix ${D}${localstatedir}/spool/postfix @@ -207,52 +194,47 @@ do_install () { chown :postdrop ${D}${sbindir}/postdrop chmod g+s ${D}${sbindir}/postqueue chmod g+s ${D}${sbindir}/postdrop + + rm -rf ${D}/etc/postfix/makedefs.out } -do_install_append_class-native() { +do_install:append:class-native() { ln -sf ../sbin/sendmail.postfix ${D}${bindir}/newaliases ln -sf ../sbin/sendmail.postfix ${D}${bindir}/mailq } -do_install_append_class-target() { - # Remove references to buildmachine paths in target makedefs.out - sed -i 's:-fdebug-prefix-map[^ ]*::g; s:--sysroot=${STAGING_DIR_TARGET}::g' ${D}/etc/postfix/makedefs.out - # Since we are building recipe postfix, newaliases and postmap come from our sysroot_native. - touch ${D}/etc/aliases - newaliases -C ${D}/etc/postfix/main.cf -oA${D}/etc/aliases - touch ${D}/etc/postfix/virtual_alias - postmap -c ${D}/etc/postfix ${D}/etc/postfix/virtual_alias - -} - -ALTERNATIVE_${PN} = "sendmail" +ALTERNATIVE:${PN}-bin = "sendmail mailq newaliases" +# /usr/lib/sendmial is required by LSB core test +ALTERNATIVE:${PN}-bin:linuxstdbase = "sendmail mailq newaliases usr-lib-sendmail" +ALTERNATIVE_TARGET[mailq] = "${bindir}/mailq" +ALTERNATIVE_TARGET[newaliases] = "${bindir}/newaliases" ALTERNATIVE_TARGET[sendmail] = "${sbindir}/sendmail.postfix" ALTERNATIVE_LINK_NAME[sendmail] = "${sbindir}/sendmail" +ALTERNATIVE_TARGET[usr-lib-sendmail] = "${sbindir}/sendmail.postfix" +ALTERNATIVE_LINK_NAME[usr-lib-sendmail] = "/usr/lib/sendmail" + ALTERNATIVE_PRIORITY = "120" -ALTERNATIVE_${PN}-doc += "mailq.1 newaliases.1 sendmail.1" +ALTERNATIVE:${PN}-doc += "mailq.1 newaliases.1 sendmail.1" ALTERNATIVE_LINK_NAME[mailq.1] = "${mandir}/man1/mailq.1" ALTERNATIVE_LINK_NAME[newaliases.1] = "${mandir}/man1/newaliases.1" ALTERNATIVE_LINK_NAME[sendmail.1] = "${mandir}/man1/sendmail.1" -pkg_postinst_${PN} () { - if [ "x$D" = "x" ]; then - touch /etc/aliases - newaliases +pkg_postinst_ontarget:${PN}-cfg () { + touch /etc/aliases + newaliases - # generate virtual_alias, default is hash - touch /etc/postfix/virtual_alias - postmap /etc/postfix/virtual_alias - else - if ${@'true' if 'linuxstdbase' in d.getVar('DISTROOVERRIDES', False) else 'false'}; then - # /usr/lib/sendmail is required by LSB core test - [ ! -L $D/usr/lib/sendmail ] && ln -sf ${sbindir}/sendmail $D/usr/lib/ - fi - fi + # generate virtual_alias, default is hash + touch /etc/postfix/virtual_alias + postmap /etc/postfix/virtual_alias } +PACKAGES =+ "${PN}-cfg" +RDEPENDS:${PN}-cfg:class-target += "${PN}-bin" +RDEPENDS:${PN}:class-target += "${PN}-cfg" # Exclude .debug directories from the main package -FILES_${PN} = "${sysconfdir} ${localstatedir} ${bindir}/* ${sbindir}/* \ +FILES:${PN}-bin += "${localstatedir} ${bindir}/* ${sbindir}/* \ ${libexecdir}/* ${systemd_unitdir}/*" -CONFFILES_${PN} = "/etc/aliases /etc/postfix/virtual_alias*" -FILES_${PN}-dbg += "${libexecdir}/postfix/.debug" +FILES:${PN}-cfg = "${sysconfdir}" +FILES:${PN}-dbg += "${libexecdir}/postfix/.debug" +ALLOW_EMPTY:${PN} = "1" diff --git a/meta-networking/recipes-daemons/proftpd/files/build_fixup.patch b/meta-networking/recipes-daemons/proftpd/files/build_fixup.patch index 9816d4d22a..8126b3619a 100644 --- a/meta-networking/recipes-daemons/proftpd/files/build_fixup.patch +++ b/meta-networking/recipes-daemons/proftpd/files/build_fixup.patch @@ -6,13 +6,13 @@ make, move-pidfile-to-var-run, move-runfile-to-var-run move pidfile to /var/run redefine PR_RUN_DIR as ${localstatedir}/run -Signed-off-By: Armin Kuster <akuster808@gmail.com> +Signed-off-by: Armin Kuster <akuster808@gmail.com> -Index: proftpd-1.3.6/Make.rules.in -=================================================================== ---- proftpd-1.3.6.orig/Make.rules.in -+++ proftpd-1.3.6/Make.rules.in +diff --git a/Make.rules.in b/Make.rules.in +index a5028ac..ccd7807 100644 +--- a/Make.rules.in ++++ b/Make.rules.in @@ -30,9 +30,9 @@ INSTALL=@INSTALL@ INSTALL_STRIP=@INSTALL_STRIP@ INSTALL_USER=@install_user@ @@ -26,11 +26,11 @@ Index: proftpd-1.3.6/Make.rules.in RM=rm -f SHELL=@CONFIG_SHELL@ -Index: proftpd-1.3.6/Makefile.in -=================================================================== ---- proftpd-1.3.6.orig/Makefile.in -+++ proftpd-1.3.6/Makefile.in -@@ -105,7 +105,6 @@ check: proftpd$(EXEEXT) +diff --git a/Makefile.in b/Makefile.in +index 9434cbd..13f2e16 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -123,7 +123,6 @@ check: proftpd$(EXEEXT) $(DESTDIR)$(localedir) $(DESTDIR)$(includedir) $(DESTDIR)$(includedir)/proftpd $(DESTDIR)$(libdir) $(DESTDIR)$(pkgconfigdir) $(DESTDIR)$(libdir)/proftpd $(DESTDIR)$(libexecdir) $(DESTDIR)$(localstatedir) $(DESTDIR)$(sysconfdir) $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) $(DESTDIR)$(mandir) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man8: @if [ ! -d $@ ]; then \ mkdir -p $@; \ @@ -38,20 +38,20 @@ Index: proftpd-1.3.6/Makefile.in chmod 0755 $@; \ fi -@@ -115,7 +114,6 @@ install-proftpd: proftpd $(DESTDIR)$(inc +@@ -133,7 +132,6 @@ install-proftpd: proftpd$(EXEEXT) $(DESTDIR)$(includedir) $(DESTDIR)$(localstate rm -f $(DESTDIR)$(sbindir)/in.proftpd ; \ fi - ln -s proftpd $(DESTDIR)$(sbindir)/in.proftpd + ln -s $(top_builddir)/proftpd $(DESTDIR)$(sbindir)/in.proftpd - -chown -h $(INSTALL_USER):$(INSTALL_GROUP) $(DESTDIR)$(sbindir)/in.proftpd install-libs: $(DESTDIR)$(libdir)/proftpd cd lib/ && $(MAKE) install -@@ -152,11 +150,11 @@ install-utils: $(DESTDIR)$(sbindir) $(DE - $(INSTALL_SBIN) ftpshut $(DESTDIR)$(sbindir)/ftpshut - $(INSTALL_BIN) ftptop $(DESTDIR)$(bindir)/ftptop - $(INSTALL_BIN) ftpwho $(DESTDIR)$(bindir)/ftpwho -- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 src/prxs $(DESTDIR)$(bindir)/prxs -+ $(INSTALL) -m 0755 src/prxs $(DESTDIR)$(bindir)/prxs +@@ -170,11 +168,11 @@ install-utils: $(DESTDIR)$(sbindir) $(DESTDIR)$(bindir) + $(INSTALL_SBIN) $(top_builddir)/ftpshut $(DESTDIR)$(sbindir)/ftpshut + $(INSTALL_BIN) $(top_builddir)/ftptop $(DESTDIR)$(bindir)/ftptop + $(INSTALL_BIN) $(top_builddir)/ftpwho $(DESTDIR)$(bindir)/ftpwho +- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 $(top_builddir)/src/prxs $(DESTDIR)$(bindir)/prxs ++ $(INSTALL) -m 0755 $(top_builddir)/src/prxs $(DESTDIR)$(bindir)/prxs install-conf: $(DESTDIR)$(sysconfdir) if [ ! -f $(DESTDIR)$(sysconfdir)/proftpd.conf ] ; then \ @@ -60,11 +60,11 @@ Index: proftpd-1.3.6/Makefile.in $(top_srcdir)/sample-configurations/basic.conf \ $(DESTDIR)$(sysconfdir)/proftpd.conf ; \ fi -Index: proftpd-1.3.6/configure -=================================================================== ---- proftpd-1.3.6.orig/configure -+++ proftpd-1.3.6/configure -@@ -41777,7 +41777,7 @@ _ACEOF +diff --git a/configure b/configure +index 0a51670..69fa130 100755 +--- a/configure ++++ b/configure +@@ -25116,7 +25116,7 @@ _ACEOF cat >>confdefs.h <<_ACEOF @@ -73,7 +73,7 @@ Index: proftpd-1.3.6/configure _ACEOF -@@ -41787,7 +41787,7 @@ _ACEOF +@@ -25126,7 +25126,7 @@ _ACEOF cat >>confdefs.h <<_ACEOF @@ -82,11 +82,11 @@ Index: proftpd-1.3.6/configure _ACEOF -Index: proftpd-1.3.6/configure.in -=================================================================== ---- proftpd-1.3.6.orig/configure.in -+++ proftpd-1.3.6/configure.in -@@ -3833,8 +3833,8 @@ locale_dir="`eval echo ${locale_dir}`" +diff --git a/configure.in b/configure.in +index 50561de..93cad3f 100644 +--- a/configure.in ++++ b/configure.in +@@ -4059,8 +4059,8 @@ locale_dir="`eval echo ${locale_dir}`" AC_DEFINE_UNQUOTED(PR_LOCALE_DIR, "`eval echo "${locale_dir}"`", [Define the locale directory]) AC_DEFINE_UNQUOTED(PR_RUN_DIR, "`eval echo "${localstatedir}"`", [Define the run directory]) @@ -97,16 +97,3 @@ Index: proftpd-1.3.6/configure.in prefix="$pr_saved_prefix" exec_prefix="$pr_saved_exec_prefix" -Index: proftpd-1.3.6/lib/libcap/Makefile -=================================================================== ---- proftpd-1.3.6.orig/lib/libcap/Makefile -+++ proftpd-1.3.6/lib/libcap/Makefile -@@ -26,7 +26,7 @@ OBJS=$(addsuffix .o, $(FILES)) - all: $(LIBNAME) - - _makenames: _makenames.c cap_names.sed -- $(CC) $(CFLAGS) $(LDFLAGS) $< -o $@ -+ $(BUILD_CC) $(CFLAGS) $(LDFLAGS) $< -o $@ - - cap_names.h: _makenames - ./_makenames > cap_names.h diff --git a/meta-networking/recipes-daemons/proftpd/files/contrib.patch b/meta-networking/recipes-daemons/proftpd/files/contrib.patch index 7e2a8e3ce0..96c237d386 100644 --- a/meta-networking/recipes-daemons/proftpd/files/contrib.patch +++ b/meta-networking/recipes-daemons/proftpd/files/contrib.patch @@ -11,32 +11,29 @@ Signed-off-by: Kevin Strasser <kevin.strasser@linux.intel.com> 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.in b/Makefile.in -index 5b2e683..ee72fe1 100644 +index 9434cbd..8da7d1f 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -120,7 +120,7 @@ install-modules: $(DESTDIR)$(libexecdir) $(DESTDIR)$(sysconfdir) +@@ -163,7 +163,7 @@ install-modules: $(DESTDIR)$(libexecdir) $(DESTDIR)$(sysconfdir) test -z "$(SHARED_MODULE_OBJS)" -a -z "$(SHARED_MODULE_DIRS)" -a -z "$(STATIC_MODULE_DIRS)" || (cd modules/ && $(MAKE) install) install-utils: $(DESTDIR)$(sbindir) $(DESTDIR)$(bindir) - cd contrib/ && $(MAKE) install-utils + cd contrib/ && $(MAKE) DESTDIR=${DESTDIR} install-utils - $(INSTALL_BIN) ftpcount $(DESTDIR)$(bindir)/ftpcount - $(INSTALL_BIN) ftpdctl $(DESTDIR)$(bindir)/ftpdctl - $(INSTALL_SBIN) ftpscrub $(DESTDIR)$(sbindir)/ftpscrub + $(INSTALL_BIN) $(top_builddir)/ftpcount $(DESTDIR)$(bindir)/ftpcount + $(INSTALL_BIN) $(top_builddir)/ftpdctl $(DESTDIR)$(bindir)/ftpdctl + $(INSTALL_SBIN) $(top_builddir)/ftpscrub $(DESTDIR)$(sbindir)/ftpscrub diff --git a/contrib/Makefile.in b/contrib/Makefile.in -index 5bcc038..51d248c 100644 +index d1a31af..65d2abc 100644 --- a/contrib/Makefile.in +++ b/contrib/Makefile.in -@@ -18,6 +18,6 @@ Makefile: Makefile.in ../config.status +@@ -17,6 +17,6 @@ Makefile: Makefile.in ../config.status cd ../ && ./config.status install-utils: -- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 ftpasswd $(DESTDIR)$(bindir)/ftpasswd -- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 ftpmail $(DESTDIR)$(bindir)/ftpmail -- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 ftpquota $(DESTDIR)$(bindir)/ftpquota -+ $(INSTALL) -m 0755 ftpasswd $(DESTDIR)$(bindir)/ftpasswd -+ $(INSTALL) -m 0755 ftpmail $(DESTDIR)$(bindir)/ftpmail -+ $(INSTALL) -m 0755 ftpquota $(DESTDIR)$(bindir)/ftpquota --- -1.7.9.5 - +- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 $(srcdir)/ftpasswd $(DESTDIR)$(bindir)/ftpasswd +- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 $(srcdir)/ftpmail $(DESTDIR)$(bindir)/ftpmail +- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 $(srcdir)/ftpquota $(DESTDIR)$(bindir)/ftpquota ++ $(INSTALL) -m 0755 $(srcdir)/ftpasswd $(DESTDIR)$(bindir)/ftpasswd ++ $(INSTALL) -m 0755 $(srcdir)/ftpmail $(DESTDIR)$(bindir)/ftpmail ++ $(INSTALL) -m 0755 $(srcdir)/ftpquota $(DESTDIR)$(bindir)/ftpquota diff --git a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.7c.bb index 409947265d..aa8d5fabd6 100644 --- a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb +++ b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.7c.bb @@ -1,10 +1,13 @@ SUMMARY = "Secure and configurable FTP server" SECTION = "net" HOMEPAGE = "http://www.proftpd.org" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=fb0d1484d11915fa88a6a7702f1dc184" -SRC_URI = "ftp://ftp.proftpd.org/distrib/source/${BPN}-${PV}.tar.gz \ +SRCREV = "75aa739805a6e05eeb31189934a3d324e7862962" +BRANCH = "1.3.7" + +SRC_URI = "git://github.com/proftpd/proftpd.git;branch=${BRANCH};protocol=https \ file://basic.conf.patch \ file://proftpd-basic.init \ file://default \ @@ -13,13 +16,16 @@ SRC_URI = "ftp://ftp.proftpd.org/distrib/source/${BPN}-${PV}.tar.gz \ file://build_fixup.patch \ file://proftpd.service \ " -iSRC_URI[md5sum] = "13270911c42aac842435f18205546a1b" -SRC_URI[sha256sum] = "91ef74b143495d5ff97c4d4770c6804072a8c8eb1ad1ecc8cc541b40e152ecaf" -inherit autotools-brokensep useradd update-rc.d systemd +S = "${WORKDIR}/git" + +inherit autotools-brokensep useradd update-rc.d systemd multilib_script + +EXTRA_OECONF += "--enable-largefile" PACKAGECONFIG ??= "shadow \ ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 pam', d)} \ + static \ " PACKAGECONFIG[curses] = "--enable-curses --enable-ncurses, --disable-curses --disable-ncurses, ncurses" @@ -28,6 +34,7 @@ PACKAGECONFIG[pam] = "--enable-auth-pam, --disable-auth-pam, libpam, libpam" PACKAGECONFIG[ipv6] = "--enable-ipv6, --disable-ipv6" PACKAGECONFIG[shadow] = "--enable-shadow, --disable-shadow" PACKAGECONFIG[pcre] = "--enable-pcre, --disable-pcre, libpcre " +PACKAGECONFIG[static] = "--enable-static=yes, --enable-static=no" # enable POSIX.1e capabilities PACKAGECONFIG[cap] = "--enable-cap, --disable-cap, libcap, libcap" @@ -53,19 +60,16 @@ PACKAGECONFIG[nls] = "--enable-nls, --disable-nls" #add mod_dso to core modules PACKAGECONFIG[dso] = "--enable-dso, --disable-dso" -PACKAGECONFIG[largefile] = "--enable-largefile, --disable-largefile" #omit mod_auth_file from core modules PACKAGECONFIG[auth] = "--enable-auth-file, --disable-auth-file" - # proftpd uses libltdl which currently makes configuring using # autotools.bbclass a pain... do_configure () { install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S} install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S} oe_runconf - cp ${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool ${S}/libtool } FTPUSER = "ftp" @@ -78,14 +82,14 @@ do_install () { sed -i '/ *User[ \t]*/s/ftp/${FTPUSER}/' ${D}${sysconfdir}/proftpd.conf sed -i '/ *Group[ \t]*/s/ftp/${FTPGROUP}/' ${D}${sysconfdir}/proftpd.conf install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/proftpd-basic.init ${D}${sysconfdir}/init.d/proftpd + install -m 0755 ${UNPACKDIR}/proftpd-basic.init ${D}${sysconfdir}/init.d/proftpd sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/proftpd sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/proftpd sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/proftpd sed -i 's!^PATH=.*!PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}${sysconfdir}/init.d/proftpd install -d ${D}${sysconfdir}/default - install -m 0755 ${WORKDIR}/default ${D}${sysconfdir}/default/proftpd + install -m 0755 ${UNPACKDIR}/default ${D}${sysconfdir}/default/proftpd # create the pub directory mkdir -p ${D}/home/${FTPUSER}/pub/ @@ -101,7 +105,7 @@ do_install () { fi install -d ${D}/${systemd_unitdir}/system - install -m 644 ${WORKDIR}/proftpd.service ${D}/${systemd_unitdir}/system + install -m 644 ${UNPACKDIR}/proftpd.service ${D}/${systemd_unitdir}/system sed -e 's,@BASE_SBINDIR@,${base_sbindir},g' \ -e 's,@SYSCONFDIR@,${sysconfdir},g' \ -e 's,@SBINDIR@,${sbindir},g' \ @@ -109,7 +113,9 @@ do_install () { sed -e 's|--sysroot=${STAGING_DIR_HOST}||g' \ -e 's|${STAGING_DIR_NATIVE}||g' \ + -e 's|-ffile-prefix-map=[^ ]*||g' \ -e 's|-fdebug-prefix-map=[^ ]*||g' \ + -e 's|-fmacro-prefix-map=[^ ]*||g' \ -i ${D}/${bindir}/prxs # ftpmail perl script, which reads the proftpd log file and sends @@ -126,13 +132,15 @@ INITSCRIPT_NAME = "proftpd" INITSCRIPT_PARAM = "defaults 85 15" SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "proftpd.service" +SYSTEMD_SERVICE:${PN} = "proftpd.service" USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "--system ${FTPGROUP}" -USERADD_PARAM_${PN} = "--system -g ${FTPGROUP} --home-dir /var/lib/${FTPUSER} --no-create-home \ +GROUPADD_PARAM:${PN} = "--system ${FTPGROUP}" +USERADD_PARAM:${PN} = "--system -g ${FTPGROUP} --home-dir /var/lib/${FTPUSER} --no-create-home \ --shell /bin/false ${FTPUSER}" -FILES_${PN} += "/home/${FTPUSER}" +MULTILIB_SCRIPTS = "${PN}:${bindir}/prxs" + +FILES:${PN} += "/home/${FTPUSER}" -RDEPENDS_${PN} += "perl" +RDEPENDS:${PN} += "perl" diff --git a/meta-networking/recipes-daemons/ptpd/ptpd/0001-ptpd-Solve-memory-leak-for-function-NTPDCrequest.patch b/meta-networking/recipes-daemons/ptpd/ptpd/0001-ptpd-Solve-memory-leak-for-function-NTPDCrequest.patch new file mode 100644 index 0000000000..b2caeba2ca --- /dev/null +++ b/meta-networking/recipes-daemons/ptpd/ptpd/0001-ptpd-Solve-memory-leak-for-function-NTPDCrequest.patch @@ -0,0 +1,40 @@ +From 3886219c5c1fdca114dd480b46ce211762e30742 Mon Sep 17 00:00:00 2001 +From: Li Zhou <li.zhou@windriver.com> +Date: Tue, 30 Jun 2020 13:50:11 +0800 +Subject: [PATCH] ptpd: Solve memory leak for function NTPDCrequest + +Solve the memory leak in function NTPDCrequest detected by valgrind tool. + +Memory leak log example: +==619== 21 bytes in 1 blocks are still reachable in loss record 1 of 3 +==619== at 0x4A09DB0: calloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) +==619== by 0x43512E: NTPDCrequest (ntpdcontrol.c:255) +==619== by 0x43512E: NTPDCquery.isra.1 (ntpdcontrol.c:683) +==619== by 0x4359EE: ntpdInControl (ntpdcontrol.c:807) +==619== by 0x4364F5: ntpServiceUpdate (timingdomain.c:622) +==619== by 0x436935: timingDomainUpdate (timingdomain.c:756) +==619== by 0x4334A7: protocol (protocol.c:263) +==619== by 0x402BAE: main (ptpd.c:131) + +Upstream-Status: Pending + +Signed-off-by: Li Zhou <li.zhou@windriver.com> +--- + src/dep/ntpengine/ntpdcontrol.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/dep/ntpengine/ntpdcontrol.c b/src/dep/ntpengine/ntpdcontrol.c +index bfe0b5e..b1973cb 100644 +--- a/src/dep/ntpengine/ntpdcontrol.c ++++ b/src/dep/ntpengine/ntpdcontrol.c +@@ -271,6 +271,7 @@ NTPDCrequest( + + if (!auth) { + qpkt.auth_seq = AUTH_SEQ(0, 0); ++ free(key); + return ntpSend(control, (Octet *)&qpkt, req_pkt_size); + } + +-- +1.9.1 + diff --git a/meta-networking/recipes-daemons/ptpd/ptpd/Fixed-100-CPU-using-issue-by-adding-minimum-POSIX-ti.patch b/meta-networking/recipes-daemons/ptpd/ptpd/Fixed-100-CPU-using-issue-by-adding-minimum-POSIX-ti.patch new file mode 100644 index 0000000000..91028d82bc --- /dev/null +++ b/meta-networking/recipes-daemons/ptpd/ptpd/Fixed-100-CPU-using-issue-by-adding-minimum-POSIX-ti.patch @@ -0,0 +1,67 @@ +From e00d3f52ccc6496a60992ac5a9d771b1d067eceb Mon Sep 17 00:00:00 2001 +From: Haiqing Bai <Haiqing.Bai@windriver.com> +Date: Thu, 22 Nov 2018 08:42:48 +0000 +Subject: [PATCH] Fixed 100% CPU using issue by adding minimum POSIX timer + interval + +Added minimum POSIX timer interval to prevent from timers firing +to quickly for the process to handle, resulting in 100% CPU and +endless signal queue. + +Upstream-Status: Backport [From commit 1f0baae98a7b23e85f2bfd8f5de64795421c270e: + - critical: added minimum POSIX timer interval to prevent from + timers firing to quickly for the process to handle, + resulting in 100% CPU and endless signal queue] + +Signed-off-by: Haiqing Bai <Haiqing.Bai@windriver.com> +--- + src/dep/eventtimer.h | 3 ++- + src/dep/eventtimer_itimer.c | 2 +- + src/dep/eventtimer_posix.c | 4 ++++ + 3 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/src/dep/eventtimer.h b/src/dep/eventtimer.h +index 64e483a..0a21318 100644 +--- a/src/dep/eventtimer.h ++++ b/src/dep/eventtimer.h +@@ -30,7 +30,8 @@ + * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +-#define EVENTTIMER_MAX_DESC 20 ++#define EVENTTIMER_MAX_DESC 20 ++#define EVENTTIMER_MIN_INTERVAL_US 250 /* 4000/sec */ + + typedef struct EventTimer EventTimer; + +diff --git a/src/dep/eventtimer_itimer.c b/src/dep/eventtimer_itimer.c +index cf3c6db..3bb7ec6 100644 +--- a/src/dep/eventtimer_itimer.c ++++ b/src/dep/eventtimer_itimer.c +@@ -53,7 +53,7 @@ + + #include "../ptpd.h" + +-#define US_TIMER_INTERVAL (62500) ++#define US_TIMER_INTERVAL (31250) + + static volatile unsigned int elapsed; + +diff --git a/src/dep/eventtimer_posix.c b/src/dep/eventtimer_posix.c +index 637eef3..f4a702d 100644 +--- a/src/dep/eventtimer_posix.c ++++ b/src/dep/eventtimer_posix.c +@@ -100,6 +100,10 @@ eventTimerStart_posix(EventTimer *timer, double interval) + ts.tv_sec = interval; + ts.tv_nsec = (interval - ts.tv_sec) * 1E9; + ++ if(!ts.tv_sec && ts.tv_nsec < EVENTTIMER_MIN_INTERVAL_US * 1000) { ++ ts.tv_nsec = EVENTTIMER_MIN_INTERVAL_US * 1000; ++ } ++ + DBGV("Timer %s start requested at %d.%4d sec interval\n", timer->id, ts.tv_sec, ts.tv_nsec); + + its.it_interval = ts; +-- +2.11.0 + diff --git a/meta-networking/recipes-daemons/ptpd/ptpd/ptpd-use-pkgconfig.patch b/meta-networking/recipes-daemons/ptpd/ptpd/ptpd-use-pkgconfig.patch index e4578dda74..cb8c81385b 100644 --- a/meta-networking/recipes-daemons/ptpd/ptpd/ptpd-use-pkgconfig.patch +++ b/meta-networking/recipes-daemons/ptpd/ptpd/ptpd-use-pkgconfig.patch @@ -6,7 +6,7 @@ Subject: [PATCH] ptpd: use pkgconfig Yocto uses pkg-config for libpcap, rather than pcap-config, so use that instead as the source for libs and cflags. -Upstream-status: Inappropriate [ embedded specific ] +Upstream-Status: Inappropriate [ embedded specific ] Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> --- 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 e136193205..f2c300855c 100644 --- a/meta-networking/recipes-daemons/ptpd/ptpd_2.3.1.bb +++ b/meta-networking/recipes-daemons/ptpd/ptpd_2.3.1.bb @@ -5,7 +5,7 @@ and PTP Version 2 implements IEEE-1588-2008. PTP was developed to provide very p time coordination of LAN connected computers." HOMEPAGE = "http://sourceforge.net/projects/ptpd" SECTION = "net" -LICENSE = "BSD" +LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://README;md5=0733e1b3788ab2ebbc63bf33a020da1d" DEPENDS = "libpcap" @@ -23,6 +23,8 @@ def get_sub(d): SRC_URI = "http://downloads.sourceforge.net/project/ptpd/ptpd/${@get_sub(d)}/ptpd-${PV}.tar.gz \ file://ptpd-use-pkgconfig.patch \ + file://Fixed-100-CPU-using-issue-by-adding-minimum-POSIX-ti.patch \ + file://0001-ptpd-Solve-memory-leak-for-function-NTPDCrequest.patch \ file://ptpd.service \ file://ptpd.conf \ " @@ -30,6 +32,8 @@ SRC_URI = "http://downloads.sourceforge.net/project/ptpd/ptpd/${@get_sub(d)}/ptp SRC_URI[md5sum] = "253bab7ab51d969616ea811be1f132f3" SRC_URI[sha256sum] = "0dbf54dd2c178bd9fe62481d2c37513ee36636d8bf137cfdad96891490cdbf93" +UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/ptpd/files/releases" + S = "${WORKDIR}/ptpd-${PV}" EXTRA_OEMAKE = "" @@ -43,16 +47,16 @@ do_install() { if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/ptpd.service ${D}${systemd_unitdir}/system + install -m 0644 ${UNPACKDIR}/ptpd.service ${D}${systemd_unitdir}/system sed -i -e 's#@SYSCONFDIR@#${sysconfdir}#g' ${D}${systemd_unitdir}/system/ptpd.service sed -i -e 's#@BINDIR@#${bindir}#g' ${D}${systemd_unitdir}/system/ptpd.service install -d ${D}${sysconfdir}/default/ - install -m 0644 ${WORKDIR}/ptpd.conf ${D}${sysconfdir}/default/ptpd + install -m 0644 ${UNPACKDIR}/ptpd.conf ${D}${sysconfdir}/default/ptpd fi } SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "ptpd.service" +SYSTEMD_SERVICE:${PN} = "ptpd.service" SYSTEMD_AUTO_ENABLE = "disable" diff --git a/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch b/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch index 76523fb997..c213943d53 100644 --- a/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch +++ b/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch @@ -1,4 +1,4 @@ -From 1bafadf2502334a3e972ff667061469316d0d2ca Mon Sep 17 00:00:00 2001 +From a45e086661a3eed29193546c525998d7525ef6d9 Mon Sep 17 00:00:00 2001 From: Tudor Florea <tudor.florea@enea.com> Date: Tue, 4 Aug 2015 02:46:39 +0200 Subject: [PATCH] Remove hardcoded /usr/local includes from configure.ac @@ -7,33 +7,43 @@ Upstream-Status: Inappropriate [config] Signed-off-by: Yauhen Kharuzhy <yauhen.kharuzhy@promwad.com> Signed-off-by: Tudor Florea <tudor.florea@enea.com> + +Update for 1.0.49. +Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> + +Update for 1.0.51. +Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> --- - configure.ac | 12 ------------ - 1 file changed, 12 deletions(-) + configure.ac | 16 ---------------- + 1 file changed, 16 deletions(-) diff --git a/configure.ac b/configure.ac -index 6c78e8c..851d45d 100644 +index 62768c8..efaeee5 100644 --- a/configure.ac +++ b/configure.ac -@@ -100,18 +100,6 @@ AC_ARG_VAR(PYTHON,local path to the python interpreter) - python_possible_path="/usr/bin:/usr/local/bin:/bin:/opt/python/bin:/opt/python/usr/bin:/opt/python/usr/local/bin" - AC_PATH_PROG(PYTHON,python,/usr/bin/env python,$python_possible_path) +@@ -97,22 +97,6 @@ AX_CHECK_LINK_FLAG([-Wl,-z,relro], [LDFLAGS="$LDFLAGS -Wl,-z,relro"]) + AX_CHECK_LINK_FLAG([-Wl,-z,now], [LDFLAGS="$LDFLAGS -Wl,-z,now"]) + AX_CHECK_LINK_FLAG([-Wl,-z,noexecstack], [LDFLAGS="$LDFLAGS -Wl,-z,noexecstack"]) --if test -d /usr/local/include; then -- CPPFLAGS="$CPPFLAGS -I/usr/local/include" --fi -- --if test -d /usr/kerberos/include; then -- CPPFLAGS="$CPPFLAGS -I/usr/kerberos/include" --fi -- --if test -d /usr/local/lib; then -- LDFLAGS="$LDFLAGS -L/usr/local/lib" +-if test "x$cross_compiling" != "xyes"; then +- for path in \ +- /usr/kerberos \ +- /usr/local /opt /usr/local/opt \ +- /opt/homebrew/opt/openssl@3 /usr/local/opt/openssl@3 \ +- /opt/homebrew/opt/openssl@1.1 /usr/local/opt/openssl@1.1 \ +- /usr/openssl /opt/openssl /usr/local/opt/openssl; do +- if test -d $path/include; then +- CPPFLAGS="$CPPFLAGS -I${path}/include" +- fi +- if test -d $path/lib; then +- LDFLAGS="$LDFLAGS -L${path}/lib" +- fi +- done -fi - CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2" dnl Checks for header files -- -1.9.1 +2.25.1 diff --git a/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/nostrip.patch b/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/nostrip.patch index 4cb33bc5c8..32d714f6f4 100644 --- a/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/nostrip.patch +++ b/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/nostrip.patch @@ -1,7 +1,8 @@ -From 0290bd6f4ceddff2c52dff833c9d31d24de7d0e1 Mon Sep 17 00:00:00 2001 +From 79fd22c0def26eba130db98e312bb00fec32ac0a Mon Sep 17 00:00:00 2001 From: Tudor Florea <tudor.florea@enea.com> Date: Tue, 4 Aug 2015 03:07:01 +0200 -Subject: [PATCH] Don't mess with CFLAGS and LDFLAGS when --with-minimal is specified +Subject: [PATCH] Don't mess with CFLAGS and LDFLAGS when --with-minimal is + specified We especially don't want stripping enabled. @@ -9,15 +10,16 @@ Upstream-Status: Inappropriate [config] Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Tudor Florea <tudor.florea@enea.com> + --- configure.ac | 2 -- 1 file changed, 2 deletions(-) diff --git a/configure.ac b/configure.ac -index 851d45d..dc410a1 100644 +index 695ce68..0f28b55 100644 --- a/configure.ac +++ b/configure.ac -@@ -423,8 +423,6 @@ AC_ARG_WITH(minimal, +@@ -414,8 +414,6 @@ AC_ARG_WITH(minimal, AC_DEFINE(NO_FTP_USERS) AC_DEFINE(WITHOUT_ASCII) AC_DEFINE(BORING_MODE) @@ -26,6 +28,3 @@ index 851d45d..dc410a1 100644 fi ]) AC_ARG_WITH(paranoidmsg, --- -1.9.1 - diff --git a/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.42.bb b/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.51.bb index c1f1504055..6f03f73db5 100644 --- a/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.42.bb +++ b/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.51.bb @@ -2,21 +2,18 @@ SUMMARY = "FTP Server with a strong focus on software security" DESCRIPTION = "Pure-FTPd is a free (BSD license), secure, production-quality and standard-conformant FTP server." HOMEPAGE = "http://www.pureftpd.org/project/pure-ftpd" SECTION = "net" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=90352fb2bfe17f4261687a0d6e09f489" - -DEPENDS = "libcap" +LICENSE = "0BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=194bc994ad6bbd4ff5a021082fe52156" +DEPENDS = "libcap virtual/crypt" SRC_URI = "http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-${PV}.tar.gz \ file://0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch \ file://nostrip.patch \ " -SRC_URI[md5sum] = "4195af8f0e5ee2a798b1014071dae3a3" -SRC_URI[sha256sum] = "7be73a8e58b190a7054d2ae00c5e650cb9e091980420082d02ec3c3b68d8e7f9" +SRC_URI[sha256sum] = "4160f66b76615eea2397eac4ea3f0a146b7928207b79bc4cc2f99ad7b7bd9513" inherit autotools -EXTRA_OECONF = "--with-minimal" PACKAGECONFIG[libsodium] ="ac_cv_lib_sodium_crypto_pwhash_scryptsalsa208sha256_str=yes, \ - ac_cv_lib_sodium_crypto_pwhash_scryptsalsa208sha256_str=no, libsodium" + ac_cv_lib_sodium_crypto_pwhash_scryptsalsa208sha256_str=no, libsodium" diff --git a/meta-networking/recipes-daemons/radvd/files/0001-Reverts-the-include.h-change-in-46883f8a1a02fe42040d.patch b/meta-networking/recipes-daemons/radvd/files/0001-Reverts-the-include.h-change-in-46883f8a1a02fe42040d.patch new file mode 100644 index 0000000000..57338d4713 --- /dev/null +++ b/meta-networking/recipes-daemons/radvd/files/0001-Reverts-the-include.h-change-in-46883f8a1a02fe42040d.patch @@ -0,0 +1,32 @@ +From 15f439c555289f900eb33111b010bf1266f97edb Mon Sep 17 00:00:00 2001 +From: Jonathan Davies <jpds@protonmail.com> +Date: Thu, 25 Nov 2021 15:29:18 +0000 +Subject: [PATCH] Reverts the include.h change in + 46883f8a1a02fe42040dd8e48aec0ed871545d4d + +Closes: #158 + +Upstream-Status: Backport [https://github.com/radvd-project/radvd/commit/06689f8c06f44c7e87f7ff1d814428f88375b53f] +Signed-off-by: Jonathan Davies <jpds@protonmail.com> +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + includes.h | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/includes.h b/includes.h +index ef30b10..c528c86 100644 +--- a/includes.h ++++ b/includes.h +@@ -76,12 +76,7 @@ + #include <sys/sysctl.h> + #endif + +-#if !defined(__GLIBC__) && defined(linux) +-#include <linux/if.h> +-#define IF_NAMESIZE IFNAMSIZ +-#else + #include <net/if.h> +-#endif + + #ifdef HAVE_NET_IF_DL_H + #include <net/if_dl.h> diff --git a/meta-networking/recipes-daemons/radvd/files/radvd.conf b/meta-networking/recipes-daemons/radvd/files/radvd.conf new file mode 100644 index 0000000000..c006f86313 --- /dev/null +++ b/meta-networking/recipes-daemons/radvd/files/radvd.conf @@ -0,0 +1,18 @@ +# NOTE: there is no such thing as a working "by-default" configuration file. +# At least the prefix needs to be specified. Please consult the radvd.conf(5) +# man page and/or /usr/share/doc/radvd-*/radvd.conf.example for help. +# +# +#interface eth0 +#{ +# AdvSendAdvert on; +# MinRtrAdvInterval 30; +# MaxRtrAdvInterval 100; +# prefix 2001:db8:1:0::/64 +# { +# AdvOnLink on; +# AdvAutonomous on; +# AdvRouterAddr off; +# }; +# +#}; diff --git a/meta-networking/recipes-daemons/radvd/radvd_2.17.bb b/meta-networking/recipes-daemons/radvd/radvd_2.17.bb deleted file mode 100644 index 4baea01d07..0000000000 --- a/meta-networking/recipes-daemons/radvd/radvd_2.17.bb +++ /dev/null @@ -1,5 +0,0 @@ - -require radvd.inc - -SRC_URI[md5sum] = "64ee3fdb5544bcddef1c6cd80d77fa0a" -SRC_URI[sha256sum] = "53757e7f2164899e1145482f1ae91829600a6e2f6fec29cfb3b350a3bb45bd5d" diff --git a/meta-networking/recipes-daemons/radvd/radvd.inc b/meta-networking/recipes-daemons/radvd/radvd_2.19.bb index bff693ca97..a8a116cbe5 100644 --- a/meta-networking/recipes-daemons/radvd/radvd.inc +++ b/meta-networking/recipes-daemons/radvd/radvd_2.19.bb @@ -8,7 +8,7 @@ addresses and some other parameters. They also can \ choose a default router based on these advertisements." HOMEPAGE = "http://www.litech.org/radvd/" SECTION = "net" -DEPENDS = "flex-native libdaemon" +DEPENDS = "flex-native bison-native libdaemon " # License is BSD-Style (with advertising clause) but also has an additional 0th clause LICENSE = "radvd" @@ -18,49 +18,53 @@ SRC_URI = "http://v6web.litech.org/radvd/dist/radvd-${PV}.tar.gz \ file://radvd.init \ file://radvd.service \ file://volatiles.03_radvd \ - file://radvd.default" + file://radvd.default \ + file://radvd.conf \ + file://0001-Reverts-the-include.h-change-in-46883f8a1a02fe42040d.patch \ + " +SRC_URI[sha256sum] = "c36470706fec3a9e6bed394ffea08acaff5dac647848d26b96bb9b9c65d58da0" -inherit autotools update-rc.d useradd pkgconfig systemd +inherit autotools useradd pkgconfig systemd -SYSTEMD_SERVICE_${PN} = "radvd.service" +SYSTEMD_SERVICE:${PN} = "radvd.service" SYSTEMD_AUTO_ENABLE = "disable" -do_install_append () { +do_install:append () { install -m 0755 -d ${D}${sysconfdir}/init.d \ ${D}${sysconfdir}/default/volatiles \ ${D}${docdir}/radvd # Install init script and volatiles - install -m 0755 ${WORKDIR}/radvd.init ${D}${sysconfdir}/init.d/radvd + install -m 0755 ${UNPACKDIR}/radvd.init ${D}${sysconfdir}/init.d/radvd sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/radvd sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/radvd sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/radvd sed -i 's!^PATH=.*!PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}${sysconfdir}/init.d/radvd - install -m 0644 ${WORKDIR}/volatiles.03_radvd ${D}${sysconfdir}/default/volatiles/volatiles.03_radvd + install -m 0644 ${UNPACKDIR}/volatiles.03_radvd ${D}${sysconfdir}/default/volatiles/03_radvd # Install systemd service files install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/radvd.service ${D}${systemd_unitdir}/system + install -m 0644 ${UNPACKDIR}/radvd.service ${D}${systemd_unitdir}/system sed -i -e 's#@SYSCONFDIR@#${sysconfdir}#g' \ -e 's#@SBINDIR@#${sbindir}#g' \ -e 's#@BASE_BINDIR@#${base_bindir}#g' ${D}${systemd_unitdir}/system/radvd.service # Install default environment file - install -m 0644 ${WORKDIR}/radvd.default ${D}${sysconfdir}/default/radvd + install -m 0644 ${UNPACKDIR}/radvd.default ${D}${sysconfdir}/default/radvd # Documentation for i in radvd.conf.example README; do \ install -m 0644 ${S}/$i ${D}${docdir}/radvd; \ done -} -INITSCRIPT_NAME = "radvd" -INITSCRIPT_PARAMS = "defaults 20 80" + install -m 0644 ${UNPACKDIR}/radvd.conf ${D}${sysconfdir}/radvd.conf +} USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--system --home ${localstatedir}/run/radvd/ -M -g nogroup radvd" +GROUPADD_PARAM:${PN} = "--system nogroup" +USERADD_PARAM:${PN} = "--system --home ${localstatedir}/run/radvd/ -M -g nogroup --shell /sbin/nologin radvd" -pkg_postinst_${PN} () { +pkg_postinst:${PN} () { if [ -z "$D" -a -x /etc/init.d/populate-volatile.sh ]; then /etc/init.d/populate-volatile.sh update fi diff --git a/meta-networking/recipes-daemons/squid/files/0001-SquidNew-use-noexcept-instead-of-throw-for-C-11-comp.patch b/meta-networking/recipes-daemons/squid/files/0001-SquidNew-use-noexcept-instead-of-throw-for-C-11-comp.patch deleted file mode 100644 index 48674c3c57..0000000000 --- a/meta-networking/recipes-daemons/squid/files/0001-SquidNew-use-noexcept-instead-of-throw-for-C-11-comp.patch +++ /dev/null @@ -1,48 +0,0 @@ -From f9150a0dc092ab2cbd47ee428436b747dce323a9 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 23 Apr 2017 10:28:28 -0700 -Subject: [PATCH] SquidNew: use noexcept instead of throw for C++11 compilers - -Fixes errors with gcc7 which is more pedantic about c++11 -conformance regarding deprecated features - -include/SquidNew.h:21:51: error: dynamic exception specifications are deprecated in C++11 -_SQUID_EXTERNNEW_ void *operator new[] (size_t size) throw (std::bad_alloc) - ^~~~~ - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - include/SquidNew.h | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/include/SquidNew.h b/include/SquidNew.h -index 39fcee0..c960347 100644 ---- a/include/SquidNew.h -+++ b/include/SquidNew.h -@@ -18,19 +18,19 @@ - */ - #include <new> - --_SQUID_EXTERNNEW_ void *operator new(size_t size) throw (std::bad_alloc) -+_SQUID_EXTERNNEW_ void *operator new(size_t size) noexcept(false) - { - return xmalloc(size); - } --_SQUID_EXTERNNEW_ void operator delete (void *address) throw() -+_SQUID_EXTERNNEW_ void operator delete (void *address) noexcept(true) - { - xfree(address); - } --_SQUID_EXTERNNEW_ void *operator new[] (size_t size) throw (std::bad_alloc) -+_SQUID_EXTERNNEW_ void *operator new[] (size_t size) noexcept(false) - { - return xmalloc(size); - } --_SQUID_EXTERNNEW_ void operator delete[] (void *address) throw() -+_SQUID_EXTERNNEW_ void operator delete[] (void *address) noexcept(true) - { - xfree(address); - } --- -2.12.2 - diff --git a/meta-networking/recipes-daemons/squid/files/0001-configure-Check-for-Wno-error-format-truncation-comp.patch b/meta-networking/recipes-daemons/squid/files/0001-configure-Check-for-Wno-error-format-truncation-comp.patch deleted file mode 100644 index 0c0a3aad10..0000000000 --- a/meta-networking/recipes-daemons/squid/files/0001-configure-Check-for-Wno-error-format-truncation-comp.patch +++ /dev/null @@ -1,116 +0,0 @@ -From 14d469bc82c758116aef7d549abd49c131b4170f Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 22 Apr 2017 11:54:57 -0700 -Subject: [PATCH] configure: Check for -Wno-error=format-truncation compiler - option - -If this option is supported by compiler then disable it ( gcc7+) -Fixes -client.c:834:23: error: '%s' directive output may be truncated writing up to 1023 bytes into a region of size 1010 [-Werror=format-truncation=] - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - configure.ac | 3 +- - m4/ax_check_compile_flag.m4 | 74 +++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 76 insertions(+), 1 deletion(-) - create mode 100644 m4/ax_check_compile_flag.m4 - -Index: squid-3.5.26/configure.ac -=================================================================== ---- squid-3.5.26.orig/configure.ac -+++ squid-3.5.26/configure.ac -@@ -26,6 +26,7 @@ m4_include([acinclude/pkg.m4]) - m4_include([acinclude/lib-checks.m4]) - m4_include([acinclude/ax_cxx_compile_stdcxx_11.m4]) - m4_include([acinclude/ax_cxx_0x_types.m4]) -+m4_include([acinclude/ax_check_compile_flag.m4]) - - HOSTCXX="$BUILD_CXX" - PRESET_CFLAGS="$CFLAGS" -@@ -44,6 +45,7 @@ AC_PROG_CXX - AC_LANG([C++]) - AC_CANONICAL_HOST - -+AX_CHECK_COMPILE_FLAG([-Werror=format-truncation],[CFLAGS="$CFLAGS -Wno-error=format-truncation" CXXFLAGS="$CXXFLAGS -Wno-error=format-truncation"]) - # Clang 3.2 on some CPUs requires -march-native to detect correctly. - # GCC 4.3+ can also produce faster executables when its used. - # But building inside a virtual machine environment has been found to -Index: squid-3.5.26/acinclude/ax_check_compile_flag.m4 -=================================================================== ---- /dev/null -+++ squid-3.5.26/acinclude/ax_check_compile_flag.m4 -@@ -0,0 +1,74 @@ -+# =========================================================================== -+# https://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html -+# =========================================================================== -+# -+# SYNOPSIS -+# -+# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT]) -+# -+# DESCRIPTION -+# -+# Check whether the given FLAG works with the current language's compiler -+# or gives an error. (Warnings, however, are ignored) -+# -+# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on -+# success/failure. -+# -+# If EXTRA-FLAGS is defined, it is added to the current language's default -+# flags (e.g. CFLAGS) when the check is done. The check is thus made with -+# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to -+# force the compiler to issue an error when a bad flag is given. -+# -+# INPUT gives an alternative input source to AC_COMPILE_IFELSE. -+# -+# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this -+# macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG. -+# -+# LICENSE -+# -+# Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de> -+# Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com> -+# -+# This program is free software: you can redistribute it and/or modify it -+# under the terms of the GNU General Public License as published by the -+# Free Software Foundation, either version 3 of the License, or (at your -+# option) any later version. -+# -+# This program is distributed in the hope that it will be useful, but -+# WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -+# Public License for more details. -+# -+# You should have received a copy of the GNU General Public License along -+# with this program. If not, see <https://www.gnu.org/licenses/>. -+# -+# As a special exception, the respective Autoconf Macro's copyright owner -+# gives unlimited permission to copy, distribute and modify the configure -+# scripts that are the output of Autoconf when processing the Macro. You -+# need not follow the terms of the GNU General Public License when using -+# or distributing such scripts, even though portions of the text of the -+# Macro appear in them. The GNU General Public License (GPL) does govern -+# all other use of the material that constitutes the Autoconf Macro. -+# -+# This special exception to the GPL applies to versions of the Autoconf -+# Macro released by the Autoconf Archive. When you make and distribute a -+# modified version of the Autoconf Macro, you may extend this special -+# exception to the GPL to apply to your modified version as well. -+ -+#serial 5 -+ -+AC_DEFUN([AX_CHECK_COMPILE_FLAG], -+[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF -+AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl -+AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [ -+ ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS -+ _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1" -+ AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])], -+ [AS_VAR_SET(CACHEVAR,[yes])], -+ [AS_VAR_SET(CACHEVAR,[no])]) -+ _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags]) -+AS_VAR_IF(CACHEVAR,yes, -+ [m4_default([$2], :)], -+ [m4_default([$3], :)]) -+AS_VAR_POPDEF([CACHEVAR])dnl -+])dnl AX_CHECK_COMPILE_FLAGS diff --git a/meta-networking/recipes-daemons/squid/files/0001-tools.cc-fixed-unused-result-warning.patch b/meta-networking/recipes-daemons/squid/files/0001-tools.cc-fixed-unused-result-warning.patch deleted file mode 100644 index 082a1114b6..0000000000 --- a/meta-networking/recipes-daemons/squid/files/0001-tools.cc-fixed-unused-result-warning.patch +++ /dev/null @@ -1,36 +0,0 @@ -From a78f2f0feda8f92cb59afe8236bd90726908768f Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 25 Jun 2017 00:59:24 -0700 -Subject: [PATCH] tools.cc: fixed unused-result warning - -fix -| ../../squid-3.5.26/src/tools.cc: In function 'void enter_suid()': -| ../../squid-3.5.26/src/tools.cc:616:11: error: ignoring return value of 'int setuid(__uid_t)', declared with attribute warn_unused_result [-Werror=unused-result] -| setuid(0); -| ~~~~~~^~~ - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Submitted - - src/tools.cc | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/tools.cc b/src/tools.cc -index 8137a03..843e266 100644 ---- a/src/tools.cc -+++ b/src/tools.cc -@@ -612,8 +612,8 @@ enter_suid(void) - if (setresuid((uid_t)-1, 0, (uid_t)-1) < 0) - debugs (21, 3, "enter_suid: setresuid failed: " << xstrerror ()); - #else -- -- setuid(0); -+ if (setuid(0) < 0) -+ debugs(50, DBG_IMPORTANT, "WARNING: no_suid: setuid(0): " << xstrerror()); - #endif - #if HAVE_PRCTL && defined(PR_SET_DUMPABLE) - /* Set Linux DUMPABLE flag */ --- -2.13.1 - diff --git a/meta-networking/recipes-daemons/squid/files/0002-squid-make-squid-conf-tests-run-on-target-device.patch b/meta-networking/recipes-daemons/squid/files/0002-squid-make-squid-conf-tests-run-on-target-device.patch new file mode 100644 index 0000000000..ca1c16b83e --- /dev/null +++ b/meta-networking/recipes-daemons/squid/files/0002-squid-make-squid-conf-tests-run-on-target-device.patch @@ -0,0 +1,70 @@ +From cd8bf8a4bf881f84c23a5fc1f48bb716efa51512 Mon Sep 17 00:00:00 2001 +From: Patrick Wicki <patrick.wicki@siemens.com> +Date: Wed, 22 Nov 2023 15:35:44 +0100 +Subject: [PATCH] squid: make squid-conf-tests run on target device + +* Fix paths to allow tests to run outside the original builddir +* Allow the tests to run on read-only root + * Don't overwrite tests with true on success + * Change logfile path to /var/log + +Upstream-Status: Inappropriate [cross compile specific] + +Signed-off-by: Patrick Wicki <patrick.wicki@siemens.com> + +--- + test-suite/Makefile.am | 16 ++++++++-------- + test-suite/test-squid-conf.sh | 2 +- + 2 files changed, 9 insertions(+), 9 deletions(-) + +--- a/test-suite/Makefile.am ++++ b/test-suite/Makefile.am +@@ -21,7 +21,7 @@ LDADD = \ + EXTRA_PROGRAMS = mem_node_test splay + + EXTRA_DIST = \ +- $(srcdir)/squidconf/* \ ++ squidconf/* \ + test-functionality.sh \ + test-sources.sh \ + test-squid-conf.sh \ +@@ -134,21 +134,21 @@ VirtualDeleteOperator_SOURCES = \ + + installcheck-local: squid-conf-tests + +-squid-conf-tests: $(srcdir)/test-squid-conf.sh $(top_builddir)/src/squid.conf.default $(srcdir)/squidconf/* +- @failed=0; cfglist="$(top_builddir)/src/squid.conf.default $(srcdir)/squidconf/*.conf"; rm -f $@ || $(TRUE); \ ++squid-conf-tests: test-squid-conf.sh $(top_builddir)/src/squid.conf.default squidconf/* ++ @failed=0; cfglist="$(top_builddir)/src/squid.conf.default squidconf/*.conf"; rm -f $@ || $(TRUE); \ + for cfg in $$cfglist ; do \ +- $(srcdir)/test-squid-conf.sh $(top_builddir) $(sbindir) $$cfg || \ ++ ./test-squid-conf.sh $(top_builddir) $(sbindir) $$cfg || \ + { echo "FAIL: squid.conf test: $$cfg" | \ + sed s%$(top_builddir)/src/%% | \ +- sed s%$(srcdir)/squidconf/%% ; \ ++ sed s%squidconf/%% ; \ + failed=1; break; \ + }; \ + if test "$$failed" -eq 0; then \ + echo "PASS: squid.conf test: $$cfg" | \ + sed s%$(top_builddir)/src/%% | \ +- sed s%$(srcdir)/squidconf/%% ; \ ++ sed s%squidconf/%% ; \ + else break; fi; \ + done; \ +- if test "$$failed" -eq 0; then cp $(TRUE) $@ ; else exit 1; fi ++ exit "$$failed" + +-CLEANFILES += squid-conf-tests squid-stderr.log ++CLEANFILES += squid-conf-tests /var/log/squid-stderr.log +--- a/test-suite/test-squid-conf.sh ++++ b/test-suite/test-squid-conf.sh +@@ -111,7 +111,7 @@ then + done < $instructionsFile + fi + +-errorLog="squid-stderr.log" ++errorLog="/var/log/squid-stderr.log" + + $sbindir/squid -k parse -f $configFile 2> $errorLog + result=$? diff --git a/meta-networking/recipes-daemons/squid/files/Fix-flawed-dynamic-ldb-link-test-in-configure.patch b/meta-networking/recipes-daemons/squid/files/Fix-flawed-dynamic-ldb-link-test-in-configure.patch deleted file mode 100644 index 2304c5f1dd..0000000000 --- a/meta-networking/recipes-daemons/squid/files/Fix-flawed-dynamic-ldb-link-test-in-configure.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 0d5b337ff5ef7dd48f970f08bd95d6327917cfd1 Mon Sep 17 00:00:00 2001 -Message-Id: <0d5b337ff5ef7dd48f970f08bd95d6327917cfd1.1382375807.git.Jim.Somerville@windriver.com> -From: Jim Somerville <Jim.Somerville@windriver.com> -Date: Mon, 21 Oct 2013 12:50:44 -0400 -Subject: [PATCH 1/1] Fix flawed dynamic -ldb link test in configure - -The test uses dbopen, but just ignores the fact -that this function may not exist in the db version -used. This leads to the dynamic link test failing -and the configure script just making assumptions -about why and setting the need for -ldb incorrectly. - -Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com> ---- - configure.ac | 12 ++++++++++-- - 1 files changed, 10 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 962a748..42e6a93 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3051,8 +3051,16 @@ AC_CHECK_DECL(dbopen,,,[ - #include <db.h> - #endif]) - --dnl 1.85 --SQUID_CHECK_DBOPEN_NEEDS_LIBDB -+if test "x$ac_cv_have_decl_dbopen" = "xyes"; then -+ dnl 1.85 -+ SQUID_CHECK_DBOPEN_NEEDS_LIBDB -+else -+ # dbopen isn't there. So instead of running a compile/link test that -+ # uses it and is thus guaranteed to fail, we just assume that we will -+ # need to link in the db library, rather than fabricate some other -+ # dynamic compile/link test. -+ ac_cv_dbopen_libdb="yes" -+fi - if test "x$ac_cv_dbopen_libdb" = "xyes"; then - LIB_DB="-ldb" - fi --- -1.7.4.1 - diff --git a/meta-networking/recipes-daemons/squid/files/Set-up-for-cross-compilation.patch b/meta-networking/recipes-daemons/squid/files/Set-up-for-cross-compilation.patch index 4ca27444a4..18bc78e6be 100644 --- a/meta-networking/recipes-daemons/squid/files/Set-up-for-cross-compilation.patch +++ b/meta-networking/recipes-daemons/squid/files/Set-up-for-cross-compilation.patch @@ -1,29 +1,28 @@ -From 17e5a28667f667859c48bee25e575a072d39ee1b Mon Sep 17 00:00:00 2001 -Message-Id: <17e5a28667f667859c48bee25e575a072d39ee1b.1381956170.git.Jim.Somerville@windriver.com> +From c0be3192f608037682464bcb728e97f9d9b543aa Mon Sep 17 00:00:00 2001 From: Jim Somerville <Jim.Somerville@windriver.com> Date: Wed, 16 Oct 2013 16:41:03 -0400 -Subject: [PATCH 1/1] Set up for cross compilation +Subject: [PATCH] Set up for cross compilation + +Message-Id: <17e5a28667f667859c48bee25e575a072d39ee1b.1381956170.git.Jim.Somerville@windriver.com> Set the host compiler to BUILD_CXX so proper cross compilation can occur. Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com> + --- - configure.ac | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) +Upstream-Status: Pending + + configure.ac | 1 + + 1 file changed, 1 insertion(+) -diff --git a/configure.ac b/configure.ac -index c2d3033..dda9ed9 100644 --- a/configure.ac +++ b/configure.ac -@@ -19,6 +19,7 @@ m4_include([acinclude/lib-checks.m4]) - m4_include([acinclude/ax_cxx_compile_stdcxx_0x.m4]) - m4_include([acinclude/ax_cxx_0x_types.m4]) +@@ -29,6 +29,7 @@ m4_include([acinclude/tdb.m4]) + m4_include([acinclude/lib-checks.m4]) + m4_include([acinclude/ax_cxx_compile_stdcxx.m4]) +HOSTCXX="$BUILD_CXX" PRESET_CFLAGS="$CFLAGS" PRESET_CXXFLAGS="$CXXFLAGS" PRESET_LDFLAGS="$LDFLAGS" --- -1.7.4.1 - diff --git a/meta-networking/recipes-daemons/squid/files/Skip-AC_RUN_IFELSE-tests.patch b/meta-networking/recipes-daemons/squid/files/Skip-AC_RUN_IFELSE-tests.patch index 7b6dcc820d..e0d002c68c 100644 --- a/meta-networking/recipes-daemons/squid/files/Skip-AC_RUN_IFELSE-tests.patch +++ b/meta-networking/recipes-daemons/squid/files/Skip-AC_RUN_IFELSE-tests.patch @@ -1,3 +1,6 @@ +From 050f8ab275a7a5f3d94045da6b15a2b63dfbeb3f Mon Sep 17 00:00:00 2001 +From: Jim Somerville <Jim.Somerville@windriver.com> +Date: Tue, 14 Oct 2014 02:56:08 -0400 Subject: [PATCH] Skip AC_RUN_IFELSE tests Upstream-Status: Inappropriate [cross compiling specific] @@ -7,16 +10,15 @@ environment. Choose sane defaults. Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com> Signed-off-by: Jackie Huang <jackie.huang@windriver.com> + --- - acinclude/krb5.m4 | 10 +++++++++- - acinclude/lib-checks.m4 | 8 ++++++-- + acinclude/krb5.m4 | 10 +++++++++- + acinclude/lib-checks.m4 | 8 ++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) -diff --git a/acinclude/krb5.m4 b/acinclude/krb5.m4 -index 946bea8..7a072a2 100644 --- a/acinclude/krb5.m4 +++ b/acinclude/krb5.m4 -@@ -82,7 +82,15 @@ main(void) +@@ -57,7 +57,15 @@ main(void) return 0; } @@ -31,34 +33,29 @@ index 946bea8..7a072a2 100644 + dnl Can't test in cross compiled env - so assume good + squid_cv_broken_heimdal_krb5_h=no ]) + SQUID_STATE_ROLLBACK(squid_krb5_heimdal_test) ]) - ]) dnl SQUID_CHECK_KRB5_HEIMDAL_BROKEN_KRB5_H -diff --git a/acinclude/lib-checks.m4 b/acinclude/lib-checks.m4 -index 2bf98ee..50dba9b 100644 --- a/acinclude/lib-checks.m4 +++ b/acinclude/lib-checks.m4 -@@ -128,7 +128,9 @@ AC_DEFUN([SQUID_CHECK_OPENSSL_GETCERTIFICATE_WORKS],[ - AC_DEFINE(SQUID_SSLGETCERTIFICATE_BUGGY, 1) - AC_MSG_RESULT([yes]) +@@ -205,7 +205,9 @@ AC_DEFUN([SQUID_CHECK_OPENSSL_CONST_SSL_ + [ + AC_MSG_RESULT([no]) ], - []) + [ + AC_MSG_RESULT([skipped - can't test in cross-compiled env]) + ]) - AC_MSG_CHECKING(whether the workaround for SSL_get_certificate works) - AC_RUN_IFELSE([ -@@ -154,7 +156,9 @@ AC_DEFUN([SQUID_CHECK_OPENSSL_GETCERTIFICATE_WORKS],[ - [ - AC_MSG_RESULT([no]) - ], --[]) -+[ -+ AC_MSG_RESULT([skipped - can't test in cross-compiled env]) -+]) + SQUID_STATE_ROLLBACK(check_const_SSL_METHOD) + ]) +@@ -347,7 +349,9 @@ AC_DEFUN([SQUID_CHECK_OPENSSL_TXTDB],[ + ],[ + AC_MSG_RESULT([yes]) + AC_DEFINE(SQUID_USE_SSLLHASH_HACK, 1) +- ],[]) ++ ],[ ++ AC_MSG_RESULT([skipped - can't test in cross-compiled env]) ++ ]) - SQUID_STATE_ROLLBACK(check_SSL_get_certificate) + SQUID_STATE_ROLLBACK(check_TXTDB) ]) --- -1.7.1 - diff --git a/meta-networking/recipes-daemons/squid/files/gcc7-fixes.patch b/meta-networking/recipes-daemons/squid/files/gcc7-fixes.patch deleted file mode 100644 index cc1ea78a55..0000000000 --- a/meta-networking/recipes-daemons/squid/files/gcc7-fixes.patch +++ /dev/null @@ -1,17 +0,0 @@ -../../squid-3.5.26/src/DiskIO/DiskThreads/aiops.cc: In function 'void squidaio_init()': ../../squid-3.5.26/src/DiskIO/DiskThreads/DiskThreads.h:30:50: error: '*' in boolean context, suggest '&&' instead [-Werror=int-in-bool-context] #define NUMTHREADS (Config.cacheSwap.n_configured*16) - - -Upstream-Status: Backport -Index: squid-3.5.26/src/DiskIO/DiskThreads/aiops.cc -=================================================================== ---- squid-3.5.26.orig/src/DiskIO/DiskThreads/aiops.cc -+++ squid-3.5.26/src/DiskIO/DiskThreads/aiops.cc -@@ -290,7 +290,7 @@ squidaio_init(void) - /* Create threads and get them to sit in their wait loop */ - squidaio_thread_pool = memPoolCreate("aio_thread", sizeof(squidaio_thread_t)); - -- assert(NUMTHREADS); -+ assert(NUMTHREADS != 0); - - for (i = 0; i < NUMTHREADS; ++i) { - threadp = (squidaio_thread_t *)squidaio_thread_pool->alloc(); diff --git a/meta-networking/recipes-daemons/squid/files/run-ptest b/meta-networking/recipes-daemons/squid/files/run-ptest index de79a293c5..8f8e28f92b 100644 --- a/meta-networking/recipes-daemons/squid/files/run-ptest +++ b/meta-networking/recipes-daemons/squid/files/run-ptest @@ -1,3 +1,4 @@ #!/bin/sh # +make -C test-suite -k squid-conf-tests make -C test-suite -k runtest-TESTS diff --git a/meta-networking/recipes-daemons/squid/files/set_sysroot_patch.patch b/meta-networking/recipes-daemons/squid/files/set_sysroot_patch.patch deleted file mode 100644 index fdcd174d3b..0000000000 --- a/meta-networking/recipes-daemons/squid/files/set_sysroot_patch.patch +++ /dev/null @@ -1,33 +0,0 @@ -Set the SYSROOT for libxml2 header file to avoid host contamination. - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Yue Tao <yue.tao@windriver.com> -Signed-off-by: Yi Zhao <yi.zhao@windriver.com> - -diff --git a/configure.ac.old b/configure.ac -index 54eda73..874f48e 100644 ---- a/configure.ac.old -+++ b/configure.ac -@@ -964,15 +964,15 @@ if test "x$squid_opt_use_esi" = "xyes" -a "x$with_libxml2" != "xno" ; then - dnl Find the main header and include path... - AC_CACHE_CHECK([location of libxml2 include files], [ac_cv_libxml2_include], [ - AC_CHECK_HEADERS([libxml/parser.h], [], [ -- AC_MSG_NOTICE([Testing in /usr/include/libxml2]) -+ AC_MSG_NOTICE([Testing in $SYSROOT/usr/include/libxml2]) - SAVED_CPPFLAGS="$CPPFLAGS" -- CPPFLAGS="-I/usr/include/libxml2 $CPPFLAGS" -+ CPPFLAGS="-I$SYSROOT/usr/include/libxml2 $CPPFLAGS" - unset ac_cv_header_libxml_parser_h -- AC_CHECK_HEADERS([libxml/parser.h], [ac_cv_libxml2_include="-I/usr/include/libxml2"], [ -- AC_MSG_NOTICE([Testing in /usr/local/include/libxml2]) -- CPPFLAGS="-I/usr/local/include/libxml2 $SAVED_CPPFLAGS" -+ AC_CHECK_HEADERS([libxml/parser.h], [ac_cv_libxml2_include="-I$SYSROOT/usr/include/libxml2"], [ -+ AC_MSG_NOTICE([Testing in $SYSROOT/usr/local/include/libxml2]) -+ CPPFLAGS="-I$SYSROOT/usr/local/include/libxml2 $SAVED_CPPFLAGS" - unset ac_cv_header_libxml_parser_h -- AC_CHECK_HEADERS([libxml/parser.h], [ac_cv_libxml2_include="-I/usr/local/include/libxml2"], [ -+ AC_CHECK_HEADERS([libxml/parser.h], [ac_cv_libxml2_include="-I$SYSROOT/usr/local/include/libxml2"], [ - AC_MSG_NOTICE([Failed to find libxml2 header file libxml/parser.h]) - ]) - ]) diff --git a/meta-networking/recipes-daemons/squid/files/squid-don-t-do-squid-conf-tests-at-build-time.patch b/meta-networking/recipes-daemons/squid/files/squid-don-t-do-squid-conf-tests-at-build-time.patch deleted file mode 100644 index 312f44f8eb..0000000000 --- a/meta-networking/recipes-daemons/squid/files/squid-don-t-do-squid-conf-tests-at-build-time.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 54a9c2ba60adc7ec2724786662fd398e7c03999f Mon Sep 17 00:00:00 2001 -From: Jackie Huang <jackie.huang@windriver.com> -Date: Thu, 25 Aug 2016 15:22:57 +0800 -Subject: [PATCH] squid: don't do squid-conf-tests at build time - -* squid-conf-tests is a test to run "squid -k parse -f" - to perse the config files, which should not be run - at build time since we are cross compiling, so remove - it but it will be added back for the runtime ptest. - -* Fix the directories of the conf files for squid-conf-tests - so that it can run on the target board. - -Upstream-Status: Inappropriate [cross compile specific] - -Signed-off-by: Jackie Huang <jackie.huang@windriver.com> ---- - test-suite/Makefile.am | 15 +++++++-------- - 1 file changed, 7 insertions(+), 8 deletions(-) - -diff --git a/test-suite/Makefile.am b/test-suite/Makefile.am -index d5468be..77fc480 100644 ---- a/test-suite/Makefile.am -+++ b/test-suite/Makefile.am -@@ -41,8 +41,7 @@ TESTS += debug \ - MemPoolTest\ - mem_node_test\ - mem_hdr_test\ -- $(ESI_TESTS) \ -- squid-conf-tests -+ $(ESI_TESTS) - - ## Sort by alpha - any build failures are significant. - check_PROGRAMS += debug \ -@@ -125,19 +124,19 @@ VirtualDeleteOperator_SOURCES = VirtualDeleteOperator.cc $(DEBUG_SOURCE) - ##$(TARGLIB): $(LIBOBJS) - ## $(AR_R) $(TARGLIB) $(LIBOBJS) - --squid-conf-tests: $(top_builddir)/src/squid.conf.default $(srcdir)/squidconf/* -+squid-conf-tests: $(sysconfdir)/squid.conf.default squidconf/* - @failed=0; cfglist="$?"; rm -f $@ || $(TRUE); \ - for cfg in $$cfglist ; do \ -- $(top_builddir)/src/squid -k parse -f $$cfg || \ -+ squid -k parse -f $$cfg || \ - { echo "FAIL: squid.conf test: $$cfg" | \ -- sed s%$(top_builddir)/src/%% | \ -- sed s%$(srcdir)/squidconf/%% ; \ -+ sed s%$(sysconfdir)/%% | \ -+ sed s%squidconf/%% ; \ - failed=1; break; \ - }; \ - if test "$$failed" -eq 0; then \ - echo "PASS: squid.conf test: $$cfg" | \ -- sed s%$(top_builddir)/src/%% | \ -- sed s%$(srcdir)/squidconf/%% ; \ -+ sed s%$(sysconfdir)/%% | \ -+ sed s%squidconf/%% ; \ - else break; fi; \ - done; \ - if test "$$failed" -eq 0; then cp $(TRUE) $@ ; fi --- -2.8.3 - diff --git a/meta-networking/recipes-daemons/squid/files/squid-use-serial-tests-config-needed-by-ptest.patch b/meta-networking/recipes-daemons/squid/files/squid-use-serial-tests-config-needed-by-ptest.patch index 01ec596223..5df006038b 100644 --- a/meta-networking/recipes-daemons/squid/files/squid-use-serial-tests-config-needed-by-ptest.patch +++ b/meta-networking/recipes-daemons/squid/files/squid-use-serial-tests-config-needed-by-ptest.patch @@ -1,4 +1,4 @@ -From bd58d3672bc267824000f34a37561c7ab2bd571f Mon Sep 17 00:00:00 2001 +From 3d881c112bba765731d581194aae95651819b715 Mon Sep 17 00:00:00 2001 From: Jackie Huang <jackie.huang@windriver.com> Date: Tue, 19 Jul 2016 01:56:23 -0400 Subject: [PATCH] squid: use serial-tests config needed by ptest @@ -9,23 +9,19 @@ serial-tests is required to generate those targets. Upstream-Status: Inappropriate [default automake behavior incompatible with ptest] Signed-off-by: Jackie Huang <jackie.huang@windriver.com> + --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/configure.ac b/configure.ac -index 05ad027..e324b93 100644 --- a/configure.ac +++ b/configure.ac @@ -10,7 +10,7 @@ AC_PREREQ(2.61) AC_CONFIG_HEADERS([include/autoconf.h]) AC_CONFIG_AUX_DIR(cfgaux) AC_CONFIG_SRCDIR([src/main.cc]) --AM_INIT_AUTOMAKE([tar-ustar nostdinc subdir-objects]) -+AM_INIT_AUTOMAKE([tar-ustar nostdinc subdir-objects serial-tests]) +-AM_INIT_AUTOMAKE([tar-ustar nostdinc subdir-objects dist-xz]) ++AM_INIT_AUTOMAKE([tar-ustar nostdinc subdir-objects dist-xz serial-tests]) AC_REVISION($Revision$)dnl AC_PREFIX_DEFAULT(/usr/local/squid) AM_MAINTAINER_MODE --- -2.8.1 - diff --git a/meta-networking/recipes-daemons/squid/files/squid.nm b/meta-networking/recipes-daemons/squid/files/squid.nm new file mode 100644 index 0000000000..b58ee11bdc --- /dev/null +++ b/meta-networking/recipes-daemons/squid/files/squid.nm @@ -0,0 +1,7 @@ +#!/bin/sh + +case "$2" in + up|down|vpn-up|vpn-down) + systemctl -q reload squid.service || : + ;; +esac diff --git a/meta-networking/recipes-daemons/squid/squid_3.5.26.bb b/meta-networking/recipes-daemons/squid/squid_3.5.26.bb deleted file mode 100644 index 3ee96abb7b..0000000000 --- a/meta-networking/recipes-daemons/squid/squid_3.5.26.bb +++ /dev/null @@ -1,114 +0,0 @@ -SUMMARY = "A fully-featured http proxy and web-cache daemon for Linux" -DESCRIPTION = "A fully-featured http proxy and web-cache daemon for Linux. \ -Squid offers a rich access control, authorization and logging environment to \ -develop web proxy and content serving applications. \ -Squid offers a rich set of traffic optimization options, most of which are \ -enabled by default for simpler installation and high performance. \ -" -HOMEPAGE = "http://www.squid-cache.org" -SECTION = "web" -LICENSE = "GPLv2+" - -MAJ_VER = "${@oe.utils.trim_version("${PV}", 1)}" -MIN_VER = "${@oe.utils.trim_version("${PV}", 2)}" - -SRC_URI = "http://www.squid-cache.org/Versions/v${MAJ_VER}/${MIN_VER}/${BPN}-${PV}.tar.bz2 \ - file://Set-up-for-cross-compilation.patch \ - file://Skip-AC_RUN_IFELSE-tests.patch \ - file://Fix-flawed-dynamic-ldb-link-test-in-configure.patch \ - file://squid-use-serial-tests-config-needed-by-ptest.patch \ - file://run-ptest \ - file://volatiles.03_squid \ - file://set_sysroot_patch.patch \ - file://squid-don-t-do-squid-conf-tests-at-build-time.patch \ - file://0001-SquidNew-use-noexcept-instead-of-throw-for-C-11-comp.patch \ - file://0001-configure-Check-for-Wno-error-format-truncation-comp.patch \ - file://gcc7-fixes.patch \ - file://0001-tools.cc-fixed-unused-result-warning.patch \ - " - -SRC_URI_remove_toolchain-clang = "file://0001-configure-Check-for-Wno-error-format-truncation-comp.patch" - -SRC_URI[md5sum] = "dc1830cd361e077814aa39bcc3691d8b" -SRC_URI[sha256sum] = "41d8845863dcd026c856508cd1599d417c8947ffd96e86e24085f9893cb8b8c2" - -LIC_FILES_CHKSUM = "file://COPYING;md5=c492e2d6d32ec5c1aad0e0609a141ce9 \ - file://errors/COPYRIGHT;md5=8861130fae91400bcf99b66f133172b3 \ - " -DEPENDS = "libtool krb5 openldap db cyrus-sasl openssl expat libxml2" - -inherit autotools pkgconfig useradd ptest perlnative - -USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--system --no-create-home --home-dir /var/run/squid --shell /bin/false --user-group squid" - -PACKAGECONFIG ??= "${@bb.utils.contains('TARGET_ARCH', 'powerpc', 'noatomics', '', d)} \ - ${@bb.utils.contains('TARGET_ARCH', 'mips', 'noatomics', '', d)} \ - ${@bb.utils.contains('TARGET_ARCH', 'mipsel', 'noatomics', '', d)} \ - ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ - " -PACKAGECONFIG[libnetfilter-conntrack] = "--with-netfilter-conntrack=${includedir}, --without-netfilter-conntrack, libnetfilter-conntrack" -PACKAGECONFIG[noatomics] = "squid_cv_gnu_atomics=no,squid_cv_gnu_atomics=yes,," -PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," - -BASIC_AUTH = "DB SASL LDAP" - -DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" -BASIC_AUTH += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'PAM', '', d)}" - -EXTRA_OECONF += "--with-default-user=squid --enable-auth-basic='${BASIC_AUTH}' \ - --sysconfdir=${sysconfdir}/${BPN} \ - --with-logdir=${localstatedir}/log/${BPN} \ - 'PERL=${USRBINPATH}/env perl'" - -export BUILDCXXFLAGS="${BUILD_CXXFLAGS}" - -TESTDIR = "test-suite" - -do_configure_prepend() { - export SYSROOT=$PKG_CONFIG_SYSROOT_DIR -} - -do_compile_ptest() { - oe_runmake -C ${TESTDIR} buildtest-TESTS -} - -do_install_ptest() { - cp -rf ${B}/${TESTDIR} ${D}${PTEST_PATH} - cp -rf ${S}/${TESTDIR} ${D}${PTEST_PATH} - - # do NOT need to rebuild Makefile itself - sed -i 's/^Makefile:.*$/Makefile:/' ${D}${PTEST_PATH}/${TESTDIR}/Makefile - - # Add squid-conf-tests for runtime tests - sed -e 's/^\(runtest-TESTS:\)/\1 squid-conf-tests/' \ - -e "s/\(list=' \$(TESTS)\)/\1 squid-conf-tests/" \ - -i ${D}${PTEST_PATH}/${TESTDIR}/Makefile - - # Ensure the path for command true is correct - sed -i 's:^TRUE = .*$:TRUE = /bin/true:' ${D}${PTEST_PATH}/${TESTDIR}/Makefile -} - -do_install_append() { - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -d ${D}${sysconfdir}/tmpfiles.d - echo "d ${localstatedir}/run/${BPN} 0755 squid squid -" >> ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf - echo "d ${localstatedir}/log/${BPN} 0750 squid squid -" >> ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf - fi - - install -d ${D}${sysconfdir}/default/volatiles - install -m 0644 ${WORKDIR}/volatiles.03_squid ${D}${sysconfdir}/default/volatiles/03_squid - - rmdir "${D}${localstatedir}/run/${BPN}" - rmdir --ignore-fail-on-non-empty "${D}${localstatedir}/run" - - rmdir "${D}${localstatedir}/log/${BPN}" - rmdir --ignore-fail-on-non-empty "${D}${localstatedir}/log" -} - -FILES_${PN} += "${libdir} ${datadir}/errors ${datadir}/icons" -FILES_${PN}-dbg += "/usr/src/debug" -FILES_${PN}-doc += "${datadir}/*.txt" - -RDEPENDS_${PN} += "perl" -RDEPENDS_${PN}-ptest += "make" diff --git a/meta-networking/recipes-daemons/squid/squid_6.9.bb b/meta-networking/recipes-daemons/squid/squid_6.9.bb new file mode 100644 index 0000000000..f670a776eb --- /dev/null +++ b/meta-networking/recipes-daemons/squid/squid_6.9.bb @@ -0,0 +1,148 @@ +SUMMARY = "A fully-featured http proxy and web-cache daemon for Linux" +DESCRIPTION = "A fully-featured http proxy and web-cache daemon for Linux. \ +Squid offers a rich access control, authorization and logging environment to \ +develop web proxy and content serving applications. \ +Squid offers a rich set of traffic optimization options, most of which are \ +enabled by default for simpler installation and high performance. \ +" +HOMEPAGE = "http://www.squid-cache.org" +SECTION = "web" +LICENSE = "GPL-2.0-or-later" + +MAJ_VER = "${@oe.utils.trim_version("${PV}", 1)}" +MIN_VER = "${@oe.utils.trim_version("${PV}", 2)}" + +SRC_URI = "http://www.squid-cache.org/Versions/v${MAJ_VER}/${BPN}-${PV}.tar.xz \ + file://Set-up-for-cross-compilation.patch \ + file://Skip-AC_RUN_IFELSE-tests.patch \ + file://squid-use-serial-tests-config-needed-by-ptest.patch \ + file://run-ptest \ + file://volatiles.03_squid \ + file://0002-squid-make-squid-conf-tests-run-on-target-device.patch \ + file://squid.nm \ + " + +SRC_URI[sha256sum] = "1ad72d46e1cb556e9561214f0fb181adb87c7c47927ef69bc8acd68a03f61882" + +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://errors/COPYRIGHT;md5=d324bc1f9447d1d1588d75b22a678dc4 \ + " +DEPENDS = "libtool" + +inherit autotools pkgconfig useradd ptest perlnative systemd + +LDFLAGS:append:mipsarch = " -latomic" +LDFLAGS:append:powerpc = " -latomic" +LDFLAGS:append:riscv64 = " -latomic" +LDFLAGS:append:riscv32 = " -latomic" + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM:${PN} = "--system --no-create-home --home-dir /var/run/squid --shell /bin/false --user-group squid" + +PACKAGECONFIG ??= "auth url-rewrite-helpers \ + ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ +" + +PACKAGECONFIG[libnetfilter-conntrack] = "--with-netfilter-conntrack=${includedir}, --without-netfilter-conntrack, libnetfilter-conntrack" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," +PACKAGECONFIG[werror] = "--enable-strict-error-checking,--disable-strict-error-checking," +PACKAGECONFIG[esi] = "--enable-esi,--disable-esi,expat libxml2" +PACKAGECONFIG[ssl] = "--with-openssl=yes,--with-openssl=no,openssl" +PACKAGECONFIG[auth] = "--enable-auth-basic='${BASIC_AUTH}',--disable-auth --disable-auth-basic,krb5 openldap db cyrus-sasl" +PACKAGECONFIG[url-rewrite-helpers] = "--enable-url-rewrite-helpers,--disable-url-rewrite-helpers," +PACKAGECONFIG[systemd] = "--with-systemd,--without-systemd,systemd" + +PACKAGES =+ " \ + ${PN}-conf \ + ${PN}-networkmanager \ +" + +BASIC_AUTH = "DB SASL LDAP" + +DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" +BASIC_AUTH += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'PAM', '', d)}" + +EXTRA_OECONF += "--with-default-user=squid \ + --sysconfdir=${sysconfdir}/${BPN} \ + --with-logdir=${localstatedir}/log/${BPN} \ + 'PERL=${USRBINPATH}/env perl'" + +# Workaround a build failure when using a native compiler that need -std=c++17 +# with a cross-compiler that doesn't. +# Upstream issue closed as invalid : https://bugs.squid-cache.org/show_bug.cgi?id=5376 +BUILD_CXXFLAGS += "-std=c++17" + +export BUILDCXXFLAGS="${BUILD_CXXFLAGS}" + +TESTDIR = "test-suite" + +do_configure:prepend() { + export SYSROOT=$PKG_CONFIG_SYSROOT_DIR +} + +do_configure:append() { + sed -i -e 's|${WORKDIR}||g' ${B}/include/autoconf.h +} + +do_compile_ptest() { + oe_runmake -C ${TESTDIR} buildtest-TESTS +} + +do_install_ptest() { + cp -rf ${B}/${TESTDIR} ${D}${PTEST_PATH} + cp -rf ${S}/${TESTDIR} ${D}${PTEST_PATH} + + # Install default config + install -d ${D}${PTEST_PATH}/src + install -m 0644 ${B}/src/squid.conf.default ${D}${PTEST_PATH}/src + + # autoconf.h is needed during squid-conf-tests + install -d ${D}${PTEST_PATH}/include + install -m 0644 ${B}/include/autoconf.h ${D}${PTEST_PATH}/include + + # do NOT need to rebuild Makefile itself + sed -i 's/^Makefile:.*$/Makefile:/' ${D}${PTEST_PATH}/${TESTDIR}/Makefile + + # Ensure the path for command true is correct + sed -i 's:^TRUE = .*$:TRUE = /bin/true:' ${D}${PTEST_PATH}/${TESTDIR}/Makefile +} + +do_install:append() { + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + # Install service unit file + install -d ${D}/${systemd_unitdir}/system + install ${S}/tools/systemd/squid.service ${D}/${systemd_unitdir}/system + sed -i 's:/var/run/:/run/:g' ${D}/${systemd_unitdir}/system/squid.service + + # Configure tmpfiles.d + install -d ${D}${sysconfdir}/tmpfiles.d + echo "d ${localstatedir}/run/${BPN} 0755 squid squid -" >> ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf + echo "d ${localstatedir}/log/${BPN} 0750 squid squid -" >> ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf + fi + + install -d ${D}${sysconfdir}/default/volatiles + install -m 0644 ${UNPACKDIR}/volatiles.03_squid ${D}${sysconfdir}/default/volatiles/03_squid + + rmdir "${D}${localstatedir}/run/${BPN}" + rmdir --ignore-fail-on-non-empty "${D}${localstatedir}/run" + + rmdir "${D}${localstatedir}/log/${BPN}" + rmdir --ignore-fail-on-non-empty "${D}${localstatedir}/log" + + # Install NetworkManager dispatcher reload hooks + install -d ${D}${libdir}/NetworkManager/dispatcher.d + install -m 0755 ${UNPACKDIR}/squid.nm ${D}${libdir}/NetworkManager/dispatcher.d/20-squid +} + +SYSTEMD_AUTO_ENABLE = "disable" +SYSTEMD_SERVICE:${PN} = "squid.service" + +FILES:${PN} += "${libdir} ${datadir}/errors ${datadir}/icons" +FILES:${PN}-dbg += "/usr/src/debug" +FILES:${PN}-doc += "${datadir}/*.txt" +FILES:${PN}-conf += "${sysconfdir}/squid" +FILES:${PN}-networkmanager = "${libdir}/NetworkManager/dispatcher.d" + +RDEPENDS:${PN} += "perl ${PN}-conf" +RDEPENDS:${PN}-ptest += "perl make bash" diff --git a/meta-networking/recipes-daemons/tftp-hpa/files/0001-__progname-is-provided-by-libc.patch b/meta-networking/recipes-daemons/tftp-hpa/files/0001-__progname-is-provided-by-libc.patch index cead977e28..66c15b5f8b 100644 --- a/meta-networking/recipes-daemons/tftp-hpa/files/0001-__progname-is-provided-by-libc.patch +++ b/meta-networking/recipes-daemons/tftp-hpa/files/0001-__progname-is-provided-by-libc.patch @@ -12,6 +12,8 @@ global symbols and work around Debian bug #519006 (Closes: #564052). Signed-off-by: Ron Lee <ron@debian.org> Signed-off-by: H. Peter Anvin <hpa@linux.intel.com> --- +Upstream-Status: Pending + tftpd/tftpd.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meta-networking/recipes-daemons/tftp-hpa/files/0001-tftp-Mark-toplevel-definition-as-external.patch b/meta-networking/recipes-daemons/tftp-hpa/files/0001-tftp-Mark-toplevel-definition-as-external.patch new file mode 100644 index 0000000000..646757c783 --- /dev/null +++ b/meta-networking/recipes-daemons/tftp-hpa/files/0001-tftp-Mark-toplevel-definition-as-external.patch @@ -0,0 +1,30 @@ +From 2a12174a5059e84d4ff6fad8f983a4d0f2127e73 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 12 Aug 2020 12:17:31 -0700 +Subject: [PATCH] tftp: Mark toplevel definition as external + +Fixes +multiple definition of `toplevel'; tftp.o:/usr/src/debug/tftp-hpa/5.2-r0/tftp-hpa-5.2/tftp/tftp.c:51: first defined here + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + tftp/tftp.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tftp/tftp.c b/tftp/tftp.c +index 9d15022..109848c 100644 +--- a/tftp/tftp.c ++++ b/tftp/tftp.c +@@ -48,7 +48,7 @@ extern int maxtimeout; + #define PKTSIZE SEGSIZE+4 + char ackbuf[PKTSIZE]; + int timeout; +-sigjmp_buf toplevel; ++extern sigjmp_buf toplevel; + sigjmp_buf timeoutbuf; + + static void nak(int, const char *); +-- +2.28.0 + diff --git a/meta-networking/recipes-daemons/tftp-hpa/files/0001-tftp-Remove-double-inclusion-of-signal.h.patch b/meta-networking/recipes-daemons/tftp-hpa/files/0001-tftp-Remove-double-inclusion-of-signal.h.patch new file mode 100644 index 0000000000..84658d667b --- /dev/null +++ b/meta-networking/recipes-daemons/tftp-hpa/files/0001-tftp-Remove-double-inclusion-of-signal.h.patch @@ -0,0 +1,39 @@ +From e9ed48d91642d384ce07cbb9bec788f07fc6354c Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 6 Sep 2022 14:51:42 -0700 +Subject: [PATCH] tftp: Remove double inclusion of signal.h + +Undefine __USE_XOPEN2K8 so we can get bsd_signal definition from system +headers + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + config.h | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/config.h b/config.h +index 3ff2915..ae1a14b 100644 +--- a/config.h ++++ b/config.h +@@ -93,7 +93,6 @@ + #endif + + #include <errno.h> +-#include <signal.h> + + #ifdef HAVE_SYS_SOCKET_H + #include <sys/socket.h> +@@ -296,6 +295,9 @@ char *xstrdup(const char *); + + #ifndef HAVE_BSD_SIGNAL + void (*bsd_signal(int, void (*)(int))) (int); ++#else ++#undef __USE_XOPEN2K8 ++#include <signal.h> + #endif + #ifndef HAVE_DUP2 + int dup2(int, int); +-- +2.37.3 + diff --git a/meta-networking/recipes-daemons/tftp-hpa/files/add-error-check-for-disk-filled-up.patch b/meta-networking/recipes-daemons/tftp-hpa/files/add-error-check-for-disk-filled-up.patch index d01c20d385..e4acd099ab 100644 --- a/meta-networking/recipes-daemons/tftp-hpa/files/add-error-check-for-disk-filled-up.patch +++ b/meta-networking/recipes-daemons/tftp-hpa/files/add-error-check-for-disk-filled-up.patch @@ -3,7 +3,7 @@ From: "Roy.Li" <rongqing.li@windriver.com> Date: Thu, 22 Aug 2013 08:56:09 +0800 Subject: [PATCH] tftp-hpa: add error check for disk filled up -Upstream-status: Pending [Sent to http://www.syslinux.org/archives/2013-August/020765.html] +Upstream-Status: Pending [Sent to http://www.syslinux.org/archives/2013-August/020765.html] Add error check when the write-buffer is finally flushed to the file, the caller can detect if the disk filled up (or had an i/o error) and diff --git a/meta-networking/recipes-daemons/tftp-hpa/files/fix-writing-emtpy-file.patch b/meta-networking/recipes-daemons/tftp-hpa/files/fix-writing-emtpy-file.patch index 452aa05f81..4f3dcd7767 100644 --- a/meta-networking/recipes-daemons/tftp-hpa/files/fix-writing-emtpy-file.patch +++ b/meta-networking/recipes-daemons/tftp-hpa/files/fix-writing-emtpy-file.patch @@ -1,6 +1,6 @@ [PATCH] fix the empty file writting -Upstream-Status: pending +Upstream-Status: Pending With the feature that checking the disk filled up, the return value of function write_behind was checked and used to detect diff --git a/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-bug-fix-on-separated-CR-and-LF.patch b/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-bug-fix-on-separated-CR-and-LF.patch index 3e220ec385..e994f28402 100644 --- a/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-bug-fix-on-separated-CR-and-LF.patch +++ b/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-bug-fix-on-separated-CR-and-LF.patch @@ -7,7 +7,7 @@ In ascii mode, if the CR and LF was separated into different transfer blocks, LF will be just dropped instead of replacing the previous CR. Add a checking on the first character to fix it. -Upstream-Status: pending +Upstream-Status: Pending Signed-off-by: Zhang Xiao <xiao.zhang@windriver.com> --- 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 132972b331..b5a2b9dae0 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 @@ -28,6 +28,8 @@ SRC_URI = "http://kernel.org/pub/software/network/tftp/tftp-hpa/tftp-hpa-${PV}.t file://tftp-hpa-bug-fix-on-separated-CR-and-LF.patch \ file://fix-writing-emtpy-file.patch \ file://0001-__progname-is-provided-by-libc.patch \ + file://0001-tftp-Mark-toplevel-definition-as-external.patch \ + file://0001-tftp-Remove-double-inclusion-of-signal.h.patch \ file://tftpd-hpa.socket \ file://tftpd-hpa.service \ " @@ -56,36 +58,41 @@ do_install() { install -m 755 -d ${D}${localstatedir}/lib/tftpboot/ install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/tftpd-hpa + install -m 0755 ${UNPACKDIR}/init ${D}${sysconfdir}/init.d/tftpd-hpa sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/tftpd-hpa sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/tftpd-hpa sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/tftpd-hpa sed -i 's!^PATH=.*!PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}${sysconfdir}/init.d/tftpd-hpa install -d ${D}${sysconfdir}/default - install -m 0644 ${WORKDIR}/default ${D}${sysconfdir}/default/tftpd-hpa + install -m 0644 ${UNPACKDIR}/default ${D}${sysconfdir}/default/tftpd-hpa install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/tftpd-hpa.socket ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/tftpd-hpa.service ${D}${systemd_unitdir}/system + install -m 0644 ${UNPACKDIR}/tftpd-hpa.socket ${D}${systemd_unitdir}/system + install -m 0644 ${UNPACKDIR}/tftpd-hpa.service ${D}${systemd_unitdir}/system sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/tftpd-hpa.service } -FILES_${PN} = "${bindir}" +FILES:${PN} = "${bindir}" PACKAGES += "tftp-hpa-server" -SUMMARY_tftp-hpa-server = "Server for the Trivial File Transfer Protocol" -FILES_tftp-hpa-server = "${sbindir} ${sysconfdir} ${localstatedir}" -CONFFILES_tftp-hpa-server = "${sysconfdir}/default/tftpd-hpa" +SUMMARY:tftp-hpa-server = "Server for the Trivial File Transfer Protocol" +FILES:tftp-hpa-server = "${sbindir} ${sysconfdir} ${localstatedir}" +CONFFILES:tftp-hpa-server = "${sysconfdir}/default/tftpd-hpa" INITSCRIPT_PACKAGES = "tftp-hpa-server" INITSCRIPT_NAME = "tftpd-hpa" INITSCRIPT_PARAMS = "start 20 2 3 4 5 . stop 20 1 ." -ALTERNATIVE_${PN} = "tftp" +ALTERNATIVE:${PN}-doc = "tftpd.8 tftp.1" +ALTERNATIVE_LINK_NAME[tftpd.8] = "${mandir}/man8/tftpd.8" +ALTERNATIVE_LINK_NAME[tftp.1] = "${mandir}/man1/tftp.1" + +ALTERNATIVE:${PN} = "tftp" ALTERNATIVE_TARGET[tftp] = "${bindir}/tftp-hpa" -ALTERNATIVE_PRIORITY = "60" +ALTERNATIVE_PRIORITY = "100" + SYSTEMD_PACKAGES = "tftp-hpa-server" -SYSTEMD_SERVICE_tftp-hpa-server = "tftpd-hpa.socket tftpd-hpa.service" -SYSTEMD_AUTO_ENABLE_tftp-hpa-server = "enable" +SYSTEMD_SERVICE:tftp-hpa-server = "tftpd-hpa.socket tftpd-hpa.service" +SYSTEMD_AUTO_ENABLE:tftp-hpa-server = "enable" diff --git a/meta-networking/recipes-daemons/vblade/files/cross.patch b/meta-networking/recipes-daemons/vblade/files/cross.patch index d2eb156143..f3dc31c93d 100644 --- a/meta-networking/recipes-daemons/vblade/files/cross.patch +++ b/meta-networking/recipes-daemons/vblade/files/cross.patch @@ -8,8 +8,8 @@ diff -urN vblade-19.old//makefile vblade-19//makefile @@ -9,8 +9,6 @@ mandir = ${sharedir}/man - O=aoe.o bpf.o ${PLATFORM}.o ata.o --CFLAGS += -Wall -g -O2 + O=aoe.o bpf.o ${PLATFORM}.o ata.o dat.o +-CFLAGS += -Wall -g -O2 -fno-common -CC = gcc vblade: $O diff --git a/meta-networking/recipes-daemons/vblade/files/makefile-add-ldflags.patch b/meta-networking/recipes-daemons/vblade/files/makefile-add-ldflags.patch index a74452db69..71af47ac73 100644 --- a/meta-networking/recipes-daemons/vblade/files/makefile-add-ldflags.patch +++ b/meta-networking/recipes-daemons/vblade/files/makefile-add-ldflags.patch @@ -9,7 +9,7 @@ index 98008da..c328ba7 100644 --- a/makefile +++ b/makefile @@ -11,7 +11,7 @@ mandir = ${sharedir}/man - O=aoe.o bpf.o ${PLATFORM}.o ata.o + O=aoe.o bpf.o ${PLATFORM}.o ata.o dat.o vblade: $O - ${CC} -o vblade $O diff --git a/meta-networking/recipes-daemons/vblade/vblade_22.bb b/meta-networking/recipes-daemons/vblade/vblade_25.bb index d7b1dfaad3..7f20e927c6 100644 --- a/meta-networking/recipes-daemons/vblade/vblade_22.bb +++ b/meta-networking/recipes-daemons/vblade/vblade_25.bb @@ -1,10 +1,13 @@ SUMMARY = "Virtual EtherDrive blade AoE target" SECTION = "admin" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -SRC_URI = "${SOURCEFORGE_MIRROR}/aoetools/${BP}.tar.gz \ +UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/aoetools/files/vblade/" + +SRCREV = "5f1a0ba8b9815e3f08a3e2635a17f78bbf2a5b10" +SRC_URI = "git://github.com/OpenAoE/vblade;branch=master;protocol=https \ file://cross.patch \ file://makefile-add-ldflags.patch \ file://${BPN}.conf \ @@ -13,8 +16,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/aoetools/${BP}.tar.gz \ file://volatiles.99_vblade \ " -SRC_URI[md5sum] = "510d98ba0f231284a5fbe2da11cb2d6e" -SRC_URI[sha256sum] = "a990378f273f10eb431e42954a871aed52714035bbab28c54cef600c458356bb" +S = "${WORKDIR}/git" + +UPSTREAM_CHECK_URI = "https://github.com/OpenAoE/vblade/archive/" inherit autotools-brokensep update-rc.d systemd @@ -23,22 +27,22 @@ do_install() { install -D -m 0755 ${S}/vbladed ${D}/${sbindir}/vbladed install -D -m 0644 ${S}/vblade.8 ${D}/${mandir}/man8/vblade.8 - install -D -m 0644 ${WORKDIR}/${BPN}.conf ${D}/${sysconfdir}/${BPN}.conf - install -D -m 0755 ${WORKDIR}/${BPN}.init ${D}/${sysconfdir}/init.d/${BPN} + install -D -m 0644 ${UNPACKDIR}/${BPN}.conf ${D}/${sysconfdir}/${BPN}.conf + install -D -m 0755 ${UNPACKDIR}/${BPN}.init ${D}/${sysconfdir}/init.d/${BPN} if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then install -d ${D}/${sysconfdir}/default/volatiles - install -m 0755 ${WORKDIR}/volatiles.99_vblade ${D}/${sysconfdir}/default/volatiles/99_vblade + install -m 0755 ${UNPACKDIR}/volatiles.99_vblade ${D}/${sysconfdir}/default/volatiles/99_vblade fi if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}/${bindir} - install -m 0755 ${WORKDIR}/${BPN}.init ${D}/${bindir}/ + install -m 0755 ${UNPACKDIR}/${BPN}.init ${D}/${bindir}/ install -d ${D}${sysconfdir}/tmpfiles.d echo "d /var/run/${BPN} 0755 root root -" > ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/vblade.service ${D}${systemd_system_unitdir} + install -m 0644 ${UNPACKDIR}/vblade.service ${D}${systemd_system_unitdir} sed -e 's,@BINDIR@,${bindir},g' -i ${D}${systemd_system_unitdir}/*.service fi @@ -47,5 +51,5 @@ do_install() { INITSCRIPT_NAME = "vblade" INITSCRIPT_PARAMS = "start 30 . stop 70 0 1 2 3 4 5 6 ." -SYSTEMD_SERVICE_${PN} = "vblade.service" +SYSTEMD_SERVICE:${PN} = "vblade.service" SYSTEMD_AUTO_ENABLE = "disable" diff --git a/meta-networking/recipes-daemons/vsftpd/files/change-secure_chroot_dir.patch b/meta-networking/recipes-daemons/vsftpd/files/change-secure_chroot_dir.patch index 5f2860e846..b69de1d1c3 100644 --- a/meta-networking/recipes-daemons/vsftpd/files/change-secure_chroot_dir.patch +++ b/meta-networking/recipes-daemons/vsftpd/files/change-secure_chroot_dir.patch @@ -1,20 +1,25 @@ -vsftpd: change default value of secure_chroot_dir +From ce2be5d4967445828d5ae9d9462cfaa78ae03c73 Mon Sep 17 00:00:00 2001 +From: Ming Liu <ming.liu@windriver.com> +Date: Wed, 18 Sep 2013 09:44:20 +0800 +Subject: [PATCH] vsftpd: change default value of secure_chroot_dir Upstream-Status: Pending Change secure_chroot_dir pointing to a volatile directory. Signed-off-by: Ming Liu <ming.liu@windriver.com> + --- - INSTALL | 6 +++--- - tunables.c | 2 +- - vsftpd.conf.5 | 2 +- + INSTALL | 6 +++--- + tunables.c | 2 +- + vsftpd.conf.5 | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) -diff -urpN a/INSTALL b/INSTALL ---- a/INSTALL 2013-09-13 10:23:57.504972397 +0800 -+++ b/INSTALL 2013-09-13 10:25:25.664971779 +0800 -@@ -27,11 +27,11 @@ user in case it does not already exist. +diff --git a/INSTALL b/INSTALL +index 4f811aa..427122a 100644 +--- a/INSTALL ++++ b/INSTALL +@@ -27,11 +27,11 @@ user in case it does not already exist. e.g.: [root@localhost root]# useradd nobody useradd: user nobody exists @@ -29,9 +34,10 @@ diff -urpN a/INSTALL b/INSTALL 2c) For anonymous FTP, you will need the user "ftp" to exist, and have a valid home directory (which is NOT owned or writable by the user "ftp"). -diff -urpN a/tunables.c b/tunables.c ---- a/tunables.c 2013-09-13 10:26:29.554972817 +0800 -+++ b/tunables.c 2013-09-13 10:27:18.104972210 +0800 +diff --git a/tunables.c b/tunables.c +index 284a10d..8c63c3f 100644 +--- a/tunables.c ++++ b/tunables.c @@ -254,7 +254,7 @@ tunables_load_defaults() /* -rw------- */ tunable_chown_upload_mode = 0600; @@ -41,10 +47,11 @@ diff -urpN a/tunables.c b/tunables.c install_str_setting("ftp", &tunable_ftp_username); install_str_setting("root", &tunable_chown_username); install_str_setting("/var/log/xferlog", &tunable_xferlog_file); -diff -urpN a/vsftpd.conf.5 b/vsftpd.conf.5 ---- a/vsftpd.conf.5 2013-09-13 10:09:33.774972462 +0800 -+++ b/vsftpd.conf.5 2013-09-13 10:10:41.914971989 +0800 -@@ -969,7 +969,7 @@ This option should be the name of a dire +diff --git a/vsftpd.conf.5 b/vsftpd.conf.5 +index fcc6022..e4ffdee 100644 +--- a/vsftpd.conf.5 ++++ b/vsftpd.conf.5 +@@ -969,7 +969,7 @@ This option should be the name of a directory which is empty. Also, the directory should not be writable by the ftp user. This directory is used as a secure chroot() jail at times vsftpd does not require filesystem access. diff --git a/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/0001-vsftpd-allow-sysinfo-in-the-seccomp-sandbox.patch b/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/0001-vsftpd-allow-sysinfo-in-the-seccomp-sandbox.patch deleted file mode 100644 index 7accbbc241..0000000000 --- a/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/0001-vsftpd-allow-sysinfo-in-the-seccomp-sandbox.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 37cc924363515c8c309944c455bcbba7ddcc8eda Mon Sep 17 00:00:00 2001 -From: Mingli Yu <Mingli.Yu@windriver.com> -Date: Tue, 6 Sep 2016 17:17:44 +0800 -Subject: [PATCH] vsftpd: allow sysinfo() in the seccomp sandbox - -Upstream-Status: Pending - -* Allow sysinfo() in the seccomp sandbox otherwise - comes below OOPS: priv_sock_get_cmd as the syscall - sysinfo() not allowed - -tnftp 192.168.1.1 -Connected to 192.168.1.1. -220 (vsFTPd 3.0.3) -Name (192.168.1.1:root): anonymous -331 Please specify the password. -Password: -230 Login successful. -Remote system type is UNIX. -Using binary mode to transfer files. -ftp> prompt -Interactive mode off. -ftp> mget small* -OOPS: priv_sock_get_cmd - -Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> ---- - seccompsandbox.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/seccompsandbox.c b/seccompsandbox.c -index 2c350a9..67d9ca5 100644 ---- a/seccompsandbox.c -+++ b/seccompsandbox.c -@@ -409,6 +409,7 @@ seccomp_sandbox_setup_postlogin(const struct vsf_session* p_sess) - allow_nr(__NR_getcwd); - allow_nr(__NR_chdir); - allow_nr(__NR_getdents); -+ allow_nr(__NR_sysinfo); - /* Misc */ - allow_nr(__NR_umask); - --- -2.8.1 - diff --git a/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/makefile-libs.patch b/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/makefile-libs.patch deleted file mode 100644 index 9a10f722f4..0000000000 --- a/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/makefile-libs.patch +++ /dev/null @@ -1,21 +0,0 @@ -Hardcode LIBS instead of using a script to determine available libs - -We want to avoid this dynamic detection so we have a deterministic -build. - -Upstream-Status: Inappropriate [config] - -Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> - -diff --git a/Makefile b/Makefile ---- a/Makefile -+++ b/Makefile -@@ -5,7 +5,7 @@ - #CFLAGS = -g - CFLAGS = -O2 -Wall -W -Wshadow #-pedantic -Werror -Wconversion - --LIBS = `./vsf_findlibs.sh` -+LIBS = -lssl -lcrypto -lnsl -lresolv - LINK = -Wl,-s - - OBJS = main.o utility.o prelogin.o ftpcmdio.o postlogin.o privsock.o \ diff --git a/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/nopam-with-tcp_wrappers.patch b/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/nopam-with-tcp_wrappers.patch deleted file mode 100644 index fdcf3a02b6..0000000000 --- a/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/nopam-with-tcp_wrappers.patch +++ /dev/null @@ -1,17 +0,0 @@ -Disable PAM - -Upstream-Status: Inappropriate [config] - -Signed-off-by: Roy.Li <rongqing.li@windriver.com> -diff -ur vsftpd-2.0.1_org/builddefs.h vsftpd-2.0.1_patch/builddefs.h ---- vsftpd-2.0.1_org/builddefs.h 2004-07-02 16:36:59.000000000 +0200 -+++ vsftpd-2.0.1_patch/builddefs.h 2004-07-21 09:34:49.044900488 +0200 -@@ -2,7 +2,7 @@ - #define VSF_BUILDDEFS_H - - #define VSF_BUILD_TCPWRAPPERS --#define VSF_BUILD_PAM -+#undef VSF_BUILD_PAM - #undef VSF_BUILD_SSL - - #endif /* VSF_BUILDDEFS_H */ diff --git a/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/0001-sysdeputil.c-Fix-with-musl-which-does-not-have-utmpx.patch b/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.5/0001-sysdeputil.c-Fix-with-musl-which-does-not-have-utmpx.patch index c3919e1174..6c68989d3b 100644 --- a/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/0001-sysdeputil.c-Fix-with-musl-which-does-not-have-utmpx.patch +++ b/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.5/0001-sysdeputil.c-Fix-with-musl-which-does-not-have-utmpx.patch @@ -1,10 +1,13 @@ -From e55135c2a4ea7eae3cb1f4dccf69ca477ea095bf Mon Sep 17 00:00:00 2001 +From c5caf52b9ed79da8916ef5722efe6df61a856e2f Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Tue, 28 Mar 2017 20:09:12 -0700 Subject: [PATCH] sysdeputil.c: Fix with musl which does not have utmpx Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- +Upstream-Status: Pending + sysdeputil.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) @@ -23,6 +26,3 @@ index 06f01f4..a8cff3b 100644 #define __USE_GNU #include <utmpx.h> --- -2.12.1 - diff --git a/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/makefile-destdir.patch b/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.5/makefile-destdir.patch index 1980d09fd4..5ad5c14e7a 100644 --- a/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/makefile-destdir.patch +++ b/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.5/makefile-destdir.patch @@ -1,14 +1,22 @@ -Use DESTDIR within install to allow installing under a prefix +From bab3f62f1fd5b7c2ab197f4311ad191bf18816b9 Mon Sep 17 00:00:00 2001 +From: Paul Eggleton <paul.eggleton@linux.intel.com> +Date: Mon, 20 Feb 2012 13:51:49 +0000 +Subject: [PATCH] Use DESTDIR within install to allow installing under a prefix Upstream-Status: Pending Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> +--- + Makefile | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) + diff --git a/Makefile b/Makefile +index c63ed1b..9e4f35f 100644 --- a/Makefile +++ b/Makefile -@@ -24,21 +24,21 @@ - $(CC) -o vsftpd $(OBJS) $(LINK) $(LIBS) +@@ -29,21 +29,21 @@ vsftpd: $(OBJS) + $(CC) -o vsftpd $(OBJS) $(LINK) $(LDFLAGS) $(LIBS) install: - if [ -x /usr/local/sbin ]; then \ diff --git a/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.5/makefile-libs.patch b/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.5/makefile-libs.patch new file mode 100644 index 0000000000..d2e58a3254 --- /dev/null +++ b/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.5/makefile-libs.patch @@ -0,0 +1,30 @@ +From 328799d0cd5c523ad7a814fefec16d8a84aa8010 Mon Sep 17 00:00:00 2001 +From: Paul Eggleton <paul.eggleton@linux.intel.com> +Date: Tue, 16 Apr 2013 10:53:55 +0000 +Subject: [PATCH] Hardcode LIBS instead of using a script to determine + available libs + +We want to avoid this dynamic detection so we have a deterministic +build. + +Upstream-Status: Inappropriate [config] + +Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> + +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 9e4f35f..3a5535d 100644 +--- a/Makefile ++++ b/Makefile +@@ -8,7 +8,7 @@ CFLAGS = -O2 -fPIE -fstack-protector --param=ssp-buffer-size=4 \ + -D_FORTIFY_SOURCE=2 \ + #-pedantic -Wconversion + +-LIBS = `./vsf_findlibs.sh` ++LIBS = -lssl -lcrypto -lnsl -lresolv + LINK = -Wl,-s + LDFLAGS = -fPIE -pie -Wl,-z,relro -Wl,-z,now + diff --git a/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/makefile-strip.patch b/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.5/makefile-strip.patch index fd3160037f..e596073887 100644 --- a/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/makefile-strip.patch +++ b/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.5/makefile-strip.patch @@ -1,10 +1,18 @@ -Disable stripping at link time +From 261874ea47973ea156141185082252fc92081906 Mon Sep 17 00:00:00 2001 +From: Paul Eggleton <paul.eggleton@linux.intel.com> +Date: Tue, 16 Apr 2013 10:53:55 +0000 +Subject: [PATCH] Disable stripping at link time Upstream-Status: Inappropriate [config] Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> +--- + Makefile | 1 - + 1 file changed, 1 deletion(-) + diff --git a/Makefile b/Makefile +index 3a5535d..e78019a 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,6 @@ CFLAGS = -O2 -fPIE -fstack-protector --param=ssp-buffer-size=4 \ diff --git a/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.5/nopam-with-tcp_wrappers.patch b/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.5/nopam-with-tcp_wrappers.patch new file mode 100644 index 0000000000..a4387c132b --- /dev/null +++ b/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.5/nopam-with-tcp_wrappers.patch @@ -0,0 +1,26 @@ +From 71628ddc91b6efb9b922a3fcf8cc18522f5387be Mon Sep 17 00:00:00 2001 +From: "Roy.Li" <rongqing.li@windriver.com> +Date: Mon, 20 Feb 2012 13:51:49 +0000 +Subject: [PATCH] Disable PAM + +Upstream-Status: Inappropriate [config] + +Signed-off-by: Roy.Li <rongqing.li@windriver.com> + +--- + builddefs.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/builddefs.h b/builddefs.h +index 0106d1a..f48a568 100644 +--- a/builddefs.h ++++ b/builddefs.h +@@ -2,7 +2,7 @@ + #define VSF_BUILDDEFS_H + + #define VSF_BUILD_TCPWRAPPERS +-#define VSF_BUILD_PAM ++#undef VSF_BUILD_PAM + #undef VSF_BUILD_SSL + + #endif /* VSF_BUILDDEFS_H */ diff --git a/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/nopam.patch b/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.5/nopam.patch index cf0d68e272..cf0d68e272 100644 --- a/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/nopam.patch +++ b/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.5/nopam.patch diff --git a/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/vsftpd-2.1.0-filter.patch b/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.5/vsftpd-2.1.0-filter.patch index 32f7e82183..590eb58579 100644 --- a/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/vsftpd-2.1.0-filter.patch +++ b/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.5/vsftpd-2.1.0-filter.patch @@ -1,4 +1,7 @@ -Fix the CVE-2015-1419 +From b756444854c5ab3b1284fd7113043fe8860e99ec Mon Sep 17 00:00:00 2001 +From: Roy Li <rongqing.li@windriver.com> +Date: Fri, 24 Apr 2015 09:36:48 +0800 +Subject: [PATCH] Fix the CVE-2015-1419 Upstream-Status: Pending @@ -9,10 +12,17 @@ ftp://195.220.108.108/linux/fedora/linux/development/rawhide/source/SRPMS/v/vsft Signed-off-by: Roy Li <rongqing.li@windriver.com> -diff -up vsftpd-2.1.0/ls.c.filter vsftpd-2.1.0/ls.c ---- vsftpd-2.1.0/ls.c.filter 2008-02-02 02:30:41.000000000 +0100 -+++ vsftpd-2.1.0/ls.c 2009-01-08 19:31:15.000000000 +0100 -@@ -239,9 +239,31 @@ vsf_filename_passes_filter(const struct +--- + ls.c | 26 ++++++++++++++++++++++++-- + str.c | 11 +++++++++++ + str.h | 1 + + 3 files changed, 36 insertions(+), 2 deletions(-) + +diff --git a/ls.c b/ls.c +index 7e1376d..e9302dd 100644 +--- a/ls.c ++++ b/ls.c +@@ -246,9 +246,31 @@ vsf_filename_passes_filter(const struct mystr* p_filename_str, int ret = 0; char last_token = 0; int must_match_at_current_pos = 1; @@ -46,10 +56,11 @@ diff -up vsftpd-2.1.0/ls.c.filter vsftpd-2.1.0/ls.c while (!str_isempty(&filter_remain_str) && *iters < VSFTP_MATCHITERS_MAX) { static struct mystr s_match_needed_str; -diff -up vsftpd-2.1.0/str.c.filter vsftpd-2.1.0/str.c ---- vsftpd-2.1.0/str.c.filter 2008-12-17 06:54:16.000000000 +0100 -+++ vsftpd-2.1.0/str.c 2009-01-08 19:31:15.000000000 +0100 -@@ -680,3 +680,14 @@ str_replace_unprintable(struct mystr* p_ +diff --git a/str.c b/str.c +index 6596204..ba4b92a 100644 +--- a/str.c ++++ b/str.c +@@ -711,3 +711,14 @@ str_replace_unprintable(struct mystr* p_str, char new_char) } } @@ -64,10 +75,11 @@ diff -up vsftpd-2.1.0/str.c.filter vsftpd-2.1.0/str.c + if (str_isempty(d_str)) + str_copy (d_str, path); +} -diff -up vsftpd-2.1.0/str.h.filter vsftpd-2.1.0/str.h ---- vsftpd-2.1.0/str.h.filter 2008-12-17 06:53:23.000000000 +0100 -+++ vsftpd-2.1.0/str.h 2009-01-08 19:32:14.000000000 +0100 -@@ -100,6 +100,7 @@ void str_replace_unprintable(struct myst +diff --git a/str.h b/str.h +index ab0a9a4..3a21b50 100644 +--- a/str.h ++++ b/str.h +@@ -100,6 +100,7 @@ void str_replace_unprintable(struct mystr* p_str, char new_char); int str_atoi(const struct mystr* p_str); filesize_t str_a_to_filesize_t(const struct mystr* p_str); unsigned int str_octal_to_uint(const struct mystr* p_str); diff --git a/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/vsftpd-tcp_wrappers-support.patch b/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.5/vsftpd-tcp_wrappers-support.patch index 69745b3a10..c558aee0aa 100644 --- a/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/vsftpd-tcp_wrappers-support.patch +++ b/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.5/vsftpd-tcp_wrappers-support.patch @@ -1,11 +1,15 @@ -Enable tcp_wrapper. +From c026b0c0de4eebb189bc77b2d4c3b9528454ac04 Mon Sep 17 00:00:00 2001 +From: "Roy.Li" <rongqing.li@windriver.com> +Date: Fri, 19 Jul 2013 10:19:25 +0800 +Subject: [PATCH] Enable tcp_wrapper. Upstream-Status: Inappropriate [configuration] Signed-off-by: Roy.Li <rongqing.li@windriver.com> + --- - builddefs.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + builddefs.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builddefs.h b/builddefs.h index e908352..0106d1a 100644 @@ -20,6 +24,3 @@ index e908352..0106d1a 100644 #define VSF_BUILD_PAM #undef VSF_BUILD_SSL --- -1.7.1 - diff --git a/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb b/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.5.bb index 7a20356018..4a843bd800 100644 --- a/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb +++ b/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.5.bb @@ -1,7 +1,7 @@ SUMMARY = "Very Secure FTP server" HOMEPAGE = "https://security.appspot.com/vsftpd.html" SECTION = "net" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=a6067ad950b28336613aed9dd47b1271" DEPENDS = "libcap openssl" @@ -18,33 +18,34 @@ SRC_URI = "https://security.appspot.com/downloads/vsftpd-${PV}.tar.gz \ file://volatiles.99_vsftpd \ file://vsftpd.service \ file://vsftpd-2.1.0-filter.patch \ - file://0001-vsftpd-allow-sysinfo-in-the-seccomp-sandbox.patch \ ${@bb.utils.contains('PACKAGECONFIG', 'tcp-wrappers', 'file://vsftpd-tcp_wrappers-support.patch', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '', '${NOPAM_SRC}', d)} \ file://0001-sysdeputil.c-Fix-with-musl-which-does-not-have-utmpx.patch \ " +UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/v/vsftpd/" +UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.orig\.tar" + LIC_FILES_CHKSUM = "file://COPYING;md5=a6067ad950b28336613aed9dd47b1271 \ file://COPYRIGHT;md5=04251b2eb0f298dae376d92454f6f72e \ file://LICENSE;md5=654df2042d44b8cac8a5654fc5be63eb" -SRC_URI[md5sum] = "da119d084bd3f98664636ea05b5bb398" -SRC_URI[sha256sum] = "9d4d2bf6e6e2884852ba4e69e157a2cecd68c5a7635d66a3a8cf8d898c955ef7" +SRC_URI[sha256sum] = "26b602ae454b0ba6d99ef44a09b6b9e0dfa7f67228106736df1f278c70bc91d3" PACKAGECONFIG ??= "tcp-wrappers" PACKAGECONFIG[tcp-wrappers] = ",,tcp-wrappers" DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" -RDEPENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-listfile', '', d)}" +RDEPENDS:${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-listfile', '', d)}" PAMLIB = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '-L${STAGING_BASELIBDIR} -lpam', '', d)}" WRAPLIB = "${@bb.utils.contains('PACKAGECONFIG', 'tcp-wrappers', '-lwrap', '', d)}" NOPAM_SRC ="${@bb.utils.contains('PACKAGECONFIG', 'tcp-wrappers', 'file://nopam-with-tcp_wrappers.patch', 'file://nopam.patch', d)}" inherit update-rc.d useradd systemd -CONFFILES_${PN} = "${sysconfdir}/vsftpd.conf" -LDFLAGS_append =" -lcrypt -lcap" - +CONFFILES:${PN} = "${sysconfdir}/vsftpd.conf" +LDFLAGS:append =" -lcrypt -lcap" +CFLAGS:append:libc-musl = " -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -include fcntl.h" EXTRA_OEMAKE = "-e MAKEFLAGS=" do_configure() { @@ -64,14 +65,14 @@ do_install() { install -d ${D}${mandir}/man5 oe_runmake 'DESTDIR=${D}' install install -d ${D}${sysconfdir} - install -m 600 ${WORKDIR}/vsftpd.conf ${D}${sysconfdir}/vsftpd.conf + install -m 600 ${UNPACKDIR}/vsftpd.conf ${D}${sysconfdir}/vsftpd.conf install -d ${D}${sysconfdir}/init.d/ - install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/vsftpd + install -m 755 ${UNPACKDIR}/init ${D}${sysconfdir}/init.d/vsftpd install -d ${D}/${sysconfdir}/default/volatiles - install -m 644 ${WORKDIR}/volatiles.99_vsftpd ${D}/${sysconfdir}/default/volatiles/99_vsftpd + install -m 644 ${UNPACKDIR}/volatiles.99_vsftpd ${D}/${sysconfdir}/default/volatiles/99_vsftpd - install -m 600 ${WORKDIR}/vsftpd.ftpusers ${D}${sysconfdir}/ - install -m 600 ${WORKDIR}/vsftpd.user_list ${D}${sysconfdir}/ + install -m 600 ${UNPACKDIR}/vsftpd.ftpusers ${D}${sysconfdir}/ + install -m 600 ${UNPACKDIR}/vsftpd.user_list ${D}${sysconfdir}/ if ! test -z "${PAMLIB}" ; then install -d ${D}${sysconfdir}/pam.d/ cp ${S}/RedHat/vsftpd.pam ${D}${sysconfdir}/pam.d/vsftpd @@ -86,22 +87,22 @@ do_install() { # Install systemd unit files install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/vsftpd.service ${D}${systemd_unitdir}/system + install -m 0644 ${UNPACKDIR}/vsftpd.service ${D}${systemd_unitdir}/system sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/vsftpd.service } INITSCRIPT_PACKAGES = "${PN}" -INITSCRIPT_NAME_${PN} = "vsftpd" -INITSCRIPT_PARAMS_${PN} = "defaults 80" +INITSCRIPT_NAME:${PN} = "vsftpd" +INITSCRIPT_PARAMS:${PN} = "defaults 80" USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--system --home-dir /var/lib/ftp --no-create-home -g ftp \ +USERADD_PARAM:${PN} = "--system --home-dir /var/lib/ftp --no-create-home -g ftp \ --shell /bin/false ftp " -GROUPADD_PARAM_${PN} = "-r ftp" +GROUPADD_PARAM:${PN} = "-r ftp" -SYSTEMD_SERVICE_${PN} = "vsftpd.service" +SYSTEMD_SERVICE:${PN} = "vsftpd.service" -pkg_postinst_${PN}() { +pkg_postinst:${PN}() { if [ -z "$D" ]; then if type systemd-tmpfiles >/dev/null; then systemd-tmpfiles --create diff --git a/meta-networking/recipes-devtools/libcoap/libcoap/CVE-2024-0962.patch b/meta-networking/recipes-devtools/libcoap/libcoap/CVE-2024-0962.patch new file mode 100644 index 0000000000..add52483b7 --- /dev/null +++ b/meta-networking/recipes-devtools/libcoap/libcoap/CVE-2024-0962.patch @@ -0,0 +1,45 @@ +From bf6a303883bde40cf96b960c8574cddd89e71701 Mon Sep 17 00:00:00 2001 +From: Jon Shallow <supjps-libcoap@jpshallow.com> +Date: Thu, 25 Jan 2024 18:03:17 +0000 +Subject: [PATCH] coap_oscore.c: Fix parsing OSCORE configuration information + +A vulnerability was found in obgm libcoap 4.3.4. It has been rated as critical. +Affected by this issue is the function get_split_entry of the file src/coap_oscore.c of the component Configuration File Handler. +The manipulation leads to stack-based buffer overflow. + +CVE: CVE-2024-0962 + +Upstream-Status: Backport [https://github.com/obgm/libcoap/pull/1311] + +Signed-off-by: alperak <alperyasinak1@gmail.com> +--- + src/coap_oscore.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/coap_oscore.c b/src/coap_oscore.c +index 83f785c92..e0fb22947 100644 +--- a/src/coap_oscore.c ++++ b/src/coap_oscore.c +@@ -1678,11 +1678,12 @@ get_split_entry(const char **start, + oscore_value_t *value) { + const char *begin = *start; + const char *end; ++ const char *kend; + const char *split; + size_t i; + + retry: +- end = memchr(begin, '\n', size); ++ kend = end = memchr(begin, '\n', size); + if (end == NULL) + return 0; + +@@ -1693,7 +1694,7 @@ get_split_entry(const char **start, + + if (begin[0] == '#' || (end - begin) == 0) { + /* Skip comment / blank line */ +- size -= end - begin + 1; ++ size -= kend - begin + 1; + begin = *start; + goto retry; + } diff --git a/meta-networking/recipes-devtools/libcoap/libcoap/run-ptest b/meta-networking/recipes-devtools/libcoap/libcoap/run-ptest new file mode 100644 index 0000000000..b56ffe68f3 --- /dev/null +++ b/meta-networking/recipes-devtools/libcoap/libcoap/run-ptest @@ -0,0 +1,7 @@ +#!/bin/sh + +if /usr/lib/libcoap/ptest/testdriver; then + echo "PASS: libcoap" +else + echo "FAIL: libcoap" +fi diff --git a/meta-networking/recipes-devtools/libcoap/libcoap_4.3.4.bb b/meta-networking/recipes-devtools/libcoap/libcoap_4.3.4.bb new file mode 100644 index 0000000000..2f5d192a77 --- /dev/null +++ b/meta-networking/recipes-devtools/libcoap/libcoap_4.3.4.bb @@ -0,0 +1,63 @@ +SUMMARY = "A C implementation of the Constrained Application Protocol" +DESCRIPTION = "libcoap implements a lightweight application-protocol for \ +devices that are constrained their resources such as computing power, \ +RF range, memory, bandwith, or network packet sizes." +HOMEPAGE ="https://libcoap.net/" + +LICENSE = "BSD-2-Clause & BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1978dbc41673ab1c20e64b287c8317bc" + +SRC_URI = "git://github.com/obgm/libcoap.git;branch=main;protocol=https \ + file://run-ptest \ + file://CVE-2024-0962.patch \ + " +SRCREV = "5fd2f89ef068214130e5d60b7087ef48711fa615" + +S = "${WORKDIR}/git" + +inherit autotools manpages pkgconfig ptest + +DEPENDS += "ctags-native" + +PACKAGECONFIG ?= "\ + async openssl tcp \ + ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \ +" +PACKAGECONFIG[async] = "--enable-async,--disable-async" +PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls,,,openssl mbedtls" +PACKAGECONFIG[manpages] = "--enable-documentation --enable-doxygen --enable-manpages,--disable-documentation,asciidoc-native doxygen-native graphviz-native" +PACKAGECONFIG[mbedtls] = "--with-mbedtls,--without-mbedtls,mbedtls,,,gnutls openssl" +PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl,,,gnutls mbedtls" +PACKAGECONFIG[small-stack] = "--enable-small-stack,--disable-small-stack" +PACKAGECONFIG[tcp] = "--enable-tcp,--disable-tcp" +PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,cunit" + +EXTRA_OECONF = "\ + --with-epoll --enable-add-default-names \ + --without-tinydtls --without-submodule-tinydtls \ + ${@bb.utils.contains_any('PACKAGECONFIG', 'gnutls openssl mbedtls', '--enable-dtls', '--disable-dtls', d)} \ +" + +python () { + if d.getVar('PTEST_ENABLED') == "1": + d.setVar('DISABLE_STATIC', '') +} + +export SGML_CATALOG_FILES="file://${STAGING_ETCDIR_NATIVE}/xml/catalog" + +do_compile:prepend() { + oe_runmake update-map-file +} + +do_install_ptest () { + install -d ${D}${PTEST_PATH} + install -m 0755 ${UNPACKDIR}/run-ptest ${D}${PTEST_PATH}/run-ptest + install -m 0755 ${B}/tests/testdriver ${D}${PTEST_PATH}/testdriver +} + +PACKAGE_BEFORE_PN += "\ + ${PN}-bin \ +" + +FILES:${PN}-bin = "${bindir}" +FILES:${PN}-dev += "${datadir}/${BPN}/examples" diff --git a/meta-networking/recipes-devtools/perl/libauthen/libauthen-radius-perl/run-ptest b/meta-networking/recipes-devtools/perl/libauthen/libauthen-radius-perl/run-ptest deleted file mode 100644 index f1c833e6ca..0000000000 --- a/meta-networking/recipes-devtools/perl/libauthen/libauthen-radius-perl/run-ptest +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh -# - -# prepare testing config -CONF_USERS=`readlink -f /etc/raddb/users` -mv ${CONF_USERS} ${CONF_USERS}_orig -echo "testing Cleartext-Password := \"testpassword\"" > ${CONF_USERS} -cat ${CONF_USERS}_orig >> ${CONF_USERS} - -# restart radiusd server -systemctl restart radiusd || /etc/init.d/radiusd restart || { - echo "FAIL: Start radiusd service." - exit 1 -} - -# run teests -perl test.pl - -# restore the config and restart -mv ${CONF_USERS}_orig ${CONF_USERS} -systemctl restart radiusd || /etc/init.d/radiusd restart diff --git a/meta-networking/recipes-devtools/perl/libauthen/libauthen-radius-perl/test.pl-adjust-for-ptest.patch b/meta-networking/recipes-devtools/perl/libauthen/libauthen-radius-perl/test.pl-adjust-for-ptest.patch deleted file mode 100644 index 9798af497c..0000000000 --- a/meta-networking/recipes-devtools/perl/libauthen/libauthen-radius-perl/test.pl-adjust-for-ptest.patch +++ /dev/null @@ -1,90 +0,0 @@ -From 829302792bf0e4935d29efc23ca1f2e9e7ee7dfd Mon Sep 17 00:00:00 2001 -From: Jackie Huang <jackie.huang@windriver.com> -Date: Thu, 7 Jan 2016 03:12:38 -0500 -Subject: [PATCH] test.pl: adjust for ptest - -* Don't use interactive inputs, set default test - settings instead. -* Change the test results output to the ptest format - -Upstream-Status: Inappropriate [OE ptest specific] - -Signed-off-by: Jackie Huang <jackie.huang@windriver.com> ---- - test.pl | 31 ++++++++++++++++++------------- - 1 file changed, 18 insertions(+), 13 deletions(-) - -diff --git a/test.pl b/test.pl -index cfd1c1e..9b4f10e 100644 ---- a/test.pl -+++ b/test.pl -@@ -7,11 +7,11 @@ - # Change 1..1 below to 1..last_test_to_print . - # (It may become useful if the test is moved to ./t subdirectory.) - --BEGIN {print "1..5\n";} --END {print "not ok 1\n" unless $loaded;} -+BEGIN {print "Start testing for libauthen-radius-perl\n";} -+END {print "\nFAIL: test1\n" unless $loaded;} - use Authen::Radius; - $loaded = 1; --print "ok 1\n"; -+print "\nPASS: test1\n"; - - ######################### End of black magic. - -@@ -19,26 +19,31 @@ print "ok 1\n"; - # (correspondingly "not ok 13") depending on the success of chunk 13 - # of the test code): - -+$host = "127.0.0.1"; -+$secret = "testing123"; -+$user = "testing"; -+$pwd = "testpassword"; -+ - print "Make sure this machine is in your Radius clients file!\n"; --print "Enter hostname[:port] of your Radius server: "; chomp ($host = <STDIN>); --print "Enter shared-secret of your Radius server: "; chomp ($secret = <STDIN>); --print "Enter a username to be validated: "; chomp ($user = <STDIN>); --print "Enter this user's password: "; chomp ($pwd = <STDIN>); -+print "hostname of your Radius server: $host\n"; -+print "shared-secret of your Radius server: $secret\n"; -+print "The username to be validated: $user\n"; -+print "The user's password: $pwd\n"; - - $t = 2; - if ($host ne '') { - $r = new Authen::Radius(Host => $host, Secret => $secret, Debug => 1); -- print defined($r) ? "" : "not ", "ok $t\n"; $t++; -+ print defined($r) ? "\nPASS: test$t\n" : "\nFAIL: test$t\n"; $t++; - #Authen::Radius->load_dictionary; -- print $r->check_pwd($user, $pwd) ? "" : "not ", "ok $t\n"; $t++; -+ print $r->check_pwd($user, $pwd) ? "\nPASS: test$t\n" : "\nFAIL: test$t\n"; $t++; - @a = $r->get_attributes; -- print $#a != -1 ? "" : "not ", "ok $t\n"; $t++; -+ print $#a != -1 ? "\nPASS: test$t\n" : "\nFAIL: test$t\n"; $t++; - #for $a (@a) { - # print "attr: name=$a->{'Name'} value=$a->{'Value'}\n"; - #} - } else { - foreach my $t (2..4) { -- print "skipped $t\n"; -+ print "\nSKIP test$t\n"; - } - } - -@@ -53,9 +58,9 @@ my $data = "what do ya want for nothing?"; - my $etalon_digest = hex_to_ascii("750c783e6ab0b503eaa86e310a5db738"); - my $digest = Authen::Radius::hmac_md5(undef, $data, $key); - if ($etalon_digest eq $digest) { -- print "ok 5\n"; -+ print "\nPASS: test5\n"; - } else { -- print "not ok 5\n"; -+ print "\nFAIL: test5\n"; - } - - exit; --- -1.9.1 - diff --git a/meta-networking/recipes-devtools/perl/libauthen/libauthen-radius-perl_0.22.bb b/meta-networking/recipes-devtools/perl/libauthen/libauthen-radius-perl_0.22.bb deleted file mode 100644 index ea5bb1b0c9..0000000000 --- a/meta-networking/recipes-devtools/perl/libauthen/libauthen-radius-perl_0.22.bb +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "Authen::Radius - provide simple Radius client facilities" -DESCRIPTION = "The Authen::Radius module provides a simple class that \ - allows you to send/receive Radius requests/responses to/from a \ - Radius server. \ -" - -HOMEPAGE = "http://search.cpan.org/~manowar/RadiusPerl" -SECTION = "libs" - -LICENSE = "Artistic-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=78ab6ea0cba1f1ec1680ebb149e3bc11" - -DEPENDS = "perl" - -SRC_URI = "http://search.cpan.org/CPAN/authors/id/M/MA/MANOWAR/RadiusPerl-${PV}.tar.gz \ - file://test.pl-adjust-for-ptest.patch \ - file://run-ptest \ -" -SRC_URI[md5sum] = "d1fe2d6ecf7ea99299e4e3a8f945aad8" -SRC_URI[sha256sum] = "3b276506986ccaa4949d92b13ce053a0017ad11562a991cc753364923fe81ca7" - -S = "${WORKDIR}/Authen-Radius-${PV}" - -inherit cpan ptest - -do_install_ptest() { - install -m 0755 ${S}/test.pl ${D}${PTEST_PATH} -} - -RDEPENDS_${PN} += "\ - libdata-hexdump-perl \ - perl-module-digest-md5 \ - perl-module-data-dumper \ - perl-module-io-select \ - perl-module-io-socket \ -" -RDEPENDS_${PN}-ptest += "${PN} freeradius" - -BBCLASSEXTEND = "native" diff --git a/meta-networking/recipes-devtools/python/python-ldap_2.4.41.bb b/meta-networking/recipes-devtools/python/python-ldap_2.4.41.bb deleted file mode 100644 index 3dbc8b13e5..0000000000 --- a/meta-networking/recipes-devtools/python/python-ldap_2.4.41.bb +++ /dev/null @@ -1,29 +0,0 @@ -# -# Copyright (C) 2012 Wind River Systems, Inc. -# -SUMMARY = "Provides a wrapper in Python to LDAP" -DESCRIPTION = "This module provides access to the LDAP \ -(Lightweight Directory Access Protocol) through Python operations \ -instead of C API. The module mainly acts as a wrapper for the \ -OpenLDAP 2.x libraries. Errors will appear as exceptions." - -LICENSE = "PSF" -HOMEPAGE = "http://www.python-ldap.org/" -DEPENDS = "python openldap cyrus-sasl" - -PYPI_PACKAGE = "python-ldap" -inherit pypi setuptools - -LIC_FILES_CHKSUM = "file://LICENCE;md5=a41c82edffa04912007cae1d20cac555" -SRC_URI[md5sum] = "18db2d009150ec1864710fea3ed76173" -SRC_URI[sha256sum] = "6d430ecf040f2fc704ee316d3390cb1f5419c191371e1e131baef54a0e42cef0" - -do_configure_prepend() { - sed -i -e 's:^library_dirs =.*::' setup.cfg - sed -i -e 's:^include_dirs =.*:include_dirs = =/usr/include/sasl/:' setup.cfg -} - -RDEPENDS_${PN} = " \ - ${PYTHON_PN}-pprint \ - ${PYTHON_PN}-threading \ -" diff --git a/meta-networking/recipes-devtools/python/python3-scapy/run-ptest b/meta-networking/recipes-devtools/python/python3-scapy/run-ptest new file mode 100644 index 0000000000..417e21053c --- /dev/null +++ b/meta-networking/recipes-devtools/python/python3-scapy/run-ptest @@ -0,0 +1,4 @@ +#!/bin/sh +python3 UTscapy.py -t regression.uts -f text -l -C \ + -o @PTEST_PATH@/scapy_ptest_$(date +%Y%m%d-%H%M%S).log \ + 2>&1 | sed -e 's/^passed None/PASS:/' -e 's/^failed None/FAIL:/' diff --git a/meta-networking/recipes-devtools/python/python3-scapy_2.5.0.bb b/meta-networking/recipes-devtools/python/python3-scapy_2.5.0.bb new file mode 100644 index 0000000000..d57cb977e4 --- /dev/null +++ b/meta-networking/recipes-devtools/python/python3-scapy_2.5.0.bb @@ -0,0 +1,44 @@ +SUMMARY = "Network scanning and manipulation tool" +DESCRIPTION = "Scapy is a powerful interactive packet manipulation program. \ +It is able to forge or decode packets of a wide number of protocols, send \ +them on the wire, capture them, match requests and replies, and much more. \ +It can easily handle most classical tasks like scanning, tracerouting, probing, \ +unit tests, attacks or network discovery (it can replace hping, 85% of nmap, \ +arpspoof, arp-sk, arping, tcpdump, tethereal, p0f, etc.). It also performs very \ +well at a lot of other specific tasks that most other tools can't handle, like \ +sending invalid frames, injecting your own 802.11 frames, combining technics \ +(VLAN hopping+ARP cache poisoning, VOIP decoding on WEP encrypted channel, ...), etc." +SECTION = "security" +LICENSE = "GPL-2.0-only" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +# If you want ptest support, use the git repo +# UTscapy does not exist in the pypi pkg +# +SRCREV = "0474c37bf1d147c969173d52ab3ac76d2404d981" +SRC_URI = "git://github.com/secdev/scapy.git;branch=master;protocol=https \ + file://run-ptest" + +S = "${WORKDIR}/git" + +UPSTREAM_CHECK_COMMITS = "1" + +inherit setuptools3 ptest + +do_install:append() { + mv ${D}${bindir}/scapy ${D}${bindir}/scapy3 +} + +do_install_ptest() { + install -m 0644 ${S}/scapy/tools/UTscapy.py ${D}${PTEST_PATH} + install -m 0644 ${S}/test/regression.uts ${D}${PTEST_PATH} + sed -i 's,@PTEST_PATH@,${PTEST_PATH},' ${D}${PTEST_PATH}/run-ptest +} + +RDEPENDS:${PN} = "tcpdump python3-compression python3-cryptography python3-netclient \ + python3-netserver python3-pydoc python3-pkgutil python3-shell \ + python3-threading python3-numbers python3-fcntl python3-logging \ + python3-difflib" +RDEPENDS:${PN}-ptest += "python3-json python3-mock python3-multiprocessing \ + iproute2 tshark" diff --git a/meta-networking/recipes-extended/corosync/corosync/corosync.conf b/meta-networking/recipes-extended/corosync/corosync/corosync.conf new file mode 100644 index 0000000000..744a30ff55 --- /dev/null +++ b/meta-networking/recipes-extended/corosync/corosync/corosync.conf @@ -0,0 +1,61 @@ +# Please read the corosync.conf.5 manual page +totem { + version: 2 + + # Set name of the cluster + cluster_name: testCluster + + # crypto_cipher and crypto_hash: Used for mutual node authentication. + # If you choose to enable this, then do remember to create a shared + # secret with "corosync-keygen". + # enabling crypto_cipher, requires also enabling of crypto_hash. + # crypto works only with knet transport + crypto_cipher: none + crypto_hash: none +} + +logging { + # Log the source file and line where messages are being + # generated. When in doubt, leave off. Potentially useful for + # debugging. + fileline: off + # Log to standard error. When in doubt, set to yes. Useful when + # running in the foreground (when invoking "corosync -f") + to_stderr: yes + # Log to a log file. When set to "no", the "logfile" option + # must not be set. + to_logfile: yes + logfile: /var/log/cluster/corosync.log + # Log to the system log daemon. When in doubt, set to yes. + to_syslog: yes + # Log debug messages (very verbose). When in doubt, leave off. + debug: off + # Log messages with time stamps. When in doubt, set to hires (or on) + #timestamp: hires + logger_subsys { + subsys: QUORUM + debug: off + } +} + +quorum { + # Enable and configure quorum subsystem (default: off) + # see also corosync.conf.5 and votequorum.5 + provider: corosync_votequorum +} + +nodelist { + # Change/uncomment/add node sections to match cluster configuration + + node { + # Hostname of the node + name: node1 + # Cluster membership node identifier + nodeid: 1 + # Address of first link + ring0_addr: 127.0.0.1 + # When knet transport is used it's possible to define up to 8 links + #ring1_addr: 192.168.1.1 + } + # ... +} diff --git a/meta-networking/recipes-extended/corosync/corosync_2.4.3.bb b/meta-networking/recipes-extended/corosync/corosync_2.4.3.bb deleted file mode 100644 index 9673fa362e..0000000000 --- a/meta-networking/recipes-extended/corosync/corosync_2.4.3.bb +++ /dev/null @@ -1,79 +0,0 @@ -SUMMARY = "The Corosync Cluster Engine and Application Programming Interfaces" -DESCRIPTION = "This package contains the Corosync Cluster Engine Executive, several default \ -APIs and libraries, default configuration files, and an init script." -HOMEPAGE = "http://corosync.github.io/corosync/" - -SECTION = "base" - -inherit autotools pkgconfig systemd useradd - -SRC_URI = "http://build.clusterlabs.org/corosync/releases/${BP}.tar.gz" - -SRC_URI[md5sum] = "bf0ede13018aadc8a046183bc593b0e0" -SRC_URI[sha256sum] = "b1e7e422e8d2f7af8e5315fa329b1dbd1175fff32efaa55e8054584c80a2c597" - -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d" - -DEPENDS = "groff-native nss libqb" - -SYSTEMD_SERVICE_${PN} = "corosync.service corosync-notifyd.service \ - ${@bb.utils.contains('PACKAGECONFIG', 'qdevice', 'corosync-qdevice.service', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'qnetd', 'corosync-qnetd.service', '', d)} \ -" -SYSTEMD_AUTO_ENABLE = "disable" - -INITSCRIPT_NAME = "corosync-daemon" - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ - dbus qdevice qnetd snmp \ -" - -PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus" -PACKAGECONFIG[qdevice] = "--enable-qdevices,--disable-qdevices" -PACKAGECONFIG[qnetd] = "--enable-qnetd,--disable-qnetd" -PACKAGECONFIG[rdma] = "--enable-rdma,--disable-rdma" -PACKAGECONFIG[snmp] = "--enable-snmp,--disable-snmp,net-snmp" -PACKAGECONFIG[systemd] = "--enable-systemd --with-systemddir=${systemd_system_unitdir},--disable-systemd --without-systemddir,systemd" - -EXTRA_OECONF = "ac_cv_path_BASHPATH=${base_bindir}/bash ap_cv_cc_pie=no" -EXTRA_OEMAKE = "tmpfilesdir_DATA=" - -do_configure_prepend() { - ( cd ${S} - ${S}/autogen.sh ) -} - -do_install_append() { - install -d ${D}${sysconfdir}/sysconfig/ - install -m 0644 ${S}/init/corosync.sysconfig.example ${D}${sysconfdir}/sysconfig/corosync - install -m 0644 ${S}/tools/corosync-notifyd.sysconfig.example ${D}${sysconfdir}/sysconfig/corosync-notifyd - - rm -rf "${D}${localstatedir}/run" - - install -d ${D}${sysconfdir}/default/volatiles - echo "d root root 0755 ${localstatedir}/log/cluster none" > ${D}${sysconfdir}/default/volatiles/05_corosync - - if [ ${@bb.utils.filter('PACKAGECONFIG', 'qnetd', d)} ]; then - chown -R coroqnetd:coroqnetd ${D}${sysconfdir}/${BPN}/qnetd - echo "d coroqnetd coroqnetd 0770 /var/run/corosync-qnetd none" >> ${D}${sysconfdir}/default/volatiles/05_corosync - fi - - if [ ${@bb.utils.filter('DISTRO_FEATURES','systemd',d)} ]; then - install -d ${D}${sysconfdir}/tmpfiles.d - echo "d ${localstatedir}/log/cluster - - - -" > ${D}${sysconfdir}/tmpfiles.d/corosync.conf - - if [ ${@bb.utils.filter('PACKAGECONFIG', 'qnetd', d)} ]; then - install -m 0644 ${S}/conf/tmpfiles.d/corosync-qnetd.conf ${D}${sysconfdir}/tmpfiles.d - fi - fi -} - -RDEPENDS_${PN} += "bash ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'sysvinit-pidof', 'procps', d)}" - -FILES_${PN}-dbg += "${libexecdir}/lcrso/.debug" -FILES_${PN}-doc += "${datadir}/snmp/mibs/COROSYNC-MIB.txt" - -USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "--system coroqnetd" -USERADD_PARAM_${PN} = "--system -d / -M -s /bin/nologin -c 'User for corosync-qnetd' -g coroqnetd coroqnetd" diff --git a/meta-networking/recipes-extended/corosync/corosync_3.1.6.bb b/meta-networking/recipes-extended/corosync/corosync_3.1.6.bb new file mode 100644 index 0000000000..cbbbbc70cd --- /dev/null +++ b/meta-networking/recipes-extended/corosync/corosync_3.1.6.bb @@ -0,0 +1,63 @@ +SUMMARY = "The Corosync Cluster Engine and Application Programming Interfaces" +DESCRIPTION = "This package contains the Corosync Cluster Engine Executive, several default \ +APIs and libraries, default configuration files, and an init script." +HOMEPAGE = "http://corosync.github.io/corosync/" + +SECTION = "base" + +inherit autotools pkgconfig systemd + +SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.gz \ + file://corosync.conf \ + " +SRC_URI[sha256sum] = "ca6ed32b4d7f33ed614afce8760fe58d0de92c68b575d4969ebacd892f3d1e27" +UPSTREAM_CHECK_REGEX = "(?P<pver>\d+\.(?!99)\d+(\.\d+)+)" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d" + +DEPENDS = "groff-native nss libqb kronosnet" + +SYSTEMD_SERVICE:${PN} = "corosync.service corosync-notifyd.service" +SYSTEMD_AUTO_ENABLE = "disable" + +INITSCRIPT_NAME = "corosync-daemon" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + dbus snmp \ +" + +PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus" +PACKAGECONFIG[snmp] = "--enable-snmp,--disable-snmp,net-snmp" +PACKAGECONFIG[systemd] = "--enable-systemd --with-systemddir=${systemd_system_unitdir},--disable-systemd --without-systemddir,systemd" + +EXTRA_OECONF = "ac_cv_path_BASHPATH=${base_bindir}/bash ap_cv_cc_pie=no" +EXTRA_OEMAKE = "tmpfilesdir_DATA=" + +#do_configure:prepend() { +# ( cd ${S} +# ${S}/autogen.sh ) +#} + +do_install:append() { + install -D -m 0644 ${UNPACKDIR}/corosync.conf ${D}${sysconfdir}/corosync/corosync.conf.example + install -d ${D}${sysconfdir}/sysconfig/ + install -m 0644 ${S}/init/corosync.sysconfig.example ${D}${sysconfdir}/sysconfig/corosync + install -m 0644 ${S}/tools/corosync-notifyd.sysconfig.example ${D}${sysconfdir}/sysconfig/corosync-notifyd + + rmdir ${D}${localstatedir}/log/cluster ${D}${localstatedir}/log + rmdir --ignore-fail-on-non-empty ${D}${localstatedir} + + install -d ${D}${sysconfdir}/default/volatiles + echo "d root root 0755 ${localstatedir}/log/cluster none" > ${D}${sysconfdir}/default/volatiles/05_corosync + + if [ ${@bb.utils.filter('DISTRO_FEATURES','systemd',d)} ]; then + install -d ${D}${sysconfdir}/tmpfiles.d + echo "d ${localstatedir}/log/cluster - - - -" > ${D}${sysconfdir}/tmpfiles.d/corosync.conf + fi +} + +RDEPENDS:${PN} += "bash ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'sysvinit-pidof', 'procps', d)}" + +FILES:${PN}-dbg += "${libexecdir}/lcrso/.debug" +FILES:${PN}-doc += "${datadir}/snmp/mibs/COROSYNC-MIB.txt" diff --git a/meta-networking/recipes-extended/dlm/dlm/0001-Disable-annobin-plugin.patch b/meta-networking/recipes-extended/dlm/dlm/0001-Disable-annobin-plugin.patch new file mode 100644 index 0000000000..6302829267 --- /dev/null +++ b/meta-networking/recipes-extended/dlm/dlm/0001-Disable-annobin-plugin.patch @@ -0,0 +1,31 @@ +From 5a0799d0bacc0cf93e15febdac7d8c50b21e7234 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 15 Jul 2023 13:13:12 -0700 +Subject: [PATCH] Disable annobin plugin + +OE gcc does not build this plugin, moreover there are non gcc compilers +which can be used with OE as well e.g. clang which might not have it +either + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + dlm_controld/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/dlm_controld/Makefile b/dlm_controld/Makefile +index 8802d88..0380ec9 100644 +--- a/dlm_controld/Makefile ++++ b/dlm_controld/Makefile +@@ -47,7 +47,7 @@ CFLAGS += -D_GNU_SOURCE -O2 -ggdb \ + + BIN_CFLAGS += $(CFLAGS) -fPIE -DPIE + BIN_CFLAGS += -I../include -I../libdlm +-LIB_CFLAGS += $(CFLAGS) -fPIC -fplugin=annobin ++LIB_CFLAGS += $(CFLAGS) -fPIC + + BIN_LDFLAGS += $(LDFLAGS) -Wl,-z,relro -Wl,-z,now -pie + BIN_LDFLAGS += -lpthread -lrt -lcpg -lcmap -lcfg -lquorum -luuid +-- +2.41.0 + diff --git a/meta-networking/recipes-extended/dlm/dlm/0001-Include-sys-sysmacros.h-for-major-minor-macros-in-gl.patch b/meta-networking/recipes-extended/dlm/dlm/0001-Include-sys-sysmacros.h-for-major-minor-macros-in-gl.patch new file mode 100644 index 0000000000..6f9a0a45a3 --- /dev/null +++ b/meta-networking/recipes-extended/dlm/dlm/0001-Include-sys-sysmacros.h-for-major-minor-macros-in-gl.patch @@ -0,0 +1,41 @@ +From a55ab8a07770296bf6a622df14f2f0445be16327 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 19 Aug 2018 15:58:49 -0700 +Subject: [PATCH] Include sys/sysmacros.h for major/minor macros in glibc 2.25+ + +sys/sysmacros.h was included though sys/types.h until 2.28 +glibc release removed it therefore it must be included +explicitly now. + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + dlm_controld/action.c | 2 ++ + libdlm/libdlm.c | 1 + + 2 files changed, 3 insertions(+) + +diff --git a/dlm_controld/action.c b/dlm_controld/action.c +index 84637f1..2b8ad6c 100644 +--- a/dlm_controld/action.c ++++ b/dlm_controld/action.c +@@ -8,6 +8,8 @@ + + #include "dlm_daemon.h" + ++#include <sys/sysmacros.h> ++ + #include <corosync/corotypes.h> + #include <corosync/cmap.h> + +diff --git a/libdlm/libdlm.c b/libdlm/libdlm.c +index a9e6195..499eb6a 100644 +--- a/libdlm/libdlm.c ++++ b/libdlm/libdlm.c +@@ -14,6 +14,7 @@ + #include <sys/ioctl.h> + #include <sys/param.h> + #include <sys/stat.h> ++#include <sys/sysmacros.h> + #include <stdint.h> + #include <stdlib.h> + #include <inttypes.h> diff --git a/meta-networking/recipes-extended/dlm/dlm/0001-Remove-fcf-protection-full.patch b/meta-networking/recipes-extended/dlm/dlm/0001-Remove-fcf-protection-full.patch new file mode 100644 index 0000000000..6290aa4c7a --- /dev/null +++ b/meta-networking/recipes-extended/dlm/dlm/0001-Remove-fcf-protection-full.patch @@ -0,0 +1,64 @@ +From e4ae70ae71f88d48cf1ab63810c9f7b4177af3a5 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 15 Jul 2023 19:05:54 -0700 +Subject: [PATCH] Remove -fcf-protection=full + +This option is not available on all architectures e.g. RISC-V +Fixes +| cc1: error: '-fcf-protection=full' is not supported for this target + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + dlm_controld/Makefile | 1 - + dlm_tool/Makefile | 1 - + fence/Makefile | 1 - + libdlm/Makefile | 4 ++-- + 4 files changed, 2 insertions(+), 5 deletions(-) + +--- a/dlm_controld/Makefile ++++ b/dlm_controld/Makefile +@@ -43,7 +43,7 @@ CFLAGS += -D_GNU_SOURCE -O2 -ggdb \ + -Wno-sign-compare -Wno-unused-parameter -Wp,-D_FORTIFY_SOURCE=2 \ + -fexceptions -fasynchronous-unwind-tables -fdiagnostics-show-option \ + -Wp,-D_GLIBCXX_ASSERTIONS -fstack-protector-strong \ +- -fstack-clash-protection -fcf-protection=full ++ -fstack-clash-protection + + BIN_CFLAGS += $(CFLAGS) -fPIE -DPIE + BIN_CFLAGS += -I../include -I../libdlm +--- a/dlm_tool/Makefile ++++ b/dlm_tool/Makefile +@@ -15,7 +15,7 @@ CFLAGS += -D_GNU_SOURCE -O2 -ggdb \ + -Wno-sign-compare -Wno-unused-parameter -Wp,-D_FORTIFY_SOURCE=2 \ + -fexceptions -fasynchronous-unwind-tables -fdiagnostics-show-option \ + -Wp,-D_GLIBCXX_ASSERTIONS -fstack-protector-strong \ +- -fstack-clash-protection -fcf-protection=full ++ -fstack-clash-protection + + CFLAGS += -fPIE -DPIE + CFLAGS += -I../include -I../libdlm -I../dlm_controld +--- a/fence/Makefile ++++ b/fence/Makefile +@@ -15,7 +15,7 @@ CFLAGS += -D_GNU_SOURCE -O2 -ggdb \ + -Wno-sign-compare -Wno-unused-parameter -Wp,-D_FORTIFY_SOURCE=2 \ + -fexceptions -fasynchronous-unwind-tables -fdiagnostics-show-option \ + -Wp,-D_GLIBCXX_ASSERTIONS -fstack-protector-strong \ +- -fstack-clash-protection -fcf-protection=full ++ -fstack-clash-protection + + CFLAGS += -fPIE -DPIE + CFLAGS += -I../include +--- a/libdlm/Makefile ++++ b/libdlm/Makefile +@@ -80,8 +80,8 @@ CFLAGS += -D_GNU_SOURCE -O2 -ggdb \ + -fdiagnostics-show-option \ + -fPIC + +-LIB_CFLAGS += $(CFLAGS) -D_REENTRANT -fcf-protection=full +-LLT_CFLAGS += $(CFLAGS) -fcf-protection=full ++LIB_CFLAGS += $(CFLAGS) -D_REENTRANT ++LLT_CFLAGS += $(CFLAGS) + + LIB_LDFLAGS += $(LDFLAGS) -lpthread -Wl,-z,now + LLT_LDFLAGS += $(LDFLAGS) -Wl,-z,now diff --git a/meta-networking/recipes-extended/dlm/dlm/0001-dlm_controld-remove-unnecessary-header-include.patch b/meta-networking/recipes-extended/dlm/dlm/0001-dlm_controld-remove-unnecessary-header-include.patch new file mode 100644 index 0000000000..55efcea184 --- /dev/null +++ b/meta-networking/recipes-extended/dlm/dlm/0001-dlm_controld-remove-unnecessary-header-include.patch @@ -0,0 +1,35 @@ +From 4c40289eb9e47cfd272a8cc402fd2ddb29e2a3dc Mon Sep 17 00:00:00 2001 +From: Alexander Aring <aahringo@redhat.com> +Date: Wed, 24 May 2023 13:50:59 +0000 +Subject: [PATCH] dlm_controld: remove unnecessary header include + +The timewarn netlink functionality got dropped and will be removed by +kernel v6.4. The user space part was already dropped by commit 34ea31e7 +("controld: remove timewarn handling"). This is just a left over of this +commit. Recent builds fails now because the UAPI header in the Linux +kernel was removed. This means older dlm sources cannot be build with +newer kernel-headers, however it is not recommended to use older dlm +sources and all existing users should upgrade anyway. + +Upstream-Status: Backport [https://pagure.io/dlm/c/ddbba6608896f81bfce8f8edf3d0f507714cfc43?branch=main] +Reported-by: Fabio M. Di Nitto <fdinitto@redhat.com> +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + dlm_controld/main.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/dlm_controld/main.c b/dlm_controld/main.c +index 7cf6348..e70e96a 100644 +--- a/dlm_controld/main.c ++++ b/dlm_controld/main.c +@@ -12,7 +12,6 @@ + #include <pthread.h> + #include <linux/netlink.h> + #include <linux/genetlink.h> +-#include <linux/dlm_netlink.h> + #include <uuid/uuid.h> + + #ifdef USE_SD_NOTIFY +-- +2.41.0 + diff --git a/meta-networking/recipes-extended/dlm/dlm/0001-make-Replace-cp-a-with-mode-preserving-options.patch b/meta-networking/recipes-extended/dlm/dlm/0001-make-Replace-cp-a-with-mode-preserving-options.patch new file mode 100644 index 0000000000..e6a37579ed --- /dev/null +++ b/meta-networking/recipes-extended/dlm/dlm/0001-make-Replace-cp-a-with-mode-preserving-options.patch @@ -0,0 +1,51 @@ +From 2f72f9271b8dd61ca5092e025b0f8243c6fd68f2 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 3 Mar 2020 12:38:19 -0800 +Subject: [PATCH] make: Replace cp -a with mode preserving options + +Helps fix permissions in staging area + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + dlm_controld/Makefile | 4 ++-- + libdlm/Makefile | 8 ++++---- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/dlm_controld/Makefile b/dlm_controld/Makefile +index 6081cf8..fe71be2 100644 +--- a/dlm_controld/Makefile ++++ b/dlm_controld/Makefile +@@ -88,8 +88,8 @@ install: all + $(INSTALL) -d $(DESTDIR)/$(PKGDIR) + $(INSTALL) -m 755 $(BIN_TARGET) $(DESTDIR)/$(BINDIR) + $(INSTALL) -m 755 $(LIB_TARGET) $(DESTDIR)/$(LIBDIR) +- cp -a $(LIB_SO) $(DESTDIR)/$(LIBDIR) +- cp -a $(LIB_SMAJOR) $(DESTDIR)/$(LIBDIR) ++ cp -R --no-dereference --preserve=mode,links $(LIB_SO) $(DESTDIR)/$(LIBDIR) ++ cp -R --no-dereference --preserve=mode,links $(LIB_SMAJOR) $(DESTDIR)/$(LIBDIR) + $(INSTALL) -m 644 $(LIB_PC) $(DESTDIR)/$(PKGDIR) + $(INSTALL) -m 644 libdlmcontrol.h $(DESTDIR)/$(HDRDIR) + $(INSTALL) -m 644 dlm_controld.8 $(DESTDIR)/$(MANDIR)/man8/ +diff --git a/libdlm/Makefile b/libdlm/Makefile +index ab32761..8820bf8 100644 +--- a/libdlm/Makefile ++++ b/libdlm/Makefile +@@ -125,10 +125,10 @@ install: all + $(INSTALL) -d $(DESTDIR)/$(UDEVDIR) + $(INSTALL) -c -m 755 $(LIB_TARGET) $(DESTDIR)/$(LIBDIR) + $(INSTALL) -c -m 755 $(LLT_TARGET) $(DESTDIR)/$(LIBDIR) +- cp -a $(LIB_SO) $(DESTDIR)/$(LIBDIR) +- cp -a $(LIB_SMAJOR) $(DESTDIR)/$(LIBDIR) +- cp -a $(LLT_SO) $(DESTDIR)/$(LIBDIR) +- cp -a $(LLT_SMAJOR) $(DESTDIR)/$(LIBDIR) ++ cp -R --no-dereference --preserve=mode,links $(LIB_SO) $(DESTDIR)/$(LIBDIR) ++ cp -R --no-dereference --preserve=mode,links $(LIB_SMAJOR) $(DESTDIR)/$(LIBDIR) ++ cp -R --no-dereference --preserve=mode,links $(LLT_SO) $(DESTDIR)/$(LIBDIR) ++ cp -R --no-dereference --preserve=mode,links $(LLT_SMAJOR) $(DESTDIR)/$(LIBDIR) + $(INSTALL) -m 644 $(LIB_PC) $(DESTDIR)/$(PKGDIR) + $(INSTALL) -m 644 $(LLT_PC) $(DESTDIR)/$(PKGDIR) + $(INSTALL) -c -m 644 $(HDR_TARGET) $(DESTDIR)/$(HDRDIR) +-- +2.25.1 + diff --git a/meta-networking/recipes-extended/dlm/dlm/respect-ldflags-also-from-bin_ldflags.patch b/meta-networking/recipes-extended/dlm/dlm/respect-ldflags-also-from-bin_ldflags.patch deleted file mode 100644 index 69b2f903c3..0000000000 --- a/meta-networking/recipes-extended/dlm/dlm/respect-ldflags-also-from-bin_ldflags.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -uNr dlm-4.0.2.orig/dlm_controld/Makefile dlm-4.0.2/dlm_controld/Makefile ---- dlm-4.0.2.orig/dlm_controld/Makefile 2017-04-04 10:49:23.661320260 +0200 -+++ dlm-4.0.2/dlm_controld/Makefile 2017-04-04 10:50:36.121326429 +0200 -@@ -55,7 +55,7 @@ - BIN_CFLAGS += -fPIE -DPIE - BIN_CFLAGS += -I../include -I../libdlm - --BIN_LDFLAGS += -Wl,-z,now -Wl,-z,relro -pie -+BIN_LDFLAGS += $(LDFLAGS) -Wl,-z,now -Wl,-z,relro -pie - BIN_LDFLAGS += -lpthread -lrt -lcpg -lcmap -lcfg -lquorum - - LIB_CFLAGS += $(BIN_CFLAGS) -diff -uNr dlm-4.0.2.orig/dlm_tool/Makefile dlm-4.0.2/dlm_tool/Makefile ---- dlm-4.0.2.orig/dlm_tool/Makefile 2013-07-31 17:50:26.000000000 +0200 -+++ dlm-4.0.2/dlm_tool/Makefile 2017-04-04 10:50:44.617327153 +0200 -@@ -32,7 +32,7 @@ - BIN_CFLAGS += -fPIE -DPIE - BIN_CFLAGS += -I../include -I../libdlm -I../dlm_controld - --BIN_LDFLAGS += -Wl,-z,now -Wl,-z,relro -pie -+BIN_LDFLAGS += $(LDFLAGS) -Wl,-z,now -Wl,-z,relro -pie - BIN_LDFLAGS += -L../libdlm -L../dlm_controld - BIN_LDFLAGS += -lpthread -ldlm -ldlmcontrol - -diff -uNr dlm-4.0.2.orig/dlm_controld/Makefile dlm-4.0.2/dlm_controld/Makefile ---- dlm-4.0.2.orig/dlm_controld/Makefile 2017-04-04 11:02:58.578389641 +0200 -+++ dlm-4.0.2/dlm_controld/Makefile 2017-04-04 11:07:55.672414935 +0200 -@@ -59,7 +59,7 @@ - BIN_LDFLAGS += -lpthread -lrt -lcpg -lcmap -lcfg -lquorum - - LIB_CFLAGS += $(BIN_CFLAGS) --LIB_LDFLAGS += -Wl,-z,relro -pie -+LIB_LDFLAGS += $(LDFLAGS) -Wl,-z,relro -pie - - ifeq ($(USE_SD_NOTIFY),yes) - BIN_CFLAGS += $(shell pkg-config --cflags libsystemd-daemon) \ diff --git a/meta-networking/recipes-extended/dlm/dlm_4.0.2.bb b/meta-networking/recipes-extended/dlm/dlm_4.0.2.bb deleted file mode 100644 index 31e411e86d..0000000000 --- a/meta-networking/recipes-extended/dlm/dlm_4.0.2.bb +++ /dev/null @@ -1,51 +0,0 @@ -DESCRIPTION = "dlm control daemon and tool" - -SECTION = "utils" -HOMEPAGE = "https://fedorahosted.org/cluster/wiki/HomePage" - -REQUIRED_DISTRO_FEATURES = "systemd" - -SRC_URI = "https://git.fedorahosted.org/cgit/dlm.git/snapshot/${BP}.tar.xz \ - file://respect-ldflags-also-from-bin_ldflags.patch \ -" - -SRC_URI[md5sum] = "efc2ee6093aa6aa0a88aaad83e998a3f" -SRC_URI[sha256sum] = "b89bc557aaffbab0ac005398025f247718a5589cff6574d902eaffe2b20e683e" - -LICENSE = "LGPLv2+ & GPLv2 & GPLv2+" -LIC_FILES_CHKSUM = "file://README.license;md5=8f0bbcdd678df1bce9863492b6c8832d" - -DEPENDS = "corosync systemd" - -inherit pkgconfig systemd distro_features_check - -SYSTEMD_SERVICE_${PN} = "dlm.service" -SYSTEMD_AUTO_ENABLE = "enable" - -export EXTRA_OEMAKE = "" - -do_compile_prepend() { - sed -i "s/libsystemd-daemon/libsystemd/g" ${S}/dlm_controld/Makefile -} - -do_compile () { - oe_runmake 'CC=${CC}' -} - -do_install_append (){ - install -d ${D}${sysconfdir}/sysconfig/ - install -d ${D}${sysconfdir}/init.d/ - install -m 0644 ${S}/init/dlm.sysconfig ${D}${sysconfdir}/sysconfig/dlm - install -m 0644 ${S}/init/dlm.init ${D}${sysconfdir}/init.d/dlm - - # install systemd unit files - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${S}/init/dlm.service ${D}${systemd_unitdir}/system - fi -} - -do_install() { - oe_runmake install DESTDIR=${D} LIBDIR=${libdir} -} - diff --git a/meta-networking/recipes-extended/dlm/dlm_4.2.0.bb b/meta-networking/recipes-extended/dlm/dlm_4.2.0.bb new file mode 100644 index 0000000000..ee006efe28 --- /dev/null +++ b/meta-networking/recipes-extended/dlm/dlm_4.2.0.bb @@ -0,0 +1,65 @@ +DESCRIPTION = "dlm control daemon and tool" + +SECTION = "utils" +HOMEPAGE = "https://fedorahosted.org/cluster/wiki/HomePage" + +REQUIRED_DISTRO_FEATURES = "systemd" + +SRC_URI = "https://pagure.io/dlm/archive/dlm-${PV}/dlm-dlm-${PV}.tar.gz \ + file://0001-Include-sys-sysmacros.h-for-major-minor-macros-in-gl.patch \ + file://0001-make-Replace-cp-a-with-mode-preserving-options.patch \ + file://0001-dlm_controld-remove-unnecessary-header-include.patch \ + file://0001-Disable-annobin-plugin.patch \ + file://0001-Remove-fcf-protection-full.patch \ + " + +SRC_URI[sha256sum] = "90237e18af7422ac15fc756899b3bb6932597b13342296de8e0e120e6d8729ab" + +UPSTREAM_CHECK_URI = "https://pagure.io/dlm/releases" +UPSTREAM_CHECK_REGEX = "dlm-(?P<pver>\d+(\.\d+)+)" + +LICENSE = "LGPL-2.0-or-later & GPL-2.0-only & GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://README.license;md5=8f0bbcdd678df1bce9863492b6c8832d" + +S = "${WORKDIR}/dlm-dlm-${PV}" + +DEPENDS += "corosync" + +inherit pkgconfig systemd features_check + +PACKAGECONFIG ??= "" + +PACKAGECONFIG[pacemaker] = ",,pacemaker" + +SYSTEMD_SERVICE:${PN} = "dlm.service" +SYSTEMD_AUTO_ENABLE = "enable" + +export EXTRA_OEMAKE = "" + +CFPROTECTION ?= "-fcf-protection=full" +CFPROTECTION:riscv64 = "" +CFPROTECTION:arm = "" +CFPROTECTION:aarch64 = "" + +CFLAGS += "${CFPROTECTION}" + +PARALLEL_MAKE = "" + +DONTBUILD = "${@bb.utils.contains('PACKAGECONFIG', 'pacemaker', '', 'fence', d)}" + +do_compile() { + sed -i "s/libsystemd-daemon/libsystemd/g" ${S}/dlm_controld/Makefile + sed -i -e "s/ ${DONTBUILD}//g" ${S}/Makefile + oe_runmake 'CC=${CC}' +} + +do_install() { + oe_runmake install DESTDIR=${D} LIBDIR=${libdir} + install -Dm 0644 ${S}/init/dlm.sysconfig ${D}${sysconfdir}/sysconfig/dlm + install -Dm 0644 ${S}/init/dlm.init ${D}${sysconfdir}/init.d/dlm + + # install systemd unit files + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + install -Dm 0644 ${S}/init/dlm.service ${D}${systemd_unitdir}/system/dlm.service + fi +} diff --git a/meta-networking/recipes-extended/iscsitarget/files/0001-kernel-event-netlink_ack-now-requires-4-arguments.patch b/meta-networking/recipes-extended/iscsitarget/files/0001-kernel-event-netlink_ack-now-requires-4-arguments.patch deleted file mode 100644 index 4426d3552d..0000000000 --- a/meta-networking/recipes-extended/iscsitarget/files/0001-kernel-event-netlink_ack-now-requires-4-arguments.patch +++ /dev/null @@ -1,40 +0,0 @@ -From cbc5f8151017f45231b75a826f18354a81c287c4 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 26 Aug 2017 07:52:59 -0700 -Subject: [PATCH] kernel/event: netlink_ack() now requires 4 arguments - -see https://patchwork.kernel.org/patch/9670181/ - -event.c:32:4: error: too few arguments to function 'netlink_ack' -| netlink_ack(skb, nlh, 0); -| ^~~~~~~~~~~ - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - kernel/event.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: iscsitarget-1.4.20.3+svn502/kernel/event.c -=================================================================== ---- iscsitarget-1.4.20.3+svn502.orig/kernel/event.c -+++ iscsitarget-1.4.20.3+svn502/kernel/event.c -@@ -6,6 +6,7 @@ - * Some functions are based on audit code. - */ - -+#include <linux/version.h> - #include <linux/module.h> - #include <net/tcp.h> - #include "iet_u.h" -@@ -29,7 +30,11 @@ static void event_recv_skb(struct sk_buf - ietd_pid = NETLINK_CB(skb).portid; - WARN_ON(ietd_pid == 0); - if (nlh->nlmsg_flags & NLM_F_ACK) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) -+ netlink_ack(skb, nlh, 0, NULL); -+#else - netlink_ack(skb, nlh, 0); -+#endif - skb_pull(skb, rlen); - } - } diff --git a/meta-networking/recipes-extended/iscsitarget/files/access-sk_v6_daddr-iff-IPV6-defined.patch b/meta-networking/recipes-extended/iscsitarget/files/access-sk_v6_daddr-iff-IPV6-defined.patch deleted file mode 100644 index 4444234b2e..0000000000 --- a/meta-networking/recipes-extended/iscsitarget/files/access-sk_v6_daddr-iff-IPV6-defined.patch +++ /dev/null @@ -1,28 +0,0 @@ -The element skc_v6_daddr (in struct sock_common) is defined in -kernel source only when CONFIG_IPV6 is enabled. Hence, access -sk_v6_daddr element (i.e __sk_common.skc_v6_daddr) only when CONFIG_IPV6 -is defined; to fix below error in world build: - --- snip -- -/home/jenkins/oe/world/shr-core/tmp-glibc/work-shared/qemux86/kernel-source/include/net/sock.h:330:33: error: 'struct sock_common' has no member named 'skc_v6_daddr' --- CUT -- - -Upstream-Status: Pending - -Signed-off-by: Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com> - ---- iscsitarget-1.4.20.3+svn502_org/kernel/conn.c 2015-12-29 21:57:50.547932217 -0800 -+++ iscsitarget-1.4.20.3+svn502/kernel/conn.c 2015-12-29 22:47:25.254657627 -0800 -@@ -46,10 +46,12 @@ void conn_info_show(struct seq_file *seq - snprintf(buf, sizeof(buf), - "%pI4", &inet_sk(sk)->inet_daddr); - break; -+#if defined(CONFIG_IPV6) - case AF_INET6: - snprintf(buf, sizeof(buf), "[%pI6]", - &(sk)->sk_v6_daddr); - break; -+#endif /* defined(CONFIG_IPV6) */ - default: - break; - } diff --git a/meta-networking/recipes-extended/iscsitarget/files/build_with_updated_bio_struct_of_linux_v4.3_and_above.patch b/meta-networking/recipes-extended/iscsitarget/files/build_with_updated_bio_struct_of_linux_v4.3_and_above.patch deleted file mode 100644 index bce38baee5..0000000000 --- a/meta-networking/recipes-extended/iscsitarget/files/build_with_updated_bio_struct_of_linux_v4.3_and_above.patch +++ /dev/null @@ -1,108 +0,0 @@ -Description: Fix source to compile with 4.3+ kernels - commit 4246a0b63bd8f56a1469b12eafeb875b1041a451 - block: add a bi_error field to struct bio - -> Removes BIO_UPTODATE and error argument to bio_endio. - commit b54ffb73cadcdcff9cc1ae0e11f502407e3e2e4c - block: remove bio_get_nr_vecs() - -> Removed that call (always use BIO_MAX_PAGES) - commit 676d23690fb62b5d51ba5d659935e9f7d9da9f8e - net: Fix use after free by removing length arg from sk_data_ready callbacks. - -> Removes len argument from sk_data_ready() callback. -Author: Stefan Bader <stefan.bader@canonical.com> - -The original patch is at http://launchpadlibrarian.net/227478885/iscsitarget_1.4.20.3+svn502-2ubuntu2_1.4.20.3+svn502-2ubuntu3.diff.gz, -those changes were taken using #ifs to allow compilation of iscsitarget -package with kernel versions < 4.3. - -Upstream-Status: Submitted [http://launchpadlibrarian.net/227478885/iscsitarget_1.4.20.3+svn502-2ubuntu2_1.4.20.3+svn502-2ubuntu3.diff.gz] - -Signed-off-by: Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com> - -diff -Naurp iscsitarget-1.4.20.3+svn502_org/kernel/block-io.c iscsitarget-1.4.20.3+svn502/kernel/block-io.c ---- iscsitarget-1.4.20.3+svn502_org/kernel/block-io.c 2014-05-06 13:59:55.000000000 -0700 -+++ iscsitarget-1.4.20.3+svn502/kernel/block-io.c 2017-01-19 00:46:28.263951115 -0800 -@@ -29,14 +29,23 @@ struct tio_work { - struct completion tio_complete; - }; - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 3, 0) -+static void blockio_bio_endio(struct bio *bio) -+#else - static void blockio_bio_endio(struct bio *bio, int error) -+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(4, 3, 0) */ - { - struct tio_work *tio_work = bio->bi_private; - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 3, 0) -+ if (bio->bi_error) -+ atomic_set(&tio_work->error, bio->bi_error); -+#else - error = test_bit(BIO_UPTODATE, &bio->bi_flags) ? error : -EIO; - - if (error) - atomic_set(&tio_work->error, error); -+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(4, 3, 0) */ - - /* If last bio signal completion */ - if (atomic_dec_and_test(&tio_work->bios_remaining)) -@@ -61,14 +70,20 @@ blockio_make_request(struct iet_volume * - u32 size = tio->size; - u32 tio_index = 0; - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 3, 0) -+ int max_pages = bdev_q ? BIO_MAX_PAGES : 1; -+#else - int max_pages = 1; -+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(4, 3, 0) */ - int err = 0; - - loff_t ppos = tio->offset; - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0) - /* Calculate max_pages for bio_alloc (memory saver) */ - if (bdev_q) - max_pages = bio_get_nr_vecs(bio_data->bdev); -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0) */ - - tio_work = kzalloc(sizeof (*tio_work), GFP_KERNEL); - if (!tio_work) -diff -Naurp iscsitarget-1.4.20.3+svn502_org/kernel/conn.c iscsitarget-1.4.20.3+svn502/kernel/conn.c ---- iscsitarget-1.4.20.3+svn502_org/kernel/conn.c 2017-01-19 00:39:09.737117778 -0800 -+++ iscsitarget-1.4.20.3+svn502/kernel/conn.c 2017-01-19 00:52:30.037223901 -0800 -@@ -89,13 +89,21 @@ static void iet_state_change(struct sock - target->nthread_info.old_state_change(sk); - } - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 3, 0) -+static void iet_data_ready(struct sock *sk) -+#else - static void iet_data_ready(struct sock *sk, int len) -+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(4, 3, 0) */ - { - struct iscsi_conn *conn = sk->sk_user_data; - struct iscsi_target *target = conn->session->target; - - nthread_wakeup(target); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 3, 0) -+ target->nthread_info.old_data_ready(sk); -+#else - target->nthread_info.old_data_ready(sk, len); -+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(4, 3, 0) */ - } - - /* -diff -Naurp iscsitarget-1.4.20.3+svn502_org/kernel/iscsi.h iscsitarget-1.4.20.3+svn502/kernel/iscsi.h ---- iscsitarget-1.4.20.3+svn502_org/kernel/iscsi.h 2014-05-06 13:59:55.000000000 -0700 -+++ iscsitarget-1.4.20.3+svn502/kernel/iscsi.h 2017-01-19 00:48:02.102837260 -0800 -@@ -81,7 +81,11 @@ struct network_thread_info { - spinlock_t nthread_lock; - - void (*old_state_change)(struct sock *); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 3, 0) -+ void (*old_data_ready)(struct sock *); -+#else - void (*old_data_ready)(struct sock *, int); -+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(4, 3, 0) */ - void (*old_write_space)(struct sock *); - }; - diff --git a/meta-networking/recipes-extended/iscsitarget/files/build_with_updated_interfaces_of_linux_v4.8_and_above.patch b/meta-networking/recipes-extended/iscsitarget/files/build_with_updated_interfaces_of_linux_v4.8_and_above.patch deleted file mode 100644 index e508a5e6cd..0000000000 --- a/meta-networking/recipes-extended/iscsitarget/files/build_with_updated_interfaces_of_linux_v4.8_and_above.patch +++ /dev/null @@ -1,475 +0,0 @@ -Resolve build error with linux kernel 4.8 - -The below changes in kernel source, triggered iscsitarget -build fail with linux kernel v4.8. - -1. An extra 'flags' argument has been passed to vfs_readv/vfs_writev - syscalls in v4.8. So, set this argument to "0" for now - (as there is no real need for that). - Ref: https://github.com/torvalds/linux/commit/793b80ef14af56d20c998265287648ad34239b6f - Solves: - -- snip -- -TOPDIR/tmp-glibc/work/qemux86-oe-linux/iscsitarget/1.4.20.3+svn502-r0/iscsitarget-1.4.20.3+svn502/kernel/nthread.c: In function 'write_data': -TOPDIR/tmp-glibc/work/qemux86-oe-linux/iscsitarget/1.4.20.3+svn502-r0/iscsitarget-1.4.20.3+svn502/kernel/nthread.c:350:9: error: too few arguments to function 'vfs_writev' - res = vfs_writev(file, (struct iovec __user *) iop, count, &off); - ^~~~~~~~~~ - -- snip -- - -2. Redefine dropped PAGE_CACHE_* and page_cache_{get,release} definitions, - as they have been dropped with v4.8 - Ref: https://github.com/torvalds/linux/commit/1fa64f198b9f8d6ec0f7aec7c18dc94684391140 - Solves: - -- snip -- -TOPDIR/tmp-glibc/work/qemux86-oe-linux/iscsitarget/1.4.20.3+svn502-r0/iscsitarget-1.4.20.3+svn502/kernel/param.c: In function 'sess_param_check': -TOPDIR/tmp-glibc/work/qemux86-oe-linux/iscsitarget/1.4.20.3+svn502-r0/iscsitarget-1.4.20.3+svn502/kernel/param.c:48:41: error: 'PAGE_CACHE_SIZE' undeclared (first use in this function) - (u32) ((ISCSI_CONN_IOV_MAX - 1) * PAGE_CACHE_SIZE)); - ^ - -- snip -- - -3. Replace crypto_hash interfaces with crypto_ahash interfaces, - Ref: https://github.com/torvalds/linux/commit/896545098777564212b9e91af4c973f094649aa7 - Ref: https://www.redhat.com/archives/dm-devel/2016-January/msg00244.html - Solves: - -- snip -- -TOPDIR/tmp-glibc/work/qemux86-oe-linux/iscsitarget/1.4.20.3+svn502-r0/iscsitarget-1.4.20.3+svn502/kernel/digest.c: In function 'digest_init': -TOPDIR/tmp-glibc/work/qemux86-oe-linux/iscsitarget/1.4.20.3+svn502-r0/iscsitarget-1.4.20.3+svn502/kernel/digest.c:42:23: error: implicit declaration of function 'crypto_alloc_hash' [-Werror=implicit-function-declaration] - conn->rx_hash.tfm = crypto_alloc_hash("crc32c", 0, - ^~~~~~~~~~~~~~~~~ -TOPDIR/tmp-glibc/work/qemux86-oe-linux/iscsitarget/1.4.20.3+svn502-r0/iscsitarget-1.4.20.3+svn502/kernel/digest.c: In function 'digest_cleanup': -TOPDIR/tmp-glibc/work/qemux86-oe-linux/iscsitarget/1.4.20.3+svn502-r0/iscsitarget-1.4.20.3+svn502/kernel/digest.c:77:3: error: implicit declaration of function 'crypto_free_hash' [-Werror=implicit-function-declaration] - crypto_free_hash(conn->tx_hash.tfm); - ^~~~~~~~~~~~~~~~ - -- snip -- - -4. The earlier "rw" parameter has been set in "bi_rw" within - bio structure, hence remove "rw" argument. - Ref: https://github.com/torvalds/linux/commit/4e49ea4a3d276365bf7396c9b77b4d1d5923835a - Solves: --- snip -- -TOPDIR/tmp-glibc/work/qemux86-oe-linux/iscsitarget/1.4.20.3+svn502-r0/iscsitarget-1.4.20.3+svn502/kernel/block-io.c:140:14: warning: passing argument 1 of 'submit_bio' makes pointer from integer without a cast [-Wint-conversion] - submit_bio(rw, bio); - ^~ --- snip -- - -5. The 'len' argument from sk_data_ready() callback has been removed in - linux kernel v4.3 and above. - Ref: https://github.com/torvalds/linux/commit/676d23690fb62b5d51ba5d659935e9f7d9da9f8e - Solves: --- snip -- -TOPDIR/tmp-glibc/work/qemux86-oe-linux/iscsitarget/1.4.20.3+svn502-r0/iscsitarget-1.4.20.3+svn502/kernel/conn.c: In function 'iet_socket_bind': -TOPDIR/tmp-glibc/work/qemux86-oe-linux/iscsitarget/1.4.20.3+svn502-r0/iscsitarget-1.4.20.3+svn502/kernel/conn.c:143:38: error: assignment from incompatible pointer type [-Werror=incompatible-pointer-types] - target->nthread_info.old_data_ready = conn->sock->sk->sk_data_ready; - ^ -TOPDIR/tmp-glibc/work/qemux86-oe-linux/iscsitarget/1.4.20.3+svn502-r0/iscsitarget-1.4.20.3+svn502/kernel/conn.c:144:32: error: assignment from incompatible pointer type [-Werror=incompatible-pointer-types] - conn->sock->sk->sk_data_ready = iet_data_ready; - ^ --- snip -- - -6. - A. The "size" argument has been dropped from sock_recvmsg syscall in v4.8, - as all callers have it equal to msg_data_left(msg). - B. 'struct user_msghdr' is being used for userland-side msghdr instead - of 'struct msghdr', which is used for kernel-side msghdr in linux v3.19 - and above, so typecase it while calling sock_recvmsg syscall. - Ref: https://github.com/torvalds/linux/commit/2da62906b1e298695e1bb725927041cd59942c98 - https://github.com/torvalds/linux/commit/666547ff591cebdedc4679bf6b1b3f3383a8dea3 - Solves: - -- snip -- -TOPDIR/tmp-glibc/work-shared/qemux86/kernel-source/include/linux/net.h:222:5: note: expected 'struct msghdr *' but argument is of type 'struct user_msghdr *' - int sock_recvmsg(struct socket *sock, struct msghdr *msg, int flags); - ^~~~~~~~~~~~ -TOPDIR/tmp-glibc/work/qemux86-oe-linux/iscsitarget/1.4.20.3+svn502-r0/iscsitarget-1.4.20.3+svn502/kernel/nthread.c:129:8: error: too many arguments to function 'sock_recvmsg' - res = sock_recvmsg(conn->sock, &msg, len, MSG_DONTWAIT | MSG_NOSIGNAL); - ^~~~~~~~~~~~ - -- snip -- - -Detailed error log is at: http://errors.yoctoproject.org/Errors/Details/83334/ - -Upstream-Status: Pending - -Signed-off-by: Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com> - -diff -Naurp iscsitarget-1.4.20.3+svn502_org/kernel/block-io.c iscsitarget-1.4.20.3+svn502/kernel/block-io.c ---- iscsitarget-1.4.20.3+svn502_org/kernel/block-io.c 2017-01-19 20:19:27.400507354 -0800 -+++ iscsitarget-1.4.20.3+svn502/kernel/block-io.c 2017-01-19 20:32:22.977988593 -0800 -@@ -104,7 +104,11 @@ blockio_make_request(struct iet_volume * - /* bi_sector is ALWAYS in units of 512 bytes */ - bio->bi_iter.bi_sector = ppos >> 9; - bio->bi_bdev = bio_data->bdev; -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) -+ bio->bi_end_io = (bio_end_io_t *) blockio_bio_endio; -+#else - bio->bi_end_io = blockio_bio_endio; -+#endif - bio->bi_private = tio_work; - - if (tio_bio) -@@ -139,7 +143,12 @@ blockio_make_request(struct iet_volume * - tio_bio = tio_bio->bi_next; - bio->bi_next = NULL; - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) -+ bio_set_op_attrs(bio, REQ_OP_WRITE, 0); -+ submit_bio(bio); -+#else - submit_bio(rw, bio); -+#endif - } - - blk_finish_plug(&plug); -diff -Naurp iscsitarget-1.4.20.3+svn502_org/kernel/conn.c iscsitarget-1.4.20.3+svn502/kernel/conn.c ---- iscsitarget-1.4.20.3+svn502_org/kernel/conn.c 2017-01-19 20:19:27.400507354 -0800 -+++ iscsitarget-1.4.20.3+svn502/kernel/conn.c 2017-01-19 20:32:22.978988614 -0800 -@@ -148,8 +148,14 @@ static void iet_socket_bind(struct iscsi - target->nthread_info.old_state_change = conn->sock->sk->sk_state_change; - conn->sock->sk->sk_state_change = iet_state_change; - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) -+ target->nthread_info.old_data_ready = (void (*) (struct sock *)) \ -+ conn->sock->sk->sk_data_ready; -+ conn->sock->sk->sk_data_ready = (void (*) (struct sock *)) iet_data_ready; -+#else - target->nthread_info.old_data_ready = conn->sock->sk->sk_data_ready; - conn->sock->sk->sk_data_ready = iet_data_ready; -+#endif - - target->nthread_info.old_write_space = conn->sock->sk->sk_write_space; - conn->sock->sk->sk_write_space = iet_write_space; -diff -Naurp iscsitarget-1.4.20.3+svn502_org/kernel/digest.c iscsitarget-1.4.20.3+svn502/kernel/digest.c ---- iscsitarget-1.4.20.3+svn502_org/kernel/digest.c 2014-05-06 13:59:55.000000000 -0700 -+++ iscsitarget-1.4.20.3+svn502/kernel/digest.c 2017-01-19 20:32:22.978988614 -0800 -@@ -30,6 +30,9 @@ void digest_alg_available(unsigned int * - int digest_init(struct iscsi_conn *conn) - { - int err = 0; -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) -+ struct crypto_ahash *tfm; -+#endif - - if (!(conn->hdigest_type & DIGEST_ALL)) - conn->hdigest_type = DIGEST_NONE; -@@ -39,15 +42,40 @@ int digest_init(struct iscsi_conn *conn) - - if (conn->hdigest_type & DIGEST_CRC32C || - conn->ddigest_type & DIGEST_CRC32C) { -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) -+ tfm = crypto_alloc_ahash("crc32c", 0, CRYPTO_ALG_ASYNC); -+ if (IS_ERR(tfm)) { -+ tfm = NULL; -+#else - conn->rx_hash.tfm = crypto_alloc_hash("crc32c", 0, - CRYPTO_ALG_ASYNC); - conn->rx_hash.flags = 0; - if (IS_ERR(conn->rx_hash.tfm)) { - conn->rx_hash.tfm = NULL; -+#endif - err = -ENOMEM; - goto out; - } -- -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) -+ conn->rx_hash = ahash_request_alloc(tfm, GFP_KERNEL); -+ if (!conn->rx_hash) { -+ pr_err("ahash_request_alloc() failed for conn->rx_hash\n"); -+ crypto_free_ahash(tfm); -+ err = -ENOMEM; -+ goto out; -+ } -+ ahash_request_set_callback(conn->rx_hash, 0, NULL, NULL); -+ conn->tx_hash = ahash_request_alloc(tfm, GFP_KERNEL); -+ if(!conn->tx_hash) { -+ pr_err("ahash_request_alloc() failed for conn->tx_hash\n"); -+ ahash_request_free(conn->rx_hash); -+ conn->rx_hash = NULL; -+ crypto_free_ahash(tfm); -+ err = -ENOMEM; -+ goto out; -+ } -+ ahash_request_set_callback(conn->tx_hash, 0, NULL, NULL); -+#else - conn->tx_hash.tfm = crypto_alloc_hash("crc32c", 0, - CRYPTO_ALG_ASYNC); - conn->tx_hash.flags = 0; -@@ -56,6 +84,7 @@ int digest_init(struct iscsi_conn *conn) - err = -ENOMEM; - goto out; - } -+#endif - } - - out: -@@ -73,10 +102,21 @@ out: - */ - void digest_cleanup(struct iscsi_conn *conn) - { -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) -+ ahash_request_free(conn->tx_hash); -+ if (conn->rx_hash) { -+ struct crypto_ahash *tfm; -+ tfm = crypto_ahash_reqtfm(conn->rx_hash); -+ ahash_request_free(conn->rx_hash); -+ crypto_free_ahash(tfm); -+ } -+ -+#else - if (conn->tx_hash.tfm) - crypto_free_hash(conn->tx_hash.tfm); - if (conn->rx_hash.tfm) - crypto_free_hash(conn->rx_hash.tfm); -+#endif - } - - /** -@@ -160,8 +200,13 @@ static inline void __dbg_simulate_data_d - } - } - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) -+static void digest_header(struct ahash_request *hash, struct iscsi_pdu *pdu, -+ u8 *crc) -+#else - static void digest_header(struct hash_desc *hash, struct iscsi_pdu *pdu, - u8 *crc) -+#endif - { - struct scatterlist sg[2]; - unsigned int nbytes = sizeof(struct iscsi_hdr); -@@ -174,16 +219,27 @@ static void digest_header(struct hash_de - nbytes += pdu->ahssize; - } - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) -+ crypto_ahash_init(hash); -+ ahash_request_set_crypt(hash, sg, crc, nbytes); -+ crypto_ahash_update(hash); -+ crypto_ahash_digest(hash); -+#else - crypto_hash_init(hash); - crypto_hash_update(hash, sg, nbytes); - crypto_hash_final(hash, crc); -+#endif - } - - int digest_rx_header(struct iscsi_cmnd *cmnd) - { - u32 crc; - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) -+ digest_header(cmnd->conn->rx_hash, &cmnd->pdu, (u8 *) &crc); -+#else - digest_header(&cmnd->conn->rx_hash, &cmnd->pdu, (u8 *) &crc); -+#endif - if (crc != cmnd->hdigest) - return -EIO; - -@@ -192,11 +248,20 @@ int digest_rx_header(struct iscsi_cmnd * - - void digest_tx_header(struct iscsi_cmnd *cmnd) - { -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) -+ digest_header(cmnd->conn->tx_hash, &cmnd->pdu, (u8 *) &cmnd->hdigest); -+#else - digest_header(&cmnd->conn->tx_hash, &cmnd->pdu, (u8 *) &cmnd->hdigest); -+#endif - } - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) -+static void digest_data(struct ahash_request *hash, struct iscsi_cmnd *cmnd, -+ struct tio *tio, u32 offset, u8 *crc) -+#else - static void digest_data(struct hash_desc *hash, struct iscsi_cmnd *cmnd, - struct tio *tio, u32 offset, u8 *crc) -+#endif - { - struct scatterlist *sg = cmnd->conn->hash_sg; - u32 size, length, npages; -@@ -214,7 +279,11 @@ static void digest_data(struct hash_desc - BUG_ON(npages > ISCSI_CONN_IOV_MAX); - - sg_init_table(sg, ARRAY_SIZE(cmnd->conn->hash_sg)); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) -+ crypto_ahash_init(hash); -+#else - crypto_hash_init(hash); -+#endif - - for (i = 0; size > 0; i++) { - length = min_t(u32, PAGE_CACHE_SIZE - offset, size); -@@ -225,8 +294,14 @@ static void digest_data(struct hash_desc - - sg_mark_end(&sg[i - 1]); - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) -+ ahash_request_set_crypt(hash, sg, crc, nbytes); -+ crypto_ahash_update(hash); -+ crypto_ahash_digest(hash); -+#else - crypto_hash_update(hash, sg, nbytes); - crypto_hash_final(hash, crc); -+#endif - } - - int digest_rx_data(struct iscsi_cmnd *cmnd) -@@ -251,8 +326,11 @@ int digest_rx_data(struct iscsi_cmnd *cm - tio = cmnd->tio; - offset = 0; - } -- -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) -+ digest_data(cmnd->conn->rx_hash, cmnd, tio, offset, (u8 *) &crc); -+#else - digest_data(&cmnd->conn->rx_hash, cmnd, tio, offset, (u8 *) &crc); -+#endif - - if (!cmnd->conn->read_overflow && - (cmnd_opcode(cmnd) != ISCSI_OP_PDU_REJECT)) { -@@ -269,6 +347,11 @@ void digest_tx_data(struct iscsi_cmnd *c - struct iscsi_data_out_hdr *req = (struct iscsi_data_out_hdr *)&cmnd->pdu.bhs; - - assert(tio); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) -+ digest_data(cmnd->conn->tx_hash, cmnd, tio, -+ be32_to_cpu(req->buffer_offset), (u8 *) &cmnd->ddigest); -+#else - digest_data(&cmnd->conn->tx_hash, cmnd, tio, - be32_to_cpu(req->buffer_offset), (u8 *) &cmnd->ddigest); -+#endif - } -diff -Naurp iscsitarget-1.4.20.3+svn502_org/kernel/iscsi.h iscsitarget-1.4.20.3+svn502/kernel/iscsi.h ---- iscsitarget-1.4.20.3+svn502_org/kernel/iscsi.h 2017-01-19 20:19:27.400507354 -0800 -+++ iscsitarget-1.4.20.3+svn502/kernel/iscsi.h 2017-01-19 20:32:22.979988634 -0800 -@@ -14,6 +14,7 @@ - #include <linux/pagemap.h> - #include <linux/seq_file.h> - #include <linux/mm.h> -+#include <crypto/hash.h> - #include <linux/crypto.h> - #include <linux/scatterlist.h> - #include <net/sock.h> -@@ -275,8 +276,13 @@ struct iscsi_conn { - u32 write_offset; - int write_state; - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) -+ struct ahash_request *rx_hash; -+ struct ahash_request *tx_hash; -+#else - struct hash_desc rx_hash; - struct hash_desc tx_hash; -+#endif - struct scatterlist hash_sg[ISCSI_CONN_IOV_MAX]; - }; - -@@ -552,4 +558,10 @@ enum cmnd_flags { - #define PRODUCT_ID "VIRTUAL-DISK" - #define PRODUCT_REV "0" - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) -+#define PAGE_CACHE_SHIFT PAGE_SHIFT -+#define PAGE_CACHE_SIZE PAGE_SIZE -+#define PAGE_CACHE_MASK PAGE_MASK -+#endif -+ - #endif /* __ISCSI_H__ */ -diff -Naurp iscsitarget-1.4.20.3+svn502_org/kernel/nthread.c iscsitarget-1.4.20.3+svn502/kernel/nthread.c ---- iscsitarget-1.4.20.3+svn502_org/kernel/nthread.c 2017-01-19 20:19:27.276504928 -0800 -+++ iscsitarget-1.4.20.3+svn502/kernel/nthread.c 2017-01-19 20:32:22.979988634 -0800 -@@ -155,7 +155,12 @@ static int do_recv(struct iscsi_conn *co - - oldfs = get_fs(); - set_fs(get_ds()); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) -+ res = sock_recvmsg(conn->sock, (struct msghdr *) &msg, \ -+ MSG_DONTWAIT | MSG_NOSIGNAL); -+#else - res = sock_recvmsg(conn->sock, &msg, len, MSG_DONTWAIT | MSG_NOSIGNAL); -+#endif - set_fs(oldfs); - - if (res <= 0) { -@@ -376,7 +381,11 @@ static int write_data(struct iscsi_conn - ; - oldfs = get_fs(); - set_fs(KERNEL_DS); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) -+ res = vfs_writev(file, (struct iovec __user *) iop, count, &off, 0); -+#else - res = vfs_writev(file, (struct iovec __user *) iop, count, &off); -+#endif - set_fs(oldfs); - dprintk(D_DATA, "%#Lx:%u: %d(%ld)\n", - (unsigned long long) conn->session->sid, conn->cid, -@@ -503,7 +512,11 @@ static int tx_ddigest(struct iscsi_cmnd - iov.iov_base = (char *) (&cmnd->ddigest) + (sizeof(u32) - rest); - iov.iov_len = rest; - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) -+ res = kernel_sendmsg(cmnd->conn->sock, (struct msghdr *) &msg, &iov, 1, rest); -+#else - res = kernel_sendmsg(cmnd->conn->sock, &msg, &iov, 1, rest); -+#endif - - if (res > 0) { - cmnd->conn->write_size -= res; -@@ -702,7 +715,12 @@ static void close_conn(struct iscsi_conn - - write_lock_bh(&conn->sock->sk->sk_callback_lock); - conn->sock->sk->sk_state_change = target->nthread_info.old_state_change; -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) -+ conn->sock->sk->sk_data_ready = (void (*) (struct sock *)) \ -+ target->nthread_info.old_data_ready; -+#else - conn->sock->sk->sk_data_ready = target->nthread_info.old_data_ready; -+#endif - conn->sock->sk->sk_write_space = target->nthread_info.old_write_space; - write_unlock_bh(&conn->sock->sk->sk_callback_lock); - -diff -Naurp iscsitarget-1.4.20.3+svn502_org/kernel/volume.c iscsitarget-1.4.20.3+svn502/kernel/volume.c ---- iscsitarget-1.4.20.3+svn502_org/kernel/volume.c 2017-01-19 20:19:27.276504928 -0800 -+++ iscsitarget-1.4.20.3+svn502/kernel/volume.c 2017-01-19 20:32:22.979988634 -0800 -@@ -84,12 +84,25 @@ static int set_scsisn(struct iet_volume - /* Generate a MD5 hash of the target IQN and LUN number */ - static void gen_scsiid(struct iet_volume *volume) - { -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) -+ struct ahash_request *hash; -+ struct crypto_ahash *tfm; -+#else - struct hash_desc hash; -+#endif - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) -+ tfm = crypto_alloc_ahash("md5", 0, CRYPTO_ALG_ASYNC); -+#else - hash.tfm = crypto_alloc_hash("md5", 0, CRYPTO_ALG_ASYNC); - hash.flags = 0; -+#endif - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) -+ if (!IS_ERR(tfm)) { -+#else - if (!IS_ERR(hash.tfm)) { -+#endif - struct scatterlist sg[2]; - unsigned int nbytes = 0; - -@@ -102,11 +115,19 @@ static void gen_scsiid(struct iet_volume - sg_set_buf(&sg[1], &volume->lun, sizeof(volume->lun)); - nbytes += sizeof(volume->lun); - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) -+ crypto_ahash_init(hash); -+ ahash_request_set_crypt(hash, sg, volume->scsi_id, nbytes); -+ crypto_ahash_update(hash); -+ crypto_ahash_digest(hash); -+ crypto_free_ahash(tfm); -+#else - crypto_hash_init(&hash); - crypto_hash_update(&hash, sg, nbytes); - crypto_hash_final(&hash, volume->scsi_id); - - crypto_free_hash(hash.tfm); -+#endif - } else { - /* If no MD5 available set ID to TID and LUN */ - memcpy(volume->scsi_id, &volume->target->tid, diff --git a/meta-networking/recipes-extended/iscsitarget/files/fix-call-trace-of-ahash-API-calling.patch b/meta-networking/recipes-extended/iscsitarget/files/fix-call-trace-of-ahash-API-calling.patch deleted file mode 100644 index c99683478b..0000000000 --- a/meta-networking/recipes-extended/iscsitarget/files/fix-call-trace-of-ahash-API-calling.patch +++ /dev/null @@ -1,85 +0,0 @@ -The previous build_with_updated_interfaces_of_linux_v4.8_and_above.patch -does not alloc struct ahash_request before using it. This will cause the -kernel call trace below when calling gen_scsiid on kernel 4.8 or later -version. - -This patch normalizes the calling of ahash API according to the example -in kernel doc Documentation/crypto/api-intro.txt. - -BUG: unable to handle kernel NULL pointer dereference at 0000000000000020 -IP: [<ffffffffa0008d45>] volume_add+0x625/0x7f0 [iscsi_trgt] -PGD dd77067 PUD dd7c067 PMD 0 -Oops: 0000 [#1] PREEMPT SMP -Modules linked in: iscsi_trgt(O) -CPU: 0 PID: 350 Comm: ietd Tainted: G O 4.8.12-yocto-standard #1 -Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.9.3-0-ge2fc41e-prebuilt.qemu-project.org 04/01/2014 -task: ffff88000dfe2c00 task.stack: ffff88000de88000 -RIP: 0010:[<ffffffffa0008d45>] [<ffffffffa0008d45>] volume_add+0x625/0x7f0 [iscsi_trgt] -RSP: 0018:ffff88000de8bd90 EFLAGS: 00000206 -RAX: 000000000000ddfa RBX: ffff88000ddd1d78 RCX: ffffea0000000000 -RDX: 0000000000000600 RSI: 0000000000000000 RDI: ffff88000ddd1c14 -RBP: ffff88000de8be38 R08: ffff88000de44180 R09: ffff88000de8bdd0 -R10: 000000000000002c R11: 0000000000000000 R12: ffff88000ddfa600 -R13: 0000000000000000 R14: 0000000000000000 R15: ffff88000de92200 -FS: 00007f767548b700(0000) GS:ffff88000fc00000(0000) knlGS:0000000000000000 -CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 -CR2: 0000000000000020 CR3: 000000000dd2d000 CR4: 00000000000006f0 -Stack: - ffff88000de8bdd0 ffff88000dc1b3d0 ffff88000ddfa650 ffff88000ddfa660 - ffff88000df8f000 ffff88000ddd1c00 ffff88000de44180 0000000000000000 - ffffea0000377440 0000000f00000c14 0000000000000000 0000000000000000 -Call Trace: - [<ffffffffa0006547>] ioctl+0x217/0x390 [iscsi_trgt] - [<ffffffff81192574>] do_vfs_ioctl+0x94/0x5c0 - [<ffffffff8117ff73>] ? vfs_read+0xf3/0x120 - [<ffffffff81192b19>] SyS_ioctl+0x79/0x90 - [<ffffffff8191a45b>] entry_SYSCALL_64_fastpath+0x13/0x8f -Code: 4c 01 e0 0f 82 a2 01 00 00 48 b9 00 00 00 80 ff 77 00 00 48 01 -c8 45 31 f6 48 b9 00 00 00 00 00 ea ff ff 89 54 24 68 48 c1 e8 0c <49> -8b 56 20 4c 89 44 24 20 4c 89 f7 48 c1 e0 06 c7 44 24 6c 04 -RIP [<ffffffffa0008d45>] volume_add+0x625/0x7f0 [iscsi_trgt] - RSP <ffff88000de8bd90> -CR2: 0000000000000020 -end trace cd2016297df21635 ] -ietd_response_recv 200 0 -5 -Input/output error. - -Upstream-Status: Pending [This patch is based on the previous one which -has not been merged upstream.] - -Signed-off-by: Zhe He <zhe.he@windriver.com> - ---- iscsitarget-1.4.20.3+svn502_orig/kernel/volume.c 2017-01-18 08:57:56.752187402 +0800 -+++ iscsitarget-1.4.20.3+svn502/kernel/volume.c 2017-01-18 09:02:44.164195234 +0800 -@@ -93,13 +93,14 @@ static void gen_scsiid(struct iet_volume - - #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) - tfm = crypto_alloc_ahash("md5", 0, CRYPTO_ALG_ASYNC); -+ hash = ahash_request_alloc(tfm, GFP_ATOMIC); - #else - hash.tfm = crypto_alloc_hash("md5", 0, CRYPTO_ALG_ASYNC); - hash.flags = 0; - #endif - - #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) -- if (!IS_ERR(tfm)) { -+ if (tfm && !IS_ERR(tfm)) { - #else - if (!IS_ERR(hash.tfm)) { - #endif -@@ -116,10 +117,13 @@ static void gen_scsiid(struct iet_volume - nbytes += sizeof(volume->lun); - - #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) -- crypto_ahash_init(hash); -+ ahash_request_set_callback(hash, 0, NULL, NULL); - ahash_request_set_crypt(hash, sg, volume->scsi_id, nbytes); -- crypto_ahash_update(hash); - crypto_ahash_digest(hash); -+ crypto_ahash_init(hash); -+ crypto_ahash_update(hash); -+ crypto_ahash_final(hash); -+ ahash_request_free(hash); - crypto_free_ahash(tfm); - #else - crypto_hash_init(&hash); diff --git a/meta-networking/recipes-extended/iscsitarget/files/fix-errors-observed-with-linux-3.19-and-greater.patch b/meta-networking/recipes-extended/iscsitarget/files/fix-errors-observed-with-linux-3.19-and-greater.patch deleted file mode 100644 index 1e6a1d6d3f..0000000000 --- a/meta-networking/recipes-extended/iscsitarget/files/fix-errors-observed-with-linux-3.19-and-greater.patch +++ /dev/null @@ -1,327 +0,0 @@ -Description: Fix source to compile on 3.19 kernels -Author: Stefan Bader <stefan.bader@canonical.com> -Forward: no - -Fixes below inconsistent crash when trying to login to iSCSI target -server, observed with linux kernel v4.1. - --- snip -- -CPU: 1 PID: 29883 Comm: istd1 Tainted: G O 4.1.35-rt40-yocto-standard #1 -Hardware name: To be filled by O.E.M. To be filled by O.E.M./Larne CRB, BIOS 4.6.5.4 09/18/2014 -task: ffff88020f1f30c0 ti: ffff8800d7f3c000 task.ti: ffff8800d7f3c000 -RIP: 0010:[<ffffffff8140d1ae>] [<ffffffff8140d1ae>] copy_to_iter+0x3e/0x280 -RSP: 0018:ffff8800d7f3f728 EFLAGS: 00010246 -RAX: 00000000d7f3f928 RBX: 0000000000000030 RCX: 0000000000000030 -RDX: ffff8800d7f3f900 RSI: 0000000000000030 RDI: ffff8800d1501e82 -RBP: ffff8800d7f3f768 R08: 00000000c127d467 R09: 0000000000000000 -R10: ffff88020f29e118 R11: 0000000000000004 R12: ffff8800d7f3f900 -R13: 0000000000000030 R14: 0000000000000001 R15: 0000000000000246 -FS: 00007f86f9c4c700(0000) GS:ffff88021ec80000(0000) knlGS:00000000f7733700 -CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 -CR2: 000000000000024e CR3: 00000000d38b0000 CR4: 00000000000406e0 -Stack: -ffff880214f14ec0 ffff8800d1501e82 ffff8800d7f3f748 0000000000000030 -ffff88020f122500 0000000000000030 0000000000000000 0000000000000030 -ffff8800d7f3f7c8 ffffffff81806981 ffff8800d7f3f798 ffffffff8105d72a -Call Trace: -[<ffffffff81806981>] skb_copy_datagram_iter+0x71/0x2b0 -[<ffffffff8105d72a>] ? __local_bh_enable_ip+0x4a/0xb0 -[<ffffffff8186c9c0>] tcp_recvmsg+0x5e0/0xbb0 -[<ffffffff81898ded>] inet_recvmsg+0x8d/0xb0 -[<ffffffff817f49f3>] sock_recvmsg+0x13/0x20 -[<ffffffffa01655c3>] do_recv+0xe3/0x1f0 [iscsi_trgt] -[<ffffffff81153097>] ? __mod_zone_page_state+0x77/0xb0 -[<ffffffff81417613>] ? __this_cpu_preempt_check+0x13/0x20 -[<ffffffff81153097>] ? __mod_zone_page_state+0x77/0xb0 -[<ffffffff8140fed5>] ? find_next_bit+0x15/0x30 -[<ffffffff813fa8e0>] ? cpumask_next_and+0x30/0x50 -[<ffffffff8113f785>] ? __alloc_pages_nodemask+0x165/0x980 -[<ffffffff8107e370>] ? preempt_count_add+0xd0/0xf0 -[<ffffffff8195da8b>] ? _raw_spin_lock+0x1b/0x60 -[<ffffffff8109cfa8>] ? cpuacct_charge+0x58/0x70 -[<ffffffff81089039>] ? update_curr+0xb9/0x190 -[<ffffffff81417613>] ? __this_cpu_preempt_check+0x13/0x20 -[<ffffffff8112b43f>] ? __perf_event_task_sched_in+0x4f/0x90 -[<ffffffff8195dbbd>] ? _raw_spin_unlock_irq+0x1d/0x40 -[<ffffffff8107e223>] ? finish_task_switch+0x63/0xe0 -[<ffffffff81959e3b>] ? __schedule+0x38b/0x980 -[<ffffffff8107e370>] ? preempt_count_add+0xd0/0xf0 -[<ffffffffa0165c65>] istd+0x4d5/0x1390 [iscsi_trgt] -[<ffffffff81959e3b>] ? __schedule+0x38b/0x980 -[<ffffffffa0165790>] ? nthread_wakeup+0x40/0x40 [iscsi_trgt] -[<ffffffffa0165790>] ? nthread_wakeup+0x40/0x40 [iscsi_trgt] -[<ffffffff8107748b>] kthread+0xbb/0xe0 -[<ffffffff81950000>] ? wireless_dev_seq_show+0x100/0x180 -[<ffffffff810773d0>] ? kthread_worker_fn+0x170/0x170 -[<ffffffff8195e7a2>] ret_from_fork+0x42/0x70 -[<ffffffff810773d0>] ? kthread_worker_fn+0x170/0x170 -Code: 5a 10 48 89 7d c8 48 39 f3 48 0f 47 de 48 85 db 0f 84 6f 01 00 00 8b 02 49 89 -d4 4c 8b 72 08 4c 8b 7a 18 a8 04 0f 85 a2 00 00 00 <4d> 8b 6f 08 4d 29 f5 49 39 dd 4c 0f 47 eb a8 02 0f 85 5c 01 00 -RSP <ffff8800d7f3f728> -CR2: 000000000000024e -------------[ cut here ]------------ --- snip -- - -The original patch is at -http://launchpadlibrarian.net/218100509/iscsitarget_1.4.20.3+svn499-0ubuntu2_1.4.20.3+svn499-0ubuntu2.1.diff.gz, -those changes were taken using #ifs, inorder to allow compilation of -iscsitarget package with linux kernels < 3.19. - -Upstream-Status: Submitted [http://launchpadlibrarian.net/218100509/iscsitarget_1.4.20.3+svn499-0ubuntu2_1.4.20.3+svn499-0ubuntu2.1.diff.gz] - -Signed-off-by: Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com> - -diff -Naurp iscsitarget-1.4.20.3+svn502_org/kernel/conn.c iscsitarget-1.4.20.3+svn502/kernel/conn.c ---- iscsitarget-1.4.20.3+svn502_org/kernel/conn.c 2017-01-18 22:27:02.713167436 -0800 -+++ iscsitarget-1.4.20.3+svn502/kernel/conn.c 2017-01-18 23:13:11.909214379 -0800 -@@ -129,7 +129,11 @@ static void iet_socket_bind(struct iscsi - - dprintk(D_GENERIC, "%llu\n", (unsigned long long) session->sid); - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0) -+ conn->sock = SOCKET_I(file_inode(conn->file)); -+#else - conn->sock = SOCKET_I(conn->file->f_dentry->d_inode); -+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0) */ - conn->sock->sk->sk_user_data = conn; - - write_lock_bh(&conn->sock->sk->sk_callback_lock); -diff -Naurp iscsitarget-1.4.20.3+svn502_org/kernel/file-io.c iscsitarget-1.4.20.3+svn502/kernel/file-io.c ---- iscsitarget-1.4.20.3+svn502_org/kernel/file-io.c 2014-05-06 13:59:55.000000000 -0700 -+++ iscsitarget-1.4.20.3+svn502/kernel/file-io.c 2017-01-18 23:54:38.505717079 -0800 -@@ -69,7 +69,11 @@ static int fileio_make_request(struct ie - static int fileio_sync(struct iet_volume *lu, struct tio *tio) - { - struct fileio_data *p = lu->private; -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0) -+ struct inode *inode = file_inode(p->filp); -+#else - struct inode *inode = p->filp->f_dentry->d_inode; -+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0) */ - struct address_space *mapping = inode->i_mapping; - loff_t ppos, count; - int res; -@@ -213,7 +217,11 @@ static int fileio_attach(struct iet_volu - eprintk("%d\n", err); - goto out; - } -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0) -+ inode = file_inode(p->filp); -+#else - inode = p->filp->f_dentry->d_inode; -+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0) */ - - if (S_ISREG(inode->i_mode)) - ; -diff -Naurp iscsitarget-1.4.20.3+svn502_org/kernel/iscsi.c iscsitarget-1.4.20.3+svn502/kernel/iscsi.c ---- iscsitarget-1.4.20.3+svn502_org/kernel/iscsi.c 2014-05-06 13:59:55.000000000 -0700 -+++ iscsitarget-1.4.20.3+svn502/kernel/iscsi.c 2017-01-18 23:37:36.462970326 -0800 -@@ -489,8 +489,12 @@ static void cmnd_skip_pdu(struct iscsi_c - } - conn->read_iov[i].iov_base = addr; - conn->read_iov[i].iov_len = size; -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0) -+ iov_iter_init(&conn->read_msg.msg_iter, READ, conn->read_iov, ++i, conn->read_size); -+#else - conn->read_msg.msg_iov = conn->read_iov; - conn->read_msg.msg_iovlen = ++i; -+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0) */ - } - - static void iscsi_cmnd_reject(struct iscsi_cmnd *req, int reason) -@@ -718,7 +722,9 @@ static int cmnd_recv_pdu(struct iscsi_co - idx = offset >> PAGE_CACHE_SHIFT; - offset &= ~PAGE_CACHE_MASK; - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0) - conn->read_msg.msg_iov = conn->read_iov; -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0) */ - conn->read_size = size = (size + 3) & -4; - conn->read_overflow = 0; - -@@ -730,16 +736,25 @@ static int cmnd_recv_pdu(struct iscsi_co - conn->read_iov[i].iov_base = addr + offset; - if (offset + size <= PAGE_CACHE_SIZE) { - conn->read_iov[i].iov_len = size; -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0) -+ iov_iter_init(&conn->read_msg.msg_iter, READ, conn->read_iov, ++i, conn->read_size); -+#else - conn->read_msg.msg_iovlen = ++i; -+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0) */ - break; - } - conn->read_iov[i].iov_len = PAGE_CACHE_SIZE - offset; - size -= conn->read_iov[i].iov_len; - offset = 0; - if (++i >= ISCSI_CONN_IOV_MAX) { -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0) - conn->read_msg.msg_iovlen = i; -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0) */ - conn->read_overflow = size; - conn->read_size -= size; -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0) -+ iov_iter_init(&conn->read_msg.msg_iter, READ, conn->read_iov, i, conn->read_size); -+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0) */ - break; - } - -@@ -918,7 +933,9 @@ static int nop_out_start(struct iscsi_co - - if ((size = cmnd->pdu.datasize)) { - size = (size + 3) & -4; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0) - conn->read_msg.msg_iov = conn->read_iov; -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0) */ - if (cmnd->pdu.bhs.itt != cpu_to_be32(ISCSI_RESERVED_TAG)) { - struct tio *tio; - int pg_cnt = get_pgcnt(size); -@@ -946,7 +963,11 @@ static int nop_out_start(struct iscsi_co - } - assert(!size); - conn->read_overflow = size; -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0) -+ iov_iter_init(&conn->read_msg.msg_iter, READ, conn->read_iov, i, conn->read_size); -+#else - conn->read_msg.msg_iovlen = i; -+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0) */ - } - - out: -@@ -986,7 +1007,11 @@ static void scsi_cmnd_start(struct iscsi - set_cmnd_lunit(req); - - switch (req_hdr->scb[0]) { -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0) -+ case SERVICE_ACTION_IN_16: -+#else - case SERVICE_ACTION_IN: -+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0) */ - if ((req_hdr->scb[1] & 0x1f) != 0x10) - goto error; - case INQUIRY: -diff -Naurp iscsitarget-1.4.20.3+svn502_org/kernel/nthread.c iscsitarget-1.4.20.3+svn502/kernel/nthread.c ---- iscsitarget-1.4.20.3+svn502_org/kernel/nthread.c 2014-05-06 13:59:55.000000000 -0700 -+++ iscsitarget-1.4.20.3+svn502/kernel/nthread.c 2017-01-18 23:45:03.291033881 -0800 -@@ -42,9 +42,14 @@ static inline void iscsi_conn_init_read( - len = (len + 3) & -4; // XXX ??? - conn->read_iov[0].iov_base = data; - conn->read_iov[0].iov_len = len; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0) - conn->read_msg.msg_iov = conn->read_iov; - conn->read_msg.msg_iovlen = 1; -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0) */ - conn->read_size = (len + 3) & -4; -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0) -+ iov_iter_init(&conn->read_msg.msg_iter, READ, conn->read_iov, 1, conn->read_size); -+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0) */ - } - - static void iscsi_conn_read_ahs(struct iscsi_conn *conn, struct iscsi_cmnd *cmnd) -@@ -83,14 +88,31 @@ static int is_data_available(struct iscs - - static void forward_iov(struct msghdr *msg, int len) - { -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0) -+ struct iovec *iov; -+ -+ while (msg->msg_iter.iov->iov_len <= len) { -+ len -= msg->msg_iter.iov->iov_len; -+ msg->msg_iter.iov++; -+ msg->msg_iter.nr_segs--; -+ } -+#else - while (msg->msg_iov->iov_len <= len) { - len -= msg->msg_iov->iov_len; - msg->msg_iov++; - msg->msg_iovlen--; - } -+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0) */ - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0) -+ /* XXX: discards const ... */ -+ iov = msg->msg_iter.iov; -+ iov->iov_base = (char *) msg->msg_iter.iov->iov_base + len; -+ iov->iov_len -= len; -+#else - msg->msg_iov->iov_base = (char *) msg->msg_iov->iov_base + len; - msg->msg_iov->iov_len -= len; -+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0) */ - } - - static int do_recv(struct iscsi_conn *conn, int state) -@@ -98,6 +120,9 @@ static int do_recv(struct iscsi_conn *co - mm_segment_t oldfs; - struct msghdr msg; - struct iovec iov[ISCSI_CONN_IOV_MAX]; -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0) -+ size_t iovlen = ISCSI_CONN_IOV_MAX; -+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0) */ - int i, len, res; - - if (!test_bit(CONN_ACTIVE, &conn->state)) { -@@ -110,12 +135,23 @@ static int do_recv(struct iscsi_conn *co - goto out; - } - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0) -+ if (conn->read_msg.msg_iter.nr_segs < iovlen) -+ iovlen = conn->read_msg.msg_iter.nr_segs; -+ -+ for (i = 0, len = 0; i < iovlen; i++) { -+ iov[i] = conn->read_msg.msg_iter.iov[i]; -+ len += iov[i].iov_len; -+ } -+ iov_iter_init(&msg.msg_iter, READ, iov, iovlen, len); -+#else - msg.msg_iov = iov; - msg.msg_iovlen = min_t(size_t, conn->read_msg.msg_iovlen, ISCSI_CONN_IOV_MAX); - for (i = 0, len = 0; i < msg.msg_iovlen; i++) { - iov[i] = conn->read_msg.msg_iov[i]; - len += iov[i].iov_len; - } -+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0) */ - - oldfs = get_fs(); - set_fs(get_ds()); -diff -Naurp iscsitarget-1.4.20.3+svn502_org/kernel/target_disk.c iscsitarget-1.4.20.3+svn502/kernel/target_disk.c ---- iscsitarget-1.4.20.3+svn502_org/kernel/target_disk.c 2014-05-06 13:59:55.000000000 -0700 -+++ iscsitarget-1.4.20.3+svn502/kernel/target_disk.c 2017-01-18 23:45:51.451010417 -0800 -@@ -606,7 +606,11 @@ static int disk_execute_cmnd(struct iscs - case REQUEST_SENSE: - send_data_rsp(cmnd, build_request_sense_response); - break; -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0) -+ case SERVICE_ACTION_IN_16: -+#else - case SERVICE_ACTION_IN: -+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0) */ - send_data_rsp(cmnd, build_service_action_in_response); - break; - case READ_6: -diff -Naurp iscsitarget-1.4.20.3+svn502_org/kernel/volume.c iscsitarget-1.4.20.3+svn502/kernel/volume.c ---- iscsitarget-1.4.20.3+svn502_org/kernel/volume.c 2014-05-06 13:59:55.000000000 -0700 -+++ iscsitarget-1.4.20.3+svn502/kernel/volume.c 2017-01-18 23:47:07.957561600 -0800 -@@ -398,7 +398,11 @@ int is_volume_reserved(struct iet_volume - case READ_CAPACITY: - /* allowed commands when reserved */ - break; -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0) -+ case SERVICE_ACTION_IN_16: -+#else - case SERVICE_ACTION_IN: -+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0) */ - if ((scb[1] & 0x1F) == 0x10) - break; - /* fall through */ -@@ -465,7 +469,11 @@ int is_volume_reserved(struct iet_volume - if (excl_access_ro && !registered) - err = -EBUSY; - break; -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0) -+ case SERVICE_ACTION_IN_16: -+#else - case SERVICE_ACTION_IN: -+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0) */ - if ((scb[1] & 0x1F) == 0x10) - break; - /* fall through */ diff --git a/meta-networking/recipes-extended/iscsitarget/files/use-kernel-makefile-to-get-kernel-version.patch b/meta-networking/recipes-extended/iscsitarget/files/use-kernel-makefile-to-get-kernel-version.patch deleted file mode 100644 index 95bd047b97..0000000000 --- a/meta-networking/recipes-extended/iscsitarget/files/use-kernel-makefile-to-get-kernel-version.patch +++ /dev/null @@ -1,67 +0,0 @@ -Get linux kernel version from Makefile of kernel source - -We get below messages while building iscsitarget, - --- snip -- -x86_64-poky-linux-gcc: error: -/CGE7_SHDD/project_yocto_1.8/poky/build/tmp/work-shared/qemux86-64/kernel-source/include/linux/version.h: -No such file or directory -x86_64-poky-linux-gcc: fatal error: no input files -compilation terminated. -/bin/sh: line 0: [: too many arguments -/bin/sh: line 0: [: too many arguments -/bin/sh: line 0: [: too many arguments -/bin/sh: line 0: [: too many arguments -/bin/sh: line 0: [: too many arguments -/bin/sh: line 0: [: too many arguments -/bin/sh: line 0: [: too many arguments -/bin/sh: line 0: [: too many arguments -/bin/sh: line 0: [: too many arguments -/bin/sh: line 0: [: too many arguments -/bin/sh: line 0: [: too many arguments -/bin/sh: line 0: [: too many arguments --- CUT -- - -These messages are due to absence of include/linux/version.h file in -kernel source directory and failed to compute linux kernel version. -So, use kernel source Makefile ( i.e $(KSRC)/Makefile) to find out -actual kernel version. - -Upstream-Status: Pending - -Signed-off-by: Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com> - ---- iscsitarget-1.4.20.3+svn499_org/Makefile 2014-01-27 00:00:45.000000000 +0530 -+++ iscsitarget-1.4.20.3+svn499/Makefile 2015-07-23 10:44:47.013600285 +0530 -@@ -18,27 +18,11 @@ ifeq ($(KSRC),) - endif - - --ifneq ($(wildcard $(KSRC)/include/generated/utsrelease.h),) -- VERSION_FILE := $(KSRC)/include/generated/utsrelease.h --else -- ifneq ($(wildcard $(KSRC)/include/linux/utsrelease.h),) -- VERSION_FILE := $(KSRC)/include/linux/utsrelease.h -- else -- VERSION_FILE := $(KSRC)/include/linux/version.h -- endif --endif -- --KVER := $(shell $(CC) $(CFLAGS) $(LDFLAGS) -E -dM $(VERSION_FILE) | \ -- grep UTS_RELEASE | awk '{ print $$3 }' | sed 's/\"//g') -- - KMOD := /lib/modules/$(KVER)/extra -- --KMAJ := $(shell echo $(KVER) | \ -- sed -e 's/^\([0-9][0-9]*\)\.[0-9][0-9]*\.[0-9][0-9]*.*/\1/') --KMIN := $(shell echo $(KVER) | \ -- sed -e 's/^[0-9][0-9]*\.\([0-9][0-9]*\)\.[0-9][0-9]*.*/\1/') --KREV := $(shell echo $(KVER) | \ -- sed -e 's/^[0-9][0-9]*\.[0-9][0-9]*\.\([0-9][0-9]*\).*/\1/') -+KMAJ := $(shell cat $(KSRC)/Makefile | grep ^VERSION | gawk -F " " '{ print $$NF }') -+KMIN := $(shell cat $(KSRC)/Makefile | grep ^PATCHLEVEL | gawk -F " " '{ print $$NF }') -+KREV := $(shell cat $(KSRC)/Makefile | grep ^SUBLEVEL | gawk -F " " '{ print $$NF }') -+KVER := ${KMAJ}.${KMIN}.${KREV} - - kver_eq = $(shell [ $(KMAJ) -eq $(1) -a $(KMIN) -eq $(2) -a $(KREV) -eq $(3) ] && \ - echo 1 || echo 0) diff --git a/meta-networking/recipes-extended/iscsitarget/iscsitarget_1.4.20.3+svn502.bb b/meta-networking/recipes-extended/iscsitarget/iscsitarget_1.4.20.3+svn502.bb deleted file mode 100644 index 6593661075..0000000000 --- a/meta-networking/recipes-extended/iscsitarget/iscsitarget_1.4.20.3+svn502.bb +++ /dev/null @@ -1,62 +0,0 @@ -DESCRIPTION = "iSCSI Enterprise Target is aimed to develop an \ - open source iSCSI target with professional features, \ - that works well in enterprise environment under real \ - workload, and is scalable and versatile enough to meet the \ - challenge of future storage needs and developments." -HOMEPAGE = "http://iscsitarget.sourceforge.net/" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=6e233eda45c807aa29aeaa6d94bc48a2" -DEPENDS = "openssl virtual/kernel" - -SRC_URI = "http://ftp.heanet.ie/mirrors/ubuntu/pool/universe/i/${BPN}/${BPN}_${PV}.orig.tar.gz \ - file://use-kernel-makefile-to-get-kernel-version.patch \ - file://fix-errors-observed-with-linux-3.19-and-greater.patch \ - file://access-sk_v6_daddr-iff-IPV6-defined.patch \ - file://build_with_updated_bio_struct_of_linux_v4.3_and_above.patch \ - file://build_with_updated_interfaces_of_linux_v4.8_and_above.patch \ - file://fix-call-trace-of-ahash-API-calling.patch \ - file://0001-kernel-event-netlink_ack-now-requires-4-arguments.patch \ - " - -SRC_URI[md5sum] = "ef9bc823bbabd3c772208c00d5f2d089" -SRC_URI[sha256sum] = "d3196ccb78a43266dce28587bfe30d8ab4db7566d7bce96057dfbb84100babb5" - -inherit module - -do_configure[noexec] = "1" - -# make_scripts requires kernel source directory to create -# kernel scripts -do_make_scripts[depends] += "virtual/kernel:do_shared_workdir" - -do_compile() { - oe_runmake KSRC=${STAGING_KERNEL_DIR} LDFLAGS='' V=1 kernel - oe_runmake KSRC=${STAGING_KERNEL_DIR} usr -} - -do_install() { - # Module - install -d ${D}/lib/modules/${KERNEL_VERSION}/kernel/iscsi - install -m 0644 kernel/iscsi_trgt.ko \ - ${D}/lib/modules/${KERNEL_VERSION}/kernel/iscsi/iscsi_trgt.ko - - # Userspace utilities - install -d ${D}${sbindir} - install -m 0755 usr/ietd ${D}${sbindir}/ietd - install -m 0755 usr/ietadm ${D}${sbindir}/ietadm - - # Config files, init scripts - mkdir -p ${D}${sysconfdir}/iet - install -m 0644 etc/ietd.conf ${D}/${sysconfdir}/iet/ietd.conf - install -m 0644 etc/initiators.allow ${D}${sysconfdir}/iet/initiators.allow - install -m 0644 etc/targets.allow ${D}${sysconfdir}/iet/targets.allow - mkdir -p ${D}${sysconfdir}/init.d - install -m 0755 etc/initd/initd ${D}${sysconfdir}/init.d/iscsi-target - install -m 0644 etc/initiators.deny ${D}${sysconfdir}/iet/initiators.deny -} - -FILES_${PN} += "${sbindir} \ - ${sysconfdir}" - -RDEPENDS_${PN} = "kernel-module-iscsi-trgt" -RRECOMMENDS_${PN} = "kernel-module-crc32c kernel-module-libcrc32c" diff --git a/meta-networking/recipes-extended/kronosnet/kronosnet/0001-links.c-Fix-build-with-gcc-12.patch b/meta-networking/recipes-extended/kronosnet/kronosnet/0001-links.c-Fix-build-with-gcc-12.patch new file mode 100644 index 0000000000..d57d0e61b5 --- /dev/null +++ b/meta-networking/recipes-extended/kronosnet/kronosnet/0001-links.c-Fix-build-with-gcc-12.patch @@ -0,0 +1,40 @@ +From a8aac8f3fd8b07fde8f5dc0aa9ece54a46d24425 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Thu, 9 Jun 2022 16:03:06 +0800 +Subject: [PATCH] links.c: Fix build with gcc-12 + +Fixes: + | /build/tmp-glibc/work/corei7-64-wrs-linux/kronosnet/1.22-r0/recipe-sysroot/usr/include/bits/string_fortified.h:59:10: error: 'link' may be used uninitialized [-Werror=maybe-uninitialized] + | 59 | return __builtin___memset_chk (__dest, __ch, __len, + | | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + | 60 | __glibc_objsize0 (__dest)); + | | ~~~~~~~~~~~~~~~~~~~~~~~~~~ + | ../../git/libknet/links.c: In function 'knet_link_set_config': + | ../../git/libknet/links.c:108:27: note: 'link' was declared here + | 108 | struct knet_link *link; + | | ^~~~ + | cc1: all warnings being treated as errors + +Upstream-Status: Submitted [https://github.com/kronosnet/kronosnet/pull/382] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + libknet/links.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libknet/links.c b/libknet/links.c +index 8cb1621b..0ef42b79 100644 +--- a/libknet/links.c ++++ b/libknet/links.c +@@ -105,7 +105,7 @@ int knet_link_set_config(knet_handle_t knet_h, knet_node_id_t host_id, uint8_t l + { + int savederrno = 0, err = 0, i, wipelink = 0, link_idx; + struct knet_host *host, *tmp_host; +- struct knet_link *link; ++ struct knet_link *link = NULL; + + if (!_is_valid_handle(knet_h)) { + return -1; +-- +2.25.1 + diff --git a/meta-networking/recipes-extended/kronosnet/kronosnet_1.24.bb b/meta-networking/recipes-extended/kronosnet/kronosnet_1.24.bb new file mode 100644 index 0000000000..cbd5e7a0fd --- /dev/null +++ b/meta-networking/recipes-extended/kronosnet/kronosnet_1.24.bb @@ -0,0 +1,32 @@ +# Copyright (C) 2020 Khem Raj <raj.khem@gmail.com> +# Released under the MIT license (see COPYING.MIT for the terms) + +SUMMARY = "Kronosnet, often referred to as knet, is a network abstraction layer \ + designed for High Availability use cases, where redundancy, security, \ + fault tolerance and fast fail-over are the core requirements of your application." +HOMEPAGE = "https://kronosnet.org/" +LICENSE = "GPL-2.0-or-later & LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING.applications;md5=751419260aa954499f7abaabaa882bbe \ + file://COPYING.libraries;md5=2d5025d4aa3495befef8f17206a5b0a1" +SECTION = "libs" +DEPENDS = "doxygen-native libqb-native libxml2-native bzip2 libqb libxml2 libnl lksctp-tools lz4 lzo openssl nss xz zlib zstd" + +SRCREV = "f8f80fd7f9b85f2626d2c6452612962ad8efca9e" +SRC_URI = "git://github.com/kronosnet/kronosnet;protocol=https;branch=stable1 \ + file://0001-links.c-Fix-build-with-gcc-12.patch \ + " + +UPSTREAM_CHECK_URI = "https://github.com/kronosnet/kronosnet/releases" + +inherit autotools pkgconfig + +S = "${WORKDIR}/git" + +# libknet/transport_udp.c:326:48: error: comparison of integers of different signs: 'unsigned long' and 'int' [-Werror,-Wsign-compare] +# for (cmsg = CMSG_FIRSTHDR(&msg);cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) { +# ^~~~~~~~~~~~~~~~~~~~~~~ +CFLAGS:append:toolchain-clang = " -Wno-sign-compare" + +PACKAGECONFIG[man] = "enable_man="yes", --disable-man, " + +PACKAGECONFIG:remove = "man" diff --git a/meta-networking/recipes-extended/tgt/files/0001-Correct-the-path-of-header-files-check-in-Yocto-buil.patch b/meta-networking/recipes-extended/tgt/files/0001-Correct-the-path-of-header-files-check-in-Yocto-buil.patch new file mode 100644 index 0000000000..173ecb620d --- /dev/null +++ b/meta-networking/recipes-extended/tgt/files/0001-Correct-the-path-of-header-files-check-in-Yocto-buil.patch @@ -0,0 +1,47 @@ +From 93fea40915d01be6d02587a0b8be85a642e6a8d5 Mon Sep 17 00:00:00 2001 +From: Zhenhua Luo <zhenhua.luo@freescale.com> +Date: Thu, 10 Apr 2014 11:26:39 +0800 +Subject: [PATCH] Correct the path of header files check in Yocto build env + +Upstream-Status: Inappropriate [the fix is specific to Yocto build env] + +Current Makefile will check headers on host instead of Yocto sysroot, following +error appears. Change the path of header check. +| bs_aio.c:34:20: fatal error: libaio.h: No such file or directory +| #include <libaio.h> +| ^ +| compilation terminated. + +Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com> + +--- + usr/Makefile | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/usr/Makefile b/usr/Makefile +index decf13c..9ff8f15 100644 +--- a/usr/Makefile ++++ b/usr/Makefile +@@ -1,11 +1,11 @@ + sbindir ?= $(PREFIX)/sbin + libdir ?= $(PREFIX)/lib/tgt + +-ifneq ($(shell test -e /usr/include/linux/signalfd.h && echo 1),) ++ifneq ($(shell test -e $(SYSROOT)/usr/include/linux/signalfd.h && echo 1),) + CFLAGS += -DUSE_SIGNALFD + endif + +-ifneq ($(shell test -n $(shell find /usr/include -name "timerfd.h" | head -n1) && echo 1),) ++ifneq ($(shell test -n $(shell find $(SYSROOT)/usr/include -name "timerfd.h" | head -n1) && echo 1),) + CFLAGS += -DUSE_TIMERFD + endif + +@@ -25,7 +25,7 @@ ifneq ($(SD_NOTIFY),) + CFLAGS += -DUSE_SYSTEMD + endif + +-ifneq ($(shell test -e /usr/include/sys/eventfd.h && test -e /usr/include/libaio.h && echo 1),) ++ifneq ($(shell test -e $(SYSROOT)/usr/include/sys/eventfd.h && test -e $(SYSROOT)/usr/include/libaio.h && echo 1),) + CFLAGS += -DUSE_EVENTFD + TGTD_OBJS += bs_aio.o + LIBS += -laio diff --git a/meta-networking/recipes-extended/tgt/files/0001-usr-Makefile-WARNING-fix.patch b/meta-networking/recipes-extended/tgt/files/0001-usr-Makefile-WARNING-fix.patch new file mode 100644 index 0000000000..a3ea604086 --- /dev/null +++ b/meta-networking/recipes-extended/tgt/files/0001-usr-Makefile-WARNING-fix.patch @@ -0,0 +1,29 @@ +From 6f4e3b11c7dccf83e2d18635c84837b212dfcc1c Mon Sep 17 00:00:00 2001 +From: Li xin <lixin.fnst@cn.fujitsu.com> +Date: Sun, 26 Jul 2015 04:23:51 +0900 +Subject: [PATCH] usr/Makefile: WARNING fix WARNING: QA Issue: tgt: + /work/i586-oe-linux/tgt/1.0.60+gitAUTOINC+ab51727a36-r0/ + packages-split/tgt/usr/sbin/tgtd contains probably-redundant RPATH /usr/lib + [useless-rpaths] + +Upstream-Status: Pending + +Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> + +--- + usr/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/usr/Makefile b/usr/Makefile +index 9ff8f15..cc8df11 100644 +--- a/usr/Makefile ++++ b/usr/Makefile +@@ -63,7 +63,7 @@ TGTD_OBJS += tgtd.o mgmt.o target.o scsi.o log.o driver.o util.o work.o \ + + TGTD_DEP = $(TGTD_OBJS:.o=.d) + +-LDFLAGS = -Wl,-E,-rpath=$(libdir) ++LDFLAGS += -Wl,-E + + .PHONY:all + all: $(PROGRAMS) $(MODULES) diff --git a/meta-networking/recipes-extended/tgt/files/musl-__wordsize.patch b/meta-networking/recipes-extended/tgt/files/musl-__wordsize.patch new file mode 100644 index 0000000000..ac758cc39d --- /dev/null +++ b/meta-networking/recipes-extended/tgt/files/musl-__wordsize.patch @@ -0,0 +1,41 @@ +The definition of __WORDSIZE is found in <sys/reg.h> + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- a/usr/iscsi/iscsid.h ++++ b/usr/iscsi/iscsid.h +@@ -22,6 +22,9 @@ + #include <stdint.h> + #include <inttypes.h> + #include <netdb.h> ++#if !defined(__GLIBC__) ++#include <sys/reg.h> ++#endif + + #include "transport.h" + #include "list.h" +--- a/usr/tgtd.h ++++ b/usr/tgtd.h +@@ -1,6 +1,9 @@ + #ifndef __TARGET_DAEMON_H + #define __TARGET_DAEMON_H + ++#if !defined(__GLIBC__) ++#include <sys/reg.h> ++#endif + #include "log.h" + #include "scsi_cmnd.h" + #include "tgtadm_error.h" +--- a/usr/util.h ++++ b/usr/util.h +@@ -19,6 +19,9 @@ + #include <linux/fs.h> + #include <sys/types.h> + #include <sys/stat.h> ++#if !defined(__GLIBC__) ++#include <sys/reg.h> ++#endif + + #include "be_byteshift.h" + diff --git a/meta-networking/recipes-extended/tgt/files/tgtd b/meta-networking/recipes-extended/tgt/files/tgtd new file mode 100644 index 0000000000..64df6a3eb4 --- /dev/null +++ b/meta-networking/recipes-extended/tgt/files/tgtd @@ -0,0 +1,5 @@ +# options for tgtd +TGTD_OPTS="" + +# configuration file +TGTD_CONFIG=/etc/tgt/targets.conf diff --git a/meta-networking/recipes-extended/tgt/files/tgtd.init b/meta-networking/recipes-extended/tgt/files/tgtd.init new file mode 100644 index 0000000000..4b0ce9443f --- /dev/null +++ b/meta-networking/recipes-extended/tgt/files/tgtd.init @@ -0,0 +1,116 @@ +#!/bin/sh + +### BEGIN INIT INFO +# Provides: tgtd +# Required-Start: $remote_fs $network $syslog +# Required-Stop: $remote_fs $syslog +# Default-Start: 3 5 +# Default-Stop: 0 1 2 6 +# Short-Description: SCSI target daemon +# Description: Linux SCSI target framework (tgt) +### END INIT INFO + +DESC="tgtd" +DAEMON="/usr/sbin/tgtd" +TGTD_CONFIG=/etc/tgt/targets.conf + +start () +{ + echo -n "Starting $DESC..." + + # Ensure service isn't running + tgt-admin -s >/dev/null 2>&1 + RETVAL=$? + if [ "$RETVAL" -ne 107 ] ; then + echo "$DESC is already running." + exit 1 + fi + + # Start tgtd first + $DAEMON &>/dev/null + RETVAL=$? + if [ "$RETVAL" -ne 0 ]; then + echo "failed." + exit 1 + fi + + # Put tgtd into "offline" state until all the targets are configured. + # We don't want initiators to (re)connect and fail the connection + # if it's not ready. + tgtadm --op update --mode sys --name State -v offline + # Configure the targets. + tgt-admin -f -e -c $TGTD_CONFIG + # Put tgtd into "ready" state. + tgtadm --op update --mode sys --name State -v ready + + echo "done." +} + +stop () +{ + echo -n "Stopping $DESC..." + + # Remove all targets. It only removes targets which are not in use. + tgt-admin --update ALL -c /dev/null &>/dev/null + # tgtd will exit if all targets were removed + tgtadm --op delete --mode system &>/dev/null + RETVAL=$? + if [ "$RETVAL" -eq 107 ] ; then + if [ "$TASK" != "restart" ] ; then + return 1 + fi + elif [ "$RETVAL" -ne 0 ] ; then + echo "Some initiators are still connected - could not stop tgtd" + return 2 + fi + echo -n +} + +reload() +{ + echo "Reloading configuration of $DESC" "$NAME" + # Update configuration for targets. Only targets which + # are not in use will be updated. + tgt-admin --update ALL -c $TGTD_CONFIG &>/dev/null + RETVAL=$? + if [ "$RETVAL" -eq 107 ] ; then + echo "tgtd is not running" + exit 1 + fi +} + +status() +{ + tgt-admin -s >/dev/null 2>&1 + RETVAL=$? + if [ "$RETVAL" -eq 107 ] ; then + echo "tgtd is not running" + else + echo "tgtd is running" + fi +} + +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart|force-reload) + stop + start + ;; + reload) + reload + ;; + status) + status + ;; + *) + echo "Usage: $0 {start|stop|force-reload|restart|status|reload}" + exit 1 + ;; +esac + +exit 0 diff --git a/meta-networking/recipes-extended/tgt/files/tgtd.service b/meta-networking/recipes-extended/tgt/files/tgtd.service new file mode 100755 index 0000000000..afbd4b4eaa --- /dev/null +++ b/meta-networking/recipes-extended/tgt/files/tgtd.service @@ -0,0 +1,33 @@ +[Unit] +Description=tgtd iSCSI target daemon +After=network.target + +[Service] +EnvironmentFile=@SYSCONFDIR@/sysconfig/tgtd + +ExecStart=@SBINDIR@/tgtd -f $TGTD_OPTS +# see bz 848942. workaround for a race for now. +ExecStartPost=@BASE_BINDIR@/sleep 5 +# Put tgtd into "offline" state until all the targets are configured. +# We don't want initiators to (re)connect and fail the connection +# if it's not ready. +ExecStartPost=@SBINDIR@/tgtadm --op update --mode sys --name State -v offline +# Configure the targets. +ExecStartPost=@SBINDIR@/tgt-admin -e -c $TGTD_CONFIG +# Put tgtd into "ready" state. +ExecStartPost=@SBINDIR@/tgtadm --op update --mode sys --name State -v ready + +# Update configuration for targets. Only targets which +# are not in use will be updated. +ExecReload=@SBINDIR@/tgt-admin --update ALL -c $TGTD_CONFIG + +# NOTE: Shutdown of the iscsi target may cause data corruption +# for initiators that are connected. +ExecStop=@SBINDIR@/tgtadm --op update --mode sys --name State -v offline +# Remove all targets. It only removes targets which are not in use. +ExecStop=@SBINDIR@/tgt-admin --update ALL -c /dev/null +# tgtd will exit if all targets were removed +ExecStop=@SBINDIR@/tgtadm --op delete --mode system + +[Install] +WantedBy=multi-user.target diff --git a/meta-networking/recipes-extended/tgt/files/usr-Makefile-apply-LDFLAGS-to-all-executables.patch b/meta-networking/recipes-extended/tgt/files/usr-Makefile-apply-LDFLAGS-to-all-executables.patch new file mode 100644 index 0000000000..b6c674bd9d --- /dev/null +++ b/meta-networking/recipes-extended/tgt/files/usr-Makefile-apply-LDFLAGS-to-all-executables.patch @@ -0,0 +1,37 @@ +From a815ac8ee16b344d9e24b445957f32bf2aafa532 Mon Sep 17 00:00:00 2001 +From: Mark Asselstine <mark.asselstine@windriver.com> +Date: Thu, 5 Jan 2017 11:07:51 -0500 +Subject: [PATCH] usr/Makefile: apply LDFLAGS to all executables + +Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> +--- +Upstream-Status: Pending + + usr/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/usr/Makefile b/usr/Makefile +index cc8df11..c55fd68 100644 +--- a/usr/Makefile ++++ b/usr/Makefile +@@ -78,7 +78,7 @@ TGTADM_OBJS = tgtadm.o concat_buf.o + TGTADM_DEP = $(TGTADM_OBJS:.o=.d) + + tgtadm: $(TGTADM_OBJS) +- $(CC) $^ -o $@ ++ $(CC) $^ -o $@ $(LDFLAGS) + + -include $(TGTADM_DEP) + +@@ -86,7 +86,7 @@ TGTIMG_OBJS = tgtimg.o libssc.o libcrc32c.o + TGTIMG_DEP = $(TGTIMG_OBJS:.o=.d) + + tgtimg: $(TGTIMG_OBJS) +- $(CC) $^ -o $@ ++ $(CC) $^ -o $@ $(LDFLAGS) + + -include $(TGTIMG_DEP) + +-- +2.7.4 + diff --git a/meta-networking/recipes-extended/tgt/tgt_1.0.90.bb b/meta-networking/recipes-extended/tgt/tgt_1.0.90.bb new file mode 100644 index 0000000000..e816b79e87 --- /dev/null +++ b/meta-networking/recipes-extended/tgt/tgt_1.0.90.bb @@ -0,0 +1,93 @@ +DESCRIPTION = "Linux SCSI target framework (tgt)" +HOMEPAGE = "http://stgt.sourceforge.net" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://scripts/tgtd.spec;beginline=7;endline=7;md5=21c19ea7dad04648b9c2f791b6e29b4c" +DEPENDS = "sg3-utils libaio" + +SRCREV = "df991fa788e22cd8b8e3013cfae306988c19c3d0" + +SRC_URI = "git://github.com/fujita/tgt.git;branch=master;protocol=https \ + file://0001-Correct-the-path-of-header-files-check-in-Yocto-buil.patch \ + file://0001-usr-Makefile-WARNING-fix.patch \ + file://usr-Makefile-apply-LDFLAGS-to-all-executables.patch \ + file://musl-__wordsize.patch \ +" +SRC_URI += "file://tgtd.init \ + file://tgtd.service \ + file://tgtd \ +" + +S = "${WORKDIR}/git" + +CONFFILES:${PN} += "${sysconfdir}/tgt/targets.conf" + +inherit update-rc.d systemd + +SYSTEMD_SERVICE:${PN} = "tgtd.service" +SYSTEMD_AUTO_ENABLE:${PN} = "disable" + +CFLAGS += ' -I. -DUSE_SIGNALFD -DUSE_TIMERFD -D_GNU_SOURCE -DTGT_VERSION=\\"1.0.63\\" -DBSDIR=\\"${libdir}/backing-store\\"' + +CFLAGS:append:libc-musl = " -D_LARGEFILE64_SOURCE" +#do_compile() { +# oe_runmake SYSROOT="${STAGING_DIR_TARGET}" -e programs conf scripts +#} +EXTRA_OEMAKE = "-e programs conf scripts" + +do_install() { + oe_runmake -e DESTDIR="${D}" install-programs install-conf install-scripts + + if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${UNPACKDIR}/tgtd.init ${D}${sysconfdir}/init.d/tgtd + elif ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${UNPACKDIR}/tgtd.service ${D}${systemd_unitdir}/system/tgtd.service + install -d ${D}${sysconfdir}/sysconfig + install -m 0644 ${UNPACKDIR}/tgtd ${D}${sysconfdir}/sysconfig/tgtd + sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/tgtd.service + sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' ${D}${systemd_unitdir}/system/tgtd.service + sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/tgtd.service + fi +} + +FILES:${PN} += "${systemd_unitdir}/system/tgtd.service \ + ${sysconfdir}/sysconfig/tgtd \ +" + +RDEPENDS:${PN} = " \ + bash \ + libaio \ + libconfig-general-perl \ + perl \ + perl-module-english \ + perl-module-tie-hash-namedcapture \ + perl-module-xsloader \ + perl-module-carp \ + perl-module-exporter \ + perl-module-errno \ + perl-module-exporter-heavy \ + perl-module-symbol \ + perl-module-selectsaver \ + perl-module-dynaloader \ + perl-module-carp-heavy \ + perl-module-filehandle \ + perl-module-feature \ + perl-module-overload \ + perl-module-fcntl \ + perl-module-io \ + perl-module-io-file \ + perl-module-io-handle \ + perl-module-io-seekable \ + perl-module-file-glob \ + perl-module-base \ + perl-module-encoding-warnings \ + perl-module-file-spec-unix \ + perl-module-file-spec \ + perl-module-file-spec-functions \ + perl-module-getopt-long \ + perl-module-constant \ + " +INITSCRIPT_PACKAGES = "${PN}" +INITSCRIPT_NAME:${PN} = "tgtd" + diff --git a/meta-networking/recipes-filter/arno-iptables-firewall/arno-iptables-firewall_2.0.1g.bb b/meta-networking/recipes-filter/arno-iptables-firewall/arno-iptables-firewall_2.1.2.bb index 6fd0affdf6..940454c3ac 100644 --- a/meta-networking/recipes-filter/arno-iptables-firewall/arno-iptables-firewall_2.0.1g.bb +++ b/meta-networking/recipes-filter/arno-iptables-firewall/arno-iptables-firewall_2.1.2.bb @@ -1,15 +1,13 @@ SUMMARY = "IPTables based firewall scripts" HOMEPAGE = "http://rocky.eld.leidenuniv.nl/joomla/index.php?option=com_content&view=article&id=45&Itemid=63" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://gpl_license.txt;md5=11c7b65c4a4acb9d5175f7e9bf99c403" -SRC_URI = "http://rocky.eld.leidenuniv.nl/arno-iptables-firewall/${BPN}_${PV}.tar.gz \ - " -SRC_URI[md5sum] = "77eba7f148bf2840a3e35a6f50c9c353" -SRC_URI[sha256sum] = "0bafd85ddc235752250eaec0c7fdb21e530912483f6807a97f86158ed2d301f7" +SRCREV = "c8dfd85b9e8e453e279525f30c1e3184c092f036" +SRC_URI = "git://github.com/arno-iptables-firewall/aif;branch=master;protocol=https" -S = "${WORKDIR}/${BPN}_${PV}" +S = "${WORKDIR}/git" inherit systemd @@ -22,7 +20,7 @@ do_install() { install -m 0755 ${S}/bin/arno-fwfilter ${D}${bindir} cp -r ${S}/share/arno-iptables-firewall/* ${D}${datadir}/arno-iptables-firewall cp -r ${S}/etc/arno-iptables-firewall/* ${D}${sysconfdir}/arno-iptables-firewall - install -m 0644 ${S}/${systemd_unitdir}/system/arno-iptables-firewall.service ${D}${systemd_unitdir}/system + install -m 0644 ${S}/lib/systemd/system/arno-iptables-firewall.service ${D}${systemd_unitdir}/system sed -i -e 's%/usr/local/sbin%${bindir}%g' ${D}${systemd_unitdir}/system/arno-iptables-firewall.service sed -i -e 's%/usr/local/sbin%${sbindir}%g' ${D}${bindir}/arno-iptables-firewall sed -i -e 's%/usr/local%${exec_prefix}%g' ${D}${sysconfdir}/arno-iptables-firewall/firewall.conf @@ -31,5 +29,5 @@ do_install() { sed -i -e 's%#!/bin/bash%#!/bin/sh%g' ${D}${datadir}/arno-iptables-firewall/plugins/dyndns-host-open-helper } -SYSTEMD_SERVICE_${PN} = "arno-iptables-firewall.service" -FILES_${PN} += "${systemd_unitdir}/system/arno-iptables-firewall.service" +SYSTEMD_SERVICE:${PN} = "arno-iptables-firewall.service" +FILES:${PN} += "${systemd_unitdir}/system/arno-iptables-firewall.service" diff --git a/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.4.bb b/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.4.bb deleted file mode 100644 index 8b3490d7c2..0000000000 --- a/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.4.bb +++ /dev/null @@ -1,36 +0,0 @@ -SUMMARY = "Connection tracking userspace tools for Linux" -SECTION = "net" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" - -DEPENDS = "libnfnetlink libnetfilter-conntrack libnetfilter-cttimeout \ - libnetfilter-cthelper libnetfilter-queue bison-native" - -DEPENDS_append_libc-musl = " libtirpc" -CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc" -LDFLAGS_append_libc-musl = " -ltirpc" - -SRC_URI = "http://www.netfilter.org/projects/conntrack-tools/files/conntrack-tools-${PV}.tar.bz2;name=tar \ - file://conntrack-failover \ - file://init \ -" -SRC_URI[tar.md5sum] = "acd9e0b27cf16ae3092ba900e4d7560e" -SRC_URI[tar.sha256sum] = "b7caf4fcc4c03575df57d25e5216584d597fd916c891f191dac616ce68bdba6c" - -inherit autotools update-rc.d pkgconfig - -INITSCRIPT_NAME = "conntrackd" - -do_install_append() { - install -d ${D}/${sysconfdir}/conntrackd - install -d ${D}/${sysconfdir}/init.d - install -m 0644 ${S}/doc/sync/ftfw/conntrackd.conf ${D}/${sysconfdir}/conntrackd/conntrackd.conf.sample - install -m 0755 ${WORKDIR}/conntrack-failover ${D}/${sysconfdir}/init.d/conntrack-failover - install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/conntrackd - - # Fix hardcoded paths in scripts - sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}/${sysconfdir}/init.d/conntrack-failover ${D}/${sysconfdir}/init.d/conntrackd - sed -i 's!/etc/!${sysconfdir}/!g' ${D}/${sysconfdir}/init.d/conntrack-failover ${D}/${sysconfdir}/init.d/conntrackd - sed -i 's!/var/!${localstatedir}/!g' ${D}/${sysconfdir}/init.d/conntrack-failover ${D}/${sysconfdir}/init.d/conntrackd ${D}/${sysconfdir}/conntrackd/conntrackd.conf.sample - sed -i 's!^export PATH=.*!export PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}/${sysconfdir}/init.d/conntrackd -} 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 new file mode 100644 index 0000000000..524718d56c --- /dev/null +++ b/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.8.bb @@ -0,0 +1,60 @@ +SUMMARY = "Connection tracking userspace tools for Linux" +SECTION = "net" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" + +DEPENDS = "libnfnetlink libnetfilter-conntrack libnetfilter-cttimeout \ + libnetfilter-cthelper libnetfilter-queue bison-native libtirpc" + +EXTRA_OECONF += "LIBS=-ltirpc CPPFLAGS=-I${STAGING_INCDIR}/tirpc" + +SRC_URI = "http://www.netfilter.org/projects/conntrack-tools/files/conntrack-tools-${PV}.tar.xz \ + file://conntrack-failover \ + file://init \ + file://conntrackd.service \ +" +SRC_URI[sha256sum] = "067677f4c5f6564819e78ed3a9d4a8980935ea9273f3abb22a420ea30ab5ded6" + +inherit autotools update-rc.d pkgconfig systemd + +PACKAGECONFIG ?= "cthelper cttimeout \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" + +PACKAGECONFIG[cthelper] = "--enable-cthelper,--disable-cthelper" +PACKAGECONFIG[cttimeout] = "--enable-cttimeout,--disable-cttimeout" +PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd" + +INITSCRIPT_NAME = "conntrackd" + +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE:${PN} = "conntrackd.service" +SYSTEMD_AUTO_ENABLE = "disable" + +do_install:append() { + install -d ${D}/${sysconfdir}/conntrackd + install -d ${D}/${sysconfdir}/init.d + install -m 0644 ${S}/doc/sync/ftfw/conntrackd.conf ${D}/${sysconfdir}/conntrackd/conntrackd.conf.sample + install -m 0755 ${UNPACKDIR}/conntrack-failover ${D}/${sysconfdir}/init.d/conntrack-failover + install -m 0755 ${UNPACKDIR}/init ${D}/${sysconfdir}/init.d/conntrackd + + # Fix hardcoded paths in scripts + sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}/${sysconfdir}/init.d/conntrack-failover ${D}/${sysconfdir}/init.d/conntrackd + sed -i 's!/etc/!${sysconfdir}/!g' ${D}/${sysconfdir}/init.d/conntrack-failover ${D}/${sysconfdir}/init.d/conntrackd + sed -i 's!/var/!${localstatedir}/!g' ${D}/${sysconfdir}/init.d/conntrack-failover ${D}/${sysconfdir}/init.d/conntrackd ${D}/${sysconfdir}/conntrackd/conntrackd.conf.sample + sed -i 's!^export PATH=.*!export PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}/${sysconfdir}/init.d/conntrackd + + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}/${systemd_system_unitdir} + install -m 644 ${UNPACKDIR}/conntrackd.service ${D}/${systemd_system_unitdir} + fi +} + +# fix error message: Do not forget that you need *root* or CAP_NET_ADMIN capabilities ;-) +pkg_postinst:${PN} () { + setcap cap_net_admin+ep "$D/${sbindir}/conntrack" +} +PACKAGE_WRITE_DEPS += "libcap-native" + +RRECOMMENDS:${PN} = "kernel-module-nf-conntrack kernel-module-nfnetlink \ + kernel-module-nf-conntrack-netlink \ + " diff --git a/meta-networking/recipes-filter/conntrack-tools/files/conntrackd.service b/meta-networking/recipes-filter/conntrack-tools/files/conntrackd.service new file mode 100644 index 0000000000..b3b0f1d216 --- /dev/null +++ b/meta-networking/recipes-filter/conntrack-tools/files/conntrackd.service @@ -0,0 +1,11 @@ +[Unit] +Description=Conntrack Daemon +Documentation=man:conntrackd(8) man:conntrackd.conf(5) + +[Service] +Type=notify +ExecStartPre=-/bin/rm -f /var/lock/conntrackd.lock +ExecStart=/usr/sbin/conntrackd -C /etc/conntrackd/conntrackd.conf + +[Install] +WantedBy=multi-user.target diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0001-add-RARP-and-update-iana-url.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0001-add-RARP-and-update-iana-url.patch deleted file mode 100644 index 90b69792b8..0000000000 --- a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0001-add-RARP-and-update-iana-url.patch +++ /dev/null @@ -1,45 +0,0 @@ -From dd35afc9ce1004128a754d5eeb8c5c2cb32ae420 Mon Sep 17 00:00:00 2001 -From: Bart De Schuymer <bdschuym@pandora.be> -Date: Tue, 3 Jul 2012 18:47:32 +0000 -Subject: [PATCH 01/10] add RARP and update iana url - ---- - ethertypes | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -diff --git a/ethertypes b/ethertypes -index 5e700f6..813177b 100644 ---- a/ethertypes -+++ b/ethertypes -@@ -5,6 +5,7 @@ - # - # This list could be found on: - # http://www.iana.org/assignments/ethernet-numbers -+# http://www.iana.org/assignments/ieee-802-numbers - # - # <name> <hexnumber> <alias1>...<alias35> #Comment - # -@@ -21,15 +22,16 @@ LAT 6004 # DEC LAT - DIAG 6005 # DEC Diagnostics - CUST 6006 # DEC Customer use - SCA 6007 # DEC Systems Comms Arch --TEB 6558 # Trans Ether Bridging [RFC1701] --RAW_FR 6559 # Raw Frame Relay [RFC1701] -+TEB 6558 # Trans Ether Bridging [RFC1701] -+RAW_FR 6559 # Raw Frame Relay [RFC1701] -+RARP 8035 # Reverse ARP [RFC903] - AARP 80F3 # Appletalk AARP --ATALK 809B # Appletalk -+ATALK 809B # Appletalk - 802_1Q 8100 8021q 1q 802.1q dot1q # 802.1Q Virtual LAN tagged frame - IPX 8137 # Novell IPX - NetBEUI 8191 # NetBEUI - IPv6 86DD ip6 # IP version 6 --PPP 880B # PPP -+PPP 880B # PPP - ATMMPOA 884C # MultiProtocol over ATM - PPP_DISC 8863 # PPPoE discovery messages - PPP_SES 8864 # PPPoE session messages --- -2.12.1 - diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0002-fix-compilation-warning.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0002-fix-compilation-warning.patch deleted file mode 100644 index 87b0e9b877..0000000000 --- a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0002-fix-compilation-warning.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 2a5333fc8b4825251adfb717d980d89cefde38d6 Mon Sep 17 00:00:00 2001 -From: Petri Gynther <petri.gynther@gmail.com> -Date: Sun, 24 Feb 2013 10:56:59 +0100 -Subject: [PATCH 02/10] fix compilation warning - ---- - communication.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/communication.c b/communication.c -index 62ed667..ba058c0 100644 ---- a/communication.c -+++ b/communication.c -@@ -282,7 +282,7 @@ static int store_counters_in_file(char *filename, struct ebt_u_replace *repl) - } - close_file: - fclose(file); -- return 0; -+ return ret; - } - - /* Gets executed after ebt_deliver_table. Delivers the counters to the kernel --- -2.12.1 - diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0003-add-info-about-Wl-no-as-needed.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0003-add-info-about-Wl-no-as-needed.patch deleted file mode 100644 index c8573a464f..0000000000 --- a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0003-add-info-about-Wl-no-as-needed.patch +++ /dev/null @@ -1,25 +0,0 @@ -From a6faf3b50d6af4768b7b853cb536944fb18e1450 Mon Sep 17 00:00:00 2001 -From: Bart De Schuymer <bdschuym@pandora.be> -Date: Wed, 3 Jul 2013 22:12:47 +0200 -Subject: [PATCH 03/10] add info about -Wl,-no-as-needed - ---- - INSTALL | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/INSTALL b/INSTALL -index 4a05c67..e90d5c1 100644 ---- a/INSTALL -+++ b/INSTALL -@@ -39,6 +39,8 @@ That's all - You can also use a base directory different from the root directory (/), - using the DESTDIR option. See the Makefile for more details. - -+You might need to set LDFLAGS=-Wl,-no-as-needed to build ebtables correctly -+on your system. - - ADDITIONAL PROGRAMS: - ---------------------- --- -2.12.1 - diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0004-workaround-for-kernel-regression-bug-IPv6-source-des.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0004-workaround-for-kernel-regression-bug-IPv6-source-des.patch deleted file mode 100644 index d8f2795bca..0000000000 --- a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0004-workaround-for-kernel-regression-bug-IPv6-source-des.patch +++ /dev/null @@ -1,28 +0,0 @@ -From b0617af37b8b1aafb43e8019135bea44c2d94c28 Mon Sep 17 00:00:00 2001 -From: Luis Fernando <tdthp@terra.com.br> -Date: Wed, 3 Jul 2013 22:19:55 +0200 -Subject: [PATCH 04/10] workaround for kernel regression bug: IPv6 - source/destination addresses are potentially not matched correctly - ---- - extensions/ebt_ip6.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/extensions/ebt_ip6.c b/extensions/ebt_ip6.c -index 0465e77..bbdc4ae 100644 ---- a/extensions/ebt_ip6.c -+++ b/extensions/ebt_ip6.c -@@ -312,6 +312,10 @@ static void init(struct ebt_entry_match *match) - - ipinfo->invflags = 0; - ipinfo->bitmask = 0; -+ memset(ipinfo->saddr.s6_addr, 0, sizeof(ipinfo->saddr.s6_addr)); -+ memset(ipinfo->smsk.s6_addr, 0, sizeof(ipinfo->smsk.s6_addr)); -+ memset(ipinfo->daddr.s6_addr, 0, sizeof(ipinfo->daddr.s6_addr)); -+ memset(ipinfo->dmsk.s6_addr, 0, sizeof(ipinfo->dmsk.s6_addr)); - } - - #define OPT_SOURCE 0x01 --- -2.12.1 - diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0005-Add-noflush-command-line-support-for-ebtables-restor.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0005-Add-noflush-command-line-support-for-ebtables-restor.patch deleted file mode 100644 index 9585fd20e3..0000000000 --- a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0005-Add-noflush-command-line-support-for-ebtables-restor.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 15d3ab8a4a167dc44396b003d2ec01841949972f Mon Sep 17 00:00:00 2001 -From: Sanket Shah <sanket.shah@cyberoam.com> -Date: Wed, 31 Jul 2013 21:40:08 +0200 -Subject: [PATCH 05/10] Add --noflush command line support for ebtables-restore - ---- - ebtables-restore.c | 29 +++++++++++++++++++++++++---- - 1 file changed, 25 insertions(+), 4 deletions(-) - -diff --git a/ebtables-restore.c b/ebtables-restore.c -index ea02960..bb4d0cf 100644 ---- a/ebtables-restore.c -+++ b/ebtables-restore.c -@@ -22,13 +22,25 @@ - #include <string.h> - #include <errno.h> - #include <unistd.h> -+#include <getopt.h> - #include "include/ebtables_u.h" - -+static const struct option options[] = { -+ {.name = "noflush", .has_arg = 0, .val = 'n'}, -+ { 0 } -+}; -+ - static struct ebt_u_replace replace[3]; - void ebt_early_init_once(); - - #define OPT_KERNELDATA 0x800 /* Also defined in ebtables.c */ - -+static void print_usage() -+{ -+ fprintf(stderr, "Usage: ebtables-restore [ --noflush ]\n"); -+ exit(1); -+} -+ - static void copy_table_names() - { - strcpy(replace[0].name, "filter"); -@@ -41,11 +53,20 @@ static void copy_table_names() - int main(int argc_, char *argv_[]) - { - char *argv[EBTD_ARGC_MAX], cmdline[EBTD_CMDLINE_MAXLN]; -- int i, offset, quotemode = 0, argc, table_nr = -1, line = 0, whitespace; -+ int i, offset, quotemode = 0, argc, table_nr = -1, line = 0, whitespace, c, flush = 1; - char ebtables_str[] = "ebtables"; - -- if (argc_ != 1) -- ebtrest_print_error("options are not supported"); -+ while ((c = getopt_long(argc_, argv_, "n", options, NULL)) != -1) { -+ switch(c) { -+ case 'n': -+ flush = 0; -+ break; -+ default: -+ print_usage(); -+ break; -+ } -+ } -+ - ebt_silent = 0; - copy_table_names(); - ebt_early_init_once(); -@@ -68,7 +89,7 @@ int main(int argc_, char *argv_[]) - ebtrest_print_error("table '%s' was not recognized", cmdline+1); - table_nr = i; - replace[table_nr].command = 11; -- ebt_get_kernel_table(&replace[table_nr], 1); -+ ebt_get_kernel_table(&replace[table_nr], flush); - replace[table_nr].command = 0; - replace[table_nr].flags = OPT_KERNELDATA; /* Prevent do_command from initialising replace */ - continue; --- -2.12.1 - diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0006-don-t-print-IPv6-mask-if-it-s-all-ones-based-on-patc.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0006-don-t-print-IPv6-mask-if-it-s-all-ones-based-on-patc.patch deleted file mode 100644 index 21f8e588d4..0000000000 --- a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0006-don-t-print-IPv6-mask-if-it-s-all-ones-based-on-patc.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 85a0f6d77a9d5c0e7ef7948395f0f6b1612dc987 Mon Sep 17 00:00:00 2001 -From: Bart De Schuymer <bdschuym@pandora.be> -Date: Mon, 14 Apr 2014 22:04:55 +0200 -Subject: [PATCH 06/10] don't print IPv6 mask if it's all ones (based on patch - by Mariusz Mazur <mmazur at axeos.com>) - ---- - extensions/ebt_ip6.c | 4 ++-- - include/ebtables_u.h | 1 + - useful_functions.c | 13 +++++++++++++ - 3 files changed, 16 insertions(+), 2 deletions(-) - -diff --git a/extensions/ebt_ip6.c b/extensions/ebt_ip6.c -index bbdc4ae..e3e0956 100644 ---- a/extensions/ebt_ip6.c -+++ b/extensions/ebt_ip6.c -@@ -449,14 +449,14 @@ static void print(const struct ebt_u_entry *entry, - if (ipinfo->invflags & EBT_IP6_SOURCE) - printf("! "); - printf("%s", ebt_ip6_to_numeric(&ipinfo->saddr)); -- printf("/%s ", ebt_ip6_to_numeric(&ipinfo->smsk)); -+ printf("%s ", ebt_ip6_mask_to_string(&ipinfo->smsk)); - } - if (ipinfo->bitmask & EBT_IP6_DEST) { - printf("--ip6-dst "); - if (ipinfo->invflags & EBT_IP6_DEST) - printf("! "); - printf("%s", ebt_ip6_to_numeric(&ipinfo->daddr)); -- printf("/%s ", ebt_ip6_to_numeric(&ipinfo->dmsk)); -+ printf("%s ", ebt_ip6_mask_to_string(&ipinfo->dmsk)); - } - if (ipinfo->bitmask & EBT_IP6_TCLASS) { - printf("--ip6-tclass "); -diff --git a/include/ebtables_u.h b/include/ebtables_u.h -index ab615c1..35a5bcc 100644 ---- a/include/ebtables_u.h -+++ b/include/ebtables_u.h -@@ -303,6 +303,7 @@ char *ebt_mask_to_dotted(uint32_t mask); - void ebt_parse_ip6_address(char *address, struct in6_addr *addr, - struct in6_addr *msk); - char *ebt_ip6_to_numeric(const struct in6_addr *addrp); -+char *ebt_ip6_mask_to_string(const struct in6_addr *msk); - - - int do_command(int argc, char *argv[], int exec_style, -diff --git a/useful_functions.c b/useful_functions.c -index d20b68e..d14cbe9 100644 ---- a/useful_functions.c -+++ b/useful_functions.c -@@ -411,3 +411,16 @@ char *ebt_ip6_to_numeric(const struct in6_addr *addrp) - static char buf[50+1]; - return (char *)inet_ntop(AF_INET6, addrp, buf, sizeof(buf)); - } -+ -+char *ebt_ip6_mask_to_string(const struct in6_addr *msk) -+{ -+ /* /0000:0000:0000:0000:0000:000.000.000.000 -+ * /0000:0000:0000:0000:0000:0000:0000:0000 */ -+ static char buf[51+1]; -+ if (msk->s6_addr32[0] == 0xFFFFFFFFL && msk->s6_addr32[1] == 0xFFFFFFFFL && -+ msk->s6_addr32[2] == 0xFFFFFFFFL && msk->s6_addr32[3] == 0xFFFFFFFFL) -+ *buf = '\0'; -+ else -+ sprintf(buf, "/%s", ebt_ip6_to_numeric(msk)); -+ return buf; -+} --- -2.12.1 - diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0007-extensions-Use-stdint-types.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0007-extensions-Use-stdint-types.patch deleted file mode 100644 index 6fbe7df4ca..0000000000 --- a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0007-extensions-Use-stdint-types.patch +++ /dev/null @@ -1,67 +0,0 @@ -From a60c7d4a6d05387aceb8ae9c38390d0f9bae84a2 Mon Sep 17 00:00:00 2001 -From: Felix Janda <felix.janda@posteo.de> -Date: Sat, 16 May 2015 12:22:39 +0200 -Subject: [PATCH 07/10] extensions: Use stdint types - -Signed-off-by: Felix Janda <felix.janda@posteo.de> -Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> ---- - extensions/ebt_ip6.c | 4 ++-- - extensions/ebt_limit.c | 10 +++++----- - 2 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/extensions/ebt_ip6.c b/extensions/ebt_ip6.c -index e3e0956..dd48547 100644 ---- a/extensions/ebt_ip6.c -+++ b/extensions/ebt_ip6.c -@@ -53,8 +53,8 @@ static const struct option opts[] = - - struct icmpv6_names { - const char *name; -- u_int8_t type; -- u_int8_t code_min, code_max; -+ uint8_t type; -+ uint8_t code_min, code_max; - }; - - static const struct icmpv6_names icmpv6_codes[] = { -diff --git a/extensions/ebt_limit.c b/extensions/ebt_limit.c -index ee40e5c..d189a09 100644 ---- a/extensions/ebt_limit.c -+++ b/extensions/ebt_limit.c -@@ -59,11 +59,11 @@ static void print_help(void) - " default %u\n", EBT_LIMIT_BURST); - } - --static int parse_rate(const char *rate, u_int32_t *val) -+static int parse_rate(const char *rate, uint32_t *val) - { - const char *delim; -- u_int32_t r; -- u_int32_t mult = 1; /* Seconds by default. */ -+ uint32_t r; -+ uint32_t mult = 1; /* Seconds by default. */ - - delim = strchr(rate, '/'); - if (delim) { -@@ -151,7 +151,7 @@ static void final_check(const struct ebt_u_entry *entry, - struct rates - { - const char *name; -- u_int32_t mult; -+ uint32_t mult; - }; - - static struct rates g_rates[] = -@@ -162,7 +162,7 @@ static struct rates g_rates[] = - { "sec", EBT_LIMIT_SCALE } - }; - --static void print_rate(u_int32_t period) -+static void print_rate(uint32_t period) - { - unsigned int i; - --- -2.12.1 - diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0008-ethernetdb.h-Remove-C-specific-compiler-hint-macro-_.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0008-ethernetdb.h-Remove-C-specific-compiler-hint-macro-_.patch deleted file mode 100644 index df3f521437..0000000000 --- a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0008-ethernetdb.h-Remove-C-specific-compiler-hint-macro-_.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 6ed23c8c2bc5efc3956e7bb6155afc8f45e6ae1a Mon Sep 17 00:00:00 2001 -From: Felix Janda <felix.janda@posteo.de> -Date: Sat, 16 May 2015 12:31:58 +0200 -Subject: [PATCH 08/10] ethernetdb.h: Remove C++ specific compiler hint macro - _THROW - -Fixes compilation with musl libc - -Signed-off-by: Felix Janda <felix.janda@posteo.de> -Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> ---- - include/ethernetdb.h | 11 +++++------ - 1 file changed, 5 insertions(+), 6 deletions(-) - -diff --git a/include/ethernetdb.h b/include/ethernetdb.h -index 46d8bfd..1683abe 100644 ---- a/include/ethernetdb.h -+++ b/include/ethernetdb.h -@@ -38,21 +38,20 @@ struct ethertypeent { - - /* Open ethertype data base files and mark them as staying open even - after a later search if STAY_OPEN is non-zero. */ --extern void setethertypeent(int __stay_open) __THROW; -+extern void setethertypeent(int __stay_open); - - /* Close ethertype data base files and clear `stay open' flag. */ --extern void endethertypeent(void) __THROW; -+extern void endethertypeent(void); - - /* Get next entry from ethertype data base file. Open data base if - necessary. */ --extern struct ethertypeent *getethertypeent(void) __THROW; -+extern struct ethertypeent *getethertypeent(void); - - /* Return entry from ethertype data base for network with NAME. */ --extern struct ethertypeent *getethertypebyname(__const char *__name) -- __THROW; -+extern struct ethertypeent *getethertypebyname(__const char *__name); - - /* Return entry from ethertype data base which number is PROTO. */ --extern struct ethertypeent *getethertypebynumber(int __ethertype) __THROW; -+extern struct ethertypeent *getethertypebynumber(int __ethertype); - - - #endif /* ethernetdb.h */ --- -2.12.1 - diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0009-ebtables-Allow-RETURN-target-rules-in-user-defined-c.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0009-ebtables-Allow-RETURN-target-rules-in-user-defined-c.patch deleted file mode 100644 index 248582c188..0000000000 --- a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0009-ebtables-Allow-RETURN-target-rules-in-user-defined-c.patch +++ /dev/null @@ -1,48 +0,0 @@ -From e6b367c0c2668341c47242d099f4d2048ae575ef Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Alin=20N=C4=83stac?= <alin.nastac@gmail.com> -Date: Thu, 22 Oct 2015 16:41:03 +0200 -Subject: [PATCH 09/10] ebtables: Allow RETURN target rules in user defined - chains - -During loop checking ebtables marks entries with '1 << NF_BR_NUMHOOKS' if -they're called from a base chain rather than a user defined chain. - -This can be used by ebtables targets that can encode a special return -value to bail out if e.g. RETURN is used from a base chain. - -Unfortunately, this is broken, since the '1 << NF_BR_NUMHOOKS' is also -copied to called user-defined-chains (i.e., a user defined chain can no -longer be distinguished from a base chain): - -root@OpenWrt:~# ebtables -N foo -root@OpenWrt:~# ebtables -A OUTPUT -j foo -root@OpenWrt:~# ebtables -A foo -j mark --mark-or 3 --mark-target RETURN ---mark-target RETURN not allowed on base chain. - -This works if -A OUTPUT -j foo is omitted, but will still appear -if we try to call foo from OUTPUT afterwards. - -After this patch we still reject -'-A OUTPUT -j mark .. --mark-target RETURN'. - -Signed-off-by: Florian Westphal <fw@strlen.de> ---- - libebtc.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libebtc.c b/libebtc.c -index 17ba8f2..74830ec 100644 ---- a/libebtc.c -+++ b/libebtc.c -@@ -1102,7 +1102,7 @@ void ebt_check_for_loops(struct ebt_u_replace *replace) - /* check if we've dealt with this chain already */ - if (entries2->hook_mask & (1<<i)) - goto letscontinue; -- entries2->hook_mask |= entries->hook_mask; -+ entries2->hook_mask |= entries->hook_mask & ~(1 << NF_BR_NUMHOOKS); - /* Jump to the chain, make sure we know how to get back */ - stack[sp].chain_nr = chain_nr; - stack[sp].n = j; --- -2.12.1 - diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0010-Adjust-header-include-sequence.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0010-Adjust-header-include-sequence.patch deleted file mode 100644 index a6ef9cd099..0000000000 --- a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0010-Adjust-header-include-sequence.patch +++ /dev/null @@ -1,216 +0,0 @@ -From b7cee37734007fced7a4d5ed586c3a9e5ad92878 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 26 Mar 2017 13:12:21 -0700 -Subject: [PATCH 10/10] Adjust header include sequence - -This fixes the build with musl - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - extensions/ebt_among.c | 2 +- - extensions/ebt_arpreply.c | 2 +- - extensions/ebt_nat.c | 2 +- - include/linux/if_ether.h | 126 ---------------------------------------------- - useful_functions.c | 4 +- - 5 files changed, 5 insertions(+), 131 deletions(-) - delete mode 100644 include/linux/if_ether.h - -diff --git a/extensions/ebt_among.c b/extensions/ebt_among.c -index f97d07e..b096847 100644 ---- a/extensions/ebt_among.c -+++ b/extensions/ebt_among.c -@@ -12,8 +12,8 @@ - #include <getopt.h> - #include <ctype.h> - #include <unistd.h> --#include "../include/ebtables_u.h" - #include <netinet/ether.h> -+#include "../include/ebtables_u.h" - #include "../include/ethernetdb.h" - #include <linux/if_ether.h> - #include <linux/netfilter_bridge/ebt_among.h> -diff --git a/extensions/ebt_arpreply.c b/extensions/ebt_arpreply.c -index c3757f3..c5102a4 100644 ---- a/extensions/ebt_arpreply.c -+++ b/extensions/ebt_arpreply.c -@@ -11,8 +11,8 @@ - #include <stdlib.h> - #include <string.h> - #include <getopt.h> --#include "../include/ebtables_u.h" - #include <netinet/ether.h> -+#include "../include/ebtables_u.h" - #include <linux/netfilter_bridge/ebt_arpreply.h> - - static int mac_supplied; -diff --git a/extensions/ebt_nat.c b/extensions/ebt_nat.c -index e6afbf8..8d318d1 100644 ---- a/extensions/ebt_nat.c -+++ b/extensions/ebt_nat.c -@@ -10,8 +10,8 @@ - #include <stdlib.h> - #include <string.h> - #include <getopt.h> --#include "../include/ebtables_u.h" - #include <netinet/ether.h> -+#include "../include/ebtables_u.h" - #include <linux/netfilter_bridge/ebt_nat.h> - - static int to_source_supplied, to_dest_supplied; -diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h -deleted file mode 100644 -index 28a15ff..0000000 ---- a/include/linux/if_ether.h -+++ /dev/null -@@ -1,126 +0,0 @@ --/* -- * INET An implementation of the TCP/IP protocol suite for the LINUX -- * operating system. INET is implemented using the BSD Socket -- * interface as the means of communication with the user level. -- * -- * Global definitions for the Ethernet IEEE 802.3 interface. -- * -- * Version: @(#)if_ether.h 1.0.1a 02/08/94 -- * -- * Author: Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG> -- * Donald Becker, <becker@super.org> -- * Alan Cox, <alan@lxorguk.ukuu.org.uk> -- * Steve Whitehouse, <gw7rrm@eeshack3.swan.ac.uk> -- * -- * This program is free software; you can redistribute it and/or -- * modify it under the terms of the GNU General Public License -- * as published by the Free Software Foundation; either version -- * 2 of the License, or (at your option) any later version. -- */ -- --#ifndef _LINUX_IF_ETHER_H --#define _LINUX_IF_ETHER_H -- --#include <linux/types.h> -- --/* -- * IEEE 802.3 Ethernet magic constants. The frame sizes omit the preamble -- * and FCS/CRC (frame check sequence). -- */ -- --#define ETH_ALEN 6 /* Octets in one ethernet addr */ --#define ETH_HLEN 14 /* Total octets in header. */ --#define ETH_ZLEN 60 /* Min. octets in frame sans FCS */ --#define ETH_DATA_LEN 1500 /* Max. octets in payload */ --#define ETH_FRAME_LEN 1514 /* Max. octets in frame sans FCS */ --#define ETH_FCS_LEN 4 /* Octets in the FCS */ -- --/* -- * These are the defined Ethernet Protocol ID's. -- */ -- --#define ETH_P_LOOP 0x0060 /* Ethernet Loopback packet */ --#define ETH_P_PUP 0x0200 /* Xerox PUP packet */ --#define ETH_P_PUPAT 0x0201 /* Xerox PUP Addr Trans packet */ --#define ETH_P_IP 0x0800 /* Internet Protocol packet */ --#define ETH_P_X25 0x0805 /* CCITT X.25 */ --#define ETH_P_ARP 0x0806 /* Address Resolution packet */ --#define ETH_P_BPQ 0x08FF /* G8BPQ AX.25 Ethernet Packet [ NOT AN OFFICIALLY REGISTERED ID ] */ --#define ETH_P_IEEEPUP 0x0a00 /* Xerox IEEE802.3 PUP packet */ --#define ETH_P_IEEEPUPAT 0x0a01 /* Xerox IEEE802.3 PUP Addr Trans packet */ --#define ETH_P_DEC 0x6000 /* DEC Assigned proto */ --#define ETH_P_DNA_DL 0x6001 /* DEC DNA Dump/Load */ --#define ETH_P_DNA_RC 0x6002 /* DEC DNA Remote Console */ --#define ETH_P_DNA_RT 0x6003 /* DEC DNA Routing */ --#define ETH_P_LAT 0x6004 /* DEC LAT */ --#define ETH_P_DIAG 0x6005 /* DEC Diagnostics */ --#define ETH_P_CUST 0x6006 /* DEC Customer use */ --#define ETH_P_SCA 0x6007 /* DEC Systems Comms Arch */ --#define ETH_P_TEB 0x6558 /* Trans Ether Bridging */ --#define ETH_P_RARP 0x8035 /* Reverse Addr Res packet */ --#define ETH_P_ATALK 0x809B /* Appletalk DDP */ --#define ETH_P_AARP 0x80F3 /* Appletalk AARP */ --#define ETH_P_8021Q 0x8100 /* 802.1Q VLAN Extended Header */ --#define ETH_P_IPX 0x8137 /* IPX over DIX */ --#define ETH_P_IPV6 0x86DD /* IPv6 over bluebook */ --#define ETH_P_PAUSE 0x8808 /* IEEE Pause frames. See 802.3 31B */ --#define ETH_P_SLOW 0x8809 /* Slow Protocol. See 802.3ad 43B */ --#define ETH_P_WCCP 0x883E /* Web-cache coordination protocol -- * defined in draft-wilson-wrec-wccp-v2-00.txt */ --#define ETH_P_PPP_DISC 0x8863 /* PPPoE discovery messages */ --#define ETH_P_PPP_SES 0x8864 /* PPPoE session messages */ --#define ETH_P_MPLS_UC 0x8847 /* MPLS Unicast traffic */ --#define ETH_P_MPLS_MC 0x8848 /* MPLS Multicast traffic */ --#define ETH_P_ATMMPOA 0x884c /* MultiProtocol Over ATM */ --#define ETH_P_LINK_CTL 0x886c /* HPNA, wlan link local tunnel */ --#define ETH_P_ATMFATE 0x8884 /* Frame-based ATM Transport -- * over Ethernet -- */ --#define ETH_P_PAE 0x888E /* Port Access Entity (IEEE 802.1X) */ --#define ETH_P_AOE 0x88A2 /* ATA over Ethernet */ --#define ETH_P_TIPC 0x88CA /* TIPC */ --#define ETH_P_1588 0x88F7 /* IEEE 1588 Timesync */ --#define ETH_P_FCOE 0x8906 /* Fibre Channel over Ethernet */ --#define ETH_P_FIP 0x8914 /* FCoE Initialization Protocol */ --#define ETH_P_EDSA 0xDADA /* Ethertype DSA [ NOT AN OFFICIALLY REGISTERED ID ] */ -- --/* -- * Non DIX types. Won't clash for 1500 types. -- */ -- --#define ETH_P_802_3 0x0001 /* Dummy type for 802.3 frames */ --#define ETH_P_AX25 0x0002 /* Dummy protocol id for AX.25 */ --#define ETH_P_ALL 0x0003 /* Every packet (be careful!!!) */ --#define ETH_P_802_2 0x0004 /* 802.2 frames */ --#define ETH_P_SNAP 0x0005 /* Internal only */ --#define ETH_P_DDCMP 0x0006 /* DEC DDCMP: Internal only */ --#define ETH_P_WAN_PPP 0x0007 /* Dummy type for WAN PPP frames*/ --#define ETH_P_PPP_MP 0x0008 /* Dummy type for PPP MP frames */ --#define ETH_P_LOCALTALK 0x0009 /* Localtalk pseudo type */ --#define ETH_P_CAN 0x000C /* Controller Area Network */ --#define ETH_P_PPPTALK 0x0010 /* Dummy type for Atalk over PPP*/ --#define ETH_P_TR_802_2 0x0011 /* 802.2 frames */ --#define ETH_P_MOBITEX 0x0015 /* Mobitex (kaz@cafe.net) */ --#define ETH_P_CONTROL 0x0016 /* Card specific control frames */ --#define ETH_P_IRDA 0x0017 /* Linux-IrDA */ --#define ETH_P_ECONET 0x0018 /* Acorn Econet */ --#define ETH_P_HDLC 0x0019 /* HDLC frames */ --#define ETH_P_ARCNET 0x001A /* 1A for ArcNet :-) */ --#define ETH_P_DSA 0x001B /* Distributed Switch Arch. */ --#define ETH_P_TRAILER 0x001C /* Trailer switch tagging */ --#define ETH_P_PHONET 0x00F5 /* Nokia Phonet frames */ --#define ETH_P_IEEE802154 0x00F6 /* IEEE802.15.4 frame */ --#define ETH_P_CAIF 0x00F7 /* ST-Ericsson CAIF protocol */ -- --/* -- * This is an Ethernet frame header. -- */ -- --struct ethhdr { -- unsigned char h_dest[ETH_ALEN]; /* destination eth addr */ -- unsigned char h_source[ETH_ALEN]; /* source ether addr */ -- __be16 h_proto; /* packet type ID field */ --} __attribute__((packed)); -- -- --#endif /* _LINUX_IF_ETHER_H */ -diff --git a/useful_functions.c b/useful_functions.c -index d14cbe9..c304f4d 100644 ---- a/useful_functions.c -+++ b/useful_functions.c -@@ -22,8 +22,6 @@ - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ --#include "include/ebtables_u.h" --#include "include/ethernetdb.h" - #include <stdio.h> - #include <netinet/ether.h> - #include <string.h> -@@ -33,6 +31,8 @@ - #include <sys/types.h> - #include <sys/socket.h> - #include <arpa/inet.h> -+#include "include/ebtables_u.h" -+#include "include/ethernetdb.h" - - const unsigned char mac_type_unicast[ETH_ALEN] = {0,0,0,0,0,0}; - const unsigned char msk_type_unicast[ETH_ALEN] = {1,0,0,0,0,0}; --- -2.12.1 - diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/01debian_defaultconfig.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/01debian_defaultconfig.patch deleted file mode 100644 index c260403eaf..0000000000 --- a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/01debian_defaultconfig.patch +++ /dev/null @@ -1,50 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## debian_defaultconfig.dpatch by <hesso@pool.math.tu-berlin.de> -## -## DP: Debian enhancements to the ebtables "sysconfig" default settings. - -@DPATCH@ - ---- ebtables-2.0.8.1.orig/ebtables-config -+++ ebtables-2.0.8.1/ebtables-config -@@ -1,17 +1,3 @@ --# Save (and possibly restore) in text format. --# Value: yes|no, default: yes --# Save the firewall rules in text format to __SYSCONFIG__/ebtables --# If EBTABLES_BINARY_FORMAT="no" then restoring the firewall rules --# is done using this text format. --EBTABLES_TEXT_FORMAT="yes" -- --# Save (and restore) in binary format. --# Value: yes|no, default: yes --# Save (and restore) the firewall rules in binary format to (and from) --# __SYSCONFIG__/ebtables.<chain>. Enabling this option will make --# firewall initialisation a lot faster. --EBTABLES_BINARY_FORMAT="yes" -- - # Unload modules on restart and stop - # Value: yes|no, default: yes - # This option has to be 'yes' to get to a sane state for a firewall -@@ -19,6 +5,12 @@ - # modules. - EBTABLES_MODULES_UNLOAD="yes" - -+# Load firewall rules on system startup. -+# Value: yes|no, default: no -+# Restores the ebtables rulesets from the last saved state when the -+# system boots up. -+EBTABLES_LOAD_ON_START="no" -+ - # Save current firewall rules on stop. - # Value: yes|no, default: no - # Saves all firewall rules if firewall gets stopped -@@ -35,3 +27,9 @@ - # Save rule counters when saving a kernel table to a file. If the - # rule counters were saved, they will be restored when restoring the table. - EBTABLES_SAVE_COUNTER="no" -+ -+# Backup suffix for ruleset save files. -+# Value: <string>, default: "~" -+# Keep one backup level of saved rules. -+# Set this variable to the empty string to disable backups. -+EBTABLES_BACKUP_SUFFIX="~" diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/ebtables.init b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/ebtables.init deleted file mode 100755 index c9a77a29e8..0000000000 --- a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/ebtables.init +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -# -# init script for the Ethernet Bridge filter tables -# -# Written by Dag Wieers <dag@wieers.com> -# Modified by Rok Papez <rok.papez@arnes.si> -# Bart De Schuymer <bdschuym@pandora.be> -# Adapted to Debian by Jan Christoph Nordholz <hesso@pool.math.tu-berlin.de> -# Adapted to OpenEmbedded by Roman I Khimov <khimov@altell.ru> -# -# chkconfig: - 15 85 -# description: Ethernet Bridge filtering tables -# -### BEGIN INIT INFO -# Provides: ebtables -# Required-Start: -# Required-Stop: -# Should-Start: $local_fs -# Should-Stop: $local_fs -# Default-Start: S -# Default-Stop: 0 6 -# Short-Description: ebtables ruleset management -# Description: Saves and restores the state of the ebtables rulesets. -### END INIT INFO - -/usr/sbin/ebtables.common $1 diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/installnonroot.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/installnonroot.patch deleted file mode 100644 index bcd9bed238..0000000000 --- a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/installnonroot.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/Makefile b/Makefile -index c1106a4..7ea6b7a 100644 ---- a/Makefile -+++ b/Makefile -@@ -157,31 +157,31 @@ tmp3:=$(shell printf $(PIPE) | sed 's/\//\\\//g') - scripts: ebtables-save ebtables.sysv ebtables-config - cat ebtables-save | sed 's/__EXEC_PATH__/$(tmp1)/g' > ebtables-save_ - mkdir -p $(DESTDIR)$(BINDIR) -- install -m 0755 -o root -g root ebtables-save_ $(DESTDIR)$(BINDIR)/ebtables-save -+ install -m 0755 ebtables-save_ $(DESTDIR)$(BINDIR)/ebtables-save - cat ebtables.sysv | sed 's/__EXEC_PATH__/$(tmp1)/g' | sed 's/__SYSCONFIG__/$(tmp2)/g' > ebtables.sysv_ - if [ "$(DESTDIR)" != "" ]; then mkdir -p $(DESTDIR)$(INITDIR); fi -- if test -d $(DESTDIR)$(INITDIR); then install -m 0755 -o root -g root ebtables.sysv_ $(DESTDIR)$(INITDIR)/ebtables; fi -+ if test -d $(DESTDIR)$(INITDIR); then install -m 0755 ebtables.sysv_ $(DESTDIR)$(INITDIR)/ebtables; fi - cat ebtables-config | sed 's/__SYSCONFIG__/$(tmp2)/g' > ebtables-config_ - if [ "$(DESTDIR)" != "" ]; then mkdir -p $(DESTDIR)$(SYSCONFIGDIR); fi -- if test -d $(DESTDIR)$(SYSCONFIGDIR); then install -m 0600 -o root -g root ebtables-config_ $(DESTDIR)$(SYSCONFIGDIR)/ebtables-config; fi -+ if test -d $(DESTDIR)$(SYSCONFIGDIR); then install -m 0600 ebtables-config_ $(DESTDIR)$(SYSCONFIGDIR)/ebtables-config; fi - rm -f ebtables-save_ ebtables.sysv_ ebtables-config_ - - tmp4:=$(shell printf $(LOCKFILE) | sed 's/\//\\\//g') - $(MANDIR)/man8/ebtables.8: ebtables.8 - mkdir -p $(DESTDIR)$(@D) - sed -e 's/$$(VERSION)/$(PROGVERSION)/' -e 's/$$(DATE)/$(PROGDATE)/' -e 's/$$(LOCKFILE)/$(tmp4)/' ebtables.8 > ebtables.8_ -- install -m 0644 -o root -g root ebtables.8_ $(DESTDIR)$@ -+ install -m 0644 ebtables.8_ $(DESTDIR)$@ - rm -f ebtables.8_ - - $(DESTDIR)$(ETHERTYPESFILE): ethertypes - mkdir -p $(@D) -- install -m 0644 -o root -g root $< $@ -+ install -m 0644 $< $@ - - .PHONY: exec - exec: ebtables ebtables-restore - mkdir -p $(DESTDIR)$(BINDIR) -- install -m 0755 -o root -g root $(PROGNAME) $(DESTDIR)$(BINDIR)/$(PROGNAME) -- install -m 0755 -o root -g root ebtables-restore $(DESTDIR)$(BINDIR)/ebtables-restore -+ install -m 0755 $(PROGNAME) $(DESTDIR)$(BINDIR)/$(PROGNAME) -+ install -m 0755 ebtables-restore $(DESTDIR)$(BINDIR)/ebtables-restore - - .PHONY: install - install: $(MANDIR)/man8/ebtables.8 $(DESTDIR)$(ETHERTYPESFILE) exec scripts diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/no-as-needed.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/no-as-needed.patch deleted file mode 100644 index 336119d6ba..0000000000 --- a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/no-as-needed.patch +++ /dev/null @@ -1,25 +0,0 @@ -link ebtables with --no-as-needed and adjust the link order to fix runtime crash - -Program terminated with signal 11, Segmentation fault. -#0 0x00007ffaa837fb53 in ebt_initialize_entry () from /lib64/ebtables/libebtc.so -(gdb) bt -#0 0x00007ffaa837fb53 in ebt_initialize_entry () from /lib64/ebtables/libebtc.so -#1 0x00007ffaa83824dc in do_command () from /lib64/ebtables/libebtc.so -#2 0x000000000040065c in ?? () -#3 0x00007ffaa7fed755 in __libc_start_main () from /lib64/libc.so.6 -#4 0x0000000000400691 in ?? () - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Index: ebtables-v2.0.10-4/Makefile -=================================================================== ---- ebtables-v2.0.10-4.orig/Makefile 2011-12-15 12:02:47.000000000 -0800 -+++ ebtables-v2.0.10-4/Makefile 2012-12-17 22:09:45.065973753 -0800 -@@ -90,7 +90,7 @@ - $(CC) -shared $(LDFLAGS) -Wl,-soname,libebtc.so -o libebtc.so -lc $(OBJECTS2) - - ebtables: $(OBJECTS) ebtables-standalone.o libebtc.so -- $(CC) $(CFLAGS) $(CFLAGS_SH_LIB) $(LDFLAGS) -o $@ ebtables-standalone.o -I$(KERNEL_INCLUDES) -L. -Lextensions -lebtc $(EXT_LIBSI) \ -+ $(CC) $(CFLAGS) $(CFLAGS_SH_LIB) $(LDFLAGS) -o $@ ebtables-standalone.o -I$(KERNEL_INCLUDES) -L. -Lextensions -Wl,--no-as-needed $(EXT_LIBSI) -lebtc \ - -Wl,-rpath,$(LIBDIR) - - ebtablesu: ebtablesu.c diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.11/0001-Makefile.am-do-not-install-etc-ethertypes.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.11/0001-Makefile.am-do-not-install-etc-ethertypes.patch new file mode 100644 index 0000000000..f2dbb552ea --- /dev/null +++ b/meta-networking/recipes-filter/ebtables/ebtables-2.0.11/0001-Makefile.am-do-not-install-etc-ethertypes.patch @@ -0,0 +1,34 @@ +From a822e8dbca017e426a4c1c3ca835d0d03cbb4a4d Mon Sep 17 00:00:00 2001 +From: Yi Zhao <yi.zhao@windriver.com> +Date: Thu, 31 Dec 2020 16:09:56 +0800 +Subject: [PATCH] Makefile.am: do not install /etc/ethertypes + +The /etc/ethertypes is provided by netbase since 6.0[1]. +Do not instal the file in ebtables, otherwise there would be a conflict: +Error: Transaction test error: + file /etc/ethertypes conflicts between attempted installs of netbase-1:6.2-r0.corei7_64 and ebtables-2.0.10+4-r4.corei7_64 + +[1] https://salsa.debian.org/md/netbase/-/commit/316680c6a2c3641b6abc76b3eebf88781f609d35) + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + Makefile.am | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index b879941..2237002 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -26,7 +26,6 @@ AM_CFLAGS = ${regular_CFLAGS} + + sbin_PROGRAMS = ebtables-legacy ebtablesd ebtablesu ebtables-legacy-restore + EXTRA_PROGRAMS = static examples/ulog/test_ulog +-sysconf_DATA = ethertypes + sbin_SCRIPTS = ebtables-legacy-save + man8_MANS = ebtables-legacy.8 + lib_LTLIBRARIES = libebtc.la +-- +2.17.1 + diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.11/0010-Adjust-header-include-sequence.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.11/0010-Adjust-header-include-sequence.patch new file mode 100644 index 0000000000..dd8ad969c0 --- /dev/null +++ b/meta-networking/recipes-filter/ebtables/ebtables-2.0.11/0010-Adjust-header-include-sequence.patch @@ -0,0 +1,86 @@ +From b7cee37734007fced7a4d5ed586c3a9e5ad92878 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 26 Mar 2017 13:12:21 -0700 +Subject: [PATCH 10/10] Adjust header include sequence + +This fixes the build with musl + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com> +--- +Upstream-Status: Pending + + extensions/ebt_among.c | 2 +- + extensions/ebt_arpreply.c | 2 +- + extensions/ebt_nat.c | 2 +- + useful_functions.c | 4 ++-- + 4 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/extensions/ebt_among.c b/extensions/ebt_among.c +index 30c098c..af73bd9 100644 +--- a/extensions/ebt_among.c ++++ b/extensions/ebt_among.c +@@ -12,8 +12,8 @@ + #include <getopt.h> + #include <ctype.h> + #include <unistd.h> +-#include "../include/ebtables_u.h" + #include <netinet/ether.h> ++#include "../include/ebtables_u.h" + #include "../include/ethernetdb.h" + #include <linux/if_ether.h> + #include <linux/netfilter_bridge/ebt_among.h> +diff --git a/extensions/ebt_arpreply.c b/extensions/ebt_arpreply.c +index 399868b..7b6b5ae 100644 +--- a/extensions/ebt_arpreply.c ++++ b/extensions/ebt_arpreply.c +@@ -11,8 +11,8 @@ + #include <stdlib.h> + #include <string.h> + #include <getopt.h> +-#include "../include/ebtables_u.h" + #include <netinet/ether.h> ++#include "../include/ebtables_u.h" + #include <linux/netfilter_bridge/ebt_arpreply.h> + + static int mac_supplied; +diff --git a/extensions/ebt_nat.c b/extensions/ebt_nat.c +index fe7e987..1899df3 100644 +--- a/extensions/ebt_nat.c ++++ b/extensions/ebt_nat.c +@@ -10,8 +10,8 @@ + #include <stdlib.h> + #include <string.h> + #include <getopt.h> +-#include "../include/ebtables_u.h" + #include <netinet/ether.h> ++#include "../include/ebtables_u.h" + #include <linux/netfilter_bridge/ebt_nat.h> + + static int to_source_supplied, to_dest_supplied; +diff --git a/useful_functions.c b/useful_functions.c +index 133ae2f..c7adc66 100644 +--- a/useful_functions.c ++++ b/useful_functions.c +@@ -22,8 +22,6 @@ + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +-#include "include/ebtables_u.h" +-#include "include/ethernetdb.h" + #include <errno.h> + #include <inttypes.h> + #include <limits.h> +@@ -36,6 +34,8 @@ + #include <sys/types.h> + #include <sys/socket.h> + #include <arpa/inet.h> ++#include "include/ebtables_u.h" ++#include "include/ethernetdb.h" + + + const unsigned char mac_type_unicast[ETH_ALEN] = {0,0,0,0,0,0}; +-- +2.25.1 + + diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/ebtables-save b/meta-networking/recipes-filter/ebtables/ebtables-2.0.11/ebtables-legacy-save index 2d7fc4ed7c..2133600f77 100755..100644 --- a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/ebtables-save +++ b/meta-networking/recipes-filter/ebtables/ebtables-2.0.11/ebtables-legacy-save @@ -1,6 +1,6 @@ #!/bin/bash -EBTABLES="/sbin/ebtables" +EBTABLES="/usr/sbin/ebtables-legacy" [ -x "$EBTABLES" ] || exit 1 diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/ebtables.common b/meta-networking/recipes-filter/ebtables/ebtables-2.0.11/ebtables.common index 640025dba6..d948422e99 100644 --- a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/ebtables.common +++ b/meta-networking/recipes-filter/ebtables/ebtables-2.0.11/ebtables.common @@ -1,6 +1,6 @@ #!/bin/sh -[ -x /sbin/ebtables ] || exit 1 +[ -x /usr/sbin/ebtables-legacy ] || exit 1 EBTABLES_DUMPFILE_STEM=/etc/ebtables/dump @@ -20,29 +20,29 @@ EBTABLES_BACKUP_SUFFIX="~" config=/etc/default/$prog [ -f "$config" ] && . "$config" -function get_supported_tables() { +get_supported_tables() { EBTABLES_SUPPORTED_TABLES= - /sbin/ebtables -t filter -L 2>&1 1>/dev/null | grep -q permission + /usr/sbin/ebtables-legacy -t filter -L 2>&1 1>/dev/null | grep -q permission if [ $? -eq 0 ]; then echo "Error: insufficient privileges to access the ebtables rulesets." exit 1 fi for table in filter nat broute; do - /sbin/ebtables -t $table -L &> /dev/null + /usr/sbin/ebtables-legacy -t $table -L &> /dev/null if [ $? -eq 0 ]; then EBTABLES_SUPPORTED_TABLES="${EBTABLES_SUPPORTED_TABLES} $table" fi done } -function load() { +load() { RETVAL=0 get_supported_tables echo -n "Restoring ebtables rulesets: " for table in $EBTABLES_SUPPORTED_TABLES; do echo -n "$table " if [ -s ${EBTABLES_DUMPFILE_STEM}.$table ]; then - /sbin/ebtables -t $table --atomic-file ${EBTABLES_DUMPFILE_STEM}.$table --atomic-commit + /usr/sbin/ebtables-legacy -t $table --atomic-file ${EBTABLES_DUMPFILE_STEM}.$table --atomic-commit RET=$? if [ $RET -ne 0 ]; then echo -n "(failed) " @@ -64,13 +64,13 @@ function load() { fi } -function clear() { +clear_rules() { RETVAL=0 get_supported_tables echo -n "Clearing ebtables rulesets: " for table in $EBTABLES_SUPPORTED_TABLES; do echo -n "$table " - /sbin/ebtables -t $table --init-table + /usr/sbin/ebtables-legacy -t $table --init-table done if [ "$EBTABLES_MODULES_UNLOAD" = "yes" ]; then @@ -90,22 +90,22 @@ function clear() { fi } -function save() { +save() { RETVAL=0 get_supported_tables echo -n "Saving ebtables rulesets: " for table in $EBTABLES_SUPPORTED_TABLES; do echo -n "$table " [ -n "$EBTABLES_BACKUP_SUFFIX" ] && [ -s ${EBTABLES_DUMPFILE_STEM}.$table ] && \ - mv ${EBTABLES_DUMPFILE_STEM}.$table ${EBTABLES_DUMPFILE_STEM}.$table$EBTABLES_BACKUP_SUFFIX - /sbin/ebtables -t $table --atomic-file ${EBTABLES_DUMPFILE_STEM}.$table --atomic-save + mv ${EBTABLES_DUMPFILE_STEM}.$table ${EBTABLES_DUMPFILE_STEM}.$table$EBTABLES_BACKUP_SUFFIX + /usr/sbin/ebtables-legacy -t $table --atomic-file ${EBTABLES_DUMPFILE_STEM}.$table --atomic-save RET=$? if [ $RET -ne 0 ]; then echo -n "(failed) " RETVAL=$RET else if [ "$EBTABLES_SAVE_COUNTER" = "no" ]; then - /sbin/ebtables -t $table --atomic-file ${EBTABLES_DUMPFILE_STEM}.$table -Z + /usr/sbin/ebtables-legacy -t $table --atomic-file ${EBTABLES_DUMPFILE_STEM}.$table -Z fi fi done @@ -122,42 +122,42 @@ function save() { } case "$1" in - start) - [ "$EBTABLES_LOAD_ON_START" = "yes" ] && load - ;; - stop) - [ "$EBTABLES_SAVE_ON_STOP" = "yes" ] && save - clear - ;; - restart|reload|force-reload) - [ "$EBTABLES_SAVE_ON_RESTART" = "yes" ] && save - clear - [ "$EBTABLES_LOAD_ON_START" = "yes" ] && load - ;; - load) - load - ;; - save) - save - ;; - status) - get_supported_tables - if [ -z "$EBTABLES_SUPPORTED_TABLES" ]; then - echo "No kernel support for ebtables." + start) + [ "$EBTABLES_LOAD_ON_START" = "yes" ] && load + ;; + stop) + [ "$EBTABLES_SAVE_ON_STOP" = "yes" ] && save + clear_rules + ;; + restart|reload|force-reload) + [ "$EBTABLES_SAVE_ON_RESTART" = "yes" ] && save + clear_rules + [ "$EBTABLES_LOAD_ON_START" = "yes" ] && load + ;; + load) + load + ;; + save) + save + ;; + status) + get_supported_tables + if [ -z "$EBTABLES_SUPPORTED_TABLES" ]; then + echo "No kernel support for ebtables." + RETVAL=1 + else + echo -n "Ebtables support available, number of installed rules: " + for table in $EBTABLES_SUPPORTED_TABLES; do + COUNT=$(( $(/usr/sbin/ebtables-legacy -t $table -L | sed -e "/^Bridge chain/! d" -e "s/^.*entries: //" -e "s/,.*$/ +/") 0 )) + echo -n "$table($COUNT) " + done + echo ok + RETVAL=0 + fi + ;; + *) + echo "Usage: $0 {start|stop|restart|reload|force-reload|load|save|status}" >&2 RETVAL=1 - else - echo -n "Ebtables support available, number of installed rules: " - for table in $EBTABLES_SUPPORTED_TABLES; do - COUNT=$(( $(/sbin/ebtables -t $table -L | sed -e "/^Bridge chain/! d" -e "s/^.*entries: //" -e "s/,.*$/ +/") 0 )) - echo -n "$table($COUNT) " - done - echo ok - RETVAL=0 - fi - ;; - *) - echo "Usage: $0 {start|stop|restart|reload|force-reload|load|save|status}" >&2 - RETVAL=1 esac exit $RETVAL diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/ebtables.service b/meta-networking/recipes-filter/ebtables/ebtables-2.0.11/ebtables.service index 3abd1fe3e2..3abd1fe3e2 100644 --- a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/ebtables.service +++ b/meta-networking/recipes-filter/ebtables/ebtables-2.0.11/ebtables.service diff --git a/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb b/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb deleted file mode 100644 index d5e7341a01..0000000000 --- a/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb +++ /dev/null @@ -1,102 +0,0 @@ -SUMMARY = "Filtering tool for a Linux-based bridging firewall" -HOMEPAGE = "http://sourceforge.net/projects/ebtables/" -DESCRIPTION = "Utility for basic Ethernet frame filtering on a Linux bridge, \ - advanced logging, MAC DNAT/SNAT and brouting." -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=53b4a999993871a28ab1488fdbd2e73e" -SECTION = "net" -PR = "r4" - -RDEPENDS_${PN} += "bash" - -RRECOMMENDS_${PN} += "kernel-module-ebtables \ - " - -SRC_URI = "${SOURCEFORGE_MIRROR}/ebtables/ebtables-v${PV}.tar.gz \ - file://ebtables-save \ - file://installnonroot.patch \ - file://01debian_defaultconfig.patch \ - file://ebtables.init \ - file://ebtables.common \ - file://ebtables.service \ - file://no-as-needed.patch \ - file://0001-add-RARP-and-update-iana-url.patch \ - file://0002-fix-compilation-warning.patch \ - file://0003-add-info-about-Wl-no-as-needed.patch \ - file://0004-workaround-for-kernel-regression-bug-IPv6-source-des.patch \ - file://0005-Add-noflush-command-line-support-for-ebtables-restor.patch \ - file://0006-don-t-print-IPv6-mask-if-it-s-all-ones-based-on-patc.patch \ - file://0007-extensions-Use-stdint-types.patch \ - file://0008-ethernetdb.h-Remove-C-specific-compiler-hint-macro-_.patch \ - file://0009-ebtables-Allow-RETURN-target-rules-in-user-defined-c.patch \ - file://0010-Adjust-header-include-sequence.patch \ - " - -SRC_URI[md5sum] = "506742a3d44b9925955425a659c1a8d0" -SRC_URI[sha256sum] = "dc6f7b484f207dc712bfca81645f45120cb6aee3380e77a1771e9c34a9a4455d" - -S = "${WORKDIR}/ebtables-v${PV}" - -inherit update-rc.d systemd - -python __anonymous () { - import re - - karch = d.getVar('KARCH') - multilib = d.getVar('MLPREFIX') - - if multilib and karch == 'powerpc64': - searchstr = "lib.?32" - reg = re.compile(searchstr) - if reg.search(multilib): - d.appendVar('CFLAGS' ,' -DKERNEL_64_USERSPACE_32 -DEBT_MIN_ALIGN=8') -} - -EXTRA_OEMAKE = " \ - BINDIR=${base_sbindir} \ - MANDIR=${mandir} \ - ETHERTYPESPATH=${sysconfdir} \ - INITDIR=${sysconfdir}/init.d \ - SYSCONFIGDIR=${sysconfdir}/default \ - LIBDIR=${base_libdir}/ebtables \ - 'CC=${CC}' \ - 'CFLAGS=${CFLAGS}' \ - 'LDFLAGS=${LDFLAGS} -Wl,--no-as-needed' \ - 'LD=${LD}' \ -" - -do_install () { - install -d ${D}${sbindir} - install -m 0755 ${WORKDIR}/ebtables.common ${D}${sbindir}/ebtables.common - # Fix hardcoded paths in scripts - sed -i 's!/sbin/!${base_sbindir}/!g' ${D}${sbindir}/ebtables.common - sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sbindir}/ebtables.common - - install -d ${D}${sysconfdir}/init.d - install -d ${D}${sysconfdir}/default - install -d ${D}${sysconfdir}/ebtables - oe_runmake DESTDIR='${D}' install - install -m 0755 ${WORKDIR}/ebtables.init ${D}/${sysconfdir}/init.d/ebtables - mv ${D}${sysconfdir}/default/ebtables-config ${D}${sysconfdir}/default/ebtables - sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/ebtables - - # Replace upstream ebtables-save perl script with Fedora bash based rewrite - # http://pkgs.fedoraproject.org/cgit/rpms/ebtables.git/tree/ebtables-save - install -m 0755 ${WORKDIR}/ebtables-save ${D}${base_sbindir}/ebtables-save - sed -i 's!/sbin/!${base_sbindir}/!g' ${D}${base_sbindir}/ebtables-save - - # Install systemd service files - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/ebtables.service ${D}${systemd_unitdir}/system - sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/ebtables.service -} - -CONFFILES_${PN} += "${sysconfdir}/default/ebtables" - -INITSCRIPT_NAME = "ebtables" -INITSCRIPT_PARAMS = "start 41 S . stop 41 6 ." - -SYSTEMD_SERVICE_${PN} = "ebtables.service" - -FILES_${PN}-dbg += "${base_libdir}/ebtables/.debug" -FILES_${PN} += "${base_libdir}/ebtables/*.so" diff --git a/meta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb b/meta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb new file mode 100644 index 0000000000..8918936e14 --- /dev/null +++ b/meta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb @@ -0,0 +1,53 @@ +SUMMARY = "Filtering tool for a Linux-based bridging firewall" +HOMEPAGE = "http://sourceforge.net/projects/ebtables/" +DESCRIPTION = "Utility for basic Ethernet frame filtering on a Linux bridge, \ + advanced logging, MAC DNAT/SNAT and brouting." +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=53b4a999993871a28ab1488fdbd2e73e" +SECTION = "net" + +RDEPENDS:${PN} += "bash" + +RRECOMMENDS:${PN} += "kernel-module-ebtables \ + " + +SRC_URI = "http://ftp.netfilter.org/pub/ebtables/ebtables-${PV}.tar.gz \ + file://0001-Makefile.am-do-not-install-etc-ethertypes.patch \ + file://ebtables-legacy-save \ + file://ebtables.common \ + file://ebtables.service \ + " + +SRC_URI:append:libc-musl = " file://0010-Adjust-header-include-sequence.patch" + +SRC_URI[md5sum] = "071c8b0a59241667a0044fb040d4fc72" +SRC_URI[sha256sum] = "b71f654784a726329f88b412ef7b96b4e5d786ed2bd28193ed7b4c0d677dfd2a" + +inherit systemd autotools + +do_install:append () { + # Replace upstream ebtables-save perl script with Fedora bash based rewrite + # http://pkgs.fedoraproject.org/cgit/rpms/ebtables.git/tree/ebtables-save + rm -f ${D}${sbindir}/ebtables-legacy-save + install -m 0755 ${UNPACKDIR}/ebtables-legacy-save ${D}${sbindir}/ebtables-legacy-save + + # Install systemd service files + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${UNPACKDIR}/ebtables.service ${D}${systemd_unitdir}/system + sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/ebtables.service + install -m 0755 ${UNPACKDIR}/ebtables.common ${D}${sbindir}/ebtables.common + fi + + install -d ${D}${base_sbindir} + ln -sf ${sbindir}/ebtables-legacy ${D}${base_sbindir}/ebtables +} + +do_configure:prepend () { + ( cd ${S}; ./autogen.sh ) +} + +FILES:${PN}-dbg += "${base_libdir}/ebtables/.debug" +FILES:${PN} += "${base_libdir}/ebtables/*.so" + +SYSTEMD_SERVICE:${PN} = "ebtables.service" diff --git a/meta-networking/recipes-filter/ipset/ipset/0001-ipset-Define-portable-basename-function.patch b/meta-networking/recipes-filter/ipset/ipset/0001-ipset-Define-portable-basename-function.patch new file mode 100644 index 0000000000..a06bcac362 --- /dev/null +++ b/meta-networking/recipes-filter/ipset/ipset/0001-ipset-Define-portable-basename-function.patch @@ -0,0 +1,50 @@ +From 8c5c0a7a48af7652c50bc27a4efdd9cb4f7d95bd Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 24 Mar 2024 21:58:50 -0700 +Subject: [PATCH] ipset: Define portable basename function + +Newer version of musl have removed prototype for basename in string.h [1] +which now makes it fail to compile with newer clang 18+ compiler therefore +define own basename utility function and not depend on platform for it. + +[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/ipset.c | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +diff --git a/src/ipset.c b/src/ipset.c +index 162f477..7b5d580 100644 +--- a/src/ipset.c ++++ b/src/ipset.c +@@ -16,6 +16,16 @@ + #include <libipset/ipset.h> /* ipset library */ + #include <libipset/xlate.h> /* translate to nftables */ + ++/* basename is implemented differently across different C libraries. This ++ * implementation matches the one provided by the GNU libc, and does not ++ * modify its input parameter. ++ */ ++static const char *ipset_basename(const char *path) ++{ ++ const char *base = strrchr(path, '/'); ++ return base ? base + 1 : path; ++} ++ + int + main(int argc, char *argv[]) + { +@@ -32,7 +42,7 @@ main(int argc, char *argv[]) + exit(1); + } + +- if (!strcmp(basename(argv[0]), "ipset-translate")) { ++ if (!strcmp(ipset_basename(argv[0]), "ipset-translate")) { + ret = ipset_xlate_argv(ipset, argc, argv); + } else { + ret = ipset_parse_argv(ipset, argc, argv); +-- +2.44.0 + diff --git a/meta-networking/recipes-filter/ipset/ipset_7.21.bb b/meta-networking/recipes-filter/ipset/ipset_7.21.bb new file mode 100644 index 0000000000..c7ebdc1c66 --- /dev/null +++ b/meta-networking/recipes-filter/ipset/ipset_7.21.bb @@ -0,0 +1,22 @@ +# Copyright (C) 2017 Aaron Brice <aaron.brice@datasoft.com> +# Released under the MIT license (see COPYING.MIT for the terms) + +DESCRIPTION = "Administration tool for IP sets" +HOMEPAGE = "http://ipset.netfilter.org" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" +SECTION = "base" + +DEPENDS = "libtool libmnl" + +SRC_URI = "http://ftp.netfilter.org/pub/ipset/${BP}.tar.bz2 \ + file://0001-ipset-Define-portable-basename-function.patch" +SRC_URI[sha256sum] = "e2c6ce4fcf3acb3893ca5d35c86935f80ad76fc5ccae601185842df760e0bc69" + +inherit autotools pkgconfig module-base + +EXTRA_OECONF += "-with-kbuild=${KBUILD_OUTPUT} --with-ksource=${STAGING_KERNEL_DIR}" + +RRECOMMENDS:${PN} = "\ + kernel-module-ip-set \ +" diff --git a/meta-networking/recipes-filter/libnetfilter/files/0001-Correct-typo-in-the-location-of-internal.h-in-includ.patch b/meta-networking/recipes-filter/libnetfilter/files/0001-Correct-typo-in-the-location-of-internal.h-in-includ.patch deleted file mode 100644 index 76d2d5d287..0000000000 --- a/meta-networking/recipes-filter/libnetfilter/files/0001-Correct-typo-in-the-location-of-internal.h-in-includ.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 32af64e1811c74292891dc4dc8455736f7d33ccf Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 30 Mar 2017 13:26:56 -0700 -Subject: [PATCH] Correct typo in the location of internal.h in #include - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/libnetfilter_queue.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/libnetfilter_queue.c b/src/libnetfilter_queue.c -index 211a8ba..065d618 100644 ---- a/src/libnetfilter_queue.c -+++ b/src/libnetfilter_queue.c -@@ -32,7 +32,7 @@ - - #include <libnfnetlink/libnfnetlink.h> - #include <libnetfilter_queue/libnetfilter_queue.h> --#include "src/internal.h" -+#include "internal.h" - - /** - * \mainpage --- -2.12.1 - diff --git a/meta-networking/recipes-filter/libnetfilter/files/0001-conntrack-fix-build-with-kernel-5.15-and-musl.patch b/meta-networking/recipes-filter/libnetfilter/files/0001-conntrack-fix-build-with-kernel-5.15-and-musl.patch new file mode 100644 index 0000000000..a02940af3d --- /dev/null +++ b/meta-networking/recipes-filter/libnetfilter/files/0001-conntrack-fix-build-with-kernel-5.15-and-musl.patch @@ -0,0 +1,61 @@ +From 21ee35dde73aec5eba35290587d479218c6dd824 Mon Sep 17 00:00:00 2001 +From: Robert Marko <robimarko@gmail.com> +Date: Thu, 24 Feb 2022 15:01:11 +0100 +Subject: [PATCH] conntrack: fix build with kernel 5.15 and musl + +Currently, with kernel 5.15 headers and musl building is failing with +redefinition errors due to a conflict between the kernel and musl headers. + +Musl is able to suppres the conflicting kernel header definitions if they +are included after the standard libc ones, however since ICMP definitions +were moved into a separate internal header to avoid duplication this has +stopped working and is breaking the builds. + +It seems that the issue is that <netinet/in.h> which contains the UAPI +suppression defines is included in the internal.h header and not in the +proto.h which actually includes the kernel ICMP headers and thus UAPI +supression defines are not present. + +Solve this by moving the <netinet/in.h> include before the ICMP kernel +includes in the proto.h + +Fixes: bc1cb4b11403 ("conntrack: Move icmp request>reply type mapping to common file") +Signed-off-by: Robert Marko <robimarko@gmail.com> +Signed-off-by: Florian Westphal <fw@strlen.de> + +Upstream-Status: Backport +[https://git.netfilter.org/libnetfilter_conntrack/commit/?id=21ee35dde73aec5eba35290587d479218c6dd824] + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + include/internal/internal.h | 1 - + include/internal/proto.h | 1 + + 2 files changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/internal/internal.h b/include/internal/internal.h +index 2ef8a90..7cd7c44 100644 +--- a/include/internal/internal.h ++++ b/include/internal/internal.h +@@ -14,7 +14,6 @@ + #include <arpa/inet.h> + #include <time.h> + #include <errno.h> +-#include <netinet/in.h> + + #include <libnfnetlink/libnfnetlink.h> + #include <libnetfilter_conntrack/libnetfilter_conntrack.h> +diff --git a/include/internal/proto.h b/include/internal/proto.h +index 40e7bfe..60a5f4e 100644 +--- a/include/internal/proto.h ++++ b/include/internal/proto.h +@@ -2,6 +2,7 @@ + #define _NFCT_PROTO_H_ + + #include <stdint.h> ++#include <netinet/in.h> + #include <linux/icmp.h> + #include <linux/icmpv6.h> + +-- +2.25.1 + diff --git a/meta-networking/recipes-filter/libnetfilter/files/0001-libnetfilter-acct-Declare-the-define-visivility-attribute-together.patch b/meta-networking/recipes-filter/libnetfilter/files/0001-libnetfilter-acct-Declare-the-define-visivility-attribute-together.patch index 9e0b420e0a..92e178efb7 100644 --- a/meta-networking/recipes-filter/libnetfilter/files/0001-libnetfilter-acct-Declare-the-define-visivility-attribute-together.patch +++ b/meta-networking/recipes-filter/libnetfilter/files/0001-libnetfilter-acct-Declare-the-define-visivility-attribute-together.patch @@ -10,6 +10,8 @@ fail to link due to these missing symbols Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + doxygen.cfg.in | 2 +- src/internal.h | 5 ++--- src/libnetfilter_acct.c | 41 ++++++++++++++--------------------------- diff --git a/meta-networking/recipes-filter/libnetfilter/files/0001-libnetfilter-queue-Declare-the-define-visivility-attribute-together.patch b/meta-networking/recipes-filter/libnetfilter/files/0001-libnetfilter-queue-Declare-the-define-visivility-attribute-together.patch deleted file mode 100644 index 946f1b71d7..0000000000 --- a/meta-networking/recipes-filter/libnetfilter/files/0001-libnetfilter-queue-Declare-the-define-visivility-attribute-together.patch +++ /dev/null @@ -1,1229 +0,0 @@ -From 06562244ac4a1a61e1a2c6b219a517658f7349bf Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 10 Apr 2017 12:09:41 -0700 -Subject: [PATCH] Declare the define visivility attribute together - -clang ignores the visibility attribute if its not -defined before the definition. As a result these -symbols become hidden and consumers of this library -fail to link due to these missing symbols - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - doxygen.cfg.in | 2 +- - src/extra/ipv4.c | 15 +++---- - src/extra/ipv6.c | 9 ++-- - src/extra/pktbuff.c | 42 ++++++------------ - src/extra/tcp.c | 21 +++------ - src/extra/udp.c | 21 +++------ - src/internal.h | 5 +-- - src/libnetfilter_queue.c | 108 ++++++++++++++++------------------------------- - src/nlmsg.c | 21 +++------ - 9 files changed, 82 insertions(+), 162 deletions(-) - -diff --git a/doxygen.cfg.in b/doxygen.cfg.in -index a7378ca..659abee 100644 ---- a/doxygen.cfg.in -+++ b/doxygen.cfg.in -@@ -72,7 +72,7 @@ RECURSIVE = YES - EXCLUDE = - EXCLUDE_SYMLINKS = NO - EXCLUDE_PATTERNS = --EXCLUDE_SYMBOLS = EXPORT_SYMBOL -+EXCLUDE_SYMBOLS = - EXAMPLE_PATH = - EXAMPLE_PATTERNS = - EXAMPLE_RECURSIVE = NO -diff --git a/src/extra/ipv4.c b/src/extra/ipv4.c -index a93d113..56d5dc7 100644 ---- a/src/extra/ipv4.c -+++ b/src/extra/ipv4.c -@@ -32,7 +32,7 @@ - * This funcion returns NULL if the IPv4 is malformed or the protocol version - * is not 4. On success, it returns a valid pointer to the IPv4 header. - */ --struct iphdr *nfq_ip_get_hdr(struct pkt_buff *pktb) -+struct iphdr __EXPORTED *nfq_ip_get_hdr(struct pkt_buff *pktb) - { - struct iphdr *iph; - unsigned int pktlen = pktb->tail - pktb->network_header; -@@ -53,14 +53,13 @@ struct iphdr *nfq_ip_get_hdr(struct pkt_buff *pktb) - - return iph; - } --EXPORT_SYMBOL(nfq_ip_get_hdr); - - /** - * nfq_ip_set_transport_header - set transport header - * \param pktb: pointer to network packet buffer - * \param iph: pointer to the IPv4 header - */ --int nfq_ip_set_transport_header(struct pkt_buff *pktb, struct iphdr *iph) -+int __EXPORTED nfq_ip_set_transport_header(struct pkt_buff *pktb, struct iphdr *iph) - { - int doff = iph->ihl * 4; - -@@ -71,7 +70,6 @@ int nfq_ip_set_transport_header(struct pkt_buff *pktb, struct iphdr *iph) - pktb->transport_header = pktb->network_header + doff; - return 0; - } --EXPORT_SYMBOL(nfq_ip_set_transport_header); - - /** - * nfq_ip_set_checksum - set IPv4 checksum -@@ -80,14 +78,13 @@ EXPORT_SYMBOL(nfq_ip_set_transport_header); - * \note Call to this function if you modified the IPv4 header to update the - * checksum. - */ --void nfq_ip_set_checksum(struct iphdr *iph) -+void __EXPORTED nfq_ip_set_checksum(struct iphdr *iph) - { - uint32_t iph_len = iph->ihl * 4; - - iph->check = 0; - iph->check = nfq_checksum(0, (uint16_t *)iph, iph_len); - } --EXPORT_SYMBOL(nfq_ip_set_checksum); - - /** - * nfq_ip_mangle - mangle IPv4 packet buffer -@@ -100,7 +97,7 @@ EXPORT_SYMBOL(nfq_ip_set_checksum); - * - * \note This function recalculates the IPv4 checksum (if needed). - */ --int nfq_ip_mangle(struct pkt_buff *pkt, unsigned int dataoff, -+int __EXPORTED nfq_ip_mangle(struct pkt_buff *pkt, unsigned int dataoff, - unsigned int match_offset, unsigned int match_len, - const char *rep_buffer, unsigned int rep_len) - { -@@ -116,7 +113,6 @@ int nfq_ip_mangle(struct pkt_buff *pkt, unsigned int dataoff, - - return 1; - } --EXPORT_SYMBOL(nfq_ip_mangle); - - /** - * nfq_pkt_snprintf_ip - print IPv4 header into buffer in iptables LOG format -@@ -128,7 +124,7 @@ EXPORT_SYMBOL(nfq_ip_mangle); - * case that there is enough room in the buffer. Read snprintf manpage for more - * information to know more about this strange behaviour. - */ --int nfq_ip_snprintf(char *buf, size_t size, const struct iphdr *iph) -+int __EXPORTED nfq_ip_snprintf(char *buf, size_t size, const struct iphdr *iph) - { - int ret; - struct in_addr src = { iph->saddr }; -@@ -147,7 +143,6 @@ int nfq_ip_snprintf(char *buf, size_t size, const struct iphdr *iph) - - return ret; - } --EXPORT_SYMBOL(nfq_ip_snprintf); - - /** - * @} -diff --git a/src/extra/ipv6.c b/src/extra/ipv6.c -index 7c5dc9b..6641c6b 100644 ---- a/src/extra/ipv6.c -+++ b/src/extra/ipv6.c -@@ -33,7 +33,7 @@ - * This funcion returns NULL if an invalid header is found. On sucess, it - * returns a valid pointer to the header. - */ --struct ip6_hdr *nfq_ip6_get_hdr(struct pkt_buff *pktb) -+struct ip6_hdr __EXPORTED *nfq_ip6_get_hdr(struct pkt_buff *pktb) - { - struct ip6_hdr *ip6h; - unsigned int pktlen = pktb->tail - pktb->network_header; -@@ -50,7 +50,6 @@ struct ip6_hdr *nfq_ip6_get_hdr(struct pkt_buff *pktb) - - return ip6h; - } --EXPORT_SYMBOL(nfq_ip6_get_hdr); - - /** - * nfq_ip6_set_transport_header - set transport header pointer for IPv6 packet -@@ -61,7 +60,7 @@ EXPORT_SYMBOL(nfq_ip6_get_hdr); - * This function returns 1 if the protocol has been found and the transport - * header has been set. Otherwise, it returns 0. - */ --int nfq_ip6_set_transport_header(struct pkt_buff *pktb, struct ip6_hdr *ip6h, -+int __EXPORTED nfq_ip6_set_transport_header(struct pkt_buff *pktb, struct ip6_hdr *ip6h, - uint8_t target) - { - uint8_t nexthdr = ip6h->ip6_nxt; -@@ -115,7 +114,6 @@ int nfq_ip6_set_transport_header(struct pkt_buff *pktb, struct ip6_hdr *ip6h, - pktb->transport_header = cur; - return cur ? 1 : 0; - } --EXPORT_SYMBOL(nfq_ip6_set_transport_header); - - /** - * nfq_ip6_snprintf - print IPv6 header into one buffer in iptables LOG format -@@ -124,7 +122,7 @@ EXPORT_SYMBOL(nfq_ip6_set_transport_header); - * \param ip6_hdr: pointer to a valid IPv6 header. - * - */ --int nfq_ip6_snprintf(char *buf, size_t size, const struct ip6_hdr *ip6h) -+int __EXPORTED nfq_ip6_snprintf(char *buf, size_t size, const struct ip6_hdr *ip6h) - { - int ret; - char src[INET6_ADDRSTRLEN]; -@@ -143,7 +141,6 @@ int nfq_ip6_snprintf(char *buf, size_t size, const struct ip6_hdr *ip6h) - - return ret; - } --EXPORT_SYMBOL(nfq_ip6_snprintf); - - /** - * @} -diff --git a/src/extra/pktbuff.c b/src/extra/pktbuff.c -index 1c15a00..54d8244 100644 ---- a/src/extra/pktbuff.c -+++ b/src/extra/pktbuff.c -@@ -40,7 +40,7 @@ - * - * \return a pointer to a new queue handle or NULL on failure. - */ --struct pkt_buff * -+struct pkt_buff __EXPORTED * - pktb_alloc(int family, void *data, size_t len, size_t extra) - { - struct pkt_buff *pktb; -@@ -84,120 +84,108 @@ pktb_alloc(int family, void *data, size_t len, size_t extra) - } - return pktb; - } --EXPORT_SYMBOL(pktb_alloc); - - /** - * pktb_data - return pointer to the beginning of the packet buffer - * \param pktb Pointer to packet buffer - */ --uint8_t *pktb_data(struct pkt_buff *pktb) -+uint8_t __EXPORTED *pktb_data(struct pkt_buff *pktb) - { - return pktb->data; - } --EXPORT_SYMBOL(pktb_data); - - /** - * pktb_len - return length of the packet buffer - * \param pktb Pointer to packet buffer - */ --uint32_t pktb_len(struct pkt_buff *pktb) -+uint32_t __EXPORTED pktb_len(struct pkt_buff *pktb) - { - return pktb->len; - } --EXPORT_SYMBOL(pktb_len); - - /** - * pktb_free - release packet buffer - * \param pktb Pointer to packet buffer - */ --void pktb_free(struct pkt_buff *pktb) -+void __EXPORTED pktb_free(struct pkt_buff *pktb) - { - free(pktb); - } --EXPORT_SYMBOL(pktb_free); - - /** - * pktb_push - update pointer to the beginning of the packet buffer - * \param pktb Pointer to packet buffer - */ --void pktb_push(struct pkt_buff *pktb, unsigned int len) -+void __EXPORTED pktb_push(struct pkt_buff *pktb, unsigned int len) - { - pktb->data -= len; - pktb->len += len; - } --EXPORT_SYMBOL(pktb_push); - - /** - * pktb_pull - update pointer to the beginning of the packet buffer - * \param pktb Pointer to packet buffer - */ --void pktb_pull(struct pkt_buff *pktb, unsigned int len) -+void __EXPORTED pktb_pull(struct pkt_buff *pktb, unsigned int len) - { - pktb->data += len; - pktb->len -= len; - } --EXPORT_SYMBOL(pktb_pull); - - /** - * pktb_put - add extra bytes to the tail of the packet buffer - * \param pktb Pointer to packet buffer - */ --void pktb_put(struct pkt_buff *pktb, unsigned int len) -+void __EXPORTED pktb_put(struct pkt_buff *pktb, unsigned int len) - { - pktb->tail += len; - pktb->len += len; - } --EXPORT_SYMBOL(pktb_put); - - /** - * pktb_trim - set new length for this packet buffer - * \param pktb Pointer to packet buffer - */ --void pktb_trim(struct pkt_buff *pktb, unsigned int len) -+void __EXPORTED pktb_trim(struct pkt_buff *pktb, unsigned int len) - { - pktb->len = len; - } --EXPORT_SYMBOL(pktb_trim); - - /** - * pktb_tailroom - get room in bytes in the tail of the packet buffer - * \param pktb Pointer to packet buffer - */ --unsigned int pktb_tailroom(struct pkt_buff *pktb) -+unsigned int __EXPORTED pktb_tailroom(struct pkt_buff *pktb) - { - return pktb->data_len - pktb->len; - } --EXPORT_SYMBOL(pktb_tailroom); - - /** - * pktb_mac_header - return pointer to layer 2 header (if any) - * \param pktb Pointer to packet buffer - */ --uint8_t *pktb_mac_header(struct pkt_buff *pktb) -+uint8_t __EXPORTED *pktb_mac_header(struct pkt_buff *pktb) - { - return pktb->mac_header; - } --EXPORT_SYMBOL(pktb_mac_header); - - /** - * pktb_network_header - return pointer to layer 3 header - * \param pktb Pointer to packet buffer - */ --uint8_t *pktb_network_header(struct pkt_buff *pktb) -+uint8_t __EXPORTED *pktb_network_header(struct pkt_buff *pktb) - { - return pktb->network_header; - } --EXPORT_SYMBOL(pktb_network_header); - - /** - * pktb_transport_header - return pointer to layer 4 header (if any) - * \param pktb Pointer to packet buffer - */ --uint8_t *pktb_transport_header(struct pkt_buff *pktb) -+uint8_t __EXPORTED *pktb_transport_header(struct pkt_buff *pktb) - { - return pktb->transport_header; - } --EXPORT_SYMBOL(pktb_transport_header); - - static int pktb_expand_tail(struct pkt_buff *pkt, int extra) - { -@@ -224,7 +212,7 @@ static int enlarge_pkt(struct pkt_buff *pkt, unsigned int extra) - return 1; - } - --int pktb_mangle(struct pkt_buff *pkt, -+int __EXPORTED pktb_mangle(struct pkt_buff *pkt, - unsigned int dataoff, - unsigned int match_offset, - unsigned int match_len, -@@ -258,17 +246,15 @@ int pktb_mangle(struct pkt_buff *pkt, - pkt->mangled = true; - return 1; - } --EXPORT_SYMBOL(pktb_mangle); - - /** - * pktb_mangled - return true if packet has been mangled - * \param pktb Pointer to packet buffer - */ --bool pktb_mangled(const struct pkt_buff *pkt) -+bool __EXPORTED pktb_mangled(const struct pkt_buff *pkt) - { - return pkt->mangled; - } --EXPORT_SYMBOL(pktb_mangled); - - /** - * @} -diff --git a/src/extra/tcp.c b/src/extra/tcp.c -index d1cd79d..8038ce5 100644 ---- a/src/extra/tcp.c -+++ b/src/extra/tcp.c -@@ -40,7 +40,7 @@ - * \note You have to call nfq_ip_set_transport_header or - * nfq_ip6_set_transport_header first to access the TCP header. - */ --struct tcphdr *nfq_tcp_get_hdr(struct pkt_buff *pktb) -+struct tcphdr __EXPORTED *nfq_tcp_get_hdr(struct pkt_buff *pktb) - { - if (pktb->transport_header == NULL) - return NULL; -@@ -51,14 +51,13 @@ struct tcphdr *nfq_tcp_get_hdr(struct pkt_buff *pktb) - - return (struct tcphdr *)pktb->transport_header; - } --EXPORT_SYMBOL(nfq_tcp_get_hdr); - - /** - * nfq_tcp_get_payload - get the TCP packet payload - * \param tcph: pointer to the TCP header - * \param pktb: pointer to user-space network packet buffer - */ --void *nfq_tcp_get_payload(struct tcphdr *tcph, struct pkt_buff *pktb) -+void __EXPORTED *nfq_tcp_get_payload(struct tcphdr *tcph, struct pkt_buff *pktb) - { - unsigned int len = tcph->doff * 4; - -@@ -72,47 +71,43 @@ void *nfq_tcp_get_payload(struct tcphdr *tcph, struct pkt_buff *pktb) - - return pktb->transport_header + len; - } --EXPORT_SYMBOL(nfq_tcp_get_payload); - - /** - * nfq_tcp_get_payload_len - get the tcp packet payload - * \param tcph: pointer to the TCP header - * \param pktb: pointer to user-space network packet buffer - */ --unsigned int -+unsigned int __EXPORTED - nfq_tcp_get_payload_len(struct tcphdr *tcph, struct pkt_buff *pktb) - { - return pktb->tail - pktb->transport_header; - } --EXPORT_SYMBOL(nfq_tcp_get_payload_len); - - /** - * nfq_tcp_set_checksum_ipv4 - computes IPv4/TCP packet checksum - * \param tcph: pointer to the TCP header - * \param iph: pointer to the IPv4 header - */ --void -+void __EXPORTED - nfq_tcp_compute_checksum_ipv4(struct tcphdr *tcph, struct iphdr *iph) - { - /* checksum field in header needs to be zero for calculation. */ - tcph->check = 0; - tcph->check = nfq_checksum_tcpudp_ipv4(iph); - } --EXPORT_SYMBOL(nfq_tcp_compute_checksum_ipv4); - - /** - * nfq_tcp_set_checksum_ipv6 - computes IPv6/TCP packet checksum - * \param tcph: pointer to the TCP header - * \param iph: pointer to the IPv6 header - */ --void -+void __EXPORTED - nfq_tcp_compute_checksum_ipv6(struct tcphdr *tcph, struct ip6_hdr *ip6h) - { - /* checksum field in header needs to be zero for calculation. */ - tcph->check = 0; - tcph->check = nfq_checksum_tcpudp_ipv6(ip6h, tcph); - } --EXPORT_SYMBOL(nfq_tcp_compute_checksum_ipv6); - - /* - * The union cast uses a gcc extension to avoid aliasing problems -@@ -134,7 +129,7 @@ union tcp_word_hdr { - * \param tcp: pointer to a valid tcp header. - * - */ --int nfq_tcp_snprintf(char *buf, size_t size, const struct tcphdr *tcph) -+int __EXPORTED nfq_tcp_snprintf(char *buf, size_t size, const struct tcphdr *tcph) - { - int ret, len = 0; - -@@ -177,7 +172,6 @@ int nfq_tcp_snprintf(char *buf, size_t size, const struct tcphdr *tcph) - - return ret; - } --EXPORT_SYMBOL(nfq_tcp_snprintf); - - /** - * nfq_tcp_mangle_ipv4 - mangle TCP/IPv4 packet buffer -@@ -189,7 +183,7 @@ EXPORT_SYMBOL(nfq_tcp_snprintf); - * - * \note This function recalculates the IPv4 and TCP checksums for you. - */ --int -+int __EXPORTED - nfq_tcp_mangle_ipv4(struct pkt_buff *pkt, - unsigned int match_offset, unsigned int match_len, - const char *rep_buffer, unsigned int rep_len) -@@ -208,7 +202,6 @@ nfq_tcp_mangle_ipv4(struct pkt_buff *pkt, - - return 1; - } --EXPORT_SYMBOL(nfq_tcp_mangle_ipv4); - - /** - * @} -diff --git a/src/extra/udp.c b/src/extra/udp.c -index 8c44a66..99c8faa 100644 ---- a/src/extra/udp.c -+++ b/src/extra/udp.c -@@ -37,7 +37,7 @@ - * This function returns NULL if invalid UDP header is found. On success, - * it returns the UDP header. - */ --struct udphdr *nfq_udp_get_hdr(struct pkt_buff *pktb) -+struct udphdr __EXPORTED *nfq_udp_get_hdr(struct pkt_buff *pktb) - { - if (pktb->transport_header == NULL) - return NULL; -@@ -48,14 +48,13 @@ struct udphdr *nfq_udp_get_hdr(struct pkt_buff *pktb) - - return (struct udphdr *)pktb->transport_header; - } --EXPORT_SYMBOL(nfq_udp_get_hdr); - - /** - * nfq_udp_get_payload - get the UDP packet payload. - * \param udph: the pointer to the UDP header. - * \param tail: pointer to the tail of the packet - */ --void *nfq_udp_get_payload(struct udphdr *udph, struct pkt_buff *pktb) -+void __EXPORTED *nfq_udp_get_payload(struct udphdr *udph, struct pkt_buff *pktb) - { - uint16_t len = ntohs(udph->len); - -@@ -69,17 +68,15 @@ void *nfq_udp_get_payload(struct udphdr *udph, struct pkt_buff *pktb) - - return pktb->transport_header + sizeof(struct udphdr); - } --EXPORT_SYMBOL(nfq_udp_get_payload); - - /** - * nfq_udp_get_payload_len - get the udp packet payload. - * \param udp: the pointer to the udp header. - */ --unsigned int nfq_udp_get_payload_len(struct udphdr *udph, struct pkt_buff *pktb) -+unsigned int __EXPORTED nfq_udp_get_payload_len(struct udphdr *udph, struct pkt_buff *pktb) - { - return pktb->tail - pktb->transport_header; - } --EXPORT_SYMBOL(nfq_udp_get_payload_len); - - /** - * nfq_udp_set_checksum_ipv4 - computes a IPv4/TCP packet's segment -@@ -91,14 +88,13 @@ EXPORT_SYMBOL(nfq_udp_get_payload_len); - * \see nfq_pkt_compute_ip_checksum - * \see nfq_pkt_compute_udp_checksum - */ --void -+void __EXPORTED - nfq_udp_compute_checksum_ipv4(struct udphdr *udph, struct iphdr *iph) - { - /* checksum field in header needs to be zero for calculation. */ - udph->check = 0; - udph->check = nfq_checksum_tcpudp_ipv4(iph); - } --EXPORT_SYMBOL(nfq_udp_compute_checksum_ipv4); - - /** - * nfq_udp_set_checksum_ipv6 - computes a IPv6/TCP packet's segment -@@ -110,14 +106,13 @@ EXPORT_SYMBOL(nfq_udp_compute_checksum_ipv4); - * \see nfq_pkt_compute_ip_checksum - * \see nfq_pkt_compute_udp_checksum - */ --void -+void __EXPORTED - nfq_udp_compute_checksum_ipv6(struct udphdr *udph, struct ip6_hdr *ip6h) - { - /* checksum field in header needs to be zero for calculation. */ - udph->check = 0; - udph->check = nfq_checksum_tcpudp_ipv6(ip6h, udph); - } --EXPORT_SYMBOL(nfq_udp_compute_checksum_ipv6); - - /** - * nfq_tcp_mangle_ipv4 - mangle TCP/IPv4 packet buffer -@@ -129,7 +124,7 @@ EXPORT_SYMBOL(nfq_udp_compute_checksum_ipv6); - * - * \note This function recalculates the IPv4 and TCP checksums for you. - */ --int -+int __EXPORTED - nfq_udp_mangle_ipv4(struct pkt_buff *pkt, - unsigned int match_offset, unsigned int match_len, - const char *rep_buffer, unsigned int rep_len) -@@ -148,7 +143,6 @@ nfq_udp_mangle_ipv4(struct pkt_buff *pkt, - - return 1; - } --EXPORT_SYMBOL(nfq_udp_mangle_ipv4); - - /** - * nfq_pkt_snprintf_udp_hdr - print udp header into one buffer in a humnan -@@ -158,12 +152,11 @@ EXPORT_SYMBOL(nfq_udp_mangle_ipv4); - * \param udp: pointer to a valid udp header. - * - */ --int nfq_udp_snprintf(char *buf, size_t size, const struct udphdr *udph) -+int __EXPORTED nfq_udp_snprintf(char *buf, size_t size, const struct udphdr *udph) - { - return snprintf(buf, size, "SPT=%u DPT=%u ", - htons(udph->source), htons(udph->dest)); - } --EXPORT_SYMBOL(nfq_udp_snprintf); - - /** - * @} -diff --git a/src/internal.h b/src/internal.h -index 558d267..79b0752 100644 ---- a/src/internal.h -+++ b/src/internal.h -@@ -5,10 +5,9 @@ - #include <stdint.h> - #include <stdbool.h> - #ifdef HAVE_VISIBILITY_HIDDEN --# define __visible __attribute__((visibility("default"))) --# define EXPORT_SYMBOL(x) typeof(x) (x) __visible -+# define __EXPORTED __attribute__((visibility("default"))) - #else --# define EXPORT_SYMBOL -+# define __EXPORTED - #endif - - struct iphdr; -diff --git a/src/libnetfilter_queue.c b/src/libnetfilter_queue.c -index 065d618..ab0b66b 100644 ---- a/src/libnetfilter_queue.c -+++ b/src/libnetfilter_queue.c -@@ -133,8 +133,7 @@ struct nfq_data { - struct nfattr **data; - }; - --int nfq_errno; --EXPORT_SYMBOL(nfq_errno); -+int __EXPORTED nfq_errno; - - /*********************************************************************** - * low level stuff -@@ -218,11 +217,10 @@ static int __nfq_rcv_pkt(struct nlmsghdr *nlh, struct nfattr *nfa[], - - /* public interface */ - --struct nfnl_handle *nfq_nfnlh(struct nfq_handle *h) -+struct nfnl_handle __EXPORTED *nfq_nfnlh(struct nfq_handle *h) - { - return h->nfnlh; - } --EXPORT_SYMBOL(nfq_nfnlh); - - /** - * -@@ -294,11 +292,10 @@ EXPORT_SYMBOL(nfq_nfnlh); - * over the netlink connection associated with the given queue connection - * handle. - */ --int nfq_fd(struct nfq_handle *h) -+int __EXPORTED nfq_fd(struct nfq_handle *h) - { - return nfnl_fd(nfq_nfnlh(h)); - } --EXPORT_SYMBOL(nfq_fd); - /** - * @} - */ -@@ -349,7 +346,7 @@ EXPORT_SYMBOL(nfq_fd); - * - * \return a pointer to a new queue handle or NULL on failure. - */ --struct nfq_handle *nfq_open(void) -+struct nfq_handle __EXPORTED *nfq_open(void) - { - struct nfnl_handle *nfnlh = nfnl_open(); - struct nfq_handle *qh; -@@ -366,7 +363,6 @@ struct nfq_handle *nfq_open(void) - - return qh; - } --EXPORT_SYMBOL(nfq_open); - - /** - * @} -@@ -382,7 +378,7 @@ EXPORT_SYMBOL(nfq_open); - * - * \return a pointer to a new queue handle or NULL on failure. - */ --struct nfq_handle *nfq_open_nfnl(struct nfnl_handle *nfnlh) -+struct nfq_handle __EXPORTED *nfq_open_nfnl(struct nfnl_handle *nfnlh) - { - struct nfnl_callback pkt_cb = { - .call = __nfq_rcv_pkt, -@@ -419,7 +415,6 @@ out_free: - free(h); - return NULL; - } --EXPORT_SYMBOL(nfq_open_nfnl); - - /** - * \addtogroup LibrarySetup -@@ -438,7 +433,7 @@ EXPORT_SYMBOL(nfq_open_nfnl); - * - * \return 0 on success, non-zero on failure. - */ --int nfq_close(struct nfq_handle *h) -+int __EXPORTED nfq_close(struct nfq_handle *h) - { - int ret; - -@@ -447,7 +442,6 @@ int nfq_close(struct nfq_handle *h) - free(h); - return ret; - } --EXPORT_SYMBOL(nfq_close); - - /** - * nfq_bind_pf - bind a nfqueue handler to a given protocol family -@@ -460,11 +454,10 @@ EXPORT_SYMBOL(nfq_close); - * - * \return integer inferior to 0 in case of failure - */ --int nfq_bind_pf(struct nfq_handle *h, uint16_t pf) -+int __EXPORTED nfq_bind_pf(struct nfq_handle *h, uint16_t pf) - { - return __build_send_cfg_msg(h, NFQNL_CFG_CMD_PF_BIND, 0, pf); - } --EXPORT_SYMBOL(nfq_bind_pf); - - /** - * nfq_unbind_pf - unbind nfqueue handler from a protocol family -@@ -476,11 +469,10 @@ EXPORT_SYMBOL(nfq_bind_pf); - * - * This call is obsolete, Linux kernels from 3.8 onwards ignore it. - */ --int nfq_unbind_pf(struct nfq_handle *h, uint16_t pf) -+int __EXPORTED nfq_unbind_pf(struct nfq_handle *h, uint16_t pf) - { - return __build_send_cfg_msg(h, NFQNL_CFG_CMD_PF_UNBIND, 0, pf); - } --EXPORT_SYMBOL(nfq_unbind_pf); - - - /** -@@ -524,7 +516,7 @@ typedef int nfq_callback(struct nfq_q_handle *qh, - * The callback should return < 0 to stop processing. - */ - --struct nfq_q_handle *nfq_create_queue(struct nfq_handle *h, -+struct nfq_q_handle __EXPORTED *nfq_create_queue(struct nfq_handle *h, - uint16_t num, - nfq_callback *cb, - void *data) -@@ -555,7 +547,6 @@ struct nfq_q_handle *nfq_create_queue(struct nfq_handle *h, - add_qh(qh); - return qh; - } --EXPORT_SYMBOL(nfq_create_queue); - - /** - * @} -@@ -573,7 +564,7 @@ EXPORT_SYMBOL(nfq_create_queue); - * Removes the binding for the specified queue handle. This call also unbind - * from the nfqueue handler, so you don't have to call nfq_unbind_pf. - */ --int nfq_destroy_queue(struct nfq_q_handle *qh) -+int __EXPORTED nfq_destroy_queue(struct nfq_q_handle *qh) - { - int ret = __build_send_cfg_msg(qh->h, NFQNL_CFG_CMD_UNBIND, qh->id, 0); - if (ret == 0) { -@@ -583,7 +574,6 @@ int nfq_destroy_queue(struct nfq_q_handle *qh) - - return ret; - } --EXPORT_SYMBOL(nfq_destroy_queue); - - /** - * nfq_handle_packet - handle a packet received from the nfqueue subsystem -@@ -597,11 +587,10 @@ EXPORT_SYMBOL(nfq_destroy_queue); - * - * \return 0 on success, non-zero on failure. - */ --int nfq_handle_packet(struct nfq_handle *h, char *buf, int len) -+int __EXPORTED nfq_handle_packet(struct nfq_handle *h, char *buf, int len) - { - return nfnl_handle_packet(h->nfnlh, buf, len); - } --EXPORT_SYMBOL(nfq_handle_packet); - - /** - * nfq_set_mode - set the amount of packet data that nfqueue copies to userspace -@@ -618,7 +607,7 @@ EXPORT_SYMBOL(nfq_handle_packet); - * - * \return -1 on error; >=0 otherwise. - */ --int nfq_set_mode(struct nfq_q_handle *qh, -+int __EXPORTED nfq_set_mode(struct nfq_q_handle *qh, - uint8_t mode, uint32_t range) - { - union { -@@ -638,7 +627,6 @@ int nfq_set_mode(struct nfq_q_handle *qh, - - return nfnl_query(qh->h->nfnlh, &u.nmh); - } --EXPORT_SYMBOL(nfq_set_mode); - - /** - * nfq_set_queue_flags - set flags (options) for the kernel queue -@@ -690,7 +678,7 @@ EXPORT_SYMBOL(nfq_set_mode); - * - * \return -1 on error with errno set appropriately; =0 otherwise. - */ --int nfq_set_queue_flags(struct nfq_q_handle *qh, -+int __EXPORTED nfq_set_queue_flags(struct nfq_q_handle *qh, - uint32_t mask, uint32_t flags) - { - union { -@@ -711,7 +699,6 @@ int nfq_set_queue_flags(struct nfq_q_handle *qh, - - return nfnl_query(qh->h->nfnlh, &u.nmh); - } --EXPORT_SYMBOL(nfq_set_queue_flags); - - /** - * nfq_set_queue_maxlen - Set kernel queue maximum length parameter -@@ -724,7 +711,7 @@ EXPORT_SYMBOL(nfq_set_queue_flags); - * - * \return -1 on error; >=0 otherwise. - */ --int nfq_set_queue_maxlen(struct nfq_q_handle *qh, -+int __EXPORTED nfq_set_queue_maxlen(struct nfq_q_handle *qh, - uint32_t queuelen) - { - union { -@@ -742,7 +729,6 @@ int nfq_set_queue_maxlen(struct nfq_q_handle *qh, - - return nfnl_query(qh->h->nfnlh, &u.nmh); - } --EXPORT_SYMBOL(nfq_set_queue_maxlen); - - /** - * @} -@@ -829,14 +815,13 @@ static int __set_verdict(struct nfq_q_handle *qh, uint32_t id, - * - * \return -1 on error; >= 0 otherwise. - */ --int nfq_set_verdict(struct nfq_q_handle *qh, uint32_t id, -+int __EXPORTED nfq_set_verdict(struct nfq_q_handle *qh, uint32_t id, - uint32_t verdict, uint32_t data_len, - const unsigned char *buf) - { - return __set_verdict(qh, id, verdict, 0, 0, data_len, buf, - NFQNL_MSG_VERDICT); - } --EXPORT_SYMBOL(nfq_set_verdict); - - /** - * nfq_set_verdict2 - like nfq_set_verdict, but you can set the mark. -@@ -847,14 +832,13 @@ EXPORT_SYMBOL(nfq_set_verdict); - * \param data_len number of bytes of data pointed to by #buf - * \param buf the buffer that contains the packet data - */ --int nfq_set_verdict2(struct nfq_q_handle *qh, uint32_t id, -+int __EXPORTED nfq_set_verdict2(struct nfq_q_handle *qh, uint32_t id, - uint32_t verdict, uint32_t mark, - uint32_t data_len, const unsigned char *buf) - { - return __set_verdict(qh, id, verdict, htonl(mark), 1, data_len, - buf, NFQNL_MSG_VERDICT); - } --EXPORT_SYMBOL(nfq_set_verdict2); - - /** - * nfq_set_verdict_batch - issue verdicts on several packets at once -@@ -868,13 +852,12 @@ EXPORT_SYMBOL(nfq_set_verdict2); - * batch support was added in Linux 3.1. - * These functions will fail silently on older kernels. - */ --int nfq_set_verdict_batch(struct nfq_q_handle *qh, uint32_t id, -+int __EXPORTED nfq_set_verdict_batch(struct nfq_q_handle *qh, uint32_t id, - uint32_t verdict) - { - return __set_verdict(qh, id, verdict, 0, 0, 0, NULL, - NFQNL_MSG_VERDICT_BATCH); - } --EXPORT_SYMBOL(nfq_set_verdict_batch); - - /** - * nfq_set_verdict_batch2 - like nfq_set_verdict_batch, but you can set a mark. -@@ -883,13 +866,12 @@ EXPORT_SYMBOL(nfq_set_verdict_batch); - * \param verdict verdict to return to netfilter (NF_ACCEPT, NF_DROP) - * \param mark mark to put on packet - */ --int nfq_set_verdict_batch2(struct nfq_q_handle *qh, uint32_t id, -+int __EXPORTED nfq_set_verdict_batch2(struct nfq_q_handle *qh, uint32_t id, - uint32_t verdict, uint32_t mark) - { - return __set_verdict(qh, id, verdict, htonl(mark), 1, 0, - NULL, NFQNL_MSG_VERDICT_BATCH); - } --EXPORT_SYMBOL(nfq_set_verdict_batch2); - - /** - * nfq_set_verdict_mark - like nfq_set_verdict, but you can set the mark. -@@ -905,14 +887,13 @@ EXPORT_SYMBOL(nfq_set_verdict_batch2); - * This function is deprecated since it is broken, its use is highly - * discouraged. Please, use nfq_set_verdict2 instead. - */ --int nfq_set_verdict_mark(struct nfq_q_handle *qh, uint32_t id, -+int __EXPORTED nfq_set_verdict_mark(struct nfq_q_handle *qh, uint32_t id, - uint32_t verdict, uint32_t mark, - uint32_t data_len, const unsigned char *buf) - { - return __set_verdict(qh, id, verdict, mark, 1, data_len, buf, - NFQNL_MSG_VERDICT); - } --EXPORT_SYMBOL(nfq_set_verdict_mark); - - /** - * @} -@@ -947,12 +928,11 @@ EXPORT_SYMBOL(nfq_set_verdict_mark); - } __attribute__ ((packed)); - \endverbatim - */ --struct nfqnl_msg_packet_hdr *nfq_get_msg_packet_hdr(struct nfq_data *nfad) -+struct nfqnl_msg_packet_hdr __EXPORTED *nfq_get_msg_packet_hdr(struct nfq_data *nfad) - { - return nfnl_get_pointer_to_data(nfad->data, NFQA_PACKET_HDR, - struct nfqnl_msg_packet_hdr); - } --EXPORT_SYMBOL(nfq_get_msg_packet_hdr); - - /** - * nfq_get_nfmark - get the packet mark -@@ -960,11 +940,10 @@ EXPORT_SYMBOL(nfq_get_msg_packet_hdr); - * - * \return the netfilter mark currently assigned to the given queued packet. - */ --uint32_t nfq_get_nfmark(struct nfq_data *nfad) -+uint32_t __EXPORTED nfq_get_nfmark(struct nfq_data *nfad) - { - return ntohl(nfnl_get_data(nfad->data, NFQA_MARK, uint32_t)); - } --EXPORT_SYMBOL(nfq_get_nfmark); - - /** - * nfq_get_timestamp - get the packet timestamp -@@ -975,7 +954,7 @@ EXPORT_SYMBOL(nfq_get_nfmark); - * - * \return 0 on success, non-zero on failure. - */ --int nfq_get_timestamp(struct nfq_data *nfad, struct timeval *tv) -+int __EXPORTED nfq_get_timestamp(struct nfq_data *nfad, struct timeval *tv) - { - struct nfqnl_msg_packet_timestamp *qpt; - qpt = nfnl_get_pointer_to_data(nfad->data, NFQA_TIMESTAMP, -@@ -988,7 +967,6 @@ int nfq_get_timestamp(struct nfq_data *nfad, struct timeval *tv) - - return 0; - } --EXPORT_SYMBOL(nfq_get_timestamp); - - /** - * nfq_get_indev - get the interface that the packet was received through -@@ -1001,11 +979,10 @@ EXPORT_SYMBOL(nfq_get_timestamp); - * \warning all nfq_get_dev() functions return 0 if not set, since linux - * only allows ifindex >= 1, see net/core/dev.c:2600 (in 2.6.13.1) - */ --uint32_t nfq_get_indev(struct nfq_data *nfad) -+uint32_t __EXPORTED nfq_get_indev(struct nfq_data *nfad) - { - return ntohl(nfnl_get_data(nfad->data, NFQA_IFINDEX_INDEV, uint32_t)); - } --EXPORT_SYMBOL(nfq_get_indev); - - /** - * nfq_get_physindev - get the physical interface that the packet was received -@@ -1015,11 +992,10 @@ EXPORT_SYMBOL(nfq_get_indev); - * If the returned index is 0, the packet was locally generated or the - * physical input interface is no longer known (ie. POSTROUTING?). - */ --uint32_t nfq_get_physindev(struct nfq_data *nfad) -+uint32_t __EXPORTED nfq_get_physindev(struct nfq_data *nfad) - { - return ntohl(nfnl_get_data(nfad->data, NFQA_IFINDEX_PHYSINDEV, uint32_t)); - } --EXPORT_SYMBOL(nfq_get_physindev); - - /** - * nfq_get_outdev - gets the interface that the packet will be routed out -@@ -1029,11 +1005,10 @@ EXPORT_SYMBOL(nfq_get_physindev); - * returned index is 0, the packet is destined for localhost or the output - * interface is not yet known (ie. PREROUTING?). - */ --uint32_t nfq_get_outdev(struct nfq_data *nfad) -+uint32_t __EXPORTED nfq_get_outdev(struct nfq_data *nfad) - { - return ntohl(nfnl_get_data(nfad->data, NFQA_IFINDEX_OUTDEV, uint32_t)); - } --EXPORT_SYMBOL(nfq_get_outdev); - - /** - * nfq_get_physoutdev - get the physical interface that the packet output -@@ -1045,11 +1020,10 @@ EXPORT_SYMBOL(nfq_get_outdev); - * - * \return The index of physical interface that the packet output will be routed out. - */ --uint32_t nfq_get_physoutdev(struct nfq_data *nfad) -+uint32_t __EXPORTED nfq_get_physoutdev(struct nfq_data *nfad) - { - return ntohl(nfnl_get_data(nfad->data, NFQA_IFINDEX_PHYSOUTDEV, uint32_t)); - } --EXPORT_SYMBOL(nfq_get_physoutdev); - - /** - * nfq_get_indev_name - get the name of the interface the packet -@@ -1089,13 +1063,12 @@ EXPORT_SYMBOL(nfq_get_physoutdev); - \endverbatim - * - */ --int nfq_get_indev_name(struct nlif_handle *nlif_handle, -+int __EXPORTED nfq_get_indev_name(struct nlif_handle *nlif_handle, - struct nfq_data *nfad, char *name) - { - uint32_t ifindex = nfq_get_indev(nfad); - return nlif_index2name(nlif_handle, ifindex, name); - } --EXPORT_SYMBOL(nfq_get_indev_name); - - /** - * nfq_get_physindev_name - get the name of the physical interface the -@@ -1109,13 +1082,12 @@ EXPORT_SYMBOL(nfq_get_indev_name); - * - * \return -1 in case of error, > 0 if it succeed. - */ --int nfq_get_physindev_name(struct nlif_handle *nlif_handle, -+int __EXPORTED nfq_get_physindev_name(struct nlif_handle *nlif_handle, - struct nfq_data *nfad, char *name) - { - uint32_t ifindex = nfq_get_physindev(nfad); - return nlif_index2name(nlif_handle, ifindex, name); - } --EXPORT_SYMBOL(nfq_get_physindev_name); - - /** - * nfq_get_outdev_name - get the name of the physical interface the -@@ -1129,13 +1101,12 @@ EXPORT_SYMBOL(nfq_get_physindev_name); - * - * \return -1 in case of error, > 0 if it succeed. - */ --int nfq_get_outdev_name(struct nlif_handle *nlif_handle, -+int __EXPORTED nfq_get_outdev_name(struct nlif_handle *nlif_handle, - struct nfq_data *nfad, char *name) - { - uint32_t ifindex = nfq_get_outdev(nfad); - return nlif_index2name(nlif_handle, ifindex, name); - } --EXPORT_SYMBOL(nfq_get_outdev_name); - - /** - * nfq_get_physoutdev_name - get the name of the interface the -@@ -1150,13 +1121,12 @@ EXPORT_SYMBOL(nfq_get_outdev_name); - * \return -1 in case of error, > 0 if it succeed. - */ - --int nfq_get_physoutdev_name(struct nlif_handle *nlif_handle, -+int __EXPORTED nfq_get_physoutdev_name(struct nlif_handle *nlif_handle, - struct nfq_data *nfad, char *name) - { - uint32_t ifindex = nfq_get_physoutdev(nfad); - return nlif_index2name(nlif_handle, ifindex, name); - } --EXPORT_SYMBOL(nfq_get_physoutdev_name); - - /** - * nfq_get_packet_hw -@@ -1180,12 +1150,11 @@ EXPORT_SYMBOL(nfq_get_physoutdev_name); - } __attribute__ ((packed)); - \endverbatim - */ --struct nfqnl_msg_packet_hw *nfq_get_packet_hw(struct nfq_data *nfad) -+struct nfqnl_msg_packet_hw __EXPORTED *nfq_get_packet_hw(struct nfq_data *nfad) - { - return nfnl_get_pointer_to_data(nfad->data, NFQA_HWADDR, - struct nfqnl_msg_packet_hw); - } --EXPORT_SYMBOL(nfq_get_packet_hw); - - /** - * nfq_get_uid - get the UID of the user the packet belongs to -@@ -1193,7 +1162,7 @@ EXPORT_SYMBOL(nfq_get_packet_hw); - * - * \return 1 if there is a UID available, 0 otherwise. - */ --int nfq_get_uid(struct nfq_data *nfad, uint32_t *uid) -+int __EXPORTED nfq_get_uid(struct nfq_data *nfad, uint32_t *uid) - { - if (!nfnl_attr_present(nfad->data, NFQA_UID)) - return 0; -@@ -1201,7 +1170,6 @@ int nfq_get_uid(struct nfq_data *nfad, uint32_t *uid) - *uid = ntohl(nfnl_get_data(nfad->data, NFQA_UID, uint32_t)); - return 1; - } --EXPORT_SYMBOL(nfq_get_uid); - - /** - * nfq_get_gid - get the GID of the user the packet belongs to -@@ -1209,7 +1177,7 @@ EXPORT_SYMBOL(nfq_get_uid); - * - * \return 1 if there is a GID available, 0 otherwise. - */ --int nfq_get_gid(struct nfq_data *nfad, uint32_t *gid) -+int __EXPORTED nfq_get_gid(struct nfq_data *nfad, uint32_t *gid) - { - if (!nfnl_attr_present(nfad->data, NFQA_GID)) - return 0; -@@ -1217,7 +1185,6 @@ int nfq_get_gid(struct nfq_data *nfad, uint32_t *gid) - *gid = ntohl(nfnl_get_data(nfad->data, NFQA_GID, uint32_t)); - return 1; - } --EXPORT_SYMBOL(nfq_get_gid); - - - /** -@@ -1227,7 +1194,7 @@ EXPORT_SYMBOL(nfq_get_gid); - * - * \return -1 on error, otherwise > 0 - */ --int nfq_get_secctx(struct nfq_data *nfad, unsigned char **secdata) -+int __EXPORTED nfq_get_secctx(struct nfq_data *nfad, unsigned char **secdata) - { - if (!nfnl_attr_present(nfad->data, NFQA_SECCTX)) - return -1; -@@ -1240,7 +1207,6 @@ int nfq_get_secctx(struct nfq_data *nfad, unsigned char **secdata) - - return 0; - } --EXPORT_SYMBOL(nfq_get_secctx); - - /** - * nfq_get_payload - get payload -@@ -1253,7 +1219,7 @@ EXPORT_SYMBOL(nfq_get_secctx); - * - * \return -1 on error, otherwise > 0. - */ --int nfq_get_payload(struct nfq_data *nfad, unsigned char **data) -+int __EXPORTED nfq_get_payload(struct nfq_data *nfad, unsigned char **data) - { - *data = (unsigned char *) - nfnl_get_pointer_to_data(nfad->data, NFQA_PAYLOAD, char); -@@ -1262,7 +1228,6 @@ int nfq_get_payload(struct nfq_data *nfad, unsigned char **data) - - return -1; - } --EXPORT_SYMBOL(nfq_get_payload); - - /** - * @} -@@ -1307,7 +1272,7 @@ do { \ - * would have been printed into the buffer (in case that there is enough - * room in it). See snprintf() return value for more information. - */ --int nfq_snprintf_xml(char *buf, size_t rem, struct nfq_data *tb, int flags) -+int __EXPORTED nfq_snprintf_xml(char *buf, size_t rem, struct nfq_data *tb, int flags) - { - struct nfqnl_msg_packet_hdr *ph; - struct nfqnl_msg_packet_hw *hwph; -@@ -1460,7 +1425,6 @@ int nfq_snprintf_xml(char *buf, size_t rem, struct nfq_data *tb, int flags) - - return len; - } --EXPORT_SYMBOL(nfq_snprintf_xml); - - /** - * @} -diff --git a/src/nlmsg.c b/src/nlmsg.c -index ba28c77..5582407 100644 ---- a/src/nlmsg.c -+++ b/src/nlmsg.c -@@ -30,7 +30,7 @@ - * @{ - */ - --void nfq_nlmsg_verdict_put(struct nlmsghdr *nlh, int id, int verdict) -+void __EXPORTED nfq_nlmsg_verdict_put(struct nlmsghdr *nlh, int id, int verdict) - { - struct nfqnl_msg_verdict_hdr vh = { - .verdict = htonl(verdict), -@@ -38,20 +38,17 @@ void nfq_nlmsg_verdict_put(struct nlmsghdr *nlh, int id, int verdict) - }; - mnl_attr_put(nlh, NFQA_VERDICT_HDR, sizeof(vh), &vh); - } --EXPORT_SYMBOL(nfq_nlmsg_verdict_put); - --void nfq_nlmsg_verdict_put_mark(struct nlmsghdr *nlh, uint32_t mark) -+void __EXPORTED nfq_nlmsg_verdict_put_mark(struct nlmsghdr *nlh, uint32_t mark) - { - mnl_attr_put_u32(nlh, NFQA_MARK, htonl(mark)); - } --EXPORT_SYMBOL(nfq_nlmsg_verdict_put_mark); - --void -+void __EXPORTED - nfq_nlmsg_verdict_put_pkt(struct nlmsghdr *nlh, const void *pkt, uint32_t plen) - { - mnl_attr_put(nlh, NFQA_PAYLOAD, plen, pkt); - } --EXPORT_SYMBOL(nfq_nlmsg_verdict_put_pkt); - - /** - * @} -@@ -85,7 +82,7 @@ EXPORT_SYMBOL(nfq_nlmsg_verdict_put_pkt); - * given protocol family. Both commands are ignored by Linux kernel 3.8 and - * later versions. - */ --void nfq_nlmsg_cfg_put_cmd(struct nlmsghdr *nlh, uint16_t pf, uint8_t cmd) -+void __EXPORTED nfq_nlmsg_cfg_put_cmd(struct nlmsghdr *nlh, uint16_t pf, uint8_t cmd) - { - struct nfqnl_msg_config_cmd command = { - .command = cmd, -@@ -93,9 +90,8 @@ void nfq_nlmsg_cfg_put_cmd(struct nlmsghdr *nlh, uint16_t pf, uint8_t cmd) - }; - mnl_attr_put(nlh, NFQA_CFG_CMD, sizeof(command), &command); - } --EXPORT_SYMBOL(nfq_nlmsg_cfg_put_cmd); - --void nfq_nlmsg_cfg_put_params(struct nlmsghdr *nlh, uint8_t mode, int range) -+void __EXPORTED nfq_nlmsg_cfg_put_params(struct nlmsghdr *nlh, uint8_t mode, int range) - { - struct nfqnl_msg_config_params params = { - .copy_range = htonl(range), -@@ -103,13 +99,11 @@ void nfq_nlmsg_cfg_put_params(struct nlmsghdr *nlh, uint8_t mode, int range) - }; - mnl_attr_put(nlh, NFQA_CFG_PARAMS, sizeof(params), ¶ms); - } --EXPORT_SYMBOL(nfq_nlmsg_cfg_put_params); - --void nfq_nlmsg_cfg_put_qmaxlen(struct nlmsghdr *nlh, uint32_t queue_maxlen) -+void __EXPORTED nfq_nlmsg_cfg_put_qmaxlen(struct nlmsghdr *nlh, uint32_t queue_maxlen) - { - mnl_attr_put_u32(nlh, NFQA_CFG_QUEUE_MAXLEN, htonl(queue_maxlen)); - } --EXPORT_SYMBOL(nfq_nlmsg_cfg_put_qmaxlen); - - /** - * @} -@@ -179,12 +173,11 @@ static int nfq_pkt_parse_attr_cb(const struct nlattr *attr, void *data) - * This function returns MNL_CB_ERROR if any error occurs, or MNL_CB_OK on - * success. - */ --int nfq_nlmsg_parse(const struct nlmsghdr *nlh, struct nlattr **attr) -+int __EXPORTED nfq_nlmsg_parse(const struct nlmsghdr *nlh, struct nlattr **attr) - { - return mnl_attr_parse(nlh, sizeof(struct nfgenmsg), - nfq_pkt_parse_attr_cb, attr); - } --EXPORT_SYMBOL(nfq_nlmsg_parse); - - /** - * @} --- -2.12.2 - diff --git a/meta-networking/recipes-filter/libnetfilter/files/libnetfilter-cthelper-visibility-hidden.patch b/meta-networking/recipes-filter/libnetfilter/files/libnetfilter-cthelper-visibility-hidden.patch deleted file mode 100644 index 9377f57cb0..0000000000 --- a/meta-networking/recipes-filter/libnetfilter/files/libnetfilter-cthelper-visibility-hidden.patch +++ /dev/null @@ -1,385 +0,0 @@ -From f58c5b09fb59baf07c942d373fc4d522b27e73c6 Mon Sep 17 00:00:00 2001 -From: Kevin Cernekee <cernekee@chromium.org> -Date: Wed, 4 Jan 2017 14:30:26 -0800 -Subject: Use __EXPORTED rather than EXPORT_SYMBOL - -clang is sensitive to the ordering of -__attribute__((visibility("default"))) relative to the function -body. gcc is not. So if we try to re-declare an existing function -with default visibility, clang prints a warning and generates -a broken .so file in which nfct_helper_* are not exported to library -callers. - -Move the attribute up into the function definition to make clang happy. - -Signed-off-by: Kevin Cernekee <cernekee@chromium.org> -Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> ---- - doxygen.cfg.in | 2 +- - src/internal.h | 5 ++- - src/libnetfilter_cthelper.c | 83 ++++++++++++++++++--------------------------- - 3 files changed, 36 insertions(+), 54 deletions(-) - -diff --git a/doxygen.cfg.in b/doxygen.cfg.in -index cac9b05..190b7cd 100644 ---- a/doxygen.cfg.in -+++ b/doxygen.cfg.in -@@ -72,7 +72,7 @@ RECURSIVE = YES - EXCLUDE = - EXCLUDE_SYMLINKS = NO - EXCLUDE_PATTERNS = */.git/* .*.d --EXCLUDE_SYMBOLS = EXPORT_SYMBOL -+EXCLUDE_SYMBOLS = - EXAMPLE_PATH = - EXAMPLE_PATTERNS = - EXAMPLE_RECURSIVE = NO -diff --git a/src/internal.h b/src/internal.h -index 3a88d1a..5d78171 100644 ---- a/src/internal.h -+++ b/src/internal.h -@@ -3,10 +3,9 @@ - - #include "config.h" - #ifdef HAVE_VISIBILITY_HIDDEN --# define __visible __attribute__((visibility("default"))) --# define EXPORT_SYMBOL(x) typeof(x) (x) __visible -+# define __EXPORTED __attribute__((visibility("default"))) - #else --# define EXPORT_SYMBOL -+# define __EXPORTED - #endif - - #endif -diff --git a/src/libnetfilter_cthelper.c b/src/libnetfilter_cthelper.c -index f8f58e6..af543a1 100644 ---- a/src/libnetfilter_cthelper.c -+++ b/src/libnetfilter_cthelper.c -@@ -99,17 +99,16 @@ struct nfct_helper { - * In case of success, this function returns a valid pointer, otherwise NULL - * s returned and errno is appropriately set. - */ --struct nfct_helper *nfct_helper_alloc(void) -+struct nfct_helper __EXPORTED *nfct_helper_alloc(void) - { - return calloc(1, sizeof(struct nfct_helper)); - } --EXPORT_SYMBOL(nfct_helper_alloc); - - /** - * nfct_helper_free - release one helper object - * \param nfct_helper pointer to the helper object - */ --void nfct_helper_free(struct nfct_helper *h) -+void __EXPORTED nfct_helper_free(struct nfct_helper *h) - { - int i; - -@@ -119,7 +118,6 @@ void nfct_helper_free(struct nfct_helper *h) - } - free(h); - } --EXPORT_SYMBOL(nfct_helper_free); - - /** - * nfct_helper_policy_alloc - allocate a new helper policy object -@@ -127,21 +125,19 @@ EXPORT_SYMBOL(nfct_helper_free); - * In case of success, this function returns a valid pointer, otherwise NULL - * s returned and errno is appropriately set. - */ --struct nfct_helper_policy *nfct_helper_policy_alloc(void) -+struct nfct_helper_policy __EXPORTED *nfct_helper_policy_alloc(void) - { - return calloc(1, sizeof(struct nfct_helper_policy)); - } --EXPORT_SYMBOL(nfct_helper_policy_alloc); - - /** - * nfct_helper_free - release one helper policy object - * \param nfct_helper pointer to the helper object - */ --void nfct_helper_policy_free(struct nfct_helper_policy *p) -+void __EXPORTED nfct_helper_policy_free(struct nfct_helper_policy *p) - { - free(p); - } --EXPORT_SYMBOL(nfct_helper_policy_free); - - /** - * nfct_helper_policy_attr_set - set one attribute of the helper object -@@ -149,7 +145,7 @@ EXPORT_SYMBOL(nfct_helper_policy_free); - * \param type attribute type you want to set - * \param data pointer to data that will be used to set this attribute - */ --void -+void __EXPORTED - nfct_helper_policy_attr_set(struct nfct_helper_policy *p, - enum nfct_helper_policy_attr_type type, - const void *data) -@@ -170,7 +166,6 @@ nfct_helper_policy_attr_set(struct nfct_helper_policy *p, - break; - } - } --EXPORT_SYMBOL(nfct_helper_policy_attr_set); - - /** - * nfct_helper_attr_set_str - set one attribute the helper object -@@ -178,23 +173,21 @@ EXPORT_SYMBOL(nfct_helper_policy_attr_set); - * \param type attribute type you want to set - * \param name string that will be used to set this attribute - */ --void -+void __EXPORTED - nfct_helper_policy_attr_set_str(struct nfct_helper_policy *p, - enum nfct_helper_policy_attr_type type, - const char *name) - { - nfct_helper_policy_attr_set(p, type, name); - } --EXPORT_SYMBOL(nfct_helper_policy_attr_set_str); - --void -+void __EXPORTED - nfct_helper_policy_attr_set_u32(struct nfct_helper_policy *p, - enum nfct_helper_policy_attr_type type, - uint32_t value) - { - nfct_helper_policy_attr_set(p, type, &value); - } --EXPORT_SYMBOL(nfct_helper_policy_attr_set_u32); - - /** - * nfct_helper_attr_set - set one attribute of the helper object -@@ -202,7 +195,7 @@ EXPORT_SYMBOL(nfct_helper_policy_attr_set_u32); - * \param type attribute type you want to set - * \param data pointer to data that will be used to set this attribute - */ --void -+void __EXPORTED - nfct_helper_attr_set(struct nfct_helper *h, - enum nfct_helper_attr_type type, const void *data) - { -@@ -250,7 +243,6 @@ nfct_helper_attr_set(struct nfct_helper *h, - break; - } - } --EXPORT_SYMBOL(nfct_helper_attr_set); - - /** - * nfct_helper_attr_set_str - set one attribute the helper object -@@ -258,44 +250,40 @@ EXPORT_SYMBOL(nfct_helper_attr_set); - * \param type attribute type you want to set - * \param name string that will be used to set this attribute - */ --void -+void __EXPORTED - nfct_helper_attr_set_str(struct nfct_helper *nfct_helper, enum nfct_helper_attr_type type, - const char *name) - { - nfct_helper_attr_set(nfct_helper, type, name); - } --EXPORT_SYMBOL(nfct_helper_attr_set_str); - --void -+void __EXPORTED - nfct_helper_attr_set_u8(struct nfct_helper *nfct_helper, - enum nfct_helper_attr_type type, uint8_t value) - { - nfct_helper_attr_set(nfct_helper, type, &value); - } --EXPORT_SYMBOL(nfct_helper_attr_set_u8); - --void -+void __EXPORTED - nfct_helper_attr_set_u16(struct nfct_helper *nfct_helper, - enum nfct_helper_attr_type type, uint16_t value) - { - nfct_helper_attr_set(nfct_helper, type, &value); - } --EXPORT_SYMBOL(nfct_helper_attr_set_u16); - --void -+void __EXPORTED - nfct_helper_attr_set_u32(struct nfct_helper *nfct_helper, - enum nfct_helper_attr_type type, uint32_t value) - { - nfct_helper_attr_set(nfct_helper, type, &value); - } --EXPORT_SYMBOL(nfct_helper_attr_set_u32); - - /** - * nfct_helper_attr_unset - unset one attribute the helper object - * \param nfct_helper pointer to the helper object - * \param type attribute type you want to set - */ --void -+void __EXPORTED - nfct_helper_attr_unset(struct nfct_helper *nfct_helper, enum nfct_helper_attr_type type) - { - switch(type) { -@@ -307,7 +295,6 @@ nfct_helper_attr_unset(struct nfct_helper *nfct_helper, enum nfct_helper_attr_ty - break; - } - } --EXPORT_SYMBOL(nfct_helper_attr_unset); - - /** - * nfct_helper_attr_get - get one attribute the helper object -@@ -317,8 +304,9 @@ EXPORT_SYMBOL(nfct_helper_attr_unset); - * This function returns a valid pointer to the attribute data. If a - * unsupported attribute is used, this returns NULL. - */ --const void *nfct_helper_attr_get(struct nfct_helper *helper, -- enum nfct_helper_attr_type type) -+const void __EXPORTED * -+nfct_helper_attr_get(struct nfct_helper *helper, -+ enum nfct_helper_attr_type type) - { - const void *ret = NULL; - -@@ -358,7 +346,6 @@ const void *nfct_helper_attr_get(struct nfct_helper *helper, - } - return ret; - } --EXPORT_SYMBOL(nfct_helper_attr_get); - - /** - * nfct_helper_attr_get_str - get one attribute the helper object -@@ -368,13 +355,12 @@ EXPORT_SYMBOL(nfct_helper_attr_get); - * This function returns a valid pointer to the beginning of the string. - * If the attribute is unsupported, this returns NULL. - */ --const char * -+const char __EXPORTED * - nfct_helper_attr_get_str(struct nfct_helper *nfct_helper, - enum nfct_helper_attr_type type) - { - return (const char *)nfct_helper_attr_get(nfct_helper, type); - } --EXPORT_SYMBOL(nfct_helper_attr_get_str); - - /** - * nfct_helper_attr_get_u8 - get one attribute the helper object -@@ -384,12 +370,12 @@ EXPORT_SYMBOL(nfct_helper_attr_get_str); - * This function returns a unsigned 8-bits integer. If the attribute is - * unsupported, this returns NULL. - */ --uint8_t nfct_helper_attr_get_u8(struct nfct_helper *nfct_helper, -- enum nfct_helper_attr_type type) -+uint8_t __EXPORTED -+nfct_helper_attr_get_u8(struct nfct_helper *nfct_helper, -+ enum nfct_helper_attr_type type) - { - return *((uint8_t *)nfct_helper_attr_get(nfct_helper, type)); - } --EXPORT_SYMBOL(nfct_helper_attr_get_u8); - - /** - * nfct_helper_attr_get_u16 - get one attribute the helper object -@@ -399,12 +385,12 @@ EXPORT_SYMBOL(nfct_helper_attr_get_u8); - * This function returns a unsigned 16-bits integer. If the attribute is - * unsupported, this returns NULL. - */ --uint16_t nfct_helper_attr_get_u16(struct nfct_helper *nfct_helper, -- enum nfct_helper_attr_type type) -+uint16_t __EXPORTED -+nfct_helper_attr_get_u16(struct nfct_helper *nfct_helper, -+ enum nfct_helper_attr_type type) - { - return *((uint16_t *)nfct_helper_attr_get(nfct_helper, type)); - } --EXPORT_SYMBOL(nfct_helper_attr_get_u16); - - /** - * nfct_helper_attr_get_u32 - get one attribute the helper object -@@ -414,12 +400,12 @@ EXPORT_SYMBOL(nfct_helper_attr_get_u16); - * This function returns a unsigned 32-bits integer. If the attribute is - * unsupported, this returns NULL. - */ --uint32_t nfct_helper_attr_get_u32(struct nfct_helper *nfct_helper, -- enum nfct_helper_attr_type type) -+uint32_t __EXPORTED -+nfct_helper_attr_get_u32(struct nfct_helper *nfct_helper, -+ enum nfct_helper_attr_type type) - { - return *((uint32_t *)nfct_helper_attr_get(nfct_helper, type)); - } --EXPORT_SYMBOL(nfct_helper_attr_get_u32); - - /** - * nfct_helper_snprintf - print helper object into one buffer -@@ -431,9 +417,10 @@ EXPORT_SYMBOL(nfct_helper_attr_get_u32); - * This function returns -1 in case that some mandatory attributes are - * missing. On sucess, it returns 0. - */ --int nfct_helper_snprintf(char *buf, size_t size, -- struct nfct_helper *helper, -- unsigned int type, unsigned int flags) -+int __EXPORTED -+nfct_helper_snprintf(char *buf, size_t size, -+ struct nfct_helper *helper, -+ unsigned int type, unsigned int flags) - { - int ret; - -@@ -454,7 +441,6 @@ int nfct_helper_snprintf(char *buf, size_t size, - - return ret; - } --EXPORT_SYMBOL(nfct_helper_snprintf); - - /** - * @} -@@ -490,7 +476,7 @@ EXPORT_SYMBOL(nfct_helper_snprintf); - * - Command NFNL_MSG_ACCT_DEL, to delete one specific nfct_helper object (if - * unused, otherwise you hit EBUSY). - */ --struct nlmsghdr * -+struct nlmsghdr __EXPORTED * - nfct_helper_nlmsg_build_hdr(char *buf, uint8_t cmd, - uint16_t flags, uint32_t seq) - { -@@ -509,7 +495,6 @@ nfct_helper_nlmsg_build_hdr(char *buf, uint8_t cmd, - - return nlh; - } --EXPORT_SYMBOL(nfct_helper_nlmsg_build_hdr); - - static void - nfct_helper_nlmsg_build_policy(struct nlmsghdr *nlh, -@@ -530,7 +515,7 @@ nfct_helper_nlmsg_build_policy(struct nlmsghdr *nlh, - * \param nlh: netlink message that you want to use to add the payload. - * \param nfct_helper: pointer to a helper object - */ --void -+void __EXPORTED - nfct_helper_nlmsg_build_payload(struct nlmsghdr *nlh, struct nfct_helper *h) - { - struct nlattr *nest; -@@ -593,7 +578,6 @@ nfct_helper_nlmsg_build_payload(struct nlmsghdr *nlh, struct nfct_helper *h) - if (h->bitset & (1 << NFCTH_ATTR_STATUS)) - mnl_attr_put_u32(nlh, NFCTH_STATUS, ntohl(h->status)); - } --EXPORT_SYMBOL(nfct_helper_nlmsg_build_payload); - - static int - nfct_helper_nlmsg_parse_tuple_cb(const struct nlattr *attr, void *data) -@@ -795,7 +779,7 @@ nfct_helper_nlmsg_parse_attr_cb(const struct nlattr *attr, void *data) - * This function returns -1 in case that some mandatory attributes are - * missing. On sucess, it returns 0. - */ --int -+int __EXPORTED - nfct_helper_nlmsg_parse_payload(const struct nlmsghdr *nlh, - struct nfct_helper *h) - { -@@ -832,7 +816,6 @@ nfct_helper_nlmsg_parse_payload(const struct nlmsghdr *nlh, - } - return 0; - } --EXPORT_SYMBOL(nfct_helper_nlmsg_parse_payload); - - /** - * @} --- -cgit v1.1 - diff --git a/meta-networking/recipes-filter/libnetfilter/files/libnetfilter-cttimeout-visibility-hidden.patch b/meta-networking/recipes-filter/libnetfilter/files/libnetfilter-cttimeout-visibility-hidden.patch deleted file mode 100644 index 2c606c832d..0000000000 --- a/meta-networking/recipes-filter/libnetfilter/files/libnetfilter-cttimeout-visibility-hidden.patch +++ /dev/null @@ -1,264 +0,0 @@ -From d0c4e39d12f903e06db262656cff2e24d267bed7 Mon Sep 17 00:00:00 2001 -From: Kevin Cernekee <cernekee@chromium.org> -Date: Wed, 4 Jan 2017 14:30:25 -0800 -Subject: Use __EXPORTED rather than EXPORT_SYMBOL - -clang is sensitive to the ordering of -__attribute__((visibility("default"))) relative to the function -body. gcc is not. So if we try to re-declare an existing function -with default visibility, clang prints a warning and generates -a broken .so file in which nfct_timeout_* are not exported to library -callers. - -Move the attribute up into the function definition to make clang happy. - -Signed-off-by: Kevin Cernekee <cernekee@chromium.org> -Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> ---- - doxygen.cfg.in | 2 +- - src/internal.h | 5 ++--- - src/libnetfilter_cttimeout.c | 44 +++++++++++++++++--------------------------- - 3 files changed, 20 insertions(+), 31 deletions(-) - -diff --git a/doxygen.cfg.in b/doxygen.cfg.in -index 8e5d449..09c3ce0 100644 ---- a/doxygen.cfg.in -+++ b/doxygen.cfg.in -@@ -72,7 +72,7 @@ RECURSIVE = YES - EXCLUDE = - EXCLUDE_SYMLINKS = NO - EXCLUDE_PATTERNS = */.git/* .*.d --EXCLUDE_SYMBOLS = EXPORT_SYMBOL nfct_timeout _container_policy_cb -+EXCLUDE_SYMBOLS = nfct_timeout _container_policy_cb - EXAMPLE_PATH = - EXAMPLE_PATTERNS = - EXAMPLE_RECURSIVE = NO -diff --git a/src/internal.h b/src/internal.h -index 3a88d1a..5d78171 100644 ---- a/src/internal.h -+++ b/src/internal.h -@@ -3,10 +3,9 @@ - - #include "config.h" - #ifdef HAVE_VISIBILITY_HIDDEN --# define __visible __attribute__((visibility("default"))) --# define EXPORT_SYMBOL(x) typeof(x) (x) __visible -+# define __EXPORTED __attribute__((visibility("default"))) - #else --# define EXPORT_SYMBOL -+# define __EXPORTED - #endif - - #endif -diff --git a/src/libnetfilter_cttimeout.c b/src/libnetfilter_cttimeout.c -index 7844a1f..a0a7185 100644 ---- a/src/libnetfilter_cttimeout.c -+++ b/src/libnetfilter_cttimeout.c -@@ -187,7 +187,7 @@ struct nfct_timeout { - * In case of success, this function returns a valid pointer, otherwise NULL - * s returned and errno is appropriately set. - */ --struct nfct_timeout *nfct_timeout_alloc(void) -+struct nfct_timeout __EXPORTED *nfct_timeout_alloc(void) - { - struct nfct_timeout *t; - -@@ -197,19 +197,17 @@ struct nfct_timeout *nfct_timeout_alloc(void) - - return t; - } --EXPORT_SYMBOL(nfct_timeout_alloc); - - /** - * nfct_timeout_free - release one conntrack timeout object - * \param t pointer to the conntrack timeout object - */ --void nfct_timeout_free(struct nfct_timeout *t) -+void __EXPORTED nfct_timeout_free(struct nfct_timeout *t) - { - if (t->timeout) - free(t->timeout); - free(t); - } --EXPORT_SYMBOL(nfct_timeout_free); - - /** - * nfct_timeout_attr_set - set one attribute of the conntrack timeout object -@@ -217,7 +215,7 @@ EXPORT_SYMBOL(nfct_timeout_free); - * \param type attribute type you want to set - * \param data pointer to data that will be used to set this attribute - */ --int -+int __EXPORTED - nfct_timeout_attr_set(struct nfct_timeout *t, uint32_t type, const void *data) - { - switch(type) { -@@ -236,7 +234,6 @@ nfct_timeout_attr_set(struct nfct_timeout *t, uint32_t type, const void *data) - t->attrset |= (1 << type); - return 0; - } --EXPORT_SYMBOL(nfct_timeout_attr_set); - - /** - * nfct_timeout_attr_set_u8 - set one attribute of the conntrack timeout object -@@ -244,12 +241,11 @@ EXPORT_SYMBOL(nfct_timeout_attr_set); - * \param type attribute type you want to set - * \param data pointer to data that will be used to set this attribute - */ --int -+int __EXPORTED - nfct_timeout_attr_set_u8(struct nfct_timeout *t, uint32_t type, uint8_t data) - { - return nfct_timeout_attr_set(t, type, &data); - } --EXPORT_SYMBOL(nfct_timeout_attr_set_u8); - - /** - * nfct_timeout_attr_set_u16 - set one attribute of the conntrack timeout object -@@ -257,23 +253,21 @@ EXPORT_SYMBOL(nfct_timeout_attr_set_u8); - * \param type attribute type you want to set - * \param data pointer to data that will be used to set this attribute - */ --int -+int __EXPORTED - nfct_timeout_attr_set_u16(struct nfct_timeout *t, uint32_t type, uint16_t data) - { - return nfct_timeout_attr_set(t, type, &data); - } --EXPORT_SYMBOL(nfct_timeout_attr_set_u16); - - /** - * nfct_timeout_attr_unset - unset one attribute of the conntrack timeout object - * \param t pointer to the conntrack timeout object - * \param type attribute type you want to set - */ --void nfct_timeout_attr_unset(struct nfct_timeout *t, uint32_t type) -+void __EXPORTED nfct_timeout_attr_unset(struct nfct_timeout *t, uint32_t type) - { - t->attrset &= ~(1 << type); - } --EXPORT_SYMBOL(nfct_timeout_attr_unset); - - /** - * nfct_timeout_policy_attr_set_u32 - set one attribute of the policy -@@ -281,7 +275,7 @@ EXPORT_SYMBOL(nfct_timeout_attr_unset); - * \param type attribute type you want to set - * \param data data that will be used to set this attribute - */ --int -+int __EXPORTED - nfct_timeout_policy_attr_set_u32(struct nfct_timeout *t, - uint32_t type, uint32_t data) - { -@@ -319,18 +313,17 @@ nfct_timeout_policy_attr_set_u32(struct nfct_timeout *t, - - return 0; - } --EXPORT_SYMBOL(nfct_timeout_policy_attr_set_u32); - - /** - * nfct_timeout_policy_attr_unset - unset one attribute of the policy - * \param t pointer to the conntrack timeout object - * \param type attribute type you want to set - */ --void nfct_timeout_policy_attr_unset(struct nfct_timeout *t, uint32_t type) -+void __EXPORTED -+nfct_timeout_policy_attr_unset(struct nfct_timeout *t, uint32_t type) - { - t->attrset &= ~(1 << type); - } --EXPORT_SYMBOL(nfct_timeout_policy_attr_unset); - - /** - * nfct_timeout_policy_attr_to_name - get state name from protocol state number -@@ -340,7 +333,8 @@ EXPORT_SYMBOL(nfct_timeout_policy_attr_unset); - * This function returns NULL if unsupported protocol or state number is passed. - * Otherwise, a pointer to valid string is returned. - */ --const char *nfct_timeout_policy_attr_to_name(uint8_t l4proto, uint32_t state) -+const char __EXPORTED * -+nfct_timeout_policy_attr_to_name(uint8_t l4proto, uint32_t state) - { - if (timeout_protocol[l4proto].state_to_name == NULL) { - printf("no array state name\n"); -@@ -354,7 +348,6 @@ const char *nfct_timeout_policy_attr_to_name(uint8_t l4proto, uint32_t state) - - return timeout_protocol[l4proto].state_to_name[state]; - } --EXPORT_SYMBOL(nfct_timeout_policy_attr_to_name); - - /** - * @} -@@ -438,8 +431,9 @@ nfct_timeout_snprintf_default(char *buf, size_t size, - * This function returns -1 in case that some mandatory attributes are - * missing. On sucess, it returns 0. - */ --int nfct_timeout_snprintf(char *buf, size_t size, const struct nfct_timeout *t, -- unsigned int type, unsigned int flags) -+int __EXPORTED -+nfct_timeout_snprintf(char *buf, size_t size, const struct nfct_timeout *t, -+ unsigned int type, unsigned int flags) - { - int ret = 0; - -@@ -454,7 +448,6 @@ int nfct_timeout_snprintf(char *buf, size_t size, const struct nfct_timeout *t, - - return ret; - } --EXPORT_SYMBOL(nfct_timeout_snprintf); - - /** - * @} -@@ -477,7 +470,7 @@ EXPORT_SYMBOL(nfct_timeout_snprintf); - * - CTNL_MSG_TIMEOUT_GET: get conntrack timeout object. - * - CTNL_MSG_TIMEOUT_DEL: delete conntrack timeout object. - */ --struct nlmsghdr * -+struct nlmsghdr __EXPORTED * - nfct_timeout_nlmsg_build_hdr(char *buf, uint8_t cmd, - uint16_t flags, uint32_t seq) - { -@@ -496,14 +489,13 @@ nfct_timeout_nlmsg_build_hdr(char *buf, uint8_t cmd, - - return nlh; - } --EXPORT_SYMBOL(nfct_timeout_nlmsg_build_hdr); - - /** - * nfct_timeout_nlmsg_build_payload - build payload from ct timeout object - * \param nlh: netlink message that you want to use to add the payload. - * \param t: pointer to a conntrack timeout object - */ --void -+void __EXPORTED - nfct_timeout_nlmsg_build_payload(struct nlmsghdr *nlh, - const struct nfct_timeout *t) - { -@@ -532,7 +524,6 @@ nfct_timeout_nlmsg_build_payload(struct nlmsghdr *nlh, - } - - } --EXPORT_SYMBOL(nfct_timeout_nlmsg_build_payload); - - static int - timeout_nlmsg_parse_attr_cb(const struct nlattr *attr, void *data) -@@ -629,7 +620,7 @@ timeout_parse_attr_data(struct nfct_timeout *t, const struct nlattr *nest) - * This function returns -1 in case that some mandatory attributes are - * missing. On sucess, it returns 0. - */ --int -+int __EXPORTED - nfct_timeout_nlmsg_parse_payload(const struct nlmsghdr *nlh, - struct nfct_timeout *t) - { -@@ -654,7 +645,6 @@ nfct_timeout_nlmsg_parse_payload(const struct nlmsghdr *nlh, - } - return 0; - } --EXPORT_SYMBOL(nfct_timeout_nlmsg_parse_payload); - - /** - * @} --- -cgit v1.1 - diff --git a/meta-networking/recipes-filter/libnetfilter/libnetfilter-acct_1.0.3.bb b/meta-networking/recipes-filter/libnetfilter/libnetfilter-acct_1.0.3.bb index 974035ccc7..d92c676fa9 100644 --- a/meta-networking/recipes-filter/libnetfilter/libnetfilter-acct_1.0.3.bb +++ b/meta-networking/recipes-filter/libnetfilter/libnetfilter-acct_1.0.3.bb @@ -2,7 +2,7 @@ SUMMARY = "libnetfilter_acct accounting infrastructure." DESCRIPTION = "libnetfilter_acct is the userspace library providing interface to extended accounting infrastructure." HOMEPAGE = "http://netfilter.org/projects/libnetfilter_acct/index.html" SECTION = "libs" -LICENSE = "LGPL-2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" DEPENDS = "libnfnetlink libmnl" diff --git a/meta-networking/recipes-filter/libnetfilter/libnetfilter-conntrack_1.0.6.bb b/meta-networking/recipes-filter/libnetfilter/libnetfilter-conntrack_1.0.9.bb index e4e186bdbb..abec84b256 100644 --- a/meta-networking/recipes-filter/libnetfilter/libnetfilter-conntrack_1.0.6.bb +++ b/meta-networking/recipes-filter/libnetfilter/libnetfilter-conntrack_1.0.9.bb @@ -2,14 +2,16 @@ SUMMARY = "Netfilter connection tracking library" DESCRIPTION = "Userspace library providing a programming interface (API) to the Linux kernel netfilter connection tracking state table" HOMEPAGE = "http://www.netfilter.org/projects/libnetfilter_conntrack/index.html" SECTION = "libs" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" DEPENDS = "libnfnetlink libmnl" -SRC_URI = "http://www.netfilter.org/projects/libnetfilter_conntrack/files/libnetfilter_conntrack-${PV}.tar.bz2;name=tar \ -" -SRC_URI[tar.md5sum] = "7139c5f408dd9606ffecfd5dcda8175b" -SRC_URI[tar.sha256sum] = "efcc08021284e75f4d96d3581c5155a11f08fd63316b1938cbcb269c87f37feb" +SRC_URI = "https://www.netfilter.org/projects/libnetfilter_conntrack/files/libnetfilter_conntrack-${PV}.tar.bz2 \ + file://0001-conntrack-fix-build-with-kernel-5.15-and-musl.patch \ + " + +SRC_URI[md5sum] = "596c722733cdf30f24d4418f34f999d9" +SRC_URI[sha256sum] = "67bd9df49fe34e8b82144f6dfb93b320f384a8ea59727e92ff8d18b5f4b579a8" S = "${WORKDIR}/libnetfilter_conntrack-${PV}" diff --git a/meta-networking/recipes-filter/libnetfilter/libnetfilter-cthelper_1.0.0.bb b/meta-networking/recipes-filter/libnetfilter/libnetfilter-cthelper_1.0.0.bb deleted file mode 100644 index 92cb23d6e9..0000000000 --- a/meta-networking/recipes-filter/libnetfilter/libnetfilter-cthelper_1.0.0.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "Netfilter connection tracking helper library" -DESCRIPTION = "Userspace library providing a programming interface (API) to the Linux kernel netfilter user-space helper infrastructure" -HOMEPAGE = "http://www.netfilter.org/projects/libnetfilter_cthelper/index.html" -SECTION = "libs" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" -DEPENDS = "libmnl" - -SRC_URI = "http://www.netfilter.org/projects/libnetfilter_cthelper/files/libnetfilter_cthelper-${PV}.tar.bz2;name=tar \ - file://libnetfilter-cthelper-visibility-hidden.patch \ -" -SRC_URI[tar.md5sum] = "b2efab1a3a198a5add448960ba011acd" -SRC_URI[tar.sha256sum] = "07618e71c4d9a6b6b3dc1986540486ee310a9838ba754926c7d14a17d8fccf3d" - -S = "${WORKDIR}/libnetfilter_cthelper-${PV}" - -inherit autotools pkgconfig diff --git a/meta-networking/recipes-filter/libnetfilter/libnetfilter-cthelper_1.0.1.bb b/meta-networking/recipes-filter/libnetfilter/libnetfilter-cthelper_1.0.1.bb new file mode 100644 index 0000000000..ebb0eb2329 --- /dev/null +++ b/meta-networking/recipes-filter/libnetfilter/libnetfilter-cthelper_1.0.1.bb @@ -0,0 +1,17 @@ +SUMMARY = "Netfilter connection tracking helper library" +DESCRIPTION = "Userspace library providing a programming interface (API) to the Linux kernel netfilter user-space helper infrastructure" +HOMEPAGE = "https://www.netfilter.org/projects/libnetfilter_cthelper/index.html" +SECTION = "libs" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" +DEPENDS = "libmnl" + +SRC_URI = "https://www.netfilter.org/projects/libnetfilter_cthelper/files/libnetfilter_cthelper-${PV}.tar.bz2 \ + " + +SRC_URI[md5sum] = "e59279645fe65d40dd7dfc82a797ca5b" +SRC_URI[sha256sum] = "14073d5487233897355d3ff04ddc1c8d03cc5ba8d2356236aa88161a9f2dc912" + +S = "${WORKDIR}/libnetfilter_cthelper-${PV}" + +inherit autotools pkgconfig diff --git a/meta-networking/recipes-filter/libnetfilter/libnetfilter-cttimeout_1.0.0.bb b/meta-networking/recipes-filter/libnetfilter/libnetfilter-cttimeout_1.0.1.bb index ff32f3409d..5349e6e4b8 100644 --- a/meta-networking/recipes-filter/libnetfilter/libnetfilter-cttimeout_1.0.0.bb +++ b/meta-networking/recipes-filter/libnetfilter/libnetfilter-cttimeout_1.0.1.bb @@ -1,15 +1,15 @@ SUMMARY = "Netfilter connection tracking timeout library" DESCRIPTION = "Userspace library providing a programming interface (API) to the Linux kernel netfilter fine-grain connection tracking timeout infrastructure" SECTION = "libs" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" DEPENDS = "libmnl" -SRC_URI = "http://www.netfilter.org/projects/libnetfilter_cttimeout/files/libnetfilter_cttimeout-${PV}.tar.bz2;name=tar \ - file://libnetfilter-cttimeout-visibility-hidden.patch \ -" -SRC_URI[tar.md5sum] = "7697437fc9ebb6f6b83df56a633db7f9" -SRC_URI[tar.sha256sum] = "aeab12754f557cba3ce2950a2029963d817490df7edb49880008b34d7ff8feba" +SRC_URI = "https://www.netfilter.org/projects/libnetfilter_cttimeout/files/libnetfilter_cttimeout-${PV}.tar.bz2 \ + " + +SRC_URI[md5sum] = "ac64b55952b79cb9910db95ce8883940" +SRC_URI[sha256sum] = "0b59da2f3204e1c80cb85d1f6d72285fc07b01a2f5678abf5dccfbbefd650325" S = "${WORKDIR}/libnetfilter_cttimeout-${PV}" diff --git a/meta-networking/recipes-filter/libnetfilter/libnetfilter-log_1.0.1.bb b/meta-networking/recipes-filter/libnetfilter/libnetfilter-log_1.0.2.bb index 2f627d458e..699b096ae8 100644 --- a/meta-networking/recipes-filter/libnetfilter/libnetfilter-log_1.0.1.bb +++ b/meta-networking/recipes-filter/libnetfilter/libnetfilter-log_1.0.2.bb @@ -2,13 +2,12 @@ SUMMARY = "Netfilter logging library" DESCRIPTION = "Userspace library providing a programming interface (API) to the Linux kernel netfilter log message (NFLOG)" HOMEPAGE = "http://www.netfilter.org/projects/libnetfilter_log/index.html" SECTION = "libs" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" DEPENDS = "libnfnetlink libmnl" -SRCREV = "ba196a97e810746e5660fe3f57c87c0ed0f2b324" -PV .= "+git${SRCPV}" +SRCREV = "b0e4be94c0b8f68d4e912402b93a130063c34e17" -SRC_URI = "git://git.netfilter.org/libnetfilter_log" +SRC_URI = "git://git.netfilter.org/libnetfilter_log;branch=master" S = "${WORKDIR}/git" diff --git a/meta-networking/recipes-filter/libnetfilter/libnetfilter-queue_1.0.2.bb b/meta-networking/recipes-filter/libnetfilter/libnetfilter-queue_1.0.5.bb index 754e11d999..301dd86cf3 100644 --- a/meta-networking/recipes-filter/libnetfilter/libnetfilter-queue_1.0.2.bb +++ b/meta-networking/recipes-filter/libnetfilter/libnetfilter-queue_1.0.5.bb @@ -2,18 +2,17 @@ SUMMARY = "Netfilter packet queue access library" DESCRIPTION = "Userspace library providing a programming interface (API) to access the Linux kernel netfilter packet queue" HOMEPAGE = "http://www.netfilter.org/projects/libnetfilter_queue/index.html" SECTION = "libs" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" DEPENDS = "libnfnetlink libmnl" -PV .= "+git${SRCREV}" -SRCREV = "981025e103d887fb6a9c9bb49c74ec323108d098" +SRCREV = "2ff321690b8dafeca99ee8e9cafac71e36f292b9" -SRC_URI = "git://git.netfilter.org/libnetfilter_queue \ - file://0001-Correct-typo-in-the-location-of-internal.h-in-includ.patch \ - file://0001-libnetfilter-queue-Declare-the-define-visivility-attribute-together.patch \ +SRC_URI = "git://git.netfilter.org/libnetfilter_queue;branch=master \ " S = "${WORKDIR}/git" inherit autotools pkgconfig + +BBCLASSEXTEND = "native" diff --git a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0001-build-resolve-automake-1.12-warnings.patch b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0001-build-resolve-automake-1.12-warnings.patch deleted file mode 100644 index 00d95cd79e..0000000000 --- a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0001-build-resolve-automake-1.12-warnings.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 2e5f2b81fb8cbe0d1cd33e58caa19ac308e1f847 Mon Sep 17 00:00:00 2001 -From: Jan Engelhardt <jengelh@inai.de> -Date: Tue, 9 Oct 2012 15:59:48 +0200 -Subject: [PATCH 1/6] build: resolve automake-1.12 warnings - -am/ltlibrary.am: warning: 'libnfnetlink.la': linking libtool libraries -using a non-POSIX archiver requires 'AM_PROG_AR' in 'configure.ac' - -Signed-off-by: Jan Engelhardt <jengelh@inai.de> ---- - configure.ac | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/configure.ac b/configure.ac -index ed549df..0926a1c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -7,6 +7,7 @@ AC_CANONICAL_HOST - - AM_INIT_AUTOMAKE([-Wall foreign subdir-objects - tar-pax no-dist-gzip dist-bzip2 1.6]) -+m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) - - dnl kernel style compile messages - m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) --- -2.12.1 - diff --git a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0002-src-get-source-code-license-header-in-sync-with-curr.patch b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0002-src-get-source-code-license-header-in-sync-with-curr.patch deleted file mode 100644 index c2fb5e05a7..0000000000 --- a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0002-src-get-source-code-license-header-in-sync-with-curr.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 5e6b6e23a8b04475c5a9de7eddb4c18103932fe5 Mon Sep 17 00:00:00 2001 -From: Pablo Neira Ayuso <pablo@netfilter.org> -Date: Wed, 7 Aug 2013 20:53:57 +0200 -Subject: [PATCH 2/6] src: get source code license header in sync with current - licensing terms - -Since (3956761 license: upgrade to GPLv2+), we upgraded to GPLv2+, -propagate that changes to src/iftable.c and src/rtnl.c - -Reported-by: Thomas Woerner <twoerner@redhat.com> -Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> ---- - src/iftable.c | 2 +- - src/rtnl.c | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/iftable.c b/src/iftable.c -index 0325335..5976ed8 100644 ---- a/src/iftable.c -+++ b/src/iftable.c -@@ -3,7 +3,7 @@ - * (C) 2004 by Astaro AG, written by Harald Welte <hwelte@astaro.com> - * (C) 2008 by Pablo Neira Ayuso <pablo@netfilter.org> - * -- * This software is Free Software and licensed under GNU GPLv2. -+ * This software is Free Software and licensed under GNU GPLv2+. - */ - - /* IFINDEX handling */ -diff --git a/src/rtnl.c b/src/rtnl.c -index 5ccb272..7b4ac7d 100644 ---- a/src/rtnl.c -+++ b/src/rtnl.c -@@ -1,10 +1,10 @@ - /* rtnl - rtnetlink utility functions - * - * (C) 2004 by Astaro AG, written by Harald Welte <hwelte@astaro.com> -- * -+ * - * Adapted to nfnetlink by Eric Leblond <eric@inl.fr> - * -- * This software is free software and licensed under GNU GPLv2. -+ * This software is free software and licensed under GNU GPLv2+. - * - */ - --- -2.12.1 - diff --git a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0003-configure-uclinux-is-also-linux.patch b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0003-configure-uclinux-is-also-linux.patch deleted file mode 100644 index 6cb7ed6fa9..0000000000 --- a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0003-configure-uclinux-is-also-linux.patch +++ /dev/null @@ -1,27 +0,0 @@ -From b259fe13826414c1bd5328a25c8d6d60e20e65f2 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias <gustavo@zacarias.com.ar> -Date: Tue, 10 Sep 2013 16:23:29 -0300 -Subject: [PATCH 3/6] configure: uclinux is also linux - -Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> -Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 0926a1c..b979772 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -18,7 +18,7 @@ AC_DISABLE_STATIC - AM_PROG_LIBTOOL - - case "$host" in --*-*-linux*) ;; -+*-*-linux* | *-*-uclinux*) ;; - *) AC_MSG_ERROR([Linux only, dude!]);; - esac - --- -2.12.1 - diff --git a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0004-libnfnetlink-initialize-attribute-padding-to-resolve.patch b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0004-libnfnetlink-initialize-attribute-padding-to-resolve.patch deleted file mode 100644 index cf3a841356..0000000000 --- a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0004-libnfnetlink-initialize-attribute-padding-to-resolve.patch +++ /dev/null @@ -1,39 +0,0 @@ -From b142da8d2c9e2e2dfbe4e89e680dd124f6064ac8 Mon Sep 17 00:00:00 2001 -From: Pablo Neira Ayuso <pablo@netfilter.org> -Date: Mon, 3 Feb 2014 12:09:29 +0100 -Subject: [PATCH 4/6] libnfnetlink: initialize attribute padding to resolve - valgrind warnings - -==12195== Syscall param socketcall.sendto(msg) points to uninitialised byte(s) -==12195== at 0x51209C3: __sendto_nocancel (syscall-template.S:81) -==12195== by 0x53E4D12: nfnl_send (libnfnetlink.c:391) -==12195== by 0x53E6952: nfnl_query (libnfnetlink.c:1569) -==12195== by 0x4E344AF: __build_send_cfg_msg.isra.1 (libnetfilter_log.c:143) -==12195== by 0x4E34710: nflog_bind_group (libnetfilter_log.c:413) -==12195== by 0x400CB1: main (nfulnl_test.c:77) -==12195== Address 0x7fefff3e9 is on thread 1's stack - -This patch sets to zero the padding that is included to align the -attribute payload. - -Reported-by: Ivan Homoliak <xhomol11@gmail.com> -Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> ---- - src/libnfnetlink.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/libnfnetlink.c b/src/libnfnetlink.c -index 4b2bcd0..398b7d7 100644 ---- a/src/libnfnetlink.c -+++ b/src/libnfnetlink.c -@@ -809,6 +809,7 @@ int nfnl_addattr_l(struct nlmsghdr *n, int maxlen, int type, const void *data, - nfa->nfa_type = type; - nfa->nfa_len = len; - memcpy(NFA_DATA(nfa), data, alen); -+ memset((uint8_t *)nfa + nfa->nfa_len, 0, NFA_ALIGN(alen) - alen); - n->nlmsg_len = (NLMSG_ALIGN(n->nlmsg_len) + NFA_ALIGN(len)); - return 0; - } --- -2.12.1 - diff --git a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0005-include-Sync-with-kernel-headers.patch b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0005-include-Sync-with-kernel-headers.patch deleted file mode 100644 index 383f0e8b3d..0000000000 --- a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0005-include-Sync-with-kernel-headers.patch +++ /dev/null @@ -1,110 +0,0 @@ -From b10c90a61a5fc46f2be5aeecb9c96e84178f7717 Mon Sep 17 00:00:00 2001 -From: Felix Janda <felix.janda@posteo.de> -Date: Sat, 16 May 2015 14:49:07 +0200 -Subject: [PATCH 5/6] include: Sync with kernel headers - -Signed-off-by: Felix Janda <felix.janda@posteo.de> -Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> ---- - include/libnfnetlink/linux_nfnetlink.h | 44 ++++----------------------- - include/libnfnetlink/linux_nfnetlink_compat.h | 12 ++++---- - 2 files changed, 12 insertions(+), 44 deletions(-) - -diff --git a/include/libnfnetlink/linux_nfnetlink.h b/include/libnfnetlink/linux_nfnetlink.h -index 76a8550..44a38d6 100644 ---- a/include/libnfnetlink/linux_nfnetlink.h -+++ b/include/libnfnetlink/linux_nfnetlink.h -@@ -25,9 +25,9 @@ enum nfnetlink_groups { - /* General form of address family dependent message. - */ - struct nfgenmsg { -- u_int8_t nfgen_family; /* AF_xxx */ -- u_int8_t version; /* nfnetlink version */ -- u_int16_t res_id; /* resource id */ -+ __u8 nfgen_family; /* AF_xxx */ -+ __u8 version; /* nfnetlink version */ -+ __be16 res_id; /* resource id */ - }; - - #define NFNETLINK_V0 0 -@@ -46,40 +46,8 @@ struct nfgenmsg { - #define NFNL_SUBSYS_CTNETLINK_EXP 2 - #define NFNL_SUBSYS_QUEUE 3 - #define NFNL_SUBSYS_ULOG 4 --#define NFNL_SUBSYS_COUNT 5 -+#define NFNL_SUBSYS_OSF 5 -+#define NFNL_SUBSYS_IPSET 6 -+#define NFNL_SUBSYS_COUNT 7 - --#ifdef __KERNEL__ -- --#include <linux/netlink.h> --#include <linux/capability.h> --#include <net/netlink.h> -- --struct nfnl_callback --{ -- int (*call)(struct sock *nl, struct sk_buff *skb, -- struct nlmsghdr *nlh, struct nlattr *cda[]); -- const struct nla_policy *policy; /* netlink attribute policy */ -- const u_int16_t attr_count; /* number of nlattr's */ --}; -- --struct nfnetlink_subsystem --{ -- const char *name; -- __u8 subsys_id; /* nfnetlink subsystem ID */ -- __u8 cb_count; /* number of callbacks */ -- const struct nfnl_callback *cb; /* callback for individual types */ --}; -- --extern int nfnetlink_subsys_register(const struct nfnetlink_subsystem *n); --extern int nfnetlink_subsys_unregister(const struct nfnetlink_subsystem *n); -- --extern int nfnetlink_has_listeners(unsigned int group); --extern int nfnetlink_send(struct sk_buff *skb, u32 pid, unsigned group, -- int echo); --extern int nfnetlink_unicast(struct sk_buff *skb, u_int32_t pid, int flags); -- --#define MODULE_ALIAS_NFNL_SUBSYS(subsys) \ -- MODULE_ALIAS("nfnetlink-subsys-" __stringify(subsys)) -- --#endif /* __KERNEL__ */ - #endif /* _NFNETLINK_H */ -diff --git a/include/libnfnetlink/linux_nfnetlink_compat.h b/include/libnfnetlink/linux_nfnetlink_compat.h -index e145176..74b9e55 100644 ---- a/include/libnfnetlink/linux_nfnetlink_compat.h -+++ b/include/libnfnetlink/linux_nfnetlink_compat.h -@@ -1,6 +1,8 @@ - #ifndef _NFNETLINK_COMPAT_H - #define _NFNETLINK_COMPAT_H --#ifndef __KERNEL__ -+ -+#include <linux/types.h> -+ - /* Old nfnetlink macros for userspace */ - - /* nfnetlink groups: Up to 32 maximum */ -@@ -18,10 +20,9 @@ - * ! nfnetlink use the same attributes methods. - J. Schulist. - */ - --struct nfattr --{ -- u_int16_t nfa_len; -- u_int16_t nfa_type; /* we use 15 bits for the type, and the highest -+struct nfattr { -+ __u16 nfa_len; -+ __u16 nfa_type; /* we use 15 bits for the type, and the highest - * bit to indicate whether the payload is nested */ - }; - -@@ -57,5 +58,4 @@ struct nfattr - + NLMSG_ALIGN(sizeof(struct nfgenmsg)))) - #define NFM_PAYLOAD(n) NLMSG_PAYLOAD(n, sizeof(struct nfgenmsg)) - --#endif /* ! __KERNEL__ */ - #endif /* _NFNETLINK_COMPAT_H */ --- -2.12.1 - diff --git a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0006-src-Use-stdint-types-everywhere.patch b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0006-src-Use-stdint-types-everywhere.patch deleted file mode 100644 index 72c9987d1e..0000000000 --- a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0006-src-Use-stdint-types-everywhere.patch +++ /dev/null @@ -1,403 +0,0 @@ -From 5cb589e246c91331ee6b3926b15f5e6cfc8ad95e Mon Sep 17 00:00:00 2001 -From: Felix Janda <felix.janda@posteo.de> -Date: Sat, 16 May 2015 14:59:57 +0200 -Subject: [PATCH 6/6] src: Use stdint types everywhere - -Signed-off-by: Felix Janda <felix.janda@posteo.de> -Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> ---- - include/libnfnetlink/libnfnetlink.h | 25 ++++++------- - src/iftable.c | 8 ++--- - src/iftable.h | 4 +-- - src/libnfnetlink.c | 72 ++++++++++++++++++------------------- - src/rtnl.c | 4 +-- - src/rtnl.h | 2 +- - 6 files changed, 58 insertions(+), 57 deletions(-) - -diff --git a/include/libnfnetlink/libnfnetlink.h b/include/libnfnetlink/libnfnetlink.h -index 1d8c49d..cd0be3d 100644 ---- a/include/libnfnetlink/libnfnetlink.h -+++ b/include/libnfnetlink/libnfnetlink.h -@@ -15,6 +15,7 @@ - #define aligned_u64 unsigned long long __attribute__((aligned(8))) - #endif - -+#include <stdint.h> - #include <sys/socket.h> /* for sa_family_t */ - #include <linux/netlink.h> - #include <libnfnetlink/linux_nfnetlink.h> -@@ -55,7 +56,7 @@ struct nfnlhdr { - struct nfnl_callback { - int (*call)(struct nlmsghdr *nlh, struct nfattr *nfa[], void *data); - void *data; -- u_int16_t attr_count; -+ uint16_t attr_count; - }; - - struct nfnl_handle; -@@ -69,7 +70,7 @@ extern struct nfnl_handle *nfnl_open(void); - extern int nfnl_close(struct nfnl_handle *); - - extern struct nfnl_subsys_handle *nfnl_subsys_open(struct nfnl_handle *, -- u_int8_t, u_int8_t, -+ uint8_t, uint8_t, - unsigned int); - extern void nfnl_subsys_close(struct nfnl_subsys_handle *); - -@@ -88,8 +89,8 @@ extern int nfnl_sendiov(const struct nfnl_handle *nfnlh, - const struct iovec *iov, unsigned int num, - unsigned int flags); - extern void nfnl_fill_hdr(struct nfnl_subsys_handle *, struct nlmsghdr *, -- unsigned int, u_int8_t, u_int16_t, u_int16_t, -- u_int16_t); -+ unsigned int, uint8_t, uint16_t, uint16_t, -+ uint16_t); - extern __attribute__((deprecated)) int - nfnl_talk(struct nfnl_handle *, struct nlmsghdr *, pid_t, - unsigned, struct nlmsghdr *, -@@ -103,8 +104,8 @@ nfnl_listen(struct nfnl_handle *, - /* receiving */ - extern ssize_t nfnl_recv(const struct nfnl_handle *h, unsigned char *buf, size_t len); - extern int nfnl_callback_register(struct nfnl_subsys_handle *, -- u_int8_t type, struct nfnl_callback *cb); --extern int nfnl_callback_unregister(struct nfnl_subsys_handle *, u_int8_t type); -+ uint8_t type, struct nfnl_callback *cb); -+extern int nfnl_callback_unregister(struct nfnl_subsys_handle *, uint8_t type); - extern int nfnl_handle_packet(struct nfnl_handle *, char *buf, int len); - - /* parsing */ -@@ -180,12 +181,12 @@ extern int nfnl_query(struct nfnl_handle *h, struct nlmsghdr *nlh); - - /* nfnl attribute handling functions */ - extern int nfnl_addattr_l(struct nlmsghdr *, int, int, const void *, int); --extern int nfnl_addattr8(struct nlmsghdr *, int, int, u_int8_t); --extern int nfnl_addattr16(struct nlmsghdr *, int, int, u_int16_t); --extern int nfnl_addattr32(struct nlmsghdr *, int, int, u_int32_t); -+extern int nfnl_addattr8(struct nlmsghdr *, int, int, uint8_t); -+extern int nfnl_addattr16(struct nlmsghdr *, int, int, uint16_t); -+extern int nfnl_addattr32(struct nlmsghdr *, int, int, uint32_t); - extern int nfnl_nfa_addattr_l(struct nfattr *, int, int, const void *, int); --extern int nfnl_nfa_addattr16(struct nfattr *, int, int, u_int16_t); --extern int nfnl_nfa_addattr32(struct nfattr *, int, int, u_int32_t); -+extern int nfnl_nfa_addattr16(struct nfattr *, int, int, uint16_t); -+extern int nfnl_nfa_addattr32(struct nfattr *, int, int, uint32_t); - extern int nfnl_parse_attr(struct nfattr **, int, struct nfattr *, int); - #define nfnl_parse_nested(tb, max, nfa) \ - nfnl_parse_attr((tb), (max), NFA_DATA((nfa)), NFA_PAYLOAD((nfa))) -@@ -197,7 +198,7 @@ extern int nfnl_parse_attr(struct nfattr **, int, struct nfattr *, int); - ({ (tail)->nfa_len = (void *) NLMSG_TAIL(nlh) - (void *) tail; }) - - extern void nfnl_build_nfa_iovec(struct iovec *iov, struct nfattr *nfa, -- u_int16_t type, u_int32_t len, -+ uint16_t type, uint32_t len, - unsigned char *val); - extern unsigned int nfnl_rcvbufsiz(const struct nfnl_handle *h, - unsigned int size); -diff --git a/src/iftable.c b/src/iftable.c -index 5976ed8..157f97b 100644 ---- a/src/iftable.c -+++ b/src/iftable.c -@@ -27,10 +27,10 @@ - struct ifindex_node { - struct list_head head; - -- u_int32_t index; -- u_int32_t type; -- u_int32_t alen; -- u_int32_t flags; -+ uint32_t index; -+ uint32_t type; -+ uint32_t alen; -+ uint32_t flags; - char addr[8]; - char name[16]; - }; -diff --git a/src/iftable.h b/src/iftable.h -index 8df7f24..655df6b 100644 ---- a/src/iftable.h -+++ b/src/iftable.h -@@ -1,8 +1,8 @@ - #ifndef _IFTABLE_H - #define _IFTABLE_H - --int iftable_delete(u_int32_t dst, u_int32_t mask, u_int32_t gw, u_int32_t oif); --int iftable_insert(u_int32_t dst, u_int32_t mask, u_int32_t gw, u_int32_t oif); -+int iftable_delete(uint32_t dst, uint32_t mask, uint32_t gw, uint32_t oif); -+int iftable_insert(uint32_t dst, uint32_t mask, uint32_t gw, uint32_t oif); - - int iftable_init(void); - void iftable_fini(void); -diff --git a/src/libnfnetlink.c b/src/libnfnetlink.c -index 398b7d7..df57533 100644 ---- a/src/libnfnetlink.c -+++ b/src/libnfnetlink.c -@@ -72,9 +72,9 @@ - - struct nfnl_subsys_handle { - struct nfnl_handle *nfnlh; -- u_int32_t subscriptions; -- u_int8_t subsys_id; -- u_int8_t cb_count; -+ uint32_t subscriptions; -+ uint8_t subsys_id; -+ uint8_t cb_count; - struct nfnl_callback *cb; /* array of callbacks */ - }; - -@@ -86,11 +86,11 @@ struct nfnl_handle { - int fd; - struct sockaddr_nl local; - struct sockaddr_nl peer; -- u_int32_t subscriptions; -- u_int32_t seq; -- u_int32_t dump; -- u_int32_t rcv_buffer_size; /* for nfnl_catch */ -- u_int32_t flags; -+ uint32_t subscriptions; -+ uint32_t seq; -+ uint32_t dump; -+ uint32_t rcv_buffer_size; /* for nfnl_catch */ -+ uint32_t flags; - struct nlmsghdr *last_nlhdr; - struct nfnl_subsys_handle subsys[NFNL_MAX_SUBSYS+1]; - }; -@@ -145,7 +145,7 @@ unsigned int nfnl_portid(const struct nfnl_handle *h) - static int recalc_rebind_subscriptions(struct nfnl_handle *nfnlh) - { - int i, err; -- u_int32_t new_subscriptions = nfnlh->subscriptions; -+ uint32_t new_subscriptions = nfnlh->subscriptions; - - for (i = 0; i < NFNL_MAX_SUBSYS; i++) - new_subscriptions |= nfnlh->subsys[i].subscriptions; -@@ -273,8 +273,8 @@ void nfnl_set_rcv_buffer_size(struct nfnl_handle *h, unsigned int size) - * a valid address that points to a nfnl_subsys_handle structure is returned. - */ - struct nfnl_subsys_handle * --nfnl_subsys_open(struct nfnl_handle *nfnlh, u_int8_t subsys_id, -- u_int8_t cb_count, u_int32_t subscriptions) -+nfnl_subsys_open(struct nfnl_handle *nfnlh, uint8_t subsys_id, -+ uint8_t cb_count, uint32_t subscriptions) - { - struct nfnl_subsys_handle *ssh; - -@@ -435,10 +435,10 @@ int nfnl_sendiov(const struct nfnl_handle *nfnlh, const struct iovec *iov, - */ - void nfnl_fill_hdr(struct nfnl_subsys_handle *ssh, - struct nlmsghdr *nlh, unsigned int len, -- u_int8_t family, -- u_int16_t res_id, -- u_int16_t msg_type, -- u_int16_t msg_flags) -+ uint8_t family, -+ uint16_t res_id, -+ uint16_t msg_type, -+ uint16_t msg_flags) - { - assert(ssh); - assert(nlh); -@@ -815,7 +815,7 @@ int nfnl_addattr_l(struct nlmsghdr *n, int maxlen, int type, const void *data, - } - - /** -- * nfnl_nfa_addattr_l - Add variable length attribute to struct nfattr -+ * nfnl_nfa_addattr_l - Add variable length attribute to struct nfattr - * - * @nfa: struct nfattr - * @maxlen: maximal length of nfattr buffer -@@ -849,14 +849,14 @@ int nfnl_nfa_addattr_l(struct nfattr *nfa, int maxlen, int type, - } - - /** -- * nfnl_addattr8 - Add u_int8_t attribute to nlmsghdr -+ * nfnl_addattr8 - Add uint8_t attribute to nlmsghdr - * - * @n: netlink message header to which attribute is to be added - * @maxlen: maximum length of netlink message header - * @type: type of new attribute - * @data: content of new attribute - */ --int nfnl_addattr8(struct nlmsghdr *n, int maxlen, int type, u_int8_t data) -+int nfnl_addattr8(struct nlmsghdr *n, int maxlen, int type, uint8_t data) - { - assert(n); - assert(maxlen > 0); -@@ -866,7 +866,7 @@ int nfnl_addattr8(struct nlmsghdr *n, int maxlen, int type, u_int8_t data) - } - - /** -- * nfnl_nfa_addattr16 - Add u_int16_t attribute to struct nfattr -+ * nfnl_nfa_addattr16 - Add uint16_t attribute to struct nfattr - * - * @nfa: struct nfattr - * @maxlen: maximal length of nfattr buffer -@@ -875,7 +875,7 @@ int nfnl_addattr8(struct nlmsghdr *n, int maxlen, int type, u_int8_t data) - * - */ - int nfnl_nfa_addattr16(struct nfattr *nfa, int maxlen, int type, -- u_int16_t data) -+ uint16_t data) - { - assert(nfa); - assert(maxlen > 0); -@@ -885,7 +885,7 @@ int nfnl_nfa_addattr16(struct nfattr *nfa, int maxlen, int type, - } - - /** -- * nfnl_addattr16 - Add u_int16_t attribute to nlmsghdr -+ * nfnl_addattr16 - Add uint16_t attribute to nlmsghdr - * - * @n: netlink message header to which attribute is to be added - * @maxlen: maximum length of netlink message header -@@ -894,7 +894,7 @@ int nfnl_nfa_addattr16(struct nfattr *nfa, int maxlen, int type, - * - */ - int nfnl_addattr16(struct nlmsghdr *n, int maxlen, int type, -- u_int16_t data) -+ uint16_t data) - { - assert(n); - assert(maxlen > 0); -@@ -904,7 +904,7 @@ int nfnl_addattr16(struct nlmsghdr *n, int maxlen, int type, - } - - /** -- * nfnl_nfa_addattr32 - Add u_int32_t attribute to struct nfattr -+ * nfnl_nfa_addattr32 - Add uint32_t attribute to struct nfattr - * - * @nfa: struct nfattr - * @maxlen: maximal length of nfattr buffer -@@ -913,7 +913,7 @@ int nfnl_addattr16(struct nlmsghdr *n, int maxlen, int type, - * - */ - int nfnl_nfa_addattr32(struct nfattr *nfa, int maxlen, int type, -- u_int32_t data) -+ uint32_t data) - { - assert(nfa); - assert(maxlen > 0); -@@ -923,7 +923,7 @@ int nfnl_nfa_addattr32(struct nfattr *nfa, int maxlen, int type, - } - - /** -- * nfnl_addattr32 - Add u_int32_t attribute to nlmsghdr -+ * nfnl_addattr32 - Add uint32_t attribute to nlmsghdr - * - * @n: netlink message header to which attribute is to be added - * @maxlen: maximum length of netlink message header -@@ -932,7 +932,7 @@ int nfnl_nfa_addattr32(struct nfattr *nfa, int maxlen, int type, - * - */ - int nfnl_addattr32(struct nlmsghdr *n, int maxlen, int type, -- u_int32_t data) -+ uint32_t data) - { - assert(n); - assert(maxlen > 0); -@@ -980,7 +980,7 @@ int nfnl_parse_attr(struct nfattr *tb[], int max, struct nfattr *nfa, int len) - * - */ - void nfnl_build_nfa_iovec(struct iovec *iov, struct nfattr *nfa, -- u_int16_t type, u_int32_t len, unsigned char *val) -+ uint16_t type, uint32_t len, unsigned char *val) - { - assert(iov); - assert(nfa); -@@ -1115,7 +1115,7 @@ struct nlmsghdr *nfnl_get_msg_next(struct nfnl_handle *h, - * appropiately. - */ - int nfnl_callback_register(struct nfnl_subsys_handle *ssh, -- u_int8_t type, struct nfnl_callback *cb) -+ uint8_t type, struct nfnl_callback *cb) - { - assert(ssh); - assert(cb); -@@ -1138,7 +1138,7 @@ int nfnl_callback_register(struct nfnl_subsys_handle *ssh, - * On sucess, 0 is returned. On error, -1 is returned and errno is - * set appropiately. - */ --int nfnl_callback_unregister(struct nfnl_subsys_handle *ssh, u_int8_t type) -+int nfnl_callback_unregister(struct nfnl_subsys_handle *ssh, uint8_t type) - { - assert(ssh); - -@@ -1161,8 +1161,8 @@ int nfnl_check_attributes(const struct nfnl_handle *h, - assert(nfa); - - int min_len; -- u_int8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); -- u_int8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); -+ uint8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); -+ uint8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); - const struct nfnl_subsys_handle *ssh; - struct nfnl_callback *cb; - -@@ -1212,8 +1212,8 @@ static int __nfnl_handle_msg(struct nfnl_handle *h, struct nlmsghdr *nlh, - int len) - { - struct nfnl_subsys_handle *ssh; -- u_int8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); -- u_int8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); -+ uint8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); -+ uint8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); - int err = 0; - - if (subsys_id > NFNL_MAX_SUBSYS) -@@ -1243,7 +1243,7 @@ int nfnl_handle_packet(struct nfnl_handle *h, char *buf, int len) - { - - while (len >= NLMSG_SPACE(0)) { -- u_int32_t rlen; -+ uint32_t rlen; - struct nlmsghdr *nlh = (struct nlmsghdr *)buf; - - if (nlh->nlmsg_len < sizeof(struct nlmsghdr) -@@ -1285,8 +1285,8 @@ static int nfnl_is_error(struct nfnl_handle *h, struct nlmsghdr *nlh) - static int nfnl_step(struct nfnl_handle *h, struct nlmsghdr *nlh) - { - struct nfnl_subsys_handle *ssh; -- u_int8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); -- u_int8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); -+ uint8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); -+ uint8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); - - /* Is this an error message? */ - if (nfnl_is_error(h, nlh)) { -diff --git a/src/rtnl.c b/src/rtnl.c -index 7b4ac7d..284eecd 100644 ---- a/src/rtnl.c -+++ b/src/rtnl.c -@@ -30,7 +30,7 @@ - #define rtnl_log(x, ...) - - static inline struct rtnl_handler * --find_handler(struct rtnl_handle *rtnl_handle, u_int16_t type) -+find_handler(struct rtnl_handle *rtnl_handle, uint16_t type) - { - struct rtnl_handler *h; - for (h = rtnl_handle->handlers; h; h = h->next) { -@@ -41,7 +41,7 @@ find_handler(struct rtnl_handle *rtnl_handle, u_int16_t type) - } - - static int call_handler(struct rtnl_handle *rtnl_handle, -- u_int16_t type, -+ uint16_t type, - struct nlmsghdr *hdr) - { - struct rtnl_handler *h = find_handler(rtnl_handle, type); -diff --git a/src/rtnl.h b/src/rtnl.h -index 0c403dc..2cb22a8 100644 ---- a/src/rtnl.h -+++ b/src/rtnl.h -@@ -7,7 +7,7 @@ - struct rtnl_handler { - struct rtnl_handler *next; - -- u_int16_t nlmsg_type; -+ uint16_t nlmsg_type; - int (*handlefn)(struct nlmsghdr *h, void *arg); - void *arg; - }; --- -2.12.1 - diff --git a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink_1.0.1.bb b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink_1.0.1.bb deleted file mode 100644 index f7951ff8dd..0000000000 --- a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink_1.0.1.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "Low-level library for netfilter related kernel/userspace communication" -DESCRIPTION = "libnfnetlink is the low-level library for netfilter related \ -kernel/userspace communication. It provides a generic messaging \ -infrastructure for in-kernel netfilter subsystems (such as nfnetlink_log, \ -nfnetlink_queue, nfnetlink_conntrack) and their respective users and/or \ -management tools in userspace." -HOMEPAGE = "http://www.netfilter.org/projects/libnfnetlink/index.html" -SECTION = "libs" -LICENSE = "GPLv2+" - - -LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" - -SRC_URI = "http://www.netfilter.org/projects/libnfnetlink/files/libnfnetlink-${PV}.tar.bz2;name=tar \ - file://0001-build-resolve-automake-1.12-warnings.patch \ - file://0002-src-get-source-code-license-header-in-sync-with-curr.patch \ - file://0003-configure-uclinux-is-also-linux.patch \ - file://0004-libnfnetlink-initialize-attribute-padding-to-resolve.patch \ - file://0005-include-Sync-with-kernel-headers.patch \ - file://0006-src-Use-stdint-types-everywhere.patch \ - " -SRC_URI[tar.md5sum] = "98927583d2016a9fb1936fed992e2c5e" -SRC_URI[tar.sha256sum] = "f270e19de9127642d2a11589ef2ec97ef90a649a74f56cf9a96306b04817b51a" - -inherit autotools pkgconfig diff --git a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink_1.0.2.bb b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink_1.0.2.bb new file mode 100644 index 0000000000..2778185618 --- /dev/null +++ b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink_1.0.2.bb @@ -0,0 +1,22 @@ +SUMMARY = "Low-level library for netfilter related kernel/userspace communication" +DESCRIPTION = "libnfnetlink is the low-level library for netfilter related \ +kernel/userspace communication. It provides a generic messaging \ +infrastructure for in-kernel netfilter subsystems (such as nfnetlink_log, \ +nfnetlink_queue, nfnetlink_conntrack) and their respective users and/or \ +management tools in userspace." +HOMEPAGE = "https://www.netfilter.org/projects/libnfnetlink/index.html" +SECTION = "libs" +LICENSE = "GPL-2.0-or-later" + + +LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" + +SRC_URI = "https://www.netfilter.org/projects/libnfnetlink/files/${BPN}-${PV}.tar.bz2 \ + " + +SRC_URI[md5sum] = "39d65185e2990562c64de05a08de8771" +SRC_URI[sha256sum] = "b064c7c3d426efb4786e60a8e6859b82ee2f2c5e49ffeea640cfe4fe33cbc376" + +inherit autotools pkgconfig + +BBCLASSEXTEND = "native" diff --git a/meta-networking/recipes-filter/libnftnl/libnftnl/0001-Declare-the-define-visivility-attribute-together.patch b/meta-networking/recipes-filter/libnftnl/libnftnl/0001-Declare-the-define-visivility-attribute-together.patch deleted file mode 100644 index e82b23813f..0000000000 --- a/meta-networking/recipes-filter/libnftnl/libnftnl/0001-Declare-the-define-visivility-attribute-together.patch +++ /dev/null @@ -1,2949 +0,0 @@ -From bd01f785da5222d0662be3182fe2650e1c12f43e Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 10 Apr 2017 14:07:07 -0700 -Subject: [PATCH] Declare the define visivility attribute together - -clang ignores the visibility attribute if its not -defined before the definition. As a result these -symbols become hidden and consumers of this library -fail to link due to these missing symbols - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - doxygen.cfg.in | 2 +- - include/utils.h | 5 +-- - src/batch.c | 21 ++++------- - src/chain.c | 102 +++++++++++++++++--------------------------------- - src/common.c | 21 ++++------- - src/expr.c | 51 +++++++++---------------- - src/gen.c | 39 +++++++------------ - src/object.c | 99 ++++++++++++++++-------------------------------- - src/rule.c | 114 +++++++++++++++++++------------------------------------- - src/ruleset.c | 48 ++++++++---------------- - src/set.c | 96 ++++++++++++++++------------------------------- - src/set_elem.c | 72 ++++++++++++----------------------- - src/table.c | 90 +++++++++++++++----------------------------- - src/trace.c | 27 +++++--------- - src/udata.c | 48 ++++++++---------------- - 15 files changed, 279 insertions(+), 556 deletions(-) - -diff --git a/doxygen.cfg.in b/doxygen.cfg.in -index 23fcad4..e49f28d 100644 ---- a/doxygen.cfg.in -+++ b/doxygen.cfg.in -@@ -72,7 +72,7 @@ RECURSIVE = YES - EXCLUDE = - EXCLUDE_SYMLINKS = NO - EXCLUDE_PATTERNS = */.git/* .*.d --EXCLUDE_SYMBOLS = EXPORT_SYMBOL -+EXCLUDE_SYMBOLS = - EXAMPLE_PATH = - EXAMPLE_PATTERNS = - EXAMPLE_RECURSIVE = NO -diff --git a/include/utils.h b/include/utils.h -index 2f5cf34..ff8207e 100644 ---- a/include/utils.h -+++ b/include/utils.h -@@ -9,10 +9,9 @@ - - #include "config.h" - #ifdef HAVE_VISIBILITY_HIDDEN --# define __visible __attribute__((visibility("default"))) --# define EXPORT_SYMBOL(x) typeof(x) (x) __visible; -+# define __EXPORTED __attribute__((visibility("default"))) - #else --# define EXPORT_SYMBOL -+# define __EXPORT - #endif - - #define __noreturn __attribute__((__noreturn__)) -diff --git a/src/batch.c b/src/batch.c -index 5ee3fd7..3bedd26 100644 ---- a/src/batch.c -+++ b/src/batch.c -@@ -57,7 +57,7 @@ static void nftnl_batch_add_page(struct nftnl_batch_page *page, - list_add_tail(&page->head, &batch->page_list); - } - --struct nftnl_batch *nftnl_batch_alloc(uint32_t pg_size, uint32_t pg_overrun_size) -+struct nftnl_batch __EXPORTED *nftnl_batch_alloc(uint32_t pg_size, uint32_t pg_overrun_size) - { - struct nftnl_batch *batch; - struct nftnl_batch_page *page; -@@ -80,9 +80,8 @@ err1: - free(batch); - return NULL; - } --EXPORT_SYMBOL(nftnl_batch_alloc); - --void nftnl_batch_free(struct nftnl_batch *batch) -+void __EXPORTED nftnl_batch_free(struct nftnl_batch *batch) - { - struct nftnl_batch_page *page, *next; - -@@ -94,9 +93,8 @@ void nftnl_batch_free(struct nftnl_batch *batch) - - free(batch); - } --EXPORT_SYMBOL(nftnl_batch_free); - --int nftnl_batch_update(struct nftnl_batch *batch) -+int __EXPORTED nftnl_batch_update(struct nftnl_batch *batch) - { - struct nftnl_batch_page *page; - struct nlmsghdr *last_nlh; -@@ -119,21 +117,18 @@ int nftnl_batch_update(struct nftnl_batch *batch) - err1: - return -1; - } --EXPORT_SYMBOL(nftnl_batch_update); - --void *nftnl_batch_buffer(struct nftnl_batch *batch) -+void __EXPORTED *nftnl_batch_buffer(struct nftnl_batch *batch) - { - return mnl_nlmsg_batch_current(batch->current_page->batch); - } --EXPORT_SYMBOL(nftnl_batch_buffer); - --uint32_t nftnl_batch_buffer_len(struct nftnl_batch *batch) -+uint32_t __EXPORTED nftnl_batch_buffer_len(struct nftnl_batch *batch) - { - return mnl_nlmsg_batch_size(batch->current_page->batch); - } --EXPORT_SYMBOL(nftnl_batch_buffer_len); - --int nftnl_batch_iovec_len(struct nftnl_batch *batch) -+int __EXPORTED nftnl_batch_iovec_len(struct nftnl_batch *batch) - { - int num_pages = batch->num_pages; - -@@ -143,9 +138,8 @@ int nftnl_batch_iovec_len(struct nftnl_batch *batch) - - return num_pages; - } --EXPORT_SYMBOL(nftnl_batch_iovec_len); - --void nftnl_batch_iovec(struct nftnl_batch *batch, struct iovec *iov, -+void __EXPORTED nftnl_batch_iovec(struct nftnl_batch *batch, struct iovec *iov, - uint32_t iovlen) - { - struct nftnl_batch_page *page; -@@ -160,4 +154,3 @@ void nftnl_batch_iovec(struct nftnl_batch *batch, struct iovec *iov, - i++; - } - } --EXPORT_SYMBOL(nftnl_batch_iovec); -diff --git a/src/chain.c b/src/chain.c -index 29860c5..362fa0d 100644 ---- a/src/chain.c -+++ b/src/chain.c -@@ -87,13 +87,12 @@ static const char *nftnl_hooknum2str(int family, int hooknum) - return "unknown"; - } - --struct nftnl_chain *nftnl_chain_alloc(void) -+struct nftnl_chain __EXPORTED *nftnl_chain_alloc(void) - { - return calloc(1, sizeof(struct nftnl_chain)); - } --EXPORT_SYMBOL(nftnl_chain_alloc); - --void nftnl_chain_free(const struct nftnl_chain *c) -+void __EXPORTED nftnl_chain_free(const struct nftnl_chain *c) - { - if (c->flags & (1 << NFTNL_CHAIN_NAME)) - xfree(c->name); -@@ -105,15 +104,13 @@ void nftnl_chain_free(const struct nftnl_chain *c) - xfree(c->dev); - xfree(c); - } --EXPORT_SYMBOL(nftnl_chain_free); - --bool nftnl_chain_is_set(const struct nftnl_chain *c, uint16_t attr) -+bool __EXPORTED nftnl_chain_is_set(const struct nftnl_chain *c, uint16_t attr) - { - return c->flags & (1 << attr); - } --EXPORT_SYMBOL(nftnl_chain_is_set); - --void nftnl_chain_unset(struct nftnl_chain *c, uint16_t attr) -+void __EXPORTED nftnl_chain_unset(struct nftnl_chain *c, uint16_t attr) - { - if (!(c->flags & (1 << attr))) - return; -@@ -147,7 +144,6 @@ void nftnl_chain_unset(struct nftnl_chain *c, uint16_t attr) - - c->flags &= ~(1 << attr); - } --EXPORT_SYMBOL(nftnl_chain_unset); - - static uint32_t nftnl_chain_validate[NFTNL_CHAIN_MAX + 1] = { - [NFTNL_CHAIN_HOOKNUM] = sizeof(uint32_t), -@@ -159,7 +155,7 @@ static uint32_t nftnl_chain_validate[NFTNL_CHAIN_MAX + 1] = { - [NFTNL_CHAIN_FAMILY] = sizeof(uint32_t), - }; - --int nftnl_chain_set_data(struct nftnl_chain *c, uint16_t attr, -+int __EXPORTED nftnl_chain_set_data(struct nftnl_chain *c, uint16_t attr, - const void *data, uint32_t data_len) - { - nftnl_assert_attr_exists(attr, NFTNL_CHAIN_MAX); -@@ -226,45 +222,38 @@ int nftnl_chain_set_data(struct nftnl_chain *c, uint16_t attr, - c->flags |= (1 << attr); - return 0; - } --EXPORT_SYMBOL(nftnl_chain_set_data); - --void nftnl_chain_set(struct nftnl_chain *c, uint16_t attr, const void *data) -+void __EXPORTED nftnl_chain_set(struct nftnl_chain *c, uint16_t attr, const void *data) - { - nftnl_chain_set_data(c, attr, data, nftnl_chain_validate[attr]); - } --EXPORT_SYMBOL(nftnl_chain_set); - --void nftnl_chain_set_u32(struct nftnl_chain *c, uint16_t attr, uint32_t data) -+void __EXPORTED nftnl_chain_set_u32(struct nftnl_chain *c, uint16_t attr, uint32_t data) - { - nftnl_chain_set_data(c, attr, &data, sizeof(uint32_t)); - } --EXPORT_SYMBOL(nftnl_chain_set_u32); - --void nftnl_chain_set_s32(struct nftnl_chain *c, uint16_t attr, int32_t data) -+void __EXPORTED nftnl_chain_set_s32(struct nftnl_chain *c, uint16_t attr, int32_t data) - { - nftnl_chain_set_data(c, attr, &data, sizeof(int32_t)); - } --EXPORT_SYMBOL(nftnl_chain_set_s32); - --void nftnl_chain_set_u64(struct nftnl_chain *c, uint16_t attr, uint64_t data) -+void __EXPORTED nftnl_chain_set_u64(struct nftnl_chain *c, uint16_t attr, uint64_t data) - { - nftnl_chain_set_data(c, attr, &data, sizeof(uint64_t)); - } --EXPORT_SYMBOL(nftnl_chain_set_u64); - --void nftnl_chain_set_u8(struct nftnl_chain *c, uint16_t attr, uint8_t data) -+void __EXPORTED nftnl_chain_set_u8(struct nftnl_chain *c, uint16_t attr, uint8_t data) - { - nftnl_chain_set_data(c, attr, &data, sizeof(uint8_t)); - } --EXPORT_SYMBOL(nftnl_chain_set_u8); - --int nftnl_chain_set_str(struct nftnl_chain *c, uint16_t attr, const char *str) -+int __EXPORTED nftnl_chain_set_str(struct nftnl_chain *c, uint16_t attr, const char *str) - { - return nftnl_chain_set_data(c, attr, str, strlen(str) + 1); - } --EXPORT_SYMBOL(nftnl_chain_set_str); - --const void *nftnl_chain_get_data(const struct nftnl_chain *c, uint16_t attr, -+const void __EXPORTED *nftnl_chain_get_data(const struct nftnl_chain *c, uint16_t attr, - uint32_t *data_len) - { - if (!(c->flags & (1 << attr))) -@@ -310,22 +299,19 @@ const void *nftnl_chain_get_data(const struct nftnl_chain *c, uint16_t attr, - } - return NULL; - } --EXPORT_SYMBOL(nftnl_chain_get_data); - --const void *nftnl_chain_get(const struct nftnl_chain *c, uint16_t attr) -+const void __EXPORTED *nftnl_chain_get(const struct nftnl_chain *c, uint16_t attr) - { - uint32_t data_len; - return nftnl_chain_get_data(c, attr, &data_len); - } --EXPORT_SYMBOL(nftnl_chain_get); - --const char *nftnl_chain_get_str(const struct nftnl_chain *c, uint16_t attr) -+const char __EXPORTED *nftnl_chain_get_str(const struct nftnl_chain *c, uint16_t attr) - { - return nftnl_chain_get(c, attr); - } --EXPORT_SYMBOL(nftnl_chain_get_str); - --uint32_t nftnl_chain_get_u32(const struct nftnl_chain *c, uint16_t attr) -+uint32_t __EXPORTED nftnl_chain_get_u32(const struct nftnl_chain *c, uint16_t attr) - { - uint32_t data_len; - const uint32_t *val = nftnl_chain_get_data(c, attr, &data_len); -@@ -334,9 +320,8 @@ uint32_t nftnl_chain_get_u32(const struct nftnl_chain *c, uint16_t attr) - - return val ? *val : 0; - } --EXPORT_SYMBOL(nftnl_chain_get_u32); - --int32_t nftnl_chain_get_s32(const struct nftnl_chain *c, uint16_t attr) -+int32_t __EXPORTED nftnl_chain_get_s32(const struct nftnl_chain *c, uint16_t attr) - { - uint32_t data_len; - const int32_t *val = nftnl_chain_get_data(c, attr, &data_len); -@@ -345,9 +330,8 @@ int32_t nftnl_chain_get_s32(const struct nftnl_chain *c, uint16_t attr) - - return val ? *val : 0; - } --EXPORT_SYMBOL(nftnl_chain_get_s32); - --uint64_t nftnl_chain_get_u64(const struct nftnl_chain *c, uint16_t attr) -+uint64_t __EXPORTED nftnl_chain_get_u64(const struct nftnl_chain *c, uint16_t attr) - { - uint32_t data_len; - const uint64_t *val = nftnl_chain_get_data(c, attr, &data_len); -@@ -356,9 +340,8 @@ uint64_t nftnl_chain_get_u64(const struct nftnl_chain *c, uint16_t attr) - - return val ? *val : 0; - } --EXPORT_SYMBOL(nftnl_chain_get_u64); - --uint8_t nftnl_chain_get_u8(const struct nftnl_chain *c, uint16_t attr) -+uint8_t __EXPORTED nftnl_chain_get_u8(const struct nftnl_chain *c, uint16_t attr) - { - uint32_t data_len; - const uint8_t *val = nftnl_chain_get_data(c, attr, &data_len); -@@ -367,9 +350,8 @@ uint8_t nftnl_chain_get_u8(const struct nftnl_chain *c, uint16_t attr) - - return val ? *val : 0; - } --EXPORT_SYMBOL(nftnl_chain_get_u8); - --void nftnl_chain_nlmsg_build_payload(struct nlmsghdr *nlh, const struct nftnl_chain *c) -+void __EXPORTED nftnl_chain_nlmsg_build_payload(struct nlmsghdr *nlh, const struct nftnl_chain *c) - { - if (c->flags & (1 << NFTNL_CHAIN_TABLE)) - mnl_attr_put_strz(nlh, NFTA_CHAIN_TABLE, c->table); -@@ -404,7 +386,6 @@ void nftnl_chain_nlmsg_build_payload(struct nlmsghdr *nlh, const struct nftnl_ch - if (c->flags & (1 << NFTNL_CHAIN_TYPE)) - mnl_attr_put_strz(nlh, NFTA_CHAIN_TYPE, c->type); - } --EXPORT_SYMBOL(nftnl_chain_nlmsg_build_payload); - - static int nftnl_chain_parse_attr_cb(const struct nlattr *attr, void *data) - { -@@ -529,7 +510,7 @@ static int nftnl_chain_parse_hook(struct nlattr *attr, struct nftnl_chain *c) - return 0; - } - --int nftnl_chain_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_chain *c) -+int __EXPORTED nftnl_chain_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_chain *c) - { - struct nlattr *tb[NFTA_CHAIN_MAX+1] = {}; - struct nfgenmsg *nfg = mnl_nlmsg_get_payload(nlh); -@@ -590,7 +571,6 @@ int nftnl_chain_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_chain *c) - - return ret; - } --EXPORT_SYMBOL(nftnl_chain_nlmsg_parse); - - static inline int nftnl_str2hooknum(int family, const char *hook) - { -@@ -732,19 +712,17 @@ static int nftnl_chain_do_parse(struct nftnl_chain *c, enum nftnl_parse_type typ - return ret; - } - --int nftnl_chain_parse(struct nftnl_chain *c, enum nftnl_parse_type type, -+int __EXPORTED nftnl_chain_parse(struct nftnl_chain *c, enum nftnl_parse_type type, - const char *data, struct nftnl_parse_err *err) - { - return nftnl_chain_do_parse(c, type, data, err, NFTNL_PARSE_BUFFER); - } --EXPORT_SYMBOL(nftnl_chain_parse); - --int nftnl_chain_parse_file(struct nftnl_chain *c, enum nftnl_parse_type type, -+int __EXPORTED nftnl_chain_parse_file(struct nftnl_chain *c, enum nftnl_parse_type type, - FILE *fp, struct nftnl_parse_err *err) - { - return nftnl_chain_do_parse(c, type, fp, err, NFTNL_PARSE_FILE); - } --EXPORT_SYMBOL(nftnl_chain_parse_file); - - static int nftnl_chain_export(char *buf, size_t size, - const struct nftnl_chain *c, int type) -@@ -841,13 +819,12 @@ static int nftnl_chain_cmd_snprintf(char *buf, size_t size, - return offset; - } - --int nftnl_chain_snprintf(char *buf, size_t size, const struct nftnl_chain *c, -+int __EXPORTED nftnl_chain_snprintf(char *buf, size_t size, const struct nftnl_chain *c, - uint32_t type, uint32_t flags) - { - return nftnl_chain_cmd_snprintf(buf, size, c, nftnl_flag2cmd(flags), type, - flags); - } --EXPORT_SYMBOL(nftnl_chain_snprintf); - - static int nftnl_chain_do_snprintf(char *buf, size_t size, const void *c, - uint32_t cmd, uint32_t type, uint32_t flags) -@@ -855,19 +832,18 @@ static int nftnl_chain_do_snprintf(char *buf, size_t size, const void *c, - return nftnl_chain_snprintf(buf, size, c, type, flags); - } - --int nftnl_chain_fprintf(FILE *fp, const struct nftnl_chain *c, uint32_t type, -+int __EXPORTED nftnl_chain_fprintf(FILE *fp, const struct nftnl_chain *c, uint32_t type, - uint32_t flags) - { - return nftnl_fprintf(fp, c, NFTNL_CMD_UNSPEC, type, flags, - nftnl_chain_do_snprintf); - } --EXPORT_SYMBOL(nftnl_chain_fprintf); - - struct nftnl_chain_list { - struct list_head list; - }; - --struct nftnl_chain_list *nftnl_chain_list_alloc(void) -+struct nftnl_chain_list __EXPORTED *nftnl_chain_list_alloc(void) - { - struct nftnl_chain_list *list; - -@@ -879,9 +855,8 @@ struct nftnl_chain_list *nftnl_chain_list_alloc(void) - - return list; - } --EXPORT_SYMBOL(nftnl_chain_list_alloc); - --void nftnl_chain_list_free(struct nftnl_chain_list *list) -+void __EXPORTED nftnl_chain_list_free(struct nftnl_chain_list *list) - { - struct nftnl_chain *r, *tmp; - -@@ -891,33 +866,28 @@ void nftnl_chain_list_free(struct nftnl_chain_list *list) - } - xfree(list); - } --EXPORT_SYMBOL(nftnl_chain_list_free); - --int nftnl_chain_list_is_empty(const struct nftnl_chain_list *list) -+int __EXPORTED nftnl_chain_list_is_empty(const struct nftnl_chain_list *list) - { - return list_empty(&list->list); - } --EXPORT_SYMBOL(nftnl_chain_list_is_empty); - --void nftnl_chain_list_add(struct nftnl_chain *r, struct nftnl_chain_list *list) -+void __EXPORTED nftnl_chain_list_add(struct nftnl_chain *r, struct nftnl_chain_list *list) - { - list_add(&r->head, &list->list); - } --EXPORT_SYMBOL(nftnl_chain_list_add); - --void nftnl_chain_list_add_tail(struct nftnl_chain *r, struct nftnl_chain_list *list) -+void __EXPORTED nftnl_chain_list_add_tail(struct nftnl_chain *r, struct nftnl_chain_list *list) - { - list_add_tail(&r->head, &list->list); - } --EXPORT_SYMBOL(nftnl_chain_list_add_tail); - --void nftnl_chain_list_del(struct nftnl_chain *r) -+void __EXPORTED nftnl_chain_list_del(struct nftnl_chain *r) - { - list_del(&r->head); - } --EXPORT_SYMBOL(nftnl_chain_list_del); - --int nftnl_chain_list_foreach(struct nftnl_chain_list *chain_list, -+int __EXPORTED nftnl_chain_list_foreach(struct nftnl_chain_list *chain_list, - int (*cb)(struct nftnl_chain *r, void *data), - void *data) - { -@@ -931,14 +901,13 @@ int nftnl_chain_list_foreach(struct nftnl_chain_list *chain_list, - } - return 0; - } --EXPORT_SYMBOL(nftnl_chain_list_foreach); - - struct nftnl_chain_list_iter { - const struct nftnl_chain_list *list; - struct nftnl_chain *cur; - }; - --struct nftnl_chain_list_iter * -+struct nftnl_chain_list_iter __EXPORTED * - nftnl_chain_list_iter_create(const struct nftnl_chain_list *l) - { - struct nftnl_chain_list_iter *iter; -@@ -955,9 +924,8 @@ nftnl_chain_list_iter_create(const struct nftnl_chain_list *l) - - return iter; - } --EXPORT_SYMBOL(nftnl_chain_list_iter_create); - --struct nftnl_chain *nftnl_chain_list_iter_next(struct nftnl_chain_list_iter *iter) -+struct nftnl_chain __EXPORTED *nftnl_chain_list_iter_next(struct nftnl_chain_list_iter *iter) - { - struct nftnl_chain *r = iter->cur; - -@@ -971,10 +939,8 @@ struct nftnl_chain *nftnl_chain_list_iter_next(struct nftnl_chain_list_iter *ite - - return r; - } --EXPORT_SYMBOL(nftnl_chain_list_iter_next); - --void nftnl_chain_list_iter_destroy(struct nftnl_chain_list_iter *iter) -+void __EXPORTED nftnl_chain_list_iter_destroy(struct nftnl_chain_list_iter *iter) - { - xfree(iter); - } --EXPORT_SYMBOL(nftnl_chain_list_iter_destroy); -diff --git a/src/common.c b/src/common.c -index a95883c..68bce2e 100644 ---- a/src/common.c -+++ b/src/common.c -@@ -43,15 +43,14 @@ static struct nlmsghdr *__nftnl_nlmsg_build_hdr(char *buf, uint16_t type, - return nlh; - } - --struct nlmsghdr *nftnl_nlmsg_build_hdr(char *buf, uint16_t type, uint16_t family, -+struct nlmsghdr __EXPORTED *nftnl_nlmsg_build_hdr(char *buf, uint16_t type, uint16_t family, - uint16_t flags, uint32_t seq) - { - return __nftnl_nlmsg_build_hdr(buf, (NFNL_SUBSYS_NFTABLES << 8) | type, - family, flags, seq, 0); - } --EXPORT_SYMBOL(nftnl_nlmsg_build_hdr); - --struct nftnl_parse_err *nftnl_parse_err_alloc(void) -+struct nftnl_parse_err __EXPORTED *nftnl_parse_err_alloc(void) - { - struct nftnl_parse_err *err; - -@@ -63,15 +62,13 @@ struct nftnl_parse_err *nftnl_parse_err_alloc(void) - - return err; - } --EXPORT_SYMBOL(nftnl_parse_err_alloc); - --void nftnl_parse_err_free(struct nftnl_parse_err *err) -+void __EXPORTED nftnl_parse_err_free(struct nftnl_parse_err *err) - { - xfree(err); - } --EXPORT_SYMBOL(nftnl_parse_err_free); - --int nftnl_parse_perror(const char *msg, struct nftnl_parse_err *err) -+int __EXPORTED nftnl_parse_perror(const char *msg, struct nftnl_parse_err *err) - { - switch (err->error) { - case NFTNL_PARSE_EBADINPUT: -@@ -89,7 +86,6 @@ int nftnl_parse_perror(const char *msg, struct nftnl_parse_err *err) - return fprintf(stderr, "%s: Undefined error\n", msg); - } - } --EXPORT_SYMBOL(nftnl_parse_perror); - - int nftnl_cmd_header_snprintf(char *buf, size_t size, uint32_t cmd, uint32_t type, - uint32_t flags) -@@ -165,21 +161,19 @@ int nftnl_cmd_footer_fprintf(FILE *fp, uint32_t cmd, uint32_t type, - nftnl_cmd_footer_fprintf_cb); - } - --struct nlmsghdr *nftnl_batch_begin(char *buf, uint32_t seq) -+struct nlmsghdr __EXPORTED *nftnl_batch_begin(char *buf, uint32_t seq) - { - return __nftnl_nlmsg_build_hdr(buf, NFNL_MSG_BATCH_BEGIN, AF_UNSPEC, - 0, seq, NFNL_SUBSYS_NFTABLES); - } --EXPORT_SYMBOL(nftnl_batch_begin); - --struct nlmsghdr *nftnl_batch_end(char *buf, uint32_t seq) -+struct nlmsghdr __EXPORTED *nftnl_batch_end(char *buf, uint32_t seq) - { - return __nftnl_nlmsg_build_hdr(buf, NFNL_MSG_BATCH_END, AF_UNSPEC, - 0, seq, NFNL_SUBSYS_NFTABLES); - } --EXPORT_SYMBOL(nftnl_batch_end); - --int nftnl_batch_is_supported(void) -+int __EXPORTED nftnl_batch_is_supported(void) - { - struct mnl_socket *nl; - struct mnl_nlmsg_batch *b; -@@ -236,4 +230,3 @@ err: - mnl_nlmsg_batch_stop(b); - return -1; - } --EXPORT_SYMBOL(nftnl_batch_is_supported); -diff --git a/src/expr.c b/src/expr.c -index 10ba2c4..c7eb2b4 100644 ---- a/src/expr.c -+++ b/src/expr.c -@@ -24,7 +24,7 @@ - - #include <libnftnl/expr.h> - --struct nftnl_expr *nftnl_expr_alloc(const char *name) -+struct nftnl_expr __EXPORTED *nftnl_expr_alloc(const char *name) - { - struct nftnl_expr *expr; - struct expr_ops *ops; -@@ -43,24 +43,21 @@ struct nftnl_expr *nftnl_expr_alloc(const char *name) - - return expr; - } --EXPORT_SYMBOL(nftnl_expr_alloc); - --void nftnl_expr_free(const struct nftnl_expr *expr) -+void __EXPORTED nftnl_expr_free(const struct nftnl_expr *expr) - { - if (expr->ops->free) - expr->ops->free(expr); - - xfree(expr); - } --EXPORT_SYMBOL(nftnl_expr_free); - --bool nftnl_expr_is_set(const struct nftnl_expr *expr, uint16_t type) -+bool __EXPORTED nftnl_expr_is_set(const struct nftnl_expr *expr, uint16_t type) - { - return expr->flags & (1 << type); - } --EXPORT_SYMBOL(nftnl_expr_is_set); - --int nftnl_expr_set(struct nftnl_expr *expr, uint16_t type, -+int __EXPORTED nftnl_expr_set(struct nftnl_expr *expr, uint16_t type, - const void *data, uint32_t data_len) - { - switch(type) { -@@ -73,43 +70,37 @@ int nftnl_expr_set(struct nftnl_expr *expr, uint16_t type, - expr->flags |= (1 << type); - return 0; - } --EXPORT_SYMBOL(nftnl_expr_set); - --void -+void __EXPORTED - nftnl_expr_set_u8(struct nftnl_expr *expr, uint16_t type, uint8_t data) - { - nftnl_expr_set(expr, type, &data, sizeof(uint8_t)); - } --EXPORT_SYMBOL(nftnl_expr_set_u8); - --void -+void __EXPORTED - nftnl_expr_set_u16(struct nftnl_expr *expr, uint16_t type, uint16_t data) - { - nftnl_expr_set(expr, type, &data, sizeof(uint16_t)); - } --EXPORT_SYMBOL(nftnl_expr_set_u16); - --void -+void __EXPORTED - nftnl_expr_set_u32(struct nftnl_expr *expr, uint16_t type, uint32_t data) - { - nftnl_expr_set(expr, type, &data, sizeof(uint32_t)); - } --EXPORT_SYMBOL(nftnl_expr_set_u32); - --void -+void __EXPORTED - nftnl_expr_set_u64(struct nftnl_expr *expr, uint16_t type, uint64_t data) - { - nftnl_expr_set(expr, type, &data, sizeof(uint64_t)); - } --EXPORT_SYMBOL(nftnl_expr_set_u64); - --int nftnl_expr_set_str(struct nftnl_expr *expr, uint16_t type, const char *str) -+int __EXPORTED nftnl_expr_set_str(struct nftnl_expr *expr, uint16_t type, const char *str) - { - return nftnl_expr_set(expr, type, str, strlen(str) + 1); - } --EXPORT_SYMBOL(nftnl_expr_set_str); - --const void *nftnl_expr_get(const struct nftnl_expr *expr, -+const void __EXPORTED *nftnl_expr_get(const struct nftnl_expr *expr, - uint16_t type, uint32_t *data_len) - { - const void *ret; -@@ -129,9 +120,8 @@ const void *nftnl_expr_get(const struct nftnl_expr *expr, - - return ret; - } --EXPORT_SYMBOL(nftnl_expr_get); - --uint8_t nftnl_expr_get_u8(const struct nftnl_expr *expr, uint16_t type) -+uint8_t __EXPORTED nftnl_expr_get_u8(const struct nftnl_expr *expr, uint16_t type) - { - const void *data; - uint32_t data_len; -@@ -145,9 +135,8 @@ uint8_t nftnl_expr_get_u8(const struct nftnl_expr *expr, uint16_t type) - - return *((uint8_t *)data); - } --EXPORT_SYMBOL(nftnl_expr_get_u8); - --uint16_t nftnl_expr_get_u16(const struct nftnl_expr *expr, uint16_t type) -+uint16_t __EXPORTED nftnl_expr_get_u16(const struct nftnl_expr *expr, uint16_t type) - { - const void *data; - uint32_t data_len; -@@ -161,9 +150,8 @@ uint16_t nftnl_expr_get_u16(const struct nftnl_expr *expr, uint16_t type) - - return *((uint16_t *)data); - } --EXPORT_SYMBOL(nftnl_expr_get_u16); - --uint32_t nftnl_expr_get_u32(const struct nftnl_expr *expr, uint16_t type) -+uint32_t __EXPORTED nftnl_expr_get_u32(const struct nftnl_expr *expr, uint16_t type) - { - const void *data; - uint32_t data_len; -@@ -177,9 +165,8 @@ uint32_t nftnl_expr_get_u32(const struct nftnl_expr *expr, uint16_t type) - - return *((uint32_t *)data); - } --EXPORT_SYMBOL(nftnl_expr_get_u32); - --uint64_t nftnl_expr_get_u64(const struct nftnl_expr *expr, uint16_t type) -+uint64_t __EXPORTED nftnl_expr_get_u64(const struct nftnl_expr *expr, uint16_t type) - { - const void *data; - uint32_t data_len; -@@ -193,17 +180,15 @@ uint64_t nftnl_expr_get_u64(const struct nftnl_expr *expr, uint16_t type) - - return *((uint64_t *)data); - } --EXPORT_SYMBOL(nftnl_expr_get_u64); - --const char *nftnl_expr_get_str(const struct nftnl_expr *expr, uint16_t type) -+const char __EXPORTED *nftnl_expr_get_str(const struct nftnl_expr *expr, uint16_t type) - { - uint32_t data_len; - - return (const char *)nftnl_expr_get(expr, type, &data_len); - } --EXPORT_SYMBOL(nftnl_expr_get_str); - --bool nftnl_expr_cmp(const struct nftnl_expr *e1, const struct nftnl_expr *e2) -+bool __EXPORTED nftnl_expr_cmp(const struct nftnl_expr *e1, const struct nftnl_expr *e2) - { - if (e1->flags != e2->flags || - strcmp(e1->ops->name, e2->ops->name) != 0) -@@ -211,7 +196,6 @@ bool nftnl_expr_cmp(const struct nftnl_expr *e1, const struct nftnl_expr *e2) - - return e1->ops->cmp(e1, e2); - } --EXPORT_SYMBOL(nftnl_expr_cmp); - - void nftnl_expr_build_payload(struct nlmsghdr *nlh, struct nftnl_expr *expr) - { -@@ -275,7 +259,7 @@ err1: - return NULL; - } - --int nftnl_expr_snprintf(char *buf, size_t size, const struct nftnl_expr *expr, -+int __EXPORTED nftnl_expr_snprintf(char *buf, size_t size, const struct nftnl_expr *expr, - uint32_t type, uint32_t flags) - { - int ret; -@@ -289,4 +273,3 @@ int nftnl_expr_snprintf(char *buf, size_t size, const struct nftnl_expr *expr, - - return offset; - } --EXPORT_SYMBOL(nftnl_expr_snprintf); -diff --git a/src/gen.c b/src/gen.c -index 213562e..8b45caa 100644 ---- a/src/gen.c -+++ b/src/gen.c -@@ -29,25 +29,22 @@ struct nftnl_gen { - uint32_t flags; - }; - --struct nftnl_gen *nftnl_gen_alloc(void) -+struct nftnl_gen __EXPORTED *nftnl_gen_alloc(void) - { - return calloc(1, sizeof(struct nftnl_gen)); - } --EXPORT_SYMBOL(nftnl_gen_alloc); - --void nftnl_gen_free(const struct nftnl_gen *gen) -+void __EXPORTED nftnl_gen_free(const struct nftnl_gen *gen) - { - xfree(gen); - } --EXPORT_SYMBOL(nftnl_gen_free); - --bool nftnl_gen_is_set(const struct nftnl_gen *gen, uint16_t attr) -+bool __EXPORTED nftnl_gen_is_set(const struct nftnl_gen *gen, uint16_t attr) - { - return gen->flags & (1 << attr); - } --EXPORT_SYMBOL(nftnl_gen_is_set); - --void nftnl_gen_unset(struct nftnl_gen *gen, uint16_t attr) -+void __EXPORTED nftnl_gen_unset(struct nftnl_gen *gen, uint16_t attr) - { - if (!(gen->flags & (1 << attr))) - return; -@@ -58,13 +55,12 @@ void nftnl_gen_unset(struct nftnl_gen *gen, uint16_t attr) - } - gen->flags &= ~(1 << attr); - } --EXPORT_SYMBOL(nftnl_gen_unset); - - static uint32_t nftnl_gen_validate[NFTNL_GEN_MAX + 1] = { - [NFTNL_GEN_ID] = sizeof(uint32_t), - }; - --int nftnl_gen_set_data(struct nftnl_gen *gen, uint16_t attr, -+int __EXPORTED nftnl_gen_set_data(struct nftnl_gen *gen, uint16_t attr, - const void *data, uint32_t data_len) - { - nftnl_assert_attr_exists(attr, NFTNL_GEN_MAX); -@@ -78,21 +74,18 @@ int nftnl_gen_set_data(struct nftnl_gen *gen, uint16_t attr, - gen->flags |= (1 << attr); - return 0; - } --EXPORT_SYMBOL(nftnl_gen_set_data); - --int nftnl_gen_set(struct nftnl_gen *gen, uint16_t attr, const void *data) -+int __EXPORTED nftnl_gen_set(struct nftnl_gen *gen, uint16_t attr, const void *data) - { - return nftnl_gen_set_data(gen, attr, data, nftnl_gen_validate[attr]); - } --EXPORT_SYMBOL(nftnl_gen_set); - --void nftnl_gen_set_u32(struct nftnl_gen *gen, uint16_t attr, uint32_t val) -+void __EXPORTED nftnl_gen_set_u32(struct nftnl_gen *gen, uint16_t attr, uint32_t val) - { - nftnl_gen_set_data(gen, attr, &val, sizeof(uint32_t)); - } --EXPORT_SYMBOL(nftnl_gen_set_u32); - --const void *nftnl_gen_get_data(const struct nftnl_gen *gen, uint16_t attr, -+const void __EXPORTED *nftnl_gen_get_data(const struct nftnl_gen *gen, uint16_t attr, - uint32_t *data_len) - { - if (!(gen->flags & (1 << attr))) -@@ -105,21 +98,18 @@ const void *nftnl_gen_get_data(const struct nftnl_gen *gen, uint16_t attr, - } - return NULL; - } --EXPORT_SYMBOL(nftnl_gen_get_data); - --const void *nftnl_gen_get(const struct nftnl_gen *gen, uint16_t attr) -+const void __EXPORTED *nftnl_gen_get(const struct nftnl_gen *gen, uint16_t attr) - { - uint32_t data_len; - return nftnl_gen_get_data(gen, attr, &data_len); - } --EXPORT_SYMBOL(nftnl_gen_get); - --uint32_t nftnl_gen_get_u32(const struct nftnl_gen *gen, uint16_t attr) -+uint32_t __EXPORTED nftnl_gen_get_u32(const struct nftnl_gen *gen, uint16_t attr) - { - const void *ret = nftnl_gen_get(gen, attr); - return ret == NULL ? 0 : *((uint32_t *)ret); - } --EXPORT_SYMBOL(nftnl_gen_get_u32); - - static int nftnl_gen_parse_attr_cb(const struct nlattr *attr, void *data) - { -@@ -140,7 +130,7 @@ static int nftnl_gen_parse_attr_cb(const struct nlattr *attr, void *data) - return MNL_CB_OK; - } - --int nftnl_gen_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_gen *gen) -+int __EXPORTED nftnl_gen_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_gen *gen) - { - struct nlattr *tb[NFTA_GEN_MAX + 1] = {}; - struct nfgenmsg *nfg = mnl_nlmsg_get_payload(nlh); -@@ -154,7 +144,6 @@ int nftnl_gen_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_gen *gen) - } - return 0; - } --EXPORT_SYMBOL(nftnl_gen_nlmsg_parse); - - static int nftnl_gen_snprintf_default(char *buf, size_t size, - const struct nftnl_gen *gen) -@@ -186,13 +175,12 @@ static int nftnl_gen_cmd_snprintf(char *buf, size_t size, - return offset; - } - --int nftnl_gen_snprintf(char *buf, size_t size, const struct nftnl_gen *gen, -+int __EXPORTED nftnl_gen_snprintf(char *buf, size_t size, const struct nftnl_gen *gen, - uint32_t type, uint32_t flags) - {; - return nftnl_gen_cmd_snprintf(buf, size, gen, nftnl_flag2cmd(flags), type, - flags); - } --EXPORT_SYMBOL(nftnl_gen_snprintf); - - static int nftnl_gen_do_snprintf(char *buf, size_t size, const void *gen, - uint32_t cmd, uint32_t type, uint32_t flags) -@@ -200,10 +188,9 @@ static int nftnl_gen_do_snprintf(char *buf, size_t size, const void *gen, - return nftnl_gen_snprintf(buf, size, gen, type, flags); - } - --int nftnl_gen_fprintf(FILE *fp, const struct nftnl_gen *gen, uint32_t type, -+int __EXPORTED nftnl_gen_fprintf(FILE *fp, const struct nftnl_gen *gen, uint32_t type, - uint32_t flags) - { - return nftnl_fprintf(fp, gen, NFTNL_CMD_UNSPEC, type, flags, - nftnl_gen_do_snprintf); - } --EXPORT_SYMBOL(nftnl_gen_fprintf); -diff --git a/src/object.c b/src/object.c -index e1a5ac4..d409c6d 100644 ---- a/src/object.c -+++ b/src/object.c -@@ -39,13 +39,12 @@ static struct obj_ops *nftnl_obj_ops_lookup(uint32_t type) - return obj_ops[type]; - } - --struct nftnl_obj *nftnl_obj_alloc(void) -+struct nftnl_obj __EXPORTED *nftnl_obj_alloc(void) - { - return calloc(1, sizeof(struct nftnl_obj)); - } --EXPORT_SYMBOL(nftnl_obj_alloc); - --void nftnl_obj_free(const struct nftnl_obj *obj) -+void __EXPORTED nftnl_obj_free(const struct nftnl_obj *obj) - { - if (obj->flags & (1 << NFTNL_OBJ_TABLE)) - xfree(obj->table); -@@ -54,20 +53,18 @@ void nftnl_obj_free(const struct nftnl_obj *obj) - - xfree(obj); - } --EXPORT_SYMBOL(nftnl_obj_free); - --bool nftnl_obj_is_set(const struct nftnl_obj *obj, uint16_t attr) -+bool __EXPORTED nftnl_obj_is_set(const struct nftnl_obj *obj, uint16_t attr) - { - return obj->flags & (1 << attr); - } --EXPORT_SYMBOL(nftnl_obj_is_set); - - static uint32_t nftnl_obj_validate[NFTNL_OBJ_MAX + 1] = { - [NFTNL_OBJ_FAMILY] = sizeof(uint32_t), - [NFTNL_OBJ_USE] = sizeof(uint32_t), - }; - --void nftnl_obj_set_data(struct nftnl_obj *obj, uint16_t attr, -+void __EXPORTED nftnl_obj_set_data(struct nftnl_obj *obj, uint16_t attr, - const void *data, uint32_t data_len) - { - if (attr < NFTNL_OBJ_MAX) -@@ -100,45 +97,38 @@ void nftnl_obj_set_data(struct nftnl_obj *obj, uint16_t attr, - } - obj->flags |= (1 << attr); - } --EXPORT_SYMBOL(nftnl_obj_set_data); - --void nftnl_obj_set(struct nftnl_obj *obj, uint16_t attr, const void *data) -+void __EXPORTED nftnl_obj_set(struct nftnl_obj *obj, uint16_t attr, const void *data) - { - nftnl_obj_set_data(obj, attr, data, nftnl_obj_validate[attr]); - } --EXPORT_SYMBOL(nftnl_obj_set); - --void nftnl_obj_set_u8(struct nftnl_obj *obj, uint16_t attr, uint8_t val) -+void __EXPORTED nftnl_obj_set_u8(struct nftnl_obj *obj, uint16_t attr, uint8_t val) - { - nftnl_obj_set_data(obj, attr, &val, sizeof(uint8_t)); - } --EXPORT_SYMBOL(nftnl_obj_set_u8); - --void nftnl_obj_set_u16(struct nftnl_obj *obj, uint16_t attr, uint16_t val) -+void __EXPORTED nftnl_obj_set_u16(struct nftnl_obj *obj, uint16_t attr, uint16_t val) - { - nftnl_obj_set_data(obj, attr, &val, sizeof(uint16_t)); - } --EXPORT_SYMBOL(nftnl_obj_set_u16); - --void nftnl_obj_set_u32(struct nftnl_obj *obj, uint16_t attr, uint32_t val) -+void __EXPORTED nftnl_obj_set_u32(struct nftnl_obj *obj, uint16_t attr, uint32_t val) - { - nftnl_obj_set_data(obj, attr, &val, sizeof(uint32_t)); - } --EXPORT_SYMBOL(nftnl_obj_set_u32); - --void nftnl_obj_set_u64(struct nftnl_obj *obj, uint16_t attr, uint64_t val) -+void __EXPORTED nftnl_obj_set_u64(struct nftnl_obj *obj, uint16_t attr, uint64_t val) - { - nftnl_obj_set_data(obj, attr, &val, sizeof(uint64_t)); - } --EXPORT_SYMBOL(nftnl_obj_set_u64); - --void nftnl_obj_set_str(struct nftnl_obj *obj, uint16_t attr, const char *str) -+void __EXPORTED nftnl_obj_set_str(struct nftnl_obj *obj, uint16_t attr, const char *str) - { - nftnl_obj_set_data(obj, attr, str, 0); - } --EXPORT_SYMBOL(nftnl_obj_set_str); - --const void *nftnl_obj_get_data(struct nftnl_obj *obj, uint16_t attr, -+const void __EXPORTED *nftnl_obj_get_data(struct nftnl_obj *obj, uint16_t attr, - uint32_t *data_len) - { - if (!(obj->flags & (1 << attr))) -@@ -168,50 +158,43 @@ const void *nftnl_obj_get_data(struct nftnl_obj *obj, uint16_t attr, - } - return NULL; - } --EXPORT_SYMBOL(nftnl_obj_get_data); - --const void *nftnl_obj_get(struct nftnl_obj *obj, uint16_t attr) -+const void __EXPORTED *nftnl_obj_get(struct nftnl_obj *obj, uint16_t attr) - { - uint32_t data_len; - return nftnl_obj_get_data(obj, attr, &data_len); - } --EXPORT_SYMBOL(nftnl_obj_get); - --uint8_t nftnl_obj_get_u8(struct nftnl_obj *obj, uint16_t attr) -+uint8_t __EXPORTED nftnl_obj_get_u8(struct nftnl_obj *obj, uint16_t attr) - { - const void *ret = nftnl_obj_get(obj, attr); - return ret == NULL ? 0 : *((uint8_t *)ret); - } --EXPORT_SYMBOL(nftnl_obj_get_u8); - --uint16_t nftnl_obj_get_u16(struct nftnl_obj *obj, uint16_t attr) -+uint16_t __EXPORTED nftnl_obj_get_u16(struct nftnl_obj *obj, uint16_t attr) - { - const void *ret = nftnl_obj_get(obj, attr); - return ret == NULL ? 0 : *((uint16_t *)ret); - } --EXPORT_SYMBOL(nftnl_obj_get_u16); - --uint32_t nftnl_obj_get_u32(struct nftnl_obj *obj, uint16_t attr) -+uint32_t __EXPORTED nftnl_obj_get_u32(struct nftnl_obj *obj, uint16_t attr) - { - const void *ret = nftnl_obj_get(obj, attr); - return ret == NULL ? 0 : *((uint32_t *)ret); - } --EXPORT_SYMBOL(nftnl_obj_get_u32); - --uint64_t nftnl_obj_get_u64(struct nftnl_obj *obj, uint16_t attr) -+uint64_t __EXPORTED nftnl_obj_get_u64(struct nftnl_obj *obj, uint16_t attr) - { - const void *ret = nftnl_obj_get(obj, attr); - return ret == NULL ? 0 : *((uint64_t *)ret); - } --EXPORT_SYMBOL(nftnl_obj_get_u64); - --const char *nftnl_obj_get_str(struct nftnl_obj *obj, uint16_t attr) -+const char __EXPORTED *nftnl_obj_get_str(struct nftnl_obj *obj, uint16_t attr) - { - return nftnl_obj_get(obj, attr); - } --EXPORT_SYMBOL(nftnl_obj_get_str); - --void nftnl_obj_nlmsg_build_payload(struct nlmsghdr *nlh, -+void __EXPORTED nftnl_obj_nlmsg_build_payload(struct nlmsghdr *nlh, - const struct nftnl_obj *obj) - { - if (obj->flags & (1 << NFTNL_OBJ_TABLE)) -@@ -228,7 +211,6 @@ void nftnl_obj_nlmsg_build_payload(struct nlmsghdr *nlh, - mnl_attr_nest_end(nlh, nest); - } - } --EXPORT_SYMBOL(nftnl_obj_nlmsg_build_payload); - - static int nftnl_obj_parse_attr_cb(const struct nlattr *attr, void *data) - { -@@ -258,7 +240,7 @@ static int nftnl_obj_parse_attr_cb(const struct nlattr *attr, void *data) - return MNL_CB_OK; - } - --int nftnl_obj_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_obj *obj) -+int __EXPORTED nftnl_obj_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_obj *obj) - { - struct nfgenmsg *nfg = mnl_nlmsg_get_payload(nlh); - struct nlattr *tb[NFTA_OBJ_MAX + 1] = {}; -@@ -299,7 +281,6 @@ int nftnl_obj_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_obj *obj) - - return 0; - } --EXPORT_SYMBOL(nftnl_obj_nlmsg_parse); - - #ifdef JSON_PARSING - static int nftnl_jansson_parse_obj(struct nftnl_obj *t, json_t *tree, -@@ -377,19 +358,17 @@ static int nftnl_obj_do_parse(struct nftnl_obj *obj, enum nftnl_parse_type type, - return ret; - } - --int nftnl_obj_parse(struct nftnl_obj *obj, enum nftnl_parse_type type, -+int __EXPORTED nftnl_obj_parse(struct nftnl_obj *obj, enum nftnl_parse_type type, - const char *data, struct nftnl_parse_err *err) - { - return nftnl_obj_do_parse(obj, type, data, err, NFTNL_PARSE_BUFFER); - } --EXPORT_SYMBOL(nftnl_obj_parse); - --int nftnl_obj_parse_file(struct nftnl_obj *obj, enum nftnl_parse_type type, -+int __EXPORTED nftnl_obj_parse_file(struct nftnl_obj *obj, enum nftnl_parse_type type, - FILE *fp, struct nftnl_parse_err *err) - { - return nftnl_obj_do_parse(obj, type, fp, err, NFTNL_PARSE_FILE); - } --EXPORT_SYMBOL(nftnl_obj_parse_file); - - static int nftnl_obj_export(char *buf, size_t size, - const struct nftnl_obj *obj, -@@ -469,13 +448,12 @@ static int nftnl_obj_cmd_snprintf(char *buf, size_t size, - return offset; - } - --int nftnl_obj_snprintf(char *buf, size_t size, const struct nftnl_obj *obj, -+int __EXPORTED nftnl_obj_snprintf(char *buf, size_t size, const struct nftnl_obj *obj, - uint32_t type, uint32_t flags) - { - return nftnl_obj_cmd_snprintf(buf, size, obj, nftnl_flag2cmd(flags), - type, flags); - } --EXPORT_SYMBOL(nftnl_obj_snprintf); - - static int nftnl_obj_do_snprintf(char *buf, size_t size, const void *obj, - uint32_t cmd, uint32_t type, uint32_t flags) -@@ -483,19 +461,18 @@ static int nftnl_obj_do_snprintf(char *buf, size_t size, const void *obj, - return nftnl_obj_snprintf(buf, size, obj, type, flags); - } - --int nftnl_obj_fprintf(FILE *fp, const struct nftnl_obj *obj, uint32_t type, -+int __EXPORTED nftnl_obj_fprintf(FILE *fp, const struct nftnl_obj *obj, uint32_t type, - uint32_t flags) - { - return nftnl_fprintf(fp, obj, NFTNL_CMD_UNSPEC, type, flags, - nftnl_obj_do_snprintf); - } --EXPORT_SYMBOL(nftnl_obj_fprintf); - - struct nftnl_obj_list { - struct list_head list; - }; - --struct nftnl_obj_list *nftnl_obj_list_alloc(void) -+struct nftnl_obj_list __EXPORTED *nftnl_obj_list_alloc(void) - { - struct nftnl_obj_list *list; - -@@ -507,9 +484,8 @@ struct nftnl_obj_list *nftnl_obj_list_alloc(void) - - return list; - } --EXPORT_SYMBOL(nftnl_obj_list_alloc); - --void nftnl_obj_list_free(struct nftnl_obj_list *list) -+void __EXPORTED nftnl_obj_list_free(struct nftnl_obj_list *list) - { - struct nftnl_obj *r, *tmp; - -@@ -519,34 +495,29 @@ void nftnl_obj_list_free(struct nftnl_obj_list *list) - } - xfree(list); - } --EXPORT_SYMBOL(nftnl_obj_list_free); - --int nftnl_obj_list_is_empty(struct nftnl_obj_list *list) -+int __EXPORTED nftnl_obj_list_is_empty(struct nftnl_obj_list *list) - { - return list_empty(&list->list); - } --EXPORT_SYMBOL(nftnl_obj_list_is_empty); - --void nftnl_obj_list_add(struct nftnl_obj *r, struct nftnl_obj_list *list) -+void __EXPORTED nftnl_obj_list_add(struct nftnl_obj *r, struct nftnl_obj_list *list) - { - list_add(&r->head, &list->list); - } --EXPORT_SYMBOL(nftnl_obj_list_add); - --void nftnl_obj_list_add_tail(struct nftnl_obj *r, -+void __EXPORTED nftnl_obj_list_add_tail(struct nftnl_obj *r, - struct nftnl_obj_list *list) - { - list_add_tail(&r->head, &list->list); - } --EXPORT_SYMBOL(nftnl_obj_list_add_tail); - --void nftnl_obj_list_del(struct nftnl_obj *t) -+void __EXPORTED nftnl_obj_list_del(struct nftnl_obj *t) - { - list_del(&t->head); - } --EXPORT_SYMBOL(nftnl_obj_list_del); - --int nftnl_obj_list_foreach(struct nftnl_obj_list *table_list, -+int __EXPORTED nftnl_obj_list_foreach(struct nftnl_obj_list *table_list, - int (*cb)(struct nftnl_obj *t, void *data), - void *data) - { -@@ -560,14 +531,13 @@ int nftnl_obj_list_foreach(struct nftnl_obj_list *table_list, - } - return 0; - } --EXPORT_SYMBOL(nftnl_obj_list_foreach); - - struct nftnl_obj_list_iter { - struct nftnl_obj_list *list; - struct nftnl_obj *cur; - }; - --struct nftnl_obj_list_iter * -+struct nftnl_obj_list_iter __EXPORTED * - nftnl_obj_list_iter_create(struct nftnl_obj_list *l) - { - struct nftnl_obj_list_iter *iter; -@@ -584,9 +554,8 @@ nftnl_obj_list_iter_create(struct nftnl_obj_list *l) - - return iter; - } --EXPORT_SYMBOL(nftnl_obj_list_iter_create); - --struct nftnl_obj *nftnl_obj_list_iter_next(struct nftnl_obj_list_iter *iter) -+struct nftnl_obj __EXPORTED *nftnl_obj_list_iter_next(struct nftnl_obj_list_iter *iter) - { - struct nftnl_obj *r = iter->cur; - -@@ -600,10 +569,8 @@ struct nftnl_obj *nftnl_obj_list_iter_next(struct nftnl_obj_list_iter *iter) - - return r; - } --EXPORT_SYMBOL(nftnl_obj_list_iter_next); - --void nftnl_obj_list_iter_destroy(struct nftnl_obj_list_iter *iter) -+void __EXPORTED nftnl_obj_list_iter_destroy(struct nftnl_obj_list_iter *iter) - { - xfree(iter); - } --EXPORT_SYMBOL(nftnl_obj_list_iter_destroy); -diff --git a/src/rule.c b/src/rule.c -index 6c22141..ad8609f 100644 ---- a/src/rule.c -+++ b/src/rule.c -@@ -52,7 +52,7 @@ struct nftnl_rule { - struct list_head expr_list; - }; - --struct nftnl_rule *nftnl_rule_alloc(void) -+struct nftnl_rule __EXPORTED *nftnl_rule_alloc(void) - { - struct nftnl_rule *r; - -@@ -64,9 +64,8 @@ struct nftnl_rule *nftnl_rule_alloc(void) - - return r; - } --EXPORT_SYMBOL(nftnl_rule_alloc); - --void nftnl_rule_free(const struct nftnl_rule *r) -+void __EXPORTED nftnl_rule_free(const struct nftnl_rule *r) - { - struct nftnl_expr *e, *tmp; - -@@ -82,15 +81,13 @@ void nftnl_rule_free(const struct nftnl_rule *r) - - xfree(r); - } --EXPORT_SYMBOL(nftnl_rule_free); - --bool nftnl_rule_is_set(const struct nftnl_rule *r, uint16_t attr) -+bool __EXPORTED nftnl_rule_is_set(const struct nftnl_rule *r, uint16_t attr) - { - return r->flags & (1 << attr); - } --EXPORT_SYMBOL(nftnl_rule_is_set); - --void nftnl_rule_unset(struct nftnl_rule *r, uint16_t attr) -+void __EXPORTED nftnl_rule_unset(struct nftnl_rule *r, uint16_t attr) - { - if (!(r->flags & (1 << attr))) - return; -@@ -116,7 +113,6 @@ void nftnl_rule_unset(struct nftnl_rule *r, uint16_t attr) - - r->flags &= ~(1 << attr); - } --EXPORT_SYMBOL(nftnl_rule_unset); - - static uint32_t nftnl_rule_validate[NFTNL_RULE_MAX + 1] = { - [NFTNL_RULE_HANDLE] = sizeof(uint64_t), -@@ -127,7 +123,7 @@ static uint32_t nftnl_rule_validate[NFTNL_RULE_MAX + 1] = { - [NFTNL_RULE_ID] = sizeof(uint32_t), - }; - --int nftnl_rule_set_data(struct nftnl_rule *r, uint16_t attr, -+int __EXPORTED nftnl_rule_set_data(struct nftnl_rule *r, uint16_t attr, - const void *data, uint32_t data_len) - { - nftnl_assert_attr_exists(attr, NFTNL_RULE_MAX); -@@ -183,33 +179,28 @@ int nftnl_rule_set_data(struct nftnl_rule *r, uint16_t attr, - r->flags |= (1 << attr); - return 0; - } --EXPORT_SYMBOL(nftnl_rule_set_data); - --int nftnl_rule_set(struct nftnl_rule *r, uint16_t attr, const void *data) -+int __EXPORTED nftnl_rule_set(struct nftnl_rule *r, uint16_t attr, const void *data) - { - return nftnl_rule_set_data(r, attr, data, nftnl_rule_validate[attr]); - } --EXPORT_SYMBOL(nftnl_rule_set); - --void nftnl_rule_set_u32(struct nftnl_rule *r, uint16_t attr, uint32_t val) -+void __EXPORTED nftnl_rule_set_u32(struct nftnl_rule *r, uint16_t attr, uint32_t val) - { - nftnl_rule_set_data(r, attr, &val, sizeof(uint32_t)); - } --EXPORT_SYMBOL(nftnl_rule_set_u32); - --void nftnl_rule_set_u64(struct nftnl_rule *r, uint16_t attr, uint64_t val) -+void __EXPORTED nftnl_rule_set_u64(struct nftnl_rule *r, uint16_t attr, uint64_t val) - { - nftnl_rule_set_data(r, attr, &val, sizeof(uint64_t)); - } --EXPORT_SYMBOL(nftnl_rule_set_u64); - --int nftnl_rule_set_str(struct nftnl_rule *r, uint16_t attr, const char *str) -+int __EXPORTED nftnl_rule_set_str(struct nftnl_rule *r, uint16_t attr, const char *str) - { - return nftnl_rule_set_data(r, attr, str, strlen(str) + 1); - } --EXPORT_SYMBOL(nftnl_rule_set_str); - --const void *nftnl_rule_get_data(const struct nftnl_rule *r, uint16_t attr, -+const void __EXPORTED *nftnl_rule_get_data(const struct nftnl_rule *r, uint16_t attr, - uint32_t *data_len) - { - if (!(r->flags & (1 << attr))) -@@ -246,22 +237,19 @@ const void *nftnl_rule_get_data(const struct nftnl_rule *r, uint16_t attr, - } - return NULL; - } --EXPORT_SYMBOL(nftnl_rule_get_data); - --const void *nftnl_rule_get(const struct nftnl_rule *r, uint16_t attr) -+const void __EXPORTED *nftnl_rule_get(const struct nftnl_rule *r, uint16_t attr) - { - uint32_t data_len; - return nftnl_rule_get_data(r, attr, &data_len); - } --EXPORT_SYMBOL(nftnl_rule_get); - --const char *nftnl_rule_get_str(const struct nftnl_rule *r, uint16_t attr) -+const char __EXPORTED *nftnl_rule_get_str(const struct nftnl_rule *r, uint16_t attr) - { - return nftnl_rule_get(r, attr); - } --EXPORT_SYMBOL(nftnl_rule_get_str); - --uint32_t nftnl_rule_get_u32(const struct nftnl_rule *r, uint16_t attr) -+uint32_t __EXPORTED nftnl_rule_get_u32(const struct nftnl_rule *r, uint16_t attr) - { - uint32_t data_len; - const uint32_t *val = nftnl_rule_get_data(r, attr, &data_len); -@@ -270,9 +258,8 @@ uint32_t nftnl_rule_get_u32(const struct nftnl_rule *r, uint16_t attr) - - return val ? *val : 0; - } --EXPORT_SYMBOL(nftnl_rule_get_u32); - --uint64_t nftnl_rule_get_u64(const struct nftnl_rule *r, uint16_t attr) -+uint64_t __EXPORTED nftnl_rule_get_u64(const struct nftnl_rule *r, uint16_t attr) - { - uint32_t data_len; - const uint64_t *val = nftnl_rule_get_data(r, attr, &data_len); -@@ -281,9 +268,8 @@ uint64_t nftnl_rule_get_u64(const struct nftnl_rule *r, uint16_t attr) - - return val ? *val : 0; - } --EXPORT_SYMBOL(nftnl_rule_get_u64); - --uint8_t nftnl_rule_get_u8(const struct nftnl_rule *r, uint16_t attr) -+uint8_t __EXPORTED nftnl_rule_get_u8(const struct nftnl_rule *r, uint16_t attr) - { - uint32_t data_len; - const uint8_t *val = nftnl_rule_get_data(r, attr, &data_len); -@@ -292,9 +278,8 @@ uint8_t nftnl_rule_get_u8(const struct nftnl_rule *r, uint16_t attr) - - return val ? *val : 0; - } --EXPORT_SYMBOL(nftnl_rule_get_u8); - --void nftnl_rule_nlmsg_build_payload(struct nlmsghdr *nlh, struct nftnl_rule *r) -+void __EXPORTED nftnl_rule_nlmsg_build_payload(struct nlmsghdr *nlh, struct nftnl_rule *r) - { - struct nftnl_expr *expr; - struct nlattr *nest, *nest2; -@@ -335,13 +320,11 @@ void nftnl_rule_nlmsg_build_payload(struct nlmsghdr *nlh, struct nftnl_rule *r) - if (r->flags & (1 << NFTNL_RULE_ID)) - mnl_attr_put_u32(nlh, NFTA_RULE_ID, htonl(r->id)); - } --EXPORT_SYMBOL(nftnl_rule_nlmsg_build_payload); - --void nftnl_rule_add_expr(struct nftnl_rule *r, struct nftnl_expr *expr) -+void __EXPORTED nftnl_rule_add_expr(struct nftnl_rule *r, struct nftnl_expr *expr) - { - list_add_tail(&expr->head, &r->expr_list); - } --EXPORT_SYMBOL(nftnl_rule_add_expr); - - static int nftnl_rule_parse_attr_cb(const struct nlattr *attr, void *data) - { -@@ -441,7 +424,7 @@ static int nftnl_rule_parse_compat(struct nlattr *nest, struct nftnl_rule *r) - return 0; - } - --int nftnl_rule_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_rule *r) -+int __EXPORTED nftnl_rule_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_rule *r) - { - struct nlattr *tb[NFTA_RULE_MAX+1] = {}; - struct nfgenmsg *nfg = mnl_nlmsg_get_payload(nlh); -@@ -510,7 +493,6 @@ int nftnl_rule_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_rule *r) - - return 0; - } --EXPORT_SYMBOL(nftnl_rule_nlmsg_parse); - - #ifdef JSON_PARSING - int nftnl_jansson_parse_rule(struct nftnl_rule *r, json_t *tree, -@@ -658,19 +640,17 @@ static int nftnl_rule_do_parse(struct nftnl_rule *r, enum nftnl_parse_type type, - - return ret; - } --int nftnl_rule_parse(struct nftnl_rule *r, enum nftnl_parse_type type, -+int __EXPORTED nftnl_rule_parse(struct nftnl_rule *r, enum nftnl_parse_type type, - const char *data, struct nftnl_parse_err *err) - { - return nftnl_rule_do_parse(r, type, data, err, NFTNL_PARSE_BUFFER); - } --EXPORT_SYMBOL(nftnl_rule_parse); - --int nftnl_rule_parse_file(struct nftnl_rule *r, enum nftnl_parse_type type, -+int __EXPORTED nftnl_rule_parse_file(struct nftnl_rule *r, enum nftnl_parse_type type, - FILE *fp, struct nftnl_parse_err *err) - { - return nftnl_rule_do_parse(r, type, fp, err, NFTNL_PARSE_FILE); - } --EXPORT_SYMBOL(nftnl_rule_parse_file); - - static int nftnl_rule_export(char *buf, size_t size, - const struct nftnl_rule *r, -@@ -819,13 +799,12 @@ static int nftnl_rule_cmd_snprintf(char *buf, size_t size, - return offset; - } - --int nftnl_rule_snprintf(char *buf, size_t size, const struct nftnl_rule *r, -+int __EXPORTED nftnl_rule_snprintf(char *buf, size_t size, const struct nftnl_rule *r, - uint32_t type, uint32_t flags) - { - return nftnl_rule_cmd_snprintf(buf, size, r, nftnl_flag2cmd(flags), type, - flags); - } --EXPORT_SYMBOL(nftnl_rule_snprintf); - - static int nftnl_rule_do_snprintf(char *buf, size_t size, const void *r, - uint32_t cmd, uint32_t type, uint32_t flags) -@@ -833,15 +812,14 @@ static int nftnl_rule_do_snprintf(char *buf, size_t size, const void *r, - return nftnl_rule_snprintf(buf, size, r, type, flags); - } - --int nftnl_rule_fprintf(FILE *fp, const struct nftnl_rule *r, uint32_t type, -+int __EXPORTED nftnl_rule_fprintf(FILE *fp, const struct nftnl_rule *r, uint32_t type, - uint32_t flags) - { - return nftnl_fprintf(fp, r, NFTNL_CMD_UNSPEC, type, flags, - nftnl_rule_do_snprintf); - } --EXPORT_SYMBOL(nftnl_rule_fprintf); - --int nftnl_expr_foreach(struct nftnl_rule *r, -+int __EXPORTED nftnl_expr_foreach(struct nftnl_rule *r, - int (*cb)(struct nftnl_expr *e, void *data), - void *data) - { -@@ -855,7 +833,6 @@ int nftnl_expr_foreach(struct nftnl_rule *r, - } - return 0; - } --EXPORT_SYMBOL(nftnl_expr_foreach); - - struct nftnl_expr_iter { - const struct nftnl_rule *r; -@@ -873,7 +850,7 @@ static void nftnl_expr_iter_init(const struct nftnl_rule *r, - head); - } - --struct nftnl_expr_iter *nftnl_expr_iter_create(const struct nftnl_rule *r) -+struct nftnl_expr_iter __EXPORTED *nftnl_expr_iter_create(const struct nftnl_rule *r) - { - struct nftnl_expr_iter *iter; - -@@ -885,9 +862,8 @@ struct nftnl_expr_iter *nftnl_expr_iter_create(const struct nftnl_rule *r) - - return iter; - } --EXPORT_SYMBOL(nftnl_expr_iter_create); - --struct nftnl_expr *nftnl_expr_iter_next(struct nftnl_expr_iter *iter) -+struct nftnl_expr __EXPORTED *nftnl_expr_iter_next(struct nftnl_expr_iter *iter) - { - struct nftnl_expr *expr = iter->cur; - -@@ -901,15 +877,13 @@ struct nftnl_expr *nftnl_expr_iter_next(struct nftnl_expr_iter *iter) - - return expr; - } --EXPORT_SYMBOL(nftnl_expr_iter_next); - --void nftnl_expr_iter_destroy(struct nftnl_expr_iter *iter) -+void __EXPORTED nftnl_expr_iter_destroy(struct nftnl_expr_iter *iter) - { - xfree(iter); - } --EXPORT_SYMBOL(nftnl_expr_iter_destroy); - --bool nftnl_rule_cmp(const struct nftnl_rule *r1, const struct nftnl_rule *r2) -+bool __EXPORTED nftnl_rule_cmp(const struct nftnl_rule *r1, const struct nftnl_rule *r2) - { - struct nftnl_expr_iter it1, it2; - struct nftnl_expr *e1, *e2; -@@ -938,13 +912,12 @@ bool nftnl_rule_cmp(const struct nftnl_rule *r1, const struct nftnl_rule *r2) - - return eq; - } --EXPORT_SYMBOL(nftnl_rule_cmp); - - struct nftnl_rule_list { - struct list_head list; - }; - --struct nftnl_rule_list *nftnl_rule_list_alloc(void) -+struct nftnl_rule_list __EXPORTED *nftnl_rule_list_alloc(void) - { - struct nftnl_rule_list *list; - -@@ -956,9 +929,8 @@ struct nftnl_rule_list *nftnl_rule_list_alloc(void) - - return list; - } --EXPORT_SYMBOL(nftnl_rule_list_alloc); - --void nftnl_rule_list_free(struct nftnl_rule_list *list) -+void __EXPORTED nftnl_rule_list_free(struct nftnl_rule_list *list) - { - struct nftnl_rule *r, *tmp; - -@@ -968,33 +940,28 @@ void nftnl_rule_list_free(struct nftnl_rule_list *list) - } - xfree(list); - } --EXPORT_SYMBOL(nftnl_rule_list_free); - --int nftnl_rule_list_is_empty(const struct nftnl_rule_list *list) -+int __EXPORTED nftnl_rule_list_is_empty(const struct nftnl_rule_list *list) - { - return list_empty(&list->list); - } --EXPORT_SYMBOL(nftnl_rule_list_is_empty); - --void nftnl_rule_list_add(struct nftnl_rule *r, struct nftnl_rule_list *list) -+void __EXPORTED nftnl_rule_list_add(struct nftnl_rule *r, struct nftnl_rule_list *list) - { - list_add(&r->head, &list->list); - } --EXPORT_SYMBOL(nftnl_rule_list_add); - --void nftnl_rule_list_add_tail(struct nftnl_rule *r, struct nftnl_rule_list *list) -+void __EXPORTED nftnl_rule_list_add_tail(struct nftnl_rule *r, struct nftnl_rule_list *list) - { - list_add_tail(&r->head, &list->list); - } --EXPORT_SYMBOL(nftnl_rule_list_add_tail); - --void nftnl_rule_list_del(struct nftnl_rule *r) -+void __EXPORTED nftnl_rule_list_del(struct nftnl_rule *r) - { - list_del(&r->head); - } --EXPORT_SYMBOL(nftnl_rule_list_del); - --int nftnl_rule_list_foreach(struct nftnl_rule_list *rule_list, -+int __EXPORTED nftnl_rule_list_foreach(struct nftnl_rule_list *rule_list, - int (*cb)(struct nftnl_rule *r, void *data), - void *data) - { -@@ -1008,14 +975,13 @@ int nftnl_rule_list_foreach(struct nftnl_rule_list *rule_list, - } - return 0; - } --EXPORT_SYMBOL(nftnl_rule_list_foreach); - - struct nftnl_rule_list_iter { - const struct nftnl_rule_list *list; - struct nftnl_rule *cur; - }; - --struct nftnl_rule_list_iter * -+struct nftnl_rule_list_iter __EXPORTED * - nftnl_rule_list_iter_create(const struct nftnl_rule_list *l) - { - struct nftnl_rule_list_iter *iter; -@@ -1032,15 +998,13 @@ nftnl_rule_list_iter_create(const struct nftnl_rule_list *l) - - return iter; - } --EXPORT_SYMBOL(nftnl_rule_list_iter_create); - --struct nftnl_rule *nftnl_rule_list_iter_cur(struct nftnl_rule_list_iter *iter) -+struct nftnl_rule __EXPORTED *nftnl_rule_list_iter_cur(struct nftnl_rule_list_iter *iter) - { - return iter->cur; - } --EXPORT_SYMBOL(nftnl_rule_list_iter_cur); - --struct nftnl_rule *nftnl_rule_list_iter_next(struct nftnl_rule_list_iter *iter) -+struct nftnl_rule __EXPORTED *nftnl_rule_list_iter_next(struct nftnl_rule_list_iter *iter) - { - struct nftnl_rule *r = iter->cur; - -@@ -1054,10 +1018,8 @@ struct nftnl_rule *nftnl_rule_list_iter_next(struct nftnl_rule_list_iter *iter) - - return r; - } --EXPORT_SYMBOL(nftnl_rule_list_iter_next); - --void nftnl_rule_list_iter_destroy(const struct nftnl_rule_list_iter *iter) -+void __EXPORTED nftnl_rule_list_iter_destroy(const struct nftnl_rule_list_iter *iter) - { - xfree(iter); - } --EXPORT_SYMBOL(nftnl_rule_list_iter_destroy); -diff --git a/src/ruleset.c b/src/ruleset.c -index 6ef2956..10d48f6 100644 ---- a/src/ruleset.c -+++ b/src/ruleset.c -@@ -55,13 +55,12 @@ struct nftnl_parse_ctx { - uint16_t flags; - }; - --struct nftnl_ruleset *nftnl_ruleset_alloc(void) -+struct nftnl_ruleset __EXPORTED *nftnl_ruleset_alloc(void) - { - return calloc(1, sizeof(struct nftnl_ruleset)); - } --EXPORT_SYMBOL(nftnl_ruleset_alloc); - --void nftnl_ruleset_free(const struct nftnl_ruleset *r) -+void __EXPORTED nftnl_ruleset_free(const struct nftnl_ruleset *r) - { - if (r->flags & (1 << NFTNL_RULESET_TABLELIST)) - nftnl_table_list_free(r->table_list); -@@ -73,15 +72,13 @@ void nftnl_ruleset_free(const struct nftnl_ruleset *r) - nftnl_rule_list_free(r->rule_list); - xfree(r); - } --EXPORT_SYMBOL(nftnl_ruleset_free); - --bool nftnl_ruleset_is_set(const struct nftnl_ruleset *r, uint16_t attr) -+bool __EXPORTED nftnl_ruleset_is_set(const struct nftnl_ruleset *r, uint16_t attr) - { - return r->flags & (1 << attr); - } --EXPORT_SYMBOL(nftnl_ruleset_is_set); - --void nftnl_ruleset_unset(struct nftnl_ruleset *r, uint16_t attr) -+void __EXPORTED nftnl_ruleset_unset(struct nftnl_ruleset *r, uint16_t attr) - { - if (!(r->flags & (1 << attr))) - return; -@@ -102,9 +99,8 @@ void nftnl_ruleset_unset(struct nftnl_ruleset *r, uint16_t attr) - } - r->flags &= ~(1 << attr); - } --EXPORT_SYMBOL(nftnl_ruleset_unset); - --void nftnl_ruleset_set(struct nftnl_ruleset *r, uint16_t attr, void *data) -+void __EXPORTED nftnl_ruleset_set(struct nftnl_ruleset *r, uint16_t attr, void *data) - { - switch (attr) { - case NFTNL_RULESET_TABLELIST: -@@ -128,9 +124,8 @@ void nftnl_ruleset_set(struct nftnl_ruleset *r, uint16_t attr, void *data) - } - r->flags |= (1 << attr); - } --EXPORT_SYMBOL(nftnl_ruleset_set); - --void *nftnl_ruleset_get(const struct nftnl_ruleset *r, uint16_t attr) -+void __EXPORTED *nftnl_ruleset_get(const struct nftnl_ruleset *r, uint16_t attr) - { - if (!(r->flags & (1 << attr))) - return NULL; -@@ -148,9 +143,8 @@ void *nftnl_ruleset_get(const struct nftnl_ruleset *r, uint16_t attr) - return NULL; - } - } --EXPORT_SYMBOL(nftnl_ruleset_get); - --void nftnl_ruleset_ctx_free(const struct nftnl_parse_ctx *ctx) -+void __EXPORTED nftnl_ruleset_ctx_free(const struct nftnl_parse_ctx *ctx) - { - switch (ctx->type) { - case NFTNL_RULESET_TABLE: -@@ -171,15 +165,13 @@ void nftnl_ruleset_ctx_free(const struct nftnl_parse_ctx *ctx) - break; - } - } --EXPORT_SYMBOL(nftnl_ruleset_ctx_free); - --bool nftnl_ruleset_ctx_is_set(const struct nftnl_parse_ctx *ctx, uint16_t attr) -+bool __EXPORTED nftnl_ruleset_ctx_is_set(const struct nftnl_parse_ctx *ctx, uint16_t attr) - { - return ctx->flags & (1 << attr); - } --EXPORT_SYMBOL(nftnl_ruleset_ctx_is_set); - --void *nftnl_ruleset_ctx_get(const struct nftnl_parse_ctx *ctx, uint16_t attr) -+void __EXPORTED *nftnl_ruleset_ctx_get(const struct nftnl_parse_ctx *ctx, uint16_t attr) - { - if (!(ctx->flags & (1 << attr))) - return NULL; -@@ -203,14 +195,12 @@ void *nftnl_ruleset_ctx_get(const struct nftnl_parse_ctx *ctx, uint16_t attr) - return NULL; - } - } --EXPORT_SYMBOL(nftnl_ruleset_ctx_get); - --uint32_t nftnl_ruleset_ctx_get_u32(const struct nftnl_parse_ctx *ctx, uint16_t attr) -+uint32_t __EXPORTED nftnl_ruleset_ctx_get_u32(const struct nftnl_parse_ctx *ctx, uint16_t attr) - { - const void *ret = nftnl_ruleset_ctx_get(ctx, attr); - return ret == NULL ? 0 : *((uint32_t *)ret); - } --EXPORT_SYMBOL(nftnl_ruleset_ctx_get_u32); - - #if defined(JSON_PARSING) - static void nftnl_ruleset_ctx_set(struct nftnl_parse_ctx *ctx, uint16_t attr, -@@ -593,22 +583,20 @@ nftnl_ruleset_do_parse(enum nftnl_parse_type type, const void *data, - return ret; - } - --int nftnl_ruleset_parse_file_cb(enum nftnl_parse_type type, FILE *fp, -+int __EXPORTED nftnl_ruleset_parse_file_cb(enum nftnl_parse_type type, FILE *fp, - struct nftnl_parse_err *err, void *data, - int (*cb)(const struct nftnl_parse_ctx *ctx)) - { - return nftnl_ruleset_do_parse(type, fp, err, NFTNL_PARSE_FILE, data, cb); - } --EXPORT_SYMBOL(nftnl_ruleset_parse_file_cb); - --int nftnl_ruleset_parse_buffer_cb(enum nftnl_parse_type type, const char *buffer, -+int __EXPORTED nftnl_ruleset_parse_buffer_cb(enum nftnl_parse_type type, const char *buffer, - struct nftnl_parse_err *err, void *data, - int (*cb)(const struct nftnl_parse_ctx *ctx)) - { - return nftnl_ruleset_do_parse(type, buffer, err, NFTNL_PARSE_BUFFER, data, - cb); - } --EXPORT_SYMBOL(nftnl_ruleset_parse_buffer_cb); - - static int nftnl_ruleset_cb(const struct nftnl_parse_ctx *ctx) - { -@@ -671,19 +659,17 @@ static int nftnl_ruleset_cb(const struct nftnl_parse_ctx *ctx) - return 0; - } - --int nftnl_ruleset_parse(struct nftnl_ruleset *r, enum nftnl_parse_type type, -+int __EXPORTED nftnl_ruleset_parse(struct nftnl_ruleset *r, enum nftnl_parse_type type, - const char *data, struct nftnl_parse_err *err) - { - return nftnl_ruleset_parse_buffer_cb(type, data, err, r, nftnl_ruleset_cb); - } --EXPORT_SYMBOL(nftnl_ruleset_parse); - --int nftnl_ruleset_parse_file(struct nftnl_ruleset *rs, enum nftnl_parse_type type, -+int __EXPORTED nftnl_ruleset_parse_file(struct nftnl_ruleset *rs, enum nftnl_parse_type type, - FILE *fp, struct nftnl_parse_err *err) - { - return nftnl_ruleset_parse_file_cb(type, fp, err, rs, nftnl_ruleset_cb); - } --EXPORT_SYMBOL(nftnl_ruleset_parse_file); - - static const char *nftnl_ruleset_o_opentag(uint32_t type) - { -@@ -928,7 +914,7 @@ static int nftnl_ruleset_cmd_snprintf(char *buf, size_t size, - } - } - --int nftnl_ruleset_snprintf(char *buf, size_t size, const struct nftnl_ruleset *r, -+int __EXPORTED nftnl_ruleset_snprintf(char *buf, size_t size, const struct nftnl_ruleset *r, - uint32_t type, uint32_t flags) - { - switch (type) { -@@ -943,7 +929,6 @@ int nftnl_ruleset_snprintf(char *buf, size_t size, const struct nftnl_ruleset *r - return -1; - } - } --EXPORT_SYMBOL(nftnl_ruleset_snprintf); - - static int nftnl_ruleset_fprintf_tables(FILE *fp, const struct nftnl_ruleset *rs, - uint32_t type, uint32_t flags) -@@ -1157,10 +1142,9 @@ static int nftnl_ruleset_cmd_fprintf(FILE *fp, const struct nftnl_ruleset *rs, - return len; - } - --int nftnl_ruleset_fprintf(FILE *fp, const struct nftnl_ruleset *rs, uint32_t type, -+int __EXPORTED nftnl_ruleset_fprintf(FILE *fp, const struct nftnl_ruleset *rs, uint32_t type, - uint32_t flags) - { - return nftnl_ruleset_cmd_fprintf(fp, rs, nftnl_flag2cmd(flags), type, - flags); - } --EXPORT_SYMBOL(nftnl_ruleset_fprintf); -diff --git a/src/set.c b/src/set.c -index cce5e63..33a6794 100644 ---- a/src/set.c -+++ b/src/set.c -@@ -27,7 +27,7 @@ - #include <libnftnl/set.h> - #include <libnftnl/expr.h> - --struct nftnl_set *nftnl_set_alloc(void) -+struct nftnl_set __EXPORTED *nftnl_set_alloc(void) - { - struct nftnl_set *s; - -@@ -38,9 +38,8 @@ struct nftnl_set *nftnl_set_alloc(void) - INIT_LIST_HEAD(&s->element_list); - return s; - } --EXPORT_SYMBOL(nftnl_set_alloc); - --void nftnl_set_free(const struct nftnl_set *s) -+void __EXPORTED nftnl_set_free(const struct nftnl_set *s) - { - struct nftnl_set_elem *elem, *tmp; - -@@ -55,15 +54,13 @@ void nftnl_set_free(const struct nftnl_set *s) - } - xfree(s); - } --EXPORT_SYMBOL(nftnl_set_free); - --bool nftnl_set_is_set(const struct nftnl_set *s, uint16_t attr) -+bool __EXPORTED nftnl_set_is_set(const struct nftnl_set *s, uint16_t attr) - { - return s->flags & (1 << attr); - } --EXPORT_SYMBOL(nftnl_set_is_set); - --void nftnl_set_unset(struct nftnl_set *s, uint16_t attr) -+void __EXPORTED nftnl_set_unset(struct nftnl_set *s, uint16_t attr) - { - if (!(s->flags & (1 << attr))) - return; -@@ -97,7 +94,6 @@ void nftnl_set_unset(struct nftnl_set *s, uint16_t attr) - - s->flags &= ~(1 << attr); - } --EXPORT_SYMBOL(nftnl_set_unset); - - static uint32_t nftnl_set_validate[NFTNL_SET_MAX + 1] = { - [NFTNL_SET_FLAGS] = sizeof(uint32_t), -@@ -113,7 +109,7 @@ static uint32_t nftnl_set_validate[NFTNL_SET_MAX + 1] = { - [NFTNL_SET_GC_INTERVAL] = sizeof(uint32_t), - }; - --int nftnl_set_set_data(struct nftnl_set *s, uint16_t attr, const void *data, -+int __EXPORTED nftnl_set_set_data(struct nftnl_set *s, uint16_t attr, const void *data, - uint32_t data_len) - { - nftnl_assert_attr_exists(attr, NFTNL_SET_MAX); -@@ -186,33 +182,28 @@ int nftnl_set_set_data(struct nftnl_set *s, uint16_t attr, const void *data, - s->flags |= (1 << attr); - return 0; - } --EXPORT_SYMBOL(nftnl_set_set_data); - --int nftnl_set_set(struct nftnl_set *s, uint16_t attr, const void *data) -+int __EXPORTED nftnl_set_set(struct nftnl_set *s, uint16_t attr, const void *data) - { - return nftnl_set_set_data(s, attr, data, nftnl_set_validate[attr]); - } --EXPORT_SYMBOL(nftnl_set_set); - --void nftnl_set_set_u32(struct nftnl_set *s, uint16_t attr, uint32_t val) -+void __EXPORTED nftnl_set_set_u32(struct nftnl_set *s, uint16_t attr, uint32_t val) - { - nftnl_set_set(s, attr, &val); - } --EXPORT_SYMBOL(nftnl_set_set_u32); - --void nftnl_set_set_u64(struct nftnl_set *s, uint16_t attr, uint64_t val) -+void __EXPORTED nftnl_set_set_u64(struct nftnl_set *s, uint16_t attr, uint64_t val) - { - nftnl_set_set(s, attr, &val); - } --EXPORT_SYMBOL(nftnl_set_set_u64); - --int nftnl_set_set_str(struct nftnl_set *s, uint16_t attr, const char *str) -+int __EXPORTED nftnl_set_set_str(struct nftnl_set *s, uint16_t attr, const char *str) - { - return nftnl_set_set_data(s, attr, str, strlen(str) + 1); - } --EXPORT_SYMBOL(nftnl_set_set_str); - --const void *nftnl_set_get_data(const struct nftnl_set *s, uint16_t attr, -+const void __EXPORTED *nftnl_set_get_data(const struct nftnl_set *s, uint16_t attr, - uint32_t *data_len) - { - if (!(s->flags & (1 << attr))) -@@ -267,22 +258,19 @@ const void *nftnl_set_get_data(const struct nftnl_set *s, uint16_t attr, - } - return NULL; - } --EXPORT_SYMBOL(nftnl_set_get_data); - --const void *nftnl_set_get(const struct nftnl_set *s, uint16_t attr) -+const void __EXPORTED *nftnl_set_get(const struct nftnl_set *s, uint16_t attr) - { - uint32_t data_len; - return nftnl_set_get_data(s, attr, &data_len); - } --EXPORT_SYMBOL(nftnl_set_get); - --const char *nftnl_set_get_str(const struct nftnl_set *s, uint16_t attr) -+const char __EXPORTED *nftnl_set_get_str(const struct nftnl_set *s, uint16_t attr) - { - return nftnl_set_get(s, attr); - } --EXPORT_SYMBOL(nftnl_set_get_str); - --uint32_t nftnl_set_get_u32(const struct nftnl_set *s, uint16_t attr) -+uint32_t __EXPORTED nftnl_set_get_u32(const struct nftnl_set *s, uint16_t attr) - { - uint32_t data_len; - const uint32_t *val = nftnl_set_get_data(s, attr, &data_len); -@@ -291,9 +279,8 @@ uint32_t nftnl_set_get_u32(const struct nftnl_set *s, uint16_t attr) - - return val ? *val : 0; - } --EXPORT_SYMBOL(nftnl_set_get_u32); - --uint64_t nftnl_set_get_u64(const struct nftnl_set *s, uint16_t attr) -+uint64_t __EXPORTED nftnl_set_get_u64(const struct nftnl_set *s, uint16_t attr) - { - uint32_t data_len; - const uint64_t *val = nftnl_set_get_data(s, attr, &data_len); -@@ -302,7 +289,6 @@ uint64_t nftnl_set_get_u64(const struct nftnl_set *s, uint16_t attr) - - return val ? *val : 0; - } --EXPORT_SYMBOL(nftnl_set_get_u64); - - struct nftnl_set *nftnl_set_clone(const struct nftnl_set *set) - { -@@ -351,7 +337,7 @@ nftnl_set_nlmsg_build_desc_payload(struct nlmsghdr *nlh, struct nftnl_set *s) - mnl_attr_nest_end(nlh, nest); - } - --void nftnl_set_nlmsg_build_payload(struct nlmsghdr *nlh, struct nftnl_set *s) -+void __EXPORTED nftnl_set_nlmsg_build_payload(struct nlmsghdr *nlh, struct nftnl_set *s) - { - if (s->flags & (1 << NFTNL_SET_TABLE)) - mnl_attr_put_strz(nlh, NFTA_SET_TABLE, s->table); -@@ -383,7 +369,6 @@ void nftnl_set_nlmsg_build_payload(struct nlmsghdr *nlh, struct nftnl_set *s) - if (s->flags & (1 << NFTNL_SET_USERDATA)) - mnl_attr_put(nlh, NFTA_SET_USERDATA, s->user.len, s->user.data); - } --EXPORT_SYMBOL(nftnl_set_nlmsg_build_payload); - - static int nftnl_set_parse_attr_cb(const struct nlattr *attr, void *data) - { -@@ -463,7 +448,7 @@ static int nftnl_set_desc_parse(struct nftnl_set *s, - return 0; - } - --int nftnl_set_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_set *s) -+int __EXPORTED nftnl_set_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_set *s) - { - struct nlattr *tb[NFTA_SET_MAX+1] = {}; - struct nfgenmsg *nfg = mnl_nlmsg_get_payload(nlh); -@@ -546,7 +531,6 @@ int nftnl_set_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_set *s) - - return 0; - } --EXPORT_SYMBOL(nftnl_set_nlmsg_parse); - - #ifdef JSON_PARSING - static int nftnl_jansson_parse_set_info(struct nftnl_set *s, json_t *tree, -@@ -718,19 +702,17 @@ static int nftnl_set_do_parse(struct nftnl_set *s, enum nftnl_parse_type type, - - return ret; - } --int nftnl_set_parse(struct nftnl_set *s, enum nftnl_parse_type type, -+int __EXPORTED nftnl_set_parse(struct nftnl_set *s, enum nftnl_parse_type type, - const char *data, struct nftnl_parse_err *err) - { - return nftnl_set_do_parse(s, type, data, err, NFTNL_PARSE_BUFFER); - } --EXPORT_SYMBOL(nftnl_set_parse); - --int nftnl_set_parse_file(struct nftnl_set *s, enum nftnl_parse_type type, -+int __EXPORTED nftnl_set_parse_file(struct nftnl_set *s, enum nftnl_parse_type type, - FILE *fp, struct nftnl_parse_err *err) - { - return nftnl_set_do_parse(s, type, fp, err, NFTNL_PARSE_FILE); - } --EXPORT_SYMBOL(nftnl_set_parse_file); - - static int nftnl_set_snprintf_json(char *buf, size_t size, - const struct nftnl_set *s, -@@ -918,13 +900,12 @@ static int nftnl_set_cmd_snprintf(char *buf, size_t size, - return offset; - } - --int nftnl_set_snprintf(char *buf, size_t size, const struct nftnl_set *s, -+int __EXPORTED nftnl_set_snprintf(char *buf, size_t size, const struct nftnl_set *s, - uint32_t type, uint32_t flags) - { - return nftnl_set_cmd_snprintf(buf, size, s, nftnl_flag2cmd(flags), type, - flags); - } --EXPORT_SYMBOL(nftnl_set_snprintf); - - static int nftnl_set_do_snprintf(char *buf, size_t size, const void *s, - uint32_t cmd, uint32_t type, uint32_t flags) -@@ -932,25 +913,23 @@ static int nftnl_set_do_snprintf(char *buf, size_t size, const void *s, - return nftnl_set_snprintf(buf, size, s, type, flags); - } - --int nftnl_set_fprintf(FILE *fp, const struct nftnl_set *s, uint32_t type, -+int __EXPORTED nftnl_set_fprintf(FILE *fp, const struct nftnl_set *s, uint32_t type, - uint32_t flags) - { - return nftnl_fprintf(fp, s, NFTNL_CMD_UNSPEC, type, flags, - nftnl_set_do_snprintf); - } --EXPORT_SYMBOL(nftnl_set_fprintf); - --void nftnl_set_elem_add(struct nftnl_set *s, struct nftnl_set_elem *elem) -+void __EXPORTED nftnl_set_elem_add(struct nftnl_set *s, struct nftnl_set_elem *elem) - { - list_add_tail(&elem->head, &s->element_list); - } --EXPORT_SYMBOL(nftnl_set_elem_add); - - struct nftnl_set_list { - struct list_head list; - }; - --struct nftnl_set_list *nftnl_set_list_alloc(void) -+struct nftnl_set_list __EXPORTED *nftnl_set_list_alloc(void) - { - struct nftnl_set_list *list; - -@@ -962,9 +941,8 @@ struct nftnl_set_list *nftnl_set_list_alloc(void) - - return list; - } --EXPORT_SYMBOL(nftnl_set_list_alloc); - --void nftnl_set_list_free(struct nftnl_set_list *list) -+void __EXPORTED nftnl_set_list_free(struct nftnl_set_list *list) - { - struct nftnl_set *s, *tmp; - -@@ -974,33 +952,28 @@ void nftnl_set_list_free(struct nftnl_set_list *list) - } - xfree(list); - } --EXPORT_SYMBOL(nftnl_set_list_free); - --int nftnl_set_list_is_empty(const struct nftnl_set_list *list) -+int __EXPORTED nftnl_set_list_is_empty(const struct nftnl_set_list *list) - { - return list_empty(&list->list); - } --EXPORT_SYMBOL(nftnl_set_list_is_empty); - --void nftnl_set_list_add(struct nftnl_set *s, struct nftnl_set_list *list) -+void __EXPORTED nftnl_set_list_add(struct nftnl_set *s, struct nftnl_set_list *list) - { - list_add(&s->head, &list->list); - } --EXPORT_SYMBOL(nftnl_set_list_add); - --void nftnl_set_list_add_tail(struct nftnl_set *s, struct nftnl_set_list *list) -+void __EXPORTED nftnl_set_list_add_tail(struct nftnl_set *s, struct nftnl_set_list *list) - { - list_add_tail(&s->head, &list->list); - } --EXPORT_SYMBOL(nftnl_set_list_add_tail); - --void nftnl_set_list_del(struct nftnl_set *s) -+void __EXPORTED nftnl_set_list_del(struct nftnl_set *s) - { - list_del(&s->head); - } --EXPORT_SYMBOL(nftnl_set_list_del); - --int nftnl_set_list_foreach(struct nftnl_set_list *set_list, -+int __EXPORTED nftnl_set_list_foreach(struct nftnl_set_list *set_list, - int (*cb)(struct nftnl_set *t, void *data), void *data) - { - struct nftnl_set *cur, *tmp; -@@ -1013,14 +986,13 @@ int nftnl_set_list_foreach(struct nftnl_set_list *set_list, - } - return 0; - } --EXPORT_SYMBOL(nftnl_set_list_foreach); - - struct nftnl_set_list_iter { - const struct nftnl_set_list *list; - struct nftnl_set *cur; - }; - --struct nftnl_set_list_iter * -+struct nftnl_set_list_iter __EXPORTED * - nftnl_set_list_iter_create(const struct nftnl_set_list *l) - { - struct nftnl_set_list_iter *iter; -@@ -1037,16 +1009,14 @@ nftnl_set_list_iter_create(const struct nftnl_set_list *l) - - return iter; - } --EXPORT_SYMBOL(nftnl_set_list_iter_create); - --struct nftnl_set * -+struct nftnl_set __EXPORTED * - nftnl_set_list_iter_cur(const struct nftnl_set_list_iter *iter) - { - return iter->cur; - } --EXPORT_SYMBOL(nftnl_set_list_iter_cur); - --struct nftnl_set *nftnl_set_list_iter_next(struct nftnl_set_list_iter *iter) -+struct nftnl_set __EXPORTED *nftnl_set_list_iter_next(struct nftnl_set_list_iter *iter) - { - struct nftnl_set *s = iter->cur; - -@@ -1060,13 +1030,11 @@ struct nftnl_set *nftnl_set_list_iter_next(struct nftnl_set_list_iter *iter) - - return s; - } --EXPORT_SYMBOL(nftnl_set_list_iter_next); - --void nftnl_set_list_iter_destroy(const struct nftnl_set_list_iter *iter) -+void __EXPORTED nftnl_set_list_iter_destroy(const struct nftnl_set_list_iter *iter) - { - xfree(iter); - } --EXPORT_SYMBOL(nftnl_set_list_iter_destroy); - - static struct nftnl_set *nftnl_set_lookup(const char *this_set_name, - struct nftnl_set_list *set_list) -diff --git a/src/set_elem.c b/src/set_elem.c -index 433b896..bd1e895 100644 ---- a/src/set_elem.c -+++ b/src/set_elem.c -@@ -27,7 +27,7 @@ - #include <libnftnl/rule.h> - #include <libnftnl/expr.h> - --struct nftnl_set_elem *nftnl_set_elem_alloc(void) -+struct nftnl_set_elem __EXPORTED *nftnl_set_elem_alloc(void) - { - struct nftnl_set_elem *s; - -@@ -37,9 +37,8 @@ struct nftnl_set_elem *nftnl_set_elem_alloc(void) - - return s; - } --EXPORT_SYMBOL(nftnl_set_elem_alloc); - --void nftnl_set_elem_free(struct nftnl_set_elem *s) -+void __EXPORTED nftnl_set_elem_free(struct nftnl_set_elem *s) - { - if (s->flags & (1 << NFTNL_SET_ELEM_CHAIN)) - xfree(s->data.chain); -@@ -55,15 +54,13 @@ void nftnl_set_elem_free(struct nftnl_set_elem *s) - - xfree(s); - } --EXPORT_SYMBOL(nftnl_set_elem_free); - --bool nftnl_set_elem_is_set(const struct nftnl_set_elem *s, uint16_t attr) -+bool __EXPORTED nftnl_set_elem_is_set(const struct nftnl_set_elem *s, uint16_t attr) - { - return s->flags & (1 << attr); - } --EXPORT_SYMBOL(nftnl_set_elem_is_set); - --void nftnl_set_elem_unset(struct nftnl_set_elem *s, uint16_t attr) -+void __EXPORTED nftnl_set_elem_unset(struct nftnl_set_elem *s, uint16_t attr) - { - if (!(s->flags & (1 << attr))) - return; -@@ -94,9 +91,8 @@ void nftnl_set_elem_unset(struct nftnl_set_elem *s, uint16_t attr) - - s->flags &= ~(1 << attr); - } --EXPORT_SYMBOL(nftnl_set_elem_unset); - --int nftnl_set_elem_set(struct nftnl_set_elem *s, uint16_t attr, -+int __EXPORTED nftnl_set_elem_set(struct nftnl_set_elem *s, uint16_t attr, - const void *data, uint32_t data_len) - { - switch(attr) { -@@ -147,27 +143,23 @@ int nftnl_set_elem_set(struct nftnl_set_elem *s, uint16_t attr, - s->flags |= (1 << attr); - return -1; - } --EXPORT_SYMBOL(nftnl_set_elem_set); - --void nftnl_set_elem_set_u32(struct nftnl_set_elem *s, uint16_t attr, uint32_t val) -+void __EXPORTED nftnl_set_elem_set_u32(struct nftnl_set_elem *s, uint16_t attr, uint32_t val) - { - nftnl_set_elem_set(s, attr, &val, sizeof(uint32_t)); - } --EXPORT_SYMBOL(nftnl_set_elem_set_u32); - --void nftnl_set_elem_set_u64(struct nftnl_set_elem *s, uint16_t attr, uint64_t val) -+void __EXPORTED nftnl_set_elem_set_u64(struct nftnl_set_elem *s, uint16_t attr, uint64_t val) - { - nftnl_set_elem_set(s, attr, &val, sizeof(uint64_t)); - } --EXPORT_SYMBOL(nftnl_set_elem_set_u64); - --int nftnl_set_elem_set_str(struct nftnl_set_elem *s, uint16_t attr, const char *str) -+int __EXPORTED nftnl_set_elem_set_str(struct nftnl_set_elem *s, uint16_t attr, const char *str) - { - return nftnl_set_elem_set(s, attr, str, strlen(str) + 1); - } --EXPORT_SYMBOL(nftnl_set_elem_set_str); - --const void *nftnl_set_elem_get(struct nftnl_set_elem *s, uint16_t attr, uint32_t *data_len) -+const void __EXPORTED *nftnl_set_elem_get(struct nftnl_set_elem *s, uint16_t attr, uint32_t *data_len) - { - if (!(s->flags & (1 << attr))) - return NULL; -@@ -205,31 +197,27 @@ const void *nftnl_set_elem_get(struct nftnl_set_elem *s, uint16_t attr, uint32_t - } - return NULL; - } --EXPORT_SYMBOL(nftnl_set_elem_get); - --const char *nftnl_set_elem_get_str(struct nftnl_set_elem *s, uint16_t attr) -+const char __EXPORTED *nftnl_set_elem_get_str(struct nftnl_set_elem *s, uint16_t attr) - { - uint32_t size; - - return nftnl_set_elem_get(s, attr, &size); - } --EXPORT_SYMBOL(nftnl_set_elem_get_str); - --uint32_t nftnl_set_elem_get_u32(struct nftnl_set_elem *s, uint16_t attr) -+uint32_t __EXPORTED nftnl_set_elem_get_u32(struct nftnl_set_elem *s, uint16_t attr) - { - uint32_t size; - uint32_t val = *((uint32_t *)nftnl_set_elem_get(s, attr, &size)); - return val; - } --EXPORT_SYMBOL(nftnl_set_elem_get_u32); - --uint64_t nftnl_set_elem_get_u64(struct nftnl_set_elem *s, uint16_t attr) -+uint64_t __EXPORTED nftnl_set_elem_get_u64(struct nftnl_set_elem *s, uint16_t attr) - { - uint32_t size; - uint64_t val = *((uint64_t *)nftnl_set_elem_get(s, attr, &size)); - return val; - } --EXPORT_SYMBOL(nftnl_set_elem_get_u64); - - struct nftnl_set_elem *nftnl_set_elem_clone(struct nftnl_set_elem *elem) - { -@@ -315,7 +303,7 @@ static struct nlattr *nftnl_set_elem_build(struct nlmsghdr *nlh, - return nest2; - } - --void nftnl_set_elems_nlmsg_build_payload(struct nlmsghdr *nlh, struct nftnl_set *s) -+void __EXPORTED nftnl_set_elems_nlmsg_build_payload(struct nlmsghdr *nlh, struct nftnl_set *s) - { - struct nftnl_set_elem *elem; - struct nlattr *nest1; -@@ -332,7 +320,6 @@ void nftnl_set_elems_nlmsg_build_payload(struct nlmsghdr *nlh, struct nftnl_set - - mnl_attr_nest_end(nlh, nest1); - } --EXPORT_SYMBOL(nftnl_set_elems_nlmsg_build_payload); - - static int nftnl_set_elem_parse_attr_cb(const struct nlattr *attr, void *data) - { -@@ -503,7 +490,7 @@ static int nftnl_set_elems_parse(struct nftnl_set *s, const struct nlattr *nest) - return ret; - } - --int nftnl_set_elems_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_set *s) -+int __EXPORTED nftnl_set_elems_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_set *s) - { - struct nlattr *tb[NFTA_SET_ELEM_LIST_MAX+1] = {}; - struct nfgenmsg *nfg = mnl_nlmsg_get_payload(nlh); -@@ -546,7 +533,6 @@ int nftnl_set_elems_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_set *s) - - return 0; - } --EXPORT_SYMBOL(nftnl_set_elems_nlmsg_parse); - - static int nftnl_set_elem_json_parse(struct nftnl_set_elem *e, const void *json, - struct nftnl_parse_err *err, -@@ -587,19 +573,17 @@ nftnl_set_elem_do_parse(struct nftnl_set_elem *e, enum nftnl_parse_type type, - - return ret; - } --int nftnl_set_elem_parse(struct nftnl_set_elem *e, enum nftnl_parse_type type, -+int __EXPORTED nftnl_set_elem_parse(struct nftnl_set_elem *e, enum nftnl_parse_type type, - const char *data, struct nftnl_parse_err *err) - { - return nftnl_set_elem_do_parse(e, type, data, err, NFTNL_PARSE_BUFFER); - } --EXPORT_SYMBOL(nftnl_set_elem_parse); - --int nftnl_set_elem_parse_file(struct nftnl_set_elem *e, enum nftnl_parse_type type, -+int __EXPORTED nftnl_set_elem_parse_file(struct nftnl_set_elem *e, enum nftnl_parse_type type, - FILE *fp, struct nftnl_parse_err *err) - { - return nftnl_set_elem_do_parse(e, type, fp, err, NFTNL_PARSE_FILE); - } --EXPORT_SYMBOL(nftnl_set_elem_parse_file); - - static int nftnl_set_elem_snprintf_json(char *buf, size_t size, - const struct nftnl_set_elem *e, -@@ -719,14 +703,13 @@ static int nftnl_set_elem_cmd_snprintf(char *buf, size_t size, - return offset; - } - --int nftnl_set_elem_snprintf(char *buf, size_t size, -+int __EXPORTED nftnl_set_elem_snprintf(char *buf, size_t size, - const struct nftnl_set_elem *e, - uint32_t type, uint32_t flags) - { - return nftnl_set_elem_cmd_snprintf(buf, size, e, nftnl_flag2cmd(flags), - type, flags); - } --EXPORT_SYMBOL(nftnl_set_elem_snprintf); - - static int nftnl_set_elem_do_snprintf(char *buf, size_t size, const void *e, - uint32_t cmd, uint32_t type, -@@ -735,15 +718,14 @@ static int nftnl_set_elem_do_snprintf(char *buf, size_t size, const void *e, - return nftnl_set_elem_snprintf(buf, size, e, type, flags); - } - --int nftnl_set_elem_fprintf(FILE *fp, struct nftnl_set_elem *se, uint32_t type, -+int __EXPORTED nftnl_set_elem_fprintf(FILE *fp, struct nftnl_set_elem *se, uint32_t type, - uint32_t flags) - { - return nftnl_fprintf(fp, se, NFTNL_CMD_UNSPEC, type, flags, - nftnl_set_elem_do_snprintf); - } --EXPORT_SYMBOL(nftnl_set_elem_fprintf); - --int nftnl_set_elem_foreach(struct nftnl_set *s, -+int __EXPORTED nftnl_set_elem_foreach(struct nftnl_set *s, - int (*cb)(struct nftnl_set_elem *e, void *data), - void *data) - { -@@ -757,7 +739,6 @@ int nftnl_set_elem_foreach(struct nftnl_set *s, - } - return 0; - } --EXPORT_SYMBOL(nftnl_set_elem_foreach); - - struct nftnl_set_elems_iter { - const struct nftnl_set *set; -@@ -765,7 +746,7 @@ struct nftnl_set_elems_iter { - struct nftnl_set_elem *cur; - }; - --struct nftnl_set_elems_iter * -+struct nftnl_set_elems_iter __EXPORTED * - nftnl_set_elems_iter_create(const struct nftnl_set *s) - { - struct nftnl_set_elems_iter *iter; -@@ -784,16 +765,14 @@ nftnl_set_elems_iter_create(const struct nftnl_set *s) - - return iter; - } --EXPORT_SYMBOL(nftnl_set_elems_iter_create); - --struct nftnl_set_elem * -+struct nftnl_set_elem __EXPORTED * - nftnl_set_elems_iter_cur(const struct nftnl_set_elems_iter *iter) - { - return iter->cur; - } --EXPORT_SYMBOL(nftnl_set_elems_iter_cur); - --struct nftnl_set_elem *nftnl_set_elems_iter_next(struct nftnl_set_elems_iter *iter) -+struct nftnl_set_elem __EXPORTED *nftnl_set_elems_iter_next(struct nftnl_set_elems_iter *iter) - { - struct nftnl_set_elem *s = iter->cur; - -@@ -806,13 +785,11 @@ struct nftnl_set_elem *nftnl_set_elems_iter_next(struct nftnl_set_elems_iter *it - - return s; - } --EXPORT_SYMBOL(nftnl_set_elems_iter_next); - --void nftnl_set_elems_iter_destroy(struct nftnl_set_elems_iter *iter) -+void __EXPORTED nftnl_set_elems_iter_destroy(struct nftnl_set_elems_iter *iter) - { - xfree(iter); - } --EXPORT_SYMBOL(nftnl_set_elems_iter_destroy); - - static bool nftnl_attr_nest_overflow(struct nlmsghdr *nlh, - const struct nlattr *from, -@@ -831,7 +808,7 @@ static bool nftnl_attr_nest_overflow(struct nlmsghdr *nlh, - return false; - } - --int nftnl_set_elems_nlmsg_build_payload_iter(struct nlmsghdr *nlh, -+int __EXPORTED nftnl_set_elems_nlmsg_build_payload_iter(struct nlmsghdr *nlh, - struct nftnl_set_elems_iter *iter) - { - struct nftnl_set_elem *elem; -@@ -861,4 +838,3 @@ int nftnl_set_elems_nlmsg_build_payload_iter(struct nlmsghdr *nlh, - - return ret; - } --EXPORT_SYMBOL(nftnl_set_elems_nlmsg_build_payload_iter); -diff --git a/src/table.c b/src/table.c -index a7d5a8f..0e99f3c 100644 ---- a/src/table.c -+++ b/src/table.c -@@ -36,28 +36,25 @@ struct nftnl_table { - uint32_t flags; - }; - --struct nftnl_table *nftnl_table_alloc(void) -+struct nftnl_table __EXPORTED *nftnl_table_alloc(void) - { - return calloc(1, sizeof(struct nftnl_table)); - } --EXPORT_SYMBOL(nftnl_table_alloc); - --void nftnl_table_free(const struct nftnl_table *t) -+void __EXPORTED nftnl_table_free(const struct nftnl_table *t) - { - if (t->flags & (1 << NFTNL_TABLE_NAME)) - xfree(t->name); - - xfree(t); - } --EXPORT_SYMBOL(nftnl_table_free); - --bool nftnl_table_is_set(const struct nftnl_table *t, uint16_t attr) -+bool __EXPORTED nftnl_table_is_set(const struct nftnl_table *t, uint16_t attr) - { - return t->flags & (1 << attr); - } --EXPORT_SYMBOL(nftnl_table_is_set); - --void nftnl_table_unset(struct nftnl_table *t, uint16_t attr) -+void __EXPORTED nftnl_table_unset(struct nftnl_table *t, uint16_t attr) - { - if (!(t->flags & (1 << attr))) - return; -@@ -74,14 +71,13 @@ void nftnl_table_unset(struct nftnl_table *t, uint16_t attr) - } - t->flags &= ~(1 << attr); - } --EXPORT_SYMBOL(nftnl_table_unset); - - static uint32_t nftnl_table_validate[NFTNL_TABLE_MAX + 1] = { - [NFTNL_TABLE_FLAGS] = sizeof(uint32_t), - [NFTNL_TABLE_FAMILY] = sizeof(uint32_t), - }; - --int nftnl_table_set_data(struct nftnl_table *t, uint16_t attr, -+int __EXPORTED nftnl_table_set_data(struct nftnl_table *t, uint16_t attr, - const void *data, uint32_t data_len) - { - nftnl_assert_attr_exists(attr, NFTNL_TABLE_MAX); -@@ -109,33 +105,28 @@ int nftnl_table_set_data(struct nftnl_table *t, uint16_t attr, - t->flags |= (1 << attr); - return 0; - } --EXPORT_SYMBOL(nftnl_table_set_data); - --void nftnl_table_set(struct nftnl_table *t, uint16_t attr, const void *data) -+void __EXPORTED nftnl_table_set(struct nftnl_table *t, uint16_t attr, const void *data) - { - nftnl_table_set_data(t, attr, data, nftnl_table_validate[attr]); - } --EXPORT_SYMBOL(nftnl_table_set); - --void nftnl_table_set_u32(struct nftnl_table *t, uint16_t attr, uint32_t val) -+void __EXPORTED nftnl_table_set_u32(struct nftnl_table *t, uint16_t attr, uint32_t val) - { - nftnl_table_set_data(t, attr, &val, sizeof(uint32_t)); - } --EXPORT_SYMBOL(nftnl_table_set_u32); - --void nftnl_table_set_u8(struct nftnl_table *t, uint16_t attr, uint8_t val) -+void __EXPORTED nftnl_table_set_u8(struct nftnl_table *t, uint16_t attr, uint8_t val) - { - nftnl_table_set_data(t, attr, &val, sizeof(uint8_t)); - } --EXPORT_SYMBOL(nftnl_table_set_u8); - --int nftnl_table_set_str(struct nftnl_table *t, uint16_t attr, const char *str) -+int __EXPORTED nftnl_table_set_str(struct nftnl_table *t, uint16_t attr, const char *str) - { - return nftnl_table_set_data(t, attr, str, strlen(str) + 1); - } --EXPORT_SYMBOL(nftnl_table_set_str); - --const void *nftnl_table_get_data(const struct nftnl_table *t, uint16_t attr, -+const void __EXPORTED *nftnl_table_get_data(const struct nftnl_table *t, uint16_t attr, - uint32_t *data_len) - { - if (!(t->flags & (1 << attr))) -@@ -157,43 +148,37 @@ const void *nftnl_table_get_data(const struct nftnl_table *t, uint16_t attr, - } - return NULL; - } --EXPORT_SYMBOL(nftnl_table_get_data); - --const void *nftnl_table_get(const struct nftnl_table *t, uint16_t attr) -+const void __EXPORTED *nftnl_table_get(const struct nftnl_table *t, uint16_t attr) - { - uint32_t data_len; - return nftnl_table_get_data(t, attr, &data_len); - } --EXPORT_SYMBOL(nftnl_table_get); - --uint32_t nftnl_table_get_u32(const struct nftnl_table *t, uint16_t attr) -+uint32_t __EXPORTED nftnl_table_get_u32(const struct nftnl_table *t, uint16_t attr) - { - const void *ret = nftnl_table_get(t, attr); - return ret == NULL ? 0 : *((uint32_t *)ret); - } --EXPORT_SYMBOL(nftnl_table_get_u32); - --uint8_t nftnl_table_get_u8(const struct nftnl_table *t, uint16_t attr) -+uint8_t __EXPORTED nftnl_table_get_u8(const struct nftnl_table *t, uint16_t attr) - { - const void *ret = nftnl_table_get(t, attr); - return ret == NULL ? 0 : *((uint8_t *)ret); - } --EXPORT_SYMBOL(nftnl_table_get_u8); - --const char *nftnl_table_get_str(const struct nftnl_table *t, uint16_t attr) -+const char __EXPORTED *nftnl_table_get_str(const struct nftnl_table *t, uint16_t attr) - { - return nftnl_table_get(t, attr); - } --EXPORT_SYMBOL(nftnl_table_get_str); - --void nftnl_table_nlmsg_build_payload(struct nlmsghdr *nlh, const struct nftnl_table *t) -+void __EXPORTED nftnl_table_nlmsg_build_payload(struct nlmsghdr *nlh, const struct nftnl_table *t) - { - if (t->flags & (1 << NFTNL_TABLE_NAME)) - mnl_attr_put_strz(nlh, NFTA_TABLE_NAME, t->name); - if (t->flags & (1 << NFTNL_TABLE_FLAGS)) - mnl_attr_put_u32(nlh, NFTA_TABLE_FLAGS, htonl(t->table_flags)); - } --EXPORT_SYMBOL(nftnl_table_nlmsg_build_payload); - - static int nftnl_table_parse_attr_cb(const struct nlattr *attr, void *data) - { -@@ -219,7 +204,7 @@ static int nftnl_table_parse_attr_cb(const struct nlattr *attr, void *data) - return MNL_CB_OK; - } - --int nftnl_table_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_table *t) -+int __EXPORTED nftnl_table_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_table *t) - { - struct nlattr *tb[NFTA_TABLE_MAX+1] = {}; - struct nfgenmsg *nfg = mnl_nlmsg_get_payload(nlh); -@@ -249,7 +234,6 @@ int nftnl_table_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_table *t) - - return 0; - } --EXPORT_SYMBOL(nftnl_table_nlmsg_parse); - - #ifdef JSON_PARSING - int nftnl_jansson_parse_table(struct nftnl_table *t, json_t *tree, -@@ -330,19 +314,17 @@ static int nftnl_table_do_parse(struct nftnl_table *t, enum nftnl_parse_type typ - return ret; - } - --int nftnl_table_parse(struct nftnl_table *t, enum nftnl_parse_type type, -+int __EXPORTED nftnl_table_parse(struct nftnl_table *t, enum nftnl_parse_type type, - const char *data, struct nftnl_parse_err *err) - { - return nftnl_table_do_parse(t, type, data, err, NFTNL_PARSE_BUFFER); - } --EXPORT_SYMBOL(nftnl_table_parse); - --int nftnl_table_parse_file(struct nftnl_table *t, enum nftnl_parse_type type, -+int __EXPORTED nftnl_table_parse_file(struct nftnl_table *t, enum nftnl_parse_type type, - FILE *fp, struct nftnl_parse_err *err) - { - return nftnl_table_do_parse(t, type, fp, err, NFTNL_PARSE_FILE); - } --EXPORT_SYMBOL(nftnl_table_parse_file); - - static int nftnl_table_export(char *buf, size_t size, - const struct nftnl_table *t, int type) -@@ -400,13 +382,12 @@ static int nftnl_table_cmd_snprintf(char *buf, size_t size, - return offset; - } - --int nftnl_table_snprintf(char *buf, size_t size, const struct nftnl_table *t, -+int __EXPORTED nftnl_table_snprintf(char *buf, size_t size, const struct nftnl_table *t, - uint32_t type, uint32_t flags) - { - return nftnl_table_cmd_snprintf(buf, size, t, nftnl_flag2cmd(flags), type, - flags); - } --EXPORT_SYMBOL(nftnl_table_snprintf); - - static int nftnl_table_do_snprintf(char *buf, size_t size, const void *t, - uint32_t cmd, uint32_t type, uint32_t flags) -@@ -414,19 +395,18 @@ static int nftnl_table_do_snprintf(char *buf, size_t size, const void *t, - return nftnl_table_snprintf(buf, size, t, type, flags); - } - --int nftnl_table_fprintf(FILE *fp, const struct nftnl_table *t, uint32_t type, -+int __EXPORTED nftnl_table_fprintf(FILE *fp, const struct nftnl_table *t, uint32_t type, - uint32_t flags) - { - return nftnl_fprintf(fp, t, NFTNL_CMD_UNSPEC, type, flags, - nftnl_table_do_snprintf); - } --EXPORT_SYMBOL(nftnl_table_fprintf); - - struct nftnl_table_list { - struct list_head list; - }; - --struct nftnl_table_list *nftnl_table_list_alloc(void) -+struct nftnl_table_list __EXPORTED *nftnl_table_list_alloc(void) - { - struct nftnl_table_list *list; - -@@ -438,9 +418,8 @@ struct nftnl_table_list *nftnl_table_list_alloc(void) - - return list; - } --EXPORT_SYMBOL(nftnl_table_list_alloc); - --void nftnl_table_list_free(struct nftnl_table_list *list) -+void __EXPORTED nftnl_table_list_free(struct nftnl_table_list *list) - { - struct nftnl_table *r, *tmp; - -@@ -450,33 +429,28 @@ void nftnl_table_list_free(struct nftnl_table_list *list) - } - xfree(list); - } --EXPORT_SYMBOL(nftnl_table_list_free); - --int nftnl_table_list_is_empty(const struct nftnl_table_list *list) -+int __EXPORTED nftnl_table_list_is_empty(const struct nftnl_table_list *list) - { - return list_empty(&list->list); - } --EXPORT_SYMBOL(nftnl_table_list_is_empty); - --void nftnl_table_list_add(struct nftnl_table *r, struct nftnl_table_list *list) -+void __EXPORTED nftnl_table_list_add(struct nftnl_table *r, struct nftnl_table_list *list) - { - list_add(&r->head, &list->list); - } --EXPORT_SYMBOL(nftnl_table_list_add); - --void nftnl_table_list_add_tail(struct nftnl_table *r, struct nftnl_table_list *list) -+void __EXPORTED nftnl_table_list_add_tail(struct nftnl_table *r, struct nftnl_table_list *list) - { - list_add_tail(&r->head, &list->list); - } --EXPORT_SYMBOL(nftnl_table_list_add_tail); - --void nftnl_table_list_del(struct nftnl_table *t) -+void __EXPORTED nftnl_table_list_del(struct nftnl_table *t) - { - list_del(&t->head); - } --EXPORT_SYMBOL(nftnl_table_list_del); - --int nftnl_table_list_foreach(struct nftnl_table_list *table_list, -+int __EXPORTED nftnl_table_list_foreach(struct nftnl_table_list *table_list, - int (*cb)(struct nftnl_table *t, void *data), - void *data) - { -@@ -490,14 +464,13 @@ int nftnl_table_list_foreach(struct nftnl_table_list *table_list, - } - return 0; - } --EXPORT_SYMBOL(nftnl_table_list_foreach); - - struct nftnl_table_list_iter { - const struct nftnl_table_list *list; - struct nftnl_table *cur; - }; - --struct nftnl_table_list_iter * -+struct nftnl_table_list_iter __EXPORTED * - nftnl_table_list_iter_create(const struct nftnl_table_list *l) - { - struct nftnl_table_list_iter *iter; -@@ -514,9 +487,8 @@ nftnl_table_list_iter_create(const struct nftnl_table_list *l) - - return iter; - } --EXPORT_SYMBOL(nftnl_table_list_iter_create); - --struct nftnl_table *nftnl_table_list_iter_next(struct nftnl_table_list_iter *iter) -+struct nftnl_table __EXPORTED *nftnl_table_list_iter_next(struct nftnl_table_list_iter *iter) - { - struct nftnl_table *r = iter->cur; - -@@ -530,10 +502,8 @@ struct nftnl_table *nftnl_table_list_iter_next(struct nftnl_table_list_iter *ite - - return r; - } --EXPORT_SYMBOL(nftnl_table_list_iter_next); - --void nftnl_table_list_iter_destroy(const struct nftnl_table_list_iter *iter) -+void __EXPORTED nftnl_table_list_iter_destroy(const struct nftnl_table_list_iter *iter) - { - xfree(iter); - } --EXPORT_SYMBOL(nftnl_table_list_iter_destroy); -diff --git a/src/trace.c b/src/trace.c -index bd05d3c..4739ef9 100644 ---- a/src/trace.c -+++ b/src/trace.c -@@ -52,14 +52,12 @@ struct nftnl_trace { - uint32_t flags; - }; - --EXPORT_SYMBOL(nftnl_trace_alloc); --struct nftnl_trace *nftnl_trace_alloc(void) -+struct nftnl_trace __EXPORTED *nftnl_trace_alloc(void) - { - return calloc(1, sizeof(struct nftnl_trace)); - } - --EXPORT_SYMBOL(nftnl_trace_free); --void nftnl_trace_free(const struct nftnl_trace *t) -+void __EXPORTED nftnl_trace_free(const struct nftnl_trace *t) - { - xfree(t->chain); - xfree(t->table); -@@ -70,8 +68,7 @@ void nftnl_trace_free(const struct nftnl_trace *t) - xfree(t); - } - --EXPORT_SYMBOL(nftnl_trace_is_set); --bool nftnl_trace_is_set(const struct nftnl_trace *t, uint16_t attr) -+bool __EXPORTED nftnl_trace_is_set(const struct nftnl_trace *t, uint16_t attr) - { - return t->flags & (1 << attr); - } -@@ -130,8 +127,7 @@ static int nftnl_trace_parse_attr_cb(const struct nlattr *attr, void *data) - return MNL_CB_OK; - } - --EXPORT_SYMBOL(nftnl_trace_get_data); --const void *nftnl_trace_get_data(const struct nftnl_trace *trace, -+const void __EXPORTED *nftnl_trace_get_data(const struct nftnl_trace *trace, - uint16_t type, uint32_t *data_len) - { - enum nftnl_trace_attr attr = type; -@@ -201,8 +197,7 @@ const void *nftnl_trace_get_data(const struct nftnl_trace *trace, - return NULL; - } - --EXPORT_SYMBOL(nftnl_trace_get_str); --const char *nftnl_trace_get_str(const struct nftnl_trace *trace, uint16_t type) -+const char __EXPORTED *nftnl_trace_get_str(const struct nftnl_trace *trace, uint16_t type) - { - if (!nftnl_trace_is_set(trace, type)) - return NULL; -@@ -216,8 +211,7 @@ const char *nftnl_trace_get_str(const struct nftnl_trace *trace, uint16_t type) - return NULL; - } - --EXPORT_SYMBOL(nftnl_trace_get_u16); --uint16_t nftnl_trace_get_u16(const struct nftnl_trace *trace, uint16_t type) -+uint16_t __EXPORTED nftnl_trace_get_u16(const struct nftnl_trace *trace, uint16_t type) - { - const uint16_t *d; - uint32_t dlen; -@@ -229,8 +223,7 @@ uint16_t nftnl_trace_get_u16(const struct nftnl_trace *trace, uint16_t type) - return 0; - } - --EXPORT_SYMBOL(nftnl_trace_get_u32); --uint32_t nftnl_trace_get_u32(const struct nftnl_trace *trace, uint16_t type) -+uint32_t __EXPORTED nftnl_trace_get_u32(const struct nftnl_trace *trace, uint16_t type) - { - const uint32_t *d; - uint32_t dlen; -@@ -242,8 +235,7 @@ uint32_t nftnl_trace_get_u32(const struct nftnl_trace *trace, uint16_t type) - return 0; - } - --EXPORT_SYMBOL(nftnl_trace_get_u64); --uint64_t nftnl_trace_get_u64(const struct nftnl_trace *trace, uint16_t type) -+uint64_t __EXPORTED nftnl_trace_get_u64(const struct nftnl_trace *trace, uint16_t type) - { - const uint64_t *d; - uint32_t dlen; -@@ -323,9 +315,8 @@ static int nftnl_trace_parse_verdict(const struct nlattr *attr, - } - return 0; - } --EXPORT_SYMBOL(nftnl_trace_nlmsg_parse); - --int nftnl_trace_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_trace *t) -+int __EXPORTED nftnl_trace_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_trace *t) - { - struct nfgenmsg *nfg = mnl_nlmsg_get_payload(nlh); - struct nlattr *tb[NFTA_TRACE_MAX+1] = {}; -diff --git a/src/udata.c b/src/udata.c -index d679dd0..7e2de0f 100644 ---- a/src/udata.c -+++ b/src/udata.c -@@ -16,7 +16,7 @@ - #include <stdint.h> - #include <string.h> - --struct nftnl_udata_buf *nftnl_udata_buf_alloc(uint32_t data_size) -+struct nftnl_udata_buf __EXPORTED *nftnl_udata_buf_alloc(uint32_t data_size) - { - struct nftnl_udata_buf *buf; - -@@ -28,47 +28,40 @@ struct nftnl_udata_buf *nftnl_udata_buf_alloc(uint32_t data_size) - - return buf; - } --EXPORT_SYMBOL(nftnl_udata_buf_alloc); - --void nftnl_udata_buf_free(const struct nftnl_udata_buf *buf) -+void __EXPORTED nftnl_udata_buf_free(const struct nftnl_udata_buf *buf) - { - xfree(buf); - } --EXPORT_SYMBOL(nftnl_udata_buf_free); - --uint32_t nftnl_udata_buf_len(const struct nftnl_udata_buf *buf) -+uint32_t __EXPORTED nftnl_udata_buf_len(const struct nftnl_udata_buf *buf) - { - return (uint32_t)(buf->end - buf->data); - } --EXPORT_SYMBOL(nftnl_udata_buf_len); - --void *nftnl_udata_buf_data(const struct nftnl_udata_buf *buf) -+void __EXPORTED *nftnl_udata_buf_data(const struct nftnl_udata_buf *buf) - { - return (void *)buf->data; - } --EXPORT_SYMBOL(nftnl_udata_buf_data); - --void nftnl_udata_buf_put(struct nftnl_udata_buf *buf, const void *data, -+void __EXPORTED nftnl_udata_buf_put(struct nftnl_udata_buf *buf, const void *data, - uint32_t len) - { - memcpy(buf->data, data, len <= buf->size ? len : buf->size); - buf->end = buf->data + len; - } --EXPORT_SYMBOL(nftnl_udata_buf_put); - --struct nftnl_udata *nftnl_udata_start(const struct nftnl_udata_buf *buf) -+struct nftnl_udata __EXPORTED *nftnl_udata_start(const struct nftnl_udata_buf *buf) - { - return (struct nftnl_udata *)buf->data; - } --EXPORT_SYMBOL(nftnl_udata_start); - --struct nftnl_udata *nftnl_udata_end(const struct nftnl_udata_buf *buf) -+struct nftnl_udata __EXPORTED *nftnl_udata_end(const struct nftnl_udata_buf *buf) - { - return (struct nftnl_udata *)buf->end; - } --EXPORT_SYMBOL(nftnl_udata_end); - --bool nftnl_udata_put(struct nftnl_udata_buf *buf, uint8_t type, uint32_t len, -+bool __EXPORTED nftnl_udata_put(struct nftnl_udata_buf *buf, uint8_t type, uint32_t len, - const void *value) - { - struct nftnl_udata *attr; -@@ -85,55 +78,47 @@ bool nftnl_udata_put(struct nftnl_udata_buf *buf, uint8_t type, uint32_t len, - - return true; - } --EXPORT_SYMBOL(nftnl_udata_put); - --bool nftnl_udata_put_strz(struct nftnl_udata_buf *buf, uint8_t type, -+bool __EXPORTED nftnl_udata_put_strz(struct nftnl_udata_buf *buf, uint8_t type, - const char *strz) - { - return nftnl_udata_put(buf, type, strlen(strz) + 1, strz); - } --EXPORT_SYMBOL(nftnl_udata_put_strz); - --bool nftnl_udata_put_u32(struct nftnl_udata_buf *buf, uint8_t type, -+bool __EXPORTED nftnl_udata_put_u32(struct nftnl_udata_buf *buf, uint8_t type, - uint32_t data) - { - return nftnl_udata_put(buf, type, sizeof(data), &data); - } --EXPORT_SYMBOL(nftnl_udata_put_u32); - --uint8_t nftnl_udata_type(const struct nftnl_udata *attr) -+uint8_t __EXPORTED nftnl_udata_type(const struct nftnl_udata *attr) - { - return attr->type; - } --EXPORT_SYMBOL(nftnl_udata_type); - --uint8_t nftnl_udata_len(const struct nftnl_udata *attr) -+uint8_t __EXPORTED nftnl_udata_len(const struct nftnl_udata *attr) - { - return attr->len; - } --EXPORT_SYMBOL(nftnl_udata_len); - --void *nftnl_udata_get(const struct nftnl_udata *attr) -+void __EXPORTED *nftnl_udata_get(const struct nftnl_udata *attr) - { - return (void *)attr->value; - } --EXPORT_SYMBOL(nftnl_udata_get); - --uint32_t nftnl_udata_get_u32(const struct nftnl_udata *attr) -+uint32_t __EXPORTED nftnl_udata_get_u32(const struct nftnl_udata *attr) - { - uint32_t *data = (uint32_t *)attr->value; - - return *data; - } --EXPORT_SYMBOL(nftnl_udata_get_u32); - --struct nftnl_udata *nftnl_udata_next(const struct nftnl_udata *attr) -+struct nftnl_udata __EXPORTED *nftnl_udata_next(const struct nftnl_udata *attr) - { - return (struct nftnl_udata *)&attr->value[attr->len]; - } --EXPORT_SYMBOL(nftnl_udata_next); - --int nftnl_udata_parse(const void *data, uint32_t data_len, nftnl_udata_cb_t cb, -+int __EXPORTED nftnl_udata_parse(const void *data, uint32_t data_len, nftnl_udata_cb_t cb, - void *cb_data) - { - int ret = 0; -@@ -147,4 +132,3 @@ int nftnl_udata_parse(const void *data, uint32_t data_len, nftnl_udata_cb_t cb, - - return ret; - } --EXPORT_SYMBOL(nftnl_udata_parse); --- -2.11.0 (Apple Git-81) - diff --git a/meta-networking/recipes-filter/libnftnl/libnftnl/0001-avoid-naming-local-function-as-one-of-printf-family.patch b/meta-networking/recipes-filter/libnftnl/libnftnl/0001-avoid-naming-local-function-as-one-of-printf-family.patch deleted file mode 100644 index 06e68177ce..0000000000 --- a/meta-networking/recipes-filter/libnftnl/libnftnl/0001-avoid-naming-local-function-as-one-of-printf-family.patch +++ /dev/null @@ -1,514 +0,0 @@ -From f840cc0da571d98beb17855c177e9986bd096b72 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 13 Apr 2017 11:46:09 -0700 -Subject: [PATCH] avoid naming local function as one of printf family - -Fixes build issues with clang -error: no member named '__builtin___snprintf_chk' in 'struct expr_ops' - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - include/expr_ops.h | 2 +- - include/obj.h | 2 +- - src/buffer.c | 2 +- - src/expr.c | 4 ++-- - src/expr/bitwise.c | 2 +- - src/expr/byteorder.c | 2 +- - src/expr/cmp.c | 2 +- - src/expr/counter.c | 2 +- - src/expr/ct.c | 2 +- - src/expr/dup.c | 2 +- - src/expr/dynset.c | 2 +- - src/expr/exthdr.c | 2 +- - src/expr/fib.c | 2 +- - src/expr/fwd.c | 2 +- - src/expr/hash.c | 2 +- - src/expr/immediate.c | 2 +- - src/expr/limit.c | 2 +- - src/expr/log.c | 2 +- - src/expr/lookup.c | 2 +- - src/expr/masq.c | 2 +- - src/expr/match.c | 2 +- - src/expr/meta.c | 2 +- - src/expr/nat.c | 2 +- - src/expr/numgen.c | 2 +- - src/expr/objref.c | 2 +- - src/expr/payload.c | 2 +- - src/expr/queue.c | 2 +- - src/expr/quota.c | 2 +- - src/expr/range.c | 2 +- - src/expr/redir.c | 2 +- - src/expr/reject.c | 2 +- - src/expr/rt.c | 2 +- - src/expr/target.c | 2 +- - src/obj/counter.c | 2 +- - src/obj/ct_helper.c | 2 +- - src/obj/quota.c | 2 +- - src/object.c | 4 ++-- - 37 files changed, 39 insertions(+), 39 deletions(-) - -diff --git a/include/expr_ops.h b/include/expr_ops.h -index e639390..c4fe050 100644 ---- a/include/expr_ops.h -+++ b/include/expr_ops.h -@@ -18,7 +18,7 @@ struct expr_ops { - const void *(*get)(const struct nftnl_expr *e, uint16_t type, uint32_t *data_len); - int (*parse)(struct nftnl_expr *e, struct nlattr *attr); - void (*build)(struct nlmsghdr *nlh, const struct nftnl_expr *e); -- int (*snprintf)(char *buf, size_t len, uint32_t type, uint32_t flags, const struct nftnl_expr *e); -+ int (*snprintf_)(char *buf, size_t len, uint32_t type, uint32_t flags, const struct nftnl_expr *e); - int (*json_parse)(struct nftnl_expr *e, json_t *data, - struct nftnl_parse_err *err); - }; -diff --git a/include/obj.h b/include/obj.h -index d90919f..772caff 100644 ---- a/include/obj.h -+++ b/include/obj.h -@@ -47,7 +47,7 @@ struct obj_ops { - const void *(*get)(const struct nftnl_obj *e, uint16_t type, uint32_t *data_len); - int (*parse)(struct nftnl_obj *e, struct nlattr *attr); - void (*build)(struct nlmsghdr *nlh, const struct nftnl_obj *e); -- int (*snprintf)(char *buf, size_t len, uint32_t type, uint32_t flags, const struct nftnl_obj *e); -+ int (*snprintf_)(char *buf, size_t len, uint32_t type, uint32_t flags, const struct nftnl_obj *e); - int (*json_parse)(struct nftnl_obj *e, json_t *data, - struct nftnl_parse_err *err); - }; -diff --git a/src/buffer.c b/src/buffer.c -index f9d5a83..db656e2 100644 ---- a/src/buffer.c -+++ b/src/buffer.c -@@ -206,7 +206,7 @@ int nftnl_buf_expr(struct nftnl_buf *b, int type, uint32_t flags, - case NFTNL_OUTPUT_JSON: - nftnl_buf_put(b, "{"); - nftnl_buf_str(b, type, expr->ops->name, TYPE); -- ret = expr->ops->snprintf(b->buf + b->off, b->len, type, flags, -+ ret = expr->ops->snprintf_(b->buf + b->off, b->len, type, flags, - expr); - if (ret > 0) - nftnl_buf_update(b, ret); -diff --git a/src/expr.c b/src/expr.c -index c7eb2b4..24f8f8c 100644 ---- a/src/expr.c -+++ b/src/expr.c -@@ -265,10 +265,10 @@ int __EXPORTED nftnl_expr_snprintf(char *buf, size_t size, const struct nftnl_ex - int ret; - unsigned int offset = 0, len = size; - -- if (!expr->ops->snprintf) -+ if (!expr->ops->snprintf_) - return 0; - -- ret = expr->ops->snprintf(buf+offset, len, type, flags, expr); -+ ret = expr->ops->snprintf_(buf+offset, len, type, flags, expr); - SNPRINTF_BUFFER_SIZE(ret, size, len, offset); - - return offset; -diff --git a/src/expr/bitwise.c b/src/expr/bitwise.c -index 0febc9d..9b48e79 100644 ---- a/src/expr/bitwise.c -+++ b/src/expr/bitwise.c -@@ -299,6 +299,6 @@ struct expr_ops expr_ops_bitwise = { - .get = nftnl_expr_bitwise_get, - .parse = nftnl_expr_bitwise_parse, - .build = nftnl_expr_bitwise_build, -- .snprintf = nftnl_expr_bitwise_snprintf, -+ .snprintf_ = nftnl_expr_bitwise_snprintf, - .json_parse = nftnl_expr_bitwise_json_parse, - }; -diff --git a/src/expr/byteorder.c b/src/expr/byteorder.c -index 3805307..079582f 100644 ---- a/src/expr/byteorder.c -+++ b/src/expr/byteorder.c -@@ -314,6 +314,6 @@ struct expr_ops expr_ops_byteorder = { - .get = nftnl_expr_byteorder_get, - .parse = nftnl_expr_byteorder_parse, - .build = nftnl_expr_byteorder_build, -- .snprintf = nftnl_expr_byteorder_snprintf, -+ .snprintf_ = nftnl_expr_byteorder_snprintf, - .json_parse = nftnl_expr_byteorder_json_parse, - }; -diff --git a/src/expr/cmp.c b/src/expr/cmp.c -index 353e907..99b497c 100644 ---- a/src/expr/cmp.c -+++ b/src/expr/cmp.c -@@ -284,6 +284,6 @@ struct expr_ops expr_ops_cmp = { - .get = nftnl_expr_cmp_get, - .parse = nftnl_expr_cmp_parse, - .build = nftnl_expr_cmp_build, -- .snprintf = nftnl_expr_cmp_snprintf, -+ .snprintf_ = nftnl_expr_cmp_snprintf, - .json_parse = nftnl_expr_cmp_json_parse, - }; -diff --git a/src/expr/counter.c b/src/expr/counter.c -index 21901e8..9fd7655 100644 ---- a/src/expr/counter.c -+++ b/src/expr/counter.c -@@ -200,6 +200,6 @@ struct expr_ops expr_ops_counter = { - .get = nftnl_expr_counter_get, - .parse = nftnl_expr_counter_parse, - .build = nftnl_expr_counter_build, -- .snprintf = nftnl_expr_counter_snprintf, -+ .snprintf_ = nftnl_expr_counter_snprintf, - .json_parse = nftnl_expr_counter_json_parse, - }; -diff --git a/src/expr/ct.c b/src/expr/ct.c -index cdd08e9..6ce5478 100644 ---- a/src/expr/ct.c -+++ b/src/expr/ct.c -@@ -356,6 +356,6 @@ struct expr_ops expr_ops_ct = { - .get = nftnl_expr_ct_get, - .parse = nftnl_expr_ct_parse, - .build = nftnl_expr_ct_build, -- .snprintf = nftnl_expr_ct_snprintf, -+ .snprintf_ = nftnl_expr_ct_snprintf, - .json_parse = nftnl_expr_ct_json_parse, - }; -diff --git a/src/expr/dup.c b/src/expr/dup.c -index 9aa332b..2f491d8 100644 ---- a/src/expr/dup.c -+++ b/src/expr/dup.c -@@ -206,6 +206,6 @@ struct expr_ops expr_ops_dup = { - .get = nftnl_expr_dup_get, - .parse = nftnl_expr_dup_parse, - .build = nftnl_expr_dup_build, -- .snprintf = nftnl_expr_dup_snprintf, -+ .snprintf_ = nftnl_expr_dup_snprintf, - .json_parse = nftnl_expr_dup_json_parse, - }; -diff --git a/src/expr/dynset.c b/src/expr/dynset.c -index f7b99ea..758f07c 100644 ---- a/src/expr/dynset.c -+++ b/src/expr/dynset.c -@@ -368,6 +368,6 @@ struct expr_ops expr_ops_dynset = { - .get = nftnl_expr_dynset_get, - .parse = nftnl_expr_dynset_parse, - .build = nftnl_expr_dynset_build, -- .snprintf = nftnl_expr_dynset_snprintf, -+ .snprintf_ = nftnl_expr_dynset_snprintf, - .json_parse = nftnl_expr_dynset_json_parse, - }; -diff --git a/src/expr/exthdr.c b/src/expr/exthdr.c -index d4f1665..a834782 100644 ---- a/src/expr/exthdr.c -+++ b/src/expr/exthdr.c -@@ -356,6 +356,6 @@ struct expr_ops expr_ops_exthdr = { - .get = nftnl_expr_exthdr_get, - .parse = nftnl_expr_exthdr_parse, - .build = nftnl_expr_exthdr_build, -- .snprintf = nftnl_expr_exthdr_snprintf, -+ .snprintf_ = nftnl_expr_exthdr_snprintf, - .json_parse = nftnl_expr_exthdr_json_parse, - }; -diff --git a/src/expr/fib.c b/src/expr/fib.c -index f3be081..3c353b2 100644 ---- a/src/expr/fib.c -+++ b/src/expr/fib.c -@@ -272,6 +272,6 @@ struct expr_ops expr_ops_fib = { - .get = nftnl_expr_fib_get, - .parse = nftnl_expr_fib_parse, - .build = nftnl_expr_fib_build, -- .snprintf = nftnl_expr_fib_snprintf, -+ .snprintf_ = nftnl_expr_fib_snprintf, - .json_parse = nftnl_expr_fib_json_parse, - }; -diff --git a/src/expr/fwd.c b/src/expr/fwd.c -index c30d494..f6e41f1 100644 ---- a/src/expr/fwd.c -+++ b/src/expr/fwd.c -@@ -180,6 +180,6 @@ struct expr_ops expr_ops_fwd = { - .get = nftnl_expr_fwd_get, - .parse = nftnl_expr_fwd_parse, - .build = nftnl_expr_fwd_build, -- .snprintf = nftnl_expr_fwd_snprintf, -+ .snprintf_ = nftnl_expr_fwd_snprintf, - .json_parse = nftnl_expr_fwd_json_parse, - }; -diff --git a/src/expr/hash.c b/src/expr/hash.c -index d870510..5acb66a 100644 ---- a/src/expr/hash.c -+++ b/src/expr/hash.c -@@ -332,6 +332,6 @@ struct expr_ops expr_ops_hash = { - .get = nftnl_expr_hash_get, - .parse = nftnl_expr_hash_parse, - .build = nftnl_expr_hash_build, -- .snprintf = nftnl_expr_hash_snprintf, -+ .snprintf_ = nftnl_expr_hash_snprintf, - .json_parse = nftnl_expr_hash_json_parse, - }; -diff --git a/src/expr/immediate.c b/src/expr/immediate.c -index 0b188cc..94bd6da 100644 ---- a/src/expr/immediate.c -+++ b/src/expr/immediate.c -@@ -316,6 +316,6 @@ struct expr_ops expr_ops_immediate = { - .get = nftnl_expr_immediate_get, - .parse = nftnl_expr_immediate_parse, - .build = nftnl_expr_immediate_build, -- .snprintf = nftnl_expr_immediate_snprintf, -+ .snprintf_ = nftnl_expr_immediate_snprintf, - .json_parse = nftnl_expr_immediate_json_parse, - }; -diff --git a/src/expr/limit.c b/src/expr/limit.c -index 856ab18..e71fc2f 100644 ---- a/src/expr/limit.c -+++ b/src/expr/limit.c -@@ -285,6 +285,6 @@ struct expr_ops expr_ops_limit = { - .get = nftnl_expr_limit_get, - .parse = nftnl_expr_limit_parse, - .build = nftnl_expr_limit_build, -- .snprintf = nftnl_expr_limit_snprintf, -+ .snprintf_ = nftnl_expr_limit_snprintf, - .json_parse = nftnl_expr_limit_json_parse, - }; -diff --git a/src/expr/log.c b/src/expr/log.c -index b642255..71dd83a 100644 ---- a/src/expr/log.c -+++ b/src/expr/log.c -@@ -352,6 +352,6 @@ struct expr_ops expr_ops_log = { - .get = nftnl_expr_log_get, - .parse = nftnl_expr_log_parse, - .build = nftnl_expr_log_build, -- .snprintf = nftnl_expr_log_snprintf, -+ .snprintf_ = nftnl_expr_log_snprintf, - .json_parse = nftnl_expr_log_json_parse, - }; -diff --git a/src/expr/lookup.c b/src/expr/lookup.c -index 861815f..6049913 100644 ---- a/src/expr/lookup.c -+++ b/src/expr/lookup.c -@@ -293,6 +293,6 @@ struct expr_ops expr_ops_lookup = { - .get = nftnl_expr_lookup_get, - .parse = nftnl_expr_lookup_parse, - .build = nftnl_expr_lookup_build, -- .snprintf = nftnl_expr_lookup_snprintf, -+ .snprintf_ = nftnl_expr_lookup_snprintf, - .json_parse = nftnl_expr_lookup_json_parse, - }; -diff --git a/src/expr/masq.c b/src/expr/masq.c -index 7c235d3..adec325 100644 ---- a/src/expr/masq.c -+++ b/src/expr/masq.c -@@ -228,6 +228,6 @@ struct expr_ops expr_ops_masq = { - .get = nftnl_expr_masq_get, - .parse = nftnl_expr_masq_parse, - .build = nftnl_expr_masq_build, -- .snprintf = nftnl_expr_masq_snprintf, -+ .snprintf_ = nftnl_expr_masq_snprintf, - .json_parse = nftnl_expr_masq_json_parse, - }; -diff --git a/src/expr/match.c b/src/expr/match.c -index dd09e1e..f0d8868 100644 ---- a/src/expr/match.c -+++ b/src/expr/match.c -@@ -249,6 +249,6 @@ struct expr_ops expr_ops_match = { - .get = nftnl_expr_match_get, - .parse = nftnl_expr_match_parse, - .build = nftnl_expr_match_build, -- .snprintf = nftnl_expr_match_snprintf, -+ .snprintf_ = nftnl_expr_match_snprintf, - .json_parse = nftnl_expr_match_json_parse, - }; -diff --git a/src/expr/meta.c b/src/expr/meta.c -index 2c75841..907a677 100644 ---- a/src/expr/meta.c -+++ b/src/expr/meta.c -@@ -290,6 +290,6 @@ struct expr_ops expr_ops_meta = { - .get = nftnl_expr_meta_get, - .parse = nftnl_expr_meta_parse, - .build = nftnl_expr_meta_build, -- .snprintf = nftnl_expr_meta_snprintf, -+ .snprintf_ = nftnl_expr_meta_snprintf, - .json_parse = nftnl_expr_meta_json_parse, - }; -diff --git a/src/expr/nat.c b/src/expr/nat.c -index 29bc3a2..d476283 100644 ---- a/src/expr/nat.c -+++ b/src/expr/nat.c -@@ -383,6 +383,6 @@ struct expr_ops expr_ops_nat = { - .get = nftnl_expr_nat_get, - .parse = nftnl_expr_nat_parse, - .build = nftnl_expr_nat_build, -- .snprintf = nftnl_expr_nat_snprintf, -+ .snprintf_ = nftnl_expr_nat_snprintf, - .json_parse = nftnl_expr_nat_json_parse, - }; -diff --git a/src/expr/numgen.c b/src/expr/numgen.c -index a15f03a..28ef741 100644 ---- a/src/expr/numgen.c -+++ b/src/expr/numgen.c -@@ -264,6 +264,6 @@ struct expr_ops expr_ops_ng = { - .get = nftnl_expr_ng_get, - .parse = nftnl_expr_ng_parse, - .build = nftnl_expr_ng_build, -- .snprintf = nftnl_expr_ng_snprintf, -+ .snprintf_ = nftnl_expr_ng_snprintf, - .json_parse = nftnl_expr_ng_json_parse, - }; -diff --git a/src/expr/objref.c b/src/expr/objref.c -index 4cfa3cb..c394290 100644 ---- a/src/expr/objref.c -+++ b/src/expr/objref.c -@@ -278,6 +278,6 @@ struct expr_ops expr_ops_objref = { - .get = nftnl_expr_objref_get, - .parse = nftnl_expr_objref_parse, - .build = nftnl_expr_objref_build, -- .snprintf = nftnl_expr_objref_snprintf, -+ .snprintf_ = nftnl_expr_objref_snprintf, - .json_parse = nftnl_expr_objref_json_parse, - }; -diff --git a/src/expr/payload.c b/src/expr/payload.c -index 91e1587..894ac08 100644 ---- a/src/expr/payload.c -+++ b/src/expr/payload.c -@@ -348,6 +348,6 @@ struct expr_ops expr_ops_payload = { - .get = nftnl_expr_payload_get, - .parse = nftnl_expr_payload_parse, - .build = nftnl_expr_payload_build, -- .snprintf = nftnl_expr_payload_snprintf, -+ .snprintf_ = nftnl_expr_payload_snprintf, - .json_parse = nftnl_expr_payload_json_parse, - }; -diff --git a/src/expr/queue.c b/src/expr/queue.c -index 8a9deda..389af83 100644 ---- a/src/expr/queue.c -+++ b/src/expr/queue.c -@@ -276,6 +276,6 @@ struct expr_ops expr_ops_queue = { - .get = nftnl_expr_queue_get, - .parse = nftnl_expr_queue_parse, - .build = nftnl_expr_queue_build, -- .snprintf = nftnl_expr_queue_snprintf, -+ .snprintf_ = nftnl_expr_queue_snprintf, - .json_parse = nftnl_expr_queue_json_parse, - }; -diff --git a/src/expr/quota.c b/src/expr/quota.c -index 667e6e1..ff5d182 100644 ---- a/src/expr/quota.c -+++ b/src/expr/quota.c -@@ -203,6 +203,6 @@ struct expr_ops expr_ops_quota = { - .get = nftnl_expr_quota_get, - .parse = nftnl_expr_quota_parse, - .build = nftnl_expr_quota_build, -- .snprintf = nftnl_expr_quota_snprintf, -+ .snprintf_ = nftnl_expr_quota_snprintf, - .json_parse = nftnl_expr_quota_json_parse, - }; -diff --git a/src/expr/range.c b/src/expr/range.c -index 8c8ce12..34d422b 100644 ---- a/src/expr/range.c -+++ b/src/expr/range.c -@@ -283,6 +283,6 @@ struct expr_ops expr_ops_range = { - .get = nftnl_expr_range_get, - .parse = nftnl_expr_range_parse, - .build = nftnl_expr_range_build, -- .snprintf = nftnl_expr_range_snprintf, -+ .snprintf_ = nftnl_expr_range_snprintf, - .json_parse = nftnl_expr_range_json_parse, - }; -diff --git a/src/expr/redir.c b/src/expr/redir.c -index 43538d5..8a21f93 100644 ---- a/src/expr/redir.c -+++ b/src/expr/redir.c -@@ -242,6 +242,6 @@ struct expr_ops expr_ops_redir = { - .get = nftnl_expr_redir_get, - .parse = nftnl_expr_redir_parse, - .build = nftnl_expr_redir_build, -- .snprintf = nftnl_expr_redir_snprintf, -+ .snprintf_ = nftnl_expr_redir_snprintf, - .json_parse = nftnl_expr_redir_json_parse, - }; -diff --git a/src/expr/reject.c b/src/expr/reject.c -index 11d8b20..b10e729 100644 ---- a/src/expr/reject.c -+++ b/src/expr/reject.c -@@ -200,6 +200,6 @@ struct expr_ops expr_ops_reject = { - .get = nftnl_expr_reject_get, - .parse = nftnl_expr_reject_parse, - .build = nftnl_expr_reject_build, -- .snprintf = nftnl_expr_reject_snprintf, -+ .snprintf_ = nftnl_expr_reject_snprintf, - .json_parse = nftnl_expr_reject_json_parse, - }; -diff --git a/src/expr/rt.c b/src/expr/rt.c -index 5088e66..9f44b29 100644 ---- a/src/expr/rt.c -+++ b/src/expr/rt.c -@@ -238,6 +238,6 @@ struct expr_ops expr_ops_rt = { - .get = nftnl_expr_rt_get, - .parse = nftnl_expr_rt_parse, - .build = nftnl_expr_rt_build, -- .snprintf = nftnl_expr_rt_snprintf, -+ .snprintf_ = nftnl_expr_rt_snprintf, - .json_parse = nftnl_expr_rt_json_parse, - }; -diff --git a/src/expr/target.c b/src/expr/target.c -index ed4bf7d..2ef4078 100644 ---- a/src/expr/target.c -+++ b/src/expr/target.c -@@ -249,6 +249,6 @@ struct expr_ops expr_ops_target = { - .get = nftnl_expr_target_get, - .parse = nftnl_expr_target_parse, - .build = nftnl_expr_target_build, -- .snprintf = nftnl_expr_target_snprintf, -+ .snprintf_ = nftnl_expr_target_snprintf, - .json_parse = nftnl_expr_target_json_parse, - }; -diff --git a/src/obj/counter.c b/src/obj/counter.c -index beadc93..8c4cc25 100644 ---- a/src/obj/counter.c -+++ b/src/obj/counter.c -@@ -179,6 +179,6 @@ struct obj_ops obj_ops_counter = { - .get = nftnl_obj_counter_get, - .parse = nftnl_obj_counter_parse, - .build = nftnl_obj_counter_build, -- .snprintf = nftnl_obj_counter_snprintf, -+ .snprintf_ = nftnl_obj_counter_snprintf, - .json_parse = nftnl_obj_counter_json_parse, - }; -diff --git a/src/obj/ct_helper.c b/src/obj/ct_helper.c -index d6d3111..4c7c88b 100644 ---- a/src/obj/ct_helper.c -+++ b/src/obj/ct_helper.c -@@ -205,6 +205,6 @@ struct obj_ops obj_ops_ct_helper = { - .get = nftnl_obj_ct_helper_get, - .parse = nftnl_obj_ct_helper_parse, - .build = nftnl_obj_ct_helper_build, -- .snprintf = nftnl_obj_ct_helper_snprintf, -+ .snprintf_ = nftnl_obj_ct_helper_snprintf, - .json_parse = nftnl_obj_quota_json_parse, - }; -diff --git a/src/obj/quota.c b/src/obj/quota.c -index d5757b2..e959ff8 100644 ---- a/src/obj/quota.c -+++ b/src/obj/quota.c -@@ -200,6 +200,6 @@ struct obj_ops obj_ops_quota = { - .get = nftnl_obj_quota_get, - .parse = nftnl_obj_quota_parse, - .build = nftnl_obj_quota_build, -- .snprintf = nftnl_obj_quota_snprintf, -+ .snprintf_ = nftnl_obj_quota_snprintf, - .json_parse = nftnl_obj_quota_json_parse, - }; -diff --git a/src/object.c b/src/object.c -index d409c6d..b938c97 100644 ---- a/src/object.c -+++ b/src/object.c -@@ -389,7 +389,7 @@ static int nftnl_obj_export(char *buf, size_t size, - nftnl_buf_u32(&b, type, obj->use, USE); - - if (obj->ops) -- ret = obj->ops->snprintf(buf + b.len, size - b.len, type, -+ ret = obj->ops->snprintf_(buf + b.len, size - b.len, type, - flags, obj); - - b.len += ret; -@@ -410,7 +410,7 @@ static int nftnl_obj_snprintf_dflt(char *buf, size_t size, - SNPRINTF_BUFFER_SIZE(ret, size, len, offset); - - if (obj->ops) { -- ret = obj->ops->snprintf(buf + offset, offset, type, flags, obj); -+ ret = obj->ops->snprintf_(buf + offset, offset, type, flags, obj); - SNPRINTF_BUFFER_SIZE(ret, size, len, offset); - } - ret = snprintf(buf + offset, offset, "]"); --- -2.12.2 - diff --git a/meta-networking/recipes-filter/libnftnl/libnftnl/0001-configure.ac-Add-serial-tests.patch b/meta-networking/recipes-filter/libnftnl/libnftnl/0001-configure.ac-Add-serial-tests.patch new file mode 100644 index 0000000000..abeca6579c --- /dev/null +++ b/meta-networking/recipes-filter/libnftnl/libnftnl/0001-configure.ac-Add-serial-tests.patch @@ -0,0 +1,33 @@ +From 801a4dd42449fb5f09fb9cb99714ed137278ca24 Mon Sep 17 00:00:00 2001 +From: Trevor Gamblin <trevor.gamblin@windriver.com> +Date: Tue, 14 Dec 2021 12:31:12 -0500 +Subject: [PATCH] configure.ac: Add serial-tests + +ptest needs buildtest-TESTS and runtest-TESTS targets. +serial-tests is required to generate those targets. + +Upstream-Status: Inappropriate (default automake behavior incompatible with ptest) + +Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com> +--- + configure.ac | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index d5c6bd0..d90048e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -8,7 +8,9 @@ AC_CONFIG_HEADERS([config.h]) + m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) + + AM_INIT_AUTOMAKE([-Wall foreign tar-pax no-dist-gzip dist-xz +- 1.6 subdir-objects]) ++ 1.6 subdir-objects serial-tests]) ++ ++AM_EXTRA_RECURSIVE_TARGETS([buildtest-TESTS]) + + dnl kernel style compile messages + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) +-- +2.25.1 + diff --git a/meta-networking/recipes-filter/libnftnl/libnftnl/run-ptest b/meta-networking/recipes-filter/libnftnl/libnftnl/run-ptest new file mode 100644 index 0000000000..133cf92d02 --- /dev/null +++ b/meta-networking/recipes-filter/libnftnl/libnftnl/run-ptest @@ -0,0 +1,2 @@ +#!/bin/sh +make -C tests -k runtest-TESTS diff --git a/meta-networking/recipes-filter/libnftnl/libnftnl_1.0.7.bb b/meta-networking/recipes-filter/libnftnl/libnftnl_1.0.7.bb deleted file mode 100644 index ca01c0a611..0000000000 --- a/meta-networking/recipes-filter/libnftnl/libnftnl_1.0.7.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "Library for low-level interaction with nftables Netlink's API over libmnl" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=79808397c3355f163c012616125c9e26" -SECTION = "libs" -DEPENDS = "libmnl" -PV .= "+git${SRCPV}" -SRCREV = "4b89c0cb0883f638ff1abbc2ff47c43cdc26aac5" -SRC_URI = "git://git.netfilter.org/libnftnl \ - file://0001-Declare-the-define-visivility-attribute-together.patch \ - file://0001-avoid-naming-local-function-as-one-of-printf-family.patch \ - " -SRC_URI[md5sum] = "82183867168eb6644926c48b991b8aac" -SRC_URI[sha256sum] = "9bb66ecbc64b8508249402f0093829f44177770ad99f6042b86b3a467d963982" - -S = "${WORKDIR}/git" - -inherit autotools pkgconfig diff --git a/meta-networking/recipes-filter/libnftnl/libnftnl_1.2.6.bb b/meta-networking/recipes-filter/libnftnl/libnftnl_1.2.6.bb new file mode 100644 index 0000000000..841a7267b8 --- /dev/null +++ b/meta-networking/recipes-filter/libnftnl/libnftnl_1.2.6.bb @@ -0,0 +1,39 @@ +SUMMARY = "Library for low-level interaction with nftables Netlink's API over libmnl" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=79808397c3355f163c012616125c9e26" +SECTION = "libs" + +SRC_URI = "git://git.netfilter.org/libnftnl;branch=master \ + file://0001-configure.ac-Add-serial-tests.patch \ + file://run-ptest \ + " +SRCREV = "83dd4dc316b4189d16ead54cd30bfc89e5160cfd" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig ptest + +DEPENDS = "libmnl" +RDEPENDS:${PN}-ptest += " bash python3-core make" + +TESTDIR = "tests" + +do_compile_ptest() { + cp -rf ${S}/build-aux . + oe_runmake buildtest-TESTS +} + +do_install_ptest() { + cp -rf ${B}/build-aux ${D}${PTEST_PATH} + install -d ${D}${PTEST_PATH}/${TESTDIR} + cp -rf ${B}/${TESTDIR}/Makefile ${D}${PTEST_PATH}/${TESTDIR} + + # the binaries compiled in ${TESTDIR} will look for a compiler to + # use, which will cause failures. Substitute the binaries in + # ${TESTDIR}/.libs instead + cp -rf ${B}/${TESTDIR}/.libs/* ${D}${PTEST_PATH}/${TESTDIR} + + # Alter the Makefile so that it does not try and rebuild anything in + # other nonexistent paths before running the actual tests + sed -i 's/^Makefile/_Makefile/' ${D}${PTEST_PATH}/${TESTDIR}/Makefile +} diff --git a/meta-networking/recipes-filter/nfacct/nfacct_1.0.2.bb b/meta-networking/recipes-filter/nfacct/nfacct_1.0.2.bb index 8177ebcc2a..9b938beae3 100644 --- a/meta-networking/recipes-filter/nfacct/nfacct_1.0.2.bb +++ b/meta-networking/recipes-filter/nfacct/nfacct_1.0.2.bb @@ -1,12 +1,12 @@ SUMMARY = "nfacct is the command line tool to create/retrieve/delete accounting objects" HOMEPAGE = "http://netfilter.org/projects/nfacct/" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" -SRC_URI = "ftp://ftp.netfilter.org/pub/${BPN}/${BP}.tar.bz2" - -SRC_URI[md5sum] = "94faafdaaed85ca9220c5692be8a408e" +UPSTREAM_CHECK_URI = "https://www.netfilter.org/pub/nfacct" +SRC_URI = "https://www.netfilter.org/pub/${BPN}/${BP}.tar.bz2" SRC_URI[sha256sum] = "ecff2218754be318bce3c3a5d1775bab93bf4168b2c4aac465785de5655fbd69" + DEPENDS = "libnfnetlink libmnl libnetfilter-acct" EXTRA_OEMAKE += 'HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}"' diff --git a/meta-networking/recipes-filter/nftables/files/0001-payload-explicit-network-ctx-assignment-for-icmp-icm.patch b/meta-networking/recipes-filter/nftables/files/0001-payload-explicit-network-ctx-assignment-for-icmp-icm.patch deleted file mode 100644 index 86a3d53dfd..0000000000 --- a/meta-networking/recipes-filter/nftables/files/0001-payload-explicit-network-ctx-assignment-for-icmp-icm.patch +++ /dev/null @@ -1,323 +0,0 @@ -From 0011985554e269e1cc8f8e5b41eb9dcd795ebe8c Mon Sep 17 00:00:00 2001 -From: Arturo Borrero Gonzalez <arturo@debian.org> -Date: Wed, 25 Jan 2017 12:51:08 +0100 -Subject: [PATCH] payload: explicit network ctx assignment for icmp/icmp6 in - special families - -In the inet, bridge and netdev families, we can add rules like these: - -% nft add rule inet t c ip protocol icmp icmp type echo-request -% nft add rule inet t c ip6 nexthdr icmpv6 icmpv6 type echo-request - -However, when we print the ruleset: - -% nft list ruleset -table inet t { - chain c { - icmpv6 type echo-request - icmp type echo-request - } -} - -These rules we obtain can't be added again: - -% nft add rule inet t c icmp type echo-request -<cmdline>:1:19-27: Error: conflicting protocols specified: inet-service vs. icmp -add rule inet t c icmp type echo-request - ^^^^^^^^^ - -% nft add rule inet t c icmpv6 type echo-request -<cmdline>:1:19-29: Error: conflicting protocols specified: inet-service vs. icmpv6 -add rule inet t c icmpv6 type echo-request - ^^^^^^^^^^^ - -Since I wouldn't expect an IP packet carrying ICMPv6, or IPv6 packet -carrying ICMP, if the link layer is inet, the network layer protocol context -can be safely update to 'ip' or 'ip6'. - -Moreover, nft currently generates a 'meta nfproto ipvX' depedency when -using icmp or icmp6 in the inet family, and similar in netdev and bridge -families. - -While at it, a bit of code factorization is introduced. - -Fixes: https://bugzilla.netfilter.org/show_bug.cgi?id=1073 -Signed-off-by: Arturo Borrero Gonzalez <arturo@debian.org> -Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> ---- -Upstream-Status: Backport -Signed-off-by: André Draszik <adraszik@tycoint.com> - src/payload.c | 70 ++++++++++++++++--------------------- - tests/py/any/icmpX.t.netdev | 8 +++++ - tests/py/any/icmpX.t.netdev.payload | 36 +++++++++++++++++++ - tests/py/bridge/icmpX.t | 8 +++++ - tests/py/bridge/icmpX.t.payload | 36 +++++++++++++++++++ - tests/py/inet/icmpX.t | 8 +++++ - tests/py/inet/icmpX.t.payload | 36 +++++++++++++++++++ - 7 files changed, 162 insertions(+), 40 deletions(-) - create mode 100644 tests/py/any/icmpX.t.netdev - create mode 100644 tests/py/any/icmpX.t.netdev.payload - create mode 100644 tests/py/bridge/icmpX.t - create mode 100644 tests/py/bridge/icmpX.t.payload - create mode 100644 tests/py/inet/icmpX.t - create mode 100644 tests/py/inet/icmpX.t.payload - -diff --git a/src/payload.c b/src/payload.c -index af533b2..74f8254 100644 ---- a/src/payload.c -+++ b/src/payload.c -@@ -223,6 +223,34 @@ static int payload_add_dependency(struct eval_ctx *ctx, - return 0; - } - -+static const struct proto_desc * -+payload_gen_special_dependency(struct eval_ctx *ctx, const struct expr *expr) -+{ -+ switch (expr->payload.base) { -+ case PROTO_BASE_LL_HDR: -+ switch (ctx->pctx.family) { -+ case NFPROTO_INET: -+ return &proto_inet; -+ case NFPROTO_BRIDGE: -+ return &proto_eth; -+ case NFPROTO_NETDEV: -+ return &proto_netdev; -+ default: -+ break; -+ } -+ break; -+ case PROTO_BASE_TRANSPORT_HDR: -+ if (expr->payload.desc == &proto_icmp) -+ return &proto_ip; -+ if (expr->payload.desc == &proto_icmp6) -+ return &proto_ip6; -+ return &proto_inet_service; -+ default: -+ break; -+ } -+ return NULL; -+} -+ - /** - * payload_gen_dependency - generate match expression on payload dependency - * -@@ -276,46 +304,8 @@ int payload_gen_dependency(struct eval_ctx *ctx, const struct expr *expr, - - desc = ctx->pctx.protocol[expr->payload.base - 1].desc; - /* Special case for mixed IPv4/IPv6 and bridge tables */ -- if (desc == NULL) { -- switch (ctx->pctx.family) { -- case NFPROTO_INET: -- switch (expr->payload.base) { -- case PROTO_BASE_LL_HDR: -- desc = &proto_inet; -- break; -- case PROTO_BASE_TRANSPORT_HDR: -- desc = &proto_inet_service; -- break; -- default: -- break; -- } -- break; -- case NFPROTO_BRIDGE: -- switch (expr->payload.base) { -- case PROTO_BASE_LL_HDR: -- desc = &proto_eth; -- break; -- case PROTO_BASE_TRANSPORT_HDR: -- desc = &proto_inet_service; -- break; -- default: -- break; -- } -- break; -- case NFPROTO_NETDEV: -- switch (expr->payload.base) { -- case PROTO_BASE_LL_HDR: -- desc = &proto_netdev; -- break; -- case PROTO_BASE_TRANSPORT_HDR: -- desc = &proto_inet_service; -- break; -- default: -- break; -- } -- break; -- } -- } -+ if (desc == NULL) -+ desc = payload_gen_special_dependency(ctx, expr); - - if (desc == NULL) - return expr_error(ctx->msgs, expr, -diff --git a/tests/py/any/icmpX.t.netdev b/tests/py/any/icmpX.t.netdev -new file mode 100644 -index 0000000..a327ce6 ---- /dev/null -+++ b/tests/py/any/icmpX.t.netdev -@@ -0,0 +1,8 @@ -+:ingress;type filter hook ingress device lo priority 0 -+ -+*netdev;test-netdev;ingress -+ -+ip protocol icmp icmp type echo-request;ok;icmp type echo-request -+icmp type echo-request;ok -+ip6 nexthdr icmpv6 icmpv6 type echo-request;ok;icmpv6 type echo-request -+icmpv6 type echo-request;ok -diff --git a/tests/py/any/icmpX.t.netdev.payload b/tests/py/any/icmpX.t.netdev.payload -new file mode 100644 -index 0000000..8b8107c ---- /dev/null -+++ b/tests/py/any/icmpX.t.netdev.payload -@@ -0,0 +1,36 @@ -+# ip protocol icmp icmp type echo-request -+netdev test-netdev ingress -+ [ meta load protocol => reg 1 ] -+ [ cmp eq reg 1 0x00000008 ] -+ [ payload load 1b @ network header + 9 => reg 1 ] -+ [ cmp eq reg 1 0x00000001 ] -+ [ payload load 1b @ transport header + 0 => reg 1 ] -+ [ cmp eq reg 1 0x00000008 ] -+ -+# icmp type echo-request -+netdev test-netdev ingress -+ [ meta load protocol => reg 1 ] -+ [ cmp eq reg 1 0x00000008 ] -+ [ payload load 1b @ network header + 9 => reg 1 ] -+ [ cmp eq reg 1 0x00000001 ] -+ [ payload load 1b @ transport header + 0 => reg 1 ] -+ [ cmp eq reg 1 0x00000008 ] -+ -+# ip6 nexthdr icmpv6 icmpv6 type echo-request -+netdev test-netdev ingress -+ [ meta load protocol => reg 1 ] -+ [ cmp eq reg 1 0x0000dd86 ] -+ [ payload load 1b @ network header + 6 => reg 1 ] -+ [ cmp eq reg 1 0x0000003a ] -+ [ payload load 1b @ transport header + 0 => reg 1 ] -+ [ cmp eq reg 1 0x00000080 ] -+ -+# icmpv6 type echo-request -+netdev test-netdev ingress -+ [ meta load protocol => reg 1 ] -+ [ cmp eq reg 1 0x0000dd86 ] -+ [ payload load 1b @ network header + 6 => reg 1 ] -+ [ cmp eq reg 1 0x0000003a ] -+ [ payload load 1b @ transport header + 0 => reg 1 ] -+ [ cmp eq reg 1 0x00000080 ] -+ -diff --git a/tests/py/bridge/icmpX.t b/tests/py/bridge/icmpX.t -new file mode 100644 -index 0000000..8c0a597 ---- /dev/null -+++ b/tests/py/bridge/icmpX.t -@@ -0,0 +1,8 @@ -+:input;type filter hook input priority 0 -+ -+*bridge;test-bridge;input -+ -+ip protocol icmp icmp type echo-request;ok;icmp type echo-request -+icmp type echo-request;ok -+ip6 nexthdr icmpv6 icmpv6 type echo-request;ok;icmpv6 type echo-request -+icmpv6 type echo-request;ok -diff --git a/tests/py/bridge/icmpX.t.payload b/tests/py/bridge/icmpX.t.payload -new file mode 100644 -index 0000000..19efdd8 ---- /dev/null -+++ b/tests/py/bridge/icmpX.t.payload -@@ -0,0 +1,36 @@ -+# ip protocol icmp icmp type echo-request -+bridge test-bridge input -+ [ payload load 2b @ link header + 12 => reg 1 ] -+ [ cmp eq reg 1 0x00000008 ] -+ [ payload load 1b @ network header + 9 => reg 1 ] -+ [ cmp eq reg 1 0x00000001 ] -+ [ payload load 1b @ transport header + 0 => reg 1 ] -+ [ cmp eq reg 1 0x00000008 ] -+ -+# icmp type echo-request -+bridge test-bridge input -+ [ payload load 2b @ link header + 12 => reg 1 ] -+ [ cmp eq reg 1 0x00000008 ] -+ [ payload load 1b @ network header + 9 => reg 1 ] -+ [ cmp eq reg 1 0x00000001 ] -+ [ payload load 1b @ transport header + 0 => reg 1 ] -+ [ cmp eq reg 1 0x00000008 ] -+ -+# ip6 nexthdr icmpv6 icmpv6 type echo-request -+bridge test-bridge input -+ [ payload load 2b @ link header + 12 => reg 1 ] -+ [ cmp eq reg 1 0x0000dd86 ] -+ [ payload load 1b @ network header + 6 => reg 1 ] -+ [ cmp eq reg 1 0x0000003a ] -+ [ payload load 1b @ transport header + 0 => reg 1 ] -+ [ cmp eq reg 1 0x00000080 ] -+ -+# icmpv6 type echo-request -+bridge test-bridge input -+ [ payload load 2b @ link header + 12 => reg 1 ] -+ [ cmp eq reg 1 0x0000dd86 ] -+ [ payload load 1b @ network header + 6 => reg 1 ] -+ [ cmp eq reg 1 0x0000003a ] -+ [ payload load 1b @ transport header + 0 => reg 1 ] -+ [ cmp eq reg 1 0x00000080 ] -+ -diff --git a/tests/py/inet/icmpX.t b/tests/py/inet/icmpX.t -new file mode 100644 -index 0000000..1b467a1 ---- /dev/null -+++ b/tests/py/inet/icmpX.t -@@ -0,0 +1,8 @@ -+:input;type filter hook input priority 0 -+ -+*inet;test-inet;input -+ -+ip protocol icmp icmp type echo-request;ok;icmp type echo-request -+icmp type echo-request;ok -+ip6 nexthdr icmpv6 icmpv6 type echo-request;ok;icmpv6 type echo-request -+icmpv6 type echo-request;ok -diff --git a/tests/py/inet/icmpX.t.payload b/tests/py/inet/icmpX.t.payload -new file mode 100644 -index 0000000..81ca774 ---- /dev/null -+++ b/tests/py/inet/icmpX.t.payload -@@ -0,0 +1,36 @@ -+# ip protocol icmp icmp type echo-request -+inet test-inet input -+ [ meta load nfproto => reg 1 ] -+ [ cmp eq reg 1 0x00000002 ] -+ [ payload load 1b @ network header + 9 => reg 1 ] -+ [ cmp eq reg 1 0x00000001 ] -+ [ payload load 1b @ transport header + 0 => reg 1 ] -+ [ cmp eq reg 1 0x00000008 ] -+ -+# icmp type echo-request -+inet test-inet input -+ [ meta load nfproto => reg 1 ] -+ [ cmp eq reg 1 0x00000002 ] -+ [ payload load 1b @ network header + 9 => reg 1 ] -+ [ cmp eq reg 1 0x00000001 ] -+ [ payload load 1b @ transport header + 0 => reg 1 ] -+ [ cmp eq reg 1 0x00000008 ] -+ -+# ip6 nexthdr icmpv6 icmpv6 type echo-request -+inet test-inet input -+ [ meta load nfproto => reg 1 ] -+ [ cmp eq reg 1 0x0000000a ] -+ [ payload load 1b @ network header + 6 => reg 1 ] -+ [ cmp eq reg 1 0x0000003a ] -+ [ payload load 1b @ transport header + 0 => reg 1 ] -+ [ cmp eq reg 1 0x00000080 ] -+ -+# icmpv6 type echo-request -+inet test-inet input -+ [ meta load nfproto => reg 1 ] -+ [ cmp eq reg 1 0x0000000a ] -+ [ payload load 1b @ network header + 6 => reg 1 ] -+ [ cmp eq reg 1 0x0000003a ] -+ [ payload load 1b @ transport header + 0 => reg 1 ] -+ [ cmp eq reg 1 0x00000080 ] -+ --- -2.11.0 - diff --git a/meta-networking/recipes-filter/nftables/files/0002-proto-Add-some-exotic-ICMPv6-types.patch b/meta-networking/recipes-filter/nftables/files/0002-proto-Add-some-exotic-ICMPv6-types.patch deleted file mode 100644 index 4d9e9d11a4..0000000000 --- a/meta-networking/recipes-filter/nftables/files/0002-proto-Add-some-exotic-ICMPv6-types.patch +++ /dev/null @@ -1,147 +0,0 @@ -From 9ade8fb75f8963375b45b3f2973b8bb7aa66ad76 Mon Sep 17 00:00:00 2001 -From: Phil Sutter <phil@nwl.cc> -Date: Thu, 16 Mar 2017 13:43:20 +0100 -Subject: [PATCH] proto: Add some exotic ICMPv6 types - -This adds support for matching on inverse ND messages as defined by -RFC3122 (not implemented in Linux) and MLDv2 as defined by RFC3810. - -Note that ICMPV6_MLD2_REPORT macro is defined in linux/icmpv6.h but -including that header leads to conflicts with symbols defined in -netinet/icmp6.h. - -In addition to the above, "mld-listener-done" is introduced as an alias -for "mld-listener-reduction". - -Signed-off-by: Phil Sutter <phil@nwl.cc> -Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> ---- -Upstream-Status: Backport -Signed-off-by: André Draszik <adraszik@tycoint.com> - src/proto.c | 8 ++++++++ - tests/py/ip6/icmpv6.t | 8 ++++++-- - tests/py/ip6/icmpv6.t.payload.ip6 | 34 +++++++++++++++++++++++++++++++++- - 3 files changed, 47 insertions(+), 3 deletions(-) - -diff --git a/src/proto.c b/src/proto.c -index fb96530..79e9dbf 100644 ---- a/src/proto.c -+++ b/src/proto.c -@@ -632,6 +632,10 @@ const struct proto_desc proto_ip = { - - #include <netinet/icmp6.h> - -+#define IND_NEIGHBOR_SOLICIT 141 -+#define IND_NEIGHBOR_ADVERT 142 -+#define ICMPV6_MLD2_REPORT 143 -+ - static const struct symbol_table icmp6_type_tbl = { - .base = BASE_DECIMAL, - .symbols = { -@@ -643,6 +647,7 @@ static const struct symbol_table icmp6_type_tbl = { - SYMBOL("echo-reply", ICMP6_ECHO_REPLY), - SYMBOL("mld-listener-query", MLD_LISTENER_QUERY), - SYMBOL("mld-listener-report", MLD_LISTENER_REPORT), -+ SYMBOL("mld-listener-done", MLD_LISTENER_REDUCTION), - SYMBOL("mld-listener-reduction", MLD_LISTENER_REDUCTION), - SYMBOL("nd-router-solicit", ND_ROUTER_SOLICIT), - SYMBOL("nd-router-advert", ND_ROUTER_ADVERT), -@@ -650,6 +655,9 @@ static const struct symbol_table icmp6_type_tbl = { - SYMBOL("nd-neighbor-advert", ND_NEIGHBOR_ADVERT), - SYMBOL("nd-redirect", ND_REDIRECT), - SYMBOL("router-renumbering", ICMP6_ROUTER_RENUMBERING), -+ SYMBOL("ind-neighbor-solicit", IND_NEIGHBOR_SOLICIT), -+ SYMBOL("ind-neighbor-advert", IND_NEIGHBOR_ADVERT), -+ SYMBOL("mld2-listener-report", ICMPV6_MLD2_REPORT), - SYMBOL_LIST_END - }, - }; -diff --git a/tests/py/ip6/icmpv6.t b/tests/py/ip6/icmpv6.t -index afbd451..a898fe3 100644 ---- a/tests/py/ip6/icmpv6.t -+++ b/tests/py/ip6/icmpv6.t -@@ -11,7 +11,8 @@ icmpv6 type echo-request accept;ok - icmpv6 type echo-reply accept;ok - icmpv6 type mld-listener-query accept;ok - icmpv6 type mld-listener-report accept;ok --icmpv6 type mld-listener-reduction accept;ok -+icmpv6 type mld-listener-done accept;ok -+icmpv6 type mld-listener-reduction accept;ok;icmpv6 type mld-listener-done accept - icmpv6 type nd-router-solicit accept;ok - icmpv6 type nd-router-advert accept;ok - icmpv6 type nd-neighbor-solicit accept;ok -@@ -19,8 +20,11 @@ icmpv6 type nd-neighbor-advert accept;ok - icmpv6 type nd-redirect accept;ok - icmpv6 type parameter-problem accept;ok - icmpv6 type router-renumbering accept;ok -+icmpv6 type ind-neighbor-solicit accept;ok -+icmpv6 type ind-neighbor-advert accept;ok -+icmpv6 type mld2-listener-report accept;ok - icmpv6 type {destination-unreachable, time-exceeded, nd-router-solicit} accept;ok --icmpv6 type {router-renumbering, mld-listener-reduction, time-exceeded, nd-router-solicit} accept;ok -+icmpv6 type {router-renumbering, mld-listener-done, time-exceeded, nd-router-solicit} accept;ok - icmpv6 type {mld-listener-query, time-exceeded, nd-router-advert} accept;ok - icmpv6 type != {mld-listener-query, time-exceeded, nd-router-advert} accept;ok - -diff --git a/tests/py/ip6/icmpv6.t.payload.ip6 b/tests/py/ip6/icmpv6.t.payload.ip6 -index 9fe2496..30f58ca 100644 ---- a/tests/py/ip6/icmpv6.t.payload.ip6 -+++ b/tests/py/ip6/icmpv6.t.payload.ip6 -@@ -54,6 +54,14 @@ ip6 test-ip6 input - [ cmp eq reg 1 0x00000083 ] - [ immediate reg 0 accept ] - -+# icmpv6 type mld-listener-done accept -+ip6 test-ip6 input -+ [ payload load 1b @ network header + 6 => reg 1 ] -+ [ cmp eq reg 1 0x0000003a ] -+ [ payload load 1b @ transport header + 0 => reg 1 ] -+ [ cmp eq reg 1 0x00000084 ] -+ [ immediate reg 0 accept ] -+ - # icmpv6 type mld-listener-reduction accept - ip6 test-ip6 input - [ payload load 1b @ network header + 6 => reg 1 ] -@@ -118,6 +126,30 @@ ip6 test-ip6 input - [ cmp eq reg 1 0x0000008a ] - [ immediate reg 0 accept ] - -+# icmpv6 type ind-neighbor-solicit accept -+ip6 test-ip6 input -+ [ payload load 1b @ network header + 6 => reg 1 ] -+ [ cmp eq reg 1 0x0000003a ] -+ [ payload load 1b @ transport header + 0 => reg 1 ] -+ [ cmp eq reg 1 0x0000008d ] -+ [ immediate reg 0 accept ] -+ -+# icmpv6 type ind-neighbor-advert accept -+ip6 test-ip6 input -+ [ payload load 1b @ network header + 6 => reg 1 ] -+ [ cmp eq reg 1 0x0000003a ] -+ [ payload load 1b @ transport header + 0 => reg 1 ] -+ [ cmp eq reg 1 0x0000008e ] -+ [ immediate reg 0 accept ] -+ -+# icmpv6 type mld2-listener-report accept -+ip6 test-ip6 input -+ [ payload load 1b @ network header + 6 => reg 1 ] -+ [ cmp eq reg 1 0x0000003a ] -+ [ payload load 1b @ transport header + 0 => reg 1 ] -+ [ cmp eq reg 1 0x0000008f ] -+ [ immediate reg 0 accept ] -+ - # icmpv6 type {destination-unreachable, time-exceeded, nd-router-solicit} accept - __set%d test-ip6 3 - __set%d test-ip6 0 -@@ -129,7 +161,7 @@ ip6 test-ip6 input - [ lookup reg 1 set __set%d ] - [ immediate reg 0 accept ] - --# icmpv6 type {router-renumbering, mld-listener-reduction, time-exceeded, nd-router-solicit} accept -+# icmpv6 type {router-renumbering, mld-listener-done, time-exceeded, nd-router-solicit} accept - __set%d test-ip6 3 - __set%d test-ip6 0 - element 0000008a : 0 [end] element 00000084 : 0 [end] element 00000003 : 0 [end] element 00000085 : 0 [end] --- -2.11.0 - diff --git a/meta-networking/recipes-filter/nftables/files/0003-payload-split-ll-proto-dependency-into-helper.patch b/meta-networking/recipes-filter/nftables/files/0003-payload-split-ll-proto-dependency-into-helper.patch deleted file mode 100644 index 50cac300e8..0000000000 --- a/meta-networking/recipes-filter/nftables/files/0003-payload-split-ll-proto-dependency-into-helper.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 8d8cfe5ad6ca460a5262fb15fdbef3601058c784 Mon Sep 17 00:00:00 2001 -From: Florian Westphal <fw@strlen.de> -Date: Thu, 18 May 2017 13:30:54 +0200 -Subject: [PATCH 1/4] payload: split ll proto dependency into helper - -will be re-used in folloup patch for icmp/icmpv6 depenency -handling. - -Signed-off-by: Florian Westphal <fw@strlen.de> ---- -Upstream-Status: Backport -Signed-off-by: André Draszik <adraszik@tycoint.com> - src/payload.c | 29 ++++++++++++++++++----------- - 1 file changed, 18 insertions(+), 11 deletions(-) - -diff --git a/src/payload.c b/src/payload.c -index 55128fe..31e5a02 100644 ---- a/src/payload.c -+++ b/src/payload.c -@@ -224,21 +224,28 @@ static int payload_add_dependency(struct eval_ctx *ctx, - } - - static const struct proto_desc * -+payload_get_get_ll_hdr(const struct eval_ctx *ctx) -+{ -+ switch (ctx->pctx.family) { -+ case NFPROTO_INET: -+ return &proto_inet; -+ case NFPROTO_BRIDGE: -+ return &proto_eth; -+ case NFPROTO_NETDEV: -+ return &proto_netdev; -+ default: -+ break; -+ } -+ -+ return NULL; -+} -+ -+static const struct proto_desc * - payload_gen_special_dependency(struct eval_ctx *ctx, const struct expr *expr) - { - switch (expr->payload.base) { - case PROTO_BASE_LL_HDR: -- switch (ctx->pctx.family) { -- case NFPROTO_INET: -- return &proto_inet; -- case NFPROTO_BRIDGE: -- return &proto_eth; -- case NFPROTO_NETDEV: -- return &proto_netdev; -- default: -- break; -- } -- break; -+ return payload_get_get_ll_hdr(ctx); - case PROTO_BASE_TRANSPORT_HDR: - if (expr->payload.desc == &proto_icmp) - return &proto_ip; --- -2.11.0 - diff --git a/meta-networking/recipes-filter/nftables/files/0004-src-allow-update-of-net-base-w.-meta-l4proto-icmpv6.patch b/meta-networking/recipes-filter/nftables/files/0004-src-allow-update-of-net-base-w.-meta-l4proto-icmpv6.patch deleted file mode 100644 index 180edb3504..0000000000 --- a/meta-networking/recipes-filter/nftables/files/0004-src-allow-update-of-net-base-w.-meta-l4proto-icmpv6.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 9a1f2bbf3cd2417e0c10d18578e224abe2071d68 Mon Sep 17 00:00:00 2001 -From: Florian Westphal <fw@strlen.de> -Date: Tue, 21 Mar 2017 19:47:22 +0100 -Subject: [PATCH 2/4] src: allow update of net base w. meta l4proto icmpv6 - -nft add rule ip6 f i meta l4proto ipv6-icmp icmpv6 type nd-router-advert -<cmdline>:1:50-60: Error: conflicting protocols specified: unknown vs. icmpv6 - -add icmpv6 to nexthdr list so base gets updated correctly. - -Reported-by: Thomas Woerner <twoerner@redhat.com> -Signed-off-by: Florian Westphal <fw@strlen.de> ---- -Upstream-Status: Backport -Signed-off-by: André Draszik <adraszik@tycoint.com> - src/proto.c | 1 + - tests/py/any/meta.t | 1 + - tests/py/any/meta.t.payload | 7 +++++++ - 3 files changed, 9 insertions(+) - -diff --git a/src/proto.c b/src/proto.c -index 79e9dbf..fcdfbe7 100644 ---- a/src/proto.c -+++ b/src/proto.c -@@ -779,6 +779,7 @@ const struct proto_desc proto_inet_service = { - PROTO_LINK(IPPROTO_TCP, &proto_tcp), - PROTO_LINK(IPPROTO_DCCP, &proto_dccp), - PROTO_LINK(IPPROTO_SCTP, &proto_sctp), -+ PROTO_LINK(IPPROTO_ICMPV6, &proto_icmp6), - }, - .templates = { - [0] = PROTO_META_TEMPLATE("l4proto", &inet_protocol_type, NFT_META_L4PROTO, 8), -diff --git a/tests/py/any/meta.t b/tests/py/any/meta.t -index c3ac0a4..2ff942f 100644 ---- a/tests/py/any/meta.t -+++ b/tests/py/any/meta.t -@@ -38,6 +38,7 @@ meta l4proto { 33, 55, 67, 88};ok;meta l4proto { 33, 55, 67, 88} - meta l4proto != { 33, 55, 67, 88};ok - meta l4proto { 33-55};ok - meta l4proto != { 33-55};ok -+meta l4proto ipv6-icmp icmpv6 type nd-router-advert;ok;icmpv6 type nd-router-advert - - meta priority root;ok - meta priority none;ok -diff --git a/tests/py/any/meta.t.payload b/tests/py/any/meta.t.payload -index e432656..871f1ad 100644 ---- a/tests/py/any/meta.t.payload -+++ b/tests/py/any/meta.t.payload -@@ -187,6 +187,13 @@ ip test-ip4 input - [ byteorder reg 1 = hton(reg 1, 2, 1) ] - [ lookup reg 1 set __set%d 0x1 ] - -+# meta l4proto ipv6-icmp icmpv6 type nd-router-advert -+ip test-ip4 input -+ [ meta load l4proto => reg 1 ] -+ [ cmp eq reg 1 0x0000003a ] -+ [ payload load 1b @ transport header + 0 => reg 1 ] -+ [ cmp eq reg 1 0x00000086 ] -+ - # meta mark 0x4 - ip test-ip4 input - [ meta load mark => reg 1 ] --- -2.11.0 - diff --git a/meta-networking/recipes-filter/nftables/files/0005-src-ipv6-switch-implicit-dependencies-to-meta-l4prot.patch b/meta-networking/recipes-filter/nftables/files/0005-src-ipv6-switch-implicit-dependencies-to-meta-l4prot.patch deleted file mode 100644 index f600ae05c0..0000000000 --- a/meta-networking/recipes-filter/nftables/files/0005-src-ipv6-switch-implicit-dependencies-to-meta-l4prot.patch +++ /dev/null @@ -1,98 +0,0 @@ -From 2366ed9ffcb4f5f5341f10f0a1d1a4688d37ad87 Mon Sep 17 00:00:00 2001 -From: Florian Westphal <fw@strlen.de> -Date: Wed, 22 Mar 2017 15:08:48 +0100 -Subject: [PATCH 3/4] src: ipv6: switch implicit dependencies to meta l4proto - -when using rule like - -ip6 filter input tcp dport 22 -nft generates: - [ payload load 1b @ network header + 6 => reg 1 ] - [ cmp eq reg 1 0x00000006 ] - [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00001600 ] - -which is: ip6 filter input ip6 nexthdr tcp dport 22 -IOW, such a rule won't match if e.g. a fragment header is in place. - -This changes ip6_proto to use 'meta l4proto' which is the protocol header -found by exthdr walk. - -A side effect is that for bridge we get a shorter dependency chain as it -no longer needs to prepend 'ether proto ipv6' for old 'ip6 nexthdr' dep. - -Only problem: - -ip6 nexthdr tcp tcp dport 22 -will now inject a (useless) meta l4 dependency as ip6 nexthdr is no -longer flagged as EXPR_F_PROTOCOL, to avoid this add a small helper -that skips the unneded meta dependency in that case. - -Signed-off-by: Florian Westphal <fw@strlen.de> ---- -Upstream-Status: Backport -Signed-off-by: André Draszik <adraszik@tycoint.com> - src/payload.c | 19 ++++++++++++++++++- - src/proto.c | 2 +- - 2 files changed, 19 insertions(+), 2 deletions(-) - -diff --git a/src/payload.c b/src/payload.c -index 31e5a02..38db15e 100644 ---- a/src/payload.c -+++ b/src/payload.c -@@ -117,6 +117,23 @@ static const struct expr_ops payload_expr_ops = { - .pctx_update = payload_expr_pctx_update, - }; - -+/* -+ * ipv6 is special case, we normally use 'meta l4proto' to fetch the last -+ * l4 header of the ipv6 extension header chain so we will also match -+ * tcp after a fragmentation header, for instance. -+ * -+ * If user specifically asks for nexthdr x, treat is as a full -+ * dependency rather than injecting another (useless) meta l4 one. -+ */ -+static bool proto_key_is_protocol(const struct proto_desc *desc, unsigned int type) -+{ -+ if (type == desc->protocol_key || -+ (desc == &proto_ip6 && type == IP6HDR_NEXTHDR)) -+ return true; -+ -+ return false; -+} -+ - struct expr *payload_expr_alloc(const struct location *loc, - const struct proto_desc *desc, - unsigned int type) -@@ -129,7 +146,7 @@ struct expr *payload_expr_alloc(const struct location *loc, - if (desc != NULL) { - tmpl = &desc->templates[type]; - base = desc->base; -- if (type == desc->protocol_key) -+ if (proto_key_is_protocol(desc, type)) - flags = EXPR_F_PROTOCOL; - } else { - tmpl = &proto_unknown_template; -diff --git a/src/proto.c b/src/proto.c -index fcdfbe7..3b20a5f 100644 ---- a/src/proto.c -+++ b/src/proto.c -@@ -707,7 +707,6 @@ const struct proto_desc proto_icmp6 = { - const struct proto_desc proto_ip6 = { - .name = "ip6", - .base = PROTO_BASE_NETWORK_HDR, -- .protocol_key = IP6HDR_NEXTHDR, - .protocols = { - PROTO_LINK(IPPROTO_ESP, &proto_esp), - PROTO_LINK(IPPROTO_AH, &proto_ah), -@@ -720,6 +719,7 @@ const struct proto_desc proto_ip6 = { - PROTO_LINK(IPPROTO_ICMPV6, &proto_icmp6), - }, - .templates = { -+ [0] = PROTO_META_TEMPLATE("l4proto", &inet_protocol_type, NFT_META_L4PROTO, 8), - [IP6HDR_VERSION] = HDR_BITFIELD("version", &integer_type, 0, 4), - [IP6HDR_DSCP] = HDR_BITFIELD("dscp", &dscp_type, 4, 6), - [IP6HDR_ECN] = HDR_BITFIELD("ecn", &ecn_type, 10, 2), --- -2.11.0 - diff --git a/meta-networking/recipes-filter/nftables/files/0006-payload-enforce-ip-ip6-protocol-depending-on-icmp-or.patch b/meta-networking/recipes-filter/nftables/files/0006-payload-enforce-ip-ip6-protocol-depending-on-icmp-or.patch deleted file mode 100644 index 00076d7cef..0000000000 --- a/meta-networking/recipes-filter/nftables/files/0006-payload-enforce-ip-ip6-protocol-depending-on-icmp-or.patch +++ /dev/null @@ -1,84 +0,0 @@ -From f21a7a4849b50c30341ec571813bd7fe37040ad3 Mon Sep 17 00:00:00 2001 -From: Florian Westphal <fw@strlen.de> -Date: Thu, 18 May 2017 13:30:54 +0200 -Subject: [PATCH 4/4] payload: enforce ip/ip6 protocol depending on icmp or - icmpv6 - -After some discussion with Pablo we agreed to treat icmp/icmpv6 specially. - -in the case of a rule like 'tcp dport 22' the inet, bridge and netdev -families only care about the lower layer protocol. - -In the icmpv6 case however we'd like to also enforce an ipv6 protocol check -(and ipv4 check in icmp case). - -This extends payload_gen_special_dependency() to consider this. -With this patch: - -add rule $pf filter input meta l4proto icmpv6 -add rule $pf filter input meta l4proto icmpv6 icmpv6 type echo-request -add rule $pf filter input icmpv6 type echo-request - -will work in all tables and all families. -For inet/bridge/netdev, an ipv6 protocol dependency is added; this will -not match ipv4 packets with ip->protocol == icmpv6, EXCEPT in the case -of the ip family. - -Its still possible to match icmpv6-in-ipv4 in inet/bridge/netdev with an -explicit dependency: - -add rule inet f i ip protocol ipv6-icmp meta l4proto ipv6-icmp icmpv6 type ... - -Implicit dependencies won't get removed at the moment, so - bridge ... icmp type echo-request -will be shown as - ether type ip meta l4proto 1 icmp type echo-request - -Signed-off-by: Florian Westphal <fw@strlen.de> ---- -Upstream-Status: Backport -Signed-off-by: André Draszik <adraszik@tycoint.com> - src/payload.c | 27 +++++++++++++++++++++++---- - 1 file changed, 23 insertions(+), 4 deletions(-) - -diff --git a/src/payload.c b/src/payload.c -index 38db15e..8796ee5 100644 ---- a/src/payload.c -+++ b/src/payload.c -@@ -264,10 +264,29 @@ payload_gen_special_dependency(struct eval_ctx *ctx, const struct expr *expr) - case PROTO_BASE_LL_HDR: - return payload_get_get_ll_hdr(ctx); - case PROTO_BASE_TRANSPORT_HDR: -- if (expr->payload.desc == &proto_icmp) -- return &proto_ip; -- if (expr->payload.desc == &proto_icmp6) -- return &proto_ip6; -+ if (expr->payload.desc == &proto_icmp || -+ expr->payload.desc == &proto_icmp6) { -+ const struct proto_desc *desc, *desc_upper; -+ struct stmt *nstmt; -+ -+ desc = ctx->pctx.protocol[PROTO_BASE_LL_HDR].desc; -+ if (!desc) { -+ desc = payload_get_get_ll_hdr(ctx); -+ if (!desc) -+ break; -+ } -+ -+ desc_upper = &proto_ip6; -+ if (expr->payload.desc == &proto_icmp) -+ desc_upper = &proto_ip; -+ -+ if (payload_add_dependency(ctx, desc, desc_upper, -+ expr, &nstmt) < 0) -+ return NULL; -+ -+ list_add_tail(&nstmt->list, &ctx->stmt->list); -+ return desc_upper; -+ } - return &proto_inet_service; - default: - break; --- -2.11.0 - diff --git a/meta-networking/recipes-filter/nftables/files/0007-src-ip-switch-implicit-dependencies-to-meta-l4proto-.patch b/meta-networking/recipes-filter/nftables/files/0007-src-ip-switch-implicit-dependencies-to-meta-l4proto-.patch deleted file mode 100644 index 5b72437d27..0000000000 --- a/meta-networking/recipes-filter/nftables/files/0007-src-ip-switch-implicit-dependencies-to-meta-l4proto-.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 0825c57d571bb7121e7048e198b9b023f7e7f358 Mon Sep 17 00:00:00 2001 -From: Florian Westphal <fw@strlen.de> -Date: Sun, 7 May 2017 03:53:30 +0200 -Subject: [PATCH] src: ip: switch implicit dependencies to meta l4proto too - -after ip6 nexthdr also switch ip to meta l4proto instead of ip protocol. - -While its needed for ipv6 (due to extension headers) this isn't needed -for ip but it has the advantage that - -tcp dport 22 - -produces same expressions for ip/ip6/inet families. - -Signed-off-by: Florian Westphal <fw@strlen.de> ---- -Upstream-Status: Backport -Signed-off-by: André Draszik <adraszik@tycoint.com> - src/payload.c | 17 +++++++++++------ - src/proto.c | 3 ++- - 2 files changed, 13 insertions(+), 7 deletions(-) - -diff --git a/src/payload.c b/src/payload.c -index 8796ee5..11b6df3 100644 ---- a/src/payload.c -+++ b/src/payload.c -@@ -118,17 +118,22 @@ static const struct expr_ops payload_expr_ops = { - }; - - /* -- * ipv6 is special case, we normally use 'meta l4proto' to fetch the last -- * l4 header of the ipv6 extension header chain so we will also match -+ * We normally use 'meta l4proto' to fetch the last l4 header of the -+ * ipv6 extension header chain so we will also match - * tcp after a fragmentation header, for instance. -+ * For consistency we also use meta l4proto for ipv4. - * -- * If user specifically asks for nexthdr x, treat is as a full -- * dependency rather than injecting another (useless) meta l4 one. -+ * If user specifically asks for nexthdr x, don't add another (useless) -+ * meta dependency. - */ - static bool proto_key_is_protocol(const struct proto_desc *desc, unsigned int type) - { -- if (type == desc->protocol_key || -- (desc == &proto_ip6 && type == IP6HDR_NEXTHDR)) -+ if (type == desc->protocol_key) -+ return true; -+ -+ if (desc == &proto_ip6 && type == IP6HDR_NEXTHDR) -+ return true; -+ if (desc == &proto_ip && type == IPHDR_PROTOCOL) - return true; - - return false; -diff --git a/src/proto.c b/src/proto.c -index 3b20a5f..2afedf7 100644 ---- a/src/proto.c -+++ b/src/proto.c -@@ -587,7 +587,6 @@ const struct proto_desc proto_ip = { - .name = "ip", - .base = PROTO_BASE_NETWORK_HDR, - .checksum_key = IPHDR_CHECKSUM, -- .protocol_key = IPHDR_PROTOCOL, - .protocols = { - PROTO_LINK(IPPROTO_ICMP, &proto_icmp), - PROTO_LINK(IPPROTO_ESP, &proto_esp), -@@ -600,6 +599,7 @@ const struct proto_desc proto_ip = { - PROTO_LINK(IPPROTO_SCTP, &proto_sctp), - }, - .templates = { -+ [0] = PROTO_META_TEMPLATE("l4proto", &inet_protocol_type, NFT_META_L4PROTO, 8), - [IPHDR_VERSION] = HDR_BITFIELD("version", &integer_type, 0, 4), - [IPHDR_HDRLENGTH] = HDR_BITFIELD("hdrlength", &integer_type, 4, 4), - [IPHDR_DSCP] = HDR_BITFIELD("dscp", &dscp_type, 8, 6), -@@ -779,6 +779,7 @@ const struct proto_desc proto_inet_service = { - PROTO_LINK(IPPROTO_TCP, &proto_tcp), - PROTO_LINK(IPPROTO_DCCP, &proto_dccp), - PROTO_LINK(IPPROTO_SCTP, &proto_sctp), -+ PROTO_LINK(IPPROTO_ICMP, &proto_icmp), - PROTO_LINK(IPPROTO_ICMPV6, &proto_icmp6), - }, - .templates = { --- -2.11.0 - diff --git a/meta-networking/recipes-filter/nftables/files/fix-to-generate-ntf.8.patch b/meta-networking/recipes-filter/nftables/files/fix-to-generate-ntf.8.patch deleted file mode 100644 index 8dce90a754..0000000000 --- a/meta-networking/recipes-filter/nftables/files/fix-to-generate-ntf.8.patch +++ /dev/null @@ -1,26 +0,0 @@ -[PATCH] disable to make ntf.8 man - -Upstream-Status: Pending - -$DB2MAN do not support the xinclude parameter whether it is -docbook2x-man or other, so disable to make ntf.8 man - -Signed-off-by: Roy Li <rongqing.li@windriver.com> ---- - doc/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/doc/Makefile.am b/doc/Makefile.am -index a92de7f..537c36b 100644 ---- a/doc/Makefile.am -+++ b/doc/Makefile.am -@@ -1,5 +1,5 @@ - if BUILD_MAN --man_MANS = nft.8 -+#man_MANS = nft.8 - endif - - if BUILD_PDF --- -1.9.1 - diff --git a/meta-networking/recipes-filter/nftables/nftables/0001-tests-shell-Fix-sets-reset_command_0-for-current-ker.patch b/meta-networking/recipes-filter/nftables/nftables/0001-tests-shell-Fix-sets-reset_command_0-for-current-ker.patch new file mode 100644 index 0000000000..164182bb1e --- /dev/null +++ b/meta-networking/recipes-filter/nftables/nftables/0001-tests-shell-Fix-sets-reset_command_0-for-current-ker.patch @@ -0,0 +1,53 @@ +From 7a6089a400a573b9a4fd92f29c00a6be7b8ef269 Mon Sep 17 00:00:00 2001 +From: Phil Sutter <phil@nwl.cc> +Date: Thu, 2 Nov 2023 16:02:14 +0100 +Subject: [PATCH] tests: shell: Fix sets/reset_command_0 for current kernels + +Since kernel commit 4c90bba60c26 ("netfilter: nf_tables: do not refresh +timeout when resetting element"), element reset won't touch expiry +anymore. Invert the one check to make sure it remains unaltered, drop +the other testing behaviour for per-element timeouts. + +Signed-off-by: Phil Sutter <phil@nwl.cc> + +Upstream-Status: Backport +[https://git.netfilter.org/nftables/commit/?id=7a6089a400a573b9a4fd92f29c00a6be7b8ef269] + +Signed-off-by: William Lyu <William.Lyu@windriver.com> +--- + tests/shell/testcases/sets/reset_command_0 | 10 ++-------- + 1 file changed, 2 insertions(+), 8 deletions(-) + +diff --git a/tests/shell/testcases/sets/reset_command_0 b/tests/shell/testcases/sets/reset_command_0 +index e663dac8..d38ddb3f 100755 +--- a/tests/shell/testcases/sets/reset_command_0 ++++ b/tests/shell/testcases/sets/reset_command_0 +@@ -44,10 +44,10 @@ elem='element t s { 1.0.0.1 . udp . 53 }' + grep 'elements = ' | drop_seconds | uniq | wc -l) == 1 ]] + echo OK + +-echo -n "counters and expiry are reset: " ++echo -n "counters are reset, expiry left alone: " + NEW=$($NFT "get $elem") + grep -q 'counter packets 0 bytes 0' <<< "$NEW" +-[[ $(expires_minutes <<< "$NEW") -gt 20 ]] ++[[ $(expires_minutes <<< "$NEW") -lt 20 ]] + echo OK + + echo -n "get map elem matches reset map elem: " +@@ -80,12 +80,6 @@ OUT=$($NFT reset map t m) + $DIFF -u <(echo "$EXP") <(echo "$OUT") + echo OK + +-echo -n "reset command respects per-element timeout: " +-VAL=$($NFT get element t s '{ 2.0.0.2 . tcp . 22 }' | expires_minutes) +-[[ $VAL -lt 15 ]] # custom timeout applies +-[[ $VAL -gt 10 ]] # expires was reset +-echo OK +- + echo -n "remaining elements are reset: " + OUT=$($NFT list ruleset) + grep -q '2.0.0.2 . tcp . 22 counter packets 0 bytes 0' <<< "$OUT" +-- +2.43.0 + diff --git a/meta-networking/recipes-filter/nftables/nftables/0001-tests-shell-skip-secmark-tests-if-kernel-does-not-su.patch b/meta-networking/recipes-filter/nftables/nftables/0001-tests-shell-skip-secmark-tests-if-kernel-does-not-su.patch new file mode 100644 index 0000000000..2a966ab443 --- /dev/null +++ b/meta-networking/recipes-filter/nftables/nftables/0001-tests-shell-skip-secmark-tests-if-kernel-does-not-su.patch @@ -0,0 +1,46 @@ +From fff913c1eefbc84eb2d9c52038ef29fe881e9ee9 Mon Sep 17 00:00:00 2001 +From: Pablo Neira Ayuso <pablo@netfilter.org> +Date: Tue, 21 Nov 2023 21:16:38 +0100 +Subject: [PATCH] tests: shell: skip secmark tests if kernel does not support + it + +Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> + +Upstream-Status: Backport +[https://git.netfilter.org/nftables/commit/?id=fff913c1eefbc84eb2d9c52038ef29fe881e9ee9] + +Signed-off-by: William Lyu <William.Lyu@windriver.com> +--- + tests/shell/features/secmark.nft | 7 +++++++ + tests/shell/testcases/json/0005secmark_objref_0 | 1 + + 2 files changed, 8 insertions(+) + create mode 100644 tests/shell/features/secmark.nft + +diff --git a/tests/shell/features/secmark.nft b/tests/shell/features/secmark.nft +new file mode 100644 +index 00000000..ccbb572f +--- /dev/null ++++ b/tests/shell/features/secmark.nft +@@ -0,0 +1,7 @@ ++# fb961945457f ("netfilter: nf_tables: add SECMARK support") ++# v4.20-rc1~14^2~125^2~5 ++table inet x { ++ secmark ssh_server { ++ "system_u:object_r:ssh_server_packet_t:s0" ++ } ++} +diff --git a/tests/shell/testcases/json/0005secmark_objref_0 b/tests/shell/testcases/json/0005secmark_objref_0 +index 992d1b00..5c44f093 100755 +--- a/tests/shell/testcases/json/0005secmark_objref_0 ++++ b/tests/shell/testcases/json/0005secmark_objref_0 +@@ -1,6 +1,7 @@ + #!/bin/bash + + # NFT_TEST_REQUIRES(NFT_TEST_HAVE_json) ++# NFT_TEST_REQUIRES(NFT_TEST_HAVE_secmark) + + set -e + +-- +2.43.0 + diff --git a/meta-networking/recipes-filter/nftables/nftables/run-ptest b/meta-networking/recipes-filter/nftables/nftables/run-ptest new file mode 100644 index 0000000000..32ddf9f455 --- /dev/null +++ b/meta-networking/recipes-filter/nftables/nftables/run-ptest @@ -0,0 +1,18 @@ +#!/bin/sh + +NFTABLESLIB=@libdir@/nftables +cd ${NFTABLESLIB}/ptest || exit 1 + +LOG="${NFTABLESLIB}/ptest/nftables_ptest_$(date +%Y%m%d-%H%M%S).log" +NFT=nft +tests/shell/run-tests.sh -v | sed -E '/I: \[OK\]/ s/^/PASS: / ; /W: \[(CHK DUMP|VALGRIND|TAINTED|DUMP FAIL|FAILED)\]/ s/^/FAIL: /' | sed "s,\x1B\[[0-9;]*[a-zA-Z],,g" | tee -a "${LOG}" + +passed=$(grep -c PASS: "${LOG}") +failed=$(grep -c FAIL: "${LOG}") +all=$((passed + failed)) + +( echo "=== Test Summary ===" + echo "TOTAL: ${all}" + echo "PASSED: ${passed}" + echo "FAILED: ${failed}" +) | tee -a "${LOG}" diff --git a/meta-networking/recipes-filter/nftables/nftables_0.7.bb b/meta-networking/recipes-filter/nftables/nftables_0.7.bb deleted file mode 100644 index 0ea79953be..0000000000 --- a/meta-networking/recipes-filter/nftables/nftables_0.7.bb +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "Netfilter Tables userspace utillites" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=d1a78fdd879a263a5e0b42d1fc565e79" -SECTION = "net" - -DEPENDS = "libmnl libnftnl readline gmp" -RRECOMMENDS_${PN} += "kernel-module-nf-tables \ - " - -SRC_URI = "http://www.netfilter.org/projects/nftables/files/${BP}.tar.bz2 \ - file://fix-to-generate-ntf.8.patch \ - \ - file://0001-payload-explicit-network-ctx-assignment-for-icmp-icm.patch \ - file://0002-proto-Add-some-exotic-ICMPv6-types.patch \ - \ - file://0003-payload-split-ll-proto-dependency-into-helper.patch \ - file://0004-src-allow-update-of-net-base-w.-meta-l4proto-icmpv6.patch \ - file://0005-src-ipv6-switch-implicit-dependencies-to-meta-l4prot.patch \ - file://0006-payload-enforce-ip-ip6-protocol-depending-on-icmp-or.patch \ - file://0007-src-ip-switch-implicit-dependencies-to-meta-l4proto-.patch \ - " -SRC_URI[md5sum] = "4c005e76a15a029afaba71d7db21d065" -SRC_URI[sha256sum] = "fe639239d801ce5890397f6f4391c58a934bfc27d8b7d5ef922692de5ec4ed43" - -ASNEEDED = "" - -inherit autotools pkgconfig diff --git a/meta-networking/recipes-filter/nftables/nftables_1.0.9.bb b/meta-networking/recipes-filter/nftables/nftables_1.0.9.bb new file mode 100644 index 0000000000..17f00ffd42 --- /dev/null +++ b/meta-networking/recipes-filter/nftables/nftables_1.0.9.bb @@ -0,0 +1,106 @@ +SUMMARY = "Netfilter Tables userspace utillites" +DESCRIPTION = "nftables replaces the popular {ip,ip6,arp,eb}tables. \ + This software provides an in-kernel packet classification framework \ + that is based on a network-specific Virtual Machine (VM), \ + nft, a userspace command line tool and libnftables, a high-level userspace library." +HOMEPAGE = "https://netfilter.org/projects/nftables" +SECTION = "net" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=81ec33bb3e47b460fc993ac768c74b62" + +DEPENDS = "libmnl libnftnl bison-native \ + ${@bb.utils.contains('PACKAGECONFIG', 'mini-gmp', '', 'gmp', d)}" + +SRC_URI = "http://www.netfilter.org/projects/nftables/files/${BP}.tar.xz \ + file://0001-tests-shell-Fix-sets-reset_command_0-for-current-ker.patch \ + file://0001-tests-shell-skip-secmark-tests-if-kernel-does-not-su.patch \ + file://run-ptest \ + " +SRC_URI[sha256sum] = "a3c304cd9ba061239ee0474f9afb938a9bb99d89b960246f66f0c3a0a85e14cd" + +inherit autotools manpages pkgconfig ptest + +PACKAGECONFIG ?= "python readline json" +PACKAGECONFIG[editline] = "--with-cli=editline, , libedit, , , linenoise readline" +PACKAGECONFIG[json] = "--with-json, --without-json, jansson" +PACKAGECONFIG[linenoise] = "--with-cli=linenoise, , linenoise, , , editline readline" +PACKAGECONFIG[manpages] = "--enable-man-doc, --disable-man-doc, asciidoc-native" +PACKAGECONFIG[mini-gmp] = "--with-mini-gmp, --without-mini-gmp" +PACKAGECONFIG[python] = ",, python3-setuptools-native" +PACKAGECONFIG[readline] = "--with-cli=readline, , readline, , , editline linenoise" +PACKAGECONFIG[xtables] = "--with-xtables, --without-xtables, iptables" + +EXTRA_OECONF = " \ + ${@bb.utils.contains_any('PACKAGECONFIG', 'editline linenoise readline', '', '--without-cli', d)}" + +SETUPTOOLS_SETUP_PATH = "${S}/py" + +inherit_defer ${@bb.utils.contains('PACKAGECONFIG', 'python', 'setuptools3', '', d)} + +PACKAGES =+ "${@bb.utils.contains('PACKAGECONFIG', 'python', '${PN}-python', '', d)}" +FILES:${PN}-python = "${PYTHON_SITEPACKAGES_DIR}" +RDEPENDS:${PN}-python = "python3-core python3-json ${PN}" + +# Explicitly define do_configure, do_compile and do_install because both autotools and setuptools3 +# have EXPORT_FUNCTIONS do_configure do_compile do_install +do_configure() { + autotools_do_configure + if ${@bb.utils.contains('PACKAGECONFIG', 'python', 'true', 'false', d)}; then + setuptools3_do_configure + fi +} + +do_compile() { + autotools_do_compile + if ${@bb.utils.contains('PACKAGECONFIG', 'python', 'true', 'false', d)}; then + setuptools3_do_compile + fi +} + +do_install() { + autotools_do_install + if ${@bb.utils.contains('PACKAGECONFIG', 'python', 'true', 'false', d)}; then + setuptools3_do_install + fi +} + +RDEPENDS:${PN}-ptest += " ${PN}-python bash coreutils make iproute2 iputils-ping procps python3-core python3-ctypes python3-json python3-misc sed util-linux" + +RRECOMMENDS:${PN}-ptest += "\ +kernel-module-nft-chain-nat kernel-module-nft-queue \ +kernel-module-nft-compat kernel-module-nft-quota \ +kernel-module-nft-connlimit kernel-module-nft-redir \ +kernel-module-nft-ct kernel-module-nft-reject \ +kernel-module-nft-flow-offload kernel-module-nft-reject-inet \ +kernel-module-nft-hash kernel-module-nft-reject-ipv4 \ +kernel-module-nft-limit kernel-module-nft-reject-ipv6 \ +kernel-module-nft-log kernel-module-nft-socket \ +kernel-module-nft-masq kernel-module-nft-synproxy \ +kernel-module-nft-nat kernel-module-nft-tunnel \ +kernel-module-nft-numgen kernel-module-nft-xfrm \ +kernel-module-nft-osf \ +kernel-module-nf-flow-table \ +kernel-module-nf-flow-table-inet \ +kernel-module-nf-nat \ +kernel-module-nf-log-syslog \ +kernel-module-nf-nat-ftp \ +kernel-module-nf-nat-sip \ +kernel-module-8021q \ +kernel-module-dummy" + +TESTDIR = "tests" + +PRIVATE_LIBS:${PN}-ptest:append = " libnftables.so.1" + +do_install_ptest() { + cp -rf ${S}/build-aux ${D}${PTEST_PATH} + cp -rf ${S}/src ${D}${PTEST_PATH} + mkdir -p ${D}${PTEST_PATH}/src/.libs + cp -rf ${B}/src/.libs/* ${D}${PTEST_PATH}/src/.libs + cp -rf ${B}/src/.libs/nft ${D}${PTEST_PATH}/src/ + cp -rf ${S}/${TESTDIR} ${D}${PTEST_PATH}/${TESTDIR} + sed -i 's#/usr/bin/python#/usr/bin/python3#' ${D}${PTEST_PATH}/${TESTDIR}/json_echo/run-test.py + sed -i 's#/usr/bin/env python#/usr/bin/env python3#' ${D}${PTEST_PATH}/${TESTDIR}/py/nft-test.py + # handle multilib + sed -i s:@libdir@:${libdir}:g ${D}${PTEST_PATH}/run-ptest +} diff --git a/meta-networking/recipes-filter/ulogd2/ulogd2/ulogd.init b/meta-networking/recipes-filter/ulogd2/ulogd2/ulogd.init new file mode 100644 index 0000000000..05d284e725 --- /dev/null +++ b/meta-networking/recipes-filter/ulogd2/ulogd2/ulogd.init @@ -0,0 +1,180 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: ulogd2 ulogd +# Required-Start: $local_fs +# Should-Start: +# Required-Stop: $local_fs +# Should-Stop: +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Userspace logging daemon for netfilter/iptables +### END INIT INFO + +# The definition of actions: (From LSB 3.1.0) +# start start the service +# stop stop the service +# restart stop and restart the service if the service is already running, +# otherwise start the service +# try-restart restart the service if the service is already running +# reload cause the configuration of the service to be reloaded without +# actually stopping and restarting the service +# force-reload cause the configuration to be reloaded if the service supports +# this, otherwise restart the service if it is running +# status print the current status of the service + +# The start, stop, restart, force-reload, and status actions shall be supported +# by all init scripts; the reload and the try-restart actions are optional + +# PATH should only include /usr/* if it runs after the mountnfs.sh script +PATH=/sbin:/usr/sbin:/bin:/usr/bin + +DESC="Userspace logging daemon for netfilter/iptables" +NAME="ulogd" +DAEMON=/usr/sbin/$NAME +DAEMON_ARGS="-d" +PIDFILE=/var/run/$NAME.pid + +. /etc/init.d/functions || exit 1 + +# Exit if the package is not installed +[ -x "$DAEMON" ] || exit 0 + +# Read configuration variable file if it is present +[ -r /etc/default/$NAME ] && . /etc/default/$NAME + +# +# Function that starts the daemon/service +# +do_start() { + local status pid + + status=0 + pid=`pidofproc $NAME` || status=$? + case $status in + 0) + echo "$DESC already running ($pid)." + exit 1 + ;; + *) + echo "Starting $DESC ..." + exec $DAEMON $DAEMON_ARGS >/dev/null 2>&1 || status=$? + echo "ERROR: Failed to start $DESC." + exit $status + ;; + esac + + # Add code here, if necessary, that waits for the process to be ready + # to handle requests from services started subsequently which depend + # on this one. As a last resort, sleep for some time. +} + +# +# Function that stops the daemon/service +# +do_stop() { + local pid status + + status=0 + pid=`pidofproc $NAME` || status=$? + case $status in + 0) + # Exit when fail to stop, the kill would complain when fail + kill -s 15 $pid >/dev/null && rm -f $PIDFILE && \ + echo "Stopped $DESC ($pid)." || exit $? + ;; + *) + echo "$DESC is not running; none killed." >&2 + ;; + esac + + # Wait for children to finish too if this is a daemon that forks + # and if the daemon is only ever run from this initscript. + # If the above conditions are not satisfied then add some other code + # that waits for the process to drop all resources that could be + # needed by services started subsequently. A last resort is to + # sleep for some time. + return $status +} + +# +# Function that sends a SIGHUP to the daemon/service +# +do_reload() { + local pid status + + status=0 + # If the daemon can reload its configuration without + # restarting (for example, when it is sent a SIGHUP), + # then implement that here. + pid=`pidofproc $NAME` || status=$? + case $status in + 0) + echo "Reloading $DESC ..." + kill -s 1 $pid || exit $? + ;; + *) + echo "$DESC is not running; none reloaded." >&2 + ;; + esac + exit $status +} + + +# +# Function that shows the daemon/service status +# +status_of_proc () { + local pid status + + status=0 + # pidof output null when no program is running, so no "2>/dev/null". + pid=`pidofproc $NAME` || status=$? + case $status in + 0) + echo "$DESC is running ($pid)." + exit 0 + ;; + *) + echo "$DESC is not running." >&2 + exit $status + ;; + esac +} + +case "$1" in +start) + do_start + ;; +stop) + do_stop || exit $? + ;; +status) + status_of_proc + ;; +restart) + # Always start the service regardless the status of do_stop + do_stop + do_start + ;; +try-restart|force-reload) + # force-reload is the same as reload or try-restart according + # to its definition, the reload is not implemented here, so + # force-reload is the alias of try-restart here, but it should + # be the alias of reload if reload is implemented. + # + # Only start the service when do_stop succeeds + do_stop && do_start + ;; +reload) + # If the "reload" action is implemented properly, then let the + # force-reload be the alias of reload, and remove it from + # try-restart|force-reload) + # + do_reload + ;; +*) + echo "Usage: $0 {start|stop|status|restart|try-restart|force-reload}" >&2 + exit 3 + ;; +esac + diff --git a/meta-networking/recipes-filter/ulogd2/ulogd2/ulogd.service b/meta-networking/recipes-filter/ulogd2/ulogd2/ulogd.service new file mode 100644 index 0000000000..cf62962a95 --- /dev/null +++ b/meta-networking/recipes-filter/ulogd2/ulogd2/ulogd.service @@ -0,0 +1,11 @@ +[Unit] +Description=Netfilter Ulogd daemon +Before=network-pre.target +Wants=network-pre.target + +[Service] +ExecStart=@SBINDIR@/ulogd +ExecReload=kill -HUP ${MAINPID} + +[Install] +WantedBy=multi-user.target diff --git a/meta-networking/recipes-filter/ulogd2/ulogd2_2.0.8.bb b/meta-networking/recipes-filter/ulogd2/ulogd2_2.0.8.bb new file mode 100644 index 0000000000..635fa6a408 --- /dev/null +++ b/meta-networking/recipes-filter/ulogd2/ulogd2_2.0.8.bb @@ -0,0 +1,80 @@ +SUMMARY = "Userspace logging daemon for netfilter/iptables" +DESCRIPTION = "ulogd-2.x provides a flexible, almost universal logging daemon for \ +netfilter logging. This encompasses both packet-based logging (logging of \ +policy violations) and flow-based logging, e.g. for accounting purpose." +HOMEPAGE = "https://www.netfilter.org/projects/ulogd/index.html" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b" + +DEPENDS = "libnfnetlink" +PROVIDES = "ulogd" + +PV .= "+git" + +SRC_URI = "git://git.netfilter.org/ulogd2;branch=master \ + file://ulogd.init \ + file://ulogd.service \ +" +SRCREV = "79aa980f2df9dda0c097e8f883a62f414b9e5138" + +S = "${WORKDIR}/git" + +inherit autotools manpages pkgconfig systemd update-rc.d + +PACKAGECONFIG ?= "dbi json nfacct nfct nflog pcap sqlite3 ulog" +PACKAGECONFIG[dbi] = "--enable-dbi,--disable-dbi,libdbi" +PACKAGECONFIG[json] = "--enable-json,--disable-json,jansson" +PACKAGECONFIG[manpages] = "" +PACKAGECONFIG[mysql] = "--enable-mysql,--disable-mysql,mysql5" +PACKAGECONFIG[nfacct] = "--enable-nfacct,--disable-nfacct,libnetfilter-acct" +PACKAGECONFIG[nfct] = "--enable-nfct,--disable-nfct,libnetfilter-conntrack" +PACKAGECONFIG[nflog] = "--enable-nflog,--disable-nflog,libnetfilter-log" +PACKAGECONFIG[pcap] = "--enable-pcap,--disable-pcap,libpcap" +PACKAGECONFIG[pgsql] = "--enable-pgsql,--disable-pgsql,postgresql" +PACKAGECONFIG[sqlite3] = "--enable-sqlite3,--disable-sqlite3,sqlite3" +PACKAGECONFIG[ulog] = "--enable-ulog,--disable-ulog" + +do_install:append () { + install -d ${D}${sysconfdir} + install -m 0644 ${B}/ulogd.conf ${D}${sysconfdir}/ulogd.conf + + install -d ${D}${mandir}/man8 + install -m 0644 ${S}/ulogd.8 ${D}${mandir}/man8/ulogd.8 + + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${UNPACKDIR}/ulogd.service ${D}${systemd_system_unitdir} + sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_system_unitdir}/ulogd.service + + install -d ${D}${sysconfdir}/init.d + install -m 755 ${UNPACKDIR}/ulogd.init ${D}${sysconfdir}/init.d/ulogd +} + +PACKAGES += "${PN}-plugins" +ALLOW_EMPTY:${PN}-plugins = "1" + +PACKAGES_DYNAMIC += "^${PN}-plugin-.*$" +NOAUTOPACKAGEDEBUG = "1" + +CONFFILES:${PN} = "${sysconfdir}/ulogd.conf" +RRECOMMENDS:${PN} += "${PN}-plugins" + +FILES:${PN}-dbg += "${sbindir}/.debug" + +python split_ulogd_libs () { + libdir = d.expand('${libdir}/ulogd') + dbglibdir = os.path.join(libdir, '.debug') + + split_packages = do_split_packages(d, libdir, r'^ulogd_.*\_([A-Z0-9]*).so', '${PN}-plugin-%s', 'ulogd2 %s plugin', prepend=True) + split_dbg_packages = do_split_packages(d, dbglibdir, r'^ulogd_.*\_([A-Z0-9]*).so', '${PN}-plugin-%s-dbg', 'ulogd2 %s plugin - Debugging files', prepend=True, extra_depends='${PN}-dbg') + + if split_packages: + pn = d.getVar('PN') + d.setVar('RRECOMMENDS:' + pn + '-plugins', ' '.join(split_packages)) + d.appendVar('RRECOMMENDS:' + pn + '-dbg', ' ' + ' '.join(split_dbg_packages)) +} +PACKAGESPLITFUNCS:prepend = "split_ulogd_libs " + +SYSTEMD_SERVICE:${PN} = "ulogd.service" + +INITSCRIPT_NAME = "ulogd" +INITSCRIPT_PARAMS = "defaults" diff --git a/meta-networking/recipes-irc/weechat/weechat/0001-use-pkg-config-for-gcrypt-instead.patch b/meta-networking/recipes-irc/weechat/weechat/0001-use-pkg-config-for-gcrypt-instead.patch new file mode 100644 index 0000000000..4a33dd7204 --- /dev/null +++ b/meta-networking/recipes-irc/weechat/weechat/0001-use-pkg-config-for-gcrypt-instead.patch @@ -0,0 +1,37 @@ +From dc6b11f4cc6035b4701e1d7f7c91b2f45757e7a2 Mon Sep 17 00:00:00 2001 +From: Alejandro Enedino Hernandez Samaniego + <alejandro@enedino.org> +Date: Wed, 26 Feb 2020 13:55:16 -0800 +Subject: [PATCH] use pkg-config for gcrypt instead + +Signed-off-by: Alejandro Enedino Hernandez Samaniego <alejandro@enedino.org> + +Upstream-Status: Inappropriate [oe-specific] + +--- + cmake/FindGCRYPT.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: weechat-2.7.1/cmake/FindGCRYPT.cmake +=================================================================== +--- weechat-2.7.1.orig/cmake/FindGCRYPT.cmake ++++ weechat-2.7.1/cmake/FindGCRYPT.cmake +@@ -27,15 +27,15 @@ + # GCRYPT_LDFLAGS = ldflags to use to compile + # + +-find_program(LIBGCRYPT_CONFIG_EXECUTABLE NAMES libgcrypt-config) ++find_program(LIBGCRYPT_CONFIG_EXECUTABLE NAMES pkg-config) + + set(GCRYPT_LDFLAGS) + set(GCRYPT_CFLAGS) + + if(LIBGCRYPT_CONFIG_EXECUTABLE) + +- execute_process(COMMAND ${LIBGCRYPT_CONFIG_EXECUTABLE} --libs RESULT_VARIABLE _return_VALUE OUTPUT_VARIABLE GCRYPT_LDFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET) +- execute_process(COMMAND ${LIBGCRYPT_CONFIG_EXECUTABLE} --cflags RESULT_VARIABLE _return_VALUE OUTPUT_VARIABLE GCRYPT_CFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET) ++ execute_process(COMMAND ${LIBGCRYPT_CONFIG_EXECUTABLE} libgcrypt --libs RESULT_VARIABLE _return_VALUE OUTPUT_VARIABLE GCRYPT_LDFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET) ++ execute_process(COMMAND ${LIBGCRYPT_CONFIG_EXECUTABLE} libgcrypt --cflags RESULT_VARIABLE _return_VALUE OUTPUT_VARIABLE GCRYPT_CFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET) + + if(NOT DEFINED ${GCRYPT_CFLAGS}) + set(GCRYPT_CFLAGS " ") diff --git a/meta-networking/recipes-irc/weechat/weechat_4.0.4.bb b/meta-networking/recipes-irc/weechat/weechat_4.0.4.bb new file mode 100644 index 0000000000..d13764e4c7 --- /dev/null +++ b/meta-networking/recipes-irc/weechat/weechat_4.0.4.bb @@ -0,0 +1,36 @@ +SUMMARY = "Full-featured IRC plugin: multi-servers, proxy support, IPv6, SASL authentication, nicklist, DCC, and many other features" +HOMEPAE = "https://weechat.org/" +SECTION = "net" +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" + +DEPENDS = "openssl zlib icu libgcrypt gnutls curl aspell zstd" + +SRC_URI = "https://weechat.org/files/src/weechat-${PV}.tar.xz \ + file://0001-use-pkg-config-for-gcrypt-instead.patch \ + " + +SRC_URI[sha256sum] = "ae5f4979b5ada0339b84e741d5f7e481ee91e3fecd40a09907b64751829eb6f6" + +inherit cmake pkgconfig + +PACKAGECONFIG ??= " ncurses python" +PACKAGECONFIG[ncurses] = "-DENABLE_NCURSES=ON,-DENABLE_NCURSES=OFF,ncurses" +PACKAGECONFIG[python] = "-DENABLE_PYTHON=ON,-DENABLE_PYTHON=OFF,python3,python3" + +EXTRA_OECMAKE:append = " -DENABLE_PHP=OFF -DENABLE_TCL=OFF -DENABLE_LUA=OFF \ + -DENABLE_JAVASCRIPT=OFF -DENABLE_RUBY=OFF \ + -DENABLE_GUILE=OFF -DENABLE_PERL=OFF -DENABLE_ASPELL=ON \ + -DLIBDIR=${libdir}" + +do_configure:prepend(){ + # Make sure we get dependencies from recipe-sysroot + sed -i -e 's# /usr/bin# ${RECIPE_SYSROOT}/${bindir}/#g' ${S}/cmake/FindPerl.cmake + sed -i -e 's# /usr/local/bin##g' ${S}/cmake/FindPerl.cmake + sed -i -e 's# /usr/pkg/bin##g' ${S}/cmake/FindPerl.cmake +} + +do_install:append(){ + rm -rf ${D}/${datadir} +} + diff --git a/meta-networking/recipes-irc/znc/znc_git.bb b/meta-networking/recipes-irc/znc/znc_1.8.2.bb index c2d71563a1..1517384eca 100644 --- a/meta-networking/recipes-irc/znc/znc_git.bb +++ b/meta-networking/recipes-irc/znc/znc_1.8.2.bb @@ -1,17 +1,15 @@ SUMMARY = "ZNC, an advanced IRC bouncer" SECTION = "net" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" DEPENDS = "openssl zlib icu" -PV = "1.6.0" - -SRC_URI = "git://github.com/znc/znc.git;name=znc \ - git://github.com/jimloco/Csocket.git;destsuffix=git/third_party/Csocket;name=Csocket \ +SRC_URI = "git://github.com/znc/znc.git;name=znc;branch=master;protocol=https \ + git://github.com/jimloco/Csocket.git;destsuffix=git/third_party/Csocket;name=Csocket;branch=master;protocol=https \ " -SRCREV_znc = "f47e8465efa4e1cd948b9caae93ac401b4355df8" -SRCREV_Csocket = "07b4437396122650e5b8fb3d014e820a5decf4ee" +SRCREV_znc = "bf253640d33d03331310778e001fb6f5aba2989e" +SRCREV_Csocket = "e8d9e0bb248c521c2c7fa01e1c6a116d929c41b4" # This constructs a composite revision based on multiple SRCREV's. # @@ -25,10 +23,10 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," # ZNC has a custom autogen.sh that states that this command is needed *and* expected to fail -do_configure_prepend() { +do_configure:prepend() { automake --add-missing || true } -do_install_append() { - sed -i 's/-fdebug-prefix-map[^ ]*//g; s#${STAGING_DIR_TARGET}##g' ${D}${libdir}/pkgconfig/*.pc +do_install:append() { + sed -i -e 's|${DEBUG_PREFIX_MAP}||g; s|--sysroot=${STAGING_DIR_TARGET}||g' ${D}${libdir}/pkgconfig/*.pc } diff --git a/meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20170810.bb b/meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20170810.bb deleted file mode 100644 index 2c69c58f8b..0000000000 --- a/meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20170810.bb +++ /dev/null @@ -1,31 +0,0 @@ -require wireguard.inc - -inherit module kernel-module-split - -DEPENDS = "virtual/kernel libmnl" - -# This module requires Linux 3.10 higher and several networking related -# configuration options. For exact kernel requirements visit: -# https://www.wireguard.io/install/#kernel-requirements - -EXTRA_OEMAKE_append = " \ - KERNELDIR=${STAGING_KERNEL_DIR} \ - " - -MAKE_TARGETS = "module" - -RRECOMMENDS_${PN} = "kernel-module-xt-hashlimit" -MODULE_NAME = "wireguard" - -# Kernel module packages MUST begin with 'kernel-module-', otherwise -# multilib image generation can fail. -# -# The following line is only necessary if the recipe name does not begin -# with kernel-module-. -PKG_${PN} = "kernel-module-${MODULE_NAME}" - -module_do_install() { - install -d ${D}/lib/modules/${KERNEL_VERSION}/kernel/${MODULE_NAME} - install -m 0644 ${MODULE_NAME}.ko \ - ${D}/lib/modules/${KERNEL_VERSION}/kernel/${MODULE_NAME}/${MODULE_NAME}.ko -} diff --git a/meta-networking/recipes-kernel/wireguard/wireguard-module_1.0.20220627.bb b/meta-networking/recipes-kernel/wireguard/wireguard-module_1.0.20220627.bb new file mode 100644 index 0000000000..d80bdd87ab --- /dev/null +++ b/meta-networking/recipes-kernel/wireguard/wireguard-module_1.0.20220627.bb @@ -0,0 +1,30 @@ +require wireguard.inc + +SRCREV = "18fbcd68a35a892527345dc5679d0b2d860ee004" + +SRC_URI = "git://git.zx2c4.com/wireguard-linux-compat;protocol=https;branch=master" + +inherit module kernel-module-split + +DEPENDS = "virtual/kernel libmnl" + +# This module requires Linux 3.10 higher and several networking related +# configuration options. For exact kernel requirements visit: +# https://www.wireguard.io/install/#kernel-requirements + +EXTRA_OEMAKE:append = " \ + KERNELDIR=${STAGING_KERNEL_DIR} \ + " + +MAKE_TARGETS = "module" +MODULES_INSTALL_TARGET = "module-install" + +RRECOMMENDS:${PN} = "kernel-module-xt-hashlimit" +MODULE_NAME = "wireguard" + + +# WireGuard has been merged into Linux kernel >= 5.6 and therefore this compatibility module is no longer required. +# OE-core post dunfell has moved to use kernel 5.8 which now means we cant build this module in world builds +# for reference machines e.g. qemu +EXCLUDE_FROM_WORLD = "1" + diff --git a/meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20170810.bb b/meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20170810.bb deleted file mode 100644 index c4ddbcb0e9..0000000000 --- a/meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20170810.bb +++ /dev/null @@ -1,27 +0,0 @@ -require wireguard.inc - -inherit bash-completion systemd pkgconfig - -DEPENDS = "wireguard-module libmnl" - -do_compile_prepend () { - cd ${S}/tools -} - -do_install () { - cd ${S}/tools - oe_runmake DESTDIR="${D}" PREFIX="${prefix}" SYSCONFDIR="${sysconfdir}" \ - SYSTEMDUNITDIR="${systemd_unitdir}" \ - WITH_SYSTEMDUNITS=${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'yes', '', d)} \ - WITH_BASHCOMPLETION=yes \ - WITH_WGQUICK=yes \ - install -} - -FILES_${PN} = " \ - ${sysconfdir} \ - ${systemd_unitdir} \ - ${bindir} \ -" - -RDEPENDS_${PN} = "wireguard-module bash" diff --git a/meta-networking/recipes-kernel/wireguard/wireguard-tools_1.0.20210914.bb b/meta-networking/recipes-kernel/wireguard/wireguard-tools_1.0.20210914.bb new file mode 100644 index 0000000000..8def54ece6 --- /dev/null +++ b/meta-networking/recipes-kernel/wireguard/wireguard-tools_1.0.20210914.bb @@ -0,0 +1,32 @@ +require wireguard.inc + +SRCREV = "3ba6527130c502144e7388b900138bca6260f4e8" +SRC_URI = "git://git.zx2c4.com/wireguard-tools;branch=master" + +inherit bash-completion systemd pkgconfig + +DEPENDS += "libmnl" + +do_install () { + oe_runmake DESTDIR="${D}" PREFIX="${prefix}" SYSCONFDIR="${sysconfdir}" \ + SYSTEMDUNITDIR="${systemd_system_unitdir}" \ + WITH_SYSTEMDUNITS=${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'yes', '', d)} \ + ${PACKAGECONFIG_CONFARGS} \ + install +} + +PACKAGECONFIG ??= "bash-completion wg-quick" + +PACKAGECONFIG[bash-completion] = "WITH_BASHCOMPLETION=yes,WITH_BASHCOMPLETION=no,,bash,," +PACKAGECONFIG[wg-quick] = "WITH_WGQUICK=yes,WITH_WGQUICK=no,,bash,," + +FILES:${PN} = " \ + ${bindir}/wg \ + ${sysconfdir} \ + ${bindir}/wg-quick \ + ${systemd_system_unitdir} \ +" + +RRECOMMENDS:${PN} = " \ + kernel-module-wireguard \ + " diff --git a/meta-networking/recipes-kernel/wireguard/wireguard.inc b/meta-networking/recipes-kernel/wireguard/wireguard.inc index f37d52b222..6fac24e3bd 100644 --- a/meta-networking/recipes-kernel/wireguard/wireguard.inc +++ b/meta-networking/recipes-kernel/wireguard/wireguard.inc @@ -6,12 +6,8 @@ TLS-based solutions like OpenVPN, while being more secure, more performant, \ and easier to use." SECTION = "networking" HOMEPAGE = "https://www.wireguard.io/" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://../COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRC_URI = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${PV}.tar.xz" -SRC_URI[md5sum] = "8dd3e080407b8295c25565a847a4ca27" -SRC_URI[sha256sum] = "ab96230390625aad6f4816fa23aef6e9f7fee130f083d838919129ff12089bf7" - -S = "${WORKDIR}/WireGuard-${PV}/src/" +S = "${WORKDIR}/git/src" diff --git a/meta-networking/recipes-netkit/netkit-ftp/netkit-ftp/0001-ftp-include-sys-types.h-for-u_long.patch b/meta-networking/recipes-netkit/netkit-ftp/netkit-ftp/0001-ftp-include-sys-types.h-for-u_long.patch deleted file mode 100644 index 8376603ead..0000000000 --- a/meta-networking/recipes-netkit/netkit-ftp/netkit-ftp/0001-ftp-include-sys-types.h-for-u_long.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 2ee0c51d81a0a08d64b64ab624074e5f7cd9615a Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 15 Jul 2017 00:07:32 -0700 -Subject: [PATCH] ftp: include sys/types.h for u_long - -fixes -ftp.c:1091:2: error: unknown type name 'u_long'; did you mean 'long'? - u_long a1,a2,a3,a4,p1,p2; - ^~~~~~ - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - ftp/ftp.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/ftp/ftp.c b/ftp/ftp.c -index 7a56af6..5dcb513 100644 ---- a/ftp/ftp.c -+++ b/ftp/ftp.c -@@ -43,6 +43,7 @@ char ftp_rcsid[] = - #include <sys/socket.h> - #include <sys/time.h> - #include <sys/file.h> -+#include <sys/types.h> - - #include <netinet/in.h> - #include <netinet/ip.h> --- -2.13.3 - diff --git a/meta-networking/recipes-netkit/netkit-ftp/netkit-ftp/Add_ARG_MAX_define.patch b/meta-networking/recipes-netkit/netkit-ftp/netkit-ftp/Add_ARG_MAX_define.patch deleted file mode 100644 index 5a47fd9175..0000000000 --- a/meta-networking/recipes-netkit/netkit-ftp/netkit-ftp/Add_ARG_MAX_define.patch +++ /dev/null @@ -1,28 +0,0 @@ -This adds ARG_MAX define to be _SC_ARG_MAX - -Upstream-Status: Inappropriate. -Most distros have their own verion for this fix. - -Signed-off-by: Armin Kuster <akuster808@gmail.com> - -Index: netkit-ftp-0.17/ftp/glob.c -=================================================================== ---- netkit-ftp-0.17.orig/ftp/glob.c -+++ netkit-ftp-0.17/ftp/glob.c -@@ -50,6 +50,7 @@ char glob_rcsid[] = - #include <stdio.h> - #include <stdlib.h> - #include <string.h> -+#include <unistd.h> - - #include "ftp_var.h" /* for protos only */ - #include "glob.h" -@@ -57,6 +58,9 @@ char glob_rcsid[] = - #define QUOTE 0200 - #define TRIM 0177 - #define eq(a,b) (strcmp(a, b)==0) -+#ifndef ARG_MAX -+#define ARG_MAX (sysconf(_SC_ARG_MAX)) -+#endif - #define GAVSIZ (ARG_MAX/6) - #define isdir(d) ((d.st_mode & S_IFMT) == S_IFDIR) diff --git a/meta-networking/recipes-netkit/netkit-ftp/netkit-ftp_0.17.bb b/meta-networking/recipes-netkit/netkit-ftp/netkit-ftp_0.17.bb deleted file mode 100644 index 394a69e629..0000000000 --- a/meta-networking/recipes-netkit/netkit-ftp/netkit-ftp_0.17.bb +++ /dev/null @@ -1,47 +0,0 @@ -DESCRIPTION = "netkit-ft includes the ftp client." -SECTION = "net" -HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit" -LICENSE = "BSD" - -LIC_FILES_CHKSUM = "file://ftp/ftp.c;beginline=2;endline=3;md5=2d40a75a50d83b8f6317b3f53db72bfa" - -SRC_URI = "${DEBIAN_MIRROR}/main/n/netkit-ftp/netkit-ftp_${PV}.orig.tar.gz;name=archive \ - ${DEBIAN_MIRROR}/main/n/netkit-ftp/netkit-ftp_${PV}-31.debian.tar.xz;name=patch31 \ - file://Add_ARG_MAX_define.patch \ - file://0001-ftp-include-sys-types.h-for-u_long.patch \ - " - -SRC_URI[archive.md5sum] = "94441610c9b86ef45c4c6ec609444060" -SRC_URI[archive.sha256sum] = "61c913299b81a4671ff089aac821329f7db9bc111aa812993dd585798b700349" -SRC_URI[patch31.md5sum] = "93d71e28ce70df69e080c7f90da63cac" -SRC_URI[patch31.sha256sum] = "4edd46a32d70daa7ba00f0ebf0118dc5d17dff23d6e46aa21a2722be2e22d1c1" - -inherit autotools-brokensep - -do_configure () { - ./configure --prefix=${prefix} - echo "LDFLAGS=${LDFLAGS}" >> MCONFIG -} - -BINMODE = "0755" -MANMODE = "0644" - -do_install () { - install -d ${D}${bindir} - install -d ${D}${mandir}/man1 - install -d ${D}${mandir}/man5 - - install -m${BINMODE} ${S}/ftp/ftp ${D}${bindir} - ln -sf ftp ${D}${bindir}/pftp - install -m${MANMODE} ${S}/ftp/ftp.1 ${D}${mandir}/man1 - ln -sf ftp.1 ${D}${mandir}/man1/pftp.1 - install -m${MANMODE} ${S}/ftp/netrc.5 ${D}${mandir}/man5 -} - -PACKAGES = "${PN} ${PN}-doc ${BPN}-dbg" -FILES_${PN} = "${bindir}/*" -FILES_${PN}-doc = "${mandir}" -FILES_${PN}-dbg = "${prefix}/src/debug \ - ${bindir}/.debug" - -RDEPENDS_${PN} = "readline" diff --git a/meta-networking/recipes-netkit/netkit-rpc/netkit-rpc/0001-rpcgen-Fix-printf-formats.patch b/meta-networking/recipes-netkit/netkit-rpc/netkit-rpc/0001-rpcgen-Fix-printf-formats.patch deleted file mode 100644 index 8bd77d2e47..0000000000 --- a/meta-networking/recipes-netkit/netkit-rpc/netkit-rpc/0001-rpcgen-Fix-printf-formats.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 439e3e35f7fcbff1abb782de4b19b31e43ae3449 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 27 Jun 2017 09:59:19 -0700 -Subject: [PATCH] rpcgen: Fix printf formats - -Fixes build with hardening flags - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - rpcgen/rpc_hout.c | 2 +- - rpcgen/rpc_tblout.c | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/rpcgen/rpc_hout.c b/rpcgen/rpc_hout.c -index 0ef52df..09a7b57 100644 ---- a/rpcgen/rpc_hout.c -+++ b/rpcgen/rpc_hout.c -@@ -474,7 +474,7 @@ pdeclaration(const char *name, declaration *dec, int tab, - break; - } - } -- f_print(fout, separator ); -+ f_print(fout, "%s", separator ); - } - - static int -diff --git a/rpcgen/rpc_tblout.c b/rpcgen/rpc_tblout.c -index d64bfde..fd62a52 100644 ---- a/rpcgen/rpc_tblout.c -+++ b/rpcgen/rpc_tblout.c -@@ -99,7 +99,7 @@ write_table(const definition *def) - } - else { - expected = 1; -- f_print(fout, null_entry); -+ f_print(fout, "%s", null_entry); - } - for (proc = vp->procs; proc != NULL; proc = proc->next) { - current = atoi(proc->proc_num); -@@ -139,7 +139,7 @@ write_table(const definition *def) - } - - /* print the table trailer */ -- f_print(fout, tbl_end); -+ f_print(fout, "%s", tbl_end); - f_print(fout, tbl_nproc, progvers, progvers, progvers); - } - } --- -2.13.2 - diff --git a/meta-networking/recipes-netkit/netkit-rpc/netkit-rpc/gcc4.patch b/meta-networking/recipes-netkit/netkit-rpc/netkit-rpc/gcc4.patch deleted file mode 100644 index d54cea9fdc..0000000000 --- a/meta-networking/recipes-netkit/netkit-rpc/netkit-rpc/gcc4.patch +++ /dev/null @@ -1,39 +0,0 @@ -This fixes an issue when building with gcc 4.x - -https://github.com/openembedded/openembedded/tree/master/recipes/netkit-rpc/netkit-rpc - -Upstream-status: Backported - -Signed-off-By: Armin Kuster <akuster808@gmail.com> - ---- netkit-rpc-0.17/rpcgen/rpc_cout.c~gcc4 -+++ netkit-rpc-0.17/rpcgen/rpc_cout.c -@@ -101,8 +101,6 @@ - case DEF_TYPEDEF: - emit_typedef(def); - break; -- default: -- /* can't happen */ - } - print_trailer(); - } -@@ -664,9 +662,6 @@ - decl->name,decl->array_max); - emit_single_in_line(decl,flag,REL_VECTOR); - f_print(fout,"\t\t }\n\t\t };\n"); -- -- default: -- /* ?... do nothing I guess */ - } - } - ---- netkit-rpc-0.17/rpcgen/rpc_hout.c~gcc4 -+++ netkit-rpc-0.17/rpcgen/rpc_hout.c -@@ -106,8 +106,6 @@ - f_print(fout, "\n"); - pprogramdef(def); - break; -- default: -- /* ?... shouldn't happen I guess */ - } - } diff --git a/meta-networking/recipes-netkit/netkit-rpc/netkit-rpc_0.17.bb b/meta-networking/recipes-netkit/netkit-rpc/netkit-rpc_0.17.bb deleted file mode 100644 index 9487fdc2c0..0000000000 --- a/meta-networking/recipes-netkit/netkit-rpc/netkit-rpc_0.17.bb +++ /dev/null @@ -1,44 +0,0 @@ -DESCRIPTION = "netkit-rpc includes rpcinfo and rpcgen." -HOMEPAGE = "http://ftp.linux.org.uk/pub/linux/Networking/netkit" -SECTION = "net" -LICENSE = "SPL-1.0" -LIC_FILES_CHKSUM = "file://rpcinfo/rpcinfo.c;beginline=2;endline=3;md5=3e6339e3ce266e1122c5ba293e04bc89" - -DEPENDS_append_libc-musl = " libtirpc" -SRC_URI = "http://sources.openembedded.org/${BPN}-${PV}.tar.gz \ - file://gcc4.patch \ - file://0001-rpcgen-Fix-printf-formats.patch \ - " -SRC_URI[md5sum] = "67212720482ea1aea9182a98653a9642" -SRC_URI[sha256sum] = "421d63b414162237a72867061f1bd3e3752a0d962cd5d30b5e933ddad8a14d3b" -CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc" -LIBS_append_libc-musl = " -ltirpc" - -do_configure () { - ./configure --prefix=${prefix} - echo "LDFLAGS=${LDFLAGS}" > MCONFIG - echo "CC=${CC}" >> MCONFIG - echo "LD=${LD}" >> MCONFIG - echo "CFLAGS=${CFLAGS}" >> MCONFIG - echo "LDFLAGS=${LDFLAGS}" >> MCONFIG - echo "LIBS=${LIBS}" >> MCONFIG -} - -do_compile () { - oe_runmake 'CC=${CC}' 'LD=${LD}' 'LDFLAGS=${LDFLAGS}' -} - -do_install () { - install -d ${D}${bindir} - install -d ${D}${mandir}/man1 - install -d ${D}${mandir}/man8 - - # remove strip flag - sed -i 's/install -s/install/' rpcinfo/Makefile - sed -i 's/install -s/install/' rpcgen/Makefile - - oe_runmake 'INSTALLROOT=${D}' 'BINMODE=0755' \ - 'DAEMONMODE=0755' 'MANMODE=0644' \ - 'BINDIR=${bindir}' 'SBINDIR=${sbindir}' \ - 'MANDIR=${mandir}' install -} diff --git a/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/fix-host-variable.patch b/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/fix-host-variable.patch deleted file mode 100644 index 1d3631d47d..0000000000 --- a/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/fix-host-variable.patch +++ /dev/null @@ -1,27 +0,0 @@ -fix host variable when rsh is renamed to other. - -Upstream-Status: Pending - -If rsh is renamed to other, like rsh.netkit, host variable is assigned to -rsh.netkit, which is wrong. - -Signed-off-by: Roy.Li <rongqing.li@windriver.com> ---- - rsh/rsh.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -diff --git a/rsh/rsh.c b/rsh/rsh.c -index ac594f9..11f533e 100644 ---- a/rsh/rsh.c -+++ b/rsh/rsh.c -@@ -100,7 +100,6 @@ main(int argc, char *argv[]) - #else - if (!strcmp(p, "rsh")) asrsh = 1; - #endif -- else host = p; - - /* handle "rsh host flags" */ - if (!host && argc > 2 && argv[1][0] != '-') { --- -1.7.5.4 - diff --git a/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/fixup_wait3_api_change.patch b/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/fixup_wait3_api_change.patch deleted file mode 100644 index cd6df62fb3..0000000000 --- a/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/fixup_wait3_api_change.patch +++ /dev/null @@ -1,34 +0,0 @@ -Fix build issue do to Deprecate union wait and remove support from wait functions [BZ #19613] - -| rlogin.c: In function 'catch_child': -| rlogin.c:463:13: error: storage size of 'status' isn't known -| union wait status; - -https://sourceware.org/ml/libc-alpha/2016-02/msg00342.html - -Upstream-Status: Inappropriate [ no upstream maintaner ] - -Signed-off-by Armin Kuster <akuster@mvista.com> - -Index: netkit-rsh-0.17/rlogin/rlogin.c -=================================================================== ---- netkit-rsh-0.17.orig/rlogin/rlogin.c -+++ netkit-rsh-0.17/rlogin/rlogin.c -@@ -460,7 +460,7 @@ writeroob(int ignore) - void - catch_child(int ignore) - { -- union wait status; -+ int status; - int pid; - - (void)ignore; -@@ -471,7 +471,7 @@ catch_child(int ignore) - return; - /* if the child (reader) dies, just quit */ - if (pid < 0 || (pid == childpid && !WIFSTOPPED(status))) -- done((int)(status.w_termsig | status.w_retcode)); -+ done((int)(WTERMSIG(status) | WEXITSTATUS(status))); - } - /* NOTREACHED */ - } diff --git a/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/netkit-rsh-0.17-rexec-ipv6.patch b/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/netkit-rsh-0.17-rexec-ipv6.patch deleted file mode 100644 index efd060f365..0000000000 --- a/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/netkit-rsh-0.17-rexec-ipv6.patch +++ /dev/null @@ -1,30 +0,0 @@ -make rexec support ipv6 - -Upstream-status: Pending - -rexec equals rexec_af(... ,AF_INET) which only support ipv4, -use rexec_af(..., AF_UNSPEC) to support both ipv6 and ipv4. - -Signed-off-by: Roy.Li <rongqing.li@windriver.com> ---- - rexec/rexec.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/rexec/rexec.c b/rexec/rexec.c -index 0913c02..9c8f769 100644 ---- a/rexec/rexec.c -+++ b/rexec/rexec.c -@@ -214,8 +214,8 @@ int main(int argc, char *argv[]) - passwd = getpass("Password: "); - } - -- if ( (sock = rexec(&host, port_exec, user_name, passwd, command, -- p_to_aux_sock)) < 0 ) -+ if ( (sock = rexec_af(&host, port_exec, user_name, passwd, command, -+ p_to_aux_sock, AF_UNSPEC)) < 0 ) - { - fprintf(stderr,"%s: Error in rexec system call: ",argv[0]); - perror(NULL); --- -1.7.4.1 - diff --git a/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/no_pam_build_fix.patch b/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/no_pam_build_fix.patch deleted file mode 100644 index fdd535be1b..0000000000 --- a/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/no_pam_build_fix.patch +++ /dev/null @@ -1,39 +0,0 @@ -netkit-rsh: -Allow to build with no PAM enabled. - -Upstream-Status: Inappropriate [ no upstream maintaner ] - -Signed-off-by: Armin Kuster <akuster808@gmail.com> - -Index: netkit-rsh-0.17/rshd/rshd.c -=================================================================== ---- netkit-rsh-0.17.orig/rshd/rshd.c -+++ netkit-rsh-0.17/rshd/rshd.c -@@ -110,9 +110,11 @@ extern char **environ; - static void error(const char *fmt, ...); - static void doit(struct sockaddr *fromp, socklen_t fromlen); - static char *getstr(char *, size_t, const char *); -+#ifdef USE_PAM - static int err_conv( - int, const struct pam_message **, struct pam_response **, void * - ); -+#endif /* USE_PAM */ - - extern int _check_rhosts_file; - -@@ -256,6 +258,7 @@ static void stderr_parent(int sock, int - } - - -+#ifdef USE_PAM - static int err_conv( - int num_msg, const struct pam_message **msg, - struct pam_response **resp, void *appdata_ptr -@@ -266,6 +269,7 @@ static int err_conv( - (void) appdata_ptr; - return PAM_CONV_ERR; - } -+#endif - - static struct passwd *doauth(const char *remuser, - const char *hostname, diff --git a/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rexec.pam b/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rexec.pam deleted file mode 100644 index 94e5dda50b..0000000000 --- a/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rexec.pam +++ /dev/null @@ -1,10 +0,0 @@ -#%PAM-1.0 -# For root login to succeed here with pam_securetty, "rexec" must be -# listed in /etc/securetty. -auth required pam_nologin.so -auth required pam_env.so -auth include common-auth -account include common-account -session optional pam_keyinit.so force revoke -session include common-session -session required pam_loginuid.so diff --git a/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rexec.xinetd.netkit b/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rexec.xinetd.netkit deleted file mode 100644 index 7354360ae7..0000000000 --- a/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rexec.xinetd.netkit +++ /dev/null @@ -1,20 +0,0 @@ -# default: off -# description: -# Rexecd is the server for the rexec program. The server provides remote -# execution facilities with authentication based on user names and -# passwords. -# -service exec -{ - socket_type = stream - protocol = tcp - flags = NAMEINARGS - wait = no - user = root - group = root - log_on_success += USERID - log_on_failure += USERID - server = /usr/sbin/tcpd - server_args = /usr/sbin/in.rexecd - disable = yes -} diff --git a/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rlogin.pam b/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rlogin.pam deleted file mode 100644 index b30f139cb7..0000000000 --- a/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rlogin.pam +++ /dev/null @@ -1,12 +0,0 @@ -#%PAM-1.0 -# For root login to succeed here with pam_securetty, "rlogin" must be -# listed in /etc/securetty. -auth required pam_nologin.so -auth required pam_securetty.so -auth required pam_env.so -auth include common-auth -account include common-account -password include common-password -session optional pam_keyinit.so force revoke -session include common-session -session required pam_loginuid.so diff --git a/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rlogin.xinetd.netkit b/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rlogin.xinetd.netkit deleted file mode 100644 index 70493e603b..0000000000 --- a/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rlogin.xinetd.netkit +++ /dev/null @@ -1,23 +0,0 @@ -# default: off -# description: -# Rlogind is a server for the rlogin program. The server provides remote -# execution with authentication based on privileged port numbers from trusted -# host -# -service login -{ - socket_type = stream - protocol = tcp - flags = NAMEINARGS - wait = no - user = root - group = root - log_on_success += USERID - log_on_failure += USERID - server = /usr/sbin/tcpd - server_args = /usr/sbin/in.rlogind -a - disable = yes -} - - - diff --git a/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rsh-redone_link_order_file.patch b/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rsh-redone_link_order_file.patch deleted file mode 100644 index c12ee9b465..0000000000 --- a/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rsh-redone_link_order_file.patch +++ /dev/null @@ -1,77 +0,0 @@ -This fixes a build issue caused by linking order. - -Upstream-Status: Inappropriate -Most distos have there own verison of this fix. This was derived by -* Fix link order to list libraries after the objects that require them -(LP: #771080). - --- Colin Watson <cjwatson@ubuntu.com> Tue, 13 Sep 2011 10:07:08 +0100 - - -signed-off-by: Armin Kuster <akuster808@gmail.com> - -Index: netkit-rsh-0.17/rsh/Makefile -=================================================================== ---- netkit-rsh-0.17.orig/rsh/Makefile -+++ netkit-rsh-0.17/rsh/Makefile -@@ -6,7 +6,7 @@ include ../MRULES - OBJS = rsh.o - - rsh: $(OBJS) -- $(CC) $(LDFLAGS) $^ $(LIBS) -o $@ -+ $(CC) $^ -o $@ $(LDFLAGS) $(LIBS) - - install: rsh - install -o root -m$(SUIDMODE) rsh $(INSTALLROOT)$(BINDIR) -Index: netkit-rsh-0.17/rshd/Makefile -=================================================================== ---- netkit-rsh-0.17.orig/rshd/Makefile -+++ netkit-rsh-0.17/rshd/Makefile -@@ -11,7 +11,7 @@ LIBS += -ldl -lpam - endif - - rshd: $(OBJS) -- $(CC) $(LDFLAGS) $^ $(LIBS) -o $@ -+ $(CC) $^ -o $@ $(LDFLAGS) $(LIBS) - - install: rshd - install -m$(DAEMONMODE) rshd $(INSTALLROOT)$(SBINDIR)/in.rshd -Index: netkit-rsh-0.17/rlogin/Makefile -=================================================================== ---- netkit-rsh-0.17.orig/rlogin/Makefile -+++ netkit-rsh-0.17/rlogin/Makefile -@@ -7,7 +7,7 @@ PROG=rlogin - OBJS=rlogin.o - - $(PROG): $(OBJS) -- $(CC) $(LDFLAGS) $^ $(LIBS) -o $@ -+ $(CC) $^ -o $@ $(LDFLAGS) $(LIBS) - - install: $(PROG) - install -o root -m$(SUIDMODE) $(PROG) $(INSTALLROOT)$(BINDIR) -Index: netkit-rsh-0.17/rlogind/Makefile -=================================================================== ---- netkit-rsh-0.17.orig/rlogind/Makefile -+++ netkit-rsh-0.17/rlogind/Makefile -@@ -13,7 +13,7 @@ LIBS += -ldl -lpam -lpam_misc - endif - - rlogind: $(OBJS) -- $(CC) $(LDFLAGS) $^ $(LIBS) -o $@ -+ $(CC) $^ -o $@ $(LDFLAGS) $(LIBS) - - rlogind.o: pathnames.h logwtmp.h rlogind.h ../version.h - logwtmp.o: logwtmp.h -Index: netkit-rsh-0.17/rexecd/Makefile -=================================================================== ---- netkit-rsh-0.17.orig/rexecd/Makefile -+++ netkit-rsh-0.17/rexecd/Makefile -@@ -24,7 +24,7 @@ endif - CFLAGS += -DRESTRICT_FTP=1 - - rexecd: rexecd.o -- $(CC) $(LDFLAGS) $^ $(LIBS) -o $@ -+ $(CC) $^ -o $@ $(LDFLAGS) $(LIBS) - - install: rexecd - install -m$(DAEMONMODE) rexecd $(INSTALLROOT)$(SBINDIR)/in.rexecd diff --git a/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rsh.pam b/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rsh.pam deleted file mode 100644 index 072327a76e..0000000000 --- a/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rsh.pam +++ /dev/null @@ -1,10 +0,0 @@ -#%PAM-1.0 -# For root login to succeed here with pam_securetty, "rsh" must be -# listed in /etc/securetty. -auth required pam_nologin.so -auth required pam_securetty.so -auth required pam_env.so -account include common-account -session optional pam_keyinit.so force revoke -session include common-session -session required pam_loginuid.so diff --git a/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rsh.xinetd.netkit b/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rsh.xinetd.netkit deleted file mode 100644 index a842eb974f..0000000000 --- a/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rsh.xinetd.netkit +++ /dev/null @@ -1,21 +0,0 @@ -# default: off -# description: -# The rshd server is a server for the rcmd(3) routine and, -# consequently, for the rsh(1) program. The server provides -# remote execution facilities with authentication based on -# privileged port numbers from trusted hosts. -# -service shell -{ - socket_type = stream - protocol = tcp - flags = NAMEINARGS - wait = no - user = root - group = root - log_on_success += USERID - log_on_failure += USERID - server = /usr/sbin/tcpd - server_args = /usr/sbin/in.rshd -aL - disable = yes -} diff --git a/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb b/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb deleted file mode 100644 index 3990f7b527..0000000000 --- a/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb +++ /dev/null @@ -1,102 +0,0 @@ -DESCRIPTION = "netkit-rsh includes the rsh daemon and client." -SECTION = "net" -HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit" -LICENSE = "BSD-4-Clause" -DEPENDS = "xinetd libgcrypt" - -LIC_FILES_CHKSUM = "file://rsh/rsh.c;endline=32;md5=487b3c637bdc181d32b2a8543d41b606" - -SRC_URI = "${DEBIAN_MIRROR}/main/n/netkit-rsh/netkit-rsh_${PV}.orig.tar.gz;name=archive \ - ${DEBIAN_MIRROR}/main/n/netkit-rsh/netkit-rsh_${PV}-15.diff.gz;name=patch15 \ - file://rsh-redone_link_order_file.patch \ - file://no_pam_build_fix.patch \ - file://rexec.xinetd.netkit \ - file://rlogin.xinetd.netkit \ - file://rsh.xinetd.netkit \ - file://netkit-rsh-0.17-rexec-ipv6.patch \ - file://fix-host-variable.patch \ - file://fixup_wait3_api_change.patch \ -" - -SRC_URI[archive.md5sum] = "65f5f28e2fe22d9ad8b17bb9a10df096" -SRC_URI[archive.sha256sum] = "edcac7fa18015f0bc04e573f3f54ae3b638d71335df1ad7dae692779914ad669" -SRC_URI[patch15.md5sum] = "655efc0d541b03ca5de0ae506c805ea3" -SRC_URI[patch15.sha256sum] = "2bc071c438e8b0ed42a0bd2db2d8b681b27a1e9b1798694d9874733293bc2aa9" - -# Other support files -PAM_SRC_URI = "file://rexec.pam \ - file://rlogin.pam \ - file://rsh.pam \ -" -SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}" - -inherit pkgconfig - -CFLAGS += " -D_GNU_SOURCE -Wno-deprecated-declarations" -LDFLAGS += " -L${STAGING_LIBDIR} -lutil -lcrypt" - -PACKAGECONFIG ??= "" -PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" -PACKAGECONFIG[pam] = " , --without-pam, libpam, libpam" - -do_configure () { - ./configure --prefix=${prefix} --exec-prefix=${exec_prefix} - echo "INSTALLROOT=${D}" > MCONFIG - - if [ "${@bb.utils.filter('PACKAGECONFIG', 'pam', d)}" ]; then - echo "USE_PAM=1" >> MCONFIG - fi - - # didn't want to patch these next changes - sed -i 's/netkit-//' ${S}/rsh/pathnames.h - sed -i 's/netkit-//' ${S}/rcp/pathnames.h -} - -do_install () { - install -d ${D}${bindir} - install -d ${D}${sbindir} - install -d ${D}${mandir}/man1 - install -d ${D}${mandir}/man8 - install -d ${D}${sysconfdir}/xinetd.d - - oe_runmake 'INSTALLROOT=${D}' 'BINMODE=0755' \ - 'DAEMONMODE=0755' 'MANMODE=0644' \ - 'SUIDMODE=4755' \ - 'BINDIR=${bindir}' 'SBINDIR=${sbindir}' \ - 'MANDIR=${mandir}' install - - if [ "${@bb.utils.filter('PACKAGECONFIG', 'pam', d)}" ]; then - install -d ${D}${sysconfdir}/pam.d - install -m 0644 debian/hosts.equiv ${D}/${sysconfdir} - install -m 0644 ${WORKDIR}/rexec.pam ${D}/${sysconfdir}/pam.d/rexec - install -m 0644 ${WORKDIR}/rlogin.pam ${D}/${sysconfdir}/pam.d/rlogin - install -m 0644 ${WORKDIR}/rsh.pam ${D}/${sysconfdir}/pam.d/rsh - fi - cp ${WORKDIR}/rexec.xinetd.netkit ${D}/${sysconfdir}/xinetd.d/rexec - cp ${WORKDIR}/rlogin.xinetd.netkit ${D}/${sysconfdir}/xinetd.d/rlogin - cp ${WORKDIR}/rsh.xinetd.netkit ${D}/${sysconfdir}/xinetd.d/rsh -} - -PACKAGES = "${PN}-client ${PN}-server ${PN}-doc ${BPN}-dbg" - -FILES_${PN}-client = "${bindir}/*" -FILES_${PN}-server = "${sbindir}/* ${sysconfdir}" -FILES_${PN}-doc = "${mandir}" -FILES_${PN}-dbg = "${prefix}/src/debug \ - ${sbindir}/.debug ${bindir}/.debug" - -ALTERNATIVE_PRIORITY = "80" -ALTERNATIVE_${PN}-client = "rcp rexec rlogin rsh" -ALTERNATIVE_${PN}-server = "rshd rexecd rlogind" -ALTERNATIVE_LINK_NAME[server] = "${bindir}/rshd" -ALTERNATIVE_TARGET[rshd] = "${sbindir}/in.rshd" -ALTERNATIVE_LINK_NAME[rexecd] = "${bindir}/rexecd" -ALTERNATIVE_TARGET[rexecd] = "${sbindir}/in.rexecd" -ALTERNATIVE_LINK_NAME[rlogind] = "${bindir}/rlogind" -ALTERNATIVE_TARGET[rlogind] = "${sbindir}/in.rlogind" - -RCONFLICTS_${PN}-server += "inetutils-rshd" -RPROVIDES_${PN}-server = "rshd" - -RDEPENDS_${PN}-server = "xinetd" -RDEPENDS_${PN}-server += "tcp-wrappers" diff --git a/meta-networking/recipes-netkit/netkit-rusers/netkit-rusers/rpc.rusersd-Makefile-fix-parallel-build-issue.patch b/meta-networking/recipes-netkit/netkit-rusers/netkit-rusers/rpc.rusersd-Makefile-fix-parallel-build-issue.patch deleted file mode 100644 index d85178d714..0000000000 --- a/meta-networking/recipes-netkit/netkit-rusers/netkit-rusers/rpc.rusersd-Makefile-fix-parallel-build-issue.patch +++ /dev/null @@ -1,30 +0,0 @@ -From c23cc112a480f90950de5cf1de09b1a7e732bf21 Mon Sep 17 00:00:00 2001 -From: Robert Yang <liezhi.yang@windriver.com> -Date: Mon, 15 Dec 2014 18:31:13 -0800 -Subject: [PATCH] rpc.rusersd/Makefile: fix parallel build issue - -Fixed: -rusers.x: No such file or directory -Makefile:44: recipe for target 'rusers_xdr.c' failed - -Upstream-Status: Pending - -Signed-off-by: Robert Yang <liezhi.yang@windriver.com> ---- - rpc.rusersd/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/rpc.rusersd/Makefile b/rpc.rusersd/Makefile -index 792f528..65a424a 100644 ---- a/rpc.rusersd/Makefile -+++ b/rpc.rusersd/Makefile -@@ -40,5 +40,5 @@ rusers.x: - rusers.h: $(RUSERSX) rusers.x - $(RPCGEN) -h -o rusers.h rusers.x - --rusers_xdr.c: $(RUSERSX) -+rusers_xdr.c: $(RUSERSX) rusers.x - $(RPCGEN) -c -C -o rusers_xdr.c rusers.x --- -1.7.9.5 - diff --git a/meta-networking/recipes-netkit/netkit-rusers/netkit-rusers_0.17.bb b/meta-networking/recipes-netkit/netkit-rusers/netkit-rusers_0.17.bb deleted file mode 100644 index 459e39e593..0000000000 --- a/meta-networking/recipes-netkit/netkit-rusers/netkit-rusers_0.17.bb +++ /dev/null @@ -1,70 +0,0 @@ -DESCRIPTION = "netkit-rusers includes rusers - Displays who is logged in to machines on local network \ - rusersd - Logged in users server" -HOMEPAGE = "ftp://ftp.uk.linux.org/pub/linux/Networking/netkit" -SECTION = "net" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://rusers/rusers.c;beginline=2;endline=3;md5=f4fc634a4ce8c569911196b72b10770e" -DEPENDS = " tcp-wrappers libtirpc rpcbind" - -SRC_URI = "http://http.debian.net/debian/pool/main/n/${BPN}/${BPN}_${PV}.orig.tar.gz;name=archive \ - http://http.debian.net/debian/pool/main/n/${BPN}/${BPN}_${PV}-8.diff.gz;name=patch8 \ - file://rpc.rusersd-Makefile-fix-parallel-build-issue.patch \ -" - -SRC_URI[archive.md5sum] = "dc99a80b9fde2ab427c874f88f1c1602" -SRC_URI[archive.sha256sum] = "f00138651865ad2dcfec5dedda0cda403cb80c4ab68efcc3bbccafe198c24b6d" -SRC_URI[patch8.md5sum] = "1ff498113e0f920d92088092e5570bdc" -SRC_URI[patch8.sha256sum] = "14882dbdda4e37baa84d55b54b46c7e063a20fc9e04d1be1a2807643cd0f3067" - -inherit autotools-brokensep - -do_configure () { - ./configure --prefix=${prefix} - echo "LDFLAGS=${LDFLAGS}" >> MCONFIG - echo "USE_GLIBC=1" >> MCONFIG -} - -do_install () { - install -d ${D}${bindir} - install -d ${D}${sbindir} - install -d ${D}${mandir}/man1 - install -d ${D}${mandir}/man8 - install -d ${D}${sysconfdir}/xinetd.d - - sed -i 's/install -s/install/' rusers/Makefile - sed -i 's/install -s/install/' rup/Makefile - sed -i 's/install -s/install/' rpc.rusersd/Makefile - - oe_runmake 'INSTALLROOT=${D}' 'BINMODE=0755' \ - 'DAEMONMODE=0755' 'MANMODE=0644' \ - 'BINDIR=${bindir}' 'SBINDIR=${sbindir}' \ - 'MANDIR=${mandir}' install - - # create the xinetd config file - cat >rusersd.conf <<EOF - service rusersd - { - disable = yes - type = RPC - rpc_version = 1-2 - socket_type = dgram - protocol = udp - wait = yes - user = root - server = ${sbindir}/rpc.rusersd - } -EOF - install rusersd.conf ${D}/${sysconfdir}/xinetd.d/rusersd -} - - -INSANE_SKIP_${PN} = "already-stripped" - -PACKAGES = "${PN}-client ${PN}-server ${PN}-doc ${BPN}-dbg" -FILES_${PN}-client = "${bindir}/*" -FILES_${PN}-server = "${sbindir}/* ${sysconfdir}" -FILES_${PN}-doc = "${mandir}" -FILES_${PN}-dbg = "${prefix}/src/debug \ - ${bindir}/.debug ${sbindir}/.debug" - -RDEPENDS_${PN}-server = "tcp-wrappers xinetd rpcbind" diff --git a/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0001-Add-missing-include-path-to-I-options.patch b/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0001-Add-missing-include-path-to-I-options.patch deleted file mode 100644 index b1325b3173..0000000000 --- a/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0001-Add-missing-include-path-to-I-options.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 55ab6f1389261edff5f4c942bc3b0d8e695856d7 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 30 Aug 2017 18:11:33 -0700 -Subject: [PATCH 1/2] Add missing include path to -I options - -Fixes errors like -| rwho.c:52:10: fatal error: 'protocols/rwhod.h' file not found -| #include <protocols/rwhod.h> -| ^~~~~~~~~~~~~~~~~~~ - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending - - rwho/Makefile | 1 + - rwhod/Makefile | 2 ++ - 2 files changed, 3 insertions(+) - -diff --git a/rwho/Makefile b/rwho/Makefile -index 6f86388..67b28d4 100644 ---- a/rwho/Makefile -+++ b/rwho/Makefile -@@ -6,6 +6,7 @@ include ../MRULES - rwho: rwho.o - $(CC) $(LDFLAGS) $^ $(LIBS) -o $@ - -+CFLAGS += -I../include - rwho.o: ../version.h - - install: rwho -diff --git a/rwhod/Makefile b/rwhod/Makefile -index 772b641..9034218 100644 ---- a/rwhod/Makefile -+++ b/rwhod/Makefile -@@ -7,6 +7,8 @@ ifneq ($(USE_GLIBC),1) - CFLAGS += -D_GNU_SOURCE - endif - -+CFLAGS += -I../include -+ - OBJS = rwhod.o - - rwhod: $(OBJS) --- -2.14.1 - diff --git a/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0002-Fix-build-issues-found-with-musl.patch b/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0002-Fix-build-issues-found-with-musl.patch deleted file mode 100644 index 717b4d73f4..0000000000 --- a/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0002-Fix-build-issues-found-with-musl.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 2108213242638fa355f662382f55495d91301858 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 30 Aug 2017 18:13:17 -0700 -Subject: [PATCH 2/2] Fix build issues found with musl - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending - - ruptime/ruptime.c | 1 + - rwho/rwho.c | 1 + - rwhod/rwhod.c | 5 +++-- - 3 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/ruptime/ruptime.c b/ruptime/ruptime.c -index 1d4f7b6..f1f043c 100644 ---- a/ruptime/ruptime.c -+++ b/ruptime/ruptime.c -@@ -53,6 +53,7 @@ char ruptime_rcsid[] = - #include <string.h> - #include <errno.h> - #include <time.h> -+#include <fcntl.h> - - struct hs { - char hs_hostname[MAXHOSTNAMELEN]; -diff --git a/rwho/rwho.c b/rwho/rwho.c -index 63919ac..71aec9e 100644 ---- a/rwho/rwho.c -+++ b/rwho/rwho.c -@@ -49,6 +49,7 @@ char rcsid[] = "$Id: rwho.c,v 1.7 1999/08/01 20:44:18 dholland Exp $"; - #include <assert.h> - #include <stdio.h> - #include <time.h> -+#include <fcntl.h> - #include <protocols/rwhod.h> - - #include "../version.h" -diff --git a/rwhod/rwhod.c b/rwhod/rwhod.c -index 54498d0..40cabcf 100644 ---- a/rwhod/rwhod.c -+++ b/rwhod/rwhod.c -@@ -76,6 +76,7 @@ char rcsid[] = - #include <grp.h> - #include <time.h> - #include <stdint.h> -+#include <fcntl.h> - - #include "../version.h" - -@@ -102,7 +103,7 @@ struct nlist nl[] = { - static void broadcaster(void); - static int configure(int s); - static int verify(const char *name); --#if __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 2) -+#if defined(__GLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 2)) - static int getloadavg(double ptr[3], int n); - #endif - -@@ -549,7 +550,7 @@ sendpacket(struct whod *wd) - } - } - --#if __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 2) -+#if defined(__GLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 2)) - /* - * Taken from: - * --- -2.14.1 - diff --git a/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/rwhod b/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/rwhod deleted file mode 100755 index f6419032e8..0000000000 --- a/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/rwhod +++ /dev/null @@ -1,71 +0,0 @@ -#!/bin/sh - -### BEGIN INIT INFO -# Provides: rwhod -# Required-Start: $network $remote_fs $syslog -# Required-Stop: $network $remote_fs $syslog -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Server for rwho and ruptime services -### END INIT INFO - -PATH=/sbin:/bin:/usr/bin:/usr/sbin - -DAEMON=/usr/sbin/rwhod -PIDFILE=/var/run/rwhod.pid -CONF_FILE="/etc/default/rwhod" -DESC="Who daemon " -# default options. Change them in /etc/default/rwhod -RWHOD_OPTIONS="-b" - -# rwhod init.d script for ntpdc from ntp.isc.org -test -f $DAEMON || exit 0 - -# Source function library. -. /etc/init.d/functions - -[ -r $CONF_FILE ] && . $CONF_FILE - -startdaemon(){ - echo -n "Starting $DESC" " rwhod " - start-stop-daemon --start --quiet --oknodo --pidfile $PIDFILE --exec $DAEMON -- $RWHOD_OPTIONS - echo "done" -} -stopdaemon(){ - echo -n "Stopping $DESC" " rwhod " - start-stop-daemon --stop --quiet --oknodo --exec $DAEMON - echo "done" -} - -case "$1" in - start) - startdaemon - ;; - stop) - stopdaemon - ;; - force-reload) - stopdaemon - startdaemon - ;; - restart) - stopdaemon - sleep 1 - startdaemon - ;; - reload) - stopdaemon - sleep 1 - startdaemon - ;; - status) - status /usr/sbin/rwhod; - exit $? - ;; - *) - echo "Usage: rwhod { start | stop | status | restart | reload }" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/rwhod.default b/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/rwhod.default deleted file mode 100644 index 62d3a942d0..0000000000 --- a/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/rwhod.default +++ /dev/null @@ -1,2 +0,0 @@ -#Options for the rwhod daemon. -RWHOD_OPTIONS="-b" diff --git a/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho_0.17.bb b/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho_0.17.bb deleted file mode 100644 index 5685f03d62..0000000000 --- a/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho_0.17.bb +++ /dev/null @@ -1,85 +0,0 @@ -DESCRIPTION = "netkit-rwho includes, ruptime rwho and rwhod (Daemon to maintain data for rwho/ruptime)" -HOMEPAGE = "ftp://ftp.uk.linux.org/pub/linux/Networking/netkit" -SECTION = "net" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://rwho/rwho.c;beginline=2;endline=3;md5=5a85f13c0142d72fc378e00f15da5b9e" - -SRC_URI = "${DEBIAN_MIRROR}/main/n/netkit-rwho/netkit-rwho_${PV}.orig.tar.gz;name=archive \ - ${DEBIAN_MIRROR}/main/n/netkit-rwho/netkit-rwho_${PV}-13.debian.tar.gz;name=patch13 \ - file://rwhod \ - file://rwhod.default \ - file://0001-Add-missing-include-path-to-I-options.patch \ - file://0002-Fix-build-issues-found-with-musl.patch \ - " -SRC_URI[archive.md5sum] = "0f71620d45d472f89134ba0d74242e75" -SRC_URI[archive.sha256sum] = "0409e2ce4bfdb2dacb2c193d0fedfc49bb975cb057c5c6b0ffcca603a1188da7" -SRC_URI[patch13.md5sum] = "82ed5a3c6b0bbf00b36508b9787963b9" -SRC_URI[patch13.sha256sum] = "53aefa27d98b565bf756db57120c03bd224a238e45699d92076420272a6eba8e" - -inherit autotools-brokensep useradd update-rc.d update-alternatives - -CFLAGS += " -D_GNU_SOURCE" - -debian_do_patch() { - cd ${S} - while read line; do patch -p1 < ${WORKDIR}/debian/patches/$line; done < ${WORKDIR}/debian/patches/series -} - -python do_patch() { - bb.build.exec_func('debian_do_patch', d) - bb.build.exec_func('patch_do_patch', d) -} - -do_configure () { - ./configure --prefix=${prefix} - echo "LDFLAGS=${LDFLAGS}" >> MCONFIG -} - -do_install () { - # rwho & ruptime - install -d ${D}${bindir} - install -d ${D}${mandir}/man1 - #rwhod - install -d ${D}${sbindir} - install -d ${D}${mandir}/man8 - install -d ${D}${sysconfdir}/init.d - install -d ${D}${sysconfdir}/default - sed -i 's/install -s/install/' rwho/Makefile - sed -i 's/install -s/install/' ruptime/Makefile - sed -i 's/install -s/install/' rwhod/Makefile - oe_runmake 'INSTALLROOT=${D}' 'BINMODE=0755' \ - 'DAEMONMODE=0755' 'MANMODE=0644' \ - 'BINDIR=${bindir}' 'SBINDIR=${sbindir}' \ - 'MANDIR=${mandir}' install - - install -m 0644 ${WORKDIR}/rwhod.default ${D}${sysconfdir}/default/rwhod - install -m 755 ${WORKDIR}/rwhod ${D}${sysconfdir}/init.d - - mkdir -p -m 755 ${D}${localstatedir}/spool/rwho - chown -R rwhod ${D}${localstatedir}/spool/rwho -} - -pkg_postinst_${PN}-server() { - ${sysconfdir}/init.d/rwhod start -} - -pkg_postrm_${PN}-server() { - ${sysconfdir}/init.d/rwhod stop -} - -INITSCRIPT_NAME = "rwhod" -INITSCRIPT_PARAM = "defaults 85 15" - -USERADD_PACKAGES = "${PN}-server" -GROUPADD_PARAM_${PN}-server = "--system rwhod" -USERADD_PARAM_${PN}-server = "--system -g rwhod --home-dir ${localstatedir}/spool/rwho \ - --no-create-home --shell /bin/false rwhod" - -INSANE_SKIP_${PN} = "already-stripped" - -PACKAGES = "${PN}-client ${PN}-server ${PN}-doc ${BPN}-dbg" -FILES_${PN}-client = "${bindir}/*" -FILES_${PN}-server = "${sbindir}/* ${localstatedir} ${sysconfdir}/default/* ${sysconfdir}/init.d/*" -FILES_${PN}-doc = "${mandir}" -FILES_${PN}-dbg = "${prefix}/src/debug \ - ${bindir}/.debug ${sbindir}/.debug" diff --git a/meta-networking/recipes-netkit/netkit-telnet/files/0001-telnet-telnetd-Fix-print-format-strings.patch b/meta-networking/recipes-netkit/netkit-telnet/files/0001-telnet-telnetd-Fix-print-format-strings.patch deleted file mode 100644 index f2f1b12e28..0000000000 --- a/meta-networking/recipes-netkit/netkit-telnet/files/0001-telnet-telnetd-Fix-print-format-strings.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 7a3095d1e9b7c73f9dca56250f433bcfc7cb660e Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 27 Jun 2017 10:15:34 -0700 -Subject: [PATCH] telnet/telnetd: Fix print format strings - -Fixes build with hardening flags - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - telnet/utilities.cc | 6 +++--- - telnetd/utility.c | 6 +++--- - 2 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/telnet/utilities.cc b/telnet/utilities.cc -index 66839ab..36f0731 100644 ---- a/telnet/utilities.cc -+++ b/telnet/utilities.cc -@@ -583,17 +583,17 @@ void printsub(int direction, unsigned char *pointer, int length) { - case ENV_VAR: - if (pointer[1] == TELQUAL_SEND) - goto def_case; -- fprintf(NetTrace, "\" VAR " + noquote); -+ fprintf(NetTrace, "%s", "\" VAR " + noquote); - noquote = 2; - break; - - case ENV_VALUE: -- fprintf(NetTrace, "\" VALUE " + noquote); -+ fprintf(NetTrace, "%s", "\" VALUE " + noquote); - noquote = 2; - break; - - case ENV_ESC: -- fprintf(NetTrace, "\" ESC " + noquote); -+ fprintf(NetTrace, "%s", "\" ESC " + noquote); - noquote = 2; - break; - -diff --git a/telnetd/utility.c b/telnetd/utility.c -index 29b7da1..75314cb 100644 ---- a/telnetd/utility.c -+++ b/telnetd/utility.c -@@ -909,17 +909,17 @@ printsub(char direction, unsigned char *pointer, int length) - case ENV_VAR: - if (pointer[1] == TELQUAL_SEND) - goto def_case; -- netoprintf("\" VAR " + noquote); -+ netoprintf("%s", "\" VAR " + noquote); - noquote = 2; - break; - - case ENV_VALUE: -- netoprintf("\" VALUE " + noquote); -+ netoprintf("%s", "\" VALUE " + noquote); - noquote = 2; - break; - - case ENV_ESC: -- netoprintf("\" ESC " + noquote); -+ netoprintf("%s", "\" ESC " + noquote); - noquote = 2; - break; - --- -2.13.2 - diff --git a/meta-networking/recipes-netkit/netkit-telnet/files/To-aviod-buffer-overflow-in-telnet.patch b/meta-networking/recipes-netkit/netkit-telnet/files/To-aviod-buffer-overflow-in-telnet.patch deleted file mode 100644 index 7fff8cffc4..0000000000 --- a/meta-networking/recipes-netkit/netkit-telnet/files/To-aviod-buffer-overflow-in-telnet.patch +++ /dev/null @@ -1,1217 +0,0 @@ -From f09a6460a62aacb87bb8683d16aa3ce55848bf7e Mon Sep 17 00:00:00 2001 -From: Li xin <lixin.fnst@cn.fujitsu.com> -Date: Fri, 28 Nov 2014 07:06:24 +0900 -Subject: [PATCH 1/2] To aviod buffer overflow in telnet - -This patch is from Fedora. - -Upstream-Status: pending - -Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> ---- - telnet/Makefile | 4 +- - telnet/commands.cc | 270 +++++++++++++++++++++++++++++++++++----------------- - telnet/defines.h | 2 + - telnet/externs.h | 7 +- - telnet/main.cc | 65 ++++++++++--- - telnet/netlink.cc | 78 +++++++++------ - telnet/netlink.h | 7 +- - telnet/network.cc | 1 + - telnet/proto.h | 2 +- - telnet/ring.cc | 2 +- - telnet/ring.h | 2 +- - telnet/sys_bsd.cc | 11 +++ - telnet/telnet.1 | 37 +++++-- - telnet/telnet.cc | 45 +++++---- - telnet/terminal.cc | 17 +++- - telnet/utilities.cc | 2 + - 16 files changed, 380 insertions(+), 172 deletions(-) - -diff --git a/telnet/Makefile b/telnet/Makefile -index cef866f..39249e1 100644 ---- a/telnet/Makefile -+++ b/telnet/Makefile -@@ -7,7 +7,7 @@ include ../MRULES - - # -DAUTHENTICATE - CXXFLAGS += -DUSE_TERMIO -DKLUDGELINEMODE --LIBS += $(LIBTERMCAP) -+LIBS = $(LIBTERMCAP) - - SRCS = commands.cc main.cc network.cc ring.cc sys_bsd.cc telnet.cc \ - terminal.cc tn3270.cc utilities.cc genget.cc environ.cc netlink.cc -@@ -22,7 +22,7 @@ depend: - $(CXX) $(CXXFLAGS) -MM $(SRCS) >depend.mk - - install: telnet -- install -s -m$(BINMODE) telnet $(INSTALLROOT)$(BINDIR) -+ install -m$(BINMODE) telnet $(INSTALLROOT)$(BINDIR) - install -m$(MANMODE) telnet.1 $(INSTALLROOT)$(MANDIR)/man1 - - clean: -diff --git a/telnet/commands.cc b/telnet/commands.cc -index d92bccd..02c593e 100644 ---- a/telnet/commands.cc -+++ b/telnet/commands.cc -@@ -86,10 +86,6 @@ char cmd_rcsid[] = - - #define HELPINDENT ((int) sizeof ("connect")) - --#ifndef MAXHOSTNAMELEN --#define MAXHOSTNAMELEN 64 --#endif MAXHOSTNAMELEN -- - #if defined(HAS_IPPROTO_IP) && defined(IP_TOS) - int tos = -1; - #endif /* defined(HAS_IPPROTO_IP) && defined(IP_TOS) */ -@@ -98,7 +94,7 @@ static unsigned long sourceroute(char *arg, char **cpp, int *lenp); - - - char *hostname; --static char _hostname[MAXHOSTNAMELEN]; -+static char *_hostname; - - //typedef int (*intrtn_t)(int argc, const char *argv[]); - -@@ -161,7 +157,7 @@ class command_entry { - assert(argc>=1); - if (nargs>=0 && argc!=nargs+1) { - fprintf(stderr, "Wrong number of arguments for command.\n"); -- fprintf(stderr, "Try %s ? for help\n", argv[0]); -+ fprintf(stderr, "Try ? %s for help\n", argv[0]); - return 0; /* is this right? */ - } - if (nargs==-2) { -@@ -480,6 +476,7 @@ static int send_wontcmd(const char *name, const char *) { - int send_tncmd(int (*func)(int, int), const char *cmd, const char *name) { - char **cpp; - extern char *telopts[]; -+ long opt; - - if (isprefix(name, "help") || isprefix(name, "?")) { - register int col, len; -@@ -506,16 +503,23 @@ int send_tncmd(int (*func)(int, int), const char *cmd, const char *name) { - name, cmd); - return 0; - } -+ -+ opt = cpp - telopts; - if (cpp == 0) { -- fprintf(stderr, "'%s': unknown argument ('send %s ?' for help).\n", -+ char *end; -+ -+ opt = strtol(name, &end, 10); -+ if (*end || opt < 0 || opt > 255) { -+ fprintf(stderr, "'%s': unknown argument ('send %s ?' for help).\n", - name, cmd); -- return 0; -+ return 0; -+ } - } - if (!connected) { - printf("?Need to be connected first.\n"); - return 0; - } -- (*func)(cpp - telopts, 1); -+ (*func)(opt, 1); - return 1; - } - -@@ -689,9 +693,9 @@ static struct togglelist Togglelist[] = { - "print encryption debugging information" }, - #endif - -- { "skiprc", "don't read ~/.telnetrc file", -+ { "skiprc", "don't read the telnetrc files", - NULL, &skiprc, -- "read ~/.telnetrc file" }, -+ "read the telnetrc files" }, - { "binary", - "sending and receiving of binary data", - togbinary, NULL, -@@ -1615,15 +1619,20 @@ void ayt_status(int) { - #endif - - int tn(int argc, const char *argv[]) { -- register struct hostent *host = 0; - struct sockaddr_in sn; -- struct servent *sp = 0; - char *srp = NULL; - int srlen; -- -- const char *cmd, *volatile user = 0; -+ int family = 0; -+ const char *cmd, *volatile user = 0, *srchostp = 0; - const char *portp = NULL; - char *hostp = NULL; -+ char *resolv_hostp; -+ struct addrinfo hints; -+ struct addrinfo *hostaddr = 0; -+ int res; -+ char name[NI_MAXHOST]; -+ char service[NI_MAXSERV]; -+ struct addrinfo *tmpaddr; - - /* clear the socket address prior to use */ - memset(&sn, 0, sizeof(sn)); -@@ -1632,6 +1641,10 @@ int tn(int argc, const char *argv[]) { - printf("?Already connected to %s\n", hostname); - return 0; - } -+ if (_hostname) { -+ delete[] _hostname; -+ _hostname = 0; -+ } - if (argc < 2) { - (void) strcpy(line, "open "); - printf("(to) "); -@@ -1657,11 +1670,33 @@ int tn(int argc, const char *argv[]) { - --argc; - continue; - } -+ if (strcmp(*argv, "-b") == 0) { -+ --argc; ++argv; -+ if (argc == 0) -+ goto usage; -+ srchostp = *argv++; -+ --argc; -+ continue; -+ } - if (strcmp(*argv, "-a") == 0) { - --argc; ++argv; - autologin = 1; - continue; - } -+ if (strcmp(*argv, "-6") == 0) { -+ --argc; ++argv; -+#ifdef AF_INET6 -+ family = AF_INET6; -+#else -+ puts("IPv6 unsupported"); -+#endif -+ continue; -+ } -+ if (strcmp(*argv, "-4") == 0) { -+ --argc; ++argv; -+ family = AF_INET; -+ continue; -+ } - if (hostp == 0) { - /* this leaks memory - FIXME */ - hostp = strdup(*argv++); -@@ -1680,6 +1715,8 @@ int tn(int argc, const char *argv[]) { - if (hostp == 0) - goto usage; - -+ resolv_hostp = hostp; -+ - #if defined(IP_OPTIONS) && defined(HAS_IPPROTO_IP) - if (hostp[0] == '@' || hostp[0] == '!') { - if ((hostname = strrchr(hostp, ':')) == NULL) -@@ -1696,78 +1733,122 @@ int tn(int argc, const char *argv[]) { - } else { - sn.sin_addr.s_addr = temp; - sn.sin_family = AF_INET; -+ /* -+ * For source route we just make sure to get the IP given -+ * on the command line when looking up the port. -+ */ -+ resolv_hostp = inet_ntoa(sn.sin_addr); - } - } -- else { --#endif -- if (inet_aton(hostp, &sn.sin_addr)) { -- sn.sin_family = AF_INET; -- strcpy(_hostname, hostp); -- hostname = _hostname; -- } -- else { -- host = gethostbyname(hostp); -- if (host) { -- sn.sin_family = host->h_addrtype; -- if (host->h_length > (int)sizeof(sn.sin_addr)) { -- host->h_length = sizeof(sn.sin_addr); -- } --#if defined(h_addr) /* In 4.3, this is a #define */ -- memcpy((caddr_t)&sn.sin_addr, -- host->h_addr_list[0], host->h_length); --#else /* defined(h_addr) */ -- memcpy((caddr_t)&sn.sin_addr, host->h_addr, host->h_length); --#endif /* defined(h_addr) */ -- strncpy(_hostname, host->h_name, sizeof(_hostname)); -- _hostname[sizeof(_hostname)-1] = '\0'; -- hostname = _hostname; -- } else { -- herror(hostp); -- return 0; -- } -- } --#if defined(IP_OPTIONS) && defined(HAS_IPPROTO_IP) -- } - #endif -+ -+ /* User port or the default name of telnet. */ - if (portp) { - if (*portp == '-') { - portp++; - telnetport = 1; -- } else -+ } else { - telnetport = 0; -- sn.sin_port = atoi(portp); -- if (sn.sin_port == 0) { -- sp = getservbyname(portp, "tcp"); -- if (sp) -- sn.sin_port = sp->s_port; -- else { -- printf("%s: bad port number\n", portp); -- return 0; -+ if (*portp >='0' && *portp<='9') { -+ char *end; -+ long int p; -+ -+ p=strtol(portp, &end, 10); -+ if (ERANGE==errno && (LONG_MIN==p || LONG_MAX==p)) { -+ fprintf(stderr, "telnet: port %s overflows\n", portp); -+ return 0; -+ } else if (p<=0 || p>=65536) { -+ fprintf(stderr, "telnet: port %s out of range\n", portp); -+ return 0; -+ } - } -- } -- else { -- sn.sin_port = htons(sn.sin_port); - } -- } -+ } - else { -- if (sp == 0) { -- sp = getservbyname("telnet", "tcp"); -- if (sp == 0) { -- fprintf(stderr, "telnet: tcp/telnet: unknown service\n"); -- return 0; -- } -- sn.sin_port = sp->s_port; -- } -+ portp = "telnet"; - telnetport = 1; - } -- printf("Trying %s...\n", inet_ntoa(sn.sin_addr)); -+ -+ /* We only understand SOCK_STREAM sockets. */ -+ memset(&hints, 0, sizeof(hints)); -+ hints.ai_socktype = SOCK_STREAM; -+ hints.ai_flags = AI_NUMERICHOST; -+ hints.ai_family = family; -+ -+ if (srchostp) { -+ res = getaddrinfo(srchostp, "0", &hints, &hostaddr); -+ if (res) { -+ fprintf(stderr, "telnet: could not resolve %s: %s\n", srchostp, -+ gai_strerror(res)); -+ return 0; -+ } -+ hints.ai_family = hostaddr->ai_family; -+ res = nlink.bind(hostaddr); -+ freeaddrinfo(hostaddr); -+ if (res < 0) -+ return 0; -+ } -+ -+ /* Resolve both the host and service simultaneously. */ -+ res = getaddrinfo(resolv_hostp, portp, &hints, &hostaddr); -+ if (res == EAI_NONAME) { -+ hints.ai_flags = AI_CANONNAME; -+ res = getaddrinfo(resolv_hostp, portp, &hints, &hostaddr); -+ } else if (hostaddr) { -+ hostaddr->ai_canonname = 0; -+ } -+ if (res || !hostaddr) { -+ fprintf(stderr, "telnet: could not resolve %s/%s: %s\n", resolv_hostp, portp, gai_strerror(res)); -+ return 0; -+ } -+ -+ /* Try to connect to every listed round robin IP. */ -+ tmpaddr = hostaddr; -+ errno = 0; - do { -- int x = nlink.connect(debug, host, &sn, srp, srlen, tos); -- if (!x) return 0; -- else if (x==1) continue; -+ int x; -+ -+ if (!tmpaddr) { -+ if (errno) -+ perror("telnet: Unable to connect to remote host"); -+ else -+ fputs("telnet: Unable to connect to remote host: " -+ "Bad port number\n", stderr); -+err: -+ freeaddrinfo(hostaddr); -+ return 0; -+ } -+ -+ if (tmpaddr->ai_family == AF_UNIX) { -+nextaddr: -+ tmpaddr = tmpaddr->ai_next; -+ continue; -+ } -+ -+ getnameinfo(tmpaddr->ai_addr, tmpaddr->ai_addrlen, -+ name, sizeof(name), service, sizeof(service), -+ NI_NUMERICHOST | NI_NUMERICSERV); -+ -+ printf("Trying %s...\n", name); -+ x = nlink.connect(debug, tmpaddr, srp, srlen, tos); -+ if (!x) -+ goto err; -+ else if (x==1) -+ goto nextaddr; -+ - connected++; - } while (connected == 0); -- cmdrc(hostp, hostname); -+ if (tmpaddr->ai_canonname == 0) { -+ hostname = new char[strlen(hostp)+1]; -+ strcpy(hostname, hostp); -+ } -+ else { -+ hostname = new char[strlen(tmpaddr->ai_canonname)+1]; -+ strcpy(hostname, tmpaddr->ai_canonname); -+ } -+ -+ cmdrc(hostp, hostname, portp); -+ freeaddrinfo(hostaddr); - if (autologin && user == NULL) { - struct passwd *pw; - -@@ -2013,30 +2094,21 @@ static int help(command_table *tab, int argc, const char *argv[]) { - return 0; - } - --static char *rcname = 0; --static char rcbuf[128]; -- --void cmdrc(const char *m1, const char *m2) { -+static void readrc(const char *m1, const char *m2, const char *port, -+ const char *rcname) -+{ - FILE *rcfile; - int gotmachine = 0; - int l1 = strlen(m1); - int l2 = strlen(m2); -- char m1save[64]; -- -- if (skiprc) return; -+ int lport = strlen(port); -+ char m1save[l1 + 1]; -+ char portsave[lport + 1]; - - strcpy(m1save, m1); - m1 = m1save; -- -- if (rcname == 0) { -- rcname = getenv("HOME"); -- if (rcname) -- strcpy(rcbuf, rcname); -- else -- rcbuf[0] = '\0'; -- strcat(rcbuf, "/.telnetrc"); -- rcname = rcbuf; -- } -+ strcpy(portsave, port); -+ port = portsave; - - rcfile = fopen(rcname, "r"); - if (!rcfile) return; -@@ -2061,6 +2133,13 @@ void cmdrc(const char *m1, const char *m2) { - strncpy(line, &line[7], sizeof(line) - 7); - else - continue; -+ -+ if (line[0] == ':') { -+ if (!strncasecmp(&line[1], port, lport)) -+ continue; -+ strncpy(line, &line[lport + 1], sizeof(line) - lport - 1); -+ } -+ - if (line[0] != ' ' && line[0] != '\t' && line[0] != '\n') - continue; - gotmachine = 1; -@@ -2073,6 +2152,21 @@ void cmdrc(const char *m1, const char *m2) { - fclose(rcfile); - } - -+void cmdrc(const char *m1, const char *m2, const char *port) { -+ char *rcname = NULL; -+ -+ if (skiprc) return; -+ -+ readrc(m1, m2, port, "/etc/telnetrc"); -+ if (asprintf (&rcname, "%s/.telnetrc", getenv ("HOME")) == -1) -+ { -+ perror ("asprintf"); -+ return; -+ } -+ readrc(m1, m2, port, rcname); -+ free (rcname); -+} -+ - #if defined(IP_OPTIONS) && defined(HAS_IPPROTO_IP) - - /* -diff --git a/telnet/defines.h b/telnet/defines.h -index 2784400..d5edc46 100644 ---- a/telnet/defines.h -+++ b/telnet/defines.h -@@ -50,3 +50,5 @@ - #define MODE_COMMAND_LINE(m) ((m)==-1) - - #define CONTROL(x) ((x)&0x1f) /* CTRL(x) is not portable */ -+ -+#define MODE_OUT8 0x8000 /* binary mode sans -opost */ -diff --git a/telnet/externs.h b/telnet/externs.h -index 955df79..0730e8a 100644 ---- a/telnet/externs.h -+++ b/telnet/externs.h -@@ -48,9 +48,7 @@ - typedef unsigned char cc_t; - #endif - --#ifdef __linux__ - #include <unistd.h> /* get _POSIX_VDISABLE */ --#endif - - #ifndef _POSIX_VDISABLE - #error "Please fix externs.h to define _POSIX_VDISABLE" -@@ -60,7 +58,8 @@ typedef unsigned char cc_t; - - extern int autologin; /* Autologin enabled */ - extern int skiprc; /* Don't process the ~/.telnetrc file */ --extern int eight; /* use eight bit mode (binary in and/or out */ -+extern int eight; /* use eight bit mode (binary in and/or out) */ -+extern int binary; /* use binary option (in and/or out) */ - extern int flushout; /* flush output */ - extern int connected; /* Are we connected to the other side? */ - extern int globalmode; /* Mode tty should be in */ -@@ -225,6 +224,8 @@ cc_t *tcval(int); - - //#if 0 - extern struct termios new_tc; -+extern struct termios old_tc; -+ - - #define termEofChar new_tc.c_cc[VEOF] - #define termEraseChar new_tc.c_cc[VERASE] -diff --git a/telnet/main.cc b/telnet/main.cc -index b67f2ce..b626e54 100644 ---- a/telnet/main.cc -+++ b/telnet/main.cc -@@ -45,7 +45,10 @@ char main_rcsid[] = - - #include <sys/types.h> - #include <getopt.h> -+#include <stdlib.h> - #include <string.h> -+#include <netdb.h> -+#include <errno.h> - - #include "ring.h" - #include "externs.h" -@@ -80,12 +83,13 @@ tninit(void) - void usage(void) { - fprintf(stderr, "Usage: %s %s%s%s%s\n", - prompt, -- " [-8] [-E] [-L] [-a] [-d] [-e char] [-l user] [-n tracefile]", -- "\n\t", -+ "[-4] [-6] [-8] [-E] [-L] [-a] [-d] [-e char] [-l user]", -+ "\n\t[-n tracefile] [ -b addr ]", - #ifdef TN3270 -+ "\n\t" - "[-noasynch] [-noasynctty] [-noasyncnet] [-r] [-t transcom]\n\t", - #else -- "[-r] ", -+ " [-r] ", - #endif - "[host-name [port]]" - ); -@@ -102,7 +106,8 @@ main(int argc, char *argv[]) - extern char *optarg; - extern int optind; - int ch; -- char *user; -+ char *user, *srcaddr; -+ int family; - - tninit(); /* Clear out things */ - #if defined(CRAY) && !defined(__STDC__) -@@ -110,21 +115,38 @@ main(int argc, char *argv[]) - #endif - - TerminalSaveState(); -+ if ((old_tc.c_cflag & (CSIZE|PARENB)) != CS8) -+ eight = 0; - - if ((prompt = strrchr(argv[0], '/'))!=NULL) - ++prompt; - else - prompt = argv[0]; - -- user = NULL; -+ user = srcaddr = NULL; -+ family = 0; - - rlogin = (strncmp(prompt, "rlog", 4) == 0) ? '~' : _POSIX_VDISABLE; - autologin = -1; - -- while ((ch = getopt(argc, argv, "8EKLS:X:ade:k:l:n:rt:x")) != EOF) { -+ while ((ch = getopt(argc, argv, -+ "4678EKLS:X:ab:de:k:l:n:rt:x")) != EOF) { - switch(ch) { -+ case '4': -+ family = AF_INET; -+ break; -+ case '6': -+#ifdef AF_INET6 -+ family = AF_INET6; -+#else -+ fputs("IPv6 unsupported\n", stderr); -+#endif -+ break; -+ case '7': -+ eight = 0; /* 7-bit ouput and input */ -+ break; - case '8': -- eight = 3; /* binary output and input */ -+ binary = 3; /* binary output and input */ - break; - case 'E': - rlogin = escapechar = _POSIX_VDISABLE; -@@ -133,23 +155,26 @@ main(int argc, char *argv[]) - //autologin = 0; - break; - case 'L': -- eight |= 2; /* binary output only */ -+ binary |= 2; /* binary output only */ - break; - case 'S': - { --#ifdef HAS_GETTOS - extern int tos; -+ int num; - -- if ((tos = parsetos(optarg, "tcp")) < 0) -+#ifdef HAS_GETTOS -+ if ((num = parsetos(optarg, "tcp")) < 0) { -+#else -+ errno = 0; -+ num = strtol(optarg, 0, 0); -+ if (errno) { -+#endif - fprintf(stderr, "%s%s%s%s\n", - prompt, ": Bad TOS argument '", - optarg, - "; will try to use default TOS"); --#else -- fprintf(stderr, -- "%s: Warning: -S ignored, no parsetos() support.\n", -- prompt); --#endif -+ } else -+ tos = num; - } - break; - case 'X': -@@ -210,6 +235,9 @@ main(int argc, char *argv[]) - "%s: -x ignored, no encryption support.\n", - prompt); - break; -+ case 'b': -+ srcaddr = optarg; -+ break; - case '?': - default: - usage(); -@@ -233,6 +261,13 @@ main(int argc, char *argv[]) - *argp++ = "-l"; - *argp++ = user; - } -+ if (srcaddr) { -+ *argp++ = "-b"; -+ *argp++ = srcaddr; -+ } -+ if (family) { -+ *argp++ = family == AF_INET ? "-4" : "-6"; -+ } - *argp++ = argv[0]; /* host */ - if (argc > 1) - *argp++ = argv[1]; /* port */ -diff --git a/telnet/netlink.cc b/telnet/netlink.cc -index f439cff..f839747 100644 ---- a/telnet/netlink.cc -+++ b/telnet/netlink.cc -@@ -79,22 +79,61 @@ void netlink::close(int doshutdown) { - shutdown(net, 2); - } - ::close(net); -+ net = -1; - } - --int netlink::connect(int debug, struct hostent *host, -- struct sockaddr_in *sn, -- char *srcroute, int srlen, int tos) -+int netlink::bind(struct addrinfo *addr) - { -- int on=1; -+ int res; -+ -+ res = socket(addr->ai_family); -+ if (res < 2) { -+ if (res == 1) -+ perror("telnet: socket"); -+ return -1; -+ } -+ -+ if (::bind(net, addr->ai_addr, addr->ai_addrlen) < 0) { -+ perror("telnet: bind"); -+ return -1; -+ } -+ -+ return 0; -+} -+ -+int netlink::socket(int family) -+{ -+ if (this->family != family) -+ close(0); - -- net = socket(AF_INET, SOCK_STREAM, 0); - if (net < 0) { -- perror("telnet: socket"); -- return 0; -+ this->family = family; -+ net = ::socket(family, SOCK_STREAM, 0); -+ if (net < 0) { -+ if (errno == EAFNOSUPPORT) -+ return 1; -+ perror("telnet: socket"); -+ return 0; -+ } - } - -+ return 2; -+} -+ -+int netlink::connect(int debug, struct addrinfo *addr, -+ char *srcroute, int srlen, int tos) -+{ -+ int on=1; -+ int res; -+ -+ res = socket(addr->ai_family); -+ if (res < 2) -+ return res; -+ - #if defined(IP_OPTIONS) && defined(HAS_IPPROTO_IP) - if (srcroute) { -+ if (addr->ai_family != AF_INET) -+ fputs("Source route is only supported for IPv4\n", stderr); - if (setsockopt(net, IPPROTO_IP, IP_OPTIONS, srcroute, srlen) < 0) - perror("setsockopt (IP_OPTIONS)"); - } -@@ -108,7 +147,7 @@ int netlink::connect(int debug, struct hostent *host, - #endif - if (tos < 0) tos = 020; /* Low Delay bit */ - if (tos && (setsockopt(net, IPPROTO_IP, IP_TOS, &tos, sizeof(int)) < 0) -- && (errno != ENOPROTOOPT)) -+ && (errno != ENOPROTOOPT) && (errno != EOPNOTSUPP)) - perror("telnet: setsockopt (IP_TOS) (ignored)"); - #endif /* defined(IPPROTO_IP) && defined(IP_TOS) */ - -@@ -116,27 +155,8 @@ int netlink::connect(int debug, struct hostent *host, - perror("setsockopt (SO_DEBUG)"); - } - -- if (::connect(net, (struct sockaddr *)sn, sizeof(*sn)) < 0) { --#if defined(h_addr) /* In 4.3, this is a #define */ -- if (host && host->h_addr_list[1]) { -- int oerrno = errno; -- -- fprintf(stderr, "telnet: connect to address %s: ", -- inet_ntoa(sn->sin_addr)); -- errno = oerrno; -- perror(NULL); -- host->h_addr_list++; -- if (host->h_length > (int)sizeof(sn->sin_addr)) { -- host->h_length = sizeof(sn->sin_addr); -- } -- memcpy(&sn->sin_addr, host->h_addr_list[0], host->h_length); -- close(net); -- return 1; -- } --#endif /* defined(h_addr) */ -- -- perror("telnet: Unable to connect to remote host"); -- return 0; -+ if (::connect(net, addr->ai_addr, addr->ai_addrlen) < 0) { -+ return 1; - } - return 2; - } -diff --git a/telnet/netlink.h b/telnet/netlink.h -index 9852b30..0ac8a08 100644 ---- a/telnet/netlink.h -+++ b/telnet/netlink.h -@@ -1,13 +1,16 @@ - - class netlink { -+ private: -+ int family; - protected: - int net; - public: - netlink(); - ~netlink(); - -- int connect(int debug, struct hostent *host, -- struct sockaddr_in *sin, -+ int bind(struct addrinfo *hostaddr); -+ int socket(int family); -+ int connect(int debug, struct addrinfo *hostaddr, - char *srcroute, int srlen, - int tos); - void close(int doshutdown); -diff --git a/telnet/network.cc b/telnet/network.cc -index 6a2c374..0dcf3e2 100644 ---- a/telnet/network.cc -+++ b/telnet/network.cc -@@ -40,6 +40,7 @@ char net_rcsid[] = - #include <sys/types.h> - #include <sys/socket.h> - #include <sys/time.h> -+#include <stdlib.h> - #include <errno.h> - #include <arpa/telnet.h> - -diff --git a/telnet/proto.h b/telnet/proto.h -index 8be4a39..92f2419 100644 ---- a/telnet/proto.h -+++ b/telnet/proto.h -@@ -13,7 +13,7 @@ int TerminalWindowSize(long *rows, long *cols); - void auth_encrypt_user(char *); - void auth_name(unsigned char *, int); - void auth_printsub(unsigned char *, int, unsigned char *, int); --void cmdrc(const char *m1, const char *m2); -+void cmdrc(const char *, const char *, const char *); - void env_init(void); - int getconnmode(void); - void init_network(void); -diff --git a/telnet/ring.cc b/telnet/ring.cc -index be57396..772c6c5 100644 ---- a/telnet/ring.cc -+++ b/telnet/ring.cc -@@ -165,7 +165,7 @@ int ringbuf::flush() { - - /////////////////////////////////////////////////// supply ////////////// - --void ringbuf::printf(const char *format, ...) { -+void ringbuf::xprintf(const char *format, ...) { - char xbuf[256]; - va_list ap; - va_start(ap, format); -diff --git a/telnet/ring.h b/telnet/ring.h -index 15d3f3f..049377e 100644 ---- a/telnet/ring.h -+++ b/telnet/ring.h -@@ -83,7 +83,7 @@ class ringbuf { - // manual supply - void putch(char c) { write(&c, 1); } - void write(const char *buffer, int ct); -- void printf(const char *format, ...); -+ void xprintf(const char *format, ...); - int empty_count() { return size - count; } - - // automatic supply -diff --git a/telnet/sys_bsd.cc b/telnet/sys_bsd.cc -index 93fba7e..a8c9aab 100644 ---- a/telnet/sys_bsd.cc -+++ b/telnet/sys_bsd.cc -@@ -189,18 +189,25 @@ void NetSetPgrp(int fd) { - * Various signal handling routines. - */ - -+#if 0 - static void deadpeer(int /*sig*/) { - setcommandmode(); - siglongjmp(peerdied, -1); - } -+#endif - - static void intr(int /*sig*/) { - if (localchars) { - intp(); - } - else { -+#if 0 - setcommandmode(); - siglongjmp(toplevel, -1); -+#else -+ signal(SIGINT, SIG_DFL); -+ raise(SIGINT); -+#endif - } - } - -@@ -214,6 +221,8 @@ static void intr2(int /*sig*/) { - sendabort(); - return; - } -+ signal(SIGQUIT, SIG_DFL); -+ raise(SIGQUIT); - } - - #ifdef SIGWINCH -@@ -238,7 +247,9 @@ void ayt(int sig) { - void sys_telnet_init(void) { - signal(SIGINT, intr); - signal(SIGQUIT, intr2); -+#if 0 - signal(SIGPIPE, deadpeer); -+#endif - #ifdef SIGWINCH - signal(SIGWINCH, sendwin); - #endif -diff --git a/telnet/telnet.1 b/telnet/telnet.1 -index 54a47fb..8365e42 100644 ---- a/telnet/telnet.1 -+++ b/telnet/telnet.1 -@@ -42,8 +42,9 @@ - protocol - .Sh SYNOPSIS - .Nm telnet --.Op Fl 8ELadr -+.Op Fl 468ELadr - .Op Fl S Ar tos -+.Op Fl b Ar address - .Op Fl e Ar escapechar - .Op Fl l Ar user - .Op Fl n Ar tracefile -@@ -68,6 +69,10 @@ command implicitly; see the description below. - .Pp - Options: - .Bl -tag -width indent -+.It Fl 4 -+Force IPv4 address resolution. -+.It Fl 6 -+Force IPv6 address resolution. - .It Fl 8 - Request 8-bit operation. This causes an attempt to negotiate the - .Dv TELNET BINARY -@@ -89,6 +94,8 @@ of the - option if supported by the remote system. The username is retrieved - via - .Xr getlogin 3 . -+.It Fl b Ar address -+Use bind(2) on the local socket to bind it to a specific local address. - .It Fl d - Sets the initial value of the - .Ic debug -@@ -474,17 +481,29 @@ protocol without making a mess. Protocol negotiation can be forced by - placing a dash before the port number. - .Pp - After establishing a connection, any commands associated with the --remote host in the user's -+remote host in -+.Pa /etc/telnetrc -+and the user's - .Pa .telnetrc --file are executed. -+file are executed, in that order. - .Pp --The format of the .telnetrc file is as follows: Lines beginning with a -+The format of the telnetrc files is as follows: Lines beginning with a - #, and blank lines, are ignored. The rest of the file should consist - of hostnames and sequences of - .Nm telnet - commands to use with that host. Commands should be one per line, - indented by whitespace; lines beginning without whitespace are --interpreted as hostnames. Upon connecting to a particular host, the -+interpreted as hostnames. Lines beginning with the special hostname -+.Ql DEFAULT -+will apply to all hosts. Hostnames including -+.Ql DEFAULT -+may be followed immediately by a colon and a port number or string. -+If a port is specified it must match exactly with what is specified -+on the command line. If no port was specified on the command line, -+then the value -+.Ql telnet -+is used. -+Upon connecting to a particular host, the - commands associated with that host are executed. - .It Ic quit - Close any open session and exit -@@ -1184,9 +1203,7 @@ escape sequences are preceded by a '*' to aid in locating them. - When the skiprc toggle is - .Dv TRUE , - .Tn telnet --does not read the --.Pa \&.telnetrc --file. The initial value for this toggle is -+does not read the telnetrc files. The initial value for this toggle is - .Dv FALSE. - .It Ic termdata - Toggles the display of all terminal data (in hexadecimal format). -@@ -1239,7 +1256,9 @@ to the other side via the - .Dv TELNET ENVIRON - option. - .Sh FILES --.Bl -tag -width ~/.telnetrc -compact -+.Bl -tag -width /etc/telnetrc -compact -+.It Pa /etc/telnetrc -+global telnet startup values - .It Pa ~/.telnetrc - user customized telnet startup values - .El -diff --git a/telnet/telnet.cc b/telnet/telnet.cc -index 4fc3b1f..7eca811 100644 ---- a/telnet/telnet.cc -+++ b/telnet/telnet.cc -@@ -88,7 +88,8 @@ char do_dont_resp[256]; - char will_wont_resp[256]; - - int --eight = 0, -+ eight = 3, -+ binary = 0, - autologin = 0, /* Autologin anyone? */ - skiprc = 0, - connected, -@@ -639,14 +640,14 @@ static const char *gettermname(void) { - if (resettermname) { - resettermname = 0; - tname = env_getvalue("TERM", 0); -- if (!tname || my_setupterm(tname, 1, &err)) { -+ if (!tname /* || my_setupterm(tname, 1, &err) */) { - termbuf[0] = 0; - tname = "UNKNOWN"; - } - mklist(termbuf, tname, termtypes); - next = 0; - } -- if (next==termtypes.num()) next = 0; -+ if (next==termtypes.num()-1) next = 0; - return termtypes[next++]; - } - /* -@@ -681,7 +682,7 @@ static void suboption(void) { - } - #endif /* TN3270 */ - name = gettermname(); -- netoring.printf("%c%c%c%c%s%c%c", IAC, SB, TELOPT_TTYPE, -+ netoring.xprintf("%c%c%c%c%s%c%c", IAC, SB, TELOPT_TTYPE, - TELQUAL_IS, name, IAC, SE); - } - break; -@@ -693,7 +694,7 @@ static void suboption(void) { - if (SB_GET() == TELQUAL_SEND) { - long oospeed, iispeed; - TerminalSpeeds(&iispeed, &oospeed); -- netoring.printf("%c%c%c%c%ld,%ld%c%c", IAC, SB, TELOPT_TSPEED, -+ netoring.xprintf("%c%c%c%c%ld,%ld%c%c", IAC, SB, TELOPT_TSPEED, - TELQUAL_IS, oospeed, iispeed, IAC, SE); - } - break; -@@ -780,7 +781,7 @@ static void suboption(void) { - send_wont(TELOPT_XDISPLOC, 1); - break; - } -- netoring.printf("%c%c%c%c%s%c%c", IAC, SB, TELOPT_XDISPLOC, -+ netoring.xprintf("%c%c%c%c%s%c%c", IAC, SB, TELOPT_XDISPLOC, - TELQUAL_IS, dp, IAC, SE); - } - break; -@@ -798,7 +799,7 @@ void lm_will(unsigned char *cmd, int len) { - return; - } - -- netoring.printf("%c%c%c%c%c%c%c", IAC, SB, TELOPT_LINEMODE, -+ netoring.xprintf("%c%c%c%c%c%c%c", IAC, SB, TELOPT_LINEMODE, - DONT, cmd[0], IAC, SE); - } - -@@ -815,7 +816,7 @@ void lm_do(unsigned char *cmd, int len) { - /*@*/ printf("lm_do: no command!!!\n"); /* Should not happen... */ - return; - } -- netoring.printf("%c%c%c%c%c%c%c", IAC, SB, TELOPT_LINEMODE, -+ netoring.xprintf("%c%c%c%c%c%c%c", IAC, SB, TELOPT_LINEMODE, - WONT, cmd[0], IAC, SE); - } - -@@ -838,7 +839,7 @@ void lm_mode(unsigned char *cmd, int len, int init) { - k |= MODE_ACK; - } - -- netoring.printf("%c%c%c%c%c%c%c", IAC, SB, TELOPT_LINEMODE, LM_MODE, -+ netoring.xprintf("%c%c%c%c%c%c%c", IAC, SB, TELOPT_LINEMODE, LM_MODE, - k, IAC, SE); - - setconnmode(0); /* set changed mode */ -@@ -933,11 +934,11 @@ void slc_mode_import(int def) { - - void slc_import(int def) { - if (def) { -- netoring.printf("%c%c%c%c%c%c%c%c%c", IAC, SB, TELOPT_LINEMODE, -+ netoring.xprintf("%c%c%c%c%c%c%c%c%c", IAC, SB, TELOPT_LINEMODE, - LM_SLC, 0, SLC_DEFAULT, 0, IAC, SE); - } - else { -- netoring.printf("%c%c%c%c%c%c%c%c%c", IAC, SB, TELOPT_LINEMODE, -+ netoring.xprintf("%c%c%c%c%c%c%c%c%c", IAC, SB, TELOPT_LINEMODE, - LM_SLC, 0, SLC_VARIABLE, 0, IAC, SE); - } - } -@@ -1050,6 +1051,7 @@ void slc_check(void) { - - - unsigned char slc_reply[128]; -+unsigned char const * const slc_reply_eom = &slc_reply[sizeof(slc_reply)]; - unsigned char *slc_replyp; - - void slc_start_reply(void) { -@@ -1061,6 +1063,14 @@ void slc_start_reply(void) { - } - - void slc_add_reply(int func, int flags, int value) { -+ /* A sequence of up to 6 bytes my be written for this member of the SLC -+ * suboption list by this function. The end of negotiation command, -+ * which is written by slc_end_reply(), will require 2 additional -+ * bytes. Do not proceed unless there is sufficient space for these -+ * items. -+ */ -+ if (&slc_replyp[6+2] > slc_reply_eom) -+ return; - if ((*slc_replyp++ = func) == IAC) - *slc_replyp++ = IAC; - if ((*slc_replyp++ = flags) == IAC) -@@ -1142,6 +1152,7 @@ void env_opt(unsigned char *buf, int len) { - } - } - -+/* OPT_REPLY_SIZE must be a multiple of 2. */ - #define OPT_REPLY_SIZE 256 - unsigned char *opt_reply; - unsigned char *opt_replyp; -@@ -1173,6 +1184,7 @@ void env_opt_start_info(void) { - - void env_opt_add(const char *ep) { - const char *vp; -+ const unsigned char *tp; - unsigned char c; - - if (opt_reply == NULL) /*XXX*/ -@@ -1185,11 +1197,12 @@ void env_opt_add(const char *ep) { - return; - } - vp = env_getvalue(ep, 1); -- if (opt_replyp + (vp ? strlen(vp) : 0) + strlen(ep) + 6 > opt_replyend) -+ tp = opt_replyp + (vp ? strlen(vp) * 2 : 0) + strlen(ep) * 2 + 6; -+ if (tp > opt_replyend) - { - register int len; -- opt_replyend += OPT_REPLY_SIZE; -- len = opt_replyend - opt_reply; -+ len = ((tp - opt_reply) + OPT_REPLY_SIZE - 1) & ~(OPT_REPLY_SIZE - 1); -+ opt_replyend = opt_reply + len; - opt_reply = (unsigned char *)realloc(opt_reply, len); - if (opt_reply == NULL) { - /*@*/ printf("env_opt_add: realloc() failed!!!\n"); -@@ -1740,8 +1753,8 @@ void telnet(const char * /*user*/) { - send_do(TELOPT_STATUS, 1); - if (env_getvalue("DISPLAY", 0)) - send_will(TELOPT_XDISPLOC, 1); -- if (eight) -- tel_enter_binary(eight); -+ if (binary) -+ tel_enter_binary(binary); - } - #endif /* !defined(TN3270) */ - -diff --git a/telnet/terminal.cc b/telnet/terminal.cc -index 9eb47ae..764f18f 100644 ---- a/telnet/terminal.cc -+++ b/telnet/terminal.cc -@@ -45,6 +45,8 @@ char terminal_rcsid[] = - #include <signal.h> - #include <errno.h> - #include <stdio.h> -+#include <string.h> -+#include <stdlib.h> - - #include "ring.h" - #include "defines.h" -@@ -155,9 +157,11 @@ int getconnmode(void) { - if (localflow) - mode |= MODE_FLOW; - -- if (my_want_state_is_will(TELOPT_BINARY)) -+ if ((eight & 1) || my_want_state_is_will(TELOPT_BINARY)) - mode |= MODE_INBIN; - -+ if (eight & 2) -+ mode |= MODE_OUT8; - if (his_want_state_is_will(TELOPT_BINARY)) - mode |= MODE_OUTBIN; - -@@ -449,10 +453,13 @@ void TerminalNewMode(int f) - // breaks SunOS. - tmp_tc.c_iflag |= ISTRIP; - } -- if (f & MODE_OUTBIN) { -+ if (f & (MODE_OUTBIN|MODE_OUT8)) { - tmp_tc.c_cflag &= ~(CSIZE|PARENB); - tmp_tc.c_cflag |= CS8; -- tmp_tc.c_oflag &= ~OPOST; -+ if (f & MODE_OUTBIN) -+ tmp_tc.c_oflag &= ~OPOST; -+ else -+ tmp_tc.c_oflag |= OPOST; - } else { - tmp_tc.c_cflag &= ~(CSIZE|PARENB); - tmp_tc.c_cflag |= old_tc.c_cflag & (CSIZE|PARENB); -@@ -468,7 +475,7 @@ void TerminalNewMode(int f) - - #ifdef SIGINFO - signal(SIGINFO, ayt); --#endif SIGINFO -+#endif /* SIGINFO */ - - #if defined(NOKERNINFO) - tmp_tc.c_lflag |= NOKERNINFO; -@@ -504,7 +511,7 @@ void TerminalNewMode(int f) - - #ifdef SIGINFO - signal(SIGINFO, ayt_status); --#endif SIGINFO -+#endif /* SIGINFO */ - - #ifdef SIGTSTP - signal(SIGTSTP, SIG_DFL); -diff --git a/telnet/utilities.cc b/telnet/utilities.cc -index 0448f0a..66839ab 100644 ---- a/telnet/utilities.cc -+++ b/telnet/utilities.cc -@@ -47,6 +47,8 @@ char util_rcsid[] = - #include <sys/socket.h> - #include <unistd.h> - #include <ctype.h> -+#include <string.h> -+#include <stdlib.h> - - #include "ring.h" - #include "defines.h" --- -1.8.4.2 - diff --git a/meta-networking/recipes-netkit/netkit-telnet/files/Warning-fix-in-the-step-of-install.patch b/meta-networking/recipes-netkit/netkit-telnet/files/Warning-fix-in-the-step-of-install.patch deleted file mode 100644 index b9a98f1d6f..0000000000 --- a/meta-networking/recipes-netkit/netkit-telnet/files/Warning-fix-in-the-step-of-install.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 31362e4c0d02b4a2b952ad0dd32acfb573c442f3 Mon Sep 17 00:00:00 2001 -From: Li xin <lixin.fnst@cn.fujitsu.com> -Date: Fri, 28 Nov 2014 07:17:40 +0900 -Subject: [PATCH 2/2] WARNING Fix and modify "CFLAGS" - -WARNING: QA Issue: File '/usr/sbin/in.telnetd' from netkit-telnet was -already stripped, this will prevent future debugging! [already-stripped] - -Upstream-Status: pending - -Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> ---- - telnetd/Makefile | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/telnetd/Makefile b/telnetd/Makefile -index 72650b4..a4cf9fa 100644 ---- a/telnetd/Makefile -+++ b/telnetd/Makefile -@@ -9,7 +9,8 @@ include ../MRULES - # take out -DPARANOID_TTYS. - - CFLAGS += '-DISSUE_FILE="/etc/issue.net"' -DPARANOID_TTYS \ -- -DNO_REVOKE -DKLUDGELINEMODE -DDIAGNOSTICS -+ -DNO_REVOKE -DKLUDGELINEMODE -DDIAGNOSTICS \ -+ -DLOGIN_WRAPPER=\"/${libdir}/telnetlogin\" - # LIBS += $(LIBTERMCAP) - - OBJS = telnetd.o state.o termstat.o slc.o sys_term.o utility.o \ -@@ -27,7 +28,7 @@ $(OBJS): defs.h ext.h pathnames.h telnetd.h logwtmp.h logout.h setproctitle.h - telnetd.o: ../version.h - - install: telnetd -- install -s -m$(DAEMONMODE) telnetd $(INSTALLROOT)$(SBINDIR)/in.telnetd -+ install -m$(DAEMONMODE) telnetd $(INSTALLROOT)$(SBINDIR)/in.telnetd - install -m$(MANMODE) issue.net.5 $(INSTALLROOT)$(MANDIR)/man5/ - install -m$(MANMODE) telnetd.8 $(INSTALLROOT)$(MANDIR)/man8/in.telnetd.8 - ln -sf in.telnetd.8 $(INSTALLROOT)$(MANDIR)/man8/telnetd.8 --- -1.8.4.2 - diff --git a/meta-networking/recipes-netkit/netkit-telnet/files/cross-compile.patch b/meta-networking/recipes-netkit/netkit-telnet/files/cross-compile.patch deleted file mode 100644 index b3fe36b7bb..0000000000 --- a/meta-networking/recipes-netkit/netkit-telnet/files/cross-compile.patch +++ /dev/null @@ -1,48 +0,0 @@ -To support the cross-compile - -Upstream-Status: Pending - -make the configure to support the cross-compile, by only to compile the -target, and not to run it - -Roy Li <rongqing.li@windriver.com> -Index: netkit-telnet-0.17/configure -=================================================================== ---- netkit-telnet-0.17.orig/configure 2008-11-23 22:01:26.000000000 +0100 -+++ netkit-telnet-0.17/configure 2008-11-23 22:05:00.000000000 +0100 -@@ -94,7 +94,7 @@ - echo -n 'Checking if C compiler works... ' - if ( - $CC __conftest.c -o __conftest || exit 1 -- ./__conftest || exit 1 -+ # Idiots belong shot! ./__conftest || exit 1 - ) >/dev/null 2>&1; then - echo 'yes' - else -@@ -141,7 +141,7 @@ - echo -n 'Checking if C++ compiler works... ' - if ( - $CXX __conftest.cc -o __conftest || exit 1 -- ./__conftest || exit 1 -+ # Iditios belong shot! ./__conftest || exit 1 - ) >/dev/null 2>&1; then - echo 'yes' - else -@@ -284,7 +284,7 @@ - else - if ( - $CXX $CXXFLAGS -D__USE_BSD_SIGNAL __conftest.cc -o __conftest || exit 1 -- ./__conftest || exit 1 -+ # running still does not work./__conftest || exit 1 - ) >/dev/null 2>&1; then - echo '-D__USE_BSD_SIGNAL' - CFLAGS="$CFLAGS -D__USE_BSD_SIGNAL" -@@ -501,7 +501,7 @@ - EOF - if ( - $CXX $CXXFLAGS __conftest.cc $LIBBSD -o __conftest || exit 1 -- ./__conftest || exit 1 -+ # argh! morons!./__conftest || exit 1 - ) >/dev/null 2>&1; then - echo 'ok' - else diff --git a/meta-networking/recipes-netkit/netkit-telnet/files/telnet-xinetd b/meta-networking/recipes-netkit/netkit-telnet/files/telnet-xinetd deleted file mode 100644 index 12204c71b2..0000000000 --- a/meta-networking/recipes-netkit/netkit-telnet/files/telnet-xinetd +++ /dev/null @@ -1,14 +0,0 @@ -# default: on -# description: The telnet server serves telnet sessions; it uses \ -# unencrypted username/password pairs for authentication. -service telnet -{ - flags = REUSE - socket_type = stream - wait = no - user = root - server = /usr/sbin/in.telnetd - log_on_failure += USERID - disable = yes -} - diff --git a/meta-networking/recipes-netkit/netkit-telnet/netkit-telnet_0.17.bb b/meta-networking/recipes-netkit/netkit-telnet/netkit-telnet_0.17.bb deleted file mode 100644 index 807b566449..0000000000 --- a/meta-networking/recipes-netkit/netkit-telnet/netkit-telnet_0.17.bb +++ /dev/null @@ -1,61 +0,0 @@ -DESCRIPTION = "netkit-telnet includes the telnet daemon and client." -HOMEPAGE = "http://www.hcs.harvard.edu/~dholland/computers/netkit.html" -SECTION = "net" -DEPENDS = "ncurses" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://telnet/telnet.cc;beginline=2;endline=3;md5=780868e7b566313e70cb701560ca95ef" - -SRC_URI = "ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${BP}.tar.gz \ - file://To-aviod-buffer-overflow-in-telnet.patch \ - file://Warning-fix-in-the-step-of-install.patch \ - file://telnet-xinetd \ - file://cross-compile.patch \ - file://0001-telnet-telnetd-Fix-print-format-strings.patch \ - " - -EXTRA_OEMAKE = "INSTALLROOT=${D} SBINDIR=${sbindir} DAEMONMODE=755 \ - MANMODE=644 MANDIR=${mandir}" - -do_configure () { - ./configure --prefix=${prefix} - sed -e 's#^CFLAGS=\(.*\)$#CFLAGS= -D_GNU_SOURCE \1#' \ - -e 's#^CXXFLAGS=\(.*\)$#CXXFLAGS= -D_GNU_SOURCE \1#' \ - -e 's#^LDFLAGS=.*$#LDFLAGS= ${LDFLAGS}#' \ - -i MCONFIG -} - -do_compile () { - oe_runmake 'CC=${CC}' 'LD=${LD}' 'LDFLAGS=${LDFLAGS}' SUB=telnet - oe_runmake 'CC=${CC}' 'LD=${LD}' 'LDFLAGS=${LDFLAGS}' LIBS=-lutil SUB=telnetd - oe_runmake 'CC=${CC}' 'LD=${LD}' 'LDFLAGS=${LDFLAGS}' SUB=telnetlogin -} - -do_install () { - install -d ${D}${bindir} - install -m 0755 telnet/telnet ${D}${bindir}/telnet.${PN} - install -d ${D}${sbindir} - install -d ${D}${mandir}/man1 - install -d ${D}${mandir}/man5 - install -d ${D}${mandir}/man8 - oe_runmake SUB=telnetd install - rm -rf ${D}${mandir}/man1 - install -D -m 4750 ${B}/telnetlogin/telnetlogin ${D}/${libdir}/telnetlogin - # fix up hardcoded paths - sed -i -e 's,/usr/sbin/,${sbindir}/,' ${WORKDIR}/telnet-xinetd - install -d ${D}/etc/xinetd.d/ - install -p -m644 ${WORKDIR}/telnet-xinetd ${D}/etc/xinetd.d/telnet -} - -pkg_postinst_${PN} () { -#!/bin/sh - update-alternatives --install ${bindir}/telnet telnet telnet.${PN} 100 -} - -pkg_prerm_${PN} () { -#!/bin/sh - update-alternatives --remove telnet telnet.${PN} 100 -} - -SRC_URI[md5sum] = "d6beabaaf53fe6e382c42ce3faa05a36" -SRC_URI[sha256sum] = "9c80d5c7838361a328fb6b60016d503def9ce53ad3c589f3b08ff71a2bb88e00" -FILES_${PN} += "${sbindir}/in.* ${libdir}/* ${sysconfdir}/xinetd.d/*" diff --git a/meta-networking/recipes-netkit/netkit-tftp/netkit-tftp/0001-tftp-Include-missing-fcntl.h.patch b/meta-networking/recipes-netkit/netkit-tftp/netkit-tftp/0001-tftp-Include-missing-fcntl.h.patch deleted file mode 100644 index 78936907f6..0000000000 --- a/meta-networking/recipes-netkit/netkit-tftp/netkit-tftp/0001-tftp-Include-missing-fcntl.h.patch +++ /dev/null @@ -1,27 +0,0 @@ -From fa57e161fc953264a75d50a787cb83983e60acc7 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 30 Aug 2017 18:30:02 -0700 -Subject: [PATCH] tftp: Include missing fcntl.h - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending - - tftp/main.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tftp/main.c b/tftp/main.c -index 8c54843..5c9b698 100644 ---- a/tftp/main.c -+++ b/tftp/main.c -@@ -63,6 +63,7 @@ char main_rcsid[] = - #include <ctype.h> - #include <netdb.h> - #include <unistd.h> -+#include <fcntl.h> - - #include "tftpsubs.h" /* for mysignal() */ - --- -2.14.1 - diff --git a/meta-networking/recipes-netkit/netkit-tftp/netkit-tftp/tftp.conf b/meta-networking/recipes-netkit/netkit-tftp/netkit-tftp/tftp.conf deleted file mode 100644 index 7bc6ca96b6..0000000000 --- a/meta-networking/recipes-netkit/netkit-tftp/netkit-tftp/tftp.conf +++ /dev/null @@ -1,11 +0,0 @@ -service tftp -{ - disable = no - socket_type = dgram - port = 69 - protocol = udp - wait = yes - user = nobody - server = /usr/sbin/in.tftpd - server_args = /tftpboot -} diff --git a/meta-networking/recipes-netkit/netkit-tftp/netkit-tftp_0.17.bb b/meta-networking/recipes-netkit/netkit-tftp/netkit-tftp_0.17.bb deleted file mode 100644 index 92c13e850c..0000000000 --- a/meta-networking/recipes-netkit/netkit-tftp/netkit-tftp_0.17.bb +++ /dev/null @@ -1,55 +0,0 @@ -SUMMARY = "tftp - Trivial file transfer protocol client" -SECTION = "net" -LICENSE = "BSD-4-Clause" -DEPENDS = "tcp-wrappers" - -LIC_FILES_CHKSUM = "file://tftp/tftp.c;beginline=2;endline=3;md5=84d2cfe1e60863a7d82648734ba4d30c" - -SRC_URI = "${DEBIAN_MIRROR}/main/n/${BPN}/${BPN}_${PV}.orig.tar.gz;name=archive \ - ${DEBIAN_MIRROR}/main/n/${BPN}/${BPN}_${PV}-18.diff.gz;name=patch18 \ - file://tftp.conf \ - file://0001-tftp-Include-missing-fcntl.h.patch \ - " - -SRC_URI[archive.md5sum] = "b7262c798e2ff50e29c2ff50dfd8d6a8" -SRC_URI[archive.sha256sum] = "3a43c0010d4e61f412563fd83769d4667d8b8e82903526d21cb9205fe55ad14d" -SRC_URI[patch18.md5sum] = "cb29e7a33dd85105ba6e6ec4f971e42c" -SRC_URI[patch18.sha256sum] = "092437d27b4fa88c044ef6290372fee5ce06d223607f0e22a6e527065c8930e7" - -inherit autotools-brokensep - -do_configure () { - ./configure --prefix=${prefix} - echo "CFLAGS=${CFLAGS}" > MCONFIG -} - -do_compile () { - oe_runmake 'CC=${CC}' 'LD=${LD}' 'LDFLAGS=${LDFLAGS}' 'CFLAGS=${CFLAGS}' -} - -do_install () { - install -d ${D}${bindir} - install -d ${D}${sbindir} - install -d ${D}${mandir}/man1 - install -d ${D}${mandir}/man8 - install -d ${D}${sysconfdir}/xinetd.d - - sed -i 's/install -s/install/' tftp/Makefile - sed -i 's/install -s/install/' tftpd/Makefile - - oe_runmake 'INSTALLROOT=${D}' 'BINMODE=0755' \ - 'DAEMONMODE=0755' 'MANMODE=0644' \ - 'BINDIR=${bindir}' 'SBINDIR=${sbindir}' \ - 'MANDIR=${mandir}' install - - install ${WORKDIR}/tftp.conf ${D}/${sysconfdir}/xinetd.d/tftp -} - -PACKAGES = "${PN}-client ${PN}-server ${PN}-doc ${BPN}-dbg" -FILES_${PN}-client = "${bindir}/*" -FILES_${PN}-server = "${sbindir}/* ${sysconfdir}/xinetd.d/*" -FILES_${PN}-doc = "${mandir}" -FILES_${PN}-dbg = "${prefix}/src/debug \ - ${bindir}/.debug ${sbindir}/.debug" - -RDEPENDS_${PN}-server = "tcp-wrappers xinetd" diff --git a/meta-networking/recipes-protocols/babeld/babeld_1.13.1.bb b/meta-networking/recipes-protocols/babeld/babeld_1.13.1.bb new file mode 100644 index 0000000000..a799ad197e --- /dev/null +++ b/meta-networking/recipes-protocols/babeld/babeld_1.13.1.bb @@ -0,0 +1,31 @@ +SUMMARY = "Babel is a loop-avoiding distance-vector routing protocol" +DESCRIPTION = "\ +Babel is a loop-avoiding distance-vector routing protocol for IPv6 and \ +IPv4 with fast convergence properties. It is based on the ideas in DSDV, AODV \ +and Cisco's EIGRP, but is designed to work well not only in wired networks \ +but also in wireless mesh networks, and has been extended with support \ +for overlay networks. Babel is in the process of becoming an IETF Standard. \ +" +HOMEPAGE = "https://www.irif.fr/~jch/software/babel/" +SECTION = "net" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENCE;md5=411a48ac3c2e9e0911b8dd9aed26f754" + +SRC_URI = "gitsm://github.com/jech/babeld.git;protocol=https;branch=master" +SRCREV = "3d61ea1e843e2c5f9706c74d1adad4e1d24d44b9" + +UPSTREAM_CHECK_GITTAGREGEX = "babeld-(?P<pver>\d+(\.\d+)+)" + +S = "${WORKDIR}/git" + +EXTRA_OEMAKE += "CFLAGS='${CFLAGS}'" + +do_compile () { + oe_runmake babeld +} + +do_install () { + oe_runmake install.minimal TARGET=${D} PREFIX=${root_prefix} +} + diff --git a/meta-networking/recipes-protocols/dante/dante_1.4.1.bb b/meta-networking/recipes-protocols/dante/dante_1.4.3.bb index ffdab22cf0..4badff8bbd 100644 --- a/meta-networking/recipes-protocols/dante/dante_1.4.1.bb +++ b/meta-networking/recipes-protocols/dante/dante_1.4.3.bb @@ -9,12 +9,11 @@ what could be described as a non-transparent Layer 4 router." HOMEPAGE = "http://www.inet.no/dante/" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=221118dda731fe93a85d0ed973467249" +LIC_FILES_CHKSUM = "file://LICENSE;md5=edd508404db7339042dfc861a3a690ad" SRC_URI = "https://www.inet.no/dante/files/dante-${PV}.tar.gz \ " -SRC_URI[md5sum] = "68c2ce12119e12cea11a90c7a80efa8f" -SRC_URI[sha256sum] = "b6d232bd6fefc87d14bf97e447e4fcdeef4b28b16b048d804b50b48f261c4f53" +SRC_URI[sha256sum] = "418a065fe1a4b8ace8fbf77c2da269a98f376e7115902e76cda7e741e4846a5d" # without --without-gssapi, config.log will contain reference to /usr/lib # as a consequence of GSSAPI path being set to /usr by default. @@ -23,27 +22,29 @@ SRC_URI[sha256sum] = "b6d232bd6fefc87d14bf97e447e4fcdeef4b28b16b048d804b50b48f26 # --enable-release build prerelease as full release EXTRA_OECONF += "--without-gssapi --sbindir=${bindir}" -DEPENDS += "flex-native bison-native libpam" +DEPENDS += "flex-native bison-native libpam libtirpc" +inherit autotools-brokensep features_check -inherit autotools-brokensep distro_features_check +CPPFLAGS += "-P" +CFLAGS += "-I${STAGING_INCDIR}/tirpc" +LIBS += "-ltirpc" REQUIRED_DISTRO_FEATURES = "pam" EXTRA_AUTORECONF = "-I ${S}" PACKAGECONFIG[libwrap] = ",--disable-libwrap,tcp-wrappers,libwrap" -PACKAGECONFIG[krb5] = ",--without-krb5,krb5" PACKAGECONFIG ??= "" -do_install_append() { +do_install:append() { install -d ${D}${sysconfdir} cp ${S}/example/sock[sd].conf ${D}${sysconfdir} } PACKAGES =+ "${PN}-sockd ${PN}-libdsocks " -FILES_${PN}-libdsocks = "${libdir}/libdsocks.so" -FILES_${PN}-sockd = "${bindir}/sockd ${sysconfdir}/sockd.conf" +FILES:${PN}-libdsocks = "${libdir}/libdsocks.so" +FILES:${PN}-sockd = "${bindir}/sockd ${sysconfdir}/sockd.conf" -INSANE_SKIP_${PN}-libdsocks = "dev-elf" +INSANE_SKIP:${PN}-libdsocks = "dev-elf" diff --git a/meta-networking/recipes-protocols/freediameter/files/0001-tests-use-EXTENSIONS_DIR.patch b/meta-networking/recipes-protocols/freediameter/files/0001-tests-use-EXTENSIONS_DIR.patch new file mode 100644 index 0000000000..4cedc21ce8 --- /dev/null +++ b/meta-networking/recipes-protocols/freediameter/files/0001-tests-use-EXTENSIONS_DIR.patch @@ -0,0 +1,92 @@ +From 935fcac46e2790e0e297ca855b8033895c1b8941 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Wed, 24 Aug 2022 13:45:32 +0800 +Subject: [PATCH] tests: use EXTENSIONS_DIR + +Use EXTENSIONS_DIR to replace BUILD_DIR as the BUILD_DIR is meanlingless +on target and also fix buildpaths issue. + +Upstream-Status: Inappropriate [OE ptest specific] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + tests/CMakeLists.txt | 1 + + tests/testloadext.c | 12 ++++++------ + tests/testmesg_stress.c | 12 ++++++------ + 3 files changed, 13 insertions(+), 12 deletions(-) + +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index 8b698ce..2c83cbb 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -37,6 +37,7 @@ SET(TEST_LIST + + ADD_DEFINITIONS(-DTEST_DEBUG) + ADD_DEFINITIONS(-DBUILD_DIR="${CMAKE_BINARY_DIR}") ++ADD_DEFINITIONS(-DEXTENSIONS_DIR="${EXTENSIONS_DIR}") + + INCLUDE_DIRECTORIES( "../libfdproto" ) + INCLUDE_DIRECTORIES( "../libfdcore" ) +diff --git a/tests/testloadext.c b/tests/testloadext.c +index 452737f..3fffef5 100644 +--- a/tests/testloadext.c ++++ b/tests/testloadext.c +@@ -35,9 +35,9 @@ + + #include "tests.h" + +-#ifndef BUILD_DIR +-#error "Missing BUILD_DIR information" +-#endif /* BUILD_DIR */ ++#ifndef EXTENSIONS_DIR ++#error "Missing EXTENSIONS_DIR information" ++#endif /* EXTENSIONS_DIR */ + + #include <sys/types.h> + #include <dirent.h> +@@ -59,9 +59,9 @@ int main(int argc, char *argv[]) + CHECK( 0, fd_rtdisp_init() ); + + /* Find all extensions which have been compiled along the test */ +- TRACE_DEBUG(INFO, "Loading from: '%s'", BUILD_DIR "/extensions"); +- CHECK( 0, (dir = opendir (BUILD_DIR "/extensions")) == NULL ? 1 : 0 ); +- pathlen = snprintf(fullname, sizeof(fullname), BUILD_DIR "/extensions/"); ++ TRACE_DEBUG(INFO, "Loading from: '%s'", EXTENSIONS_DIR); ++ CHECK( 0, (dir = opendir (EXTENSIONS_DIR)) == NULL ? 1 : 0 ); ++ pathlen = snprintf(fullname, sizeof(fullname), EXTENSIONS_DIR "/"); + + while ((dp = readdir (dir)) != NULL) { + char * dot = strrchr(dp->d_name, '.'); +diff --git a/tests/testmesg_stress.c b/tests/testmesg_stress.c +index 310a9d2..97dfe07 100644 +--- a/tests/testmesg_stress.c ++++ b/tests/testmesg_stress.c +@@ -38,9 +38,9 @@ + #include <libgen.h> + #include <dlfcn.h> + +-#ifndef BUILD_DIR +-#error "Missing BUILD_DIR information" +-#endif /* BUILD_DIR */ ++#ifndef EXTENSIONS_DIR ++#error "Missing EXTENSIONS_DIR information" ++#endif /* EXTENSIONS_DIR */ + + + /* The number of times each operation is repeated to measure the average operation time */ +@@ -73,9 +73,9 @@ static void load_all_extensions(char * prefix) + struct fd_list ext_with_depends = FD_LIST_INITIALIZER(ext_with_depends); + + /* Find all extensions which have been compiled along the test */ +- LOG_D("Loading %s*.fdx from: '%s'", BUILD_DIR "/extensions", prefix ?: ""); +- CHECK( 0, (dir = opendir (BUILD_DIR "/extensions")) == NULL ? 1 : 0 ); +- pathlen = snprintf(fullname, sizeof(fullname), BUILD_DIR "/extensions/"); ++ LOG_D("Loading %s*.fdx from: '%s'", EXTENSIONS_DIR, prefix ?: ""); ++ CHECK( 0, (dir = opendir (EXTENSIONS_DIR)) == NULL ? 1 : 0 ); ++ pathlen = snprintf(fullname, sizeof(fullname), EXTENSIONS_DIR "/"); + + while ((dp = readdir (dir)) != NULL) { + char * dot = strrchr(dp->d_name, '.'); +-- +2.25.1 + diff --git a/meta-networking/recipes-protocols/freediameter/files/freediameter.service b/meta-networking/recipes-protocols/freediameter/files/freediameter.service index 514481b431..70ed3803c6 100644 --- a/meta-networking/recipes-protocols/freediameter/files/freediameter.service +++ b/meta-networking/recipes-protocols/freediameter/files/freediameter.service @@ -4,7 +4,7 @@ After=network.target [Service] Type=simple -PIDFile=/var/run/freediameter.pid +PIDFile=/run/freediameter.pid ExecStart=@BINDIR@/freeDiameterd [Install] diff --git a/meta-networking/recipes-protocols/freediameter/files/pass-ptest-env.patch b/meta-networking/recipes-protocols/freediameter/files/pass-ptest-env.patch deleted file mode 100644 index ea857af7d6..0000000000 --- a/meta-networking/recipes-protocols/freediameter/files/pass-ptest-env.patch +++ /dev/null @@ -1,72 +0,0 @@ -freediameter ptest cases testmesg_stress.c and testloadext.c need load -extensions both build time and runtime. Then they search extensions with -build directory that causes runtime failures. - -Pass an environment variable to define runtime extension path. - -Upstream-Status: Inappropriate [OE ptest specific] - -Signed-off-by: Kai Kang <kai.kang@windriver.com> -Signed-off-by: Jackie Huang <jackie.huang@windriver.com> - -diff -Nur freeDiameter-1.2.0.orig/tests/testloadext.c freeDiameter-1.2.0/tests/testloadext.c ---- freeDiameter-1.2.0.orig/tests/testloadext.c 2014-02-19 17:33:24.785405032 +0800 -+++ freeDiameter-1.2.0/tests/testloadext.c 2014-02-19 20:08:03.871403924 +0800 -@@ -49,7 +49,7 @@ - { - DIR *dir; - struct dirent *dp; -- char fullname[512]; -+ char fullname[1024]; - int pathlen; - - /* First, initialize the daemon modules */ -@@ -57,11 +57,16 @@ - CHECK( 0, fd_queues_init() ); - CHECK( 0, fd_msg_init() ); - CHECK( 0, fd_rtdisp_init() ); -- -+ -+ char *ext_dir = getenv("EXTENSIONS_DIR"); -+ if (ext_dir) -+ pathlen = snprintf(fullname, sizeof(fullname), "%s", ext_dir); -+ else -+ pathlen = snprintf(fullname, sizeof(fullname), BUILD_DIR "/extensions/"); -+ - /* Find all extensions which have been compiled along the test */ -- TRACE_DEBUG(INFO, "Loading from: '%s'", BUILD_DIR "/extensions"); -- CHECK( 0, (dir = opendir (BUILD_DIR "/extensions")) == NULL ? 1 : 0 ); -- pathlen = snprintf(fullname, sizeof(fullname), BUILD_DIR "/extensions/"); -+ TRACE_DEBUG(INFO, "Loading from: '%s'", fullname); -+ CHECK( 0, (dir = opendir (fullname)) == NULL ? 1 : 0 ); - - while ((dp = readdir (dir)) != NULL) { - char * dot = strrchr(dp->d_name, '.'); -diff -Nur freeDiameter-1.2.0.orig/tests/testmesg_stress.c freeDiameter-1.2.0/tests/testmesg_stress.c ---- freeDiameter-1.2.0.orig/tests/testmesg_stress.c 2014-02-19 17:33:24.785405032 +0800 -+++ freeDiameter-1.2.0/tests/testmesg_stress.c 2014-02-19 20:08:03.928403924 +0800 -@@ -67,15 +67,20 @@ - { - DIR *dir; - struct dirent *dp; -- char fullname[512]; -+ char fullname[1024]; - int pathlen; - struct fd_list all_extensions = FD_LIST_INITIALIZER(all_extensions); - struct fd_list ext_with_depends = FD_LIST_INITIALIZER(ext_with_depends); - -+ char *ext_dir = getenv("EXTENSIONS_DIR"); -+ if (ext_dir) -+ pathlen = snprintf(fullname, sizeof(fullname), "%s", ext_dir); -+ else -+ pathlen = snprintf(fullname, sizeof(fullname), BUILD_DIR "/extensions/"); -+ - /* Find all extensions which have been compiled along the test */ -- LOG_D("Loading %s*.fdx from: '%s'", BUILD_DIR "/extensions", prefix ?: ""); -- CHECK( 0, (dir = opendir (BUILD_DIR "/extensions")) == NULL ? 1 : 0 ); -- pathlen = snprintf(fullname, sizeof(fullname), BUILD_DIR "/extensions/"); -+ TRACE_DEBUG(INFO, "Loading from: '%s'", fullname); -+ CHECK( 0, (dir = opendir (fullname)) == NULL ? 1 : 0 ); - - while ((dp = readdir (dir)) != NULL) { - char * dot = strrchr(dp->d_name, '.'); diff --git a/meta-networking/recipes-protocols/freediameter/files/run-ptest b/meta-networking/recipes-protocols/freediameter/files/run-ptest index d0ca8d9621..7d0648935c 100644 --- a/meta-networking/recipes-protocols/freediameter/files/run-ptest +++ b/meta-networking/recipes-protocols/freediameter/files/run-ptest @@ -6,6 +6,9 @@ if ! lsmod | grep -q sctp && ! modprobe sctp 2>/dev/null; then echo fi -export EXTENSIONS_DIR=$EXTENSIONS_DIR cmake -E cmake_echo_color --cyan "Running tests..." -ctest --force-new-ctest-process +if ctest --force-new-ctest-process ; then + echo "PASS: freediameter" +else + echo "FAIL: freediameter" +fi diff --git a/meta-networking/recipes-protocols/freediameter/freediameter_1.2.1.bb b/meta-networking/recipes-protocols/freediameter/freediameter_1.5.0.bb index 92cd24c3ae..c7c329a5d4 100644 --- a/meta-networking/recipes-protocols/freediameter/freediameter_1.2.1.bb +++ b/meta-networking/recipes-protocols/freediameter/freediameter_1.5.0.bb @@ -7,26 +7,28 @@ Accounting needs." HOMEPAGE = "http://www.freediameter.net" -DEPENDS = "flex bison cmake-native libgcrypt gnutls libidn lksctp-tools" +DEPENDS = "flex bison cmake-native libgcrypt gnutls libidn2 lksctp-tools virtual/kernel bison-native" + +PACKAGE_ARCH = "${MACHINE_ARCH}" fd_pkgname = "freeDiameter" -SRC_URI = "\ - http://www.freediameter.net/hg/${fd_pkgname}/archive/${PV}.tar.gz;downloadfilename=${fd_pkgname}-${PV}.tar.gz \ +PV .= "+git" +SRCREV = "f9f1e464e6c675d222b3be4cab9c13408d544c83" +SRC_URI = "git://github.com/freeDiameter/freeDiameter;protocol=https;branch=master \ file://Replace-murmurhash-algorithm-with-Robert-Jenkin-s-ha.patch \ + file://run-ptest \ file://freediameter.service \ file://freediameter.init \ - ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'file://install_test.patch file://run-ptest file://pass-ptest-env.patch', '', d)} \ file://freeDiameter.conf \ + file://install_test.patch \ + file://0001-tests-use-EXTENSIONS_DIR.patch \ " -SRC_URI[md5sum] = "61b1062aa144b5f12eed514611e6d697" -SRC_URI[sha256sum] = "bd7f105542e9903e776aa006c6931c1f5d3d477cb59af33a9162422efa477097" - -S = "${WORKDIR}/${fd_pkgname}-${PV}" +S = "${WORKDIR}/git" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=892b2ed6ae815488a08416ff7ee74a35" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=868c059b6147748b1d621e500feeac4f" PTEST_PATH = "${libdir}/${fd_pkgname}/ptest" @@ -44,6 +46,7 @@ EXTRA_OECMAKE = " \ -DBUILD_TEST_RT_ANY:BOOL=ON \ -DINSTALL_LIBRARY_SUFFIX:PATH=${baselib} \ -DINSTALL_EXTENSIONS_SUFFIX:PATH=${baselib}/${fd_pkgname} \ + -DEXTENSIONS_DIR:PATH=${libdir}/${fd_pkgname} \ -DINSTALL_TEST_SUFFIX:PATH=${PTEST_PATH}-tests \ -DCMAKE_SKIP_RPATH:BOOL=ON \ " @@ -66,7 +69,7 @@ FD_DH_PEM ?= "${BPN}-dh.pem" FD_HOSTNAME ?= "${MACHINE}" FD_REALM ?= "openembedded.org" -do_install_append() { +do_install:append() { # install the sample configuration files install -d -m 0755 ${D}${sysconfdir}/${fd_pkgname} for i in ${S}/doc/*.conf.sample; do @@ -75,18 +78,18 @@ do_install_append() { mv ${D}${sysconfdir}/${fd_pkgname}/freediameter.conf.sample \ ${D}${sysconfdir}/${fd_pkgname}/freeDiameter.conf.sample install -d ${D}${sysconfdir}/freeDiameter - install ${WORKDIR}/freeDiameter.conf ${D}${sysconfdir}/${fd_pkgname}/freeDiameter.conf + install ${UNPACKDIR}/freeDiameter.conf ${D}${sysconfdir}/${fd_pkgname}/freeDiameter.conf # install daemon init related files install -d -m 0755 ${D}${sysconfdir}/default install -d -m 0755 ${D}${sysconfdir}/init.d install -m 0644 ${S}/contrib/debian/freediameter-daemon.default \ ${D}${sysconfdir}/default/${BPN} - install -m 0755 ${WORKDIR}/freediameter.init ${D}${sysconfdir}/init.d/${BPN} + install -m 0755 ${UNPACKDIR}/freediameter.init ${D}${sysconfdir}/init.d/${BPN} # install for systemd install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/freediameter.service ${D}${systemd_system_unitdir} + install -m 0644 ${UNPACKDIR}/freediameter.service ${D}${systemd_system_unitdir} sed -i -e 's,@BINDIR@,${bindir},g' ${D}${systemd_system_unitdir}/*.service cat >> ${D}${sysconfdir}/freeDiameter/freeDiameter.conf <<EOF @@ -105,32 +108,34 @@ EOF 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}' openssl dhparam -out ${D}${sysconfdir}/freeDiameter/${FD_DH_PEM} 1024 + find ${B} \( -name "*.c" -o -name "*.h" \) -exec sed -i -e 's#${UNPACKDIR}##g' {} \; } do_install_ptest() { - sed -i "s#\(EXTENSIONS_DIR=\).*\$#\1${libdir}/${fd_pkgname}/#" ${D}${PTEST_PATH}/run-ptest mv ${D}${PTEST_PATH}-tests/* ${D}${PTEST_PATH}/ rmdir ${D}${PTEST_PATH}-tests install -m 0644 ${B}/tests/CTestTestfile.cmake ${D}${PTEST_PATH}/ + sed -i -e 's#${UNPACKDIR}##g' ${D}${PTEST_PATH}/CTestTestfile.cmake + sed -i "/^set_tests_properties/d" ${D}${PTEST_PATH}/CTestTestfile.cmake } -FILES_${PN}-dbg += "${libdir}/${fd_pkgname}/.debug/*" +FILES:${PN}-dbg += "${libdir}/${fd_pkgname}/.debug/*" # include the extensions in main package -FILES_${PN} += "${libdir}/${fd_pkgname}/*" +FILES:${PN} += "${libdir}/${fd_pkgname}/*" -RDEPENDS_${PN} = "glib-2.0 gnutls libidn" -RDEPENDS_${PN} += "openssl openssl-conf openssl-engines" -RDEPENDS_${PN} += "kernel-module-tipc kernel-module-sctp" -RDEPENDS_${PN} += "kernel-module-udp-tunnel kernel-module-ipip" -RDEPENDS_${PN}-ptest = "cmake" +RDEPENDS:${PN} = "glib-2.0 gnutls libidn" +RDEPENDS:${PN} += "openssl openssl-conf openssl-engines" +RRECOMMENDS:${PN} += "kernel-module-tipc kernel-module-sctp" +RRECOMMENDS:${PN} += "kernel-module-udp-tunnel kernel-module-ipip" +RDEPENDS:${PN}-ptest = "cmake" INITSCRIPT_PACKAGES = "${PN}" -INITSCRIPT_NAME_${PN} = "${BPN}" -INITSCRIPT_PARAMS$_${PN} = "start 30 . stop 70 0 1 2 3 4 5 6 ." +INITSCRIPT_NAME:${PN} = "${BPN}" +INITSCRIPT_PARAMS:${PN} = "start 30 . stop 70 0 1 2 3 4 5 6 ." -SYSTEMD_SERVICE_${PN} = "freediameter.service" +SYSTEMD_SERVICE:${PN} = "freediameter.service" SYSTEMD_AUTO_ENABLE = "disable" -CONFFILES_${PN} = "${sysconfdir}/freediameter.conf" +CONFFILES:${PN} = "${sysconfdir}/freediameter.conf" diff --git a/meta-networking/recipes-protocols/frr/frr/0001-zebra-Mimic-GNU-basename-API-for-non-glibc-library-e.patch b/meta-networking/recipes-protocols/frr/frr/0001-zebra-Mimic-GNU-basename-API-for-non-glibc-library-e.patch new file mode 100644 index 0000000000..8c83d5c8eb --- /dev/null +++ b/meta-networking/recipes-protocols/frr/frr/0001-zebra-Mimic-GNU-basename-API-for-non-glibc-library-e.patch @@ -0,0 +1,34 @@ +From 49aeccbec4bf620bb594999bbd4a9de669a3984c Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 15 Mar 2024 14:34:06 -0700 +Subject: [PATCH] zebra: Mimic GNU basename() API for non-glibc library e.g. + musl musl only provides POSIX version of basename and it has also removed + providing it via string.h header [1] which now results in compile errors with + newer compilers e.g. clang-18 + +[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7 + +Upstream-Status: Submitted [https://github.com/FRRouting/frr/pull/15561/] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + zebra/zebra_netns_notify.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/zebra/zebra_netns_notify.c b/zebra/zebra_netns_notify.c +index 1bb1292e34..d55df2f62d 100644 +--- a/zebra/zebra_netns_notify.c ++++ b/zebra/zebra_netns_notify.c +@@ -41,6 +41,10 @@ + #define ZEBRA_NS_POLLING_INTERVAL_MSEC 1000 + #define ZEBRA_NS_POLLING_MAX_RETRIES 200 + ++#if !defined(__GLIBC__) ++#define basename(src) (strrchr(src,'/') ? strrchr(src,'/')+1 : src) ++#endif ++ + DEFINE_MTYPE_STATIC(ZEBRA, NETNS_MISC, "ZebraNetNSInfo"); + static struct event *zebra_netns_notify_current; + +-- +2.44.0 + diff --git a/meta-networking/recipes-protocols/quagga/files/quagga.pam b/meta-networking/recipes-protocols/frr/frr/frr.pam index 3541a975ae..a9ec35dd69 100644 --- a/meta-networking/recipes-protocols/quagga/files/quagga.pam +++ b/meta-networking/recipes-protocols/frr/frr/frr.pam @@ -1,10 +1,11 @@ # -# The PAM configuration file for the quagga `vtysh' service +# The PAM configuration file for the frr `vtysh' service # # This allows root to change user infomation without being # prompted for a password auth sufficient pam_rootok.so +account sufficient pam_rootok.so # The standard Unix authentication modules, used with # NIS (man nsswitch) as well as normal /etc/passwd and diff --git a/meta-networking/recipes-protocols/frr/frr_9.1.bb b/meta-networking/recipes-protocols/frr/frr_9.1.bb new file mode 100644 index 0000000000..b1c9153bec --- /dev/null +++ b/meta-networking/recipes-protocols/frr/frr_9.1.bb @@ -0,0 +1,136 @@ +SUMMARY = "BGP/OSPF/RIP routing daemon" +DESCRIPTION = "FRRouting is a free and open source Internet routing protocol suite for Linux \ +and Unix platforms. It implements BGP, OSPF, RIP, IS-IS, PIM, LDP, BFD, Babel, PBR, OpenFabric \ +and VRRP, with alpha support for EIGRP and NHRP." +HOMEPAGE = "https://frrouting.org/" +SECTION = "net" + +LICENSE = "GPL-2.0-only & LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://doc/licenses/GPL-2.0;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://doc/licenses/LGPL-2.1;md5=4fbd65380cdd255951079008b364516c" + + +SRC_URI = "git://github.com/FRRouting/frr.git;protocol=https;branch=stable/9.1 \ + file://frr.pam \ + file://0001-zebra-Mimic-GNU-basename-API-for-non-glibc-library-e.patch \ + " + +SRCREV = "ca2d6f0f1e000951224a18973cc1827f7f5215b5" + +UPSTREAM_CHECK_GITTAGREGEX = "frr-(?P<pver>\d+(\.\d+)+)$" + +CVE_PRODUCT = "frrouting" + +S = "${WORKDIR}/git" + +inherit autotools-brokensep python3native pkgconfig useradd systemd + +DEPENDS:class-native = "bison-native elfutils-native" +DEPENDS:class-target = "bison-native json-c readline c-ares libyang frr-native protobuf-c-native protobuf-c" + +RDEPENDS:${PN}:class-target = "iproute2 python3-core bash" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" +PACKAGECONFIG:class-native = "" + +PACKAGECONFIG[fpm] = "--enable-fpm,--disable-fpm" +PACKAGECONFIG[pam] = "--with-libpam,--without-libpam,libpam" +PACKAGECONFIG[grpc] = "--enable-grpc,--disable-grpc,grpc-native grpc" +PACKAGECONFIG[snmp] = "--enable-snmp,--disable-snmp,net-snmp" +PACKAGECONFIG[zeromq] = "--enable-zeromq,--disable-zeromq,zeromq" +PACKAGECONFIG[protobuf] = "--enable-protobuf,--disable-protobuf,protobuf-c-native protobuf-c" +PACKAGECONFIG[capabilities] = "--enable-capabilities,--disable-capabilities,libcap" +PACKAGECONFIG[cumulus] = "--enable-cumulus,--disable-cumulus" +PACKAGECONFIG[datacenter] = "--enable-datacenter,--disable-datacenter" +PACKAGECONFIG[ospfclient] = "--enable-ospfapi --enable-ospfclient,--disable-ospfapi --disable-ospfclient" + +EXTRA_OECONF:class-native = "--enable-clippy-only" + +EXTRA_OECONF:class-target = "--sbindir=${libexecdir}/frr \ + --sysconfdir=${sysconfdir}/frr \ + --localstatedir=${localstatedir}/run/frr \ + --enable-vtysh \ + --enable-multipath=64 \ + --enable-user=frr \ + --enable-group=frr \ + --enable-vty-group=frrvty \ + --enable-configfile-mask=0640 \ + --enable-logfile-mask=0640 \ + --disable-doc \ + --with-clippy=${RECIPE_SYSROOT_NATIVE}/usr/lib/clippy \ + " + +CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl'" + +# https://github.com/FRRouting/frr/issues/14469 +DEBUG_PREFIX_MAP:remove = "-fcanon-prefix-map" + +LDFLAGS:append:mips = " -latomic" +LDFLAGS:append:mipsel = " -latomic" +LDFLAGS:append:powerpc = " -latomic" +LDFLAGS:append:riscv32 = " -latomic" + +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE:${PN} = "frr.service" +SYSTEMD_AUTO_ENABLE = "disable" + +inherit update-alternatives multilib_script multilib_header + +ALTERNATIVE_PRIORITY = "100" +ALTERNATIVE:${PN} = " ietf-interfaces " +ALTERNATIVE_LINK_NAME[ietf-interfaces] = "${datadir}/yang/ietf-interfaces.yang" +do_compile:prepend () { + sed -i -e 's#${RECIPE_SYSROOT_NATIVE}##g' \ + -e 's#${RECIPE_SYSROOT}##g' ${S}/lib/version.h +} + +do_compile:class-native () { + oe_runmake clippy-only +} + +do_install:class-native () { + install -d ${D}${libdir} + install -m 755 ${S}/lib/clippy ${D}${libdir}/clippy +} + +do_install:append:class-target () { + install -m 0755 -d ${D}${sysconfdir}/frr + install -m 0755 -d ${D}${libexecdir}/frr + install -m 0640 ${S}/tools/etc/frr/* ${D}${sysconfdir}/frr/ + chown frr:frrvty ${D}${sysconfdir}/frr + chown frr:frr ${D}${sysconfdir}/frr/* + chown frr:frrvty ${D}${sysconfdir}/frr/vtysh.conf + chmod 640 ${D}${sysconfdir}/frr/* + + if ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'true', 'false', d)}; then + install -d ${D}/${sysconfdir}/pam.d + install -m 644 ${UNPACKDIR}/frr.pam ${D}/${sysconfdir}/pam.d/frr + fi + + if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${B}/tools/frrinit.sh ${D}${sysconfdir}/init.d/frr + + install -d ${D}${sysconfdir}/default/volatiles + echo "d frr frr 0755 ${localstatedir}/run/frr none" \ + > ${D}${sysconfdir}/default/volatiles/99_frr + fi + + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${B}/tools/frr*.service ${D}${systemd_system_unitdir} + + install -d ${D}${sysconfdir}/tmpfiles.d + echo "d /run/frr 0755 frr frr -" \ + > ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf + fi + oe_multilib_header frr/version.h +} + +USERADD_PACKAGES = "${PN}" +GROUPADD_PARAM:${PN} = "--system frr ; --system frrvty" +USERADD_PARAM:${PN} = "--system --home ${localstatedir}/run/frr/ -M -g frr -G frrvty --shell /bin/false frr" + +FILES:${PN} += "${datadir}/yang" + +BBCLASSEXTEND = "native" diff --git a/meta-networking/recipes-protocols/mdns/files/build.patch b/meta-networking/recipes-protocols/mdns/files/build.patch deleted file mode 100644 index 4ab9d23bf7..0000000000 --- a/meta-networking/recipes-protocols/mdns/files/build.patch +++ /dev/null @@ -1,167 +0,0 @@ -From 43b6e98c9c37afd0d914949dcff4eab81f5a995f Mon Sep 17 00:00:00 2001 -From: Brendan Le Foll <brendan.le.foll@intel.com> -Date: Tue, 3 Mar 2015 11:42:57 +0000 - -Upstream-Status: Inappropriate [OE-specific] - -Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> - ---- - mDNSPosix/Makefile | 54 +++++++++++++++++++++++++----------------------------- - 1 file changed, 25 insertions(+), 29 deletions(-) - -diff --git a/mDNSPosix/Makefile b/mDNSPosix/Makefile -index 4f98e90..8ac97ad 100755 ---- a/mDNSPosix/Makefile -+++ b/mDNSPosix/Makefile -@@ -50,6 +50,7 @@ - - LIBVERS = 1 - -+POSIXDIR = ../mDNSPosix - COREDIR = ../mDNSCore - SHAREDDIR ?= ../mDNSShared - JDK = /usr/jdk -@@ -58,11 +59,11 @@ CC = @cc - BISON = @bison - FLEX = @flex - ST = @strip --LD = ld -shared -+LD =@LD - CP = cp - RM = rm - LN = ln -s -f --CFLAGS_COMMON = -I$(COREDIR) -I$(SHAREDDIR) -I$(OBJDIR) -fwrapv -W -Wall -DPID_FILE=\"/var/run/mdnsd.pid\" -DMDNS_UDS_SERVERPATH=\"/var/run/mdnsd\" -+CFLAGS_COMMON = -I$(POSIXDIR) -I$(COREDIR) -I$(SHAREDDIR) -I$(OBJDIR) -fwrapv -W -Wall -DPID_FILE=\"/var/run/mdnsd.pid\" -DMDNS_UDS_SERVERPATH=\"/var/run/mdnsd\" - CFLAGS_PTHREAD = - LINKOPTS = - LINKOPTS_PTHREAD = -lpthread -@@ -70,7 +71,7 @@ LDSUFFIX = so - JAVACFLAGS_OS = -fPIC -shared -ldns_sd - - # Set up diverging paths for debug vs. prod builds --DEBUG=0 -+DEBUG?=1 - ifeq ($(DEBUG),1) - CFLAGS_DEBUG = -g -DMDNS_DEBUGMSGS=2 - OBJDIR = objects/debug -@@ -213,7 +214,7 @@ endif - endif - endif - --CFLAGS = $(CFLAGS_COMMON) $(CFLAGS_OS) $(CFLAGS_DEBUG) -+CFLAGS_BUILD = $(CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_OS) $(CFLAGS_DEBUG) - - ############################################################################# - -@@ -249,8 +250,7 @@ Daemon: setup $(BUILDDIR)/mdnsd - @echo "Responder daemon done" - - $(BUILDDIR)/mdnsd: $(DAEMONOBJS) -- $(CC) -o $@ $+ $(LINKOPTS) -- @$(STRIP) $@ -+ $(CC) -o $@ $+ - - # libdns_sd target builds the client library - libdns_sd: setup $(BUILDDIR)/libdns_sd.$(LDSUFFIX) -@@ -259,22 +259,18 @@ libdns_sd: setup $(BUILDDIR)/libdns_sd.$(LDSUFFIX) - CLIENTLIBOBJS = $(OBJDIR)/dnssd_clientlib.c.so.o $(OBJDIR)/dnssd_clientstub.c.so.o $(OBJDIR)/dnssd_ipc.c.so.o - - $(BUILDDIR)/libdns_sd.$(LDSUFFIX): $(CLIENTLIBOBJS) -- @$(LD) $(LINKOPTS) -o $@ $+ -- @$(STRIP) $@ -+ $(LD) -shared $(LINKOPTS) -Wl,-soname,libdns_sd.$(LDSUFFIX).1 -o $@ $+ - --Clients: setup libdns_sd ../Clients/build/dns-sd -+Clients: setup libdns_sd -+ @$(MAKE) -C ../Clients DEBUG=${DEBUG} - @echo "Clients done" - --../Clients/build/dns-sd: -- @$(MAKE) -C ../Clients -- - # nss_mdns target builds the Name Service Switch module - nss_mdns: setup $(BUILDDIR)/$(NSSLIBFILE) - @echo "Name Service Switch module done" - - $(BUILDDIR)/$(NSSLIBFILE): $(CLIENTLIBOBJS) $(OBJDIR)/nss_mdns.c.so.o -- @$(LD) $(LINKOPTS) -o $@ $+ -- @$(STRIP) $@ -+ $(LD) -shared $(LINKOPTS) -o $@ $+ - - ############################################################################# - -@@ -470,55 +466,55 @@ dnsextd: setup $(BUILDDIR)/dnsextd - @echo "dnsextd done" - - $(BUILDDIR)/mDNSClientPosix: $(APPOBJ) $(OBJDIR)/Client.c.o -- $(CC) $+ -o $@ $(LINKOPTS) -+ $(CC) $+ -o $@ - - $(BUILDDIR)/mDNSResponderPosix: $(COMMONOBJ) $(OBJDIR)/Responder.c.o -- $(CC) $+ -o $@ $(LINKOPTS) -+ $(CC) $+ -o $@ - - $(BUILDDIR)/mDNSProxyResponderPosix: $(COMMONOBJ) $(OBJDIR)/ProxyResponder.c.o -- $(CC) $+ -o $@ $(LINKOPTS) -+ $(CC) $+ -o $@ - - $(BUILDDIR)/mDNSIdentify: $(SPECIALOBJ) $(OBJDIR)/Identify.c.o -- $(CC) $+ -o $@ $(LINKOPTS) -+ $(CC) $+ -o $@ - - $(OBJDIR)/Identify.c.o: $(COREDIR)/mDNS.c # Note: Identify.c textually imports mDNS.c - - $(BUILDDIR)/mDNSNetMonitor: $(SPECIALOBJ) $(OBJDIR)/NetMonitor.c.o -- $(CC) $+ -o $@ $(LINKOPTS) -+ $(CC) $+ -o $@ - - $(OBJDIR)/NetMonitor.c.o: $(COREDIR)/mDNS.c # Note: NetMonitor.c textually imports mDNS.c - - $(BUILDDIR)/dnsextd: $(DNSEXTDOBJ) $(OBJDIR)/dnsextd.c.threadsafe.o -- $(CC) $+ -o $@ $(LINKOPTS) $(LINKOPTS_PTHREAD) -+ $(CC) $+ -o $@ $(LINKOPTS_PTHREAD) - - ############################################################################# - - # Implicit rules - $(OBJDIR)/%.c.o: %.c -- $(CC) $(CFLAGS) -c -o $@ $< -+ $(CC) $(CFLAGS_BUILD) -c -o $@ $< - - $(OBJDIR)/%.c.o: $(COREDIR)/%.c -- $(CC) $(CFLAGS) -c -o $@ $< -+ $(CC) $(CFLAGS_BUILD) -c -o $@ $< - - $(OBJDIR)/%.c.o: $(SHAREDDIR)/%.c -- $(CC) $(CFLAGS) -c -o $@ $< -+ $(CC) $(CFLAGS_BUILD) -c -o $@ $< - - $(OBJDIR)/%.c.threadsafe.o: %.c -- $(CC) $(CFLAGS) $(CFLAGS_PTHREAD) -D_REENTRANT -c -o $@ $< -+ $(CC) $(CFLAGS_BUILD) $(CFLAGS_PTHREAD) -D_REENTRANT -c -o $@ $< - - $(OBJDIR)/%.c.threadsafe.o: $(SHAREDDIR)/%.c -- $(CC) $(CFLAGS) $(CFLAGS_PTHREAD) -D_REENTRANT -c -o $@ $< -+ $(CC) $(CFLAGS_BUILD) $(CFLAGS_PTHREAD) -D_REENTRANT -c -o $@ $< - - $(OBJDIR)/%.c.so.o: %.c -- $(CC) $(CFLAGS) -c -fPIC -o $@ $< -+ $(CC) $(CFLAGS_BUILD) -c -fPIC -o $@ $< - - $(OBJDIR)/%.c.so.o: $(SHAREDDIR)/%.c -- $(CC) $(CFLAGS) -c -fPIC -o $@ $< -+ $(CC) $(CFLAGS_BUILD) -c -fPIC -o $@ $< - - $(OBJDIR)/%.y.o: $(SHAREDDIR)/%.y - $(BISON) -o $(OBJDIR)/$*.c -d $< -- $(CC) $(CFLAGS) -c -o $@ $(OBJDIR)/$*.c -+ $(CC) $(CFLAGS_BUILD) -c -o $@ $(OBJDIR)/$*.c - - $(OBJDIR)/%.l.o: $(SHAREDDIR)/%.l - $(FLEX) $(FLEXFLAGS_OS) -i -o$(OBJDIR)/$*.l.c $< -- $(CC) $(CFLAGS) -Wno-error -c -o $@ $(OBJDIR)/$*.l.c -+ $(CC) $(CFLAGS_BUILD) -Wno-error -c -o $@ $(OBJDIR)/$*.l.c --- -2.9.5 - 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 new file mode 100644 index 0000000000..f5d424d58f --- /dev/null +++ b/meta-networking/recipes-protocols/mdns/mdns/0001-Create-subroutine-for-cleaning-recent-interfaces.patch @@ -0,0 +1,58 @@ +From c1f3e19d3cb0aa948248616eb1684a1e80aa39b4 Mon Sep 17 00:00:00 2001 +From: Nate Karstens <nate.karstens@garmin.com> +Date: Wed, 28 Jun 2017 17:30:00 -0500 +Subject: [PATCH 1/8] Create subroutine for cleaning recent interfaces + +Moves functionality for cleaning the list of recent +interfaces into its own subroutine. + +Upstream-Status: Submitted [dts@apple.com] + +Signed-off-by: Nate Karstens <nate.karstens@garmin.com> +Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> +--- + mDNSPosix/mDNSPosix.c | 24 ++++++++++++++---------- + 1 file changed, 14 insertions(+), 10 deletions(-) + +Index: mDNSResponder/mDNSPosix/mDNSPosix.c +=================================================================== +--- mDNSResponder.orig/mDNSPosix/mDNSPosix.c ++++ mDNSResponder/mDNSPosix/mDNSPosix.c +@@ -1322,6 +1322,19 @@ mDNSlocal int SetupSocket(struct sockadd + return err; + } + ++// Clean up any interfaces that have been hanging around on the RecentInterfaces list for more than a minute ++mDNSlocal void CleanRecentInterfaces(void) ++{ ++ PosixNetworkInterface **ri = &gRecentInterfaces; ++ const mDNSs32 utc = mDNSPlatformUTC(); ++ while (*ri) ++ { ++ PosixNetworkInterface *pi = *ri; ++ if (utc - pi->LastSeen < 60) ri = (PosixNetworkInterface **)&pi->coreIntf.next; ++ else { *ri = (PosixNetworkInterface *)pi->coreIntf.next; mdns_free(pi); } ++ } ++} ++ + // Creates a PosixNetworkInterface for the interface whose IP address is + // intfAddr and whose name is intfName and registers it with mDNS core. + mDNSlocal int SetupOneInterface(mDNS *const m, struct sockaddr *intfAddr, struct sockaddr *intfMask, +@@ -1559,16 +1572,7 @@ mDNSlocal int SetupInterfaceList(mDNS *c + + // Clean up. + if (intfList != NULL) freeifaddrs(intfList); +- +- // Clean up any interfaces that have been hanging around on the RecentInterfaces list for more than a minute +- PosixNetworkInterface **ri = &gRecentInterfaces; +- const mDNSs32 utc = mDNSPlatformUTC(); +- while (*ri) +- { +- PosixNetworkInterface *pi = *ri; +- if (utc - pi->LastSeen < 60) ri = (PosixNetworkInterface **)&pi->coreIntf.next; +- else { *ri = (PosixNetworkInterface *)pi->coreIntf.next; mdns_free(pi); } +- } ++ CleanRecentInterfaces(); + + return err; + } 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 new file mode 100644 index 0000000000..4b0227f1dc --- /dev/null +++ b/meta-networking/recipes-protocols/mdns/mdns/0001-Fix-SIGSEGV-during-DumpStateLog.patch @@ -0,0 +1,30 @@ +From 14cc53bb09a3d8adf301f3842c765598467e63e1 Mon Sep 17 00:00:00 2001 +From: Alex Kiernan <alex.kiernan@gmail.com> +Date: Thu, 1 Feb 2024 14:07:03 +0000 +Subject: [PATCH] Fix SIGSEGV during DumpStateLog() + +DumpStateLog() calls LogMsgWithLevelv() with category == NULL, avoid +crashing in this case. + +Upstream-Status: Inactive-Upstream [Upstream does not take patches] +Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> +--- + mDNSShared/mDNSDebug.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mDNSShared/mDNSDebug.c b/mDNSShared/mDNSDebug.c +index 7a4ca19eff6d..d449dde320f6 100644 +--- a/mDNSShared/mDNSDebug.c ++++ b/mDNSShared/mDNSDebug.c +@@ -71,7 +71,7 @@ mDNSlocal void LogMsgWithLevelv(os_log_t category, os_log_type_t level, const ch + mDNSlocal void LogMsgWithLevelv(const char *category, mDNSLogLevel_t level, const char *format, va_list args) + { + // Do not print the logs if the log category is MDNS_LOG_CATEGORY_DISABLED. +- if (strcmp(category, MDNS_LOG_CATEGORY_DISABLED) == 0) ++ if (category && strcmp(category, MDNS_LOG_CATEGORY_DISABLED) == 0) + { + return; + } +-- +2.39.0 + 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 new file mode 100644 index 0000000000..7e76f07c0e --- /dev/null +++ b/meta-networking/recipes-protocols/mdns/mdns/0001-Handle-interface-without-ifa_addr.patch @@ -0,0 +1,38 @@ +From 1cc54320306e07c1fc0eed98e7fbcbb07a2f3b28 Mon Sep 17 00:00:00 2001 +From: Stefan Agner <stefan@agner.ch> +Date: Fri, 23 Jun 2023 10:10:00 +0200 +Subject: [PATCH] Handle interface without `ifa_addr` + +It seems that certain interface types may have `ifa_addr` set to null. +Handle this case gracefully. + +Upstream-Status: Submitted [https://github.com/apple-oss-distributions/mDNSResponder/pull/2/commits/11b410d4d683c90e693c40315997bb3e8ec90e9a] + +Signed-off-by: Stefan Agner <stefan@agner.ch> +Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> +--- + mDNSPosix/mDNSPosix.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +Index: mDNSResponder/mDNSPosix/mDNSPosix.c +=================================================================== +--- mDNSResponder.orig/mDNSPosix/mDNSPosix.c ++++ mDNSResponder/mDNSPosix/mDNSPosix.c +@@ -1895,6 +1895,7 @@ mDNSlocal void InterfaceChangeCallback(i + continue; + + if ((ifa_loop4 == NULL) && ++ ((*ifi)->ifa_addr != NULL) && + ((*ifi)->ifa_addr->sa_family == AF_INET) && + ((*ifi)->ifa_flags & IFF_UP) && + ((*ifi)->ifa_flags & IFF_LOOPBACK)) +@@ -1903,7 +1904,8 @@ mDNSlocal void InterfaceChangeCallback(i + continue; + } + +- if ( (((*ifi)->ifa_addr->sa_family == AF_INET) ++ if ( ((*ifi)->ifa_addr != NULL) && ++ (((*ifi)->ifa_addr->sa_family == AF_INET) + #if HAVE_IPV6 + || ((*ifi)->ifa_addr->sa_family == AF_INET6) + #endif 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 new file mode 100644 index 0000000000..82825b294d --- /dev/null +++ b/meta-networking/recipes-protocols/mdns/mdns/0001-dns-sd-Include-missing-headers.patch @@ -0,0 +1,27 @@ +From cea342c10731cb1c8c8b52f03d55f9d15fc3b091 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 4 Nov 2021 07:31:32 -0700 +Subject: [PATCH 1/6] dns-sd: Include missing headers + +Fixes build on Musl + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + mDNSPosix/nss_mdns.c | 3 +++ + 1 file changed, 3 insertions(+) + +Index: mDNSResponder/mDNSPosix/nss_mdns.c +=================================================================== +--- mDNSResponder.orig/mDNSPosix/nss_mdns.c ++++ mDNSResponder/mDNSPosix/nss_mdns.c +@@ -89,6 +89,9 @@ + + #include <dns_sd.h> + ++#if !defined(NETDB_INTERNAL) ++# define NETDB_INTERNAL (-1) ++#endif + + //---------- + // Public functions 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 new file mode 100644 index 0000000000..867db88a50 --- /dev/null +++ b/meta-networking/recipes-protocols/mdns/mdns/0002-Create-subroutine-for-tearing-down-an-interface.patch @@ -0,0 +1,56 @@ +From 40ef0241afbb49f84e76afd65eb3ee17466bb582 Mon Sep 17 00:00:00 2001 +From: Nate Karstens <nate.karstens@garmin.com> +Date: Wed, 28 Jun 2017 17:30:00 -0500 +Subject: [PATCH 2/8] Create subroutine for tearing down an interface + +Creates a subroutine for tearing down an interface. + +Upstream-Status: Submitted [dts@apple.com] + +Signed-off-by: Nate Karstens <nate.karstens@garmin.com> +Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> +--- + mDNSPosix/mDNSPosix.c | 22 ++++++++++++++++------ + 1 file changed, 16 insertions(+), 6 deletions(-) + +Index: mDNSResponder/mDNSPosix/mDNSPosix.c +=================================================================== +--- mDNSResponder.orig/mDNSPosix/mDNSPosix.c ++++ mDNSResponder/mDNSPosix/mDNSPosix.c +@@ -1043,6 +1043,19 @@ mDNSlocal void FreePosixNetworkInterface + gRecentInterfaces = intf; + } + ++mDNSlocal void TearDownInterface(mDNS *const m, PosixNetworkInterface *intf) ++{ ++ mDNS_DeregisterInterface(m, &intf->coreIntf, NormalActivation); ++ if (gMDNSPlatformPosixVerboseLevel > 0) fprintf(stderr, "Deregistered interface %s\n", intf->intfName); ++ FreePosixNetworkInterface(intf); ++ ++ num_registered_interfaces--; ++ if (num_registered_interfaces == 0) { ++ num_pkts_accepted = 0; ++ num_pkts_rejected = 0; ++ } ++} ++ + // Grab the first interface, deregister it, free it, and repeat until done. + mDNSlocal void ClearInterfaceList(mDNS *const m) + { +@@ -1051,13 +1064,10 @@ mDNSlocal void ClearInterfaceList(mDNS * + while (m->HostInterfaces) + { + PosixNetworkInterface *intf = (PosixNetworkInterface*)(m->HostInterfaces); +- mDNS_DeregisterInterface(m, &intf->coreIntf, NormalActivation); +- if (gMDNSPlatformPosixVerboseLevel > 0) fprintf(stderr, "Deregistered interface %s\n", intf->intfName); +- FreePosixNetworkInterface(intf); ++ TearDownInterface(m, intf); + } +- num_registered_interfaces = 0; +- num_pkts_accepted = 0; +- num_pkts_rejected = 0; ++ ++ assert(num_registered_interfaces == 0); + } + + mDNSlocal int SetupIPv6Socket(int fd) 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 new file mode 100644 index 0000000000..03fb1bc0d7 --- /dev/null +++ b/meta-networking/recipes-protocols/mdns/mdns/0002-make-Set-libdns_sd.so-soname-correctly.patch @@ -0,0 +1,24 @@ +From a198bcd457abd04f2e22812ff3a37246aa564614 Mon Sep 17 00:00:00 2001 +From: Alex Kiernan <alex.kiernan@gmail.com> +Date: Mon, 5 Dec 2022 15:14:12 +0000 +Subject: [PATCH 2/6] make: Set libdns_sd.so soname correctly + +Upstream-Status: Pending +Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> +--- + mDNSPosix/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: mDNSResponder/mDNSPosix/Makefile +=================================================================== +--- mDNSResponder.orig/mDNSPosix/Makefile ++++ mDNSResponder/mDNSPosix/Makefile +@@ -276,7 +276,7 @@ libdns_sd: setup $(BUILDDIR)/libdns_sd.$ + 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 + + $(BUILDDIR)/libdns_sd.$(LDSUFFIX): $(CLIENTLIBOBJS) +- $(LD) $(SOOPTS) $(LINKOPTS) -o $@ $+ ++ $(LD) $(SOOPTS) $(LINKOPTS) -Wl,-soname,libdns_sd.$(LDSUFFIX).1 -o $@ $+ + $(STRIP) $@ + + Clients: setup libdns_sd ../Clients/build/dns-sd 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 new file mode 100644 index 0000000000..f1cda2b895 --- /dev/null +++ b/meta-networking/recipes-protocols/mdns/mdns/0003-Track-interface-socket-family.patch @@ -0,0 +1,48 @@ +From deb3a2c51f32e0d2741be11a492e727129f770e2 Mon Sep 17 00:00:00 2001 +From: Nate Karstens <nate.karstens@garmin.com> +Date: Wed, 28 Jun 2017 17:30:00 -0500 +Subject: [PATCH 3/8] Track interface socket family + +Tracks the socket family associated with the interface. + +Upstream-Status: Submitted [dts@apple.com] + +Signed-off-by: Nate Karstens <nate.karstens@garmin.com> +Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> +--- + mDNSPosix/mDNSPosix.c | 1 + + mDNSPosix/mDNSPosix.h | 2 ++ + 2 files changed, 3 insertions(+) + +Index: mDNSResponder/mDNSPosix/mDNSPosix.c +=================================================================== +--- mDNSResponder.orig/mDNSPosix/mDNSPosix.c ++++ mDNSResponder/mDNSPosix/mDNSPosix.c +@@ -1415,6 +1415,7 @@ mDNSlocal int SetupOneInterface(mDNS *co + // Set up the extra fields in PosixNetworkInterface. + assert(intf->intfName != NULL); // intf->intfName already set up above + intf->index = intfIndex; ++ intf->sa_family = intfAddr->sa_family; + intf->multicastSocket4 = -1; + #if HAVE_IPV6 + intf->multicastSocket6 = -1; +Index: mDNSResponder/mDNSPosix/mDNSPosix.h +=================================================================== +--- mDNSResponder.orig/mDNSPosix/mDNSPosix.h ++++ mDNSResponder/mDNSPosix/mDNSPosix.h +@@ -19,6 +19,7 @@ + #define __mDNSPlatformPosix_h + + #include <signal.h> ++#include <sys/socket.h> + #include <sys/time.h> + + #ifdef __cplusplus +@@ -40,6 +41,7 @@ struct PosixNetworkInterface + char * intfName; + PosixNetworkInterface * aliasIntf; + int index; ++ sa_family_t sa_family; + int multicastSocket4; + #if HAVE_IPV6 + int multicastSocket6; 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 new file mode 100644 index 0000000000..6bc36456f6 --- /dev/null +++ b/meta-networking/recipes-protocols/mdns/mdns/0004-Indicate-loopback-interface-to-mDNS-core.patch @@ -0,0 +1,55 @@ +From beab76b5708862f44d9acbe7a92db45e2f99259f Mon Sep 17 00:00:00 2001 +From: Nate Karstens <nate.karstens@garmin.com> +Date: Tue, 1 Aug 2017 17:06:01 -0500 +Subject: [PATCH 4/8] Indicate loopback interface to mDNS core + +Tells the mDNS core if an interface is a loopback interface, +similar to AddInterfaceToList() in the MacOS implementation. + +Upstream-Status: Submitted [dts@apple.com] + +Signed-off-by: Nate Karstens <nate.karstens@garmin.com> +Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> +--- + mDNSPosix/mDNSPosix.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +Index: mDNSResponder/mDNSPosix/mDNSPosix.c +=================================================================== +--- mDNSResponder.orig/mDNSPosix/mDNSPosix.c ++++ mDNSResponder/mDNSPosix/mDNSPosix.c +@@ -1348,7 +1348,7 @@ mDNSlocal void CleanRecentInterfaces(voi + // Creates a PosixNetworkInterface for the interface whose IP address is + // intfAddr and whose name is intfName and registers it with mDNS core. + mDNSlocal int SetupOneInterface(mDNS *const m, struct sockaddr *intfAddr, struct sockaddr *intfMask, +- const mDNSu8 *intfHaddr, mDNSu16 intfHlen, const char *intfName, int intfIndex) ++ const mDNSu8 *intfHaddr, mDNSu16 intfHlen, const char *intfName, int intfIndex, int intfFlags) + { + int err = 0; + PosixNetworkInterface *intf; +@@ -1411,6 +1411,7 @@ mDNSlocal int SetupOneInterface(mDNS *co + + intf->coreIntf.Advertise = m->AdvertiseLocalAddresses; + intf->coreIntf.McastTxRx = mDNStrue; ++ intf->coreIntf.Loopback = ((intfFlags & IFF_LOOPBACK) != 0) ? mDNStrue : mDNSfalse; + + // Set up the extra fields in PosixNetworkInterface. + assert(intf->intfName != NULL); // intf->intfName already set up above +@@ -1561,7 +1562,7 @@ mDNSlocal int SetupInterfaceList(mDNS *c + } + #endif + if (SetupOneInterface(m, i->ifa_addr, i->ifa_netmask, +- hwaddr, hwaddr_len, i->ifa_name, ifIndex) == 0) ++ hwaddr, hwaddr_len, i->ifa_name, ifIndex, i->ifa_flags) == 0) + { + if (i->ifa_addr->sa_family == AF_INET) + foundav4 = mDNStrue; +@@ -1578,7 +1579,7 @@ mDNSlocal int SetupInterfaceList(mDNS *c + // if ((m->HostInterfaces == NULL) && (firstLoopback != NULL)) + if (!foundav4 && firstLoopback) + (void) SetupOneInterface(m, firstLoopback->ifa_addr, firstLoopback->ifa_netmask, +- NULL, 0, firstLoopback->ifa_name, firstLoopbackIndex); ++ NULL, 0, firstLoopback->ifa_name, firstLoopbackIndex, firstLoopback->ifa_flags); + } + + // Clean up. 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 new file mode 100644 index 0000000000..837580ac36 --- /dev/null +++ b/meta-networking/recipes-protocols/mdns/mdns/0004-make-Separate-TLS-targets-from-libraries.patch @@ -0,0 +1,61 @@ +From 22316f200803225f2d375ae5c36ffead59e2f6b8 Mon Sep 17 00:00:00 2001 +From: Alex Kiernan <alex.kiernan@gmail.com> +Date: Mon, 5 Dec 2022 15:14:26 +0000 +Subject: [PATCH 4/6] make: Separate TLS targets from libraries + +There are dependencies on TLSOBJS, which fails when `-lmbedtls` is +listed as a dependency, so separate it out. + +Upstream-Status: Pending +Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> +--- + mDNSPosix/Makefile | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) + +Index: mDNSResponder/mDNSPosix/Makefile +=================================================================== +--- mDNSResponder.orig/mDNSPosix/Makefile ++++ mDNSResponder/mDNSPosix/Makefile +@@ -112,9 +112,11 @@ ifeq ($(findstring linux,$(os)),linux) + ifeq ($(tls), no) + CFLAGS_OS = -D_GNU_SOURCE -DHAVE_IPV6 -DNOT_HAVE_SA_LEN -DUSES_NETLINK -DHAVE_LINUX -DTARGET_OS_LINUX -ftabstop=4 -Wno-expansion-to-defined + TLSOBJS = ++TLSLIBS = + else + CFLAGS_OS = -D_GNU_SOURCE -DHAVE_IPV6 -DNOT_HAVE_SA_LEN -DUSES_NETLINK -DHAVE_LINUX -DTARGET_OS_LINUX -DPOSIX_HAS_TLS -ftabstop=4 -Wno-expansion-to-defined +-TLSOBJS = $(OBJDIR)/mbedtls.c.o -lmbedtls -lmbedcrypto ++TLSOBJS = $(OBJDIR)/mbedtls.c.o ++TLSLIBS = -lmbedtls -lmbedcrypto + endif + LD = $(CC) + SOOPTS = -shared +@@ -266,7 +268,7 @@ Daemon: setup $(BUILDDIR)/mdnsd + @echo "Responder daemon done" + + $(BUILDDIR)/mdnsd: $(DAEMONOBJS) +- $(CC) -o $@ $+ $(LINKOPTS) ++ $(CC) -o $@ $+ $(LINKOPTS) $(TLSLIBS) + $(STRIP) $@ + + # libdns_sd target builds the client library +@@ -485,16 +487,16 @@ dnsextd: setup $(BUILDDIR)/dnsextd + @echo "dnsextd done" + + $(BUILDDIR)/mDNSClientPosix: $(APPOBJ) $(TLSOBJS) $(OBJDIR)/Client.c.o +- $(CC) $+ -o $@ $(LINKOPTS) ++ $(CC) $+ -o $@ $(LINKOPTS) $(TLSLIBS) + + $(BUILDDIR)/mDNSResponderPosix: $(COMMONOBJ) $(TLSOBJS) $(OBJDIR)/Responder.c.o +- $(CC) $+ -o $@ $(LINKOPTS) ++ $(CC) $+ -o $@ $(LINKOPTS) $(TLSLIBS) + + $(BUILDDIR)/mDNSProxyResponderPosix: $(COMMONOBJ) $(TLSOBJS) $(OBJDIR)/ProxyResponder.c.o +- $(CC) $+ -o $@ $(LINKOPTS) ++ $(CC) $+ -o $@ $(LINKOPTS) $(TLSLIBS) + + $(BUILDDIR)/mDNSNetMonitor: $(SPECIALOBJ) $(TLSOBJS) $(OBJDIR)/NetMonitor.c.o +- $(CC) $+ -o $@ $(LINKOPTS) ++ $(CC) $+ -o $@ $(LINKOPTS) $(TLSLIBS) + + $(OBJDIR)/NetMonitor.c.o: $(COREDIR)/mDNS.c # Note: NetMonitor.c textually imports mDNS.c + 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 new file mode 100644 index 0000000000..f00116c617 --- /dev/null +++ b/meta-networking/recipes-protocols/mdns/mdns/0005-Use-list-for-changed-interfaces.patch @@ -0,0 +1,166 @@ +From e79f81f5cd626ad77ec64de4325f6645cf253c5e Mon Sep 17 00:00:00 2001 +From: Nate Karstens <nate.karstens@garmin.com> +Date: Thu, 13 Jul 2017 09:00:00 -0500 +Subject: [PATCH 5/8] Use list for changed interfaces + +Uses a linked list to store the index of changed network interfaces +instead of a bitfield. This allows for network interfaces with an +index greater than 31 (an index of 36 was seen on Android). + +Upstream-Status: Submitted [dts@apple.com] + +Signed-off-by: Nate Karstens <nate.karstens@garmin.com> +Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> +--- + mDNSPosix/mDNSPosix.c | 58 ++++++++++++++++++++++++++++++++----------- + 1 file changed, 43 insertions(+), 15 deletions(-) + +Index: mDNSResponder/mDNSPosix/mDNSPosix.c +=================================================================== +--- mDNSResponder.orig/mDNSPosix/mDNSPosix.c ++++ mDNSResponder/mDNSPosix/mDNSPosix.c +@@ -74,6 +74,14 @@ struct IfChangeRec + }; + typedef struct IfChangeRec IfChangeRec; + ++// Used to build a list of network interface indices ++struct NetworkInterfaceIndex ++{ ++ int if_index; ++ struct NetworkInterfaceIndex *Next; ++}; ++typedef struct NetworkInterfaceIndex NetworkInterfaceIndex; ++ + // Note that static data is initialized to zero in (modern) C. + static PosixEventSource *gEventSources; // linked list of PosixEventSource's + static sigset_t gEventSignalSet; // Signals which event loop listens for +@@ -1621,6 +1629,23 @@ mDNSlocal mStatus OpenIfNotifySocket(int + return err; + } + ++mDNSlocal void AddInterfaceIndexToList(GenLinkedList *list, int if_index) ++{ ++ NetworkInterfaceIndex *item; ++ ++ for (item = (NetworkInterfaceIndex*)list->Head; item != NULL; item = item->Next) ++ { ++ if (if_index == item->if_index) return; ++ } ++ ++ item = mdns_malloc(sizeof *item); ++ if (item == NULL) return; ++ ++ item->if_index = if_index; ++ item->Next = NULL; ++ AddToTail(list, item); ++} ++ + #if MDNS_DEBUGMSGS + mDNSlocal void PrintNetLinkMsg(const struct nlmsghdr *pNLMsg) + { +@@ -1648,14 +1673,13 @@ mDNSlocal void PrintNetLinkMsg(cons + } + #endif + +-mDNSlocal mDNSu32 ProcessRoutingNotification(int sd) ++mDNSlocal void ProcessRoutingNotification(int sd, GenLinkedList *changedInterfaces) + // Read through the messages on sd and if any indicate that any interface records should + // be torn down and rebuilt, return affected indices as a bitmask. Otherwise return 0. + { + ssize_t readCount; + char buff[4096]; + struct nlmsghdr *pNLMsg = (struct nlmsghdr*) buff; +- mDNSu32 result = 0; + + // The structure here is more complex than it really ought to be because, + // unfortunately, there's no good way to size a buffer in advance large +@@ -1691,9 +1715,9 @@ mDNSlocal mDNSu32 ProcessRoutingNo + + // Process the NetLink message + if (pNLMsg->nlmsg_type == RTM_GETLINK || pNLMsg->nlmsg_type == RTM_NEWLINK) +- result |= 1 << ((struct ifinfomsg*) NLMSG_DATA(pNLMsg))->ifi_index; ++ AddInterfaceIndexToList(changedInterfaces, ((struct ifinfomsg*) NLMSG_DATA(pNLMsg))->ifi_index); + else if (pNLMsg->nlmsg_type == RTM_DELADDR || pNLMsg->nlmsg_type == RTM_NEWADDR) +- result |= 1 << ((struct ifaddrmsg*) NLMSG_DATA(pNLMsg))->ifa_index; ++ AddInterfaceIndexToList(changedInterfaces, ((struct ifaddrmsg*) NLMSG_DATA(pNLMsg))->ifa_index); + + // Advance pNLMsg to the next message in the buffer + if ((pNLMsg->nlmsg_flags & NLM_F_MULTI) != 0 && pNLMsg->nlmsg_type != NLMSG_DONE) +@@ -1704,8 +1728,6 @@ mDNSlocal mDNSu32 ProcessRoutingNo + else + break; // all done! + } +- +- return result; + } + + #else // USES_NETLINK +@@ -1737,14 +1759,13 @@ mDNSlocal void PrintRoutingSocketMs + } + #endif + +-mDNSlocal mDNSu32 ProcessRoutingNotification(int sd) ++mDNSlocal void ProcessRoutingNotification(int sd, GenLinkedList *changedInterfaces) + // Read through the messages on sd and if any indicate that any interface records should + // be torn down and rebuilt, return affected indices as a bitmask. Otherwise return 0. + { + ssize_t readCount; + char buff[4096]; + struct ifa_msghdr *pRSMsg = (struct ifa_msghdr*) buff; +- mDNSu32 result = 0; + + readCount = read(sd, buff, sizeof buff); + if (readCount < (ssize_t) sizeof(struct ifa_msghdr)) +@@ -1759,12 +1780,10 @@ mDNSlocal mDNSu32 ProcessRoutingNo + pRSMsg->ifam_type == RTM_IFINFO) + { + if (pRSMsg->ifam_type == RTM_IFINFO) +- result |= 1 << ((struct if_msghdr*) pRSMsg)->ifm_index; ++ AddInterfaceIndexToList(changedInterfaces, ((struct if_msghdr*) pRSMsg)->ifm_index); + else +- result |= 1 << pRSMsg->ifam_index; ++ AddInterfaceIndexToList(changedInterfaces, pRSMsg->ifam_index); + } +- +- return result; + } + + #endif // USES_NETLINK +@@ -1774,7 +1793,8 @@ mDNSlocal void InterfaceChangeCallback(i + { + IfChangeRec *pChgRec = (IfChangeRec*) context; + fd_set readFDs; +- mDNSu32 changedInterfaces = 0; ++ GenLinkedList changedInterfaces; ++ NetworkInterfaceIndex *changedInterface; + struct timeval zeroTimeout = { 0, 0 }; + + (void)fd; // Unused +@@ -1782,17 +1802,25 @@ mDNSlocal void InterfaceChangeCallback(i + FD_ZERO(&readFDs); + FD_SET(pChgRec->NotifySD, &readFDs); + ++ InitLinkedList(&changedInterfaces, offsetof(NetworkInterfaceIndex, Next)); ++ + do + { +- changedInterfaces |= ProcessRoutingNotification(pChgRec->NotifySD); ++ ProcessRoutingNotification(pChgRec->NotifySD, &changedInterfaces); + } + while (0 < select(pChgRec->NotifySD + 1, &readFDs, (fd_set*) NULL, (fd_set*) NULL, &zeroTimeout)); + + // Currently we rebuild the entire interface list whenever any interface change is + // detected. If this ever proves to be a performance issue in a multi-homed + // configuration, more care should be paid to changedInterfaces. +- if (changedInterfaces) ++ if (changedInterfaces.Head != NULL) + mDNSPlatformPosixRefreshInterfaceList(pChgRec->mDNS); ++ ++ while ((changedInterface = (NetworkInterfaceIndex*)changedInterfaces.Head) != NULL) ++ { ++ RemoveFromList(&changedInterfaces, changedInterface); ++ mdns_free(changedInterface); ++ } + } + + // Register with either a Routing Socket or RtNetLink to listen for interface changes. 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 new file mode 100644 index 0000000000..fd2f2f1178 --- /dev/null +++ b/meta-networking/recipes-protocols/mdns/mdns/0005-mDNSCore-Fix-broken-debug-parameter.patch @@ -0,0 +1,25 @@ +From 764b6202402e9e5687ff873330e5ad6be6f69df7 Mon Sep 17 00:00:00 2001 +From: Alex Kiernan <alex.kiernan@gmail.com> +Date: Mon, 5 Dec 2022 22:49:49 +0000 +Subject: [PATCH] mDNSCore: Fix broken debug parameter + +Upstream-Status: Pending +Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> + +--- + mDNSCore/mDNS.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: mDNSResponder/mDNSCore/mDNS.c +=================================================================== +--- mDNSResponder.orig/mDNSCore/mDNS.c ++++ mDNSResponder/mDNSCore/mDNS.c +@@ -10231,7 +10231,7 @@ mDNSlocal void mDNSCoreReceiveNoUnicastA + #else + const DNSServRef dnsserv = qptr->qDNSServer; + #endif +- debugf("mDNSCoreReceiveNoUnicastAnswers making negative cache entry TTL %d for %##s (%s)", negttl, currentQName, DNSTypeName(q.qtype)); ++ debugf("mDNSCoreReceiveNoUnicastAnswers making negative cache entry TTL %d for %##s (%s)", negttl, currentQName->c, DNSTypeName(q.qtype)); + // Create a negative record for the current name in the CNAME chain. + MakeNegativeCacheRecord(m, &m->rec.r, currentQName, currentQNameHash, q.qtype, q.qclass, negttl, mDNSInterface_Any, + dnsserv, response->h.flags); 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 new file mode 100644 index 0000000000..80cdbca500 --- /dev/null +++ b/meta-networking/recipes-protocols/mdns/mdns/0006-Handle-noisy-netlink-sockets.patch @@ -0,0 +1,249 @@ +From bfa1d68bed863e22c40a6d9a19ffbcc8694bbff6 Mon Sep 17 00:00:00 2001 +From: Nate Karstens <nate.karstens@garmin.com> +Date: Mon, 24 Jul 2017 09:38:55 -0500 +Subject: [PATCH 6/8] Handle noisy netlink sockets + +The POSIX implementation currently clears all network interfaces +when netlink indicates that there has been a change. This causes +the following problems: + + 1) Applications are informed that all of the services they are + tracking have been removed. + 2) Increases network load because the client must re-query for + all records it is interested in. + +This changes netlink notification handling by: + + 1) Always comparing with the latest interface list returned + by the OS. + 2) Confirming that the interface has been changed in a way + that we care about. + +Upstream-Status: Submitted [dts@apple.com] + +Signed-off-by: Nate Karstens <nate.karstens@garmin.com> +Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> +--- + mDNSPosix/mDNSPosix.c | 182 +++++++++++++++++++++++++++++++++++++++--- + 1 file changed, 172 insertions(+), 10 deletions(-) + +Index: mDNSResponder/mDNSPosix/mDNSPosix.c +=================================================================== +--- mDNSResponder.orig/mDNSPosix/mDNSPosix.c ++++ mDNSResponder/mDNSPosix/mDNSPosix.c +@@ -1788,14 +1788,43 @@ mDNSlocal void ProcessRoutingNo + + #endif // USES_NETLINK + ++// Test whether the given PosixNetworkInterface matches the given struct ifaddrs ++mDNSlocal mDNSBool InterfacesMatch(PosixNetworkInterface *intf, struct ifaddrs *ifi) ++{ ++ mDNSBool match = mDNSfalse; ++ mDNSAddr ip, mask; ++ unsigned int if_index; ++ ++ if_index = if_nametoindex(ifi->ifa_name); ++ if (if_index == 0) ++ return mDNSfalse; ++ ++ if((intf->index == if_index) && ++ (intf->sa_family == ifi->ifa_addr->sa_family) && ++ (strcmp(intf->coreIntf.ifname, ifi->ifa_name) == 0)) ++ { ++ SockAddrTomDNSAddr(ifi->ifa_addr, &ip, NULL); ++ SockAddrTomDNSAddr(ifi->ifa_netmask, &mask, NULL); ++ ++ match = mDNSSameAddress(&intf->coreIntf.ip, &ip) && ++ mDNSSameAddress(&intf->coreIntf.mask, &mask); ++ } ++ ++ return match; ++} ++ + // Called when data appears on interface change notification socket + mDNSlocal void InterfaceChangeCallback(int fd, void *context) + { + IfChangeRec *pChgRec = (IfChangeRec*) context; ++ mDNS *m = pChgRec->mDNS; + fd_set readFDs; + GenLinkedList changedInterfaces; + NetworkInterfaceIndex *changedInterface; + struct timeval zeroTimeout = { 0, 0 }; ++ struct ifaddrs *ifa_list, **ifi, *ifa_loop4 = NULL; ++ PosixNetworkInterface *intf, *intfNext; ++ mDNSBool found, foundav4; + + (void)fd; // Unused + +@@ -1810,12 +1839,149 @@ mDNSlocal void InterfaceChangeCallback(i + } + while (0 < select(pChgRec->NotifySD + 1, &readFDs, (fd_set*) NULL, (fd_set*) NULL, &zeroTimeout)); + +- // Currently we rebuild the entire interface list whenever any interface change is +- // detected. If this ever proves to be a performance issue in a multi-homed +- // configuration, more care should be paid to changedInterfaces. +- if (changedInterfaces.Head != NULL) +- mDNSPlatformPosixRefreshInterfaceList(pChgRec->mDNS); ++ CleanRecentInterfaces(); ++ ++ if (changedInterfaces.Head == NULL) goto cleanup; ++ ++ if (getifaddrs(&ifa_list) < 0) goto cleanup; ++ ++ for (intf = (PosixNetworkInterface*)(m->HostInterfaces); intf != NULL; intf = intfNext) ++ { ++ intfNext = (PosixNetworkInterface*)(intf->coreIntf.next); ++ ++ // Loopback interface(s) are handled later ++ if (intf->coreIntf.Loopback) continue; ++ ++ found = mDNSfalse; ++ for (ifi = &ifa_list; *ifi != NULL; ifi = &(*ifi)->ifa_next) ++ { ++ if (InterfacesMatch(intf, *ifi)) ++ { ++ found = mDNStrue; ++ break; ++ } ++ } ++ ++ // Removes changed and old interfaces from m->HostInterfaces ++ if (!found) TearDownInterface(m, intf); ++ } ++ ++ // Add new and changed interfaces in ifa_list ++ // Save off loopback interface in case it is needed later ++ for (ifi = &ifa_list; *ifi != NULL; ifi = &(*ifi)->ifa_next) ++ { ++ found = mDNSfalse; ++ for (intf = (PosixNetworkInterface*)(m->HostInterfaces); intf != NULL; intf = intfNext) ++ { ++ intfNext = (PosixNetworkInterface*)(intf->coreIntf.next); ++ ++ // Loopback interface(s) are handled later ++ if (intf->coreIntf.Loopback) continue; ++ ++ if (InterfacesMatch(intf, *ifi)) ++ { ++ found = mDNStrue; ++ break; ++ } ++ ++ // Removes changed and old interfaces from m->HostInterfaces ++ } ++ if (found) ++ continue; ++ ++ if ((ifa_loop4 == NULL) && ++ ((*ifi)->ifa_addr->sa_family == AF_INET) && ++ ((*ifi)->ifa_flags & IFF_UP) && ++ ((*ifi)->ifa_flags & IFF_LOOPBACK)) ++ { ++ ifa_loop4 = *ifi; ++ continue; ++ } ++ ++ if ( (((*ifi)->ifa_addr->sa_family == AF_INET) ++#if HAVE_IPV6 ++ || ((*ifi)->ifa_addr->sa_family == AF_INET6) ++#endif ++ ) && ((*ifi)->ifa_flags & IFF_UP) ++ && !((*ifi)->ifa_flags & IFF_POINTOPOINT) ++ && !((*ifi)->ifa_flags & IFF_LOOPBACK)) ++ { ++ struct ifaddrs *i = *ifi; ++ ++#define ethernet_addr_len 6 ++ uint8_t hwaddr[ethernet_addr_len]; ++ int hwaddr_len = 0; ++ ++#if defined(TARGET_OS_LINUX) && TARGET_OS_LINUX ++ struct ifreq ifr; ++ int sockfd = socket(AF_INET6, SOCK_DGRAM, 0); ++ if (sockfd >= 0) ++ { ++ /* Add hardware address */ ++ memcpy(ifr.ifr_name, i->ifa_name, IFNAMSIZ); ++ if (ioctl(sockfd, SIOCGIFHWADDR, &ifr) != -1) ++ { ++ if (ifr.ifr_hwaddr.sa_family == ARPHRD_ETHER) ++ { ++ memcpy(hwaddr, ifr.ifr_hwaddr.sa_data, ethernet_addr_len); ++ hwaddr_len = ethernet_addr_len; ++ } ++ } ++ close(sockfd); ++ } ++ else ++ { ++ memset(hwaddr, 0, sizeof(hwaddr)); ++ } ++#endif // TARGET_OS_LINUX ++ SetupOneInterface(m, i->ifa_addr, i->ifa_netmask, ++ hwaddr, hwaddr_len, i->ifa_name, if_nametoindex(i->ifa_name), i->ifa_flags); ++ } ++ } ++ ++ // Determine if there is at least one non-loopback IPv4 interface. This is to work around issues ++ // with multicast loopback on IPv6 interfaces -- see corresponding logic in SetupInterfaceList(). ++ foundav4 = mDNSfalse; ++ for (intf = (PosixNetworkInterface*)(m->HostInterfaces); intf != NULL; intf = (PosixNetworkInterface*)(intf->coreIntf.next)) ++ { ++ if (intf->sa_family == AF_INET && !intf->coreIntf.Loopback) ++ { ++ foundav4 = mDNStrue; ++ break; ++ } ++ } ++ ++ if (foundav4) ++ { ++ for (intf = (PosixNetworkInterface*)(m->HostInterfaces); intf != NULL; intf = intfNext) ++ { ++ intfNext = (PosixNetworkInterface*)(intf->coreIntf.next); ++ if (intf->coreIntf.Loopback) TearDownInterface(m, intf); ++ } ++ } ++ else ++ { ++ found = mDNSfalse; ++ ++ for (intf = (PosixNetworkInterface*)(m->HostInterfaces); intf != NULL; intf = (PosixNetworkInterface*)(intf->coreIntf.next)) ++ { ++ if (intf->coreIntf.Loopback) ++ { ++ found = mDNStrue; ++ break; ++ } ++ } ++ ++ if (!found && (ifa_loop4 != NULL)) ++ { ++ SetupOneInterface(m, ifa_loop4->ifa_addr, ifa_loop4->ifa_netmask, ++ NULL, 0, ifa_loop4->ifa_name, if_nametoindex(ifa_loop4->ifa_name), ifa_loop4->ifa_flags); ++ } ++ } ++ ++ if (ifa_list != NULL) freeifaddrs(ifa_list); + ++cleanup: + while ((changedInterface = (NetworkInterfaceIndex*)changedInterfaces.Head) != NULL) + { + RemoveFromList(&changedInterfaces, changedInterface); +@@ -1947,15 +2113,11 @@ mDNSexport void mDNSPlatformClose(mDNS * + #endif + } + +-// This is used internally by InterfaceChangeCallback. +-// It's also exported so that the Standalone Responder (mDNSResponderPosix) ++// This is exported so that the Standalone Responder (mDNSResponderPosix) + // can call it in response to a SIGHUP (mainly for debugging purposes). + mDNSexport mStatus mDNSPlatformPosixRefreshInterfaceList(mDNS *const m) + { + int err; +- // This is a pretty heavyweight way to process interface changes -- +- // destroying the entire interface list and then making fresh one from scratch. +- // We should make it like the OS X version, which leaves unchanged interfaces alone. + ClearInterfaceList(m); + err = SetupInterfaceList(m); + return PosixErrorToStatus(err); 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 new file mode 100644 index 0000000000..c12a02fcdd --- /dev/null +++ b/meta-networking/recipes-protocols/mdns/mdns/0006-make-Add-top-level-Makefile.patch @@ -0,0 +1,21 @@ +From fa9ef50ab4c4225cf3ade4bafc38ddf93e6fe127 Mon Sep 17 00:00:00 2001 +From: Alex Kiernan <alex.kiernan@gmail.com> +Date: Tue, 6 Dec 2022 13:28:31 +0000 +Subject: [PATCH 6/6] make: Add top-level Makefile + +Simple top level Makefile that just delegates to mDNSPosix. + +Upstream-Status: Inappropriate [oe-specific] +Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> +--- + Makefile | 2 ++ + 1 file changed, 2 insertions(+) + create mode 100644 Makefile + +Index: mDNSResponder/Makefile +=================================================================== +--- /dev/null ++++ mDNSResponder/Makefile +@@ -0,0 +1,2 @@ ++all clean: ++ 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 new file mode 100644 index 0000000000..dae1ac7ea0 --- /dev/null +++ b/meta-networking/recipes-protocols/mdns/mdns/0007-Mark-deleted-interfaces-as-being-changed.patch @@ -0,0 +1,37 @@ +From a8accffb95267490b50401c8b65ec18db57b5ef5 Mon Sep 17 00:00:00 2001 +From: Nate Karstens <nate.karstens@garmin.com> +Date: Wed, 9 Aug 2017 09:16:58 -0500 +Subject: [PATCH 7/8] Mark deleted interfaces as being changed + +Netlink notification handling ignores messages for deleted links, +RTM_DELLINK. It does handle RTM_GETLINK. According to libnl docu- +mentation (http://www.infradead.org/~tgr/libnl/doc/route.html) +RTM_DELLINK can be sent by the kernel, but RTM_GETLINK cannot. +There was likely a mixup in the original implementation, so this +change replaces handling for RTM_GETLINK with RTM_DELLINK. + +Testing and Verification Instructions: + 1. Use ip-link to add and remove a VLAN interface and verify + that mDNSResponder handles the deleted link. + +Upstream-Status: Submitted [dts@apple.com] + +Signed-off-by: Nate Karstens <nate.karstens@garmin.com> +Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> +--- + mDNSPosix/mDNSPosix.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: mDNSResponder/mDNSPosix/mDNSPosix.c +=================================================================== +--- mDNSResponder.orig/mDNSPosix/mDNSPosix.c ++++ mDNSResponder/mDNSPosix/mDNSPosix.c +@@ -1714,7 +1714,7 @@ mDNSlocal void ProcessRoutingNo + #endif + + // Process the NetLink message +- if (pNLMsg->nlmsg_type == RTM_GETLINK || pNLMsg->nlmsg_type == RTM_NEWLINK) ++ if (pNLMsg->nlmsg_type == RTM_DELLINK || pNLMsg->nlmsg_type == RTM_NEWLINK) + AddInterfaceIndexToList(changedInterfaces, ((struct ifinfomsg*) NLMSG_DATA(pNLMsg))->ifi_index); + else if (pNLMsg->nlmsg_type == RTM_DELADDR || pNLMsg->nlmsg_type == RTM_NEWADDR) + AddInterfaceIndexToList(changedInterfaces, ((struct ifaddrmsg*) NLMSG_DATA(pNLMsg))->ifa_index); 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 new file mode 100644 index 0000000000..1789001e14 --- /dev/null +++ b/meta-networking/recipes-protocols/mdns/mdns/0008-Handle-errors-from-socket-calls.patch @@ -0,0 +1,60 @@ +From ed58146d3aeecdb9920fdc017f85c18b5b10f2db Mon Sep 17 00:00:00 2001 +From: Nate Karstens <nate.karstens@garmin.com> +Date: Thu, 10 Aug 2017 08:27:32 -0500 +Subject: [PATCH 8/8] Handle errors from socket calls + +Adds handling for socket() or read() returning a +negative value (indicating an error has occurred). + +Upstream-Status: Submitted [dts@apple.com] + +Signed-off-by: Nate Karstens <nate.karstens@garmin.com> +Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> +--- + mDNSPosix/mDNSPosix.c | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +Index: mDNSResponder/mDNSPosix/mDNSPosix.c +=================================================================== +--- mDNSResponder.orig/mDNSPosix/mDNSPosix.c ++++ mDNSResponder/mDNSPosix/mDNSPosix.c +@@ -1677,7 +1677,7 @@ mDNSlocal void ProcessRoutingNo + // Read through the messages on sd and if any indicate that any interface records should + // be torn down and rebuilt, return affected indices as a bitmask. Otherwise return 0. + { +- ssize_t readCount; ++ ssize_t readVal, readCount; + char buff[4096]; + struct nlmsghdr *pNLMsg = (struct nlmsghdr*) buff; + +@@ -1686,7 +1686,10 @@ mDNSlocal void ProcessRoutingNo + // enough to hold all pending data and so avoid message fragmentation. + // (Note that FIONREAD is not supported on AF_NETLINK.) + +- readCount = read(sd, buff, sizeof buff); ++ readVal = read(sd, buff, sizeof buff); ++ if (readVal < 0) return; ++ readCount = readVal; ++ + while (1) + { + // Make sure we've got an entire nlmsghdr in the buffer, and payload, too. +@@ -1702,7 +1705,9 @@ mDNSlocal void ProcessRoutingNo + pNLMsg = (struct nlmsghdr*) buff; + + // read more data +- readCount += read(sd, buff + readCount, sizeof buff - readCount); ++ readVal = read(sd, buff + readCount, sizeof buff - readCount); ++ if (readVal < 0) return; ++ readCount += readVal; + continue; // spin around and revalidate with new readCount + } + else +@@ -2017,6 +2022,7 @@ mDNSlocal mDNSBool mDNSPlatformInit_CanR + int err; + int s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + struct sockaddr_in s5353; ++ if (s < 0) return mDNSfalse; + s5353.sin_family = AF_INET; + s5353.sin_port = MulticastDNSPort.NotAnInteger; + s5353.sin_addr.s_addr = 0; 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 new file mode 100644 index 0000000000..d443bc97b2 --- /dev/null +++ b/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch @@ -0,0 +1,31 @@ +From 1d7e71e72c597ffcc19c04373a477d1fbd3ad955 Mon Sep 17 00:00:00 2001 +From: Beniamin Sandu <beniaminsandu@gmail.com> +Date: Thu, 15 Jun 2023 17:02:58 +0000 +Subject: [PATCH] remove unneeded headers + +From a quick look, these seem to not be needed and having them +breaks the build with mbedtls 3.x. Without them it builds fine +on both 2.x and 3.x versions. + +Upstream-Status: Pending + +Signed-off-by: Beniamin Sandu <beniaminsandu@gmail.com> +--- + mDNSPosix/mbedtls.c | 2 -- + 1 file changed, 2 deletions(-) + +Index: mDNSResponder/mDNSPosix/mbedtls.c +=================================================================== +--- mDNSResponder.orig/mDNSPosix/mbedtls.c ++++ mDNSResponder/mDNSPosix/mbedtls.c +@@ -38,10 +38,8 @@ + #include <mbedtls/sha256.h> + #include <mbedtls/base64.h> + +-#include <mbedtls/certs.h> + #include <mbedtls/x509.h> + #include <mbedtls/ssl.h> +-#include <mbedtls/config.h> + + // Posix TLS server context + struct TLSContext_struct { 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 new file mode 100644 index 0000000000..511a6fdc18 --- /dev/null +++ b/meta-networking/recipes-protocols/mdns/mdns/0015-Add-missing-limits.h.patch @@ -0,0 +1,23 @@ +From 9fc45a2cf3b78573a568abf538a6e6f4bd30b2d7 Mon Sep 17 00:00:00 2001 +From: Alex Kiernan <alex.kiernan@gmail.com> +Date: Wed, 27 Sep 2023 11:45:26 +0100 +Subject: [PATCH] Add missing limits.h + +Upstream-Status: Pending +Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> +--- + mDNSShared/PlatformCommon.c | 1 + + 1 file changed, 1 insertion(+) + +Index: mDNSResponder/mDNSShared/PlatformCommon.c +=================================================================== +--- mDNSResponder.orig/mDNSShared/PlatformCommon.c ++++ mDNSResponder/mDNSShared/PlatformCommon.c +@@ -32,6 +32,7 @@ + #include <time.h> + #include <sys/time.h> // Needed for #include <sys/time.h>(). + #include <assert.h> ++#include <limits.h> + + + #include "mDNSEmbeddedAPI.h" // Defines the interface provided to the client layer above diff --git a/meta-networking/recipes-protocols/mdns/files/mdns.service b/meta-networking/recipes-protocols/mdns/mdns/mdns.service index 531d142dcd..531d142dcd 100644 --- a/meta-networking/recipes-protocols/mdns/files/mdns.service +++ b/meta-networking/recipes-protocols/mdns/mdns/mdns.service diff --git a/meta-networking/recipes-protocols/mdns/mdns_2200.100.94.0.2.bb b/meta-networking/recipes-protocols/mdns/mdns_2200.100.94.0.2.bb new file mode 100644 index 0000000000..ff7b0447bb --- /dev/null +++ b/meta-networking/recipes-protocols/mdns/mdns_2200.100.94.0.2.bb @@ -0,0 +1,135 @@ +SUMMARY = "Publishes & browses available services on a link according to the Zeroconf / Bonjour protocol" +DESCRIPTION = "Bonjour, also known as zero-configuration networking, enables automatic discovery of computers, devices, and services on IP networks." +HOMEPAGE = "https://developer.apple.com/bonjour/" +LICENSE = "Apache-2.0 & BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=31c50371921e0fb731003bbc665f29bf" + +DEPENDS:append:libc-musl = " musl-nscd" + +SRC_URI = "git://github.com/apple-oss-distributions/mDNSResponder;protocol=https;branch=rel/mDNSResponder-2200 \ + file://0001-dns-sd-Include-missing-headers.patch \ + file://0002-make-Set-libdns_sd.so-soname-correctly.patch \ + file://0004-make-Separate-TLS-targets-from-libraries.patch \ + file://0005-mDNSCore-Fix-broken-debug-parameter.patch \ + file://0006-make-Add-top-level-Makefile.patch \ + file://0001-Create-subroutine-for-cleaning-recent-interfaces.patch \ + file://0002-Create-subroutine-for-tearing-down-an-interface.patch \ + file://0003-Track-interface-socket-family.patch \ + file://0004-Indicate-loopback-interface-to-mDNS-core.patch \ + file://0005-Use-list-for-changed-interfaces.patch \ + file://0006-Handle-noisy-netlink-sockets.patch \ + file://0007-Mark-deleted-interfaces-as-being-changed.patch \ + file://0008-Handle-errors-from-socket-calls.patch \ + file://0009-remove-unneeded-headers.patch \ + file://mdns.service \ + file://0015-Add-missing-limits.h.patch \ + file://0001-Handle-interface-without-ifa_addr.patch \ + file://0001-Fix-SIGSEGV-during-DumpStateLog.patch \ + " +SRCREV = "8f70f98fc1d0cf439ca3a6470be6ad8ac2bcc019" + +# We install a stub Makefile in the top directory so that the various checks +# in base.bbclass pass their tests for a Makefile, this ensures (that amongst +# other things) the sstate checks will clean the build directory when the +# task hashes changes. +# +# We can't use the approach of setting ${S} to mDNSPosix as we need +# DEBUG_PREFIX_MAP to cover files which come from the Clients directory too. +S = "${WORKDIR}/git" + +inherit github-releases manpages systemd update-rc.d + +PACKAGECONFIG ?= "tls \ + ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" +PACKAGECONFIG[debug] = "DEBUG=1,DEBUG=0" +PACKAGECONFIG[ipv6] = "HAVE_IPV6=1,HAVE_IPV6=0" +PACKAGECONFIG[manpages] = "" +PACKAGECONFIG[tls] = ",tls=no,mbedtls" + +CVE_PRODUCT = "apple:mdnsresponder" + +CVE_STATUS[CVE-2007-0613] = "not-applicable-platform: Issue affects Apple products \ +i.e. ichat,mdnsresponder, instant message framework and MacOS. Also, \ +https://www.exploit-db.com/exploits/3230 shows the part of code \ +affected by CVE-2007-0613 which is not preset in upstream source code. \ +Hence, CVE-2007-0613 does not affect other Yocto implementations and \ +is not reported for other distros can be marked whitelisted. \ +Links: https://vulmon.com/vulnerabilitydetails?qid=CVE-2007-0613 \ +https://www.incibe-cert.es/en/early-warning/vulnerabilities/cve-2007-0613 \ +https://security-tracker.debian.org/tracker/CVE-2007-0613 \ +https://vulmon.com/vulnerabilitydetails?qid=CVE-2007-0613" + +PARALLEL_MAKE = "" + +EXTRA_OEMAKE = "os=linux 'CC=${CCLD}' 'LD=${CCLD}' 'LINKOPTS=${LDFLAGS}' STRIP=: ${PACKAGECONFIG_CONFARGS}" + +# MDNS_VERSIONSTR_NODTS disables __DATE__ and __TIME__ in the version string, +# which are fixed anyway for build reproducibility. +TARGET_CPPFLAGS += "-DMDNS_VERSIONSTR_NODTS" + +TARGET_CC_ARCH += "${LDFLAGS}" + +MDNS_BUILDDIR = "build/${@bb.utils.contains('PACKAGECONFIG','debug','debug','prod', d)}" + +do_install () { + cd mDNSPosix + + install -d ${D}${sbindir} + install ${MDNS_BUILDDIR}/mdnsd ${D}${sbindir} + + install -d ${D}${libdir} + install -m 0644 ${MDNS_BUILDDIR}/libdns_sd.so ${D}${libdir}/libdns_sd.so.1 + ln -s libdns_sd.so.1 ${D}${libdir}/libdns_sd.so + + install -d ${D}${includedir} + install -m 0644 ../mDNSShared/dns_sd.h ${D}${includedir} + + install -d ${D}${mandir}/man8 + install -m 0644 ../mDNSShared/mDNSResponder.8 ${D}${mandir}/man8/mdnsd.8 + + install -d ${D}${bindir} + install -m 0755 ../Clients/build/dns-sd ${D}${bindir} + + install -d ${D}${libdir} + oe_libinstall -C ${MDNS_BUILDDIR} -so libnss_mdns-0.2 ${D}${libdir} + ln -s libnss_mdns-0.2.so ${D}${libdir}/libnss_mdns.so.2 + + install -d ${D}${sysconfdir} + install -m 0644 nss_mdns.conf ${D}${sysconfdir} + + install -d ${D}${mandir}/man5 + install -m 0644 nss_mdns.conf.5 ${D}${mandir}/man5 + + install -d ${D}${mandir}/man8 + install -m 0644 libnss_mdns.8 ${D}${mandir}/man8 + + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${UNPACKDIR}/mdns.service ${D}${systemd_system_unitdir} + + install -d ${D}${INIT_D_DIR} + install mdnsd.sh ${D}${INIT_D_DIR}/mdns +} + +pkg_postinst:${PN} () { + if [ -r $D${sysconfdir}/nsswitch.conf ]; then + sed -e '/^hosts:/s/\s*\<mdns\>//' \ + -e 's/\(^hosts:.*\)\(\<files\>\)\(.*\)\(\<dns\>\)\(.*\)/\1\2 mdns\3\4\5/' \ + -i $D${sysconfdir}/nsswitch.conf + fi +} + +pkg_prerm:${PN} () { + if [ -r $D${sysconfdir}/nsswitch.conf ]; then + sed -e '/^hosts:/s/\s*\<mdns\>//' \ + -e '/^hosts:/s/\s*mdns//' \ + -i $D${sysconfdir}/nsswitch.conf + fi +} + +SYSTEMD_SERVICE:${PN} = "mdns.service" +INITSCRIPT_NAME = "mdns" + +FILES_SOLIBSDEV = "${libdir}/libdns_sd.so" +FILES:${PN} += "${libdir}/libnss_mdns-0.2.so" + +RPROVIDES:${PN} += "libdns_sd.so" diff --git a/meta-networking/recipes-protocols/mdns/mdns_765.50.9.bb b/meta-networking/recipes-protocols/mdns/mdns_765.50.9.bb deleted file mode 100644 index 1a80f7acb6..0000000000 --- a/meta-networking/recipes-protocols/mdns/mdns_765.50.9.bb +++ /dev/null @@ -1,89 +0,0 @@ -SUMMARY = "Publishes & browses available services on a link according to the Zeroconf / Bonjour protocol" -DESCRIPTION = "Bonjour, also known as zero-configuration networking, enables automatic discovery of computers, devices, and services on IP networks." -HOMEPAGE = "http://developer.apple.com/networking/bonjour/" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://../LICENSE;md5=31c50371921e0fb731003bbc665f29bf" - -RPROVIDES_${PN} += "libdns_sd.so" - -SRC_URI = "http://opensource.apple.com/tarballs/mDNSResponder/mDNSResponder-${PV}.tar.gz \ - file://build.patch;patchdir=.. \ - file://mdns.service \ - " - -SRC_URI[md5sum] = "4a6bc1628851002634ea3833a4dca317" -SRC_URI[sha256sum] = "de61dd0034357aa50c60806726fb1f70fa8e953ff9cb62eccfb73efad10dba0a" - -PARALLEL_MAKE = "" - -S = "${WORKDIR}/mDNSResponder-${PV}/mDNSPosix" - -EXTRA_OEMAKE += "os=linux DEBUG=0 'CC=${CC}' 'LD=${CCLD} ${LDFLAGS}'" - -TARGET_CC_ARCH += "${LDFLAGS}" - -do_install () { - install -d ${D}${sbindir} - install -m 0755 build/prod/mdnsd ${D}${sbindir} - - install -d ${D}${libdir} - cp build/prod/libdns_sd.so ${D}${libdir}/libdns_sd.so.1 - chmod 0644 ${D}${libdir}/libdns_sd.so.1 - ln -s libdns_sd.so.1 ${D}${libdir}/libdns_sd.so - - install -d ${D}${includedir} - install -m 0644 ../mDNSShared/dns_sd.h ${D}${includedir} - - install -d ${D}${mandir}/man8 - install -m 0644 ../mDNSShared/mDNSResponder.8 ${D}${mandir}/man8/mdnsd.8 - - install -d ${D}${bindir} - install -m 0755 ../Clients/build/dns-sd ${D}${bindir} - - install -d ${D}${libdir} - oe_libinstall -C build/prod -so libnss_mdns-0.2 ${D}${libdir} - ln -s libnss_mdns-0.2.so ${D}${libdir}/libnss_mdns.so.2 - - install -d ${D}${sysconfdir} - install -m 0644 nss_mdns.conf ${D}${sysconfdir} - - install -d ${D}${mandir}/man5 - install -m 0644 nss_mdns.conf.5 ${D}${mandir}/man5 - - install -d ${D}${mandir}/man8 - install -m 0644 libnss_mdns.8 ${D}${mandir}/man8 - - install -d ${D}${systemd_unitdir}/system/ - install -m 0644 ${WORKDIR}/mdns.service ${D}${systemd_unitdir}/system/ -} - -pkg_postinst_${PN} () { - sed -e '/^hosts:/s/\s*\<mdns\>//' \ - -e 's/\(^hosts:.*\)\(\<files\>\)\(.*\)\(\<dns\>\)\(.*\)/\1\2 mdns\3\4\5/' \ - -i $D/etc/nsswitch.conf -} - -pkg_prerm_${PN} () { - sed -e '/^hosts:/s/\s*\<mdns\>//' \ - -e '/^hosts:/s/\s*mdns//' \ - -i $D/etc/nsswitch.conf -} - -inherit systemd - -SYSTEMD_SERVICE_${PN} = "mdns.service" - -FILES_${PN} += "${systemd_unitdir}/system/mdns.service" -FILES_${PN} += "${libdir}/libdns_sd.so.1 \ - ${bindir}/dns-sd \ - ${libdir}/libnss_mdns-0.2.so \ - ${sysconfdir}/nss_mdns.conf" - -FILES_${PN}-dev += "${libdir}/libdns_sd.so \ - ${includedir}/dns_sd.h " - -FILES_${PN}-man += "${mandir}/man8/mdnsd.8 \ - ${mandir}/man5/nss_mdns.conf.5 \ - ${mandir}/man8/libnss_mdns.8" - -PACKAGES = "${PN} ${PN}-dev ${PN}-man ${PN}-dbg" diff --git a/meta-networking/recipes-protocols/net-snmp/files/init b/meta-networking/recipes-protocols/net-snmp/files/init index 47995466fb..47995466fb 100755..100644 --- a/meta-networking/recipes-protocols/net-snmp/files/init +++ b/meta-networking/recipes-protocols/net-snmp/files/init diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-Android-Fix-the-build.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-Android-Fix-the-build.patch new file mode 100644 index 0000000000..097d9f83cd --- /dev/null +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-Android-Fix-the-build.patch @@ -0,0 +1,83 @@ +From b4598662a39ff6974119c900ea56a4d020eac366 Mon Sep 17 00:00:00 2001 +From: Bart Van Assche <bvanassche@acm.org> +Date: Wed, 20 Dec 2023 13:08:06 -0800 +Subject: [PATCH] Android: Fix the build + +Include <sys/select.h> for the fd_set type. In the configure script, +check whether 'unsigned long' is the underlying type of fd_set. Use +u_long instead of ulong. + +Upstream-Status: Backport [https://github.com/net-snmp/net-snmp/commit/b4598662a39ff6974119c900ea56a4d020eac366] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + agent/mibgroup/ip-mib/data_access/ipaddress_linux.c | 4 ++-- + configure | 2 +- + configure.d/config_project_types | 2 +- + include/net-snmp/types.h | 3 +++ + 4 files changed, 7 insertions(+), 4 deletions(-) + +diff --git a/agent/mibgroup/ip-mib/data_access/ipaddress_linux.c b/agent/mibgroup/ip-mib/data_access/ipaddress_linux.c +index b38beb57dd..232202d0f9 100644 +--- a/agent/mibgroup/ip-mib/data_access/ipaddress_linux.c ++++ b/agent/mibgroup/ip-mib/data_access/ipaddress_linux.c +@@ -50,7 +50,7 @@ int _load_v6(netsnmp_container *container, int idx_offset); + int + netsnmp_access_ipaddress_extra_prefix_info(int index, + u_long *preferedlt, +- ulong *validlt, ++ u_long *validlt, + char *addr); + #endif + +@@ -523,7 +523,7 @@ out: + + int + netsnmp_access_ipaddress_extra_prefix_info(int index, u_long *preferedlt, +- ulong *validlt, char *addr) ++ u_long *validlt, char *addr) + { + + struct { +diff --git a/configure b/configure +index e7bf859bba..48abcbab11 100755 +--- a/configure ++++ b/configure +@@ -31577,7 +31577,7 @@ CFLAGS="$CFLAGS -Werror" + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the type of fd_set::fds_bits" >&5 + printf %s "checking for the type of fd_set::fds_bits... " >&6; } +-for type in __fd_mask __int32_t long\ int unknown; do ++for type in __fd_mask __int32_t long 'unsigned long' unknown; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +diff --git a/configure.d/config_project_types b/configure.d/config_project_types +index a78e8ebb06..ac958d6712 100644 +--- a/configure.d/config_project_types ++++ b/configure.d/config_project_types +@@ -66,7 +66,7 @@ netsnmp_save_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS -Werror" + + AC_MSG_CHECKING([for the type of fd_set::fds_bits]) +-for type in __fd_mask __int32_t long\ int unknown; do ++for type in __fd_mask __int32_t long 'unsigned long' unknown; do + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ + #include <sys/select.h> + #include <stddef.h> +diff --git a/include/net-snmp/types.h b/include/net-snmp/types.h +index b78f53ffd7..6228170e5f 100644 +--- a/include/net-snmp/types.h ++++ b/include/net-snmp/types.h +@@ -23,6 +23,9 @@ + #endif + + #include <sys/types.h> ++#ifdef __ANDROID__ ++#include <sys/select.h> ++#endif + + #if defined(WIN32) && !defined(cygwin) + typedef HANDLE netsnmp_pid_t; +-- +2.44.0 + diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-BUG-a2584-Fix-snmptrap-to-use-clientaddr-from-snmp.c.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-BUG-a2584-Fix-snmptrap-to-use-clientaddr-from-snmp.c.patch deleted file mode 100644 index b05eea56fc..0000000000 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-BUG-a2584-Fix-snmptrap-to-use-clientaddr-from-snmp.c.patch +++ /dev/null @@ -1,48 +0,0 @@ -From a92628a163ebf1ea62220684736300461c003875 Mon Sep 17 00:00:00 2001 -From: Niels Baggesen <nba@users.sourceforge.net> -Date: Mon, 26 Jan 2015 20:26:06 +0100 -Subject: [PATCH] BUG#a2584: Fix snmptrap to use clientaddr from snmp.conf. - Thanks to rizwan - -Upstream-Status: backport - -Signed-off-by: Li Zhou <li.zhou@windriver.com> ---- - snmplib/transports/snmpUDPIPv6Domain.c | 21 +++++++++++++++++++++ - 1 file changed, 21 insertions(+) - -diff --git a/snmplib/transports/snmpUDPIPv6Domain.c b/snmplib/transports/snmpUDPIPv6Domain.c -index 55e3610..aca69ae 100644 ---- a/snmplib/transports/snmpUDPIPv6Domain.c -+++ b/snmplib/transports/snmpUDPIPv6Domain.c -@@ -256,6 +256,27 @@ netsnmp_udp6_transport(struct sockaddr_in6 *addr, int local) - t->data = NULL; - t->data_length = 0; - } else { -+ char *client_socket = NULL; -+ /* -+ * This is a client session. If we've been given a -+ * client address to send from, then bind to that. -+ * Otherwise the send will use "something sensible". -+ */ -+ -+ client_socket = netsnmp_ds_get_string(NETSNMP_DS_LIBRARY_ID, -+ NETSNMP_DS_LIB_CLIENT_ADDR); -+ if (client_socket) { -+ struct sockaddr_in6 client_addr; -+ netsnmp_sockaddr_in6_2(&client_addr, client_socket, NULL); -+ rc = bind(t->sock, (struct sockaddr *)&client_addr, -+ sizeof(struct sockaddr_in6)); -+ if ( rc != 0 ) { -+ DEBUGMSGTL(("netsnmp_udp6", "failed to bind for clientaddr: %d %s\n", -+ errno, strerror(errno))); -+ netsnmp_socketbase_close(t); -+ netsnmp_transport_free(t); -+ } -+ } - /* - * This is a client session. Save the address in the - * transport-specific data pointer for later use by netsnmp_udp6_send. --- -2.9.3 - diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-config_os_libs2-Error-Fix.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-config_os_libs2-Error-Fix.patch deleted file mode 100644 index 5866a95edb..0000000000 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-config_os_libs2-Error-Fix.patch +++ /dev/null @@ -1,31 +0,0 @@ -From e24fcd140f3f6dd18fd836b197c6d4bb773e50e7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Rafa=C3=ABl=20Carr=C3=A9?= <funman@videolan.org> -Date: Wed, 4 Nov 2015 16:49:30 +0100 -Subject: [PATCH] config_os_libs2: Error Fix - -ERROR: This autoconf log indicates errors, it looked at host include -and/or library paths while determining system capabilities. ---- - configure.d/config_os_libs2 | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.d/config_os_libs2 b/configure.d/config_os_libs2 -index 47491e2..e3647f9 100644 ---- a/configure.d/config_os_libs2 -+++ b/configure.d/config_os_libs2 -@@ -226,10 +226,10 @@ if test "x$with_nl" != "xno"; then - case $target_os in - linux*) # Check for libnl (linux) - netsnmp_save_CPPFLAGS="$CPPFLAGS" -- CPPFLAGS="-I/usr/include/libnl3 $CPPFLAGS" -+ CPPFLAGS="$CPPFLAGS" - NETSNMP_SEARCH_LIBS(nl_connect, nl-3, - [AC_CHECK_HEADERS(netlink/netlink.h) -- EXTERNAL_MIBGROUP_INCLUDES="$EXTERNAL_MIBGROUP_INCLUDES -I/usr/include/libnl3"], -+ EXTERNAL_MIBGROUP_INCLUDES="$EXTERNAL_MIBGROUP_INCLUDES"], - [CPPFLAGS="$netsnmp_save_CPPFLAGS"], [], [], [LMIBLIBS]) - if test "x$ac_cv_header_netlink_netlink_h" != xyes; then - NETSNMP_SEARCH_LIBS(nl_connect, nl, [ --- -2.5.0 - diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-configure-fix-check-for-enable-perl-cc-checks.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-configure-fix-check-for-enable-perl-cc-checks.patch deleted file mode 100644 index b87e9eec26..0000000000 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-configure-fix-check-for-enable-perl-cc-checks.patch +++ /dev/null @@ -1,31 +0,0 @@ -From c6304a3e4b8441ff0a6464c0f1f6c5229092fa32 Mon Sep 17 00:00:00 2001 -From: Niels Baggesen <nba@users.sourceforge.net> -Date: Wed, 24 May 2017 16:40:03 +0800 -Subject: [PATCH 1/4] configure: fix check for --enable-perl-cc-checks - -This patch comes from git://git.code.sf.net/p/net-snmp/code, -the commit is 8f431d410b803603dc809d82e0893509615d9a11. - -Upstream-Status: Backport - -Signed-off-by: Wenlin Kang <wenlin.kang@windriver.com> ---- - configure.d/config_project_perl_python | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.d/config_project_perl_python b/configure.d/config_project_perl_python -index 23f8c7e..475c843 100644 ---- a/configure.d/config_project_perl_python -+++ b/configure.d/config_project_perl_python -@@ -84,7 +84,7 @@ if test "x$install_perl" != "xno" ; then - - # What compiler was used to build the perl binary? - # -- if test "xenable_perl_cc_checks" != "xno" ; then -+ if test "x$enable_perl_cc_checks" != "xno" ; then - AC_MSG_CHECKING([for Perl cc]) - changequote(, ) - PERLCC=`$myperl -V:cc | $myperl -n -e 'print if (s/^\s*cc=.([-=\w\s\/]+).;\s*/$1/);'` --- -1.9.1 - diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-add-knob-whether-nlist.h-are-checked.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-net-snmp-add-knob-whether-nlist.h-are-checked.patch index 74b0c12e05..ea9dccac28 100644 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-add-knob-whether-nlist.h-are-checked.patch +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-net-snmp-add-knob-whether-nlist.h-are-checked.patch @@ -1,35 +1,38 @@ -net-snmp: add knob whether nlist.h are checked +From 787269b337e70f073e194c3b361eaf4d5f2291ce Mon Sep 17 00:00:00 2001 +From: Chong Lu <Chong.Lu@windriver.com> +Date: Thu, 28 May 2020 09:46:34 -0500 +Subject: [PATCH] net-snmp: add knob whether nlist.h are checked Previously, it still was checked when there was no nlish.h in sysroots directory. Add knob to decide whether nlist.h are checked or not. -Upstream-status: Pending +Upstream-Status: Pending Signed-off-by: Chong Lu <Chong.Lu@windriver.com> --- - configure.d/config_os_headers | 2 ++ + configure.d/config_os_headers | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configure.d/config_os_headers b/configure.d/config_os_headers -index d903f58..a05d30e 100644 +index 584064e..c0688f8 100644 --- a/configure.d/config_os_headers +++ b/configure.d/config_os_headers -@@ -31,6 +31,7 @@ AC_CHECK_HEADERS([getopt.h pthread.h regex.h ] dnl - [sys/un.h ]) +@@ -37,6 +37,7 @@ AC_CHECK_HEADERS([getopt.h pthread.h regex.h ] dnl + [sys/timeb.h ]) # Library and Agent: +if test "x$with_elf" != "xno"; then AC_CHECK_HEADERS([nlist.h],,,[ AC_INCLUDES_DEFAULT [ -@@ -38,6 +39,7 @@ AC_INCLUDES_DEFAULT +@@ -44,6 +45,7 @@ AC_INCLUDES_DEFAULT #define LIBBSD_DISABLE_DEPRECATED 1 #endif ]]) +fi # Library: - AC_CHECK_HEADERS([fcntl.h io.h kstat.h ] dnl + AC_CHECK_HEADERS([crt_externs.h ] dnl -- -1.7.9.5 +2.25.1 diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmplib-UDPIPv6-transport-Add-a-missing-return-state.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmplib-UDPIPv6-transport-Add-a-missing-return-state.patch deleted file mode 100644 index 6255f7ced3..0000000000 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmplib-UDPIPv6-transport-Add-a-missing-return-state.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 1ee72102fbe722d232d74abc4660a8b134cec8d6 Mon Sep 17 00:00:00 2001 -From: Bart Van Assche <bvanassche@acm.org> -Date: Sat, 23 May 2015 07:32:53 +0200 -Subject: [PATCH] snmplib, UDPIPv6 transport: Add a missing return statement - -Detected by Coverity. - -Upstream-Status: backport - -Signed-off-by: Li Zhou <li.zhou@windriver.com> ---- - snmplib/transports/snmpUDPIPv6Domain.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/snmplib/transports/snmpUDPIPv6Domain.c b/snmplib/transports/snmpUDPIPv6Domain.c -index 029b164..11c39bb 100644 ---- a/snmplib/transports/snmpUDPIPv6Domain.c -+++ b/snmplib/transports/snmpUDPIPv6Domain.c -@@ -285,6 +285,7 @@ netsnmp_udp6_transport(struct sockaddr_in6 *addr, int local) - errno, strerror(errno))); - netsnmp_socketbase_close(t); - netsnmp_transport_free(t); -+ return NULL; - } - } - /* --- -2.9.3 - diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0002-configure-fix-a-cc-check-issue.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0002-configure-fix-a-cc-check-issue.patch deleted file mode 100644 index 999976d279..0000000000 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/0002-configure-fix-a-cc-check-issue.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 94e7e4969bc84c945dfea12d67a1e10f61973948 Mon Sep 17 00:00:00 2001 -From: Wenlin Kang <wenlin.kang@windriver.com> -Date: Wed, 24 May 2017 16:45:34 +0800 -Subject: [PATCH 2/4] configure: fix a cc check issue. - -When has "." in cc value, the expression -$myperl -V:cc | $myperl -n -e 'print if (s/^\s*cc=.([-=\w\s\/]+).;\s*/$1/);' -can't get corretly the cc's value. - -Signed-off-by: Wenlin Kang <wenlin.kang@windriver.com> ---- - configure.d/config_project_perl_python | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.d/config_project_perl_python b/configure.d/config_project_perl_python -index 475c843..22d2ad3 100644 ---- a/configure.d/config_project_perl_python -+++ b/configure.d/config_project_perl_python -@@ -87,7 +87,7 @@ if test "x$install_perl" != "xno" ; then - if test "x$enable_perl_cc_checks" != "xno" ; then - AC_MSG_CHECKING([for Perl cc]) - changequote(, ) -- PERLCC=`$myperl -V:cc | $myperl -n -e 'print if (s/^\s*cc=.([-=\w\s\/]+).;\s*/$1/);'` -+ PERLCC=`$myperl -V:cc | $myperl -n -e 'print if (s/^\s*cc=.([-=\.\w\s\/]+).;\s*/$1/);'` - changequote([, ]) - if test "x$PERLCC" != "x" ; then - AC_MSG_RESULT([$PERLCC]) --- -1.9.1 - diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/fix-libtool-finish.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0002-net-snmp-fix-libtool-finish.patch index a360c3a120..e951537b04 100644 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/fix-libtool-finish.patch +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/0002-net-snmp-fix-libtool-finish.patch @@ -1,3 +1,8 @@ +From 5f002c3cc46ecf4d4a29571309f2cc0d3d34330f Mon Sep 17 00:00:00 2001 +From: "Roy.Li" <rongqing.li@windriver.com> +Date: Fri, 16 Jan 2015 14:14:01 +0800 +Subject: [PATCH] net-snmp: fix "libtool --finish" + LIB_LDCONFIG_CMD failed since it is using a host dir $(libdir) which is /usr/lib64 does not exist on host when compile 64bit image. @@ -10,12 +15,15 @@ Upstream-Status: Inappropriate [cross compile specific] Signed-off-by: Roy.Li <rongqing.li@windriver.com> --- + Makefile.top | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + diff --git a/Makefile.top b/Makefile.top -index 862fb94..ed7dcfc 100644 +index d1b3923..53e0392 100644 --- a/Makefile.top +++ b/Makefile.top -@@ -86,7 +86,7 @@ LIBREVISION = 2 - LIB_LD_CMD = $(LIBTOOL) --mode=link $(LINKCC) $(CFLAGS) -rpath $(libdir) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) -o +@@ -89,7 +89,7 @@ LIBREVISION = 1 + LIB_LD_CMD = $(LIBTOOL) --mode=link $(LINKCC) $(CFLAGS) -rpath $(libdir) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) @LD_NO_UNDEFINED@ -o LIB_EXTENSION = la LIB_VERSION = -LIB_LDCONFIG_CMD = $(LIBTOOL) --mode=finish $(INSTALL_PREFIX)$(libdir) @@ -23,3 +31,6 @@ index 862fb94..ed7dcfc 100644 LINK = $(LIBTOOL) --mode=link $(LINKCC) # RANLIB = @RANLIB@ RANLIB = : +-- +2.25.1 + diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0003-CHANGES-BUG-2712-Fix-Perl-module-compilation.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0003-CHANGES-BUG-2712-Fix-Perl-module-compilation.patch deleted file mode 100644 index 7951234a4e..0000000000 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/0003-CHANGES-BUG-2712-Fix-Perl-module-compilation.patch +++ /dev/null @@ -1,186 +0,0 @@ -From e57fc809ad6ae522670f3dc157aadde20d968ca7 Mon Sep 17 00:00:00 2001 -From: Bart Van Assche <bvanassche@acm.org> -Date: Wed, 24 May 2017 17:05:03 +0800 -Subject: [PATCH 3/4] CHANGES: BUG: 2712: Fix Perl module compilation - -Avoid that building the Net-SNMP Perl modules fails as follows: - -ERROR from evaluation of /sources/net-snmp-5.7.3/perl/ASN/Makefile.PL: Bizarre \ copy of HASH in list assignment at /usr/lib/perl5/site_perl/5.24.0/Carp.pm line\ 229. - -See also https://sourceforge.net/p/net-snmp/bugs/2712/. - -This patch comes from git://git.code.sf.net/p/net-snmp/code, -the commit is 4e793461e96a2b4fd81142ab312d074d5c8841fa. - -Signed-off-by: Wenlin Kang <wenlin.kang@windriver.com> ---- - perl/ASN/Makefile.PL | 4 +--- - perl/Makefile.PL | 4 +--- - perl/OID/Makefile.PL | 5 +---- - perl/SNMP/Makefile.PL | 5 +---- - perl/TrapReceiver/Makefile.PL | 5 +---- - perl/agent/Makefile.PL | 5 +---- - perl/agent/Support/Makefile.PL | 5 +---- - perl/agent/default_store/Makefile.PL | 5 +---- - perl/default_store/Makefile.PL | 5 +---- - 9 files changed, 9 insertions(+), 34 deletions(-) - -diff --git a/perl/ASN/Makefile.PL b/perl/ASN/Makefile.PL -index 4576781..c33d8ba 100644 ---- a/perl/ASN/Makefile.PL -+++ b/perl/ASN/Makefile.PL -@@ -7,9 +7,7 @@ my $lib_version; - # See lib/ExtUtils/MakeMaker.pm for details of how to influence - # the contents of the Makefile that is written. - --%MakeParams = InitMakeParams(); -- --WriteMakefile(%MakeParams); -+WriteMakefile(InitMakeParams()); - - Check_Version(); - -diff --git a/perl/Makefile.PL b/perl/Makefile.PL -index 31fdc40..48aba2a 100644 ---- a/perl/Makefile.PL -+++ b/perl/Makefile.PL -@@ -3,9 +3,7 @@ use Config; - use Getopt::Long; - require 5; - --%MakeParams = InitMakeParams(); -- --WriteMakefile(%MakeParams); -+WriteMakefile(InitMakeParams()); - - sub InitMakeParams { - $nsconfig="net-snmp-config"; # in path by default -diff --git a/perl/OID/Makefile.PL b/perl/OID/Makefile.PL -index 6bb1616..2589985 100644 ---- a/perl/OID/Makefile.PL -+++ b/perl/OID/Makefile.PL -@@ -6,11 +6,8 @@ require 5; - use Config; - use Getopt::Long; - my $lib_version; --my %MakeParams = (); - --%MakeParams = InitMakeParams(); -- --WriteMakefile(%MakeParams); -+WriteMakefile(InitMakeParams()); - - Check_Version(); - -diff --git a/perl/SNMP/Makefile.PL b/perl/SNMP/Makefile.PL -index e617cb7..8aab9a9 100644 ---- a/perl/SNMP/Makefile.PL -+++ b/perl/SNMP/Makefile.PL -@@ -3,15 +3,12 @@ require 5; - use Config; - use Getopt::Long; - my $lib_version; --my %MakeParams = (); - my $opts; - - # See lib/ExtUtils/MakeMaker.pm for details of how to influence - # the contents of the Makefile that is written. - --%MakeParams = InitMakeParams(); -- --WriteMakefile(%MakeParams); -+WriteMakefile(InitMakeParams()); - - Check_Version(); - -diff --git a/perl/TrapReceiver/Makefile.PL b/perl/TrapReceiver/Makefile.PL -index 874ee21..7e9e58e 100644 ---- a/perl/TrapReceiver/Makefile.PL -+++ b/perl/TrapReceiver/Makefile.PL -@@ -3,11 +3,8 @@ require 5; - use Config; - use Getopt::Long; - my $lib_version; --my %MakeParams = (); - --%MakeParams = InitMakeParams(); -- --WriteMakefile(%MakeParams); -+WriteMakefile(InitMakeParams()); - - Check_Version(); - -diff --git a/perl/agent/Makefile.PL b/perl/agent/Makefile.PL -index 4f7bee3..003c0d1 100644 ---- a/perl/agent/Makefile.PL -+++ b/perl/agent/Makefile.PL -@@ -3,11 +3,8 @@ require 5; - use Config; - use Getopt::Long; - my $lib_version; --my %MakeParams = (); - --%MakeParams = InitMakeParams(); -- --WriteMakefile(%MakeParams); -+WriteMakefile(InitMakeParams()); - - Check_Version(); - -diff --git a/perl/agent/Support/Makefile.PL b/perl/agent/Support/Makefile.PL -index 48815b6..2325e10 100644 ---- a/perl/agent/Support/Makefile.PL -+++ b/perl/agent/Support/Makefile.PL -@@ -3,14 +3,11 @@ require 5; - use Config; - use Getopt::Long; - my $lib_version; --my %MakeParams = (); - - # See lib/ExtUtils/MakeMaker.pm for details of how to influence - # the contents of the Makefile that is written. - --%MakeParams = InitMakeParams(); -- --WriteMakefile(%MakeParams); -+WriteMakefile(InitMakeParams()); - - Check_Version(); - -diff --git a/perl/agent/default_store/Makefile.PL b/perl/agent/default_store/Makefile.PL -index ed6483a..31cfbee 100644 ---- a/perl/agent/default_store/Makefile.PL -+++ b/perl/agent/default_store/Makefile.PL -@@ -3,11 +3,8 @@ require 5; - use Config; - use Getopt::Long; - my $lib_version; --my %MakeParams = (); - --%MakeParams = InitMakeParams(); -- --WriteMakefile(%MakeParams); -+WriteMakefile(InitMakeParams()); - - Check_Version(); - -diff --git a/perl/default_store/Makefile.PL b/perl/default_store/Makefile.PL -index 7c671b8..01c8dd0 100644 ---- a/perl/default_store/Makefile.PL -+++ b/perl/default_store/Makefile.PL -@@ -3,11 +3,8 @@ require 5; - use Config; - use Getopt::Long; - my $lib_version; --my %MakeParams = (); - --%MakeParams = InitMakeParams(); -- --WriteMakefile(%MakeParams); -+WriteMakefile(InitMakeParams()); - - - sub InitMakeParams { --- -1.9.1 - diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-testing-add-the-output-format-for-ptest.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0003-testing-add-the-output-format-for-ptest.patch index 9fb19b3e07..ab54492934 100644 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-testing-add-the-output-format-for-ptest.patch +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/0003-testing-add-the-output-format-for-ptest.patch @@ -1,4 +1,4 @@ -From 4bb4024b395f19d36ab3569e2773ea80d8cc5261 Mon Sep 17 00:00:00 2001 +From 2a1a2b58af09c6c03026474f1fd0db7d36e977c7 Mon Sep 17 00:00:00 2001 From: Jackie Huang <jackie.huang@windriver.com> Date: Wed, 14 Jan 2015 15:10:06 +0800 Subject: [PATCH] testing: add the output format for ptest @@ -7,14 +7,14 @@ Upstream-Status: Inappropriate [OE specific] Signed-off-by: Jackie Huang <jackie.huang@windriver.com> --- - testing/RUNTESTS | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) + testing/RUNTESTS | 4 ++++ + 1 file changed, 4 insertions(+) diff --git a/testing/RUNTESTS b/testing/RUNTESTS -index e11c969..fb90f76 100755 +index 6715831..a2b6fb8 100755 --- a/testing/RUNTESTS +++ b/testing/RUNTESTS -@@ -25,13 +25,17 @@ failed_count=0 +@@ -17,13 +17,17 @@ failed_count=0 rm -f failed_tests for i in "${srcdir}"/testing/fulltests/default/T*$1*; do echo "RUNNING $i" @@ -33,5 +33,5 @@ index e11c969..fb90f76 100755 if [ -f failed_tests ]; then -- -1.7.1 +2.25.1 diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-config_os_headers-Error-Fix.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0004-config_os_headers-Error-Fix.patch index c6401fed39..e2269bc3e8 100644 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-config_os_headers-Error-Fix.patch +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/0004-config_os_headers-Error-Fix.patch @@ -1,4 +1,4 @@ -From 261a22096c79f8e6ef7b387514a74d208e4e5945 Mon Sep 17 00:00:00 2001 +From b1c941c20577578aa5ff3450d9d8d7a23c55d14a Mon Sep 17 00:00:00 2001 From: Li xin <lixin.fnst@cn.fujitsu.com> Date: Fri, 21 Aug 2015 18:23:13 +0900 Subject: [PATCH] config_os_headers: Error Fix @@ -10,7 +10,7 @@ conftest.c:168:17: fatal error: pkg.h: No such file or directory #include <pkg.h> ^ -Upstream-Status: pending +Upstream-Status: Pending Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> --- @@ -18,10 +18,10 @@ Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.d/config_os_headers b/configure.d/config_os_headers -index 708aa09..0df32ca 100644 +index c0688f8..f68713c 100644 --- a/configure.d/config_os_headers +++ b/configure.d/config_os_headers -@@ -482,8 +482,8 @@ then +@@ -395,8 +395,8 @@ then unset ac_cv_header_pkg_h netsnmp_save_CPPFLAGS="$CPPFLAGS" netsnmp_save_LDFLAGS="$LDFLAGS" @@ -33,5 +33,5 @@ index 708aa09..0df32ca 100644 NETSNMP_SEARCH_LIBS(pkg_init, pkg, AC_DEFINE(HAVE_LIBPKG, 1, [define if you have BSD pkg-ng]))) -- -1.8.4.2 +2.25.1 diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmplib-keytools.c-Don-t-check-for-return-from-EVP_M.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0005-snmplib-keytools.c-Don-t-check-for-return-from-EVP_M.patch index af242fafb2..7a6b35460e 100644 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmplib-keytools.c-Don-t-check-for-return-from-EVP_M.patch +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/0005-snmplib-keytools.c-Don-t-check-for-return-from-EVP_M.patch @@ -1,4 +1,4 @@ -From d3027a227bc0f603a5b650d01f97ee1dec515be5 Mon Sep 17 00:00:00 2001 +From c790411f9aa82064fea9bbf23b499fb6b7f22c4f Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 18 Sep 2015 00:28:45 -0400 Subject: [PATCH] snmplib/keytools.c: Don't check for return from @@ -8,26 +8,30 @@ EVP_MD_CTX_init() API returns void, it fixes errors with new compilers snmplib/keytools.c: In function 'generate_Ku': error: invalid use of void expression +Upstream-Status: Pending + Signed-off-by: Khem Raj <raj.khem@gmail.com> +Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> --- -Upstream-Status: Submitted [https://sourceforge.net/p/net-snmp/patches/1317/] - snmplib/keytools.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) + snmplib/keytools.c | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/snmplib/keytools.c b/snmplib/keytools.c -index 0ccb3a6..880fc14 100644 +index 388e655..5a66898 100644 --- a/snmplib/keytools.c +++ b/snmplib/keytools.c -@@ -153,8 +153,7 @@ generate_Ku(const oid * hashtype, u_int hashtype_len, +@@ -183,10 +183,7 @@ generate_Ku(const oid * hashtype, u_int hashtype_len, ctx = EVP_MD_CTX_create(); #else ctx = malloc(sizeof(*ctx)); -- if (!EVP_MD_CTX_init(ctx)) -- return SNMPERR_GENERR; +- if (!EVP_MD_CTX_init(ctx)) { +- rval = SNMPERR_GENERR; +- goto generate_Ku_quit; +- } + EVP_MD_CTX_init(ctx); #endif - #ifndef NETSNMP_DISABLE_MD5 - if (ISTRANSFORM(hashtype, HMACMD5Auth)) { + if (!EVP_DigestInit(ctx, hashfn)) { + rval = SNMPERR_GENERR; -- -2.5.2 +2.25.1 diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-get_pid_from_inode-Include-limit.h.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0006-get_pid_from_inode-Include-limit.h.patch index 60ce80996d..6a0161ae27 100644 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-get_pid_from_inode-Include-limit.h.patch +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/0006-get_pid_from_inode-Include-limit.h.patch @@ -1,29 +1,29 @@ -From 7136d593ba96b64537069637c328bc65e1b66b2d Mon Sep 17 00:00:00 2001 +From 95868615a04b4a6f0dd5997c9726422828426116 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 22 Jul 2016 18:34:39 +0000 Subject: [PATCH] get_pid_from_inode: Include limit.h PATH_MAX and NAME_MAX are required by this file -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- agent/mibgroup/util_funcs/get_pid_from_inode.c | 1 + 1 file changed, 1 insertion(+) diff --git a/agent/mibgroup/util_funcs/get_pid_from_inode.c b/agent/mibgroup/util_funcs/get_pid_from_inode.c -index 8e157ae..a494ec7 100644 +index 5788e1d..ea380a6 100644 --- a/agent/mibgroup/util_funcs/get_pid_from_inode.c +++ b/agent/mibgroup/util_funcs/get_pid_from_inode.c -@@ -5,6 +5,7 @@ +@@ -6,6 +6,7 @@ #include <net-snmp/output_api.h> #include <ctype.h> +#include <limits.h> #include <stdio.h> - #if HAVE_STDLIB_H + #ifdef HAVE_STDLIB_H #include <stdlib.h> -- -1.8.3.1 +2.25.1 diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0004-configure-fix-incorrect-variable.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0007-configure-fix-incorrect-variable.patch index 2b03f9e9a2..5d394eec14 100644 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/0004-configure-fix-incorrect-variable.patch +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/0007-configure-fix-incorrect-variable.patch @@ -1,7 +1,7 @@ -From 4ad98ef125eb4e7d7a1a93146042002f78254d36 Mon Sep 17 00:00:00 2001 +From 385fa343cf178ccfe2c9a9fd7795d0db3c959fdd Mon Sep 17 00:00:00 2001 From: Wenlin Kang <wenlin.kang@windriver.com> Date: Wed, 24 May 2017 17:10:20 +0800 -Subject: [PATCH 4/4] configure: fix incorrect variable +Subject: [PATCH] configure: fix incorrect variable For cross compile platform, this variable will not be correct, so fix it. @@ -13,10 +13,10 @@ Signed-off-by: Wenlin Kang <wenlin.kang@windriver.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in -index cfcdf73..164df05 100644 +index 1c1182e..f947b8c 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -171,7 +171,7 @@ OTHERCLEANTODOS=perlclean @PYTHONCLEANTARGS@ cleanfeatures perlcleanfeatures pyt +@@ -173,7 +173,7 @@ OTHERCLEANTODOS=perlclean @PYTHONCLEANTARGS@ cleanfeatures perlcleanfeatures pyt # # override LD_RUN_PATH to avoid dependencies on the build directory perlmodules: perlmakefiles subdirs @@ -26,5 +26,5 @@ index cfcdf73..164df05 100644 exit 1 ; \ fi -- -1.9.1 +2.25.1 diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0008-net-snmp-fix-engineBoots-value-on-SIGHUP.patch index efe803876d..a57c4c8f14 100644 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/0008-net-snmp-fix-engineBoots-value-on-SIGHUP.patch @@ -1,34 +1,35 @@ -From e47c60dc7f649959f63e56bc62355de4bdfd73f4 Mon Sep 17 00:00:00 2001 -From: Marian Florea <marian.florea@windriver.com> -Date: Thu, 20 Jul 2017 16:55:24 +0800 +From b5cbe0953a7e7a3c77c7ec69dfe81254475f08c0 Mon Sep 17 00:00:00 2001 +From: Zheng Ruoqin <zhengrq.fnst@fujitsu.com> +Date: Wed, 9 Jun 2021 15:47:30 +0900 Subject: [PATCH] net snmp: fix engineBoots value on SIGHUP Upstream-Status: Pending Signed-off-by: Marian Florea <marian.florea@windriver.com> Signed-off-by: Li Zhou <li.zhou@windriver.com> +Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> --- agent/snmpd.c | 1 + snmplib/snmpv3.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/agent/snmpd.c b/agent/snmpd.c -index 056048a..12a7ea1 100644 +index fe31c87..d9f68dd 100644 --- a/agent/snmpd.c +++ b/agent/snmpd.c -@@ -1246,6 +1246,7 @@ receive(void) - snmp_log(LOG_INFO, "NET-SNMP version %s restarted\n", - netsnmp_get_version()); - update_config(); -+ snmp_store(app_name); - send_easy_trap(SNMP_TRAP_ENTERPRISESPECIFIC, 3); - #if HAVE_SIGHOLD - sigrelse(SIGHUP); +@@ -1169,6 +1169,7 @@ snmpd_reconfig(void) + snmp_log(LOG_INFO, "NET-SNMP version %s restarted\n", + netsnmp_get_version()); + update_config(); ++ snmp_store(app_name); + send_easy_trap(SNMP_TRAP_ENTERPRISESPECIFIC, 3); + #ifdef HAVE_SIGPROCMASK + ret = sigprocmask(SIG_UNBLOCK, &set, NULL); diff --git a/snmplib/snmpv3.c b/snmplib/snmpv3.c -index 435cafd..6ad8208 100644 +index be9256f..d17d2e3 100644 --- a/snmplib/snmpv3.c +++ b/snmplib/snmpv3.c -@@ -984,9 +984,9 @@ init_snmpv3_post_config(int majorid, int minorid, void *serverarg, +@@ -1071,9 +1071,9 @@ init_snmpv3_post_config(int majorid, int minorid, void *serverarg, /* * if our engineID has changed at all, the boots record must be set to 1 */ @@ -41,5 +42,5 @@ index 435cafd..6ad8208 100644 } -- -1.9.1 +2.25.1 diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-fix-for-disable-des.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0009-net-snmp-fix-for-disable-des.patch index 25eb9c96ff..36a676fb02 100644 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-fix-for-disable-des.patch +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/0009-net-snmp-fix-for-disable-des.patch @@ -1,4 +1,4 @@ -From 270e952f58a7e5ddeabe5a15e3ddaaadf40017d0 Mon Sep 17 00:00:00 2001 +From aa1f157c675da248ed186e020d17cb2528d0be12 Mon Sep 17 00:00:00 2001 From: Jackie Huang <jackie.huang@windriver.com> Date: Thu, 22 Jun 2017 10:25:08 +0800 Subject: [PATCH] net-snmp: fix for --disable-des @@ -14,10 +14,10 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com> 1 file changed, 2 insertions(+) diff --git a/snmplib/scapi.c b/snmplib/scapi.c -index 16ac829..271684b 100644 +index ac77004..7545bfa 100644 --- a/snmplib/scapi.c +++ b/snmplib/scapi.c -@@ -79,7 +79,9 @@ netsnmp_feature_child_of(usm_scapi, usm_support) +@@ -86,7 +86,9 @@ netsnmp_feature_child_of(usm_scapi, usm_support); #include <openssl/hmac.h> #include <openssl/evp.h> #include <openssl/rand.h> @@ -28,5 +28,5 @@ index 16ac829..271684b 100644 #include <openssl/aes.h> #endif -- -2.11.0 +2.25.1 diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0010-net-snmp-Reproducibility-Don-t-check-build-host-for.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0010-net-snmp-Reproducibility-Don-t-check-build-host-for.patch new file mode 100644 index 0000000000..246ce2b8d9 --- /dev/null +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/0010-net-snmp-Reproducibility-Don-t-check-build-host-for.patch @@ -0,0 +1,34 @@ +From a96140995d10660046146d9fa75faa5f7faabab0 Mon Sep 17 00:00:00 2001 +From: "douglas.royds" <douglas.royds@taitradio.com> +Date: Wed, 21 Nov 2018 13:52:18 +1300 +Subject: [PATCH] net-snmp: Reproducibility: Don't check build host for + +Reproducible build: Don't check for /etc/printcap on the build machine when +cross-compiling. Use AC_CHECK_FILE to set the cached variable +ac_cv_file__etc_printcap instead. When cross-compiling, this variable should be +set in the environment to "yes" or "no" as appropriate for the target platform. + +Upstream-Status: Pending +--- + configure.d/config_os_misc4 | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.d/config_os_misc4 b/configure.d/config_os_misc4 +index 4c445d6..099257f 100644 +--- a/configure.d/config_os_misc4 ++++ b/configure.d/config_os_misc4 +@@ -99,9 +99,9 @@ if test x$LPSTAT_PATH != x; then + [Path to the lpstat command]) + AC_DEFINE(HAVE_LPSTAT, 1, [Set if the lpstat command is available]) + fi +-if test -r /etc/printcap; then ++AC_CHECK_FILE([/etc/printcap], + AC_DEFINE(HAVE_PRINTCAP, 1, [Set if /etc/printcap exists]) +-fi ++) + + + # Check ps args +-- +2.25.1 + diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0011-ac_add_search_path.m4-keep-consistent-between-32bit-.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0011-ac_add_search_path.m4-keep-consistent-between-32bit-.patch new file mode 100644 index 0000000000..1e845c4e63 --- /dev/null +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/0011-ac_add_search_path.m4-keep-consistent-between-32bit-.patch @@ -0,0 +1,40 @@ +From 85a6c5017a2cd18a5a66afcb3f6a02276c101ad0 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Fri, 29 Jan 2021 08:49:15 +0000 +Subject: [PATCH] ac_add_search_path.m4: keep consistent between 32bit and + 64bit + +With configure option "--with-openssl=${STAGING_EXECPREFIXDIR}", it behaves +differently between 32bit and 64bit system as the openssl lib resides under +/build/tmp/work/corei7-64-wrs-linux/net-snmp/5.9-r0/recipe-sysroot/usr/lib64 +for 64bit system, but resides under [1] for 32bit system. + +So add the patch to fix the gap between 32bit and 64bit system. + +[1] /build/tmp/work/corei7-64-wrs-linux/net-snmp/5.9-r0/recipe-sysroot/usr/lib + +Upstream-Status: Inappropriate [configuration specific] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + m4/ac_add_search_path.m4 | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/m4/ac_add_search_path.m4 b/m4/ac_add_search_path.m4 +index 8e0a819..e9585bc 100644 +--- a/m4/ac_add_search_path.m4 ++++ b/m4/ac_add_search_path.m4 +@@ -3,8 +3,8 @@ dnl Add a search path to the LIBS and CPPFLAGS variables + dnl + AC_DEFUN([AC_ADD_SEARCH_PATH],[ + if test "x$1" != x -a -d $1; then +- if test -d $1/lib; then +- LDFLAGS="-L$1/lib $LDFLAGS" ++ if test -d $1/${libdir:5}; then ++ LDFLAGS="-L$1/${libdir:5} $LDFLAGS" + fi + if test -d $1/include; then + CPPFLAGS="-I$1/include $CPPFLAGS" +-- +2.25.1 + diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0012-Fix-configuration-of-NETSNMP_FD_MASK_TYPE.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0012-Fix-configuration-of-NETSNMP_FD_MASK_TYPE.patch new file mode 100644 index 0000000000..9d4b769930 --- /dev/null +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/0012-Fix-configuration-of-NETSNMP_FD_MASK_TYPE.patch @@ -0,0 +1,43 @@ +From 21ea0b9ce5cc9445f7ffd7a9020b816681e16284 Mon Sep 17 00:00:00 2001 +From: Adam Gajda <adgajda@users.noreply.github.com> +Date: Mon, 2 Oct 2023 16:40:31 +0200 +Subject: [PATCH] Fix configuration of NETSNMP_FD_MASK_TYPE + +Upstream-Status: Backport +[https://github.com/net-snmp/net-snmp/commit/af1b7f77975bbb2fcbdb3f005f8cb010d1d33cd3] + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + configure | 2 +- + configure.d/config_project_types | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index 907d441..f4468c6 100755 +--- a/configure ++++ b/configure +@@ -31638,7 +31638,7 @@ CFLAGS="$CFLAGS -Werror" + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the type of fd_set::fds_bits" >&5 + printf %s "checking for the type of fd_set::fds_bits... " >&6; } +-for type in __fd_mask __int32_t unknown; do ++for type in __fd_mask __int32_t long\ int unknown; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +diff --git a/configure.d/config_project_types b/configure.d/config_project_types +index 1b4c66b..a78e8eb 100644 +--- a/configure.d/config_project_types ++++ b/configure.d/config_project_types +@@ -66,7 +66,7 @@ netsnmp_save_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS -Werror" + + AC_MSG_CHECKING([for the type of fd_set::fds_bits]) +-for type in __fd_mask __int32_t unknown; do ++for type in __fd_mask __int32_t long\ int unknown; do + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ + #include <sys/select.h> + #include <stddef.h> +-- +2.25.1 + diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/dont-return-incompletely-parsed-varbinds.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/dont-return-incompletely-parsed-varbinds.patch deleted file mode 100644 index 6bd0f93c4b..0000000000 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/dont-return-incompletely-parsed-varbinds.patch +++ /dev/null @@ -1,131 +0,0 @@ -From 6b93e686bdb6a908d00595608646a05527a5326b Mon Sep 17 00:00:00 2001 -From: Li xin <lixin.fnst@cn.fujitsu.com> -Date: Fri, 21 Aug 2015 12:39:12 +0900 -Subject: [PATCH] the snmp_pdu_parse() function could leave incompletely parsed - varBind variables in the list of variables in case the parsing of the SNMP - PDU failed. If later processing tries to operate on the stale and - incompletely processed varBind (e.g. when printing the variables), this can - lead to e.g. crashes or, possibly, execution of arbitrary code - -Upstream-Status: Backport [net-snmp] - -Written-by: Robert Story ---- - snmplib/snmp_api.c | 53 ++++++++++++++++++++++++++++------------------------- - 1 file changed, 28 insertions(+), 25 deletions(-) - -diff --git a/snmplib/snmp_api.c b/snmplib/snmp_api.c -index 191debf..15a2d39 100644 ---- a/snmplib/snmp_api.c -+++ b/snmplib/snmp_api.c -@@ -4350,10 +4350,9 @@ snmp_pdu_parse(netsnmp_pdu *pdu, u_char * data, size_t * length) - u_char type; - u_char msg_type; - u_char *var_val; -- int badtype = 0; - size_t len; - size_t four; -- netsnmp_variable_list *vp = NULL; -+ netsnmp_variable_list *vp = NULL, *vplast = NULL; - oid objid[MAX_OID_LEN]; - u_char *p; - -@@ -4493,31 +4492,17 @@ snmp_pdu_parse(netsnmp_pdu *pdu, u_char * data, size_t * length) - (ASN_SEQUENCE | ASN_CONSTRUCTOR), - "varbinds"); - if (data == NULL) -- return -1; -+ goto fail; - - /* - * get each varBind sequence - */ - while ((int) *length > 0) { -- netsnmp_variable_list *vptemp; -- vptemp = (netsnmp_variable_list *) malloc(sizeof(*vptemp)); -- if (NULL == vptemp) { -- return -1; -- } -- if (NULL == vp) { -- pdu->variables = vptemp; -- } else { -- vp->next_variable = vptemp; -- } -- vp = vptemp; -+ vp = SNMP_MALLOC_TYPEDEF(netsnmp_variable_list); -+ if (NULL == vp) -+ goto fail; - -- vp->next_variable = NULL; -- vp->val.string = NULL; - vp->name_length = MAX_OID_LEN; -- vp->name = NULL; -- vp->index = 0; -- vp->data = NULL; -- vp->dataFreeHook = NULL; - DEBUGDUMPSECTION("recv", "VarBind"); - data = snmp_parse_var_op(data, objid, &vp->name_length, &vp->type, - &vp->val_len, &var_val, length); -@@ -4604,7 +4589,7 @@ snmp_pdu_parse(netsnmp_pdu *pdu, u_char * data, size_t * length) - vp->val.string = (u_char *) malloc(vp->val_len); - } - if (vp->val.string == NULL) { -- return -1; -+ goto fail; - } - p = asn_parse_string(var_val, &len, &vp->type, vp->val.string, - &vp->val_len); -@@ -4619,7 +4604,7 @@ snmp_pdu_parse(netsnmp_pdu *pdu, u_char * data, size_t * length) - vp->val_len *= sizeof(oid); - vp->val.objid = (oid *) malloc(vp->val_len); - if (vp->val.objid == NULL) { -- return -1; -+ goto fail; - } - memmove(vp->val.objid, objid, vp->val_len); - break; -@@ -4631,7 +4616,7 @@ snmp_pdu_parse(netsnmp_pdu *pdu, u_char * data, size_t * length) - case ASN_BIT_STR: - vp->val.bitstring = (u_char *) malloc(vp->val_len); - if (vp->val.bitstring == NULL) { -- return -1; -+ goto fail; - } - p = asn_parse_bitstring(var_val, &len, &vp->type, - vp->val.bitstring, &vp->val_len); -@@ -4640,12 +4625,30 @@ snmp_pdu_parse(netsnmp_pdu *pdu, u_char * data, size_t * length) - break; - default: - snmp_log(LOG_ERR, "bad type returned (%x)\n", vp->type); -- badtype = -1; -+ goto fail; - break; - } - DEBUGINDENTADD(-4); -+ -+ if (NULL == vplast) { -+ pdu->variables = vp; -+ } else { -+ vplast->next_variable = vp; -+ } -+ vplast = vp; -+ vp = NULL; -+ - } -- return badtype; -+ return 0; -+ -+ fail: -+ DEBUGMSGTL(("recv", "error while parsing VarBindList\n")); -+ /** if we were parsing a var, remove it from the pdu and free it */ -+ if (vp) -+ snmp_free_var(vp); -+ -+ return -1; -+ - } - - /* --- -1.8.4.2 - diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-agentx-crash.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-agentx-crash.patch deleted file mode 100644 index 5eed893e18..0000000000 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-agentx-crash.patch +++ /dev/null @@ -1,75 +0,0 @@ -Description: fix snmpd crash via AgentX connection - - taken from Fedora, net-snmp-5.7-agentx-crash.patch - -bz729738 - net-snmp dumps core in netsnmp_oid_find_prefix -bz1038011 - net-snmp: snmpd crashes/hangs when AgentX subagent times-out - -commit f9304c83f76202db0e684269ca1af32e43cd9db4 -Author: Jan Safranek <jsafranek@users.sourceforge.net> -Date: Tue Feb 7 14:53:44 2012 +0100 - - CHANGES: PATCH 1633670: fixed snmpd crashing when an AgentX subagent - disconnect in the middle of processing of a request. - - I fixed also the memory leak reported in the tracker comments. - -Upstream-Status: Backport - -Signed-off-by: Zhu Yanjun <yanjun.zhu@windriver.com> -Signed-off-by: Jackie Huang <jackie.huang@windriver.com> - ---- - agent/mibgroup/agentx/master.c | 5 +++++ - agent/mibgroup/agentx/master_admin.c | 9 +++++++-- - 2 files changed, 12 insertions(+), 2 deletions(-) - -diff --git a/agent/mibgroup/agentx/master.c b/agent/mibgroup/agentx/master.c -index c42a42a..baeebaf 100644 ---- a/agent/mibgroup/agentx/master.c -+++ b/agent/mibgroup/agentx/master.c -@@ -219,6 +219,9 @@ agentx_got_response(int operation, - if (!cache) { - DEBUGMSGTL(("agentx/master", "response too late on session %8p\n", - session)); -+ /* response is too late, free the cache */ -+ if (magic) -+ netsnmp_free_delegated_cache((netsnmp_delegated_cache*) magic); - return 0; - } - requests = cache->requests; -@@ -606,6 +609,8 @@ agentx_master_handler(netsnmp_mib_handler *handler, - result = snmp_async_send(ax_session, pdu, agentx_got_response, cb_data); - if (result == 0) { - snmp_free_pdu(pdu); -+ if (cb_data) -+ netsnmp_free_delegated_cache((netsnmp_delegated_cache*) cb_data); - } - - return SNMP_ERR_NOERROR; -diff --git a/agent/mibgroup/agentx/master_admin.c b/agent/mibgroup/agentx/master_admin.c -index f16f392..b84b85e 100644 ---- a/agent/mibgroup/agentx/master_admin.c -+++ b/agent/mibgroup/agentx/master_admin.c -@@ -133,11 +133,16 @@ close_agentx_session(netsnmp_session * session, int sessid) - * requests, so that the delegated request will be completed and - * further requests can be processed - */ -- netsnmp_remove_delegated_requests_for_session(session); -+ while (netsnmp_remove_delegated_requests_for_session(session)) { -+ DEBUGMSGTL(("agentx/master", "Continue removing delegated reqests\n")); -+ } -+ - if (session->subsession != NULL) { - netsnmp_session *subsession = session->subsession; - for(; subsession; subsession = subsession->next) { -- netsnmp_remove_delegated_requests_for_session(subsession); -+ while (netsnmp_remove_delegated_requests_for_session(subsession)) { -+ DEBUGMSGTL(("agentx/master", "Continue removing delegated subsession reqests\n")); -+ } - } - } - --- -2.7.4 - diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/run-ptest b/meta-networking/recipes-protocols/net-snmp/net-snmp/run-ptest index 2334217bc0..76514c202e 100755..100644 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/run-ptest +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/run-ptest @@ -1,4 +1,5 @@ #!/bin/sh -cd testing +workdir=$(dirname `realpath $0`) +cd ${workdir}/testing ./RUNTESTS diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/systemd-support.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/systemd-support.patch deleted file mode 100644 index c6af8c0f33..0000000000 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/systemd-support.patch +++ /dev/null @@ -1,1652 +0,0 @@ -From 0cad0c6c36af2a2d589563804c9ed2b37b7085fb Mon Sep 17 00:00:00 2001 -From: Li xin <lixin.fnst@cn.fujitsu.com> -Date: Fri, 21 Aug 2015 14:37:02 +0900 -Subject: [PATCH] ystemd support backported from the master branch as of - 23/04/2012 (post 5.7.1, pre 5.8). - -The following commits have been cherry-picked: - -19499c3c90bf9d7b2b9e5d08baa26cc6bba28a11 -fef6cddfdb94da1a6b1fb768af62918b80f11fd3 -0641e43c694c485cbbffef0556efc4641bd3ff50 -76530a89f1c8bbd0b63acce63e10d5d4812a1a16 (conflict resolved) -bf108d7f1354f6276fc43c129963f2c49b9fc242 -3692875172352f72cf3afd0d35f355e83d7e421b -74412748067c685e1d8ab6ed3bcc3ca9c2774844 -86132e3f1e6ef7b4e0b96d8fa24e37c81b71b0e0 -63557cf8986a33dba1d4429b583a901361052c4f - -Upstream-Status: Backport - -Signed-off-by: Thomas Fitzsimmons <fitzsim@cisco.com> ---- - README.systemd | 41 +++ - agent/snmpd.c | 33 +- - apps/snmptrapd.c | 32 +- - configure.d/config_modules_lib | 8 + - configure.d/config_project_with_enable | 9 + - dist/snmpd.servic | 18 + - dist/snmpd.socket | 17 + - dist/snmptrapd.service | 16 + - dist/snmptrapd.socket | 14 + - include/net-snmp/library/sd-daemon.h | 290 ++++++++++++++++ - snmplib/sd-daemon.c | 532 +++++++++++++++++++++++++++++ - snmplib/transports/snmpTCPDomain.c | 43 ++- - snmplib/transports/snmpTCPIPv6Domain.c | 46 ++- - snmplib/transports/snmpUDPIPv4BaseDomain.c | 33 +- - snmplib/transports/snmpUDPIPv6Domain.c | 34 +- - snmplib/transports/snmpUnixDomain.c | 66 ++-- - win32/libsnmp/Makefile.in | 6 + - win32/net-snmp/net-snmp-config.h | 2 + - win32/net-snmp/net-snmp-config.h.in | 2 + - 19 files changed, 1176 insertions(+), 66 deletions(-) - create mode 100644 README.systemd - create mode 100644 dist/snmpd.servic - create mode 100644 dist/snmpd.socket - create mode 100644 dist/snmptrapd.service - create mode 100644 dist/snmptrapd.socket - create mode 100644 include/net-snmp/library/sd-daemon.h - create mode 100644 snmplib/sd-daemon.c - -diff --git a/README.systemd b/README.systemd -new file mode 100644 -index 0000000..dba15d1 ---- /dev/null -+++ b/README.systemd -@@ -0,0 +1,41 @@ -+README.systemd -+-------------- -+Net-SNMP provides two daemons, which support systemd system manager. -+See http://www.freedesktop.org/wiki/Software/systemd to learn how -+systemd works. Both socket activation and notification is supported by these -+daemons. -+ -+To enable systemd support, the sources must be compiled with -+--with-systemd configure option. -+ -+snmpd - The SNMP agent -+---------------------- -+Socket activation od snmpd daemon is implemented, but it's discouraged. -+The reason is simple - snmpd not only listens and processes SNMP requests -+from network, but also gathers system statistics counters, sends traps and -+communicates with subagents. It even opens few netlink sockets. -+ -+In other words, snmpd should run from system start to properly work. -+This can be done in two ways: -+1) either as snmpd service unit with 'Type=notification' and without a socket -+ unit -+2) or as snmpd service unit with 'Type=simple', appropriate socket socket unit -+ and the snmpd service enabled. This way systemd creates the snmpd listening -+ socket early during boot and passes the sockets to snmpd slightly later -+ (but still during machine boot). This way systemd can paralelize start of -+ services, which depend on snmpd. Admins must adjust the socket file manually, -+ depending if the snmpd support AgentX, IPv6, SMUX etc. -+ -+snmpd should be started with '-f' command line parameter to disable forking - -+systemd does that for us automatically. -+ -+ -+snmptrapd - The trap processing daemon -+-------------------------------------- -+snmptrapd supports full socket activation and also notification (if needed). -+Both 'Type=simple' (with appropriate socket unit) and 'Type=notify' services -+will work. Again, '-f' parameter should be provided on snmptrapd command line. -+ -+If integration with SNMP agent using AgentX protocol is enabled, snmptrapd should -+start during boot and not after first SNMP trap arrives. Same rules as for snmpd -+applies then. -diff --git a/agent/snmpd.c b/agent/snmpd.c -index cfc7bce..116ee5c 100644 ---- a/agent/snmpd.c -+++ b/agent/snmpd.c -@@ -164,6 +164,10 @@ typedef long fd_mask; - - #endif - -+#ifndef NETSNMP_NO_SYSTEMD -+#include <net-snmp/library/sd-daemon.h> -+#endif -+ - netsnmp_feature_want(logging_file) - netsnmp_feature_want(logging_stdio) - netsnmp_feature_want(logging_syslog) -@@ -443,19 +447,29 @@ main(int argc, char *argv[]) - int agent_mode = -1; - char *pid_file = NULL; - char option_compatability[] = "-Le"; -+#ifndef WIN32 -+ int prepared_sockets = 0; -+#endif - #if HAVE_GETPID - int fd; - FILE *PID; - #endif - - #ifndef WIN32 -+#ifndef NETSNMP_NO_SYSTEMD -+ /* check if systemd has sockets for us and don't close them */ -+ prepared_sockets = netsnmp_sd_listen_fds(0); -+#endif /* NETSNMP_NO_SYSTEMD */ -+ - /* - * close all non-standard file descriptors we may have - * inherited from the shell. - */ -- for (i = getdtablesize() - 1; i > 2; --i) { -- (void) close(i); -- } -+ if (!prepared_sockets) { -+ for (i = getdtablesize() - 1; i > 2; --i) { -+ (void) close(i); -+ } -+} - #endif /* #WIN32 */ - - /* -@@ -1107,6 +1121,19 @@ main(int argc, char *argv[]) - netsnmp_addrcache_initialise(); - - /* -+ * Let systemd know we're up. -+ */ -+#ifndef NETSNMP_NO_SYSTEMD -+ netsnmp_sd_notify(1, "READY=1\n"); -+ if (prepared_sockets) -+ /* -+ * Clear the environment variable, we already processed all the sockets -+ * by now. -+ */ -+ netsnmp_sd_listen_fds(1); -+#endif -+ -+ /* - * Forever monitor the dest_port for incoming PDUs. - */ - DEBUGMSGTL(("snmpd/main", "We're up. Starting to process data.\n")); -diff --git a/apps/snmptrapd.c b/apps/snmptrapd.c -index bce0d47..c6a74ec 100644 ---- a/apps/snmptrapd.c -+++ b/apps/snmptrapd.c -@@ -125,6 +125,10 @@ SOFTWARE. - - #include <net-snmp/net-snmp-features.h> - -+#ifndef NETSNMP_NO_SYSTEMD -+#include <net-snmp/library/sd-daemon.h> -+#endif -+ - #ifndef BSD4_3 - #define BSD4_2 - #endif -@@ -657,16 +661,25 @@ main(int argc, char *argv[]) - int agentx_subagent = 1; - #endif - netsnmp_trapd_handler *traph; -+#ifndef WIN32 -+ int prepared_sockets = 0; -+#endif - - - #ifndef WIN32 -+#ifndef NETSNMP_NO_SYSTEMD -+ /* check if systemd has sockets for us and don't close them */ -+ prepared_sockets = netsnmp_sd_listen_fds(0); -+#endif - /* - * close all non-standard file descriptors we may have - * inherited from the shell. - */ -- for (i = getdtablesize() - 1; i > 2; --i) { -- (void) close(i); -- } -+ if (!prepared_sockets) { -+ for (i = getdtablesize() - 1; i > 2; --i) { -+ (void) close(i); -+ } -+} - #endif /* #WIN32 */ - - #ifdef SIGTERM -@@ -1318,6 +1331,19 @@ main(int argc, char *argv[]) - #endif - #endif - -+ /* -+ * Let systemd know we're up. -+ */ -+#ifndef NETSNMP_NO_SYSTEMD -+ netsnmp_sd_notify(1, "READY=1\n"); -+ if (prepared_sockets) -+ /* -+ * Clear the environment variable, we already processed all the sockets -+ * by now. -+ */ -+ netsnmp_sd_listen_fds(1); -+#endif -+ - #ifdef WIN32SERVICE - trapd_status = SNMPTRAPD_RUNNING; - #endif -diff --git a/configure.d/config_modules_lib b/configure.d/config_modules_lib -index 362ba0a..bb69daa 100644 ---- a/configure.d/config_modules_lib -+++ b/configure.d/config_modules_lib -@@ -53,6 +53,14 @@ if test "x$PARTIALTARGETOS" = "xmingw32" -o "x$PARTIALTARGETOS" = "xmingw32msvc" - other_ftobjs_list="$other_ftobjs_list winpipe.ft" - fi - -+# Linux systemd -+if test "x$with_systemd" == "xyes"; then -+ other_src_list="$other_src_list sd-daemon.c" -+ other_objs_list="$other_objs_list sd-daemon.o" -+ other_lobjs_list="$other_lobjs_list sd-daemon.lo" -+ other_ftobjs_list="$other_ftobjs_list sd-daemon.ft" -+fi -+ - AC_SUBST(other_src_list) - AC_SUBST(other_objs_list) - AC_SUBST(other_lobjs_list) -diff --git a/configure.d/config_project_with_enable b/configure.d/config_project_with_enable -index 61ba026..d782d12 100644 ---- a/configure.d/config_project_with_enable -+++ b/configure.d/config_project_with_enable -@@ -690,6 +690,15 @@ if test "x$with_dummy_values" != "xyes"; then - data for]) - fi - -+NETSNMP_ARG_WITH(systemd, -+[ --with-systemd Provide systemd support. See README.systemd -+ for details.]) -+# Define unless specifically suppressed (i.e., option defaults to false). -+if test "x$with_systemd" != "xyes"; then -+ AC_DEFINE(NETSNMP_NO_SYSTEMD, 1, -+ [If you don't want to integrate with systemd.]) -+fi -+ - NETSNMP_ARG_ENABLE(set-support, - [ --disable-set-support Do not allow SNMP set requests.]) - if test "x$enable_set_support" = "xno"; then -diff --git a/dist/snmpd.servic b/dist/snmpd.servic -new file mode 100644 -index 0000000..31391e5 ---- /dev/null -+++ b/dist/snmpd.servic -@@ -0,0 +1,18 @@ -+# -+# SNMP agent service file for systemd -+# -+# -+# The service should be enabled, i.e. snmpd should start during machine boot. -+# Socket activation shall not be used. See README.systemd for details. -+ -+[Unit] -+Description=Simple Network Management Protocol (SNMP) daemon. -+After=syslog.target network.target -+ -+[Service] -+# Type=notify is also supported. It should be set when snmpd.socket is not used. -+Type=simple -+ExecStart=/usr/sbin/snmpd -f -+ -+[Install] -+WantedBy=multi-user.target -diff --git a/dist/snmpd.socket b/dist/snmpd.socket -new file mode 100644 -index 0000000..7f3a2d9 ---- /dev/null -+++ b/dist/snmpd.socket -@@ -0,0 +1,17 @@ -+[Unit] -+Description=Socket listening for SNMP and AgentX messages -+ -+[Socket] -+ListenDatagram=0.0.0.0:161 -+# Uncomment other listening addresses as needed - TCP, UDP6, TCP6. -+# It must match listening addresses/ports defined in snmpd.service -+# or snmpd.conf. -+# ListenStream=0.0.0.0:161 -+# ListenDatagram=[::]:161 -+# ListenStream=[::]:161 -+# -+# Uncomment AgentX socket if snmpd.conf enables AgentX protocol. -+# ListenStream=/var/agentx/master -+ -+[Install] -+WantedBy=sockets.target -diff --git a/dist/snmptrapd.service b/dist/snmptrapd.service -new file mode 100644 -index 0000000..e88a5b4 ---- /dev/null -+++ b/dist/snmptrapd.service -@@ -0,0 +1,16 @@ -+# -+# SNMP trap-processing service file for systemd -+# -+ -+[Unit] -+Description=Simple Network Management Protocol (SNMP) Trap daemon. -+After=syslog.target network.target -+ -+[Service] -+# Type=notify is also supported. It should be set when snmptrapd.socket is not -+# used. -+Type=simple -+ExecStart=/usr/sbin/snmptrapd -f -+ -+[Install] -+WantedBy=multi-user.target -diff --git a/dist/snmptrapd.socket b/dist/snmptrapd.socket -new file mode 100644 -index 0000000..2d24fb8 ---- /dev/null -+++ b/dist/snmptrapd.socket -@@ -0,0 +1,14 @@ -++[Unit] -++Description=Socket listening for SNMP trap messages -++ -++[Socket] -++ListenDatagram=0.0.0.0:162 -++# Uncomment other listening addresses as needed - TCP, UDP6, TCP6. -++# It must match listening addresses/ports defined in snmptrapd.service -++# or snmptrapd.conf. -++# ListenStream=0.0.0.0:162 -++# ListenDatagram=[::]:162 -++# ListenStream=[::]:162 -++ -++[Install] -++WantedBy=sockets.target -diff --git a/include/net-snmp/library/sd-daemon.h b/include/net-snmp/library/sd-daemon.h -new file mode 100644 -index 0000000..85274c9 ---- /dev/null -+++ b/include/net-snmp/library/sd-daemon.h -@@ -0,0 +1,290 @@ -+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ -+ -+#ifndef SNMPD_SD_DAEMON_H -+#define SNMPD_SD_DAEMON_H -+ -+/*** -+ Copyright 2010 Lennart Poettering -+ -+ Permission is hereby granted, free of charge, to any person -+ obtaining a copy of this software and associated documentation files -+ (the "Software"), to deal in the Software without restriction, -+ including without limitation the rights to use, copy, modify, merge, -+ publish, distribute, sublicense, and/or sell copies of the Software, -+ and to permit persons to whom the Software is furnished to do so, -+ subject to the following conditions: -+ -+ The above copyright notice and this permission notice shall be -+ included in all copies or substantial portions of the Software. -+ -+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS -+ BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN -+ ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -+ SOFTWARE. -+***/ -+ -+#ifdef HAVE_SYS_TYPES_H -+#include <sys/types.h> -+#endif -+#ifdef HAVE_INTTYPES_H -+#include <inttypes.h> -+#endif -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+/* -+ Reference implementation of a few systemd related interfaces for -+ writing daemons. These interfaces are trivial to implement. To -+ simplify porting we provide this reference implementation. -+ Applications are welcome to reimplement the algorithms described -+ here if they do not want to include these two source files. -+ -+ The following functionality is provided: -+ -+ - Support for logging with log levels on stderr -+ - File descriptor passing for socket-based activation -+ - Daemon startup and status notification -+ - Detection of systemd boots -+ -+ You may compile this with -DDISABLE_SYSTEMD to disable systemd -+ support. This makes all those calls NOPs that are directly related to -+ systemd (i.e. only sd_is_xxx() will stay useful). -+ -+ Since this is drop-in code we don't want any of our symbols to be -+ exported in any case. Hence we declare hidden visibility for all of -+ them. -+ -+ You may find an up-to-date version of these source files online: -+ -+ http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.h -+ http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.c -+ -+ This should compile on non-Linux systems, too, but with the -+ exception of the sd_is_xxx() calls all functions will become NOPs. -+ -+ See sd-daemon(7) for more information. -+*/ -+ -+#ifndef _sd_printf_attr_ -+#if __GNUC__ >= 4 -+#define _sd_printf_attr_(a,b) __attribute__ ((format (printf, a, b))) -+#else -+#define _sd_printf_attr_(a,b) -+#endif -+#endif -+ -+/* -+ Log levels for usage on stderr: -+ -+ fprintf(stderr, SD_NOTICE "Hello World!\n"); -+ -+ This is similar to printk() usage in the kernel. -+*/ -+#define SD_EMERG "<0>" /* system is unusable */ -+#define SD_ALERT "<1>" /* action must be taken immediately */ -+#define SD_CRIT "<2>" /* critical conditions */ -+#define SD_ERR "<3>" /* error conditions */ -+#define SD_WARNING "<4>" /* warning conditions */ -+#define SD_NOTICE "<5>" /* normal but significant condition */ -+#define SD_INFO "<6>" /* informational */ -+#define SD_DEBUG "<7>" /* debug-level messages */ -+ -+/* The first passed file descriptor is fd 3 */ -+#define SD_LISTEN_FDS_START 3 -+ -+/* -+ Returns how many file descriptors have been passed, or a negative -+ errno code on failure. Optionally, removes the $LISTEN_FDS and -+ $LISTEN_PID file descriptors from the environment (recommended, but -+ problematic in threaded environments). If r is the return value of -+ this function you'll find the file descriptors passed as fds -+ SD_LISTEN_FDS_START to SD_LISTEN_FDS_START+r-1. Returns a negative -+ errno style error code on failure. This function call ensures that -+ the FD_CLOEXEC flag is set for the passed file descriptors, to make -+ sure they are not passed on to child processes. If FD_CLOEXEC shall -+ not be set, the caller needs to unset it after this call for all file -+ descriptors that are used. -+ -+ See sd_listen_fds(3) for more information. -+*/ -+int netsnmp_sd_listen_fds(int unset_environment); -+ -+/* -+ Helper call for identifying a passed file descriptor. Returns 1 if -+ the file descriptor is a FIFO in the file system stored under the -+ specified path, 0 otherwise. If path is NULL a path name check will -+ not be done and the call only verifies if the file descriptor -+ refers to a FIFO. Returns a negative errno style error code on -+ failure. -+ -+ See sd_is_fifo(3) for more information. -+*/ -+int netsnmp_sd_is_fifo(int fd, const char *path); -+ -+/* -+ Helper call for identifying a passed file descriptor. Returns 1 if -+ the file descriptor is a special character device on the file -+ system stored under the specified path, 0 otherwise. -+ If path is NULL a path name check will not be done and the call -+ only verifies if the file descriptor refers to a special character. -+ Returns a negative errno style error code on failure. -+ -+ See sd_is_special(3) for more information. -+*/ -+int netsnmp_sd_is_special(int fd, const char *path); -+ -+/* -+ Helper call for identifying a passed file descriptor. Returns 1 if -+ the file descriptor is a socket of the specified family (AF_INET, -+ ...) and type (SOCK_DGRAM, SOCK_STREAM, ...), 0 otherwise. If -+ family is 0 a socket family check will not be done. If type is 0 a -+ socket type check will not be done and the call only verifies if -+ the file descriptor refers to a socket. If listening is > 0 it is -+ verified that the socket is in listening mode. (i.e. listen() has -+ been called) If listening is == 0 it is verified that the socket is -+ not in listening mode. If listening is < 0 no listening mode check -+ is done. Returns a negative errno style error code on failure. -+ -+ See sd_is_socket(3) for more information. -+*/ -+int netsnmp_sd_is_socket(int fd, int family, int type, int listening); -+ -+/* -+ Helper call for identifying a passed file descriptor. Returns 1 if -+ the file descriptor is an Internet socket, of the specified family -+ (either AF_INET or AF_INET6) and the specified type (SOCK_DGRAM, -+ SOCK_STREAM, ...), 0 otherwise. If version is 0 a protocol version -+ check is not done. If type is 0 a socket type check will not be -+ done. If port is 0 a socket port check will not be done. The -+ listening flag is used the same way as in sd_is_socket(). Returns a -+ negative errno style error code on failure. -+ -+ See sd_is_socket_inet(3) for more information. -+*/ -+int netsnmp_sd_is_socket_inet(int fd, int family, int type, int listening, uint16_t port); -+ -+/* -+ Helper call for identifying a passed file descriptor. Returns 1 if -+ the file descriptor is an AF_UNIX socket of the specified type -+ (SOCK_DGRAM, SOCK_STREAM, ...) and path, 0 otherwise. If type is 0 -+ a socket type check will not be done. If path is NULL a socket path -+ check will not be done. For normal AF_UNIX sockets set length to -+ 0. For abstract namespace sockets set length to the length of the -+ socket name (including the initial 0 byte), and pass the full -+ socket path in path (including the initial 0 byte). The listening -+ flag is used the same way as in sd_is_socket(). Returns a negative -+ errno style error code on failure. -+ -+ See sd_is_socket_unix(3) for more information. -+*/ -+int netsnmp_sd_is_socket_unix(int fd, int type, int listening, const char *path, size_t length); -+ -+/* -+ Informs systemd about changed daemon state. This takes a number of -+ newline separated environment-style variable assignments in a -+ string. The following variables are known: -+ -+ READY=1 Tells systemd that daemon startup is finished (only -+ relevant for services of Type=notify). The passed -+ argument is a boolean "1" or "0". Since there is -+ little value in signaling non-readiness the only -+ value daemons should send is "READY=1". -+ -+ STATUS=... Passes a single-line status string back to systemd -+ that describes the daemon state. This is free-from -+ and can be used for various purposes: general state -+ feedback, fsck-like programs could pass completion -+ percentages and failing programs could pass a human -+ readable error message. Example: "STATUS=Completed -+ 66% of file system check..." -+ -+ ERRNO=... If a daemon fails, the errno-style error code, -+ formatted as string. Example: "ERRNO=2" for ENOENT. -+ -+ BUSERROR=... If a daemon fails, the D-Bus error-style error -+ code. Example: "BUSERROR=org.freedesktop.DBus.Error.TimedOut" -+ -+ MAINPID=... The main pid of a daemon, in case systemd did not -+ fork off the process itself. Example: "MAINPID=4711" -+ -+ Daemons can choose to send additional variables. However, it is -+ recommended to prefix variable names not listed above with X_. -+ -+ Returns a negative errno-style error code on failure. Returns > 0 -+ if systemd could be notified, 0 if it couldn't possibly because -+ systemd is not running. -+ -+ Example: When a daemon finished starting up, it could issue this -+ call to notify systemd about it: -+ -+ sd_notify(0, "READY=1"); -+ -+ See sd_notifyf() for more complete examples. -+ -+ See sd_notify(3) for more information. -+*/ -+int netsnmp_sd_notify(int unset_environment, const char *state); -+ -+/* -+ Similar to sd_notify() but takes a format string. -+ -+ Example 1: A daemon could send the following after initialization: -+ -+ sd_notifyf(0, "READY=1\n" -+ "STATUS=Processing requests...\n" -+ "MAINPID=%lu", -+ (unsigned long) getpid()); -+ -+ Example 2: A daemon could send the following shortly before -+ exiting, on failure: -+ -+ sd_notifyf(0, "STATUS=Failed to start up: %s\n" -+ "ERRNO=%i", -+ strerror(errno), -+ errno); -+ -+ See sd_notifyf(3) for more information. -+*/ -+int netsnmp_sd_notifyf(int unset_environment, const char *format, ...) _sd_printf_attr_(2,3); -+ -+/* -+ Returns > 0 if the system was booted with systemd. Returns < 0 on -+ error. Returns 0 if the system was not booted with systemd. Note -+ that all of the functions above handle non-systemd boots just -+ fine. You should NOT protect them with a call to this function. Also -+ note that this function checks whether the system, not the user -+ session is controlled by systemd. However the functions above work -+ for both user and system services. -+ -+ See sd_booted(3) for more information. -+*/ -+int netsnmp_sd_booted(void); -+ -+/** -+ * Find an socket with given parameters. See man sd_is_socket_inet for -+ * description of the arguments. -+ * -+ * Returns the file descriptor if it is found, 0 otherwise. -+ */ -+int netsnmp_sd_find_inet_socket(int family, int type, int listening, int port); -+ -+/** -+ * Find an unix socket with given parameters. See man sd_is_socket_unix for -+ * description of the arguments. -+ * -+ * Returns the file descriptor if it is found, 0 otherwise. -+ */ -+int -+netsnmp_sd_find_unix_socket(int type, int listening, const char *path); -+ -+#ifdef __cplusplus -+} -+#endif -+ -+#endif /* SNMPD_SD_DAEMON_H */ -diff --git a/snmplib/sd-daemon.c b/snmplib/sd-daemon.c -new file mode 100644 -index 0000000..42dba29 ---- /dev/null -+++ b/snmplib/sd-daemon.c -@@ -0,0 +1,532 @@ -+/* -+ * Systemd integration parts. -+ * -+ * Most of this file is directly copied from systemd sources. -+ * Changes: -+ * - all functions were renamed to have netsnmp_ prefix -+ * - includes were changed to match Net-SNMP style. -+ * - removed gcc export macros -+ * - removed POSIX message queues -+ */ -+ -+#include <net-snmp/net-snmp-config.h> -+#include <net-snmp/net-snmp-features.h> -+#include <net-snmp/types.h> -+#include <net-snmp/library/snmp_debug.h> -+ -+#ifndef NETSNMP_NO_SYSTEMD -+ -+/*** -+ Copyright 2010 Lennart Poettering -+ -+ Permission is hereby granted, free of charge, to any person -+ obtaining a copy of this software and associated documentation files -+ (the "Software"), to deal in the Software without restriction, -+ including without limitation the rights to use, copy, modify, merge, -+ publish, distribute, sublicense, and/or sell copies of the Software, -+ and to permit persons to whom the Software is furnished to do so, -+ subject to the following conditions: -+ -+ The above copyright notice and this permission notice shall be -+ included in all copies or substantial portions of the Software. -+ -+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS -+ BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN -+ ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -+ SOFTWARE. -+***/ -+ -+#ifndef _GNU_SOURCE -+#define _GNU_SOURCE -+#endif -+ -+#include <sys/types.h> -+#include <sys/stat.h> -+#include <sys/socket.h> -+#include <sys/un.h> -+#include <sys/fcntl.h> -+#include <netinet/in.h> -+#include <stdlib.h> -+#include <errno.h> -+#include <unistd.h> -+#include <string.h> -+#include <stdarg.h> -+#include <stdio.h> -+#include <stddef.h> -+#include <limits.h> -+ -+#include <net-snmp/library/sd-daemon.h> -+ -+int netsnmp_sd_listen_fds(int unset_environment) { -+ -+ int r, fd; -+ const char *e; -+ char *p = NULL; -+ unsigned long l; -+ -+ if (!(e = getenv("LISTEN_PID"))) { -+ r = 0; -+ goto finish; -+ } -+ -+ errno = 0; -+ l = strtoul(e, &p, 10); -+ -+ if (errno != 0) { -+ r = -errno; -+ goto finish; -+ } -+ -+ if (!p || *p || l <= 0) { -+ r = -EINVAL; -+ goto finish; -+ } -+ -+ /* Is this for us? */ -+ if (getpid() != (pid_t) l) { -+ r = 0; -+ goto finish; -+ } -+ -+ if (!(e = getenv("LISTEN_FDS"))) { -+ r = 0; -+ goto finish; -+ } -+ -+ errno = 0; -+ l = strtoul(e, &p, 10); -+ -+ if (errno != 0) { -+ r = -errno; -+ goto finish; -+ } -+ -+ if (!p || *p) { -+ r = -EINVAL; -+ goto finish; -+ } -+ -+ for (fd = SD_LISTEN_FDS_START; fd < SD_LISTEN_FDS_START + (int) l; fd ++) { -+ int flags; -+ -+ if ((flags = fcntl(fd, F_GETFD)) < 0) { -+ r = -errno; -+ goto finish; -+ } -+ -+ if (flags & FD_CLOEXEC) -+ continue; -+ -+ if (fcntl(fd, F_SETFD, flags | FD_CLOEXEC) < 0) { -+ r = -errno; -+ goto finish; -+ } -+ } -+ -+ r = (int) l; -+ -+finish: -+ if (unset_environment) { -+ unsetenv("LISTEN_PID"); -+ unsetenv("LISTEN_FDS"); -+ } -+ -+ return r; -+} -+ -+int netsnmp_sd_is_fifo(int fd, const char *path) { -+ struct stat st_fd; -+ -+ if (fd < 0) -+ return -EINVAL; -+ -+ memset(&st_fd, 0, sizeof(st_fd)); -+ if (fstat(fd, &st_fd) < 0) -+ return -errno; -+ -+ if (!S_ISFIFO(st_fd.st_mode)) -+ return 0; -+ -+ if (path) { -+ struct stat st_path; -+ -+ memset(&st_path, 0, sizeof(st_path)); -+ if (stat(path, &st_path) < 0) { -+ -+ if (errno == ENOENT || errno == ENOTDIR) -+ return 0; -+ -+ return -errno; -+ } -+ -+ return -+ st_path.st_dev == st_fd.st_dev && -+ st_path.st_ino == st_fd.st_ino; -+ } -+ -+ return 1; -+} -+ -+int netsnmp_sd_is_special(int fd, const char *path) { -+ struct stat st_fd; -+ -+ if (fd < 0) -+ return -EINVAL; -+ -+ if (fstat(fd, &st_fd) < 0) -+ return -errno; -+ -+ if (!S_ISREG(st_fd.st_mode) && !S_ISCHR(st_fd.st_mode)) -+ return 0; -+ -+ if (path) { -+ struct stat st_path; -+ -+ if (stat(path, &st_path) < 0) { -+ -+ if (errno == ENOENT || errno == ENOTDIR) -+ return 0; -+ -+ return -errno; -+ } -+ -+ if (S_ISREG(st_fd.st_mode) && S_ISREG(st_path.st_mode)) -+ return -+ st_path.st_dev == st_fd.st_dev && -+ st_path.st_ino == st_fd.st_ino; -+ else if (S_ISCHR(st_fd.st_mode) && S_ISCHR(st_path.st_mode)) -+ return st_path.st_rdev == st_fd.st_rdev; -+ else -+ return 0; -+ } -+ -+ return 1; -+} -+ -+static int sd_is_socket_internal(int fd, int type, int listening) { -+ struct stat st_fd; -+ -+ if (fd < 0 || type < 0) -+ return -EINVAL; -+ -+ if (fstat(fd, &st_fd) < 0) -+ return -errno; -+ -+ if (!S_ISSOCK(st_fd.st_mode)) -+ return 0; -+ -+ if (type != 0) { -+ int other_type = 0; -+ socklen_t l = sizeof(other_type); -+ -+ if (getsockopt(fd, SOL_SOCKET, SO_TYPE, &other_type, &l) < 0) -+ return -errno; -+ -+ if (l != sizeof(other_type)) -+ return -EINVAL; -+ -+ if (other_type != type) -+ return 0; -+ } -+ -+ if (listening >= 0) { -+ int accepting = 0; -+ socklen_t l = sizeof(accepting); -+ -+ if (getsockopt(fd, SOL_SOCKET, SO_ACCEPTCONN, &accepting, &l) < 0) -+ return -errno; -+ -+ if (l != sizeof(accepting)) -+ return -EINVAL; -+ -+ if (!accepting != !listening) -+ return 0; -+ } -+ -+ return 1; -+} -+ -+union sockaddr_union { -+ struct sockaddr sa; -+ struct sockaddr_in in4; -+ struct sockaddr_in6 in6; -+ struct sockaddr_un un; -+ struct sockaddr_storage storage; -+}; -+ -+int netsnmp_sd_is_socket(int fd, int family, int type, int listening) { -+ int r; -+ -+ if (family < 0) -+ return -EINVAL; -+ -+ if ((r = sd_is_socket_internal(fd, type, listening)) <= 0) -+ return r; -+ -+ if (family > 0) { -+ union sockaddr_union sockaddr; -+ socklen_t l; -+ -+ memset(&sockaddr, 0, sizeof(sockaddr)); -+ l = sizeof(sockaddr); -+ -+ if (getsockname(fd, &sockaddr.sa, &l) < 0) -+ return -errno; -+ -+ if (l < sizeof(sa_family_t)) -+ return -EINVAL; -+ -+ return sockaddr.sa.sa_family == family; -+ } -+ -+ return 1; -+} -+ -+int netsnmp_sd_is_socket_inet(int fd, int family, int type, int listening, uint16_t port) { -+ union sockaddr_union sockaddr; -+ socklen_t l; -+ int r; -+ -+ if (family != 0 && family != AF_INET && family != AF_INET6) -+ return -EINVAL; -+ -+ if ((r = sd_is_socket_internal(fd, type, listening)) <= 0) -+ return r; -+ -+ memset(&sockaddr, 0, sizeof(sockaddr)); -+ l = sizeof(sockaddr); -+ -+ if (getsockname(fd, &sockaddr.sa, &l) < 0) -+ return -errno; -+ -+ if (l < sizeof(sa_family_t)) -+ return -EINVAL; -+ -+ if (sockaddr.sa.sa_family != AF_INET && -+ sockaddr.sa.sa_family != AF_INET6) -+ return 0; -+ -+ if (family > 0) -+ if (sockaddr.sa.sa_family != family) -+ return 0; -+ -+ if (port > 0) { -+ if (sockaddr.sa.sa_family == AF_INET) { -+ if (l < sizeof(struct sockaddr_in)) -+ return -EINVAL; -+ -+ return htons(port) == sockaddr.in4.sin_port; -+ } else { -+ if (l < sizeof(struct sockaddr_in6)) -+ return -EINVAL; -+ -+ return htons(port) == sockaddr.in6.sin6_port; -+ } -+ } -+ -+ return 1; -+} -+ -+int netsnmp_sd_is_socket_unix(int fd, int type, int listening, const char *path, size_t length) { -+ union sockaddr_union sockaddr; -+ socklen_t l; -+ int r; -+ -+ if ((r = sd_is_socket_internal(fd, type, listening)) <= 0) -+ return r; -+ -+ memset(&sockaddr, 0, sizeof(sockaddr)); -+ l = sizeof(sockaddr); -+ -+ if (getsockname(fd, &sockaddr.sa, &l) < 0) -+ return -errno; -+ -+ if (l < sizeof(sa_family_t)) -+ return -EINVAL; -+ -+ if (sockaddr.sa.sa_family != AF_UNIX) -+ return 0; -+ -+ if (path) { -+ if (length <= 0) -+ length = strlen(path); -+ -+ if (length <= 0) -+ /* Unnamed socket */ -+ return l == offsetof(struct sockaddr_un, sun_path); -+ -+ if (path[0]) -+ /* Normal path socket */ -+ return -+ (l >= offsetof(struct sockaddr_un, sun_path) + length + 1) && -+ memcmp(path, sockaddr.un.sun_path, length+1) == 0; -+ else -+ /* Abstract namespace socket */ -+ return -+ (l == offsetof(struct sockaddr_un, sun_path) + length) && -+ memcmp(path, sockaddr.un.sun_path, length) == 0; -+ } -+ -+ return 1; -+} -+ -+int netsnmp_sd_notify(int unset_environment, const char *state) { -+ int fd = -1, r; -+ struct msghdr msghdr; -+ struct iovec iovec; -+ union sockaddr_union sockaddr; -+ const char *e; -+ -+ if (!state) { -+ r = -EINVAL; -+ goto finish; -+ } -+ -+ if (!(e = getenv("NOTIFY_SOCKET"))) -+ return 0; -+ -+ /* Must be an abstract socket, or an absolute path */ -+ if ((e[0] != '@' && e[0] != '/') || e[1] == 0) { -+ r = -EINVAL; -+ goto finish; -+ } -+ -+ if ((fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0)) < 0) { -+ r = -errno; -+ goto finish; -+ } -+ -+ memset(&sockaddr, 0, sizeof(sockaddr)); -+ sockaddr.sa.sa_family = AF_UNIX; -+ strncpy(sockaddr.un.sun_path, e, sizeof(sockaddr.un.sun_path)); -+ -+ if (sockaddr.un.sun_path[0] == '@') -+ sockaddr.un.sun_path[0] = 0; -+ -+ memset(&iovec, 0, sizeof(iovec)); -+ iovec.iov_base = (char *)state; -+ iovec.iov_len = strlen(state); -+ -+ memset(&msghdr, 0, sizeof(msghdr)); -+ msghdr.msg_name = &sockaddr; -+ msghdr.msg_namelen = offsetof(struct sockaddr_un, sun_path) + strlen(e); -+ -+ if (msghdr.msg_namelen > sizeof(struct sockaddr_un)) -+ msghdr.msg_namelen = sizeof(struct sockaddr_un); -+ -+ msghdr.msg_iov = &iovec; -+ msghdr.msg_iovlen = 1; -+ -+ if (sendmsg(fd, &msghdr, MSG_NOSIGNAL) < 0) { -+ r = -errno; -+ goto finish; -+ } -+ -+ r = 1; -+ -+finish: -+ if (unset_environment) -+ unsetenv("NOTIFY_SOCKET"); -+ -+ if (fd >= 0) -+ close(fd); -+ -+ return r; -+} -+ -+int netsnmp_sd_notifyf(int unset_environment, const char *format, ...) { -+ va_list ap; -+ char *p = NULL; -+ int r; -+ -+ va_start(ap, format); -+ r = vasprintf(&p, format, ap); -+ va_end(ap); -+ -+ if (r < 0 || !p) -+ return -ENOMEM; -+ -+ r = netsnmp_sd_notify(unset_environment, p); -+ free(p); -+ -+ return r; -+} -+ -+int netsnmp_sd_booted(void) { -+ struct stat a, b; -+ -+ /* We simply test whether the systemd cgroup hierarchy is -+ * mounted */ -+ -+ if (lstat("/sys/fs/cgroup", &a) < 0) -+ return 0; -+ -+ if (lstat("/sys/fs/cgroup/systemd", &b) < 0) -+ return 0; -+ -+ return a.st_dev != b.st_dev; -+} -+ -+/* End of original sd-daemon.c from systemd sources */ -+ -+int -+netsnmp_sd_find_inet_socket(int family, int type, int listening, int port) -+{ -+ int count, fd; -+ -+ count = netsnmp_sd_listen_fds(0); -+ if (count <= 0) { -+ DEBUGMSGTL(("systemd:find_inet_socket", "No LISTEN_FDS found.\n")); -+ return 0; -+ } -+ DEBUGMSGTL(("systemd:find_inet_socket", "LISTEN_FDS reports %d sockets.\n", -+ count)); -+ -+ for (fd = 3; fd < 3+count; fd++) { -+ int rc = netsnmp_sd_is_socket_inet(fd, family, type, listening, port); -+ if (rc < 0) -+ DEBUGMSGTL(("systemd:find_inet_socket", -+ "sd_is_socket_inet error: %d\n", rc)); -+ if (rc > 0) { -+ DEBUGMSGTL(("systemd:find_inet_socket", -+ "Found the socket in LISTEN_FDS\n")); -+ return fd; -+ } -+ } -+ DEBUGMSGTL(("systemd:find_inet_socket", "Socket not found in LISTEN_FDS\n")); -+ return 0; -+} -+ -+int -+netsnmp_sd_find_unix_socket(int type, int listening, const char *path) -+{ -+ int count, fd; -+ -+ count = netsnmp_sd_listen_fds(0); -+ if (count <= 0) { -+ DEBUGMSGTL(("systemd:find_unix_socket", "No LISTEN_FDS found.\n")); -+ return 0; -+ } -+ DEBUGMSGTL(("systemd:find_unix_socket", "LISTEN_FDS reports %d sockets.\n", -+ count)); -+ -+ for (fd = 3; fd < 3+count; fd++) { -+ int rc = netsnmp_sd_is_socket_unix(fd, type, listening, path, 0); -+ if (rc < 0) -+ DEBUGMSGTL(("systemd:find_unix_socket", -+ "netsnmp_sd_is_socket_unix error: %d\n", rc)); -+ if (rc > 0) { -+ DEBUGMSGTL(("systemd:find_unix_socket", -+ "Found the socket in LISTEN_FDS\n")); -+ return fd; -+ } -+ } -+ DEBUGMSGTL(("systemd:find_unix_socket", "Socket not found in LISTEN_FDS\n")); -+ return 0; -+} -+ -+#endif /* ! NETSNMP_NO_SYSTEMD */ -diff --git a/snmplib/transports/snmpTCPDomain.c b/snmplib/transports/snmpTCPDomain.c -index 7feb028..a41b926 100644 ---- a/snmplib/transports/snmpTCPDomain.c -+++ b/snmplib/transports/snmpTCPDomain.c -@@ -43,6 +43,10 @@ - #include <net-snmp/library/snmpTCPBaseDomain.h> - #include <net-snmp/library/tools.h> - -+#ifndef NETSNMP_NO_SYSTEMD -+#include <net-snmp/library/sd-daemon.h> -+#endif -+ - /* - * needs to be in sync with the definitions in snmplib/snmpUDPDomain.c - * and perl/agent/agent.xs -@@ -149,6 +153,7 @@ netsnmp_tcp_transport(struct sockaddr_in *addr, int local) - netsnmp_transport *t = NULL; - netsnmp_udp_addr_pair *addr_pair = NULL; - int rc = 0; -+ int socket_initialized = 0; - - #ifdef NETSNMP_NO_LISTEN_SUPPORT - if (local) -@@ -178,7 +183,19 @@ netsnmp_tcp_transport(struct sockaddr_in *addr, int local) - t->domain_length = - sizeof(netsnmp_snmpTCPDomain) / sizeof(netsnmp_snmpTCPDomain[0]); - -- t->sock = socket(PF_INET, SOCK_STREAM, 0); -+#ifndef NETSNMP_NO_SYSTEMD -+ /* -+ * Maybe the socket was already provided by systemd... -+ */ -+ if (local) { -+ t->sock = netsnmp_sd_find_inet_socket(PF_INET, SOCK_STREAM, 1, -+ ntohs(addr->sin_port)); -+ if (t->sock) -+ socket_initialized = 1; -+ } -+#endif -+ if (!socket_initialized) -+ t->sock = socket(PF_INET, SOCK_STREAM, 0); - if (t->sock < 0) { - netsnmp_transport_free(t); - return NULL; -@@ -215,11 +232,13 @@ netsnmp_tcp_transport(struct sockaddr_in *addr, int local) - setsockopt(t->sock, SOL_SOCKET, SO_REUSEADDR, (void *)&opt, - sizeof(opt)); - -- rc = bind(t->sock, (struct sockaddr *)addr, sizeof(struct sockaddr)); -- if (rc != 0) { -- netsnmp_socketbase_close(t); -- netsnmp_transport_free(t); -- return NULL; -+ if (!socket_initialized) { -+ rc = bind(t->sock, (struct sockaddr *)addr, sizeof(struct sockaddr)); -+ if (rc != 0) { -+ netsnmp_socketbase_close(t); -+ netsnmp_transport_free(t); -+ return NULL; -+ } - } - - /* -@@ -236,11 +255,13 @@ netsnmp_tcp_transport(struct sockaddr_in *addr, int local) - * Now sit here and wait for connections to arrive. - */ - -- rc = listen(t->sock, NETSNMP_STREAM_QUEUE_LEN); -- if (rc != 0) { -- netsnmp_socketbase_close(t); -- netsnmp_transport_free(t); -- return NULL; -+ if (!socket_initialized) { -+ rc = listen(t->sock, NETSNMP_STREAM_QUEUE_LEN); -+ if (rc != 0) { -+ netsnmp_socketbase_close(t); -+ netsnmp_transport_free(t); -+ return NULL; -+ } - } - - /* -diff --git a/snmplib/transports/snmpTCPIPv6Domain.c b/snmplib/transports/snmpTCPIPv6Domain.c -index d2e0a2d..22de6d4 100644 ---- a/snmplib/transports/snmpTCPIPv6Domain.c -+++ b/snmplib/transports/snmpTCPIPv6Domain.c -@@ -49,6 +49,10 @@ - #include <net-snmp/library/snmpTCPBaseDomain.h> - #include <net-snmp/library/tools.h> - -+#ifndef NETSNMP_NO_SYSTEMD -+#include <net-snmp/library/sd-daemon.h> -+#endif -+ - #include "inet_ntop.h" - - oid netsnmp_TCPIPv6Domain[] = { TRANSPORT_DOMAIN_TCP_IPV6 }; -@@ -140,6 +144,8 @@ netsnmp_tcp6_transport(struct sockaddr_in6 *addr, int local) - { - netsnmp_transport *t = NULL; - int rc = 0; -+ char *str = NULL; -+ int socket_initialized = 0; - - #ifdef NETSNMP_NO_LISTEN_SUPPORT - if (local) -@@ -174,7 +180,19 @@ netsnmp_tcp6_transport(struct sockaddr_in6 *addr, int local) - t->domain = netsnmp_TCPIPv6Domain; - t->domain_length = sizeof(netsnmp_TCPIPv6Domain) / sizeof(oid); - -- t->sock = socket(PF_INET6, SOCK_STREAM, 0); -+#ifndef NETSNMP_NO_SYSTEMD -+ /* -+ * Maybe the socket was already provided by systemd... -+ */ -+ if (local) { -+ t->sock = netsnmp_sd_find_inet_socket(PF_INET6, SOCK_STREAM, 1, -+ ntohs(addr->sin6_port)); -+ if (t->sock) -+ socket_initialized = 1; -+ } -+#endif -+ if (!socket_initialized) -+ t->sock = socket(PF_INET6, SOCK_STREAM, 0); - if (t->sock < 0) { - netsnmp_transport_free(t); - return NULL; -@@ -220,12 +238,14 @@ netsnmp_tcp6_transport(struct sockaddr_in6 *addr, int local) - - setsockopt(t->sock, SOL_SOCKET, SO_REUSEADDR, (void *)&opt, sizeof(opt)); - -- rc = bind(t->sock, (struct sockaddr *) addr, -- sizeof(struct sockaddr_in6)); -- if (rc != 0) { -- netsnmp_socketbase_close(t); -- netsnmp_transport_free(t); -- return NULL; -+ if (!socket_initialized) { -+ rc = bind(t->sock, (struct sockaddr *) addr, -+ sizeof(struct sockaddr_in6)); -+ if (rc != 0) { -+ netsnmp_socketbase_close(t); -+ netsnmp_transport_free(t); -+ return NULL; -+ } - } - - /* -@@ -242,11 +262,13 @@ netsnmp_tcp6_transport(struct sockaddr_in6 *addr, int local) - * Now sit here and wait for connections to arrive. - */ - -- rc = listen(t->sock, NETSNMP_STREAM_QUEUE_LEN); -- if (rc != 0) { -- netsnmp_socketbase_close(t); -- netsnmp_transport_free(t); -- return NULL; -+ if (!socket_initialized) { -+ rc = listen(t->sock, NETSNMP_STREAM_QUEUE_LEN); -+ if (rc != 0) { -+ netsnmp_socketbase_close(t); -+ netsnmp_transport_free(t); -+ return NULL; -+ } - } - - /* -diff --git a/snmplib/transports/snmpUDPIPv4BaseDomain.c b/snmplib/transports/snmpUDPIPv4BaseDomain.c -index 8c0fb05..00e5bbc 100644 ---- a/snmplib/transports/snmpUDPIPv4BaseDomain.c -+++ b/snmplib/transports/snmpUDPIPv4BaseDomain.c -@@ -40,6 +40,10 @@ - - #include <net-snmp/library/snmpSocketBaseDomain.h> - -+#ifndef NETSNMP_NO_SYSTEMD -+#include <net-snmp/library/sd-daemon.h> -+#endif -+ - #if defined(HAVE_IP_PKTINFO) || defined(HAVE_IP_RECVDSTADDR) - int netsnmp_udpipv4_recvfrom(int s, void *buf, int len, struct sockaddr *from, - socklen_t *fromlen, struct sockaddr *dstip, -@@ -64,6 +68,7 @@ netsnmp_udpipv4base_transport(struct sockaddr_in *addr, int local) - char *client_socket = NULL; - netsnmp_indexed_addr_pair addr_pair; - socklen_t local_addr_len; -+ int socket_initialized = 0; - - #ifdef NETSNMP_NO_LISTEN_SUPPORT - if (local) -@@ -88,7 +93,19 @@ netsnmp_udpipv4base_transport(struct sockaddr_in *addr, int local) - free(str); - } - -- t->sock = socket(PF_INET, SOCK_DGRAM, 0); -+#ifndef NETSNMP_NO_SYSTEMD -+ /* -+ * Maybe the socket was already provided by systemd... -+ */ -+ if (local) { -+ t->sock = netsnmp_sd_find_inet_socket(PF_INET, SOCK_DGRAM, -1, -+ ntohs(addr->sin_port)); -+ if (t->sock) -+ socket_initialized = 1; -+ } -+#endif -+ if (!socket_initialized) -+ t->sock = socket(PF_INET, SOCK_DGRAM, 0); - DEBUGMSGTL(("UDPBase", "openned socket %d as local=%d\n", t->sock, local)); - if (t->sock < 0) { - netsnmp_transport_free(t); -@@ -151,12 +168,14 @@ netsnmp_udpipv4base_transport(struct sockaddr_in *addr, int local) - } - } - #endif /* !defined(WIN32) */ -- rc = bind(t->sock, (struct sockaddr *) addr, -- sizeof(struct sockaddr)); -- if (rc != 0) { -- netsnmp_socketbase_close(t); -- netsnmp_transport_free(t); -- return NULL; -+ if (!socket_initialized) { -+ rc = bind(t->sock, (struct sockaddr *) addr, -+ sizeof(struct sockaddr)); -+ if (rc != 0) { -+ netsnmp_socketbase_close(t); -+ netsnmp_transport_free(t); -+ return NULL; -+ } - } - t->data = NULL; - t->data_length = 0; -diff --git a/snmplib/transports/snmpUDPIPv6Domain.c b/snmplib/transports/snmpUDPIPv6Domain.c -index 18de876..fd2ced4 100644 ---- a/snmplib/transports/snmpUDPIPv6Domain.c -+++ b/snmplib/transports/snmpUDPIPv6Domain.c -@@ -67,6 +67,10 @@ static const struct in6_addr in6addr_any = IN6ADDR_ANY_INIT; - #include <net-snmp/library/snmpSocketBaseDomain.h> - #include <net-snmp/library/tools.h> - -+#ifndef NETSNMP_NO_SYSTEMD -+#include <net-snmp/library/sd-daemon.h> -+#endif -+ - #include "inet_ntop.h" - #include "inet_pton.h" - -@@ -190,6 +194,8 @@ netsnmp_udp6_transport(struct sockaddr_in6 *addr, int local) - { - netsnmp_transport *t = NULL; - int rc = 0; -+ char *str = NULL; -+ int socket_initialized = 0; - - #ifdef NETSNMP_NO_LISTEN_SUPPORT - if (local) -@@ -217,7 +223,19 @@ netsnmp_udp6_transport(struct sockaddr_in6 *addr, int local) - t->domain_length = - sizeof(netsnmp_UDPIPv6Domain) / sizeof(netsnmp_UDPIPv6Domain[0]); - -- t->sock = socket(PF_INET6, SOCK_DGRAM, 0); -+#ifndef NETSNMP_NO_SYSTEMD -+ /* -+ * Maybe the socket was already provided by systemd... -+ */ -+ if (local) { -+ t->sock = netsnmp_sd_find_inet_socket(PF_INET6, SOCK_DGRAM, -1, -+ ntohs(addr->sin6_port)); -+ if (t->sock) -+ socket_initialized = 1; -+ } -+#endif -+ if (!socket_initialized) -+ t->sock = socket(PF_INET6, SOCK_DGRAM, 0); - if (t->sock < 0) { - netsnmp_transport_free(t); - return NULL; -@@ -243,12 +261,14 @@ netsnmp_udp6_transport(struct sockaddr_in6 *addr, int local) - } - #endif - -- rc = bind(t->sock, (struct sockaddr *) addr, -- sizeof(struct sockaddr_in6)); -- if (rc != 0) { -- netsnmp_socketbase_close(t); -- netsnmp_transport_free(t); -- return NULL; -+ if (!socket_initialized) { -+ rc = bind(t->sock, (struct sockaddr *) addr, -+ sizeof(struct sockaddr_in6)); -+ if (rc != 0) { -+ netsnmp_socketbase_close(t); -+ netsnmp_transport_free(t); -+ return NULL; -+ } - } - t->local = (unsigned char*)malloc(18); - if (t->local == NULL) { -diff --git a/snmplib/transports/snmpUnixDomain.c b/snmplib/transports/snmpUnixDomain.c -index 47dffc1..8f34c37 100644 ---- a/snmplib/transports/snmpUnixDomain.c -+++ b/snmplib/transports/snmpUnixDomain.c -@@ -37,6 +37,10 @@ - #include <net-snmp/library/system.h> /* mkdirhier */ - #include <net-snmp/library/tools.h> - -+#ifndef NETSNMP_NO_SYSTEMD -+#include <net-snmp/library/sd-daemon.h> -+#endif -+ - netsnmp_feature_child_of(transport_unix_socket_all, transport_all) - netsnmp_feature_child_of(unix_socket_paths, transport_unix_socket_all) - -@@ -295,6 +299,8 @@ netsnmp_unix_transport(struct sockaddr_un *addr, int local) - netsnmp_transport *t = NULL; - sockaddr_un_pair *sup = NULL; - int rc = 0; -+ char *string = NULL; -+ int socket_initialized = 0; - - #ifdef NETSNMP_NO_LISTEN_SUPPORT - /* SPECIAL CIRCUMSTANCE: We still want AgentX to be able to operate, -@@ -333,7 +339,18 @@ netsnmp_unix_transport(struct sockaddr_un *addr, int local) - t->data_length = sizeof(sockaddr_un_pair); - sup = (sockaddr_un_pair *) t->data; - -- t->sock = socket(PF_UNIX, SOCK_STREAM, 0); -+#ifndef NETSNMP_NO_SYSTEMD -+ /* -+ * Maybe the socket was already provided by systemd... -+ */ -+ if (local) { -+ t->sock = netsnmp_sd_find_unix_socket(SOCK_STREAM, 1, addr->sun_path); -+ if (t->sock) -+ socket_initialized = 1; -+ } -+#endif -+ if (!socket_initialized) -+ t->sock = socket(PF_UNIX, SOCK_STREAM, 0); - if (t->sock < 0) { - netsnmp_transport_free(t); - return NULL; -@@ -357,25 +374,26 @@ netsnmp_unix_transport(struct sockaddr_un *addr, int local) - - t->flags |= NETSNMP_TRANSPORT_FLAG_LISTEN; - -- unlink(addr->sun_path); -- rc = bind(t->sock, (struct sockaddr *) addr, SUN_LEN(addr)); -- -- if (rc != 0 && errno == ENOENT && create_path) { -- rc = mkdirhier(addr->sun_path, create_mode, 1); -+ if (!socket_initialized) { -+ unlink(addr->sun_path); -+ rc = bind(t->sock, (struct sockaddr *) addr, SUN_LEN(addr)); -+ if (rc != 0 && errno == ENOENT && create_path) { -+ rc = mkdirhier(addr->sun_path, create_mode, 1); -+ if (rc != 0) { -+ netsnmp_unix_close(t); -+ netsnmp_transport_free(t); -+ return NULL; -+ } -+ rc = bind(t->sock, (struct sockaddr *) addr, SUN_LEN(addr)); -+ } - if (rc != 0) { -+ DEBUGMSGTL(("netsnmp_unix_transport", -+ "couldn't bind \"%s\", errno %d (%s)\n", -+ addr->sun_path, errno, strerror(errno))); - netsnmp_unix_close(t); - netsnmp_transport_free(t); - return NULL; - } -- rc = bind(t->sock, (struct sockaddr *) addr, SUN_LEN(addr)); -- } -- if (rc != 0) { -- DEBUGMSGTL(("netsnmp_unix_transport", -- "couldn't bind \"%s\", errno %d (%s)\n", -- addr->sun_path, errno, strerror(errno))); -- netsnmp_unix_close(t); -- netsnmp_transport_free(t); -- return NULL; - } - - /* -@@ -391,14 +409,16 @@ netsnmp_unix_transport(struct sockaddr_un *addr, int local) - * Now sit here and listen for connections to arrive. - */ - -- rc = listen(t->sock, NETSNMP_STREAM_QUEUE_LEN); -- if (rc != 0) { -- DEBUGMSGTL(("netsnmp_unix_transport", -- "couldn't listen to \"%s\", errno %d (%s)\n", -- addr->sun_path, errno, strerror(errno))); -- netsnmp_unix_close(t); -- netsnmp_transport_free(t); -- return NULL; -+ if (!socket_initialized) { -+ rc = listen(t->sock, NETSNMP_STREAM_QUEUE_LEN); -+ if (rc != 0) { -+ DEBUGMSGTL(("netsnmp_unix_transport", -+ "couldn't listen to \"%s\", errno %d (%s)\n", -+ addr->sun_path, errno, strerror(errno))); -+ netsnmp_unix_close(t); -+ netsnmp_transport_free(t); -+ return NULL; -+ } - } - - } else { -diff --git a/win32/libsnmp/Makefile.in b/win32/libsnmp/Makefile.in -index 98d83c8..b228d20 100644 ---- a/win32/libsnmp/Makefile.in -+++ b/win32/libsnmp/Makefile.in -@@ -42,6 +42,7 @@ LIB32_OBJS= \ - "$(INTDIR)\read_config.obj" \ - "$(INTDIR)\readdir.obj" \ - "$(INTDIR)\scapi.obj" \ -+ "$(INTDIR)\sd-daemon.obj" \ - "$(INTDIR)\snmp-tc.obj" \ - "$(INTDIR)\snmp.obj" \ - "$(INTDIR)\snmpCallbackDomain.obj" \ -@@ -138,6 +139,11 @@ SOURCE=..\..\snmplib\asn1.c - "$(INTDIR)\asn1.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - -+SOURCE=..\..\snmplib\sd-daemon.c -+ -+"$(INTDIR)\sd-daemon.obj" : $(SOURCE) "$(INTDIR)" -+ $(CPP) $(CPP_PROJ) $(SOURCE) -+ - - SOURCE=..\..\snmplib\callback.c - -diff --git a/win32/net-snmp/net-snmp-config.h b/win32/net-snmp/net-snmp-config.h -index 1608563..7aec547 100644 ---- a/win32/net-snmp/net-snmp-config.h -+++ b/win32/net-snmp/net-snmp-config.h -@@ -1717,6 +1717,8 @@ enum { - #define DMALLOC_FUNC_CHECK - #endif - -++#define NETSNMP_NO_SYSTEMD -++ - /* #undef NETSNMP_ENABLE_LOCAL_SMUX */ - - /* define if agentx transport is to use domain sockets only */ -diff --git a/win32/net-snmp/net-snmp-config.h.in b/win32/net-snmp/net-snmp-config.h.in -index 9693730..96ec3d9 100644 ---- a/win32/net-snmp/net-snmp-config.h.in -+++ b/win32/net-snmp/net-snmp-config.h.in -@@ -1717,6 +1717,8 @@ enum { - #define DMALLOC_FUNC_CHECK - #endif - -+#define NETSNMP_NO_SYSTEMD -+ - /* #undef NETSNMP_ENABLE_LOCAL_SMUX */ - - /* define if agentx transport is to use domain sockets only */ --- -1.8.4.2 - diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb deleted file mode 100644 index 3c05874690..0000000000 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb +++ /dev/null @@ -1,236 +0,0 @@ -SUMMARY = "Various tools relating to the Simple Network Management Protocol" -HOMEPAGE = "http://www.net-snmp.org/" -SECTION = "net" -LICENSE = "BSD" - -LIC_FILES_CHKSUM = "file://README;beginline=3;endline=8;md5=7f7f00ba639ac8e8deb5a622ea24634e" - -DEPENDS = "openssl libnl pciutils" - -SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.zip \ - file://init \ - file://snmpd.conf \ - file://snmptrapd.conf \ - file://systemd-support.patch \ - file://snmpd.service \ - file://snmptrapd.service \ - file://net-snmp-add-knob-whether-nlist.h-are-checked.patch \ - file://fix-libtool-finish.patch \ - file://net-snmp-testing-add-the-output-format-for-ptest.patch \ - file://run-ptest \ - file://dont-return-incompletely-parsed-varbinds.patch \ - file://0001-config_os_headers-Error-Fix.patch \ - file://0001-config_os_libs2-Error-Fix.patch \ - file://0001-snmplib-keytools.c-Don-t-check-for-return-from-EVP_M.patch \ - file://net-snmp-agentx-crash.patch \ - file://0001-get_pid_from_inode-Include-limit.h.patch \ - file://0001-BUG-a2584-Fix-snmptrap-to-use-clientaddr-from-snmp.c.patch \ - file://0001-snmplib-UDPIPv6-transport-Add-a-missing-return-state.patch \ - file://0001-configure-fix-check-for-enable-perl-cc-checks.patch \ - file://0002-configure-fix-a-cc-check-issue.patch \ - file://0003-CHANGES-BUG-2712-Fix-Perl-module-compilation.patch \ - file://0004-configure-fix-incorrect-variable.patch \ - file://net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch \ - file://net-snmp-fix-for-disable-des.patch \ - " -SRC_URI[md5sum] = "9f682bd70c717efdd9f15b686d07baee" -SRC_URI[sha256sum] = "e8dfc79b6539b71a6ff335746ce63d2da2239062ad41872fff4354cafed07a3e" - -inherit autotools-brokensep update-rc.d siteinfo systemd pkgconfig perlnative - -EXTRA_OEMAKE = "INSTALL_PREFIX=${D} OTHERLDFLAGS='${LDFLAGS}' HOST_CPPFLAGS='${BUILD_CPPFLAGS}'" - -PARALLEL_MAKE = "" -CCACHE = "" - -TARGET_CC_ARCH += "${LDFLAGS}" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[elfutils] = "--with-elf, --without-elf, elfutils" -PACKAGECONFIG[libnl] = "--with-nl, --without-nl, libnl" - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" -PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,," - -PACKAGECONFIG[perl] = "--enable-embedded-perl --with-perl-modules=yes, --disable-embedded-perl --with-perl-modules=no,\ - perl, perl perl-lib" - -EXTRA_OECONF = "--enable-shared \ - --disable-manuals \ - --with-defaults \ - --with-install-prefix=${D} \ - --with-persistent-directory=${localstatedir}/lib/net-snmp \ - ${@base_conditional('SITEINFO_ENDIANNESS', 'le', '--with-endianness=little', '--with-endianness=big', d)} \ -" - -# net-snmp needs to have mib-modules=smux enabled to enable quagga to support snmp -EXTRA_OECONF += "--with-mib-modules=smux" - -CACHED_CONFIGUREVARS = " \ - ac_cv_header_valgrind_valgrind_h=no \ - ac_cv_header_valgrind_memcheck_h=no \ - ac_cv_ETC_MNTTAB=/etc/mtab \ - lt_cv_shlibpath_overrides_runpath=yes \ -" -export PERLPROG="${bindir}/env perl" -PERLPROG_append = "${@bb.utils.contains('PACKAGECONFIG', 'perl', ' -I${WORKDIR}', '', d)}" - -HAS_PERL = "${@bb.utils.contains('PACKAGECONFIG', 'perl', '1', '0', d)}" - -do_configure_prepend() { - sed -i -e "s|I/usr/include|I${STAGING_INCDIR}|g" \ - "${S}"/configure \ - "${S}"/configure.d/config_os_libs2 - - if [ "${HAS_PERL}" = "1" ]; then - # this may need to be changed when package perl has any change. - cp -f ${STAGING_DIR_TARGET}/usr/lib*/perl/*/Config.pm ${WORKDIR}/ - cp -f ${STAGING_DIR_TARGET}/usr/lib*/perl/*/Config_heavy.pl ${WORKDIR}/ - sed -e "s@libpth => '/usr/lib.*@libpth => '${STAGING_DIR_TARGET}/${libdir} ${STAGING_DIR_TARGET}/${base_libdir}',@g" \ - -e "s@privlibexp => '/usr@privlibexp => '${STAGING_DIR_TARGET}/usr@g" \ - -e "s@scriptdir => '/usr@scriptdir => '${STAGING_DIR_TARGET}/usr@g" \ - -e "s@sitearchexp => '/usr@sitearchexp => '${STAGING_DIR_TARGET}/usr@g" \ - -e "s@sitelibexp => '/usr@sitearchexp => '${STAGING_DIR_TARGET}/usr@g" \ - -e "s@vendorarchexp => '/usr@vendorarchexp => '${STAGING_DIR_TARGET}/usr@g" \ - -e "s@vendorlibexp => '/usr@vendorlibexp => '${STAGING_DIR_TARGET}/usr@g" \ - -i ${WORKDIR}/Config.pm - fi - -} - -do_configure_append() { - if [ "${HAS_PERL}" = "1" ]; then - sed -e "s@^NSC_INCLUDEDIR=.*@NSC_INCLUDEDIR=${STAGING_DIR_TARGET}\$\{includedir\}@g" \ - -e "s@^NSC_LIBDIR=-L.*@NSC_LIBDIR=-L${STAGING_DIR_TARGET}\$\{libdir\}@g" \ - -i ${B}/net-snmp-config - fi -} - -do_install_append() { - install -d ${D}${sysconfdir}/snmp - install -d ${D}${sysconfdir}/init.d - install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/snmpd - install -m 644 ${WORKDIR}/snmpd.conf ${D}${sysconfdir}/snmp/ - install -m 644 ${WORKDIR}/snmptrapd.conf ${D}${sysconfdir}/snmp/ - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/snmpd.service ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/snmptrapd.service ${D}${systemd_unitdir}/system - sed -e "s@^NSC_SRCDIR=.*@NSC_SRCDIR=.@g" \ - -i ${D}${bindir}/net-snmp-create-v3-user - sed -e "s@^NSC_SRCDIR=.*@NSC_SRCDIR=.@g" \ - -e "s@${STAGING_DIR_NATIVE}[=]*@@g" \ - -e "s@${STAGING_DIR_HOST}[=]*@@g" \ - -e "s@${WORKDIR}[=]*@@g" \ - -e "s@${D}@@g" \ - -i ${D}${bindir}/net-snmp-config - - if [ "${HAS_PERL}" = "1" ]; then - sed -e "s@^NSC_INCLUDEDIR=.*@NSC_INCLUDEDIR=\$\{includedir\}@g" \ - -e "s@^NSC_LIBDIR=-L.*@NSC_LIBDIR=-L\$\{libdir\}@g" \ - -i ${D}${bindir}/net-snmp-config - fi -} - -do_install_ptest() { - install -d ${D}${PTEST_PATH} - for i in ${S}/dist ${S}/include ${B}/include ${S}/mibs ${S}/configure \ - ${B}/net-snmp-config ${S}/testing; do - if [ -e "$i" ]; then - cp -R --no-dereference --preserve=mode,links -v "$i" ${D}${PTEST_PATH} - fi - done - echo `autoconf -V|awk '/autoconf/{print $NF}'` > ${D}${PTEST_PATH}/dist/autoconf-version - - rmdlist="${D}${PTEST_PATH}/dist/net-snmp-solaris-build" - for i in $rmdlist; do - if [ -d "$i" ]; then - rm -rf "$i" - fi - done -} - -SYSROOT_PREPROCESS_FUNCS += "net_snmp_sysroot_preprocess" - -net_snmp_sysroot_preprocess () { - if [ -e ${D}${bindir}/net-snmp-config ]; then - install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/ - install -m 755 ${D}${bindir}/net-snmp-config ${SYSROOT_DESTDIR}${bindir_crossscripts}/ - sed -e "s@-I/usr/include@-I${STAGING_INCDIR}@g" \ - -e "s@^prefix=.*@prefix=${STAGING_DIR_HOST}${prefix}@g" \ - -e "s@^exec_prefix=.*@exec_prefix=${STAGING_EXECPREFIXDIR}@g" \ - -e "s@^includedir=.*@includedir=${STAGING_INCDIR}@g" \ - -e "s@^libdir=.*@libdir=${STAGING_LIBDIR}@g" \ - -e "s@^NSC_SRCDIR=.*@NSC_SRCDIR=${S}@g" \ - -i ${SYSROOT_DESTDIR}${bindir_crossscripts}/net-snmp-config - fi -} - -PACKAGES += "${PN}-libs ${PN}-mibs ${PN}-server ${PN}-client ${PN}-server-snmpd ${PN}-server-snmptrapd" - -# perl module -PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'perl', '${PN}-perl-modules', '', d)}" - -ALLOW_EMPTY_${PN} = "1" -ALLOW_EMPTY_${PN}-server = "1" - -FILES_${PN}-perl-modules = "${libdir}/perl/*" - -FILES_${PN}-libs = "${libdir}/lib*${SOLIBS}" -FILES_${PN}-mibs = "${datadir}/snmp/mibs" -FILES_${PN}-server-snmpd = "${sbindir}/snmpd \ - ${sysconfdir}/snmp/snmpd.conf \ - ${sysconfdir}/init.d \ - ${systemd_unitdir}/system/snmpd.service \ -" - -FILES_${PN}-server-snmptrapd = "${sbindir}/snmptrapd \ - ${sysconfdir}/snmp/snmptrapd.conf \ - ${systemd_unitdir}/system/snmptrapd.service \ -" - -FILES_${PN} = "" -FILES_${PN}-client = "${bindir}/* ${datadir}/snmp/" -FILES_${PN}-dbg += "${libdir}/.debug/ ${sbindir}/.debug/ ${bindir}/.debug/" -FILES_${PN}-dev += "${bindir}/mib2c ${bindir}/mib2c-update" - -CONFFILES_${PN}-server-snmpd = "${sysconfdir}/snmp/snmpd.conf" -CONFFILES_${PN}-server-snmptrapd = "${sysconfdir}/snmp/snmptrapd.conf" - -INITSCRIPT_PACKAGES = "${PN}-server-snmpd" -INITSCRIPT_NAME_${PN}-server-snmpd = "snmpd" -INITSCRIPT_PARAMS_${PN}-server-snmpd = "start 90 2 3 4 5 . stop 60 0 1 6 ." - -EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemd', '--without-systemd', d)}" - -SYSTEMD_PACKAGES = "${PN}-server-snmpd \ - ${PN}-server-snmptrapd" - -SYSTEMD_SERVICE_${PN}-server-snmpd = "snmpd.service" -SYSTEMD_SERVICE_${PN}-server-snmptrapd = "snmptrapd.service" - -RDEPENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'perl', 'net-snmp-perl-modules', '', d)}" -RDEPENDS_${PN} += "net-snmp-client" -RDEPENDS_${PN}-server-snmpd += "net-snmp-mibs" -RDEPENDS_${PN}-server-snmptrapd += "net-snmp-server-snmpd" -RDEPENDS_${PN}-server += "net-snmp-server-snmpd net-snmp-server-snmptrapd" -RDEPENDS_${PN}-client += "net-snmp-mibs net-snmp-libs" -RDEPENDS_${PN}-libs += "libpci" -RDEPENDS_${PN}-ptest += "perl \ - perl-module-test \ - perl-module-file-basename \ - perl-module-getopt-long \ - perl-module-file-temp \ - perl-module-data-dumper \ -" -RDEPENDS_${PN}-dev = "net-snmp-client (= ${EXTENDPKGV}) net-snmp-server (= ${EXTENDPKGV})" -RRECOMMENDS_${PN}-dbg = "net-snmp-client (= ${EXTENDPKGV}) net-snmp-server (= ${EXTENDPKGV})" - -RPROVIDES_${PN}-server-snmpd += "${PN}-server-snmpd-systemd" -RREPLACES_${PN}-server-snmpd += "${PN}-server-snmpd-systemd" -RCONFLICTS_${PN}-server-snmpd += "${PN}-server-snmpd-systemd" - -RPROVIDES_${PN}-server-snmptrapd += "${PN}-server-snmptrapd-systemd" -RREPLACES_${PN}-server-snmptrapd += "${PN}-server-snmptrapd-systemd" -RCONFLICTS_${PN}-server-snmptrapd += "${PN}-server-snmptrapd-systemd" - -LEAD_SONAME = "libnetsnmp.so" 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 new file mode 100644 index 0000000000..75b3d9e8c6 --- /dev/null +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.4.bb @@ -0,0 +1,296 @@ +SUMMARY = "Various tools relating to the Simple Network Management Protocol" +HOMEPAGE = "http://www.net-snmp.org/" +SECTION = "net" +LICENSE = "BSD-3-Clause & MIT" + +LIC_FILES_CHKSUM = "file://COPYING;md5=9d100a395a38584f2ec18a8275261687" + +DEPENDS = "openssl" +DEPENDS:append:class-target = " pciutils" + +SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.tar.gz \ + file://init \ + file://snmpd.conf \ + file://snmptrapd.conf \ + file://snmpd.service \ + file://snmptrapd.service \ + file://run-ptest \ + file://0001-net-snmp-add-knob-whether-nlist.h-are-checked.patch \ + file://0002-net-snmp-fix-libtool-finish.patch \ + file://0003-testing-add-the-output-format-for-ptest.patch \ + file://0004-config_os_headers-Error-Fix.patch \ + file://0005-snmplib-keytools.c-Don-t-check-for-return-from-EVP_M.patch \ + file://0006-get_pid_from_inode-Include-limit.h.patch \ + file://0007-configure-fix-incorrect-variable.patch \ + file://0008-net-snmp-fix-engineBoots-value-on-SIGHUP.patch \ + file://0009-net-snmp-fix-for-disable-des.patch \ + file://0010-net-snmp-Reproducibility-Don-t-check-build-host-for.patch \ + file://0011-ac_add_search_path.m4-keep-consistent-between-32bit-.patch \ + file://0012-Fix-configuration-of-NETSNMP_FD_MASK_TYPE.patch \ + file://0001-Android-Fix-the-build.patch \ + " +SRC_URI[sha256sum] = "8b4de01391e74e3c7014beb43961a2d6d6fa03acc34280b9585f4930745b0544" + +UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/net-snmp/files/net-snmp/" +UPSTREAM_CHECK_REGEX = "/net-snmp/(?P<pver>\d+(\.\d+)+)/" + +inherit autotools-brokensep update-rc.d siteinfo systemd pkgconfig perlnative ptest multilib_script multilib_header + +EXTRA_OEMAKE = "INSTALL_PREFIX=${D} OTHERLDFLAGS='${LDFLAGS}' HOST_CPPFLAGS='${BUILD_CPPFLAGS}'" + +PARALLEL_MAKE = "" +CCACHE = "" +CLEANBROKEN = "1" + +TARGET_CC_ARCH += "${LDFLAGS}" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 systemd', d)} des smux" +PACKAGECONFIG[des] = "--enable-des, --disable-des" +PACKAGECONFIG[elfutils] = "--with-elf, --without-elf, elfutils" +PACKAGECONFIG[ipv6] = "--enable-ipv6, --disable-ipv6" +PACKAGECONFIG[libnl] = "--with-nl, --without-nl, libnl" +PACKAGECONFIG[perl] = "--enable-embedded-perl --with-perl-modules=yes, --disable-embedded-perl --with-perl-modules=no, perl" +PACKAGECONFIG[smux] = "" +PACKAGECONFIG[systemd] = "--with-systemd, --without-systemd" + +EXTRA_OECONF = " \ + --enable-shared \ + --disable-manuals \ + --with-defaults \ + --with-install-prefix=${D} \ + --with-persistent-directory=${localstatedir}/lib/net-snmp \ + --with-endianness=${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', 'little', 'big', d)} \ + --with-mib-modules='${MIB_MODULES}' \ +" + +MIB_MODULES = "" +MIB_MODULES:append = " ${@bb.utils.filter('PACKAGECONFIG', 'smux', d)}" + +CACHED_CONFIGUREVARS = " \ + ac_cv_header_valgrind_valgrind_h=no \ + ac_cv_header_valgrind_memcheck_h=no \ + ac_cv_ETC_MNTTAB=/etc/mtab \ + lt_cv_shlibpath_overrides_runpath=yes \ + ac_cv_path_UNAMEPROG=${base_bindir}/uname \ + ac_cv_path_PSPROG=${base_bindir}/ps \ + ac_cv_file__etc_printcap=no \ + NETSNMP_CONFIGURE_OPTIONS= \ +" +PERLPROG = "${bindir}/env perl" +PERLPROG:class-native = "${bindir_native}/env perl" +PERLPROG:append = "${@bb.utils.contains('PACKAGECONFIG', 'perl', ' -I${WORKDIR}', '', d)}" +export PERLPROG + +HAS_PERL = "${@bb.utils.contains('PACKAGECONFIG', 'perl', '1', '0', d)}" + +PTEST_BUILD_HOST_FILES += "net-snmp-config gen-variables" + +do_configure:prepend() { + sed -i -e "s|I/usr/include|I${STAGING_INCDIR}|g" \ + "${S}"/configure \ + "${S}"/configure.d/config_os_libs2 + + if [ "${HAS_PERL}" = "1" ]; then + # this may need to be changed when package perl has any change. + cp -f ${STAGING_DIR_TARGET}/usr/lib*/perl?/*/Config.pm ${WORKDIR}/ + cp -f ${STAGING_DIR_TARGET}/usr/lib*/perl?/*/*/Config_heavy.pl ${WORKDIR}/ + sed -e "s@libpth => '/usr/lib.*@libpth => '${STAGING_DIR_TARGET}/${libdir} ${STAGING_DIR_TARGET}/${base_libdir}',@g" \ + -e "s@privlibexp => '/usr@privlibexp => '${STAGING_DIR_TARGET}/usr@g" \ + -e "s@scriptdir => '/usr@scriptdir => '${STAGING_DIR_TARGET}/usr@g" \ + -e "s@sitearchexp => '/usr@sitearchexp => '${STAGING_DIR_TARGET}/usr@g" \ + -e "s@sitelibexp => '/usr@sitearchexp => '${STAGING_DIR_TARGET}/usr@g" \ + -e "s@vendorarchexp => '/usr@vendorarchexp => '${STAGING_DIR_TARGET}/usr@g" \ + -e "s@vendorlibexp => '/usr@vendorlibexp => '${STAGING_DIR_TARGET}/usr@g" \ + -i ${WORKDIR}/Config.pm + fi + +} + +do_configure:append() { + sed -e "s@^NSC_INCLUDEDIR=.*@NSC_INCLUDEDIR=${STAGING_DIR_TARGET}\$\{includedir\}@g" \ + -e "s@^NSC_LIBDIR=-L.*@NSC_LIBDIR=-L${STAGING_DIR_TARGET}\$\{libdir\}@g" \ + -e "s@^NSC_LDFLAGS=\"-L.* @NSC_LDFLAGS=\"-L${STAGING_DIR_TARGET}\$\{libdir\} @g" \ + -i ${B}/net-snmp-config +} + +do_install:append() { + install -d ${D}${sysconfdir}/snmp + install -d ${D}${sysconfdir}/init.d + install -m 755 ${UNPACKDIR}/init ${D}${sysconfdir}/init.d/snmpd + install -m 644 ${UNPACKDIR}/snmpd.conf ${D}${sysconfdir}/snmp/ + install -m 644 ${UNPACKDIR}/snmptrapd.conf ${D}${sysconfdir}/snmp/ + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${UNPACKDIR}/snmpd.service ${D}${systemd_unitdir}/system + install -m 0644 ${UNPACKDIR}/snmptrapd.service ${D}${systemd_unitdir}/system + sed -e "s@^NSC_SRCDIR=.*@NSC_SRCDIR=.@g" \ + -i ${D}${bindir}/net-snmp-create-v3-user + sed -e 's@^NSC_SRCDIR=.*@NSC_SRCDIR=.@g' \ + -e 's@[^ ]*-ffile-prefix-map=[^ "]*@@g' \ + -e 's@[^ ]*-fdebug-prefix-map=[^ "]*@@g' \ + -e 's@[^ ]*-fmacro-prefix-map=[^ "]*@@g' \ + -e 's@[^ ]*--sysroot=[^ "]*@@g' \ + -e 's@[^ ]*--with-libtool-sysroot=[^ "]*@@g' \ + -e 's@[^ ]*--with-install-prefix=[^ "]*@@g' \ + -e 's@[^ ]*PKG_CONFIG_PATH=[^ "]*@@g' \ + -e 's@[^ ]*PKG_CONFIG_LIBDIR=[^ "]*@@g' \ + -i ${D}${bindir}/net-snmp-config + + sed -e 's@[^ ]*-ffile-prefix-map=[^ "]*@@g' \ + -e 's@[^ ]*-fdebug-prefix-map=[^ "]*@@g' \ + -e 's@[^ ]*-fmacro-prefix-map=[^ "]*@@g' \ + -i ${D}${libdir}/pkgconfig/netsnmp*.pc + + # ${STAGING_DIR_HOST} is empty for native builds, and the sed command below + # will result in errors if run for native. + if [ "${STAGING_DIR_HOST}" ]; then + sed -e 's@${STAGING_DIR_HOST}@@g' \ + -i ${D}${bindir}/net-snmp-config ${D}${libdir}/pkgconfig/netsnmp*.pc + fi + + sed -e "s@^NSC_INCLUDEDIR=.*@NSC_INCLUDEDIR=\$\{includedir\}@g" \ + -e "s@^NSC_LIBDIR=-L.*@NSC_LIBDIR=-L\$\{libdir\}@g" \ + -e "s@^NSC_LDFLAGS=\"-L.* @NSC_LDFLAGS=\"-L\$\{libdir\} @g" \ + -i ${D}${bindir}/net-snmp-config + + sed -i -e 's:${HOSTTOOLS_DIR}/::g' ${D}${bindir}/net-snmp-create-v3-user + + oe_multilib_header net-snmp/net-snmp-config.h + + if [ "${HAS_PERL}" = "1" ]; then + find ${D}${libdir}/ -type f -name "perllocal.pod" | xargs rm -f + fi +} + +do_install_ptest() { + install -d ${D}${PTEST_PATH} + for i in ${S}/dist ${S}/include ${B}/include ${S}/mibs ${S}/configure \ + ${B}/net-snmp-config ${S}/testing; do + if [ -e "$i" ]; then + cp -R --no-dereference --preserve=mode,links -v "$i" ${D}${PTEST_PATH} + fi + done + echo `autoconf -V|awk '/autoconf/{print $NF}'` > ${D}${PTEST_PATH}/dist/autoconf-version + + rmdlist="${D}${PTEST_PATH}/dist/net-snmp-solaris-build" + for i in $rmdlist; do + if [ -d "$i" ]; then + rm -rf "$i" + fi + done +} + +SYSROOT_PREPROCESS_FUNCS += "net_snmp_sysroot_preprocess" +SNMP_DBGDIR = "${TARGET_DBGSRC_DIR}" + +net_snmp_sysroot_preprocess () { + if [ -e ${D}${bindir}/net-snmp-config ]; then + install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/ + install -m 755 ${D}${bindir}/net-snmp-config ${SYSROOT_DESTDIR}${bindir_crossscripts}/ + sed -e "s@-I/usr/include@-I${STAGING_INCDIR}@g" \ + -e "s@^prefix=.*@prefix=${STAGING_DIR_HOST}${prefix}@g" \ + -e "s@^exec_prefix=.*@exec_prefix=${STAGING_EXECPREFIXDIR}@g" \ + -e "s@^includedir=.*@includedir=${STAGING_INCDIR}@g" \ + -e "s@^libdir=.*@libdir=${STAGING_LIBDIR}@g" \ + -e "s@^NSC_SRCDIR=.*@NSC_SRCDIR=${S}@g" \ + -e "s@-ffile-prefix-map=${SNMP_DBGDIR}@-ffile-prefix-map=${WORKDIR}=${SNMP_DBGDIR}@g" \ + -e "s@-fdebug-prefix-map=${SNMP_DBGDIR}@-fdebug-prefix-map=${WORKDIR}=${SNMP_DBGDIR}@g" \ + -e "s@-fdebug-prefix-map= -fdebug-prefix-map=@-fdebug-prefix-map=${STAGING_DIR_NATIVE}= \ + -fdebug-prefix-map=${STAGING_DIR_HOST}=@g" \ + -e "s@--sysroot=@--sysroot=${STAGING_DIR_HOST}@g" \ + -e "s@--with-libtool-sysroot=@--with-libtool-sysroot=${STAGING_DIR_HOST}@g" \ + -e "s@--with-install-prefix=@--with-install-prefix=${D}@g" \ + -i ${SYSROOT_DESTDIR}${bindir_crossscripts}/net-snmp-config + fi +} + +PACKAGES += "${PN}-libs ${PN}-mibs ${PN}-server ${PN}-client \ + ${PN}-server-snmpd ${PN}-server-snmptrapd \ + ${PN}-lib-netsnmp ${PN}-lib-agent ${PN}-lib-helpers \ + ${PN}-lib-mibs ${PN}-lib-trapd" + +# perl module +PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'perl', '${PN}-perl-modules', '', d)}" + +ALLOW_EMPTY:${PN} = "1" +ALLOW_EMPTY:${PN}-server = "1" +ALLOW_EMPTY:${PN}-libs = "1" + +FILES:${PN}-perl-modules = "${libdir}/perl?/*" +RDEPENDS:${PN}-perl-modules = "perl" + +FILES:${PN}-libs = "" +FILES:${PN}-mibs = "${datadir}/snmp/mibs" +FILES:${PN}-server-snmpd = "${sbindir}/snmpd \ + ${sysconfdir}/snmp/snmpd.conf \ + ${sysconfdir}/init.d \ + ${systemd_unitdir}/system/snmpd.service \ +" + +FILES:${PN}-server-snmptrapd = "${sbindir}/snmptrapd \ + ${sysconfdir}/snmp/snmptrapd.conf \ + ${systemd_unitdir}/system/snmptrapd.service \ +" + +FILES:${PN}-lib-netsnmp = "${libdir}/libnetsnmp${SOLIBS}" +FILES:${PN}-lib-agent = "${libdir}/libnetsnmpagent${SOLIBS}" +FILES:${PN}-lib-helpers = "${libdir}/libnetsnmphelpers${SOLIBS}" +FILES:${PN}-lib-mibs = "${libdir}/libnetsnmpmibs${SOLIBS}" +FILES:${PN}-lib-trapd = "${libdir}/libnetsnmptrapd${SOLIBS}" + +FILES:${PN} = "" +FILES:${PN}-client = "${bindir}/* ${datadir}/snmp/" +FILES:${PN}-dbg += "${libdir}/.debug/ ${sbindir}/.debug/ ${bindir}/.debug/" +FILES:${PN}-dev += "${bindir}/mib2c \ + ${bindir}/mib2c-update \ + ${bindir}/net-snmp-config \ + ${bindir}/net-snmp-create-v3-user \ +" + +CONFFILES:${PN}-server-snmpd = "${sysconfdir}/snmp/snmpd.conf" +CONFFILES:${PN}-server-snmptrapd = "${sysconfdir}/snmp/snmptrapd.conf" + +INITSCRIPT_PACKAGES = "${PN}-server-snmpd" +INITSCRIPT_NAME:${PN}-server-snmpd = "snmpd" +INITSCRIPT_PARAMS:${PN}-server-snmpd = "start 90 2 3 4 5 . stop 60 0 1 6 ." + +SYSTEMD_PACKAGES = "${PN}-server-snmpd \ + ${PN}-server-snmptrapd" + +SYSTEMD_SERVICE:${PN}-server-snmpd = "snmpd.service" +SYSTEMD_SERVICE:${PN}-server-snmptrapd = "snmptrapd.service" + +RDEPENDS:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'perl', 'net-snmp-perl-modules', '', d)}" +RDEPENDS:${PN} += "net-snmp-client" +RDEPENDS:${PN}-server-snmpd += "net-snmp-mibs" +RDEPENDS:${PN}-server-snmptrapd += "net-snmp-server-snmpd ${PN}-lib-trapd" +RDEPENDS:${PN}-server += "net-snmp-server-snmpd net-snmp-server-snmptrapd" +RDEPENDS:${PN}-client += "net-snmp-mibs net-snmp-libs" +RDEPENDS:${PN}-libs += "libpci \ + ${PN}-lib-netsnmp \ + ${PN}-lib-agent \ + ${PN}-lib-helpers \ + ${PN}-lib-mibs \ +" +RDEPENDS:${PN}-ptest += "perl \ + perl-module-test \ + perl-module-file-basename \ + perl-module-getopt-long \ + perl-module-file-temp \ + perl-module-data-dumper \ +" +RDEPENDS:${PN}-dev = "net-snmp-client (= ${EXTENDPKGV}) net-snmp-server (= ${EXTENDPKGV})" +RRECOMMENDS:${PN}-dbg = "net-snmp-client (= ${EXTENDPKGV}) net-snmp-server (= ${EXTENDPKGV})" + +RPROVIDES:${PN}-server-snmpd += "${PN}-server-snmpd-systemd" +RREPLACES:${PN}-server-snmpd += "${PN}-server-snmpd-systemd" +RCONFLICTS:${PN}-server-snmpd += "${PN}-server-snmpd-systemd" + +RPROVIDES:${PN}-server-snmptrapd += "${PN}-server-snmptrapd-systemd" +RREPLACES:${PN}-server-snmptrapd += "${PN}-server-snmptrapd-systemd" +RCONFLICTS:${PN}-server-snmptrapd += "${PN}-server-snmptrapd-systemd" + +LEAD_SONAME = "libnetsnmp.so" + +MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/net-snmp-config" + +BBCLASSEXTEND = "native" diff --git a/meta-networking/recipes-protocols/nopoll/nopoll_0.4.2.b297.bb b/meta-networking/recipes-protocols/nopoll/nopoll_0.4.6.b400.bb index 1d77891d47..816e513a15 100644 --- a/meta-networking/recipes-protocols/nopoll/nopoll_0.4.2.b297.bb +++ b/meta-networking/recipes-protocols/nopoll/nopoll_0.4.6.b400.bb @@ -7,14 +7,14 @@ noPoll provides support for WebSocket (ws://) and TLS (secure) WebSocket (wss:// allowing message based (handler notified) programming or stream oriented access." HOMEPAGE = "http://www.aspl.es/nopoll/" -LICENSE = "LGPL-2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=f0504124678c1b3158146e0630229298 \ " DEPENDS = "openssl" SRC_URI = "http://www.aspl.es/nopoll/downloads/nopoll-${PV}.tar.gz \ " -SRC_URI[md5sum] = "8c411cd0f3c0479aed28c4cf7b114fbb" -SRC_URI[sha256sum] = "f5fbf8aaa16a77b0f265d8c847eb06cb3e68f2b1a50737466dae81181618654c" +SRC_URI[md5sum] = "8d333f158b5d5a8975a6149e6ef8db63" +SRC_URI[sha256sum] = "7f1b20f1d0525f30cdd2a4fc386d328b4cf98c6d11cef51fe62cd9491ba19ad9" inherit autotools pkgconfig diff --git a/meta-networking/recipes-protocols/opcua/open62541/0001-fix-build-do-not-install-git-files.patch b/meta-networking/recipes-protocols/opcua/open62541/0001-fix-build-do-not-install-git-files.patch new file mode 100644 index 0000000000..b93e311054 --- /dev/null +++ b/meta-networking/recipes-protocols/opcua/open62541/0001-fix-build-do-not-install-git-files.patch @@ -0,0 +1,24 @@ +From a490e82dca5a669b0af27a13d74759d8f77e2333 Mon Sep 17 00:00:00 2001 +From: Vyacheslav Yurkov <v.yurkov@precitec.de> +Date: Mon, 3 Oct 2022 18:25:15 +0200 +Subject: [PATCH] fix(build): do not install git files + +Signed-off-by: Vyacheslav Yurkov <v.yurkov@precitec.de> +--- +Upstream-Status: Backport [https://github.com/open62541/open62541/commit/a0328d4cb527f9778a262fc4a6b42bfbdffc38e9] + + CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1934374e..bc5c8bad 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1703,6 +1703,7 @@ install(DIRECTORY ${UA_install_tools_dirs} + FILES_MATCHING + PATTERN "*" + PATTERN "*.pyc" EXCLUDE ++ PATTERN ".git*" EXCLUDE + ) + + install(FILES ${UA_install_tools_files} DESTINATION ${open62541_install_tools_dir}) diff --git a/meta-networking/recipes-protocols/opcua/open62541_1.3.8.bb b/meta-networking/recipes-protocols/opcua/open62541_1.3.8.bb new file mode 100644 index 0000000000..19a50aee3a --- /dev/null +++ b/meta-networking/recipes-protocols/opcua/open62541_1.3.8.bb @@ -0,0 +1,53 @@ +DESCRIPTION = "open62541 is an implementation of OPC UA (OPC Unified Architecture)" +HOMEPAGE = "https://github.com/open62541/open62541.git" +LICENSE = "MPL-2.0 & BSD-3-Clause & MIT" +LIC_FILES_CHKSUM = "\ + file://LICENSE;md5=815ca599c9df247a0c7f619bab123dad \ + file://deps/mdnsd/LICENSE;md5=3bb4047dc4095cd7336de3e2a9be94f0 \ + file://deps/mqtt-c/LICENSE;md5=9226377baf0b79174c89a1ab55592456 \ +" + +SRCREV_FORMAT = "opcua_mdnsd_ua-nodeset_mqtt-c" +SRCREV_opcua = "086b1557d6f49e8a82c999054a7da77d080cd54e" +SRCREV_mdnsd = "3151afe5899dba5125dffa9f4cf3ae1fe2edc0f0" +SRCREV_ua-nodeset = "f71b3f411d5cb16097c3ae0c744f67ad45535ffb" +SRCREV_mqtt-c = "f69ce1e7fd54f3b1834c9c9137ce0ec5d703cb4d" + +SRC_URI = " \ + git://github.com/open62541/open62541.git;name=opcua;branch=1.3;protocol=https \ + git://github.com/Pro/mdnsd.git;name=mdnsd;protocol=https;branch=master;destsuffix=git/deps/mdnsd \ + git://github.com/OPCFoundation/UA-Nodeset;name=ua-nodeset;protocol=https;branch=v1.04;destsuffix=git/deps/ua-nodeset \ + git://github.com/LiamBindle/MQTT-C.git;name=mqtt-c;protocol=https;branch=master;destsuffix=git/deps/mqtt-c \ + file://0001-fix-build-do-not-install-git-files.patch \ +" + +S = "${WORKDIR}/git" + +inherit cmake python3native + +EXTRA_OECMAKE += "\ + -DBUILD_SHARED_LIBS=ON \ + -DUA_NAMESPACE_ZERO=FULL \ + -DUA_LOGLEVEL=600 \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ +" + +PACKAGECONFIG ?= "encryption-mbedtls pubsub pubsub-eth subscriptions subscriptions-events" +PACKAGECONFIG[amalgamation] = "-DUA_ENABLE_AMALGAMATION=ON, -DUA_ENABLE_AMALGAMATION=OFF" +PACKAGECONFIG[encryption-mbedtls] = "-DUA_ENABLE_ENCRYPTION=MBEDTLS, , mbedtls, , , encryption-openssl" +PACKAGECONFIG[encryption-openssl] = "-DUA_ENABLE_ENCRYPTION=OPENSSL, , openssl, , , encryption-mbedtls" +PACKAGECONFIG[multithreading] = "-DUA_MULTITHREADING=100, -DUA_MULTITHREADING=0" +PACKAGECONFIG[pubsub] = "-DUA_ENABLE_PUBSUB=ON, -DUA_ENABLE_PUBSUB=OFF" +PACKAGECONFIG[pubsub-eth] = "-DUA_ENABLE_PUBSUB_ETH_UADP=ON, -DUA_ENABLE_PUBSUB_ETH_UADP=OFF" +PACKAGECONFIG[subscriptions] = "-DUA_ENABLE_SUBSCRIPTIONS=ON, -DUA_ENABLE_SUBSCRIPTIONS=OFF" +PACKAGECONFIG[subscriptions-events] = "-DUA_ENABLE_SUBSCRIPTIONS_EVENTS=ON, -DUA_ENABLE_SUBSCRIPTIONS_EVENTS=OFF" +PACKAGECONFIG[werror] = "-DUA_FORCE_WERROR=ON, -DUA_FORCE_WERROR=OFF" + +do_configure:prepend:toolchain-clang:riscv64() { + sed -i -e 's/set(CMAKE_INTERPROCEDURAL_OPTIMIZATION ON)/set(CMAKE_INTERPROCEDURAL_OPTIMIZATION OFF)/' ${S}/CMakeLists.txt +} + +do_configure:prepend:toolchain-clang:riscv32() { + sed -i -e 's/set(CMAKE_INTERPROCEDURAL_OPTIMIZATION ON)/set(CMAKE_INTERPROCEDURAL_OPTIMIZATION OFF)/' ${S}/CMakeLists.txt +} + diff --git a/meta-networking/recipes-protocols/openflow/openflow.inc b/meta-networking/recipes-protocols/openflow/openflow.inc deleted file mode 100644 index cccbfa19a6..0000000000 --- a/meta-networking/recipes-protocols/openflow/openflow.inc +++ /dev/null @@ -1,37 +0,0 @@ -SUMMARY = "OpenFlow communications protocol" -DESCRIPTION = "\ -Open standard that enables researchers to run experimental protocols in \ -contained networks. OpenFlow is a communications interface between \ -control and forwarding planes of a software-defined networking architecture.\ -" -HOMEPAGE = "http://www.openflow.org" - -SECTION = "net" -LICENSE = "GPLv2" - -LIC_FILES_CHKSUM = "file://COPYING;md5=e870c934e2c3d6ccf085fd7cf0a1e2e2" - -SRC_URI = "git://gitosis.stanford.edu/openflow.git;protocol=git" - -DEPENDS = "virtual/libc" - -PACKAGECONFIG ??= "openssl" -PACKAGECONFIG[openssl] = "--enable-ssl,--disable-ssl, openssl openssl-native, libssl" - -EXTRA_OECONF += " \ - KARCH=${TARGET_ARCH} \ - ${@bb.utils.contains('PACKAGECONFIG', 'openssl', 'SSL_LIBS="-lssl -lcrypto"', '', d)} \ - " - -S = "${WORKDIR}/git" - -inherit autotools-brokensep pkgconfig - -do_configure_prepend() { - ./boot.sh -} - -do_install_append() { - # Remove /var/run as it is created on startup - rm -rf ${D}${localstatedir}/run -} diff --git a/meta-networking/recipes-protocols/openflow/openflow/0001-Check-and-use-strlcpy-from-libc-before-defining-own.patch b/meta-networking/recipes-protocols/openflow/openflow/0001-Check-and-use-strlcpy-from-libc-before-defining-own.patch index 952274bb97..2175a20b90 100644 --- a/meta-networking/recipes-protocols/openflow/openflow/0001-Check-and-use-strlcpy-from-libc-before-defining-own.patch +++ b/meta-networking/recipes-protocols/openflow/openflow/0001-Check-and-use-strlcpy-from-libc-before-defining-own.patch @@ -9,6 +9,8 @@ failures. Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + configure.ac | 2 +- lib/util.c | 2 ++ lib/util.h | 1 + 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 0000000000..6382c2a9a6 --- /dev/null +++ b/meta-networking/recipes-protocols/openflow/openflow/0001-Link-in-libexecinfo-if-it-has-backtrace-API.patch @@ -0,0 +1,62 @@ +From 2272df8407d86519d72504d6468b710e7eb56de8 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 18 May 2024 00:23:43 -0700 +Subject: [PATCH] Link in libexecinfo if it has backtrace() API + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + m4/libopenflow.m4 | 5 +++++ + tests/automake.mk | 2 +- + utilities/automake.mk | 4 ++-- + 3 files changed, 8 insertions(+), 3 deletions(-) + +diff --git a/m4/libopenflow.m4 b/m4/libopenflow.m4 +index 58014ed..c9302b8 100644 +--- a/m4/libopenflow.m4 ++++ b/m4/libopenflow.m4 +@@ -96,6 +96,11 @@ AC_DEFUN([OFP_CHECK_FAULT_LIBS], + [AC_CHECK_LIB([dl], [dladdr], [FAULT_LIBS=-ldl]) + AC_SUBST([FAULT_LIBS])]) + ++dnl Checks for libraries needed by lib/fault.c. ++AC_DEFUN([OFP_CHECK_FAULT_LIBS], ++ [AC_CHECK_LIB([execinfo], [backtrace], [FAULT_LIBS=-lexecinfo]) ++ AC_SUBST([FAULT_LIBS])]) ++ + dnl Checks for libraries needed by lib/socket-util.c. + AC_DEFUN([OFP_CHECK_SOCKET_LIBS], + [AC_CHECK_LIB([socket], [connect]) +diff --git a/tests/automake.mk b/tests/automake.mk +index a4e945a..0944275 100644 +--- a/tests/automake.mk ++++ b/tests/automake.mk +@@ -27,7 +27,7 @@ EXTRA_DIST += tests/test-stp.sh + noinst_PROGRAMS += tests/test-stp + + tests_test_stp_SOURCES = tests/test-stp.c +-tests_test_stp_LDADD = lib/libopenflow.a ++tests_test_stp_LDADD = lib/libopenflow.a $(FAULT_LIBS) + stp_files = \ + tests/test-stp-ieee802.1d-1998 \ + tests/test-stp-ieee802.1d-2004-fig17.4 \ +diff --git a/utilities/automake.mk b/utilities/automake.mk +index d6f79a8..0608655 100644 +--- a/utilities/automake.mk ++++ b/utilities/automake.mk +@@ -36,10 +36,10 @@ utilities_dpctl_SOURCES = utilities/dpctl.c + utilities_dpctl_LDADD = lib/libopenflow.a $(FAULT_LIBS) $(SSL_LIBS) + + utilities_vlogconf_SOURCES = utilities/vlogconf.c +-utilities_vlogconf_LDADD = lib/libopenflow.a ++utilities_vlogconf_LDADD = lib/libopenflow.a $(FAULT_LIBS) + + utilities_ofp_discover_SOURCES = utilities/ofp-discover.c +-utilities_ofp_discover_LDADD = lib/libopenflow.a ++utilities_ofp_discover_LDADD = lib/libopenflow.a $(FAULT_LIBS) + + utilities_ofp_kill_SOURCES = utilities/ofp-kill.c + utilities_ofp_kill_LDADD = lib/libopenflow.a +-- +2.45.1 + diff --git a/meta-networking/recipes-protocols/openflow/openflow/0001-Makefile.am-Specify-export-dynamic-directly-to-linke.patch b/meta-networking/recipes-protocols/openflow/openflow/0001-Makefile.am-Specify-export-dynamic-directly-to-linke.patch new file mode 100644 index 0000000000..27fc05f09d --- /dev/null +++ b/meta-networking/recipes-protocols/openflow/openflow/0001-Makefile.am-Specify-export-dynamic-directly-to-linke.patch @@ -0,0 +1,30 @@ +From 12bba388719c425d9b5cd970d4fabf01edf56aa4 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 7 Feb 2024 22:33:12 -0800 +Subject: [PATCH] Makefile.am: Specify export-dynamic directly to linker + +Fixes build with clang-18+ +| riscv64-yoe-linux-clang: error: unknown argument: '-export-dynamic' + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 97ac1f0..e557fe7 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -23,7 +23,7 @@ if NDEBUG + AM_CPPFLAGS += -DNDEBUG + AM_CFLAGS += -fomit-frame-pointer + else +-AM_LDFLAGS = -export-dynamic ++AM_LDFLAGS = -Wl,--export-dynamic + endif + + CLEANFILES = +-- +2.43.0 + diff --git a/meta-networking/recipes-protocols/openflow/openflow/0001-generate-not-static-get_dh-functions.patch b/meta-networking/recipes-protocols/openflow/openflow/0001-generate-not-static-get_dh-functions.patch new file mode 100644 index 0000000000..4acae80fa7 --- /dev/null +++ b/meta-networking/recipes-protocols/openflow/openflow/0001-generate-not-static-get_dh-functions.patch @@ -0,0 +1,33 @@ +From 0fe6770b617af7e400abc6f8652c1417d4c3575e Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 8 Sep 2018 22:49:15 -0700 +Subject: [PATCH] generate not static get_dh* functions + +Fixes build with OpenSSL 1.1.x + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + lib/automake.mk | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/lib/automake.mk b/lib/automake.mk +index bfbeb94..b53909a 100644 +--- a/lib/automake.mk ++++ b/lib/automake.mk +@@ -113,8 +113,9 @@ lib/dhparams.c: lib/dh1024.pem lib/dh2048.pem lib/dh4096.pem + (echo '#include "lib/dhparams.h"' && \ + openssl dhparam -C -in $(srcdir)/lib/dh1024.pem -noout && \ + openssl dhparam -C -in $(srcdir)/lib/dh2048.pem -noout && \ +- openssl dhparam -C -in $(srcdir)/lib/dh4096.pem -noout) \ +- | sed 's/\(get_dh[0-9]*\)()/\1(void)/' > lib/dhparams.c.tmp ++ openssl dhparam -C -in $(srcdir)/lib/dh4096.pem -noout) | \ ++ sed -e 's/\(get_dh[0-9]*\)()/\1(void)/' \ ++ -e 's/static DH \*get_dh/DH \*get_dh/' > lib/dhparams.c.tmp + mv lib/dhparams.c.tmp lib/dhparams.c + endif + +-- +2.18.0 + diff --git a/meta-networking/recipes-protocols/openflow/openflow/0001-socket-util-Include-sys-stat.h-for-fchmod.patch b/meta-networking/recipes-protocols/openflow/openflow/0001-socket-util-Include-sys-stat.h-for-fchmod.patch new file mode 100644 index 0000000000..97e3422166 --- /dev/null +++ b/meta-networking/recipes-protocols/openflow/openflow/0001-socket-util-Include-sys-stat.h-for-fchmod.patch @@ -0,0 +1,23 @@ +From b875c6e264eaf7350ad4e4ebf427692d8fd3cd72 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 29 Aug 2022 12:58:53 -0700 +Subject: [PATCH] socket-util: Include sys/stat.h for fchmod + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + lib/socket-util.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lib/socket-util.c b/lib/socket-util.c +index c7b5d6d..5b3d602 100644 +--- a/lib/socket-util.c ++++ b/lib/socket-util.c +@@ -42,6 +42,7 @@ + #include <stdio.h> + #include <string.h> + #include <sys/resource.h> ++#include <sys/stat.h> + #include <sys/un.h> + #include <unistd.h> + #include "fatal-signal.h" diff --git a/meta-networking/recipes-protocols/openflow/openflow/0002-lib-netdev-Adjust-header-include-sequence.patch b/meta-networking/recipes-protocols/openflow/openflow/0002-lib-netdev-Adjust-header-include-sequence.patch index 75180fe32f..9a49f4ef39 100644 --- a/meta-networking/recipes-protocols/openflow/openflow/0002-lib-netdev-Adjust-header-include-sequence.patch +++ b/meta-networking/recipes-protocols/openflow/openflow/0002-lib-netdev-Adjust-header-include-sequence.patch @@ -10,6 +10,8 @@ about double definition in libc headers Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + lib/netdev.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/meta-networking/recipes-protocols/openflow/openflow_1.0.bb b/meta-networking/recipes-protocols/openflow/openflow_1.0.bb deleted file mode 100644 index a7e254dd85..0000000000 --- a/meta-networking/recipes-protocols/openflow/openflow_1.0.bb +++ /dev/null @@ -1,4 +0,0 @@ -include ${BPN}.inc - -SRCREV = "5ccca75a69f99791659bcfbcf35353ab1921320a" -PV = "1.0" diff --git a/meta-networking/recipes-protocols/openflow/openflow_git.bb b/meta-networking/recipes-protocols/openflow/openflow_git.bb index eceb45e94f..0061565f90 100644 --- a/meta-networking/recipes-protocols/openflow/openflow_git.bb +++ b/meta-networking/recipes-protocols/openflow/openflow_git.bb @@ -1,9 +1,74 @@ -include ${BPN}.inc +SUMMARY = "OpenFlow communications protocol" +DESCRIPTION = "\ +Open standard that enables researchers to run experimental protocols in \ +contained networks. OpenFlow is a communications interface between \ +control and forwarding planes of a software-defined networking architecture.\ +" +HOMEPAGE = "http://www.openflow.org" -SRCREV = "c84f33f09d5dbcfc9b489f64cb30475bf36f653a" -PV = "1.0+git${SRCPV}" +SECTION = "net" +LICENSE = "GPL-2.0-only" -SRC_URI += "\ +LIC_FILES_CHKSUM = "file://COPYING;md5=e870c934e2c3d6ccf085fd7cf0a1e2e2" + +SRCREV = "82ad07d997b0b2ee70e1b2c7e82fcc6d0ccf23ea" + +PV = "1.0+git" + +SRC_URI = "git://github.com/mininet/openflow;protocol=https;branch=master \ file://0001-Check-and-use-strlcpy-from-libc-before-defining-own.patch \ file://0002-lib-netdev-Adjust-header-include-sequence.patch \ - " + file://0001-generate-not-static-get_dh-functions.patch \ + file://0001-socket-util-Include-sys-stat.h-for-fchmod.patch \ + file://0001-Makefile.am-Specify-export-dynamic-directly-to-linke.patch \ + file://0001-Link-in-libexecinfo-if-it-has-backtrace-API.patch \ +" +CVE_STATUS[CVE-2015-1611] = "not-applicable-config: Not referred to our implementation of openflow" +CVE_STATUS[CVE-2015-1612] = "not-applicable-config: Not referred to our implementation of openflow" +CVE_STATUS[CVE-2018-1078] = "cpe-incorrect: This CVE is not for this product but cve-check assumes it is \ +because two CPE collides when checking the NVD database" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[openssl] = "--enable-ssl,--disable-ssl, openssl openssl-native, libssl" + +EXTRA_OECONF += " \ + KARCH=${TARGET_ARCH} \ + ${@bb.utils.contains('PACKAGECONFIG', 'openssl', 'SSL_LIBS="-lssl -lcrypto"', '', d)} \ + " +DEPENDS:append:libc-musl = " libexecinfo" + +S = "${WORKDIR}/git" + +inherit autotools-brokensep pkgconfig + +do_configure:prepend() { + ./boot.sh +} + +do_install:append() { + # Remove /var/run as it is created on startup + rm -rf ${D}${localstatedir}/run + + # /var/log/openflow needs to be created in runtime. Use rmdir to catch if + # upstream stops creating /var/log/openflow, or adds something else in + # /var/log. + rmdir ${D}${localstatedir}/log/${BPN} ${D}${localstatedir}/log + rmdir --ignore-fail-on-non-empty ${D}${localstatedir} + + # Create /var/log/openflow in runtime. + if [ "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" ]; then + install -d ${D}${nonarch_libdir}/tmpfiles.d + echo "d ${localstatedir}/log/${BPN} - - - -" > ${D}${nonarch_libdir}/tmpfiles.d/${BPN}.conf + fi + if [ "${@bb.utils.filter('DISTRO_FEATURES', 'sysvinit', d)}" ]; then + install -d ${D}${sysconfdir}/default/volatiles + echo "d root root 0755 ${localstatedir}/log/${BPN} none" > ${D}${sysconfdir}/default/volatiles/99_${BPN} + fi +} + +FILES:${PN} += "${nonarch_libdir}/tmpfiles.d" + +# http://errors.yoctoproject.org/Errors/Details/766898/ +# lib/flow.c:213:48: error: initialization of 'const struct arp_eth_header *' from incompatible pointer type 'struct arp_header *' [-Wincompatible-pointer-types] +# lib/backtrace.c:126:32: error: passing argument 1 of 'backtrace' from incompatible pointer type [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-Use-1-instead-of-WAIT_ANY.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-Use-1-instead-of-WAIT_ANY.patch index d1ee3c5916..8314b5d964 100644 --- a/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-Use-1-instead-of-WAIT_ANY.patch +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-Use-1-instead-of-WAIT_ANY.patch @@ -8,6 +8,8 @@ e.g. musl do not define this. Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + usl/usl_pid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-l2tp_api-Included-needed-headers.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-l2tp_api-Included-needed-headers.patch index c50f68e65d..4bdbf458cd 100644 --- a/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-l2tp_api-Included-needed-headers.patch +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-l2tp_api-Included-needed-headers.patch @@ -7,6 +7,8 @@ These are flagged by musl Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + l2tp_api.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-l2tp_api.c-include-rpc-clnt.h-for-resultproc_t.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-l2tp_api.c-include-rpc-clnt.h-for-resultproc_t.patch deleted file mode 100644 index a11a97ebde..0000000000 --- a/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-l2tp_api.c-include-rpc-clnt.h-for-resultproc_t.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 8f299df4dd1ca857e34859c377a29b183c630961 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 21 Sep 2017 13:05:03 -0700 -Subject: [PATCH] l2tp_api.c: include rpc/clnt.h for 'resultproc_t' - -Fixes - -| /mnt/a/oe/build/tmp/work/mips32r2-bec-linux-musl/openl2tp/1.8-r0/recipe-sysroot/usr/include/tirpc/rpc/pmap_clnt.h:81:12: error: unknown type name 'resultproc_t'; did you mean 'rpcproc_t'? | resultproc_t); | ^~~~~~~~~~~~ - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending - - l2tp_api.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/l2tp_api.c b/l2tp_api.c -index f0946fd..f77881c 100644 ---- a/l2tp_api.c -+++ b/l2tp_api.c -@@ -26,6 +26,7 @@ - #include <sys/types.h> - #include <rpc/types.h> - #include <rpc/xdr.h> -+#include <rpc/clnt.h> - #include <rpc/pmap_clnt.h> - //#include <netinet/in.h> - --- -2.14.1 - diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-l2tp_rpc_server.c-Add-missing-prototype-for-l2tp_api.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-l2tp_rpc_server.c-Add-missing-prototype-for-l2tp_api.patch new file mode 100644 index 0000000000..d9aed8804a --- /dev/null +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-l2tp_rpc_server.c-Add-missing-prototype-for-l2tp_api.patch @@ -0,0 +1,28 @@ +From ded84ed583e9b0617bc35ab1798032d18b873144 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 29 Aug 2022 23:30:02 -0700 +Subject: [PATCH] l2tp_rpc_server.c: Add missing prototype for + l2tp_api_rpc_check_request + +Upstream-Status: Inappropriate [no upstream] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Makefile b/Makefile +index 0815b31..2fa5b2f 100644 +--- a/Makefile ++++ b/Makefile +@@ -236,6 +236,7 @@ endif + -$(RM) $@ $@.tmp + $(RPCGEN) $(RPCGENFLAGS) -m -o $@.tmp $< + cat $@.tmp | sed -e 's/switch (rqstp->rq_proc) {/if (l2tp_api_rpc_check_request(transp) < 0) return; switch (rqstp->rq_proc) {/' > $@ ++ sed -i '21i int l2tp_api_rpc_check_request(SVCXPRT *xprt);' $@ + + %_client.c: %.x + -$(RM) $@ +-- +2.37.2 + diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-lex-yacc-Add-missing-function-prototypes.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-lex-yacc-Add-missing-function-prototypes.patch new file mode 100644 index 0000000000..8c21a742e0 --- /dev/null +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-lex-yacc-Add-missing-function-prototypes.patch @@ -0,0 +1,45 @@ +From 2bfdd02d288de92ff118bf41b54c135a6a318c19 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 29 Aug 2022 23:42:11 -0700 +Subject: [PATCH] lex/yacc: Add missing function prototypes + +Fixes build with clang15 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + l2tp_config_parse.y | 3 +++ + l2tp_config_token.l | 3 +++ + 2 files changed, 6 insertions(+) + +diff --git a/l2tp_config_parse.y b/l2tp_config_parse.y +index 4baf1e0..15392d0 100644 +--- a/l2tp_config_parse.y ++++ b/l2tp_config_parse.y +@@ -29,6 +29,9 @@ static struct l2tp_api_session_msg_data session; + + extern void l2tp_log(int level, char *fmt, ...); + extern void yyfatal(const char *s); ++extern const char *l2tp_strerror(int error); ++extern int yylex (void); ++extern void yyerror(const char *s); + + %} + +diff --git a/l2tp_config_token.l b/l2tp_config_token.l +index 9016af6..43b8f0a 100644 +--- a/l2tp_config_token.l ++++ b/l2tp_config_token.l +@@ -15,6 +15,9 @@ + #include "l2tp_config_types.h" + #include "l2tp_config_parse.h" + ++extern void l2tp_log(int level, char *fmt, ...); ++extern const char *l2tp_strerror(int error); ++ + void yyfatal(const char *s); + void yyerror(const char *s); + +-- +2.37.2 + diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-test-pppd_dummy.c-Fix-return-value.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-test-pppd_dummy.c-Fix-return-value.patch index 1f576fa710..42d6f58007 100644 --- a/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-test-pppd_dummy.c-Fix-return-value.patch +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-test-pppd_dummy.c-Fix-return-value.patch @@ -9,6 +9,8 @@ declaration Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + test/pppd_dummy.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/0002-cli-include-fcntl.h-for-O_CREAT-define.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/0002-cli-include-fcntl.h-for-O_CREAT-define.patch index 9df32658a0..bad1007e04 100644 --- a/meta-networking/recipes-protocols/openl2tp/openl2tp/0002-cli-include-fcntl.h-for-O_CREAT-define.patch +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/0002-cli-include-fcntl.h-for-O_CREAT-define.patch @@ -5,6 +5,8 @@ Subject: [PATCH 2/4] cli: include fcntl.h for O_CREAT define Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + cli/cli_readline.c | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/0002-user-ipv6-structures.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/0002-user-ipv6-structures.patch index 3f8bcaa483..6574ba22f0 100644 --- a/meta-networking/recipes-protocols/openl2tp/openl2tp/0002-user-ipv6-structures.patch +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/0002-user-ipv6-structures.patch @@ -4,7 +4,12 @@ Date: Tue, 28 Mar 2017 18:09:58 -0700 Subject: [PATCH 2/2] user ipv6 structures Signed-off-by: Khem Raj <raj.khem@gmail.com> + +Update for ipv6 address compare +Signed-off-by: Changqing Li <changqing.li@windriver.com> --- +Upstream-Status: Pending + l2tp_api.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) @@ -18,8 +23,8 @@ index 9d6f60a..f0946fd 100644 if ((!l2tp_opt_remote_rpc) && - ((xprt->xp_raddr.sin_addr.s_addr != htonl(INADDR_LOOPBACK)) && - (xprt->xp_raddr.sin_addr.s_addr != htonl(INADDR_ANY)))) { -+ ((xprt->xp_raddr.sin6_addr.s6_addr != htonl(INADDR_LOOPBACK)) && -+ (xprt->xp_raddr.sin6_addr.s6_addr != htonl(INADDR_ANY)))) { ++ ((memcmp(&xprt->xp_raddr.sin6_addr, &in6addr_loopback, sizeof(struct in6_addr)) != 0) && ++ (memcmp(&xprt->xp_raddr.sin6_addr, &in6addr_any, sizeof(struct in6_addr)) != 0))) { + char straddr[INET6_ADDRSTRLEN]; + inet_ntop(AF_INET6, &xprt->xp_raddr.sin6_addr, straddr, sizeof(straddr)); if (l2tp_opt_trace_flags & L2TP_DEBUG_API) { diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/0003-cli-Define-_GNU_SOURCE-for-getting-sighandler_t.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/0003-cli-Define-_GNU_SOURCE-for-getting-sighandler_t.patch index e05be1bbb4..5d0c29cb42 100644 --- a/meta-networking/recipes-protocols/openl2tp/openl2tp/0003-cli-Define-_GNU_SOURCE-for-getting-sighandler_t.patch +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/0003-cli-Define-_GNU_SOURCE-for-getting-sighandler_t.patch @@ -5,6 +5,8 @@ Subject: [PATCH 3/4] cli: Define _GNU_SOURCE for getting sighandler_t Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + cli/cli_readline.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/0004-Adjust-for-linux-kernel-headers-assumptions-on-glibc.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/0004-Adjust-for-linux-kernel-headers-assumptions-on-glibc.patch deleted file mode 100644 index 0fcba6546a..0000000000 --- a/meta-networking/recipes-protocols/openl2tp/openl2tp/0004-Adjust-for-linux-kernel-headers-assumptions-on-glibc.patch +++ /dev/null @@ -1,36 +0,0 @@ -From ede4ae8e25f9fb746a6f4e076d0ef029938d2880 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 28 Mar 2017 11:46:56 -0700 -Subject: [PATCH 4/4] Adjust for linux-kernel headers assumptions on glibc - -Fixes build issues e.g. - -In file included from /mnt/a/build/tmp-musl/work/cortexa7hf-neon-vfpv4-oe-linux-musleabi/openl2tp/1.8-r0/recipe-sysroot/usr/include/linux/if_pppox.h:24: -/mnt/a/build/tmp-musl/work/cortexa7hf-neon-vfpv4-oe-linux-musleabi/openl2tp/1.8-r0/recipe-sysroot/usr/include/linux/if.h:97:2: error: expected identifier - IFF_LOWER_UP = 1<<16, /* __volatile__ */ - ^ - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - plugins/ppp_unix.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/plugins/ppp_unix.c b/plugins/ppp_unix.c -index 869066f..5c1e44f 100644 ---- a/plugins/ppp_unix.c -+++ b/plugins/ppp_unix.c -@@ -21,6 +21,11 @@ - * Plugin to use the standard UNIX pppd - */ - -+/* hack to make sure kernel headers understand that libc (musl) -+ * does define IFF_LOWER_UP et al. -+ */ -+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0 -+ - #include <unistd.h> - #include <fcntl.h> - #include <sys/types.h> --- -2.12.1 - diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/Makefile-modify-CFLAGS-to-aviod-build-error.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/Makefile-modify-CFLAGS-to-aviod-build-error.patch index 96dbc7551d..8e9bd1e9ee 100644 --- a/meta-networking/recipes-protocols/openl2tp/openl2tp/Makefile-modify-CFLAGS-to-aviod-build-error.patch +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/Makefile-modify-CFLAGS-to-aviod-build-error.patch @@ -3,7 +3,7 @@ From: Li xin <lixin.fnst@cn.fujitsu.com> Date: Mon, 1 Dec 2014 01:53:41 +0900 Subject: [PATCH] Makefile:modify CFLAGS to aviod build error. -Upstream-Status: pending +Upstream-Status: Pending Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> --- diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/fix_linux_4.15_compile.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/fix_linux_4.15_compile.patch new file mode 100644 index 0000000000..4597df80a8 --- /dev/null +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/fix_linux_4.15_compile.patch @@ -0,0 +1,44 @@ +This fixes a compile issue introduced with linux kernel 4.15 + +include/linux/in.h:222:8: error: redefinition of 'struct in_pktinfo' +| struct in_pktinfo { + + +Upstream-Status: Pending +Signed-off-by: Armin Kuster <akuster808@gmail.com> + +Index: openl2tp-1.8/plugins/ppp_unix.c +=================================================================== +--- openl2tp-1.8.orig/plugins/ppp_unix.c ++++ openl2tp-1.8/plugins/ppp_unix.c +@@ -25,9 +25,14 @@ + #include <fcntl.h> + #include <sys/types.h> + #include <signal.h> ++#include <linux/version.h> ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) + #include <net/ethernet.h> + #include <net/if.h> + #include <netinet/in.h> ++#endif ++ + #include <arpa/inet.h> + #include <sys/stat.h> + #include <unistd.h> +@@ -41,12 +46,12 @@ + #define __user + #endif + #include <sys/ioctl.h> +-#include <linux/if_ether.h> +-#include <linux/if_pppox.h> + #include <linux/ppp_defs.h> + #include <linux/if_ppp.h> ++#include <linux/if_pppox.h> ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) + #include <linux/if_pppol2tp.h> +- ++#endif + #include "usl.h" + #include "l2tp_private.h" + diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tp-simplify-gcc-warning-hack.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tp-simplify-gcc-warning-hack.patch index c11a127b81..2a7435963e 100644 --- a/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tp-simplify-gcc-warning-hack.patch +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tp-simplify-gcc-warning-hack.patch @@ -10,7 +10,7 @@ it in place but remove the #if guard since it is only there to ensure that the l2tp_private.h file is updated if the rpc source file is changed and the two get out of sync. -Upstream-status: pending +Upstream-Status: Pending Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> --- diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd-enable-tests.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd-enable-tests.patch index 0bece2f4d7..ad60083d1c 100644 --- a/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd-enable-tests.patch +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd-enable-tests.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + commit 3e96a6c41bdd26417265a45ed685138d8eed564e Author: Aws Ismail <aws.ismail@windriver.com> Date: Fri Sep 14 02:32:53 2012 -0400 diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd-initscript-fix-sysconfig.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd-initscript-fix-sysconfig.patch index 3119425e69..c094e3859b 100644 --- a/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd-initscript-fix-sysconfig.patch +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd-initscript-fix-sysconfig.patch @@ -2,17 +2,17 @@ commit 6ea3125e2bec15004f312814022335d94cdf7e94 Author: Aws Ismail <aws.ismail@windriver.com> Date: Wed Sep 19 11:34:48 2012 -0400 - Fix openl2tp config script location +Fix openl2tp config script location - Correct the location of the sysconfig - script. Use /etc/default/ instead of - /etc/sysconfig/ +Correct the location of the sysconfig +script. Use /etc/default/ instead of +/etc/sysconfig/ - Signed-off-by: Aws Ismail <aws.ismail@windriver.com> +Signed-off-by: Aws Ismail <aws.ismail@windriver.com> - Upstream-Status: Inappropriate [configuration] +Upstream-Status: Inappropriate [configuration] - Signed-off-by: Jackie Huang <jackie.huang@windriver.com> +Signed-off-by: Jackie Huang <jackie.huang@windriver.com> diff --git a/etc/rc.d/init.d/openl2tpd b/etc/rc.d/init.d/openl2tpd index 7f27bb7..4194f63 100755 diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd-initscript-fix.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd-initscript-fix.patch index 9ecd4b072f..51bddb8942 100644 --- a/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd-initscript-fix.patch +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd-initscript-fix.patch @@ -2,16 +2,16 @@ commit 7c58a1e244ea83a9e7bbd51a6d354cee25cdbd33 Author: Aws Ismail <aws.ismail@windriver.com> Date: Wed Sep 12 23:35:40 2012 -0400 - Fix openl2tpd initscript - - - Correct the location of the retval statement. - - use start-stop-daemon instead of daemon. - - Signed-off-by: Aws Ismail <aws.ismail@windriver.com> +Fix openl2tpd initscript - Upstream-Status: Inappropriate [OE specific] +- Correct the location of the retval statement. +- use start-stop-daemon instead of daemon. - Signed-off-by: Jackie Huang <jackie.huang@windriver.com> +Signed-off-by: Aws Ismail <aws.ismail@windriver.com> + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Jackie Huang <jackie.huang@windriver.com> diff --git a/etc/rc.d/init.d/openl2tpd b/etc/rc.d/init.d/openl2tpd index ce21b50..7f27bb7 100755 diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd.service b/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd.service index 7b3faf6725..d02d0ff7ec 100644 --- a/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd.service +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd.service @@ -5,7 +5,7 @@ Requires=rpcbind.service [Service] Type=forking -PIDFile=@STATEDIR@/run/openl2tpd.pid +PIDFile=/run/openl2tpd.pid EnvironmentFile=@SYSCONFDIR@/default/openl2tpd ExecStartPre=@BASE_BINDIR@/sh -c "@BASE_SBINDIR@/modprobe -sq l2tp_ppp || @BASE_SBINDIR@/modprobe -sq pppol2tp" ExecStart=@SBINDIR@/openl2tpd $OPENL2TPDARGS diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb b/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb index bf6850b17c..f64c7340d1 100644 --- a/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb @@ -9,16 +9,16 @@ HOMEPAGE = "http://www.openl2tp.org/" SECTION = "net" # cli and usl use license LGPL-2.1 -LICENSE = "GPL-2.0 & LGPL-2.1" +LICENSE = "GPL-2.0-only & LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=e9d9259cbbf00945adc25a470c1d3585 \ file://LICENSE;md5=f8970abd5ea9be701a0deedf5afd77a5 \ file://cli/LICENSE;md5=9c1387a3c5213aa40671438af3e00793 \ file://usl/LICENSE;md5=9c1387a3c5213aa40671438af3e00793 \ " -DEPENDS = "popt flex readline" +DEPENDS = "popt flex readline rpcsvc-proto-native bison-native" -SRC_URI = "ftp://ftp.openl2tp.org/releases/${BP}/${BP}.tar.gz \ +SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${PV}/${BP}.tar.gz \ file://Makefile-modify-CFLAGS-to-aviod-build-error.patch \ file://openl2tp-simplify-gcc-warning-hack.patch \ file://Makefile-obey-LDFLAGS.patch \ @@ -33,30 +33,28 @@ SRC_URI = "ftp://ftp.openl2tp.org/releases/${BP}/${BP}.tar.gz \ file://openl2tpd.service \ file://openl2tpd-enable-tests.patch \ file://run-ptest \ - " - -SRC_URI_append_libc-musl = "\ - file://0004-Adjust-for-linux-kernel-headers-assumptions-on-glibc.patch \ + file://fix_linux_4.15_compile.patch \ file://0002-user-ipv6-structures.patch \ - file://0001-l2tp_api.c-include-rpc-clnt.h-for-resultproc_t.patch \ + file://0001-l2tp_rpc_server.c-Add-missing-prototype-for-l2tp_api.patch \ + file://0001-lex-yacc-Add-missing-function-prototypes.patch \ " SRC_URI[md5sum] = "e3d08dedfb9e6a9a1e24f6766f6dadd0" SRC_URI[sha256sum] = "1c97704d4b963a87fbc0e741668d4530933991515ae9ab0dffd11b5444f4860f" inherit autotools-brokensep pkgconfig systemd ptest -SYSTEMD_SERVICE_${PN} = "openl2tpd.service" +SYSTEMD_SERVICE:${PN} = "openl2tpd.service" SYSTEMD_AUTO_ENABLE = "disable" -DEPENDS_append_libc-musl = " libtirpc" -CPPFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc" -CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc" -LDFLAGS_append_libc-musl = " -ltirpc" +DEPENDS += "libtirpc" +CPPFLAGS += "-I${STAGING_INCDIR}/tirpc" +CFLAGS += "-I${STAGING_INCDIR}/tirpc" +LDFLAGS += "-ltirpc" PARALLEL_MAKE = "" EXTRA_OEMAKE = 'CFLAGS="${CFLAGS} -Wno-unused-but-set-variable" CPPFLAGS="${CPPFLAGS}" OPT_CFLAGS="${CFLAGS}"' -do_compile_prepend() { +do_compile:prepend() { sed -i -e "s:SYS_LIBDIR=.*:SYS_LIBDIR=${libdir}:g" \ -e 's:$(CROSS_COMPILE)as:${AS}:g' \ -e 's:$(CROSS_COMPILE)ld:${LD}:g' \ @@ -69,14 +67,14 @@ do_compile_prepend() { ${S}/Makefile } -do_install_append () { +do_install:append () { install -d ${D}${sysconfdir}/init.d install -d ${D}${sysconfdir}/default install -m 0755 ${S}/etc/rc.d/init.d/openl2tpd ${D}${sysconfdir}/init.d/openl2tpd install -m 0755 ${S}/etc/sysconfig/openl2tpd ${D}${sysconfdir}/default/openl2tpd if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -D -m 0644 ${WORKDIR}/openl2tpd.service ${D}${systemd_system_unitdir}/openl2tpd.service + install -D -m 0644 ${UNPACKDIR}/openl2tpd.service ${D}${systemd_system_unitdir}/openl2tpd.service sed -i -e 's,@STATEDIR@,${localstatedir},g' \ -e 's,@SYSCONFDIR@,${sysconfdir},g' \ -e 's,@SBINDIR@,${sbindir},g' \ @@ -95,4 +93,4 @@ do_install_ptest () { done } -RDEPENDS_${PN} = "ppp ppp-l2tp bash" +RDEPENDS:${PN} = "ppp ppp-l2tp bash" diff --git a/meta-networking/recipes-protocols/openlldp/files/0001-Fix-musl-libc-build-issue.patch b/meta-networking/recipes-protocols/openlldp/files/0001-Fix-musl-libc-build-issue.patch new file mode 100644 index 0000000000..04ceb6b572 --- /dev/null +++ b/meta-networking/recipes-protocols/openlldp/files/0001-Fix-musl-libc-build-issue.patch @@ -0,0 +1,28 @@ +From a64e52f9b58519aa2b8a1073fa6c04da04933428 Mon Sep 17 00:00:00 2001 +From: Jonathan Richardson <jonathan.richardson@broadcom.com> +Date: Wed, 26 Feb 2020 12:16:38 -0800 +Subject: [PATCH] Fix musl libc build issue + +clif.h should include sys/types.h for the definition of pid_t. It fails +to compile when using musl libc. + +Signed-off-by: Jonathan Richardson <jonathan.richardson@broadcom.com> + +--- +Upstream-Status: Pending + + include/clif.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/clif.h b/include/clif.h +index 648eedf..92f4fd8 100644 +--- a/include/clif.h ++++ b/include/clif.h +@@ -32,6 +32,7 @@ + #ifndef CLIF_H + #define CLIF_H + ++#include <sys/types.h> + #include <sys/un.h> + #include "clif_sock.h" + diff --git a/meta-networking/recipes-protocols/openlldp/files/0001-autotools-Add-include-path-to-generated-version.h.patch b/meta-networking/recipes-protocols/openlldp/files/0001-autotools-Add-include-path-to-generated-version.h.patch new file mode 100644 index 0000000000..f1a3ac3ad2 --- /dev/null +++ b/meta-networking/recipes-protocols/openlldp/files/0001-autotools-Add-include-path-to-generated-version.h.patch @@ -0,0 +1,31 @@ +From eb14aa66dc0384071af401cced8c02993b55502e Mon Sep 17 00:00:00 2001 +From: Jonathan Richardson <jonathan.richardson@broadcom.com> +Date: Wed, 26 Feb 2020 15:54:51 -0800 +Subject: [PATCH] autotools: Add include path to generated version.h + +When the build dir isn't the same as source dir it fails to compile +because the generated version.h from AC_CONFIG_FILES is always in build +dir. Include the path to it in AM_CPPFLAGS. + +Signed-off-by: Jonathan Richardson <jonathan.richardson@broadcom.com> + +--- +Upstream-Status: Pending + + Makefile.am | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/Makefile.am b/Makefile.am +index 0fb9bb0..2952019 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -14,6 +14,9 @@ endif + AM_CPPFLAGS = -I${srcdir}/include -DSYSCONFDIR="\"${sysconfdir}\"" \ + -D_FORTIFY_SOURCE=2 + ++# Required for the generated version.h when build dir is not the same as srcdir. ++AM_CPPFLAGS += -I${top_builddir}/include ++ + ACLOCAL_AMFLAGS = -I m4 + + parse_cli.o: CFLAGS+=-U_FORTIFY_SOURCE -Wno-error diff --git a/meta-networking/recipes-protocols/openlldp/files/0001-autotools-Add-option-to-disable-installation-of-syst.patch b/meta-networking/recipes-protocols/openlldp/files/0001-autotools-Add-option-to-disable-installation-of-syst.patch new file mode 100644 index 0000000000..b1d746f8bc --- /dev/null +++ b/meta-networking/recipes-protocols/openlldp/files/0001-autotools-Add-option-to-disable-installation-of-syst.patch @@ -0,0 +1,59 @@ +From 7147add9fedfb28909639ae419f995041d086266 Mon Sep 17 00:00:00 2001 +From: Jonathan Richardson <jonathan.richardson@broadcom.com> +Date: Fri, 6 Apr 2018 10:49:04 -0700 +Subject: [PATCH] autotools: Add option to disable installation of systemd conf + files + +Add option to configure.ac to enable or disable install of systemd conf +files. If --with-systemdsystemunitdir is passed to configure then the +files will be installed to the provided directory. If the option isn't +provided then the value is determined from the systemd pkgconfig file, +if found in PKG_CONFIG_PATH. + +This change is required because Makefile.am always installed the files +to a hard coded path that couldn't be changed. + + +Signed-off-by: Jonathan Richardson <jonathan.richardson@broadcom.com> +--- +Upstream-Status: Pending + + Makefile.am | 3 ++- + configure.ac | 9 +++++++++ + 2 files changed, 11 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 86174e9..e90e966 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -141,8 +141,9 @@ install-data-hook: installdirs-local + pkgconfigdir = ${libdir}/pkgconfig + pkgconfig_DATA = lldpad.pc liblldp_clif.pc + +-systemdsystemunitdir = $(prefix)/lib/systemd/system ++if HAVE_SYSTEMD + dist_systemdsystemunit_DATA = lldpad.service lldpad.socket ++endif + + bashcompletiondir = $(sysconfdir)/bash_completion.d + dist_bashcompletion_DATA = contrib/bash_completion/lldpad contrib/bash_completion/lldptool +diff --git a/configure.ac b/configure.ac +index fa2f3a0..1a038cd 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -132,6 +132,15 @@ AC_TYPE_UINT16_T + AC_TYPE_UINT32_T + AC_TYPE_UINT8_T + ++# Support for systemd unit files. ++AC_ARG_WITH([systemdsystemunitdir], ++ AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]), ++ [], [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)]) ++if test "x$with_systemdsystemunitdir" != xno; then ++ AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir]) ++fi ++AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ]) ++ + AC_CONFIG_FILES([Makefile include/version.h lldpad.spec lldpad.pc liblldp_clif.pc]) + AC_CONFIG_MACRO_DIR([m4]) + AC_OUTPUT diff --git a/meta-networking/recipes-protocols/openlldp/files/0004-clif-Include-string.h-for-mem-function-prototypes.patch b/meta-networking/recipes-protocols/openlldp/files/0004-clif-Include-string.h-for-mem-function-prototypes.patch new file mode 100644 index 0000000000..b6d9cf7707 --- /dev/null +++ b/meta-networking/recipes-protocols/openlldp/files/0004-clif-Include-string.h-for-mem-function-prototypes.patch @@ -0,0 +1,23 @@ +From d88aae2230683517b6d5b62cced51da81317a722 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 29 Aug 2022 22:37:14 -0700 +Subject: [PATCH] clif: Include string.h for mem* function prototypes + +Upstream-Status: Submitted [https://github.com/intel/openlldp/pull/86] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + clif.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/clif.c b/clif.c +index cad6f75..0758a7e 100644 +--- a/clif.c ++++ b/clif.c +@@ -32,6 +32,7 @@ + + #include <stdlib.h> + #include <stdio.h> ++#include <string.h> + #include <unistd.h> + #include <sys/types.h> + #include <sys/socket.h> diff --git a/meta-networking/recipes-protocols/openlldp/openlldp_1.1.1.bb b/meta-networking/recipes-protocols/openlldp/openlldp_1.1.1.bb new file mode 100644 index 0000000000..010cd5af84 --- /dev/null +++ b/meta-networking/recipes-protocols/openlldp/openlldp_1.1.1.bb @@ -0,0 +1,32 @@ +SUMMARY = "Open-LLDP" +DESCRIPTION = "Link Layer Discovery Protocol for Linux that includes support for DCBX" +HOMEPAGE = "http://open-lldp.org/start" + +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=8c2bc283e65df398ced5f5b747e78162" + +S = "${WORKDIR}/git" + +inherit pkgconfig autotools +inherit ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} + +DEPENDS = "libnl libconfig readline" + +SRCREV = "f1dd9eb961fab06723d2bedb2f7e2b81e45ee9ab" +PV .= "+git" +SRC_URI = "git://github.com/intel/openlldp.git;protocol=https;branch=branch-1.1 \ + file://0001-Fix-musl-libc-build-issue.patch \ + file://0001-autotools-Add-include-path-to-generated-version.h.patch \ + file://0001-autotools-Add-option-to-disable-installation-of-syst.patch \ + file://0004-clif-Include-string.h-for-mem-function-prototypes.patch \ + " + +# Enable install of systemd conf files. +EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_system_unitdir}', '', d)}" + +SYSTEMD_SERVICE:${PN} = "lldpad.service lldpad.socket" + +# To enable service at boot set to enable in local.conf. +SYSTEMD_AUTO_ENABLE ?= "disable" + +RRECOMMENDS:${PN} = "iproute2-tc" diff --git a/meta-networking/recipes-protocols/pptp-linux/pptp-linux/0001-include-missing-sys-types.h.patch b/meta-networking/recipes-protocols/pptp-linux/pptp-linux/0001-include-missing-sys-types.h.patch deleted file mode 100644 index 804bf12349..0000000000 --- a/meta-networking/recipes-protocols/pptp-linux/pptp-linux/0001-include-missing-sys-types.h.patch +++ /dev/null @@ -1,28 +0,0 @@ -From f6c4d2468ae0dadd2f35680d61b98b2a59077328 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 7 Jul 2017 10:31:03 -0700 -Subject: [PATCH] include missing sys/types.h - -Fixes errors seen on musl -pqueue.h:21:3: error: unknown type name 'u_int32_t' - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - pqueue.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/pqueue.h b/pqueue.h -index c37ba7b..ae4cc6a 100644 ---- a/pqueue.h -+++ b/pqueue.h -@@ -3,6 +3,7 @@ - - #include <time.h> - #include <sys/time.h> -+#include <sys/types.h> - - /* wait this many seconds for missing packets before forgetting about them */ - #define DEFAULT_PACKET_TIMEOUT 0.3 --- -2.13.2 - diff --git a/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.9.0.bb b/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.10.0.bb index 10c9170fb1..cabe18ef8a 100644 --- a/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.9.0.bb +++ b/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.10.0.bb @@ -6,16 +6,17 @@ DESCRIPTION = "PPTP Client is a Linux, FreeBSD, NetBSD \ cable and ADSL internet service providers." HOMEPAGE = "http://pptpclient.sourceforge.net" SECTION = "net" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +inherit perlnative + SRC_URI = "${SOURCEFORGE_MIRROR}/sourceforge/pptpclient/pptp-${PV}.tar.gz \ file://options.pptp \ - file://0001-include-missing-sys-types.h.patch \ " -SRC_URI[md5sum] = "b2117b377f65294a9786f80f0235d308" -SRC_URI[sha256sum] = "0b1e8cbfc578d3f5ab12ee87c5c2c60419abfe9cc445690a8a19c320b11c9201" +SRC_URI[md5sum] = "8d25341352fdae5ad5b36b9f18254908" +SRC_URI[sha256sum] = "82492db8e487ce73b182ee7f444251d20c44f5c26d6e96c553ec7093aefb5af4" S = "${WORKDIR}/pptp-${PV}" @@ -25,7 +26,7 @@ do_install() { install -d ${D}${sbindir} ${D}${sysconfdir}/ppp ${D}${mandir}/man8 install -m 555 pptp ${D}${sbindir} install -m 644 pptp.8 ${D}${mandir}/man8 - install -m 644 ${WORKDIR}/options.pptp ${D}${sysconfdir}/ppp + install -m 644 ${UNPACKDIR}/options.pptp ${D}${sysconfdir}/ppp } -RDEPENDS_${PN} = "ppp" +RDEPENDS:${PN} = "ppp" diff --git a/meta-networking/recipes-protocols/quagga/files/bgpd.service b/meta-networking/recipes-protocols/quagga/files/bgpd.service deleted file mode 100644 index 76f9f61e73..0000000000 --- a/meta-networking/recipes-protocols/quagga/files/bgpd.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=BGP routing daemon -BindTo=zebra.service -After=zebra.service -ConditionPathExists=@SYSCONFDIR@/quagga/bgpd.conf - -[Service] -Type=forking -EnvironmentFile=-@SYSCONFDIR@/default/quagga -PIDFile=@localstatedir@/run/quagga/bgpd.pid -ExecStart=@SBINDIR@/bgpd -d $bgpd_options -f @SYSCONFDIR@/quagga/bgpd.conf -ExecStopPost=@base_bindir@/rm -rf @localstatedir@/run/quagga/bgpd.pid -Restart=on-abort - -[Install] -WantedBy=multi-user.target diff --git a/meta-networking/recipes-protocols/quagga/files/isisd.service b/meta-networking/recipes-protocols/quagga/files/isisd.service deleted file mode 100644 index 9bfe7b65ef..0000000000 --- a/meta-networking/recipes-protocols/quagga/files/isisd.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=IS-IS routing daemon -BindTo=zebra.service -After=zebra.service -ConditionPathExists=@SYSCONFDIR@/quagga/isisd.conf - -[Service] -Type=forking -EnvironmentFile=-@SYSCONFDIR@/default/quagga -ExecStart=@SBINDIR@/isisd -d $isisd_options -f /etc/quagga/isisd.conf -Restart=on-abort - -[Install] -WantedBy=multi-user.target diff --git a/meta-networking/recipes-protocols/quagga/files/ospf6d.service b/meta-networking/recipes-protocols/quagga/files/ospf6d.service deleted file mode 100644 index a2e493b423..0000000000 --- a/meta-networking/recipes-protocols/quagga/files/ospf6d.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=OSPF routing daemon for IPv6 -BindTo=zebra.service -After=zebra.service -ConditionPathExists=@SYSCONFDIR@/quagga/ospf6d.conf - -[Service] -Type=forking -EnvironmentFile=-@SYSCONFDIR@/default/quagga -PIDFile=@localstatedir@/run/quagga/ospf6d.pid -ExecStart=@SBINDIR@/ospf6d -d $ospf6d_options -f @SYSCONFDIR@/quagga/ospf6d.conf -ExecStopPost=@base_bindir@/rm -rf @localstatedir@/run/quagga/ospf6d.pid -Restart=on-abort - -[Install] -WantedBy=multi-user.target diff --git a/meta-networking/recipes-protocols/quagga/files/ospfd.service b/meta-networking/recipes-protocols/quagga/files/ospfd.service deleted file mode 100644 index 0c62cbce58..0000000000 --- a/meta-networking/recipes-protocols/quagga/files/ospfd.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=OSPF routing daemon -BindTo=zebra.service -After=zebra.service -ConditionPathExists=@SYSCONFDIR@/quagga/ospfd.conf - -[Service] -Type=forking -EnvironmentFile=-@SYSCONFDIR@/default/quagga -PIDFile=@localstatedir@/run/quagga/ospfd.pid -ExecStart=@SBINDIR@/ospfd -d $ospfd_options -f @SYSCONFDIR@/quagga/ospfd.conf -ExecStopPost=@base_bindir@/rm -rf @localstatedir@/run/quagga/ospfd.pid -Restart=on-abort - -[Install] -WantedBy=multi-user.target diff --git a/meta-networking/recipes-protocols/quagga/files/quagga.default b/meta-networking/recipes-protocols/quagga/files/quagga.default deleted file mode 100644 index 4c4bc23071..0000000000 --- a/meta-networking/recipes-protocols/quagga/files/quagga.default +++ /dev/null @@ -1,12 +0,0 @@ -# If this option is set the /etc/init.d/quagga script automatically loads -# the config via "vtysh -b" when the servers are started. -vtysh_enable=yes - -# Bind all daemons to loopback only by default -zebra_options=" --daemon -A 127.0.0.1" -bgpd_options=" --daemon -A 127.0.0.1" -ospfd_options=" --daemon -A 127.0.0.1" -ospf6d_options="--daemon -A ::1" -ripd_options=" --daemon -A 127.0.0.1" -ripngd_options="--daemon -A ::1" -isisd_options=" --daemon -A 127.0.0.1" diff --git a/meta-networking/recipes-protocols/quagga/files/quagga.init b/meta-networking/recipes-protocols/quagga/files/quagga.init deleted file mode 100644 index df1beb7123..0000000000 --- a/meta-networking/recipes-protocols/quagga/files/quagga.init +++ /dev/null @@ -1,200 +0,0 @@ -#!/bin/sh -# -# /etc/init.d/quagga -- start/stop the Quagga routing daemons -# -# Based on debian version by Endre Hirling <endre@mail.elte.hu> and -# Christian Hammers <ch@debian.org>. -# - -### BEGIN INIT INFO -# Provides: quagga -# Required-Start: $local_fs $network $remote_fs $syslog -# Required-Stop: $local_fs $network $remote_fs $syslog -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: start and stop the Quagga routing suite -# Description: Quagga is a routing suite for IP routing protocols like -# BGP, OSPF, RIP and others. This script contols the main -# daemon "quagga" as well as the individual protocol daemons. -### END INIT INFO - -# NOTE: sbin must be before bin so we get the iproute2 ip and not the -# busybox ip command. The busybox one flushes all routes instead of just -# the dynamic routes -PATH=/sbin:/usr/sbin:/bin:/usr/bin:/sbin -D_PATH=/usr/sbin -C_PATH=/etc/quagga - -# Keep zebra first and do not list watchquagga! -DAEMONS="zebra bgpd ripd ripngd ospfd ospf6d isisd" - -# Print the name of the pidfile. -pidfile() -{ - echo "/var/run/quagga/$1.pid" -} - -# Check if daemon is started by using the pidfile. -started() -{ - [ -e `pidfile $1` ] && kill -0 `cat \`pidfile $1\`` 2> /dev/null && return 0 - return 1 -} - -# Loads the config via vtysh -b if configured to do so. -vtysh_b () -{ - # Rember, that all variables have been incremented by 1 in convert_daemon_prios() - if [ "$vtysh_enable" = 2 -a -f $C_PATH/Quagga.conf ]; then - /usr/bin/vtysh -b - fi -} - -# Check if the daemon is activated and if its executable and config files -# are in place. -# params: daemon name -# returns: 0=ok, 1=error -check_daemon() -{ - # If the integrated config file is used the others are not checked. - if [ -r "$C_PATH/Quagga.conf" ]; then - return 0 - fi - - # check for config file - if [ ! -r "$C_PATH/$1.conf" ]; then - return 1 - fi - return 0 -} - -# Starts the server if it's not alrady running according to the pid file. -# The Quagga daemons creates the pidfile when starting. -start() -{ - if ! check_daemon $1; then echo -n " (!$1)"; return; fi - echo -n " $1" - start-stop-daemon \ - --start \ - --pidfile=`pidfile $1` \ - --exec "$D_PATH/$1" \ - -- \ - `eval echo "$""$1""_options"` - -} - -# Stop the daemon given in the parameter, printing its name to the terminal. -stop() -{ - if ! started "$1" ; then - echo -n " (!$1)" - return 0 - else - PIDFILE=`pidfile $1` - PID=`cat $PIDFILE 2>/dev/null` - start-stop-daemon --stop --quiet --exec "$D_PATH/$1" - # - # Now we have to wait until $DAEMON has _really_ stopped. - # - if test -n "$PID" && kill -0 $PID 2>/dev/null; then - echo -n " (waiting) ." - cnt=0 - while kill -0 $PID 2>/dev/null; do - cnt=`expr $cnt + 1` - if [ $cnt -gt 60 ]; then - # Waited 120 secs now, fail. - echo -n "Failed.. " - break - fi - sleep 2 - echo -n "." - done - fi - echo -n " $1" - rm -f `pidfile $1` - fi -} - -stop_all() -{ - local daemon_list - daemon_list=${1:-$DAEMONS} - - echo -n "Stopping Quagga daemons:" - for daemon_name in $daemon_list; do - stop "$daemon_name" - done - echo "." -} - -start_all() -{ - local daemon_list - daemon_list=${1:-$DAEMONS} - - echo -n "Starting Quagga daemons:" - for daemon_name in $daemon_list; do - start "$daemon_name" - done - echo "." -} - -status_all() -{ - local daemon_list - daemon_list=${1:-$DAEMONS} - res=1 - - echo -n "quagga: " - for daemon_name in $daemon_list; do - if started "$daemon_name" ; then - id=`cat \`pidfile $daemon_name\`` - echo -n "$daemon_name (pid $id) " - res=0 - fi - done - if [ $res -eq 0 ]; then - echo "is running..." - else - echo "is stopped..." - fi - exit $res -} - -######################################################### -# Main program # -######################################################### - -# Load configuration -test -f /etc/default/quagga && . /etc/default/quagga - -case "$1" in - start) - cd $C_PATH/ - start_all $2 - vtysh_b - ;; - - stop) - stop_all $2 - echo "Removing all routes made by zebra." - ip route flush proto zebra - ;; - - status) - status_all $2 - ;; - - restart|force-reload) - $0 stop $2 - sleep 1 - $0 start $2 - ;; - - *) - echo "Usage: /etc/init.d/quagga {start|stop|restart|status|force-reload} [daemon]" - exit 1 - ;; -esac - -exit 0 diff --git a/meta-networking/recipes-protocols/quagga/files/ripd.service b/meta-networking/recipes-protocols/quagga/files/ripd.service deleted file mode 100644 index 1d20389e8b..0000000000 --- a/meta-networking/recipes-protocols/quagga/files/ripd.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=RIP routing daemon -BindTo=zebra.service -After=zebra.service -ConditionPathExists=@SYSCONFDIR@/quagga/ripd.conf - -[Service] -Type=forking -EnvironmentFile=-@SYSCONFDIR@/default/quagga -PIDFile=@localstatedir@/run/quagga/ripd.pid -ExecStart=@SBINDIR@/ripd -d $ripd_options -f @SYSCONFDIR@/quagga/ripd.conf -ExecStopPost=@base_bindir@/rm -rf @localstatedir@/run/quagga/ripd.pid -Restart=on-abort - -[Install] -WantedBy=multi-user.target diff --git a/meta-networking/recipes-protocols/quagga/files/ripngd.service b/meta-networking/recipes-protocols/quagga/files/ripngd.service deleted file mode 100644 index 0355ad12a4..0000000000 --- a/meta-networking/recipes-protocols/quagga/files/ripngd.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=RIP routing daemon for IPv6 -BindTo=zebra.service -After=zebra.service -ConditionPathExists=@SYSCONFDIR@/quagga/ripngd.conf - -[Service] -Type=forking -EnvironmentFile=-@SYSCONFDIR@/default/quagga -PIDFile=@localstatedir@/run/quagga/ripngd.pid -ExecStart=@SBINDIR@/ripngd -d $ripngd_options -f @SYSCONFDIR@/quagga/ripngd.conf -ExecStopPost=@base_bindir@/rm -rf @localstatedir@/run/quagga/ripngd.pid -Restart=on-abort - -[Install] -WantedBy=multi-user.target diff --git a/meta-networking/recipes-protocols/quagga/files/volatiles.03_quagga b/meta-networking/recipes-protocols/quagga/files/volatiles.03_quagga deleted file mode 100644 index 1f28c0b24d..0000000000 --- a/meta-networking/recipes-protocols/quagga/files/volatiles.03_quagga +++ /dev/null @@ -1,3 +0,0 @@ -# <type> <owner> <group> <mode> <path> <linksource> -d quagga quagga 0755 /var/run/quagga none -d quagga quagga 0755 /var/log/quagga none diff --git a/meta-networking/recipes-protocols/quagga/files/watchquagga.default b/meta-networking/recipes-protocols/quagga/files/watchquagga.default deleted file mode 100644 index 2d601ec97d..0000000000 --- a/meta-networking/recipes-protocols/quagga/files/watchquagga.default +++ /dev/null @@ -1,12 +0,0 @@ -# Watchquagga configuration -#watch_daemons="zebra bgpd ospfd ospf6d ripd ripngd" -watch_daemons="zebra" - -# To enable restarts when multiple daemons are being used, uncomment this line (but first be sure to edit -# the WATCH_DAEMONS line to reflect the daemons you are actually using): -#watch_options="-Az -b_ -r/etc/init.d/quagga_restart_%s -s/etc/init.d/quagga_start_%s -k/etc/init.d/quagga_stop_%s" - -# Since we are using one quagga daemon for now, use the following line. If using -# multiple daemons, comment the line below and uncoment the line mentioned -# above. -watch_options="-z -b_ -r/etc/init.d/quagga_restart_%s" diff --git a/meta-networking/recipes-protocols/quagga/files/watchquagga.init b/meta-networking/recipes-protocols/quagga/files/watchquagga.init deleted file mode 100644 index 5ddd94a3d6..0000000000 --- a/meta-networking/recipes-protocols/quagga/files/watchquagga.init +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/sh -# -### BEGIN INIT INFO -# Provides: watchquagga -# Required-Start: $local_fs $network $remote_fs $syslog -# Required-Stop: $local_fs $network $remote_fs $syslog -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: start and stop the Quagga watchdog -### END INIT INFO - -PATH=/bin:/usr/bin:/sbin:/usr/sbin - -# Load configuration -test -f /etc/default/watchquagga && . /etc/default/watchquagga - -# Check that there are daemons to be monitored. -[ -z "$watch_daemons" ] && exit 0 - -pidfile="/var/run/quagga/watchquagga.pid" - -case "$1" in - start) - echo -n "Starting quagga watchdog daemon: watchquagga" - start-stop-daemon --start \ - --pidfile $pidfile \ - --exec /usr/sbin/watchquagga \ - -- -d $watch_options $watch_daemons - echo "." - ;; - - stop) - echo -n "Stopping quagga watchdog daemon: watchquagga" - start-stop-daemon --stop --quiet \ - --pidfile $pidfile - echo "." - ;; - - status) - echo -n "watchquagga " - res=1 - [ -e $pidfile ] && kill -0 `cat $pidfile` 2> /dev/null - if [ $? -eq 0 ]; then - echo "(pid `cat $pidfile`) is running..." - res=0 - else - echo "is stopped..." - fi - exit $res - ;; - - restart|force-reload) - $0 stop $2 - sleep 1 - $0 start $2 - ;; - - *) - echo "Usage: /etc/init.d/watchquagga {start|stop|restart|force-reload}" - exit 1 - ;; -esac - -exit 0 diff --git a/meta-networking/recipes-protocols/quagga/files/zebra.service b/meta-networking/recipes-protocols/quagga/files/zebra.service deleted file mode 100644 index e4fb6c808d..0000000000 --- a/meta-networking/recipes-protocols/quagga/files/zebra.service +++ /dev/null @@ -1,17 +0,0 @@ -[Unit] -Description=GNU Zebra routing manager -Wants=network.target -Before=network.target -ConditionPathExists=@SYSCONFDIR@/quagga/zebra.conf - -[Service] -Type=forking -EnvironmentFile=-@SYSCONFDIR@/default/quagga -PIDFile=@localstatedir@/run/quagga/zebra.pid -ExecStartPre=@BASE_SBINDIR@/ip route flush proto zebra -ExecStart=@SBINDIR@/zebra -d $zebra_options -f @SYSCONFDIR@/quagga/zebra.conf -ExecStopPost=@base_bindir@/rm -rf @localstatedir@/run/quagga/zebra.pid -Restart=on-abort - -[Install] -WantedBy=multi-user.target diff --git a/meta-networking/recipes-protocols/quagga/quagga.inc b/meta-networking/recipes-protocols/quagga/quagga.inc deleted file mode 100644 index dfd6aa7eb1..0000000000 --- a/meta-networking/recipes-protocols/quagga/quagga.inc +++ /dev/null @@ -1,232 +0,0 @@ -SUMMARY = "BGP/OSPF/RIP routing daemon" -DESCRIPTION = "Quagga is a routing software suite, providing \ -implementations of OSPFv2, OSPFv3, RIP v1 and v2, RIPv3 and BGPv4 for \ -Unix platforms, particularly FreeBSD, Linux, Solaris and NetBSD. \ -Quagga is a fork of GNU Zebra which was developed by Kunihiro \ -Ishiguro. The Quagga tree aims to build a more involved community \ -around Quagga than the current centralised model of GNU Zebra." -HOMEPAGE = "http://www.nongnu.org/quagga/" -SECTION = "net" - - -LICENSE = "GPL-2.0 & LGPL-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=81bcece21748c91ba9992349a91ec11d \ - file://COPYING.LIB;md5=01ef24401ded36cd8e5d18bfe947240c" - -DEPENDS = "readline ncurses perl-native c-ares" -DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'snmp', 'net-snmp', '', d)}" -SNMP_CONF="${@bb.utils.contains('DISTRO_FEATURES', 'snmp', '--enable-snmp', '', d)}" - -# the "ip" command from busybox is not sufficient (flush by protocol flushes all routes) -RDEPENDS_${PN} += "iproute2" - -SRC_URI = "${SAVANNAH_GNU_MIRROR}/quagga/quagga-${PV}.tar.gz; \ - file://quagga.init \ - file://quagga.default \ - file://watchquagga.init \ - file://watchquagga.default \ - file://volatiles.03_quagga \ - file://quagga.pam \ - file://bgpd.service \ - file://isisd.service \ - file://ospf6d.service \ - file://ospfd.service \ - file://ripd.service \ - file://ripngd.service \ - file://zebra.service \ - " - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" -PACKAGECONFIG[cap] = "--enable-capabilities,--disable-capabilities,libcap" -PACKAGECONFIG[pam] = "--with-libpam, --without-libpam, libpam" - -inherit autotools update-rc.d useradd systemd pkgconfig - -SYSTEMD_PACKAGES = "${PN} ${PN}-bgpd ${PN}-isisd ${PN}-ospf6d ${PN}-ospfd ${PN}-ripd ${PN}-ripngd" -SYSTEMD_SERVICE_${PN}-bgpd = "bgpd.service" -SYSTEMD_SERVICE_${PN}-isisd = "isisd.service" -SYSTEMD_SERVICE_${PN}-ospf6d = "ospf6d.service" -SYSTEMD_SERVICE_${PN}-ospfd = "ospfd.service" -SYSTEMD_SERVICE_${PN}-ripd = "ripd.service" -SYSTEMD_SERVICE_${PN}-ripngd = "ripngd.service" -SYSTEMD_SERVICE_${PN} = "zebra.service" - -EXTRA_OECONF = "--sysconfdir=${sysconfdir}/quagga \ - --localstatedir=${localstatedir}/run/quagga \ - --enable-exampledir=${docdir}/quagga/examples/ \ - --enable-vtysh \ - --enable-isisd \ - ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '--enable-watchquagga', '--disable-watchquagga', d)} \ - --enable-ospfclient=yes \ - --enable-multipath=64 \ - --enable-user=quagga \ - --enable-group=quagga \ - --enable-vty-group=quaggavty \ - --enable-configfile-mask=0640 \ - --enable-logfile-mask=0640 \ - --enable-rtadv \ - --enable-linux24-tcp-md5 \ - ap_cv_cc_pie=no \ - ${SNMP_CONF}" - -CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl'" - -do_install () { - # Install init script and default settings - install -m 0755 -d ${D}${sysconfdir}/default ${D}${sysconfdir}/init.d \ - ${D}${sysconfdir}/quagga ${D}${sysconfdir}/default/volatiles - install -m 0644 ${WORKDIR}/quagga.default ${D}${sysconfdir}/default/quagga - install -m 0644 ${WORKDIR}/watchquagga.default ${D}${sysconfdir}/default/watchquagga - install -m 0755 ${WORKDIR}/quagga.init ${D}${sysconfdir}/init.d/quagga - install -m 0755 ${WORKDIR}/watchquagga.init ${D}${sysconfdir}/init.d/watchquagga - install -m 0644 ${WORKDIR}/volatiles.03_quagga ${D}${sysconfdir}/default/volatiles/volatiles.03_quagga - - # Install sample configurations for the daemons - for f in bgpd vtysh isisd ospfd ripngd zebra ripd ospf6d; do - install -m 0640 ${S}/$f/$f.conf.sample ${D}${sysconfdir}/quagga/$f.conf.sample - done - - for f in bgpd vtysh isisd ospfd ripngd zebra ripd ospf6d; do - touch ${D}${sysconfdir}/quagga/$f.conf - done - chown quagga:quaggavty ${D}${sysconfdir}/quagga - chown quagga:quagga ${D}${sysconfdir}/quagga/*.conf - chmod 750 ${D}${sysconfdir}/quagga - chmod 640 ${D}${sysconfdir}/quagga/*.conf - - # Install quagga - oe_runmake install DESTDIR=${D} prefix=${prefix} \ - sbindir=${sbindir} \ - sysconfdir=${sysconfdir}/quagga \ - localstatedir=${localstatedir}/run/quagga - - # Fix hardcoded paths - sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/* - sed -i 's!/usr/bin/!${bindir}/!g' ${D}${sysconfdir}/init.d/quagga - sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/* ${D}${sysconfdir}/default/watchquagga - sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/* ${D}${sysconfdir}/default/volatiles/volatiles.03_quagga - sed -i 's!^PATH=.*!PATH=${base_sbindir}:${sbindir}:${base_bindir}:${bindir}!' ${D}${sysconfdir}/init.d/* - - # For PAM - for feature in ${DISTRO_FEATURES}; do - if [ "$feature" = "pam" ]; then - install -D -m 644 ${WORKDIR}/quagga.pam ${D}/${sysconfdir}/pam.d/quagga - break - fi - done - - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -d ${D}${sysconfdir}/tmpfiles.d - echo "d /var/run/quagga 0755 quagga quagga -" \ - > ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf - fi - - # Remove sysinit script if sysvinit is not in DISTRO_FEATURES - if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'false', 'true', d)}; then - rm -rf ${D}${sysconfdir}/init.d/ - rm -f ${D}${sysconfdir}/default/watchquagga - fi - - install -d ${D}${systemd_unitdir}/system - for i in bgpd isisd ospf6d ospfd ripd ripngd zebra; do - install -m 0644 ${WORKDIR}/$i.service ${D}${systemd_unitdir}/system - done - sed -e 's,@BASE_SBINDIR@,${base_sbindir},g' \ - -e 's,@SYSCONFDIR@,${sysconfdir},g' \ - -e 's,@SBINDIR@,${sbindir},g' \ - -e 's,@base_bindir@,${base_bindir},g' \ - -e 's,@localstatedir@,${localstatedir},g' \ - -i ${D}${systemd_unitdir}/system/*.service -} - -DEPENDS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd-systemctl-native', '', d)}" -pkg_postinst_${PN} () { - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd sysvinit', 'true', 'false', d)}; then - if [ -n "$D" ]; then - OPTS="--root=$D" - fi - systemctl $OPTS mask quagga.service - fi -} - -# Split into a main package and separate per-protocol packages -PACKAGE_BEFORE_PN = "${PN}-ospfd ${PN}-ospf6d ${PN}-bgpd \ - ${PN}-ripd ${PN}-ripngd ${PN}-isisd \ - ${PN}-ospfclient ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '${PN}-watchquagga', '', d)}" - -RDEPENDS_${PN} += "${PN}-bgpd ${PN}-isisd ${PN}-ospf6d ${PN}-ospfd ${PN}-ripd ${PN}-ripngd" - -FILES_${PN}-ospfd = "${sbindir}/ospfd ${libdir}/libospf.so.*" -FILES_${PN}-ospf6d = "${sbindir}/ospf6d" -FILES_${PN}-bgpd = "${sbindir}/bgpd" -FILES_${PN}-ripd = "${sbindir}/ripd" -FILES_${PN}-ripngd = "${sbindir}/ripngd" -FILES_${PN}-isisd = "${sbindir}/isisd" -FILES_${PN}-ospfclient = "${sbindir}/ospfclient ${libdir}/libospfapiclient.so.*" -FILES_${PN}-watchquagga = "${sbindir}/watchquagga ${sysconfdir}/default/watchquagga \ - ${sysconfdir}/init.d/watchquagga" - -# Indicate that the default files are configuration files -CONFFILES_${PN} = "${sysconfdir}/default/quagga \ - ${sysconfdir}/quagga/bgpd.conf \ - ${sysconfdir}/quagga/vtysh.conf \ - ${sysconfdir}/quagga/isisd.conf \ - ${sysconfdir}/quagga/ospfd.conf \ - ${sysconfdir}/quagga/ripngd.conf \ - ${sysconfdir}/quagga/zebra.conf \ - ${sysconfdir}/quagga/ripd.conf \ - ${sysconfdir}/quagga/ospf6d.conf \ - " -CONFFILES_${PN}-watchquagga = "${sysconfdir}/default/watchquagga" - -# Stop the names being rewritten due to the internal shared libraries -DEBIAN_NOAUTONAME_${PN}-ospfd = "1" -DEBIAN_NOAUTONAME_${PN}-ospfclient = "1" - -# Main init script starts all deamons -# Seperate init script for watchquagga -INITSCRIPT_PACKAGES = "${PN} ${PN}-watchquagga" -INITSCRIPT_NAME_${PN} = "quagga" -INITSCRIPT_PARAMS_${PN} = "defaults 15 85" -INITSCRIPT_NAME_${PN}-watchquagga = "watchquagga" -INITSCRIPT_PARAMS_${PN}-watchquagga = "defaults 90 10" - -# Add quagga's user and group -USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "--system quagga ; --system quaggavty" -USERADD_PARAM_${PN} = "--system --home ${localstatedir}/run/quagga/ -M -g quagga -G quaggavty --shell /bin/false quagga" - -pkg_postinst_${PN} () { - if [ -z "$D" ] && [ -e /etc/init.d/populate-volatile.sh ] ; then - ${sysconfdir}/init.d/populate-volatile.sh update - fi -} - -# Stop apps before uninstall -pkg_prerm_${PN} () { - ${sysconfdir}/init.d/quagga stop -} - -pkg_prerm_${PN}-ospfd () { - ${sysconfdir}/init.d/quagga stop ospfd -} - -pkg_prerm_${PN}-ospf6d () { - ${sysconfdir}/init.d/quagga stop ospf6d -} - -pkg_prerm_${PN}-bgpd () { - ${sysconfdir}/init.d/quagga stop bgpd -} - -pkg_prerm_${PN}-ripd () { - ${sysconfdir}/init.d/quagga stop ripd -} - -pkg_prerm_${PN}-ripngd () { - ${sysconfdir}/init.d/quagga stop ripngd -} - -pkg_prerm_${PN}-isisd () { - ${sysconfdir}/init.d/quagga stop isisd -} diff --git a/meta-networking/recipes-protocols/quagga/quagga_1.2.1.bb b/meta-networking/recipes-protocols/quagga/quagga_1.2.1.bb deleted file mode 100644 index 4d43d7b2ac..0000000000 --- a/meta-networking/recipes-protocols/quagga/quagga_1.2.1.bb +++ /dev/null @@ -1,4 +0,0 @@ -require quagga.inc - -SRC_URI[md5sum] = "b1546de89062f7070d56e780b30be4b1" -SRC_URI[sha256sum] = "aaddba5d4f41ed8e4c2f155f4584c993465d122c9096b5b52ada3fc75266fbcd" diff --git a/meta-networking/recipes-protocols/radiusclient-ng/radiusclient-ng/Modify-configure.in-and-etc-Makefile.am.patch b/meta-networking/recipes-protocols/radiusclient-ng/radiusclient-ng/Modify-configure.in-and-etc-Makefile.am.patch index ecc2d74e74..fd9961b9e8 100644 --- a/meta-networking/recipes-protocols/radiusclient-ng/radiusclient-ng/Modify-configure.in-and-etc-Makefile.am.patch +++ b/meta-networking/recipes-protocols/radiusclient-ng/radiusclient-ng/Modify-configure.in-and-etc-Makefile.am.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Modify configure.in and etc/Makefile.am this patch is from Fedora to fix error: "conftest.c:26:9: error: unknown type name 'not'" -Upstream-Status: pending +Upstream-Status: Pending Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> --- diff --git a/meta-networking/recipes-protocols/radiusclient-ng/radiusclient-ng_0.5.6.bb b/meta-networking/recipes-protocols/radiusclient-ng/radiusclient-ng_0.5.6.bb index 95faa65b1e..6baa83e83e 100644 --- a/meta-networking/recipes-protocols/radiusclient-ng/radiusclient-ng_0.5.6.bb +++ b/meta-networking/recipes-protocols/radiusclient-ng/radiusclient-ng_0.5.6.bb @@ -5,25 +5,26 @@ protocol (RFCs 2128 and 2139)." HOMEPAGE = "http://sourceforge.net/projects/radiusclient-ng.berlios/" SECTION = "net" -SRC_URI = "${DEBIAN_MIRROR}/main/r/${BPN}/${BPN}_${PV}.orig.tar.gz \ +SRC_URI = "http://archive.ubuntu.com/ubuntu/pool/universe/r/${BPN}/${BPN}_${PV}.orig.tar.gz \ file://Modify-configure.in-and-etc-Makefile.am.patch \ file://config-site.radiusclient-ng-${PV}" -SRC_URI[md5sum] = "6fb7d4d0aefafaee7385831ac46a8e9c" SRC_URI[sha256sum] = "282a9f1355f190efbb06c0d7c4e062eaa652caf342ed3ad361ac595f72f09f14" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause & BSD-2-Clause & HPND" LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=3e47566c9271b786693d8a08792dbf41" inherit autotools-brokensep +DEPENDS += "virtual/crypt" + EXTRA_OECONF += "--disable-static" -do_configure_prepend () { +do_configure:prepend () { export CONFIG_SITE=./config-site.${P} } -do_compile_prepend() { +do_compile:prepend() { for m in `find . -name "Makefile"` ; do sed -i -e 's:^program_transform_name =.*:program_transform_name =:g' ${m} done diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/configure.in-Error-fix.patch b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/configure.in-Error-fix.patch deleted file mode 100644 index 2661fd3dbc..0000000000 --- a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/configure.in-Error-fix.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 71956de46feef962dc0645af4c81ae074ca3b818 Mon Sep 17 00:00:00 2001 -From: Lei Maohui <leimaohui@cn.fujitsu.com> -Date: Wed, 19 Aug 2015 13:52:57 +0900 -Subject: [PATCH] configure.in: Error fix. - -the error is: conftest.c:9:28: fatal error: ac_nonexistent.h: -No such file or directory #include <ac_nonexistent.h> - -Upstream-Status: pending - -Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> ---- - src/configure.in | 30 ------------------------------ - 1 file changed, 30 deletions(-) - -diff --git a/src/configure.in b/src/configure.in -index 0b23df5..31c7fbc 100644 ---- a/src/configure.in -+++ b/src/configure.in -@@ -193,36 +193,6 @@ if test "$GCC" = yes; then - CFLAGS="$CFLAGS -fno-strict-aliasing -Wall -Wstrict-prototypes" - fi - --dnl Figure out packing order of structures --AC_CACHE_CHECK([packing order of bit fields],rpppoe_cv_pack_bitfields,[ --if test "${rpppoe_cv_pack_bitfields+set}" != set ; then --AC_TRY_RUN([ --union foo { -- struct bar { -- unsigned int ver:4; -- unsigned int type:4; -- } bb; -- unsigned char baz; --}; -- --int --main(void) --{ -- union foo x; -- x.bb.ver = 1; -- x.bb.type = 2; -- if (x.baz == 0x21) { -- return 1; -- } else if (x.baz == 0x12) { -- return 0; -- } else { -- return 2; -- } --}], rpppoe_cv_pack_bitfields=normal, rpppoe_cv_pack_bitfields=rev, --$ECHO "no defaults for cross-compiling"; exit 1) --fi --]) -- - if test "$rpppoe_cv_pack_bitfields" = "rev" ; then - AC_MSG_RESULT(reversed) - AC_DEFINE([PACK_BITFIELDS_REVERSED], [], [Reversed bitfields]) --- -1.8.4.2 - diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/configure.patch b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/configure.patch deleted file mode 100644 index 1380ba4891..0000000000 --- a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/configure.patch +++ /dev/null @@ -1,11 +0,0 @@ -Index: rp-pppoe-3.8/configure.in -=================================================================== ---- rp-pppoe-3.8.orig/configure.in 2014-07-16 19:31:33.549991388 +0000 -+++ rp-pppoe-3.8/configure.in 2014-07-17 22:01:18.116590827 +0000 -@@ -1,4 +1,4 @@ --AC_INIT(src/pppoe.c) --AM_INIT_AUTOMAKE([rp-pppoe], [3.8]) -+AC_INIT([rp-pppoe], [3.8]) -+AM_INIT_AUTOMAKE([foreign]) - AC_CONFIG_SUBDIRS(src) - AC_OUTPUT(Makefile) diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/dont-swallow-errors.patch b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/dont-swallow-errors.patch deleted file mode 100644 index f61337f153..0000000000 --- a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/dont-swallow-errors.patch +++ /dev/null @@ -1,28 +0,0 @@ -From bbdadb803b19f002e76e7bb5ce3faf770dd7c413 Mon Sep 17 00:00:00 2001 -From: Lei Maohui <leimaohui@cn.fujitsu.com> -Date: Wed, 19 Aug 2015 12:33:41 +0900 -Subject: [PATCH] don't swallow errors - -Further fixup to the configure scripts to not swallow errors - -Upstream-Status: Pending ---- - src/configure.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/configure.in b/src/configure.in -index 82d64d6..0b23df5 100644 ---- a/src/configure.in -+++ b/src/configure.in -@@ -219,7 +219,7 @@ main(void) - return 2; - } - }], rpppoe_cv_pack_bitfields=normal, rpppoe_cv_pack_bitfields=rev, --$ECHO "no defaults for cross-compiling"; exit 0) -+$ECHO "no defaults for cross-compiling"; exit 1) - fi - ]) - --- -1.8.4.2 - diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/pppoe-src-restrictions.patch b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/pppoe-src-restrictions.patch deleted file mode 100644 index bcf4d1164d..0000000000 --- a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/pppoe-src-restrictions.patch +++ /dev/null @@ -1,20 +0,0 @@ -Relax restrictions on the PPPoE src address, as per debian bug -293811: - - http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=293811 - -Upstream-Status: Inappropriate [Backport from Debian] - ---- rp-pppoe-3.8.orig/src/discovery.c -+++ rp-pppoe-3.8/src/discovery.c -@@ -376,8 +376,8 @@ - if (!packetIsForMe(conn, &packet)) continue; - - if (packet.code == CODE_PADO) { -- if (NOT_UNICAST(packet.ethHdr.h_source)) { -- printErr("Ignoring PADO packet from non-unicast MAC address"); -+ if (BROADCAST(packet.ethHdr.h_source)) { -+ printErr("Ignoring broadcast PADO packet"); - continue; - } - parsePacket(&packet, parsePADOTags, &pc); diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/top-autoconf.patch b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/top-autoconf.patch deleted file mode 100644 index 4fe73d0171..0000000000 --- a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/top-autoconf.patch +++ /dev/null @@ -1,27 +0,0 @@ -The autoconf stuff is all in a subdirectory, which is rather annoying -as OE expects patches to be applied and autoconf stuff to be done in -S. This adds enough autoconf at the top level to allow it to be -called there - all it does is run a sub autoconf stuff in the src -directory. - -Upstream-Status: Inappropriate [build system specific change] - -Index: rp-pppoe-3.8/Makefile.am -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ rp-pppoe-3.8/Makefile.am 2007-06-08 15:58:16.000000000 +1000 -@@ -0,0 +1,5 @@ -+PACKAGE = rp-pppoe -+VERSION = 3.8 -+ -+dnl AM_CFLAGS = -Wall -DDEBUG -+SUBDIRS = src -Index: rp-pppoe-3.8/configure.in -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ rp-pppoe-3.8/configure.in 2007-06-08 15:58:16.000000000 +1000 -@@ -0,0 +1,4 @@ -+AC_INIT(src/pppoe.c) -+AM_INIT_AUTOMAKE([rp-pppoe], [3.8]) -+AC_CONFIG_SUBDIRS(src) -+AC_OUTPUT(Makefile) diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/0001-ppoe-Dont-include-linux-if_ether.h.patch b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe/0001-ppoe-Dont-include-linux-if_ether.h.patch index 11356ce3f7..572886a26c 100644 --- a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/0001-ppoe-Dont-include-linux-if_ether.h.patch +++ b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe/0001-ppoe-Dont-include-linux-if_ether.h.patch @@ -1,12 +1,15 @@ -From 8d4d452d733bac8c5b55a90bddec8cc323cc9fa8 Mon Sep 17 00:00:00 2001 +From fdb64d21560bfdafeefccc7d20e105e4857faa99 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Tue, 28 Mar 2017 19:20:07 -0700 -Subject: [PATCH 1/2] ppoe: Dont include linux/if_ether.h +Subject: [PATCH] ppoe: Dont include linux/if_ether.h Fixes build with musl Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- +Upstream-Status: Pending + src/pppoe.h | 4 ---- 1 file changed, 4 deletions(-) @@ -25,6 +28,3 @@ index ec067a0..281879c 100644 #include <netinet/in.h> #ifdef HAVE_NETINET_IF_ETHER_H --- -2.12.1 - diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/0002-Enable-support-for-the-kernel-module.patch b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe/0002-Enable-support-for-the-kernel-module.patch index 139d1f089b..cd9e40d5eb 100644 --- a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/0002-Enable-support-for-the-kernel-module.patch +++ b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe/0002-Enable-support-for-the-kernel-module.patch @@ -1,10 +1,13 @@ -From aca8473a516a8dc013866105da141fe1cd947474 Mon Sep 17 00:00:00 2001 +From 31b6eecd7e5ebfb9a37915f28823e5af9d1062b4 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Tue, 28 Mar 2017 19:24:53 -0700 -Subject: [PATCH 2/2] Enable support for the kernel module +Subject: [PATCH] Enable support for the kernel module Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- +Upstream-Status: Pending + src/configure.in | 1 + 1 file changed, 1 insertion(+) @@ -20,6 +23,3 @@ index cae0976..951a042 100644 ]) dnl Checks for typedefs, structures, and compiler characteristics. --- -2.12.1 - diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe/configure.patch b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe/configure.patch new file mode 100644 index 0000000000..c486716b97 --- /dev/null +++ b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe/configure.patch @@ -0,0 +1,21 @@ +From c96dda04ec024bdef2a15d374e5f8242e041cad4 Mon Sep 17 00:00:00 2001 +From: Richard Purdie <richard.purdie@linuxfoundation.org> +Date: Fri, 18 Jul 2014 08:25:16 +0000 + +--- +Upstream-Status: Pending + + configure.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.in b/configure.in +index ac1a7e4..11b9f31 100644 +--- a/configure.in ++++ b/configure.in +@@ -1,4 +1,4 @@ +-AC_INIT(src/pppoe.c) +-AM_INIT_AUTOMAKE([rp-pppoe], [3.8]) ++AC_INIT([rp-pppoe], [3.8]) ++AM_INIT_AUTOMAKE([foreign]) + AC_CONFIG_SUBDIRS(src) + AC_OUTPUT(Makefile) diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/configure_in_cross.patch b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe/configure_in_cross.patch index 88cf7e6777..6e859a354c 100644 --- a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/configure_in_cross.patch +++ b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe/configure_in_cross.patch @@ -1,4 +1,4 @@ -From cab02076afb808a43c6ff3d7b1c64e71f5a1b397 Mon Sep 17 00:00:00 2001 +From 172907f31d64da4c3f289a439fd605d2ab51b24a Mon Sep 17 00:00:00 2001 From: Lei Maohui <leimaohui@cn.fujitsu.com> Date: Wed, 19 Aug 2015 12:17:03 +0900 Subject: [PATCH] configure in cross @@ -8,13 +8,12 @@ a few target paths, reworks a few tests to be more friendly for cross and drops other tests. Upstream-Status: Inappropriate [build system specific changes] - --- - src/configure.in | 66 ++++++++++++++------------------------------------------ - 1 file changed, 16 insertions(+), 50 deletions(-) + src/configure.in | 62 ++++++++++-------------------------------------- + 1 file changed, 12 insertions(+), 50 deletions(-) diff --git a/src/configure.in b/src/configure.in -index e194295..82d64d6 100644 +index 4add50c..9dff457 100644 --- a/src/configure.in +++ b/src/configure.in @@ -5,6 +5,13 @@ AC_INIT(pppoe.c) @@ -40,7 +39,7 @@ index e194295..82d64d6 100644 fi dnl Check for N_HDLC line discipline -@@ -56,7 +63,7 @@ AC_TRY_COMPILE([#include <linux/termios.h>], +@@ -58,7 +65,7 @@ AC_TRY_COMPILE([ ac_cv_n_hdlc=no) AC_MSG_RESULT($ac_cv_n_hdlc) if test "$ac_cv_n_hdlc" = yes ; then @@ -49,7 +48,7 @@ index e194295..82d64d6 100644 fi AC_ARG_ENABLE(plugin, [ --enable-plugin=pppd_src_path build pppd plugin], ac_cv_pluginpath=$enableval, ac_cv_pluginpath=no) -@@ -104,7 +111,7 @@ PPPD_INCDIR="" +@@ -106,7 +113,7 @@ PPPD_INCDIR="" if test "$ac_cv_header_linux_if_pppox_h" = yes ; then if test "$ac_cv_pluginpath" != no ; then LINUX_KERNELMODE_PLUGIN=rp-pppoe.so @@ -58,7 +57,7 @@ index e194295..82d64d6 100644 PPPD_INCDIR=$ac_cv_pluginpath fi fi -@@ -114,7 +121,7 @@ if test "$PPPD_INCDIR" = "" ; then +@@ -116,7 +123,7 @@ if test "$PPPD_INCDIR" = "" ; then fi if test "$ac_cv_debugging" = "yes" ; then @@ -67,13 +66,15 @@ index e194295..82d64d6 100644 fi AC_SUBST(LINUX_KERNELMODE_PLUGIN) -@@ -140,15 +147,8 @@ AC_CHECK_SIZEOF(unsigned short) +@@ -142,17 +149,8 @@ AC_CHECK_SIZEOF(unsigned short) AC_CHECK_SIZEOF(unsigned int) AC_CHECK_SIZEOF(unsigned long) +-dnl Check for location of ip +-AC_PATH_PROG(IP, ip, NOTFOUND, $PATH:/bin:/sbin:/usr/bin:/usr/sbin) +- -dnl Check for location of pppd -AC_PATH_PROG(PPPD, pppd, NOTFOUND, $PATH:/sbin:/usr/sbin:/usr/local/sbin) --AC_PATH_PROG(ECHO, echo, echo) - -dnl Check for setsid (probably Linux-specific) -AC_PATH_PROG(SETSID, setsid, "", $PATH:/sbin:/usr/sbin:/usr/local/sbin) @@ -84,7 +85,7 @@ index e194295..82d64d6 100644 dnl Check for Linux-specific kernel support for PPPoE AC_MSG_CHECKING(for Linux 2.4.X kernel-mode PPPoE support) -@@ -193,44 +193,8 @@ if test "$GCC" = yes; then +@@ -195,42 +193,6 @@ if test "$GCC" = yes; then CFLAGS="$CFLAGS -fno-strict-aliasing -Wall -Wstrict-prototypes" fi @@ -124,33 +125,9 @@ index e194295..82d64d6 100644 - ;; -esac - - dnl Figure out packing order of structures --AC_MSG_CHECKING([packing order of bit fields]) -+AC_CACHE_CHECK([packing order of bit fields],rpppoe_cv_pack_bitfields,[ - if test "${rpppoe_cv_pack_bitfields+set}" != set ; then - AC_TRY_RUN([ - union foo { -@@ -257,10 +221,11 @@ main(void) - }], rpppoe_cv_pack_bitfields=normal, rpppoe_cv_pack_bitfields=rev, - $ECHO "no defaults for cross-compiling"; exit 0) - fi -+]) - - if test "$rpppoe_cv_pack_bitfields" = "rev" ; then - AC_MSG_RESULT(reversed) -- AC_DEFINE(PACK_BITFIELDS_REVERSED) -+ AC_DEFINE([PACK_BITFIELDS_REVERSED], [], [Reversed bitfields]) - else - AC_MSG_RESULT(normal) - fi -@@ -324,6 +289,7 @@ AC_SUBST(PPPOE_SERVER_DEPS) - AC_SUBST(RDYNAMIC) - AC_SUBST(LIBEVENT) - AC_SUBST(ECHO) -+AC_SUBST(HAVE_STRUCT_SOCKADDR_LL) - AC_SUBST(LDFLAGS) - - datadir_evaluated=`eval echo $datadir` + # Sigh... got to fix this up for tcl + test "x$prefix" = xNONE && prefix=$ac_default_prefix + # Let make expand exec_prefix. -- -1.8.4.2 +2.34.1 diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/discard-use-of-dnl-in-Makefile.am.patch b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe/discard-use-of-dnl-in-Makefile.am.patch index 8b7886485a..57301f430d 100644 --- a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/discard-use-of-dnl-in-Makefile.am.patch +++ b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe/discard-use-of-dnl-in-Makefile.am.patch @@ -1,4 +1,4 @@ -From 611c9fe719c5aa264a2ad2eb920cf4522ae2ddec Mon Sep 17 00:00:00 2001 +From f658181c58347c3e2b0ee4f0a6a3d19162921471 Mon Sep 17 00:00:00 2001 From: Ting Liu <b28495@freescale.com> Date: Tue, 12 Jun 2012 14:26:16 -0400 Subject: [PATCH] discard use of dnl in Makefile.am @@ -7,9 +7,12 @@ Since Makefile.am is not processed by m4, but by automake, 'dnl' does not introduce a comment. Signed-off-by: Ting Liu <b28495@freescale.com> + --- - Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) +Upstream-Status: Pending + + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index eff6977..3091c33 100644 @@ -22,6 +25,3 @@ index eff6977..3091c33 100644 -dnl AM_CFLAGS = -Wall -DDEBUG +##dnl AM_CFLAGS = -Wall -DDEBUG SUBDIRS = src --- -1.7.6.5 - diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/pppoe-server.default b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe/pppoe-server.default index 996d57f3cf..996d57f3cf 100644 --- a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/pppoe-server.default +++ b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe/pppoe-server.default diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/pppoe-server.init b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe/pppoe-server.init index 21afe0be39..21afe0be39 100755 --- a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/pppoe-server.init +++ b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe/pppoe-server.init diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/pppoe-server.service b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe/pppoe-server.service index 41e0b9e851..41e0b9e851 100644 --- a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/pppoe-server.service +++ b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe/pppoe-server.service diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe/top-autoconf.patch b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe/top-autoconf.patch new file mode 100644 index 0000000000..f64da4fa2f --- /dev/null +++ b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe/top-autoconf.patch @@ -0,0 +1,41 @@ +From 0b62f71eb5d44d4a57103566ba58022b6304fa4f Mon Sep 17 00:00:00 2001 +From: Tom Rini <tom_rini@mentor.com> +Date: Wed, 27 Jul 2011 03:46:52 +0000 +Subject: [PATCH] rp-pppoe: Port from oe.dev + +The autoconf stuff is all in a subdirectory, which is rather annoying +as OE expects patches to be applied and autoconf stuff to be done in +S. This adds enough autoconf at the top level to allow it to be +called there - all it does is run a sub autoconf stuff in the src +directory. + +Upstream-Status: Inappropriate [build system specific change] + +--- + Makefile.am | 5 +++++ + configure.in | 4 ++++ + 2 files changed, 9 insertions(+) + create mode 100644 Makefile.am + create mode 100644 configure.in + +diff --git a/Makefile.am b/Makefile.am +new file mode 100644 +index 0000000..eff6977 +--- /dev/null ++++ b/Makefile.am +@@ -0,0 +1,5 @@ ++PACKAGE = rp-pppoe ++VERSION = 3.8 ++ ++dnl AM_CFLAGS = -Wall -DDEBUG ++SUBDIRS = src +diff --git a/configure.in b/configure.in +new file mode 100644 +index 0000000..ac1a7e4 +--- /dev/null ++++ b/configure.in +@@ -0,0 +1,4 @@ ++AC_INIT(src/pppoe.c) ++AM_INIT_AUTOMAKE([rp-pppoe], [3.8]) ++AC_CONFIG_SUBDIRS(src) ++AC_OUTPUT(Makefile) diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/update-config.patch b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe/update-config.patch index 42a3bc62c8..c759e09aa0 100644 --- a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/update-config.patch +++ b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe/update-config.patch @@ -1,3 +1,8 @@ +From 4d34e0d7d790ec41b0afb731c7dc1b1ee90dd377 Mon Sep 17 00:00:00 2001 +From: Tom Rini <tom_rini@mentor.com> +Date: Wed, 27 Jul 2011 03:46:52 +0000 +Subject: [PATCH] rp-pppoe: Port from oe.dev + Set the timeout to 0 since we don't want pppoe to try reconnecting, we want whatever is calling it to reconnect. Lots of odd things happen when you have pppoe retrying itself. @@ -8,11 +13,15 @@ ppp looks, so that's what we do here. Upstream-Status: Inappropriate [configuration] -Index: rp-pppoe-3.8/configs/pppoe.conf -=================================================================== ---- rp-pppoe-3.8.orig/configs/pppoe.conf 2006-04-03 00:29:41.000000000 +1000 -+++ rp-pppoe-3.8/configs/pppoe.conf 2007-06-08 16:02:47.000000000 +1000 -@@ -66,7 +66,7 @@ +--- + configs/pppoe.conf | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configs/pppoe.conf b/configs/pppoe.conf +index c222b2f..65618a5 100644 +--- a/configs/pppoe.conf ++++ b/configs/pppoe.conf +@@ -66,7 +66,7 @@ DEFAULTROUTE=yes # to connect forever after pppoe-start is called. Otherwise, it will # give out after CONNECT_TIMEOUT seconds and will not attempt to # connect again, making it impossible to reach. @@ -21,7 +30,7 @@ Index: rp-pppoe-3.8/configs/pppoe.conf # How often in seconds pppoe-start polls to check if link is up CONNECT_POLL=2 -@@ -115,7 +115,7 @@ +@@ -115,7 +115,7 @@ PPPOE_TIMEOUT=80 FIREWALL=NONE # Linux kernel-mode plugin for pppd. If you want to try the kernel-mode diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.12.bb b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.15.bb index fbe015f5e8..c8e1767114 100644 --- a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.12.bb +++ b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.15.bb @@ -1,35 +1,35 @@ SUMMARY = "A user-mode PPPoE client and server suite for Linux" HOMEPAGE = "http://www.roaringpenguin.com/products/pppoe" SECTION = "net" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=a194eaefae2be54ee3221339b10d0581" -PR = "r10" -SRC_URI = "http://www.roaringpenguin.com/files/download/${BP}.tar.gz \ +SRC_URI = "https://dianne.skoll.ca/projects/rp-pppoe/download/OLD/rp-pppoe-${PV}.tar.gz \ file://top-autoconf.patch \ file://configure_in_cross.patch \ - file://pppoe-src-restrictions.patch \ file://update-config.patch \ - file://dont-swallow-errors.patch \ file://discard-use-of-dnl-in-Makefile.am.patch \ file://configure.patch \ file://pppoe-server.default \ file://pppoe-server.init \ - file://configure.in-Error-fix.patch \ file://pppoe-server.service \ file://0001-ppoe-Dont-include-linux-if_ether.h.patch \ file://0002-Enable-support-for-the-kernel-module.patch \ " -SRC_URI[md5sum] = "216eb52b69062b92a64ee37fd71f4b66" -SRC_URI[sha256sum] = "00794e04031546b0e9b8cf286f2a6d1ccfc4a621b2a3abb2d7ef2a7ab7cc86c2" +SRC_URI[sha256sum] = "b1f318bc7e4e5b0fd8a8e23e8803f5e6e43165245a5a10a7162a92a6cf17829a" inherit autotools-brokensep update-rc.d systemd -do_install_append() { +CACHED_CONFIGUREVARS += "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', 'rpppoe_cv_pack_bitfields=normal', 'rpppoe_cv_pack_bitfields=rev', d)}" + +# Needed for strlcpy() +CFLAGS += "-D_GNU_SOURCE" + +do_install:append() { install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/pppoe-server.service ${D}${systemd_unitdir}/system + install -m 0644 ${UNPACKDIR}/pppoe-server.service ${D}${systemd_unitdir}/system sed -i -e 's#@SYSCONFDIR@#${sysconfdir}#g' ${D}${systemd_unitdir}/system/pppoe-server.service sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/pppoe-server.service install -d ${D}${datadir}/doc/${PN} @@ -41,37 +41,37 @@ do_install_append() { do_install() { # Install init script and default settings install -m 0755 -d ${D}${sysconfdir}/default ${D}${sysconfdir}/init.d - install -m 0644 ${WORKDIR}/pppoe-server.default ${D}${sysconfdir}/default/pppoe-server - install -m 0755 ${WORKDIR}/pppoe-server.init ${D}${sysconfdir}/init.d/pppoe-server + install -m 0644 ${UNPACKDIR}/pppoe-server.default ${D}${sysconfdir}/default/pppoe-server + install -m 0755 ${UNPACKDIR}/pppoe-server.init ${D}${sysconfdir}/init.d/pppoe-server # Install oe_runmake -C ${S} DESTDIR=${D} docdir=${docdir} install chmod 4755 ${D}${sbindir}/pppoe } SYSTEMD_PACKAGES = "${PN}-server" -SYSTEMD_SERVICE_${PN}-server = "pppoe-server.service" +SYSTEMD_SERVICE:${PN}-server = "pppoe-server.service" SYSTEMD_AUTO_ENABLE = "disable" # Insert server package before main package PACKAGES = "${PN}-dbg ${PN}-server ${PN}-relay ${PN}-sniff ${PN} ${PN}-doc" -FILES_${PN}-server = "${sysconfdir}/default/pppoe-server \ +FILES:${PN}-server = "${sysconfdir}/default/pppoe-server \ ${sysconfdir}/init.d/pppoe-server \ ${sbindir}/pppoe-server \ ${sysconfdir}/ppp/pppoe-server-options" -FILES_${PN}-relay = "${sbindir}/pppoe-relay" -FILES_${PN}-sniff = "${sbindir}/pppoe-sniff" +FILES:${PN}-relay = "${sbindir}/pppoe-relay" +FILES:${PN}-sniff = "${sbindir}/pppoe-sniff" -CONFFILES_${PN} = "${sysconfdir}/ppp/pppoe.conf \ +CONFFILES:${PN} = "${sysconfdir}/ppp/pppoe.conf \ ${sysconfdir}/ppp/firewall-standalone \ ${sysconfdir}/ppp/firewall-masq" -CONFFILES_${PN}-server = "${sysconfdir}/ppp/pppoe-server-options \ +CONFFILES:${PN}-server = "${sysconfdir}/ppp/pppoe-server-options \ ${sysconfdir}/default/pppoe-server" INITSCRIPT_PACKAGES = "${PN}-server" -INITSCRIPT_NAME_${PN}-server = "pppoe-server" -INITSCRIPT_PARAMS_${PN}-server = "defaults 92 8" +INITSCRIPT_NAME:${PN}-server = "pppoe-server" +INITSCRIPT_PARAMS:${PN}-server = "defaults 92 8" -RDEPENDS_${PN} = "ppp" -RDEPENDS_${PN}-server = "${PN}" -RRECOMMENDS_${PN} = "ppp-oe" +RDEPENDS:${PN} = "ppp" +RDEPENDS:${PN}-server = "${PN}" +RRECOMMENDS:${PN} = "ppp-oe" diff --git a/meta-networking/recipes-protocols/tsocks/tsocks_1.8beta5.bb b/meta-networking/recipes-protocols/tsocks/tsocks_1.8beta5.bb index b2757f6ddc..8099fa5c6e 100644 --- a/meta-networking/recipes-protocols/tsocks/tsocks_1.8beta5.bb +++ b/meta-networking/recipes-protocols/tsocks/tsocks_1.8beta5.bb @@ -6,7 +6,7 @@ make to establish network connections and negotating them through a \ SOCKS server as necessary." HOMEPAGE = "http://sourceforge.net/projects/tsocks/" SECTION = "net" -LICENSE = "GPL-2.0" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760" SRC_URI = "http://downloads.sourceforge.net/tsocks/tsocks-${PV}.tar.gz \ @@ -18,11 +18,14 @@ SRC_URI[sha256sum] = "849d7ef5af80d03e76cc05ed9fb8fa2bcc2b724b51ebfd1b6be11c7863 inherit autotools-brokensep +LIBS:append:libc-musl = " -lssp_nonshared" +LIBS:append:libc-glibc = " -lc_nonshared" + S = "${WORKDIR}/tsocks-1.8" -FILES_${PN} = "${libdir}/* ${bindir}/tsocks" -FILES_${PN}-dev = "" -INSANE_SKIP_${PN} = "dev-so" +FILES:${PN} = "${libdir}/* ${bindir}/tsocks" +FILES:${PN}-dev = "" +INSANE_SKIP:${PN} = "dev-so" -EXTRA_OEMAKE = "SHCC='${CC} -fPIC ${LDFLAGS}'" +EXTRA_OEMAKE = "SHCC='${CC} -fPIC ${LDFLAGS}' LIBS='${LIBS}'" diff --git a/meta-networking/recipes-protocols/usrsctp/usrsctp/0001-Use-foreign-switch-for-automake.patch b/meta-networking/recipes-protocols/usrsctp/usrsctp/0001-Use-foreign-switch-for-automake.patch deleted file mode 100644 index b932ebbb4f..0000000000 --- a/meta-networking/recipes-protocols/usrsctp/usrsctp/0001-Use-foreign-switch-for-automake.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 748bc693cf24baf42e459e12f152349e392b6737 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 20 Dec 2016 21:32:11 -0800 -Subject: [PATCH] Use foreign switch for automake - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending - - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 64cc9994..19ccd4a3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -29,7 +29,7 @@ dnl SUCH DAMAGE. - dnl - - AC_INIT([libusrsctp], [0.9.3.0]) --AM_INIT_AUTOMAKE -+AM_INIT_AUTOMAKE([foreign]) - - AC_PROG_CC - AC_PROG_LIBTOOL --- -2.11.0 - diff --git a/meta-networking/recipes-protocols/usrsctp/usrsctp_git.bb b/meta-networking/recipes-protocols/usrsctp/usrsctp_git.bb index 3ec746684b..4c18c6aff9 100644 --- a/meta-networking/recipes-protocols/usrsctp/usrsctp_git.bb +++ b/meta-networking/recipes-protocols/usrsctp/usrsctp_git.bb @@ -2,13 +2,14 @@ DESCRIPTION = "This is a userland SCTP stack supporting FreeBSD, Linux, Mac OS X LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=ffcf846341f3856d79a483eafa18e2a5" -SRCREV = "dbfc1b8c4cf1a46a4d8987ba542d5ff06bdaf14c" +SRCREV = "848eca82f92273af9a79687a90343a2ebcf3481d" SRC_URI = "git://github.com/sctplab/usrsctp;protocol=https;branch=master \ - file://0001-Use-foreign-switch-for-automake.patch \ " S = "${WORKDIR}/git" +UPSTREAM_CHECK_COMMITS = "1" + inherit autotools pkgconfig DEPENDS += "openssl" @@ -22,3 +23,5 @@ PACKAGECONFIG[inet] = "--enable-inet,--disable-inet," PACKAGECONFIG[inet6] = "--enable-inet6,--disable-inet6," EXTRA_OECONF += "--disable-debug" + +CVE_VERSION = "0.9.5.0" diff --git a/meta-networking/recipes-protocols/vsomeip/vsomeip/0001-Fix-pkgconfig-dir-for-multilib.patch b/meta-networking/recipes-protocols/vsomeip/vsomeip/0001-Fix-pkgconfig-dir-for-multilib.patch new file mode 100644 index 0000000000..0ddcb642bc --- /dev/null +++ b/meta-networking/recipes-protocols/vsomeip/vsomeip/0001-Fix-pkgconfig-dir-for-multilib.patch @@ -0,0 +1,28 @@ +From 2f931baf290477b586309189445bf87e3bc5d5ba Mon Sep 17 00:00:00 2001 +From: Yi Zhao <yi.zhao@windriver.com> +Date: Wed, 2 Mar 2022 14:51:13 +0800 +Subject: [PATCH] Fix pkgconfig dir for multilib + +Upstream-Status: Pending + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ab399a69..beae6eaf 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -637,7 +637,7 @@ endif() + # create pkg-config file + if(NOT WIN32) + configure_file(${VSOMEIP_NAME}.pc.in ${PROJECT_BINARY_DIR}/${VSOMEIP_NAME}.pc @ONLY) +- install(FILES ${PROJECT_BINARY_DIR}/${VSOMEIP_NAME}.pc DESTINATION lib/pkgconfig) ++ install(FILES ${PROJECT_BINARY_DIR}/${VSOMEIP_NAME}.pc DESTINATION ${INSTALL_LIB_DIR}/pkgconfig) + endif() + + ############################################################################## +-- +2.25.1 + diff --git a/meta-networking/recipes-protocols/vsomeip/vsomeip/0002-Install-example-configuration-files-to-etc-vsomeip.patch b/meta-networking/recipes-protocols/vsomeip/vsomeip/0002-Install-example-configuration-files-to-etc-vsomeip.patch new file mode 100644 index 0000000000..bdaf343606 --- /dev/null +++ b/meta-networking/recipes-protocols/vsomeip/vsomeip/0002-Install-example-configuration-files-to-etc-vsomeip.patch @@ -0,0 +1,28 @@ +From ebaa3206ee125741314272cddafa04fa71bd2d1e Mon Sep 17 00:00:00 2001 +From: Yi Zhao <yi.zhao@windriver.com> +Date: Wed, 9 Mar 2022 11:48:44 +0800 +Subject: [PATCH] Install example configuration files to /etc/vsomeip + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index beae6eaf..d791c12e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -536,7 +536,7 @@ install(FILES ${PROJECT_BINARY_DIR}/vsomeip.pc DESTINATION lib/pkgconfig) + endif () + + install ( +- FILES ${EXAMPLE_CONFIG_FILES} DESTINATION etc/vsomeip COMPONENT config ++ FILES ${EXAMPLE_CONFIG_FILES} DESTINATION ${DEFAULT_CONFIGURATION_FOLDER} COMPONENT config + ) + + # Add all targets to the build-tree export set +-- +2.25.1 + diff --git a/meta-networking/recipes-protocols/vsomeip/vsomeip/0003-Do-not-build-external-gtest.patch b/meta-networking/recipes-protocols/vsomeip/vsomeip/0003-Do-not-build-external-gtest.patch new file mode 100644 index 0000000000..09dab9a8b0 --- /dev/null +++ b/meta-networking/recipes-protocols/vsomeip/vsomeip/0003-Do-not-build-external-gtest.patch @@ -0,0 +1,187 @@ +From b1bf398015bc090020459954e5cd1ec3b51b8ac3 Mon Sep 17 00:00:00 2001 +From: Yi Zhao <yi.zhao@windriver.com> +Date: Tue, 11 Jul 2023 16:53:46 +0800 +Subject: [PATCH] Do not build external gtest + +We don't need to build external gtest since we already depend on +googletest. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + CMakeLists.txt | 11 ---- + test/CMakeLists.txt | 22 +------ + test/network_tests/CMakeLists.txt | 99 ------------------------------- + 3 files changed, 3 insertions(+), 129 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d791c12e..f1bcba27 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -18,17 +18,6 @@ set (VSOMEIP_VERSION ${VSOMEIP_MAJOR_VERSION}.${VSOMEIP_MINOR_VERSION}.${VSOMEIP + set (PACKAGE_VERSION ${VSOMEIP_VERSION}) # Used in documentation/doxygen.in + set (CMAKE_VERBOSE_MAKEFILE off) + +-if (NOT GTEST_ROOT) +- if (DEFINED ENV{GTEST_ROOT}) +- set(GTEST_ROOT $ENV{GTEST_ROOT}) +- else() +- include(FetchContent) +- FetchContent_Declare(googletest GIT_REPOSITORY https://github.com/google/googletest.git GIT_TAG v1.14.0) +- FetchContent_Populate(googletest) +- set(GTEST_ROOT ${googletest_SOURCE_DIR}) +- endif() +-endif() +- + ################################################################################################### + # see http://www.cmake.org/Wiki/CMake/Tutorials/How_to_create_a_ProjectConfig.cmake_file + ################################################################################################### +diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt +index f66ac5d3..6f09bf40 100644 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -17,27 +17,11 @@ find_package(benchmark) + # remove export symbols from the cxx flags + string(REPLACE "${EXPORTSYMBOLS}" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") + +-# check for set environment variable +-if(${GTEST_ROOT} STREQUAL "n/a") +- message(STATUS "GTEST_ROOT is not defined. For building the tests the variable +- GTEST_ROOT has to be defined. Tests can not be built.") +- # early exit +- return() # test can not be build -> make commands build_tests and check are not available +-else() +- message(STATUS "GTEST_ROOT is set. gtest root path set to ${GTEST_ROOT}") ++find_package(GTest) ++if (NOT GTest_FOUND) ++ message(WARNING "GTest is not found. Tests can not be built.") + endif() + +-# build google test as static library (always) -> therefore deactivate BUILD_SHARED_LIBS in case it is active +-set(BUILD_SHARED_LIBS_AUTOMATIC_OFF 0) +-if ("${BUILD_SHARED_LIBS}" STREQUAL "ON") +- set(BUILD_SHARED_LIBS OFF) +- set(BUILD_SHARED_LIBS_AUTOMATIC_OFF 1) +-endif() +-add_subdirectory(${GTEST_ROOT} ${CMAKE_CURRENT_BINARY_DIR}/gtest EXCLUDE_FROM_ALL) +-if ("${BUILD_SHARED_LIBS_AUTOMATIC_OFF}" STREQUAL "1") +- set(BUILD_SHARED_LIBS ON) +- set(BUILD_SHARED_LIBS_AUTOMATIC_OFF 0) +-endif() + + ############################################################################## + # build tests +diff --git a/test/network_tests/CMakeLists.txt b/test/network_tests/CMakeLists.txt +index 883cc5cf..9a2a4f5e 100644 +--- a/test/network_tests/CMakeLists.txt ++++ b/test/network_tests/CMakeLists.txt +@@ -4116,105 +4116,6 @@ if(NOT ${TESTS_BAT}) + + endif() + +-############################################################################## +-# Add for every test a dependency to gtest +-############################################################################## +- +-if(NOT ${TESTS_BAT}) +- add_dependencies(${TEST_CONFIGURATION} gtest) +- add_dependencies(${TEST_APPLICATION} gtest) +- add_dependencies(${TEST_APPLICATION_SINGLE_PROCESS_NAME} gtest) +- add_dependencies(${TEST_APPLICATION_AVAILABILITY_NAME} gtest) +- add_dependencies(${TEST_MAGIC_COOKIES_CLIENT} gtest) +- add_dependencies(${TEST_MAGIC_COOKIES_SERVICE} gtest) +- add_dependencies(${TEST_HEADER_FACTORY} gtest) +- add_dependencies(${TEST_HEADER_FACTORY_CLIENT} gtest) +- add_dependencies(${TEST_HEADER_FACTORY_SERVICE} gtest) +- add_dependencies(${TEST_LOCAL_ROUTING_SERVICE} gtest) +- add_dependencies(${TEST_LOCAL_ROUTING_CLIENT} gtest) +- add_dependencies(${TEST_EXTERNAL_LOCAL_ROUTING_SERVICE} gtest) +- add_dependencies(${TEST_PAYLOAD_SERVICE} gtest) +- add_dependencies(${TEST_PAYLOAD_CLIENT} gtest) +- add_dependencies(${TEST_BIG_PAYLOAD_SERVICE} gtest) +- add_dependencies(${TEST_BIG_PAYLOAD_CLIENT} gtest) +- add_dependencies(${TEST_CLIENT_ID_SERVICE} gtest) +- add_dependencies(${TEST_CLIENT_ID_UTILITY} gtest) +- add_dependencies(${TEST_DEBOUNCE_CLIENT} gtest) +- add_dependencies(${TEST_DEBOUNCE_SERVICE} gtest) +- add_dependencies(${TEST_DEBOUNCE_FILTER_CLIENT} gtest) +- add_dependencies(${TEST_DEBOUNCE_FILTER_SERVICE} gtest) +- add_dependencies(${TEST_DEBOUNCE_CALLBACK_CLIENT} gtest) +- add_dependencies(${TEST_DEBOUNCE_CALLBACK_SERVICE} gtest) +- add_dependencies(${TEST_DEBOUNCE_FREQUENCY_CLIENT} gtest) +- add_dependencies(${TEST_DEBOUNCE_FREQUENCY_SERVICE} gtest) +- add_dependencies(${TEST_SUBSCRIBE_NOTIFY_SERVICE} gtest) +- add_dependencies(${TEST_SUBSCRIBE_NOTIFY_ONE_EVENT_TWO_EVENTGROUPS_SERVICE} gtest) +- add_dependencies(${TEST_SUBSCRIBE_NOTIFY_ONE_EVENT_TWO_EVENTGROUPS_CLIENT} gtest) +- add_dependencies(${TEST_SUBSCRIBE_NOTIFY_ONE_SERVICE} gtest) +- add_dependencies(${TEST_CPU_LOAD_SERVICE} gtest) +- add_dependencies(${TEST_CPU_LOAD_CLIENT} gtest) +- add_dependencies(${TEST_INITIAL_EVENT_SERVICE} gtest) +- add_dependencies(${TEST_INITIAL_EVENT_CLIENT} gtest) +- add_dependencies(${TEST_INITIAL_EVENT_AVAILABILITY_CHECKER} gtest) +- add_dependencies(${TEST_INITIAL_EVENT_STOP_SERVICE} gtest) +- add_dependencies(${TEST_OFFER_SERVICE} gtest) +- add_dependencies(${TEST_OFFER_CLIENT} gtest) +- add_dependencies(${TEST_OFFER_SERVICE_EXTERNAL} gtest) +- add_dependencies(${TEST_OFFER_EXTERNAL_SD_MESSAGE_SENDER} gtest) +- add_dependencies(${TEST_OFFERED_SERVICES_INFO_CLIENT} gtest) +- add_dependencies(${TEST_OFFERED_SERVICES_INFO_SERVICE} gtest) +- add_dependencies(${TEST_PENDING_SUBSCRIPTION_SERVICE} gtest) +- add_dependencies(${TEST_PENDING_SUBSCRIPTION_CLIENT} gtest) +- add_dependencies(${TEST_MALICIOUS_DATA_SERVICE} gtest) +- add_dependencies(${TEST_MALICIOUS_DATA_CLIENT} gtest) +- if (${TEST_SECURITY}) +- add_dependencies(${TEST_SECURITY_SERVICE} gtest) +- add_dependencies(${TEST_SECURITY_CLIENT} gtest) +- endif() +- add_dependencies(${TEST_E2E_SERVICE} gtest) +- add_dependencies(${TEST_E2E_CLIENT} gtest) +- if (${TEST_E2E_PROFILE_04}) +- add_dependencies(${TEST_E2E_PROFILE_04_SERVICE} gtest) +- add_dependencies(${TEST_E2E_PROFILE_04_CLIENT} gtest) +- endif() +- if (${TEST_E2E_PROFILE_07}) +- add_dependencies(${TEST_E2E_PROFILE_07_SERVICE} gtest) +- add_dependencies(${TEST_E2E_PROFILE_07_CLIENT} gtest) +- endif() +- add_dependencies(${TEST_EVENT_SERVICE} gtest) +- add_dependencies(${TEST_EVENT_CLIENT} gtest) +- if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "QNX") +- add_dependencies(${TEST_NPDU_SERVICE_ONE} gtest) +- add_dependencies(${TEST_NPDU_SERVICE_TWO} gtest) +- add_dependencies(${TEST_NPDU_SERVICE_THREE} gtest) +- add_dependencies(${TEST_NPDU_SERVICE_FOUR} gtest) +- add_dependencies(${TEST_NPDU_CLIENT_ONE} gtest) +- add_dependencies(${TEST_NPDU_CLIENT_TWO} gtest) +- add_dependencies(${TEST_NPDU_CLIENT_THREE} gtest) +- add_dependencies(${TEST_NPDU_CLIENT_FOUR} gtest) +- add_dependencies(${TEST_NPDU_DAEMON_CLIENT} gtest) +- add_dependencies(${TEST_NPDU_DAEMON_SERVICE} gtest) +- endif() +- add_dependencies(${TEST_SOMEIPTP_CLIENT} gtest) +- add_dependencies(${TEST_SOMEIPTP_SERVICE} gtest) +- if(${TEST_SECOND_ADDRESS}) +- add_dependencies(${TEST_SECOND_ADDRESS_CLIENT} gtest) +- add_dependencies(${TEST_SECOND_ADDRESS_SERVICE} gtest) +- endif() +- add_dependencies(${TEST_SUSPEND_RESUME_CLIENT} gtest) +- add_dependencies(${TEST_SUSPEND_RESUME_SERVICE} gtest) +-else() +- add_dependencies(${TEST_APPLICATION} gtest) +- add_dependencies(${TEST_HEADER_FACTORY} gtest) +- add_dependencies(${TEST_HEADER_FACTORY_CLIENT} gtest) +- add_dependencies(${TEST_HEADER_FACTORY_SERVICE} gtest) +- add_dependencies(${TEST_PAYLOAD_SERVICE} gtest) +- add_dependencies(${TEST_PAYLOAD_CLIENT} gtest) +- add_dependencies(${TEST_BIG_PAYLOAD_SERVICE} gtest) +- add_dependencies(${TEST_BIG_PAYLOAD_CLIENT} gtest) +- add_dependencies(${TEST_LOCAL_ROUTING_SERVICE} gtest) +- add_dependencies(${TEST_LOCAL_ROUTING_CLIENT} gtest) +-endif() + + ############################################################################## + # Add tests to the target build_network_tests +-- +2.25.1 + diff --git a/meta-networking/recipes-protocols/vsomeip/vsomeip/0004-Do-not-specify-PIE-flag-explicitly.patch b/meta-networking/recipes-protocols/vsomeip/vsomeip/0004-Do-not-specify-PIE-flag-explicitly.patch new file mode 100644 index 0000000000..4bb2318555 --- /dev/null +++ b/meta-networking/recipes-protocols/vsomeip/vsomeip/0004-Do-not-specify-PIE-flag-explicitly.patch @@ -0,0 +1,47 @@ +From ec2d36466c9050ee282ea1c3bb1b5f1f61c96ecb Mon Sep 17 00:00:00 2001 +From: Yi Zhao <yi.zhao@windriver.com> +Date: Mon, 17 Jul 2023 14:33:32 +0800 +Subject: [PATCH] Do not specify PIE flag explicitly + +For nodistro distro, packages are built without PIE because +security_flags.inc is not included by default. But in vsomeip, the PIE +flag is explicitly specified in CMAKE_CXX_FLAGS, which will cause +building with PIE even in nodistro, causing an error when linking the +googletest static library: + +TOPDIR/tmp-glibc/work/cortexa53-oe-linux/vsomeip/3.1.20.3-r0/recipe-sysroot-native/usr/bin/aarch64-oe-linux/../../libexec/aarch64-oe-linux/gcc/aarch64-oe-linux/12.2.0/ld: +TOPDIR/tmp-glibc/work/cortexa53-oe-linux/vsomeip/3.1.20.3-r0/recipe-sysroot/usr/lib/libgtest.a(gtest-all.cc.o)(.text+0x4a90): +unresolvable R_AARCH64_ADR_PREL_PG_HI21 relocation against symbol `_ZSt4cerr@@GLIBCXX_3.4' + +Remove PIE flag from CMAKE_CXX_FLAGS and only enable PIE flag by +including security_flags.inc. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f1bcba27..2653a4df 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -60,12 +60,12 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") + if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") + # This is only relevant for GCC and causes warnings on Clang + set(EXPORTSYMBOLS "-Wl,-export-dynamic -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/exportmap.gcc") +- set(OS_CXX_FLAGS "${OS_CXX_FLAGS} -pie -Wno-tsan -Wl,-z,relro,-z,now") ++ set(OS_CXX_FLAGS "${OS_CXX_FLAGS} -Wno-tsan -Wl,-z,relro,-z,now") + endif() + + set(NO_DEPRECATED "") + set(OPTIMIZE "") +- set(OS_CXX_FLAGS "${OS_CXX_FLAGS} -D_GLIBCXX_USE_NANOSLEEP -pthread -O -Wall -Wextra -Wformat -Wformat-security -Wconversion -fexceptions -fstrict-aliasing -fstack-protector-strong -fasynchronous-unwind-tables -fno-omit-frame-pointer -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Wpedantic -Werror -fPIE") ++ set(OS_CXX_FLAGS "${OS_CXX_FLAGS} -D_GLIBCXX_USE_NANOSLEEP -pthread -O -Wall -Wextra -Wformat -Wformat-security -Wconversion -fexceptions -fstrict-aliasing -fstack-protector-strong -fasynchronous-unwind-tables -fno-omit-frame-pointer -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Wpedantic") + + # force all use of std::mutex and std::recursive_mutex to use runtime init + # instead of static initialization so mutexes can be hooked to enable PI as needed +-- +2.25.1 + diff --git a/meta-networking/recipes-protocols/vsomeip/vsomeip/0005-test-common-CMakeLists.txt-add-missing-link-with-dlt.patch b/meta-networking/recipes-protocols/vsomeip/vsomeip/0005-test-common-CMakeLists.txt-add-missing-link-with-dlt.patch new file mode 100644 index 0000000000..25d66514f8 --- /dev/null +++ b/meta-networking/recipes-protocols/vsomeip/vsomeip/0005-test-common-CMakeLists.txt-add-missing-link-with-dlt.patch @@ -0,0 +1,41 @@ +From 8676ef287bb25b49668be4336387bdf83a0cae5c Mon Sep 17 00:00:00 2001 +From: Yi Zhao <yi.zhao@windriver.com> +Date: Mon, 1 Jan 2024 17:02:41 +0800 +Subject: [PATCH] test/common/CMakeLists.txt: add missing link with dlt + +The libvsomeip_utilities library uses functions e.g. +dlt_check_library_version/dlt_register_app/dlt_unregister_app which are +provided by dlt therefore add it to linker flags. + +Fixes: +x86_64-poky-linux-ld.lld: error: undefined reference due to --no-allow-shlib-undefined: dlt_check_library_version +>>> referenced by test/common/libvsomeip_utilities.so + +x86_64-poky-linux-ld.lld: error: undefined reference due to --no-allow-shlib-undefined: dlt_register_app +>>> referenced by test/common/libvsomeip_utilities.so + +x86_64-poky-linux-ld.lld: error: undefined reference due to --no-allow-shlib-undefined: dlt_unregister_app +>>> referenced by test/common/libvsomeip_utilities.so + +Upstream-Status: Submitted [https://github.com/COVESA/vsomeip/pull/602] + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + test/common/CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/test/common/CMakeLists.txt b/test/common/CMakeLists.txt +index d4d14534..afc8c2d6 100644 +--- a/test/common/CMakeLists.txt ++++ b/test/common/CMakeLists.txt +@@ -27,6 +27,7 @@ TARGET_LINK_LIBRARIES ( + ${Boost_LIBRARIES} + ${DL_LIBRARY} + ${TEST_LINK_LIBRARIES} ++ ${DLT_LIBRARIES} + ) + + # ---------------------------------------------------------------------------- +-- +2.25.1 + diff --git a/meta-networking/recipes-protocols/vsomeip/vsomeip_3.4.10.bb b/meta-networking/recipes-protocols/vsomeip/vsomeip_3.4.10.bb new file mode 100644 index 0000000000..4c38970205 --- /dev/null +++ b/meta-networking/recipes-protocols/vsomeip/vsomeip_3.4.10.bb @@ -0,0 +1,75 @@ +SUMMARY = "The implementation of SOME/IP" +DESCRIPTION = "The vsomeip stack implements the http://some-ip.com/ \ +(Scalable service-Oriented MiddlewarE over IP (SOME/IP)) protocol." +HOMEPAGE = "https://github.com/COVESA/vsomeip" +SECTION = "net" + +LICENSE = "MPL-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=9741c346eef56131163e13b9db1241b3" + +SRC_URI = "git://github.com/GENIVI/${BPN}.git;branch=master;protocol=https;name=vsomeip \ + file://0001-Fix-pkgconfig-dir-for-multilib.patch \ + file://0002-Install-example-configuration-files-to-etc-vsomeip.patch \ + file://0003-Do-not-build-external-gtest.patch \ + file://0004-Do-not-specify-PIE-flag-explicitly.patch \ + file://0005-test-common-CMakeLists.txt-add-missing-link-with-dlt.patch \ + " + +SRCREV = "02c199dff8aba814beebe3ca417fd991058fe90c" + +COMPATIBLE_HOST:mips = "null" +COMPATIBLE_HOST:mips64 = "null" +COMPATIBLE_HOST:powerpc = "null" +COMPATIBLE_HOST:libc-musl = 'null' + +DEPENDS = "boost dlt-daemon googletest" + +S = "${WORKDIR}/git" + +inherit cmake pkgconfig + +EXTRA_OECMAKE = "-DINSTALL_LIB_DIR:PATH=${baselib} \ + -DINSTALL_CMAKE_DIR:PATH=${baselib}/cmake/vsomeip3 \ + " + +# For vsomeip-test +EXTRA_OECMAKE += "-DTEST_IP_MASTER=10.0.3.1 \ + -DTEST_IP_SLAVE=10.0.3.2 \ + -DTEST_IP_SLAVE_SECOND=10.0.3.3 \ + -DTEST_UID=1000 -DTEST_GID=1000 \ + " + +RDEPENDS:${PN}-test = "bash lsof" + +do_compile:append() { + cmake_runcmake_build --target examples + cmake_runcmake_build --target build_tests +} + +do_install:append() { + install -d ${D}/opt/${PN}-test/examples + install -m 0755 ${B}/examples/*-sample ${D}/opt/${PN}-test/examples + install -d ${D}/opt/${PN}-test/examples/routingmanagerd + install -m 0755 ${B}/examples/routingmanagerd/routingmanagerd \ + ${D}/opt/${PN}-test/examples/routingmanagerd + + install -d ${D}/opt/${PN}-test/test/test/common + cp -rf ${S}/test/common/examples_policies \ + ${D}/opt/${PN}-test/test/test/common/ + install -m 0755 ${B}/test/common/libvsomeip_utilities.so \ + ${D}/opt/${PN}-test/test/test/common/ + + for d in unit_tests network_tests; do + install -d ${D}/opt/${PN}-test/test/$d + cp -f ${B}/test/$d/*test* ${D}/opt/${PN}-test/test/$d + done +} + +PACKAGES += "${PN}-test" + +FILES:${PN}-dbg += " \ + /opt/${PN}-test/.debug/* \ + " +FILES:${PN}-test = " \ + /opt/${PN}-test \ + " diff --git a/meta-networking/recipes-protocols/xl2tpd/xl2tpd.inc b/meta-networking/recipes-protocols/xl2tpd/xl2tpd_1.3.16.bb index d037c7cfc6..08bab4a338 100644 --- a/meta-networking/recipes-protocols/xl2tpd/xl2tpd.inc +++ b/meta-networking/recipes-protocols/xl2tpd/xl2tpd_1.3.16.bb @@ -5,11 +5,13 @@ DEPENDS = "ppp virtual/kernel" PACKAGE_ARCH = "${MACHINE_ARCH}" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRC_URI = "git://github.com/xelerance/xl2tpd.git \ -" +SRC_URI = "git://github.com/xelerance/xl2tpd.git;branch=master;protocol=https" +SRCREV = "1ef2a025981223c1e16fc833bef226c86ff8c295" + +UPSTREAM_CHECK_URI = "https://github.com/xelerance/xl2tpd/releases" S = "${WORKDIR}/git" @@ -34,8 +36,7 @@ do_install () { install -m 0644 debian/xl2tpd.default ${D}${sysconfdir}/default/xl2tpd } -CONFFILES_${PN} += "${sysconfdir}/xl2tpd.conf ${sysconfdir}/default/xl2tpd" +CONFFILES:${PN} += "${sysconfdir}/xl2tpd.conf ${sysconfdir}/default/xl2tpd" INITSCRIPT_PACKAGES = "${PN}" -INITSCRIPT_NAME_${PN} = "xl2tpd" - +INITSCRIPT_NAME:${PN} = "xl2tpd" diff --git a/meta-networking/recipes-protocols/xl2tpd/xl2tpd_1.3.6.bb b/meta-networking/recipes-protocols/xl2tpd/xl2tpd_1.3.6.bb deleted file mode 100644 index df2ec52c65..0000000000 --- a/meta-networking/recipes-protocols/xl2tpd/xl2tpd_1.3.6.bb +++ /dev/null @@ -1,7 +0,0 @@ -require xl2tpd.inc - -# The SRCREV corresponds to v1.3.6. -# Adding tag=v1.3.6 to the SRC_URI will force access to the upstream repo. -# -SRCREV = "5619e1771048e74b729804e8602f409af0f3faea" - diff --git a/meta-networking/recipes-protocols/xl2tpd/xl2tpd_git.bb b/meta-networking/recipes-protocols/xl2tpd/xl2tpd_git.bb deleted file mode 100644 index 88ae5d6f8b..0000000000 --- a/meta-networking/recipes-protocols/xl2tpd/xl2tpd_git.bb +++ /dev/null @@ -1,8 +0,0 @@ -require xl2tpd.inc - -# This is v1.3.6 plus some commits. There is no tag for this commit. -# -PV = "1.3.9+git${SRCPV}" - -SRCREV = "f114c10ac532051badeca0132b144a2f1596f047" - diff --git a/meta-networking/recipes-protocols/zeroconf/zeroconf/0001-zeroconf-Rename-arp_op-to-avoid-namespace-conflicts-.patch b/meta-networking/recipes-protocols/zeroconf/zeroconf/0001-zeroconf-Rename-arp_op-to-avoid-namespace-conflicts-.patch index b4d6d94b06..92b581416f 100644 --- a/meta-networking/recipes-protocols/zeroconf/zeroconf/0001-zeroconf-Rename-arp_op-to-avoid-namespace-conflicts-.patch +++ b/meta-networking/recipes-protocols/zeroconf/zeroconf/0001-zeroconf-Rename-arp_op-to-avoid-namespace-conflicts-.patch @@ -12,6 +12,8 @@ and causes the conflict Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + zeroconf.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meta-networking/recipes-protocols/zeroconf/zeroconf_0.9.bb b/meta-networking/recipes-protocols/zeroconf/zeroconf_0.9.bb index 753d832982..cb26699212 100644 --- a/meta-networking/recipes-protocols/zeroconf/zeroconf_0.9.bb +++ b/meta-networking/recipes-protocols/zeroconf/zeroconf_0.9.bb @@ -7,14 +7,12 @@ These addresses are allocated from the 169.254.0.0/16 address range and \ are normally attached to each Ethernet device in your computer. \ Addresses are assigned randomly by each host and, in case of collision, \ both hosts (are supposed to) renumber." -AUTHOR = "Anand Kumria <wildfire@progsoc.uts.edu.au>" HOMEPAGE = "http://www.progsoc.org/~wildfire/zeroconf/" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4 \ file://zeroconf.c;beginline=1;endline=13;md5=a5bada96e1e34b08eb7446b28e2630b2" SECTION = "net" -PR = "r1" SRC_URI = "http://www.progsoc.org/~wildfire/zeroconf/download/${BPN}-${PV}.tar.gz \ file://compilefix.patch \ @@ -27,11 +25,13 @@ SRC_URI = "http://www.progsoc.org/~wildfire/zeroconf/download/${BPN}-${PV}.tar.g SRC_URI[md5sum] = "bdafb16b008ebb5633e4e581f77821d2" SRC_URI[sha256sum] = "a8c74df127753e2310fa1e072f3c9ca44a404bb0bbce9cfec7a84c6dff8bec7b" +EXTRA_OEMAKE += "CPPFLAGS='${CFLAGS}'" + do_install () { install -d ${D}${sbindir} install -d ${D}${sysconfdir}/network/if-up.d install -d ${D}${sysconfdir}/default install -c -m 755 ${S}/zeroconf ${D}${sbindir}/zeroconf - install -c -m 755 ${WORKDIR}/debian-zeroconf ${D}${sysconfdir}/network/if-up.d/zeroconf - install -c ${WORKDIR}/zeroconf-default ${D}${sysconfdir}/default/zeroconf + install -c -m 755 ${UNPACKDIR}/debian-zeroconf ${D}${sysconfdir}/network/if-up.d/zeroconf + install -c ${UNPACKDIR}/zeroconf-default ${D}${sysconfdir}/default/zeroconf } diff --git a/meta-networking/recipes-support/aoetools/aoetools/reproducible-build.patch b/meta-networking/recipes-support/aoetools/aoetools/reproducible-build.patch new file mode 100644 index 0000000000..34d59b1aa6 --- /dev/null +++ b/meta-networking/recipes-support/aoetools/aoetools/reproducible-build.patch @@ -0,0 +1,14 @@ +Upstream-Status: Pending + +--- a/Makefile ++++ b/Makefile +@@ -40,7 +40,8 @@ NPERSHELF=16 + CONF_SCRIPTS = aoe-discover aoe-interfaces aoe-mkshelf aoe-revalidate aoe-flush aoe-stat + PROGS = aoeping aoecfg aoe-sancheck + COMMANDS := ${CONF_SCRIPTS} aoe-mkdevs aoe-version coraid-update ${PROGS} +-CFLAGS = -Wall -O -g ++# We could still override this on the command line. ++CFLAGS += -Wall -O -g + SANCHECKLIBS = -lpthread + + AOE_PING_OBJ = aoeping.o linux.o diff --git a/meta-networking/recipes-support/aoetools/aoetools_36.bb b/meta-networking/recipes-support/aoetools/aoetools_36.bb index 9b73b442ab..9c9e5ca7ad 100644 --- a/meta-networking/recipes-support/aoetools/aoetools_36.bb +++ b/meta-networking/recipes-support/aoetools/aoetools_36.bb @@ -6,13 +6,14 @@ The vblade program (storage target) exports a blockdevice using AoE. \ " HOMEPAGE = "http://sourceforge.net/projects/${BPN}" SECTION = "admin" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -RRECOMMENDS_${PN} = "kernel-module-aoe" +RRECOMMENDS:${PN} = "kernel-module-aoe" SRC_URI = "http://sourceforge.net/projects/${BPN}/files/${BPN}/${BPN}-${PV}.tar.gz \ file://aoe-stat-no-bashism.patch \ file://makefile-add-ldflags.patch \ + file://reproducible-build.patch \ " SRC_URI[md5sum] = "bff30daa988a65f69d4448ce4726a6db" SRC_URI[sha256sum] = "fb5e2cd0de7644cc1ec04ee3aeb43211cf7445a0c19e13d6b3ed5a8fbdf215ff" diff --git a/meta-networking/recipes-support/arptables/arptables/0001-Use-ARPCFLAGS-for-package-specific-compiler-flags.patch b/meta-networking/recipes-support/arptables/arptables/0001-Use-ARPCFLAGS-for-package-specific-compiler-flags.patch index e8be45e6b6..c58ef1a9ef 100644 --- a/meta-networking/recipes-support/arptables/arptables/0001-Use-ARPCFLAGS-for-package-specific-compiler-flags.patch +++ b/meta-networking/recipes-support/arptables/arptables/0001-Use-ARPCFLAGS-for-package-specific-compiler-flags.patch @@ -8,24 +8,19 @@ which OE uses to pass tweaks Signed-off-by: Khem Raj <raj.khem@gmail.com> --- - Makefile | 15 +++++++-------- - extensions/Makefile | 5 ++++- - 2 files changed, 11 insertions(+), 9 deletions(-) +Upstream-Status: Pending + + Makefile | 10 ++++------ + extensions/Makefile | 4 ++++ + 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile -index 7bead0d..336db6b 100644 +index 62ebdf2..cd06813 100644 --- a/Makefile +++ b/Makefile -@@ -7,15 +7,13 @@ LIBDIR:=$(PREFIX)/lib - BINDIR:=$(PREFIX)/sbin - MANDIR:=$(PREFIX)/man - man8dir=$(MANDIR)/man8 --INITDIR:=/etc/rc.d/init.d -+INITDIR:=/etc/init.d - SYSCONFIGDIR:=/etc/sysconfig - DESTDIR:= +@@ -12,9 +12,7 @@ DESTDIR:= - MANS = arptables.8 arptables-save.8 arptables-restore.8 + MANS = arptables-legacy.8 arptables-save.8 arptables-restore.8 -COPT_FLAGS:=-O2 -CFLAGS:=$(COPT_FLAGS) -Wall -Wunused -I$(KERNEL_DIR)/include/ -Iinclude/ -DARPTABLES_VERSION=\"$(ARPTABLES_VERSION)\" #-g -DDEBUG #-pg # -DARPTC_DEBUG @@ -34,8 +29,8 @@ index 7bead0d..336db6b 100644 ifndef ARPT_LIBDIR ARPT_LIBDIR:=$(LIBDIR)/arptables endif -@@ -25,13 +23,13 @@ include extensions/Makefile - all: arptables libarptc/libarptc.a +@@ -24,13 +22,13 @@ include extensions/Makefile + all: arptables-legacy libarptc/libarptc.a arptables.o: arptables.c - $(CC) $(CFLAGS) -c -o $@ $< @@ -51,29 +46,18 @@ index 7bead0d..336db6b 100644 libarptc/libarptc.a: libarptc/libarptc.o $(AR) rcs $@ $< -@@ -53,7 +51,8 @@ scripts: arptables-save arptables-restore arptables.sysv - install -m 0755 arptables-restore_ $(DESTDIR)$(BINDIR)/arptables-restore - cat arptables.sysv | sed 's/__EXEC_PATH__/$(tmp1)/g' | sed 's/__SYSCONFIG__/$(tmp2)/g' > arptables.sysv_ - if [ "$(DESTDIR)" != "" ]; then mkdir -p $(DESTDIR)$(INITDIR); fi -- if test -d $(DESTDIR)$(INITDIR); then install -m 0755 arptables.sysv_ $(DESTDIR)$(INITDIR)/arptables; fi -+ install -d $(DESTDIR)$(INITDIR) -+ install -m 0755 arptables.sysv_ $(DESTDIR)$(INITDIR)/arptables - rm -f arptables-save_ arptables-restore_ arptables.sysv_ - - .PHONY: install-man diff --git a/extensions/Makefile b/extensions/Makefile -index 0189cc9..b046425 100644 +index 0189cc9..e8af782 100644 --- a/extensions/Makefile +++ b/extensions/Makefile -@@ -4,4 +4,7 @@ EXT_FUNC+=standard mangle CLASSIFY MARK - EXT_OBJS+=$(foreach T,$(EXT_FUNC), extensions/arpt_$(T).o) +@@ -5,3 +5,7 @@ EXT_OBJS+=$(foreach T,$(EXT_FUNC), extensions/arpt_$(T).o) extensions/ebt_%.o: extensions/arpt_%.c include/arptables.h include/arptables_common.h -- $(CC) $(CFLAGS) $(PROGSPECS) -c -o $@ $< + $(CC) $(CFLAGS) $(PROGSPECS) -c -o $@ $< + $(CC) $(CFLAGS) $(ARPCFLAGS) $(PROGSPECS) -c -o $@ $< + +extensions/arpt_%.o: extensions/arpt_%.c include/arptables.h include/arptables_common.h + $(CC) $(CFLAGS) $(ARPCFLAGS) $(PROGSPECS) -c -o $@ $< -- -2.12.1 +2.17.1 diff --git a/meta-networking/recipes-support/arptables/arptables/arptables-init-busybox.patch b/meta-networking/recipes-support/arptables/arptables/arptables-init-busybox.patch deleted file mode 100644 index 24956c4ca9..0000000000 --- a/meta-networking/recipes-support/arptables/arptables/arptables-init-busybox.patch +++ /dev/null @@ -1,77 +0,0 @@ -Index: arptables-v0.0.3-4/arptables.sysv -=================================================================== ---- arptables-v0.0.3-4.orig/arptables.sysv 2010-03-22 16:28:03.000000000 +0300 -+++ arptables-v0.0.3-4/arptables.sysv 2010-03-22 16:27:51.000000000 +0300 -@@ -12,10 +12,10 @@ - # config: __SYSCONFIG__/arptables - - source /etc/init.d/functions --source /etc/sysconfig/network -+# source /etc/sysconfig/network - - # Check that networking is up. --[ ${NETWORKING} = "no" ] && exit 0 -+# [ ${NETWORKING} = "no" ] && exit 0 - - [ -x __EXEC_PATH__/arptables ] || exit 1 - [ -x __EXEC_PATH__/arptables-save ] || exit 1 -@@ -28,32 +28,30 @@ - desc="Arp filtering" - - start() { -- echo -n $"Starting $desc ($prog): " -+ echo -n "Starting $desc ($prog): " - __EXEC_PATH__/arptables-restore < __SYSCONFIG__/arptables || RETVAL=1 - - if [ $RETVAL -eq 0 ]; then -- success "$prog startup" -- rm -f /var/lock/subsys/$prog -+ echo "$prog ok" -+ touch /var/lock/subsys/$prog - else -- failure "$prog startup" -+ echo "$prog failed" - fi - -- echo - return $RETVAL - } - - stop() { -- echo -n $"Stopping $desc ($prog): " -+ echo -n "Stopping $desc ($prog): " - __EXEC_PATH__/arptables-restore < /dev/null || RETVAL=1 - - if [ $RETVAL -eq 0 ]; then -- success "$prog shutdown" -- rm -f %{_localstatedir}/lock/subsys/$prog -+ echo "$prog stopped" -+ rm -f /var/lock/subsys/$prog - else -- failure "$prog shutdown" -+ echo "$prog failed to stop" - fi - -- echo - return $RETVAL - } - -@@ -63,15 +61,14 @@ - } - - save() { -- echo -n $"Saving $desc ($prog): " -+ echo -n "Saving $desc ($prog): " - __EXEC_PATH__/arptables-save > __SYSCONFIG__/arptables || RETVAL=1 - - if [ $RETVAL -eq 0 ]; then -- success "$prog saved" -+ echo "$prog saved" - else -- failure "$prog saved" -+ echo "$prog is not saved" - fi -- echo - } - - case "$1" in diff --git a/meta-networking/recipes-support/arptables/arptables/arptables-remove-bashism.patch b/meta-networking/recipes-support/arptables/arptables/arptables-remove-bashism.patch deleted file mode 100644 index f332658bcd..0000000000 --- a/meta-networking/recipes-support/arptables/arptables/arptables-remove-bashism.patch +++ /dev/null @@ -1,37 +0,0 @@ -From cd312bc0e3686404428878d23b8888cba09a20e1 Mon Sep 17 00:00:00 2001 -From: Robert Yang <liezhi.yang@windriver.com> -Date: Thu, 18 Sep 2014 19:46:58 -0700 -Subject: [PATCH] arptables.sysv: remove bashism - -Use "." to replace of "source", and change /bin/bash to /bin/sh, the -echo $"foo" works well in busybox. - -Upstream-Status: Pending - -Signed-off-by: Robert Yang <liezhi.yang@windriver.com> ---- - arptables.sysv | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arptables.sysv b/arptables.sysv -index 7a90bd2..7710376 100644 ---- a/arptables.sysv -+++ b/arptables.sysv -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - # - # init script for arptables - # -@@ -11,7 +11,7 @@ - # - # config: __SYSCONFIG__/arptables - --source /etc/init.d/functions -+. /etc/init.d/functions - # source /etc/sysconfig/network - - # Check that networking is up. --- -1.7.9.5 - diff --git a/meta-networking/recipes-support/arptables/arptables_git.bb b/meta-networking/recipes-support/arptables/arptables_git.bb index cec1d1f77e..f9dd66f605 100644 --- a/meta-networking/recipes-support/arptables/arptables_git.bb +++ b/meta-networking/recipes-support/arptables/arptables_git.bb @@ -1,23 +1,21 @@ SUMMARY = "Administration tool for arp packet filtering" SECTION = "net" -LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRCREV = "f4ab8f63f11a72f14687a6646d04ae1bae3fa45f" -PV = "0.0.4+git${SRCPV}" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" +SRCREV = "efae8949e31f8b2eb6290f377a28384cecaf105a" +PV = "0.0.5+git" SRC_URI = " \ - git://git.netfilter.org/arptables \ + git://git.netfilter.org/arptables;branch=master \ file://0001-Use-ARPCFLAGS-for-package-specific-compiler-flags.patch \ - file://arptables-init-busybox.patch \ file://arptables-arpt-get-target-fix.patch \ - file://arptables-remove-bashism.patch \ file://arptables.service \ " SRC_URI[arptables.md5sum] = "1d4ab05761f063b0751645d8f2b8f8e5" SRC_URI[arptables.sha256sum] = "e529fd465c67d69ad335299a043516e6b38cdcd337a5ed21718413e96073f928" S = "${WORKDIR}/git" -SYSTEMD_SERVICE_${PN} = "arptables.service" +SYSTEMD_SERVICE:${PN} = "arptables.service" inherit systemd @@ -27,11 +25,11 @@ do_install() { oe_runmake install DESTDIR=${D} if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${systemd_unitdir}/system - install -m 644 ${WORKDIR}/arptables.service ${D}${systemd_unitdir}/system + install -m 644 ${UNPACKDIR}/arptables.service ${D}${systemd_unitdir}/system fi } -RDEPENDS_${PN} += "perl" +RDEPENDS:${PN} += "perl" # the install target is not multi-job safe, but it doesn't do much # so we just install serially diff --git a/meta-networking/recipes-support/bmon/bmon_4.0.bb b/meta-networking/recipes-support/bmon/bmon_4.0.bb new file mode 100644 index 0000000000..c974d54fe8 --- /dev/null +++ b/meta-networking/recipes-support/bmon/bmon_4.0.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "Portable Bandwidth Monitor and rate estimator" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" +# only works with libnl-0.5.0 +DEPENDS = "libnl libconfuse ncurses" + +SRCREV = "1b3f11bde315e221474f7d066ce4efb4ff4d39e3" +SRC_URI = "git://github.com/tgraf/bmon.git;branch=master;protocol=https" + +inherit autotools pkgconfig + +S = "${WORKDIR}/git" diff --git a/meta-networking/recipes-support/bridge-utils/bridge-utils/kernel-headers.patch b/meta-networking/recipes-support/bridge-utils/bridge-utils/0001-include-missing-kernel-header.patch index 8a23a3070c..dbd6b18c42 100644 --- a/meta-networking/recipes-support/bridge-utils/bridge-utils/kernel-headers.patch +++ b/meta-networking/recipes-support/bridge-utils/bridge-utils/0001-include-missing-kernel-header.patch @@ -1,4 +1,4 @@ -From 824f838cc9c7b8a44174358446993d61be7bbb3f Mon Sep 17 00:00:00 2001 +From 203801ae47399569868aa468988e711ba3ddfa92 Mon Sep 17 00:00:00 2001 From: Joe MacDonald <joe_macdonald@mentor.com> Date: Mon, 30 Oct 2017 13:18:20 -0400 Subject: [PATCH] include missing kernel header @@ -17,7 +17,7 @@ Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> 1 file changed, 1 insertion(+) diff --git a/libbridge/libbridge.h b/libbridge/libbridge.h -index c038b92..fd09306 100644 +index 962f316..422ec33 100644 --- a/libbridge/libbridge.h +++ b/libbridge/libbridge.h @@ -24,6 +24,7 @@ @@ -29,5 +29,5 @@ index c038b92..fd09306 100644 #include <linux/if_bridge.h> -- -2.7.4 +2.17.1 diff --git a/meta-networking/recipes-support/bridge-utils/bridge-utils/0005-build-don-t-ignore-CFLAGS-from-environment.patch b/meta-networking/recipes-support/bridge-utils/bridge-utils/0002-build-don-t-ignore-CFLAGS-from-environment.patch index 0a72c6b2c4..5ec563b6b1 100644 --- a/meta-networking/recipes-support/bridge-utils/bridge-utils/0005-build-don-t-ignore-CFLAGS-from-environment.patch +++ b/meta-networking/recipes-support/bridge-utils/bridge-utils/0002-build-don-t-ignore-CFLAGS-from-environment.patch @@ -1,4 +1,4 @@ -From 9d63838d12c772dfe33371e2bb8b8191625539f2 Mon Sep 17 00:00:00 2001 +From 0c1a66fc62cc321d307c94f962031283142eea69 Mon Sep 17 00:00:00 2001 From: Joe MacDonald <joe_macdonald@mentor.com> Date: Mon, 30 Oct 2017 13:37:48 -0400 Subject: [PATCH] build: don't ignore CFLAGS from environment @@ -36,5 +36,5 @@ index e1956d6..eff260c 100644 %.o: %.c brctl.h $(CC) $(CFLAGS) $(INCLUDE) -c $< -- -2.7.4 +2.17.1 diff --git a/meta-networking/recipes-support/bridge-utils/bridge-utils/0006-libbridge-Modifying-the-AR-to-cross-toolchain.patch b/meta-networking/recipes-support/bridge-utils/bridge-utils/0003-libbridge-Modifying-the-AR-to-cross-toolchain.patch index 3f65761f54..586ebfec68 100644 --- a/meta-networking/recipes-support/bridge-utils/bridge-utils/0006-libbridge-Modifying-the-AR-to-cross-toolchain.patch +++ b/meta-networking/recipes-support/bridge-utils/bridge-utils/0003-libbridge-Modifying-the-AR-to-cross-toolchain.patch @@ -1,4 +1,4 @@ -From c924f66743c054d7ebafef90ca1bbebc96732357 Mon Sep 17 00:00:00 2001 +From 99264c688ff98d8f0f237cba6c7098eb4d5a12a7 Mon Sep 17 00:00:00 2001 From: Joe MacDonald <joe_macdonald@mentor.com> Date: Mon, 30 Oct 2017 13:48:33 -0400 Subject: [PATCH] libbridge: Modifying the AR to cross toolchain @@ -14,12 +14,12 @@ Upstream-Status: Pending Signed-off-by: Li Zhou <li.zhou@windriver.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> --- - configure.ac | 1 + + configure.ac | 4 ++++ libbridge/Makefile.in | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 8b2e2ea..8426b7c 100644 +index 66817bb..bcc6946 100644 --- a/configure.ac +++ b/configure.ac @@ -12,6 +12,10 @@ dnl Checks for programs. @@ -47,5 +47,5 @@ index 7932bfe..bd55e9b 100644 CC=@CC@ -- -2.7.4 +2.17.1 diff --git a/meta-networking/recipes-support/bridge-utils/bridge-utils/0004-cleanup-includes.patch b/meta-networking/recipes-support/bridge-utils/bridge-utils/0004-cleanup-includes.patch new file mode 100644 index 0000000000..eb5c53d9ed --- /dev/null +++ b/meta-networking/recipes-support/bridge-utils/bridge-utils/0004-cleanup-includes.patch @@ -0,0 +1,149 @@ +From 1763c5b7f8f72d651d62337029c3bdfb269491e4 Mon Sep 17 00:00:00 2001 +From: Stephen Hemminger <sthemmin@microsoft.com> +Date: Fri, 7 Jan 2022 08:44:19 -0800 +Subject: [PATCH] cleanup includes + +Use IWYU to only include necessary headers. +Should resolve build issues for distros that need limits.h +to find PATH_MAX. + +Upstream-Status: Backport +[https://git.kernel.org/pub/scm/network/bridge/bridge-utils.git/commit/?h=main&id=1763c5b7f8f72d651d62337029c3bdfb269491e4] + +Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com> +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + brctl/brctl.c | 1 - + brctl/brctl_cmd.c | 3 ++- + brctl/brctl_disp.c | 1 - + libbridge/libbridge_devif.c | 5 ++++- + libbridge/libbridge_if.c | 5 +---- + libbridge/libbridge_init.c | 4 +++- + libbridge/libbridge_misc.c | 5 +---- + 7 files changed, 11 insertions(+), 13 deletions(-) + +diff --git a/brctl/brctl.c b/brctl/brctl.c +index 8855234..d2fa005 100644 +--- a/brctl/brctl.c ++++ b/brctl/brctl.c +@@ -17,7 +17,6 @@ + */ + + #include <stdio.h> +-#include <stdlib.h> + #include <string.h> + #include <errno.h> + #include <getopt.h> +diff --git a/brctl/brctl_cmd.c b/brctl/brctl_cmd.c +index 81f7dfa..4167503 100644 +--- a/brctl/brctl_cmd.c ++++ b/brctl/brctl_cmd.c +@@ -18,10 +18,11 @@ + + #include <stdio.h> + #include <stdlib.h> ++#include <stdint.h> + #include <string.h> + #include <sys/time.h> + #include <errno.h> +-#include <asm/param.h> ++ + #include "libbridge.h" + #include "brctl.h" + +diff --git a/brctl/brctl_disp.c b/brctl/brctl_disp.c +index 3e81241..f6bf2af 100644 +--- a/brctl/brctl_disp.c ++++ b/brctl/brctl_disp.c +@@ -17,7 +17,6 @@ + */ + + #include <stdio.h> +-#include <stdlib.h> + #include <string.h> + #include <sys/time.h> + +diff --git a/libbridge/libbridge_devif.c b/libbridge/libbridge_devif.c +index 8b7d954..3aac0f9 100644 +--- a/libbridge/libbridge_devif.c ++++ b/libbridge/libbridge_devif.c +@@ -18,12 +18,15 @@ + + + #include <stdio.h> +-#include <stdlib.h> + #include <unistd.h> + #include <errno.h> + #include <string.h> + #include <dirent.h> + #include <fcntl.h> ++#include <limits.h> ++ ++#include <sys/ioctl.h> ++#include <linux/sockios.h> + + #include "libbridge.h" + #include "libbridge_private.h" +diff --git a/libbridge/libbridge_if.c b/libbridge/libbridge_if.c +index 5f3aed1..96dda30 100644 +--- a/libbridge/libbridge_if.c ++++ b/libbridge/libbridge_if.c +@@ -16,12 +16,9 @@ + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +-#include <stdio.h> +-#include <stdlib.h> + #include <errno.h> +-#include <string.h> +-#include <fcntl.h> + #include <sys/ioctl.h> ++#include <linux/sockios.h> + + #include "libbridge.h" + #include "libbridge_private.h" +diff --git a/libbridge/libbridge_init.c b/libbridge/libbridge_init.c +index c914971..d572895 100644 +--- a/libbridge/libbridge_init.c ++++ b/libbridge/libbridge_init.c +@@ -16,14 +16,16 @@ + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#include <limits.h> + #include <stdio.h> + #include <stdlib.h> + #include <unistd.h> + #include <errno.h> + #include <string.h> + #include <dirent.h> +-#include <sys/types.h> + #include <sys/stat.h> ++#include <sys/ioctl.h> ++#include <linux/sockios.h> + + #include "libbridge.h" + #include "libbridge_private.h" +diff --git a/libbridge/libbridge_misc.c b/libbridge/libbridge_misc.c +index 9379e93..5b146fd 100644 +--- a/libbridge/libbridge_misc.c ++++ b/libbridge/libbridge_misc.c +@@ -16,14 +16,11 @@ + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +-#include <stdio.h> + #include <stdlib.h> + #include <string.h> +-#include <sys/time.h> + #include <asm/param.h> +-#include "libbridge.h" +-#include "libbridge_private.h" + ++#include "libbridge.h" + + static const char *state_names[5] = { + [BR_STATE_DISABLED] = "disabled", +-- +2.17.1 + diff --git a/meta-networking/recipes-support/bridge-utils/bridge-utils_1.6.bb b/meta-networking/recipes-support/bridge-utils/bridge-utils_1.7.1.bb index 1c87c48bfa..cf0fc1c33d 100644 --- a/meta-networking/recipes-support/bridge-utils/bridge-utils_1.6.bb +++ b/meta-networking/recipes-support/bridge-utils/bridge-utils_1.7.1.bb @@ -1,17 +1,18 @@ SUMMARY = "Tools for ethernet bridging" HOMEPAGE = "http://www.linuxfoundation.org/collaborate/workgroups/networking/bridge" SECTION = "net" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=f9d20a453221a1b7e32ae84694da2c37" -SRCREV = "42c1aefc303fdf891fbb099ea51f00dca83ab606" +SRCREV = "75d949b9fae9718201422f0bd3d1103e67dd597c" SRC_URI = "\ - git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/bridge-utils.git \ - file://kernel-headers.patch \ - file://0005-build-don-t-ignore-CFLAGS-from-environment.patch \ - file://0006-libbridge-Modifying-the-AR-to-cross-toolchain.patch \ + git://git.kernel.org/pub/scm/network/bridge/bridge-utils.git;branch=main \ + file://0001-include-missing-kernel-header.patch \ + file://0002-build-don-t-ignore-CFLAGS-from-environment.patch \ + file://0003-libbridge-Modifying-the-AR-to-cross-toolchain.patch \ + file://0004-cleanup-includes.patch \ " S = "${WORKDIR}/git" @@ -20,16 +21,16 @@ DEPENDS = "sysfsutils" inherit autotools-brokensep update-alternatives -ALTERNATIVE_${PN} = "brctl" +ALTERNATIVE:${PN} = "brctl" ALTERNATIVE_PRIORITY[brctl] = "100" ALTERNATIVE_LINK_NAME[brctl] = "${sbindir}/brctl" EXTRA_OECONF = "--with-linux-headers=${STAGING_INCDIR}" -do_install_append () { +do_install:append () { install -d ${D}/${datadir}/bridge-utils install -d ${D}/${sysconfdir}/network/if-pre-up.d install -d ${D}/${sysconfdir}/network/if-post-down.d } -RRECOMMENDS_${PN} = "kernel-module-bridge" +RRECOMMENDS:${PN} = "kernel-module-bridge" diff --git a/meta-networking/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch b/meta-networking/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch deleted file mode 100644 index 5dd4c7d772..0000000000 --- a/meta-networking/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch +++ /dev/null @@ -1,105 +0,0 @@ -From 7e1ae687916fd5878ee755afbdea6b10494e0b92 Mon Sep 17 00:00:00 2001 -From: Alexey Firago <alexey_firago@mentor.com> -Date: Wed, 26 Jul 2017 23:21:25 +0300 -Subject: [PATCH] cmake: Install libcares.pc - -Prepare and install libcares.pc file during cmake build, so libraries -using pkg-config to find libcares will not fail. - -Signed-off-by: Alexey Firago <alexey_firago@mentor.com> ---- - CMakeLists.txt | 21 +++++++++++++++++++++ - libcares.pc.cmakein | 20 ++++++++++++++++++++ - 2 files changed, 41 insertions(+) - create mode 100644 libcares.pc.cmakein - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 364b6c7..0016b67 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -173,21 +173,29 @@ ADD_DEFINITIONS(${SYSFLAGS}) - - - # Tell C-Ares about libraries to depend on -+# Also pass these libraries to pkg-config file -+SET(CARES_PRIVATE_LIBS_LIST) - IF (HAVE_LIBRESOLV) - LIST (APPEND CARES_DEPENDENT_LIBS resolv) -+ LIST (APPEND CARES_PRIVATE_LIBS_LIST "-lresolv") - ENDIF () - IF (HAVE_LIBNSL) - LIST (APPEND CARES_DEPENDENT_LIBS nsl) -+ LIST (APPEND CARES_PRIVATE_LIBS_LIST "-lnsl") - ENDIF () - IF (HAVE_LIBSOCKET) - LIST (APPEND CARES_DEPENDENT_LIBS socket) -+ LIST (APPEND CARES_PRIVATE_LIBS_LIST "-lsocket") - ENDIF () - IF (HAVE_LIBRT) - LIST (APPEND CARES_DEPENDENT_LIBS rt) -+ LIST (APPEND CARES_PRIVATE_LIBS_LIST "-lrt") - ENDIF () - IF (WIN32) - LIST (APPEND CARES_DEPENDENT_LIBS ws2_32) -+ LIST (APPEND CARES_PRIVATE_LIBS_LIST "-lws2_32") - ENDIF () -+string (REPLACE ";" " " CARES_PRIVATE_LIBS "${CARES_PRIVATE_LIBS_LIST}") - - - # When checking for symbols, we need to make sure we set the proper -@@ -489,6 +497,13 @@ CONFIGURE_FILE (ares_build.h.cmake ${PROJECT_BINARY_DIR}/ares_build.h) - # Write ares_config.h configuration file. This is used only for the build. - CONFIGURE_FILE (ares_config.h.cmake ${PROJECT_BINARY_DIR}/ares_config.h) - -+# Pass required CFLAGS to pkg-config in case of static library -+IF (CARES_STATIC) -+ SET (CPPFLAG_CARES_STATICLIB "-DCARES_STATICLIB") -+ENDIF() -+ -+# Write ares_config.h configuration file. This is used only for the build. -+CONFIGURE_FILE (libcares.pc.cmakein ${PROJECT_BINARY_DIR}/libcares.pc @ONLY) - - # TRANSFORM_MAKEFILE_INC - # -@@ -625,6 +640,12 @@ IF (CARES_INSTALL) - INSTALL (FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake" DESTINATION ${CMAKECONFIG_INSTALL_DIR}) - ENDIF () - -+# pkg-config file -+IF (CARES_INSTALL) -+ SET (PKGCONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/pkgconfig") -+ INSTALL (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcares.pc" DESTINATION ${PKGCONFIG_INSTALL_DIR}) -+ENDIF () -+ - # Legacy chain-building variables (provided for compatibility with old code). - # Don't use these, external code should be updated to refer to the aliases directly (e.g., Cares::cares). - SET (CARES_FOUND 1 CACHE INTERNAL "CARES LIBRARY FOUND") -diff --git a/libcares.pc.cmakein b/libcares.pc.cmakein -new file mode 100644 -index 0000000..f29fede ---- /dev/null -+++ b/libcares.pc.cmakein -@@ -0,0 +1,20 @@ -+#*************************************************************************** -+# Project ___ __ _ _ __ ___ ___ -+# / __|____ / _` | '__/ _ \/ __| -+# | (_|_____| (_| | | | __/\__ \ -+# \___| \__,_|_| \___||___/ -+# -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=@CMAKE_INSTALL_PREFIX@ -+libdir=@CMAKE_INSTALL_FULL_LIBDIR@ -+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ -+ -+Name: c-ares -+URL: http://daniel.haxx.se/projects/c-ares/ -+Description: asynchronous DNS lookup library -+Version: @VERSION@ -+Requires: -+Requires.private: -+Cflags: -I${includedir} @CPPFLAG_CARES_STATICLIB@ -+Libs: -L${libdir} -lcares -+Libs.private: @CARES_PRIVATE_LIBS@ --- -2.7.4 - diff --git a/meta-networking/recipes-support/c-ares/c-ares_1.13.0.bb b/meta-networking/recipes-support/c-ares/c-ares_1.13.0.bb deleted file mode 100644 index 70e497f5f0..0000000000 --- a/meta-networking/recipes-support/c-ares/c-ares_1.13.0.bb +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright (c) 2012-2014 LG Electronics, Inc. -SUMMARY = "c-ares is a C library that resolves names asynchronously." -HOMEPAGE = "http://daniel.haxx.se/projects/c-ares/" -SECTION = "libs" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=f4b026880834eb01c035c5e5cb47ccac" -SRCREV = "3be1924221e1326df520f8498d704a5c4c8d0cce" -PV = "1.13.0+gitr${SRCPV}" - -SRC_URI = "\ - git://github.com/c-ares/c-ares.git \ - file://cmake-install-libcares.pc.patch \ -" - -S = "${WORKDIR}/git" - -inherit cmake pkgconfig - -PACKAGES =+ "${PN}-utils" - -FILES_${PN}-dev += "${libdir}/cmake" -FILES_${PN}-utils = "${bindir}" - -BBCLASSEXTEND = "native" diff --git a/meta-networking/recipes-support/celt051/celt051/0001-configure.ac-make-tools-support-optional.patch b/meta-networking/recipes-support/celt051/celt051/0001-configure.ac-make-tools-support-optional.patch new file mode 100644 index 0000000000..b0809ee947 --- /dev/null +++ b/meta-networking/recipes-support/celt051/celt051/0001-configure.ac-make-tools-support-optional.patch @@ -0,0 +1,39 @@ +From 86df4200c9c33d999df0e8cc3c9771f17a297ec4 Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Wed, 13 Sep 2017 15:01:54 +0200 +Subject: [PATCH] configure.ac: make tools support optional + +* add --enable-tools option +* XIPH_PATH_OGG macro is provided by libogg so we cannot call + it without the libogg dependency + +Upstream-Status: Pending + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + configure.ac | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index d4b1a3f..7d6b2dc 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -68,8 +68,14 @@ AC_MSG_RESULT($has_alloca) + + AC_CHECK_HEADERS(sys/soundcard.h sys/audioio.h) + +-XIPH_PATH_OGG([tools="tools"], [tools=""]) ++AC_ARG_ENABLE(tools, [ --enable-tools Compile ogg tools], ++[if test "$enableval" = yes; then ++ [tools="tools"] ++else ++ [tools=""] ++fi], + AC_SUBST(tools) ++) + + AC_CHECK_LIB(m, sin) + +-- +2.14.1 + diff --git a/meta-networking/recipes-support/celt051/celt051/0001-tests-Include-entcode.c-into-test-sources-to-provide.patch b/meta-networking/recipes-support/celt051/celt051/0001-tests-Include-entcode.c-into-test-sources-to-provide.patch new file mode 100644 index 0000000000..cc893f0999 --- /dev/null +++ b/meta-networking/recipes-support/celt051/celt051/0001-tests-Include-entcode.c-into-test-sources-to-provide.patch @@ -0,0 +1,55 @@ +From 61fbdddb660c5944ac23b820754a7c4cf4eee097 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 8 Jun 2018 19:29:03 -0700 +Subject: [PATCH] tests: Include entcode.c into test sources to provide + definitions of functions e.g. ec_ilog() + +Fixes link errors in tests +| /usr/src/debug/celt051/0.5.1.3+gitAUTOINC+5555aae843-r0/git/tests/../libcelt/rangedec.c:202: undefined reference to `ec_ilog' + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + tests/cwrs32-test.c | 1 + + tests/ectest.c | 2 +- + tests/laplace-test.c | 1 + + 3 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/tests/cwrs32-test.c b/tests/cwrs32-test.c +index 3a95df2..a159ab3 100644 +--- a/tests/cwrs32-test.c ++++ b/tests/cwrs32-test.c +@@ -8,6 +8,7 @@ + #include "rangeenc.c" + #include "rangedec.c" + #include "cwrs.c" ++#include "entcode.c" + #include <string.h> + #define NMAX (10) + #define MMAX (9) +diff --git a/tests/ectest.c b/tests/ectest.c +index aa35453..94eb9a3 100644 +--- a/tests/ectest.c ++++ b/tests/ectest.c +@@ -5,7 +5,7 @@ + #include <stdlib.h> + #include <stdio.h> + #include <math.h> +-#include "entcode.h" ++#include "entcode.c" + #include "entenc.c" + #include "entdec.c" + #include "rangeenc.c" +diff --git a/tests/laplace-test.c b/tests/laplace-test.c +index 3f98ab3..8e1fb4e 100644 +--- a/tests/laplace-test.c ++++ b/tests/laplace-test.c +@@ -6,6 +6,7 @@ + #include <stdlib.h> + #include "laplace.c" + #include "stack_alloc.h" ++#include "entcode.c" + #include "entenc.c" + #include "entdec.c" + #include "rangeenc.c" diff --git a/meta-networking/recipes-support/celt051/celt051_git.bb b/meta-networking/recipes-support/celt051/celt051_git.bb new file mode 100644 index 0000000000..4842a0fbdf --- /dev/null +++ b/meta-networking/recipes-support/celt051/celt051_git.bb @@ -0,0 +1,33 @@ +# +# Copyright (C) 2013 Wind River Systems, Inc. +# + +SUMMARY = "The CELT codec is a compression algorithm for audio" +DESCRIPTION = "The CELT codec is a compression algorithm for \ +audio. Like MP3, Vorbis, and AAC it is suitable for transmitting music \ +with high quality. Unlike these formats CELT imposes very little delay \ +on the signal, even less than is typical for speech centric formats \ +like Speex, GSM, or G.729." + +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=375f60ab360d17f0172737036ff155b2" + +PV = "0.5.1.3+git" + +SRCREV = "5555aae843f57241d005e330b9cb65602d56db0f" + +SRC_URI = "git://gitlab.xiph.org/xiph/celt.git;branch=compat-v0.5.1;protocol=https \ + file://0001-configure.ac-make-tools-support-optional.patch \ + file://0001-tests-Include-entcode.c-into-test-sources-to-provide.patch \ + " + +S = "${WORKDIR}/git" + +inherit pkgconfig autotools-brokensep + +PACKAGECONFIG:class-native = "" +PACKAGECONFIG ??= "" + +PACKAGECONFIG[ogg] = "--enable-tools,--disable-tools,libogg," + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-networking/recipes-support/chrony/chrony/0001-Fix-compilation-with-musl.patch b/meta-networking/recipes-support/chrony/chrony/0001-Fix-compilation-with-musl.patch new file mode 100644 index 0000000000..5e2bc64af3 --- /dev/null +++ b/meta-networking/recipes-support/chrony/chrony/0001-Fix-compilation-with-musl.patch @@ -0,0 +1,31 @@ +From 11ec10cdb5ab4b94c5999e018a9c854419997761 Mon Sep 17 00:00:00 2001 +From: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> +Date: Wed, 10 Apr 2019 03:18:17 +0200 +Subject: [PATCH] Fix compilation with musl + +Fixes: +../hash_intmd5.c:58: undefined reference to `MIN' + +Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> +--- +Upstream-Status: Pending + + hash_intmd5.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/hash_intmd5.c b/hash_intmd5.c +index 49da1cf..47efe4c 100644 +--- a/hash_intmd5.c ++++ b/hash_intmd5.c +@@ -33,6 +33,8 @@ + + #include "md5.c" + ++#include <sys/param.h> ++ + static MD5_CTX ctx; + + int +-- +2.17.1 + diff --git a/meta-networking/recipes-support/chrony/chrony/arm_eabi.patch b/meta-networking/recipes-support/chrony/chrony/arm_eabi.patch index 92a2dbd934..b9bb374e53 100644 --- a/meta-networking/recipes-support/chrony/chrony/arm_eabi.patch +++ b/meta-networking/recipes-support/chrony/chrony/arm_eabi.patch @@ -1,55 +1,82 @@ - chrony: fix build failure for arma9 +From 71c44c214c0ab8dc8e9675e5e862f2e342fcb271 Mon Sep 17 00:00:00 2001 +From: Joe Slater <jslater@windriver.com> +Date: Thu, 9 Mar 2017 10:58:06 -0800 +Subject: [PATCH] chrony: fix build failure for arma9 - Eliminate references to syscalls not available - for ARM_EABI. Also add a dependency on libseccomp - which is needed for scfilter to work. +Eliminate references to syscalls not available +for ARM_EABI. Also add a dependency on libseccomp +which is needed for scfilter to work. - Set PACKAGECONFIG to not enable scfilter, since - kernel CONFIG_SECCOMP is unlikely to be set. This - aligns the usage of libseccomp with that of other packages. +Set PACKAGECONFIG to not enable scfilter, since +kernel CONFIG_SECCOMP is unlikely to be set. This +aligns the usage of libseccomp with that of other packages. - Upstream-Status: Pending +Upstream-Status: Pending - Signed-off-by: Joe Slater <jslater@windriver.com> +Signed-off-by: Joe Slater <jslater@windriver.com> - Refresh patch for new upstream version. +Refresh patch for new upstream version. - Signed-off-by: Robert Joslyn <robert.joslyn@redrectangle.org> +Signed-off-by: Robert Joslyn <robert.joslyn@redrectangle.org> +Refreshed for 4.0 + +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- + sys_linux.c | 15 +++++++++------ + 1 file changed, 9 insertions(+), 6 deletions(-) + +diff --git a/sys_linux.c b/sys_linux.c +index 6849637..10f9a57 100644 --- a/sys_linux.c +++ b/sys_linux.c -@@ -465,14 +465,14 @@ SYS_Linux_EnableSystemCallFilter(int lev - const int syscalls[] = { - /* Clock */ - SCMP_SYS(adjtimex), SCMP_SYS(clock_gettime), SCMP_SYS(gettimeofday), -- SCMP_SYS(settimeofday), SCMP_SYS(time), -+ SCMP_SYS(settimeofday), +@@ -485,7 +485,6 @@ SYS_Linux_EnableSystemCallFilter(int level, SYS_ProcessContext context) + #endif + SCMP_SYS(gettimeofday), + SCMP_SYS(settimeofday), +- SCMP_SYS(time), + /* Process */ - SCMP_SYS(clone), SCMP_SYS(exit), SCMP_SYS(exit_group), SCMP_SYS(getpid), -- SCMP_SYS(getrlimit), SCMP_SYS(rt_sigaction), SCMP_SYS(rt_sigreturn), -+ SCMP_SYS(rt_sigaction), SCMP_SYS(rt_sigreturn), - SCMP_SYS(rt_sigprocmask), SCMP_SYS(set_tid_address), SCMP_SYS(sigreturn), - SCMP_SYS(wait4), + SCMP_SYS(clone), +@@ -495,7 +494,6 @@ SYS_Linux_EnableSystemCallFilter(int level, SYS_ProcessContext context) + SCMP_SYS(exit), + SCMP_SYS(exit_group), + SCMP_SYS(getpid), +- SCMP_SYS(getrlimit), + SCMP_SYS(getuid), + SCMP_SYS(getuid32), + #ifdef __NR_membarrier +@@ -515,7 +513,6 @@ SYS_Linux_EnableSystemCallFilter(int level, SYS_ProcessContext context) /* Memory */ -- SCMP_SYS(brk), SCMP_SYS(madvise), SCMP_SYS(mmap), SCMP_SYS(mmap2), -+ SCMP_SYS(brk), SCMP_SYS(madvise), SCMP_SYS(mmap2), - SCMP_SYS(mprotect), SCMP_SYS(mremap), SCMP_SYS(munmap), SCMP_SYS(shmdt), - /* Filesystem */ - SCMP_SYS(access), SCMP_SYS(chmod), SCMP_SYS(chown), SCMP_SYS(chown32), -@@ -483,14 +483,21 @@ - SCMP_SYS(bind), SCMP_SYS(connect), SCMP_SYS(getsockname), - SCMP_SYS(recvfrom), SCMP_SYS(recvmmsg), SCMP_SYS(recvmsg), - SCMP_SYS(sendmmsg), SCMP_SYS(sendmsg), SCMP_SYS(sendto), + SCMP_SYS(brk), + SCMP_SYS(madvise), +- SCMP_SYS(mmap), + SCMP_SYS(mmap2), + SCMP_SYS(mprotect), + SCMP_SYS(mremap), +@@ -575,8 +572,6 @@ SYS_Linux_EnableSystemCallFilter(int level, SYS_ProcessContext context) + SCMP_SYS(sendmsg), + SCMP_SYS(sendto), + SCMP_SYS(shutdown), - /* TODO: check socketcall arguments */ - SCMP_SYS(socketcall), + /* General I/O */ - SCMP_SYS(_newselect), SCMP_SYS(close), SCMP_SYS(open), SCMP_SYS(openat), SCMP_SYS(pipe), -- SCMP_SYS(poll), SCMP_SYS(read), SCMP_SYS(futex), SCMP_SYS(select), -+ SCMP_SYS(poll), SCMP_SYS(read), SCMP_SYS(futex), - SCMP_SYS(set_robust_list), SCMP_SYS(write), - /* Miscellaneous */ - SCMP_SYS(getrandom), SCMP_SYS(sysinfo), SCMP_SYS(uname), -+ /* not always available */ + SCMP_SYS(_newselect), +@@ -600,7 +595,6 @@ SYS_Linux_EnableSystemCallFilter(int level, SYS_ProcessContext context) + #ifdef __NR_futex_time64 + SCMP_SYS(futex_time64), + #endif +- SCMP_SYS(select), + SCMP_SYS(set_robust_list), + SCMP_SYS(write), + SCMP_SYS(writev), +@@ -609,6 +603,15 @@ SYS_Linux_EnableSystemCallFilter(int level, SYS_ProcessContext context) + SCMP_SYS(getrandom), + SCMP_SYS(sysinfo), + SCMP_SYS(uname), ++ /* not always available */ +#if ! defined(__ARM_EABI__) + SCMP_SYS(time), + SCMP_SYS(getrlimit), @@ -60,4 +87,4 @@ +#endif }; - const int socket_domains[] = { + const int denied_any[] = { diff --git a/meta-networking/recipes-support/chrony/chrony/chrony.conf b/meta-networking/recipes-support/chrony/chrony/chrony.conf index 8d226d31a5..d11e2d4069 100644 --- a/meta-networking/recipes-support/chrony/chrony/chrony.conf +++ b/meta-networking/recipes-support/chrony/chrony/chrony.conf @@ -1,3 +1,6 @@ +# Load config files matching the /etc/chrony/conf.d/*.conf pattern. +confdir /etc/chrony/conf.d + # Use public NTP servers from the pool.ntp.org project. # Please consider joining the pool project if possible by running your own # server(s). @@ -17,6 +20,10 @@ pool 0.openembedded.pool.ntp.org iburst # gpios = <&ps7_gpio_0 56 0>; # }; +# Load source files matching the /etc/chrony/sources.d/*.sources pattern. +# These can be reloaded using 'chronyc reload sources'. +sourcedir /etc/chrony/sources.d + # In first three updates step the system clock instead of slew # if the adjustment is larger than 1 second. makestep 1.0 3 diff --git a/meta-networking/recipes-support/chrony/chrony/chronyd b/meta-networking/recipes-support/chrony/chrony/chronyd index 04f1b681c4..8c7c167b3c 100644 --- a/meta-networking/recipes-support/chrony/chrony/chronyd +++ b/meta-networking/recipes-support/chrony/chrony/chronyd @@ -15,7 +15,7 @@ PATH=/sbin:/bin:/usr/bin:/usr/sbin DAEMON=/usr/sbin/chronyd -PIDFILE=/var/run/chronyd.pid +PIDFILE=/run/chrony/chronyd.pid test -x $DAEMON -a -r /etc/chrony.conf || exit 0 diff --git a/meta-networking/recipes-support/chrony/chrony_3.2.bb b/meta-networking/recipes-support/chrony/chrony_4.5.bb index 8b90a354ea..0681a34393 100644 --- a/meta-networking/recipes-support/chrony/chrony_3.2.bb +++ b/meta-networking/recipes-support/chrony/chrony_4.5.bb @@ -27,7 +27,7 @@ the client program only." HOMEPAGE = "https://chrony.tuxfamily.org/" SECTION = "net" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" SRC_URI = "https://download.tuxfamily.org/chrony/chrony-${PV}.tar.gz \ @@ -35,24 +35,24 @@ SRC_URI = "https://download.tuxfamily.org/chrony/chrony-${PV}.tar.gz \ file://chronyd \ file://arm_eabi.patch \ " -SRC_URI[md5sum] = "f4c4eb0dc92f35ee4bb7d3dcd8029ecb" -SRC_URI[sha256sum] = "329f6718dd8c3ece3eee78be1f4821cbbeb62608e7d23f25da293cfa433c4116" + +SRC_URI:append:libc-musl = " \ + file://0001-Fix-compilation-with-musl.patch \ +" +SRC_URI[sha256sum] = "19fe1d9f4664d445a69a96c71e8fdb60bcd8df24c73d1386e02287f7366ad422" DEPENDS = "pps-tools" # Note: Despite being built via './configure; make; make install', # chrony does not use GNU Autotools. -inherit update-rc.d systemd +inherit update-rc.d systemd pkgconfig + +# Add chronyd user if privdrop packageconfig is selected +inherit ${@bb.utils.contains('PACKAGECONFIG', 'privdrop', 'useradd', '', d)} +USERADD_PACKAGES = "${@bb.utils.contains('PACKAGECONFIG', 'privdrop', '${PN}', '', d)}" +USERADD_PARAM:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'privdrop', '--system -d / -M --shell /bin/nologin chronyd;', '', d)}" # Configuration options: -# - For command line editing support in chronyc, you may specify either -# 'editline' or 'readline' but not both. editline is smaller, but -# many systems already have readline for other purposes so you might want -# to choose that instead. However, beware license incompatibility -# since chrony is GPLv2 and readline versions after 6.0 are GPLv3+. -# You can of course choose neither, but if you're that tight on space -# consider dropping chronyc entirely (you can use it remotely with -# appropriate chrony.conf options). # - Security-related: # - 'sechash' is omitted by default because it pulls in nss which is huge. # - 'privdrop' allows chronyd to run as non-root; would need changes to @@ -62,14 +62,11 @@ inherit update-rc.d systemd PACKAGECONFIG ??= "editline \ ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ " -PACKAGECONFIG[readline] = "--without-editline,--without-readline,readline" PACKAGECONFIG[editline] = ",--without-editline,libedit" PACKAGECONFIG[sechash] = "--without-tomcrypt,--disable-sechash,nss" PACKAGECONFIG[privdrop] = ",--disable-privdrop,libcap" PACKAGECONFIG[scfilter] = "--enable-scfilter,--without-seccomp,libseccomp" PACKAGECONFIG[ipv6] = ",--disable-ipv6," -PACKAGECONFIG[nss] = "--with-nss,--without-nss,nss" -PACKAGECONFIG[libcap] = "--with-libcap,--without-libcap,libcap" # --disable-static isn't supported by chrony's configure script. DISABLE_STATIC = "" @@ -77,6 +74,10 @@ DISABLE_STATIC = "" do_configure() { ./configure --sysconfdir=${sysconfdir} --bindir=${bindir} --sbindir=${sbindir} \ --localstatedir=${localstatedir} --datarootdir=${datadir} \ + --with-ntp-era=$(shell date -d '1970-01-01 00:00:00+00:00' +'%s') \ + --with-pidfile=/run/chrony/chronyd.pid \ + --chronyrundir=/run/chrony \ + --host-system=Linux \ ${PACKAGECONFIG_CONFARGS} } @@ -89,11 +90,15 @@ do_install() { # Config file install -d ${D}${sysconfdir} - install -m 644 ${WORKDIR}/chrony.conf ${D}${sysconfdir} + install -m 644 ${UNPACKDIR}/chrony.conf ${D}${sysconfdir} + if ${@bb.utils.contains('PACKAGECONFIG', 'privdrop', 'true', 'false', d)}; then + echo "# Define user to drop to after dropping root privileges" >> ${D}${sysconfdir}/chrony.conf + echo "user chronyd" >> ${D}${sysconfdir}/chrony.conf + fi # System V init script install -d ${D}${sysconfdir}/init.d - install -m 755 ${WORKDIR}/chronyd ${D}${sysconfdir}/init.d + install -m 755 ${UNPACKDIR}/chronyd ${D}${sysconfdir}/init.d # systemd unit configuration file install -d ${D}${systemd_unitdir}/system @@ -102,9 +107,6 @@ do_install() { # Variable data (for drift and/or rtc file) install -d ${D}${localstatedir}/lib/chrony - # Log files - install -d ${D}${localstatedir}/log/chrony - # Fix hard-coded paths in config files and init scripts sed -i -e 's!/var/!${localstatedir}/!g' -e 's!/etc/!${sysconfdir}/!g' \ -e 's!/usr/sbin/!${sbindir}/!g' -e 's!/usr/bin/!${bindir}/!g' \ @@ -113,22 +115,26 @@ do_install() { ${D}${systemd_unitdir}/system/chronyd.service sed -i 's!^PATH=.*!PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}${sysconfdir}/init.d/chronyd sed -i 's!^EnvironmentFile=.*!EnvironmentFile=-${sysconfdir}/default/chronyd!' ${D}${systemd_unitdir}/system/chronyd.service + + install -d ${D}${sysconfdir}/tmpfiles.d + echo "d /var/lib/chrony 0755 root root -" > ${D}${sysconfdir}/tmpfiles.d/chronyd.conf + } -FILES_${PN} = "${sbindir}/chronyd ${sysconfdir} ${localstatedir}" -CONFFILES_${PN} = "${sysconfdir}/chrony.conf" +FILES:${PN} = "${sbindir}/chronyd ${sysconfdir} ${localstatedir}/lib/chrony ${localstatedir}" +CONFFILES:${PN} = "${sysconfdir}/chrony.conf" INITSCRIPT_NAME = "chronyd" INITSCRIPT_PARAMS = "defaults" SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "chronyd.service" +SYSTEMD_SERVICE:${PN} = "chronyd.service" # It's probably a bad idea to run chrony and another time daemon on # the same system. systemd includes the SNTP client 'timesyncd', which # will be disabled by chronyd.service, however it will remain on the rootfs -# wasting 150 kB unless you put 'PACKAGECONFIG_remove_pn-systemd = "timesyncd"' +# wasting 150 kB unless you put 'PACKAGECONFIG:remove:pn-systemd = "timesyncd"' # in a conf file or bbappend somewhere. -RCONFLICTS_${PN} = "ntp ntimed" +RCONFLICTS:${PN} = "ntp ntimed" # Separate the client program into its own package PACKAGES =+ "chronyc" -FILES_chronyc = "${bindir}/chronyc" +FILES:chronyc = "${bindir}/chronyc" diff --git a/meta-networking/recipes-support/cifs/cifs-utils_7.0.bb b/meta-networking/recipes-support/cifs/cifs-utils_7.0.bb new file mode 100644 index 0000000000..c78bbae7b8 --- /dev/null +++ b/meta-networking/recipes-support/cifs/cifs-utils_7.0.bb @@ -0,0 +1,44 @@ +DESCRIPTION = "A a package of utilities for doing and managing mounts of the Linux CIFS filesystem." +HOMEPAGE = "http://wiki.samba.org/index.php/LinuxCIFS_utils" +SECTION = "otherosfs" +LICENSE = "GPL-3.0-only & LGPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +SRCREV = "316522036133d44ed02cd39ed2748e2b59c85b30" +SRC_URI = "git://git.samba.org/cifs-utils.git;branch=master" + +S = "${WORKDIR}/git" +DEPENDS += "libtalloc" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[cap] = "--with-libcap,--without-libcap,libcap" +# when enabled, it creates ${bindir}/cifscreds and --ignore-fail-on-non-empty in do_install:append is needed +PACKAGECONFIG[cifscreds] = "--enable-cifscreds,--disable-cifscreds,keyutils" +# when enabled, it creates ${sbindir}/cifs.upcall and --ignore-fail-on-non-empty in do_install:append is needed +PACKAGECONFIG[cifsupcall] = "--enable-cifsupcall,--disable-cifsupcall,krb5 libtalloc keyutils" +PACKAGECONFIG[cifsidmap] = "--enable-cifsidmap,--disable-cifsidmap,keyutils samba" +PACKAGECONFIG[cifsacl] = "--enable-cifsacl,--disable-cifsacl,samba" +PACKAGECONFIG[pam] = "--enable-pam --with-pamdir=${base_libdir}/security,--disable-pam,libpam keyutils" + +inherit autotools pkgconfig + +do_configure:prepend() { + # want installed to /usr/sbin rather than /sbin to be DISTRO_FEATURES usrmerge compliant + # must override ROOTSBINDIR (default '/sbin'), + # setting --exec-prefix or --prefix in EXTRA_OECONF does not work + if ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','true','false',d)}; then + export ROOTSBINDIR=${sbindir} + fi +} + +do_install:append() { + if ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','false','true',d)}; then + # Remove empty /usr/bin and /usr/sbin directories since the mount helper + # is installed to /sbin + rmdir --ignore-fail-on-non-empty ${D}${bindir} ${D}${sbindir} + fi +} + +FILES:${PN} += "${base_libdir}/security" +FILES:${PN}-dbg += "${base_libdir}/security/.debug" +RRECOMMENDS:${PN} = "kernel-module-cifs" diff --git a/meta-networking/recipes-support/cifs/cifs-utils_git.bb b/meta-networking/recipes-support/cifs/cifs-utils_git.bb deleted file mode 100644 index 198e3ef987..0000000000 --- a/meta-networking/recipes-support/cifs/cifs-utils_git.bb +++ /dev/null @@ -1,37 +0,0 @@ -DESCRIPTION = "A a package of utilities for doing and managing mounts of the Linux CIFS filesystem." -HOMEPAGE = "http://wiki.samba.org/index.php/LinuxCIFS_utils" -SECTION = "otherosfs" -LICENSE = "GPLv3 & LGPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -PV = "6.7" - -SRCREV = "8101a07871f185c7044fa2ca221b282ab4607c8b" -SRC_URI = "git://git.samba.org/cifs-utils.git \ - file://0001-mount.cifs-Remove-data_blob.h-include.patch \ - " - -S = "${WORKDIR}/git" -DEPENDS += "libtalloc" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[cap] = "--with-libcap,--without-libcap,libcap" -# when enabled, it creates ${bindir}/cifscreds and --ignore-fail-on-non-empty in do_install_append is needed -PACKAGECONFIG[cifscreds] = "--enable-cifscreds,--disable-cifscreds,keyutils" -# when enabled, it creates ${sbindir}/cifs.upcall and --ignore-fail-on-non-empty in do_install_append is needed -PACKAGECONFIG[cifsupcall] = "--enable-cifsupcall,--disable-cifsupcall,krb5 libtalloc keyutils" -PACKAGECONFIG[cifsidmap] = "--enable-cifsidmap,--disable-cifsidmap,keyutils samba" -PACKAGECONFIG[cifsacl] = "--enable-cifsacl,--disable-cifsacl,samba" -PACKAGECONFIG[pam] = "--enable-pam --with-pamdir=${base_libdir}/security,--disable-pam,libpam keyutils" - -inherit autotools pkgconfig - -do_install_append() { - # Remove empty /usr/bin and /usr/sbin directories since the mount helper - # is installed to /sbin - rmdir --ignore-fail-on-non-empty ${D}${bindir} ${D}${sbindir} -} - -FILES_${PN} += "${base_libdir}/security" -FILES_${PN}-dbg += "${base_libdir}/security/.debug" -RRECOMMENDS_${PN} = "kernel-module-cifs" diff --git a/meta-networking/recipes-support/cifs/files/0001-mount.cifs-Remove-data_blob.h-include.patch b/meta-networking/recipes-support/cifs/files/0001-mount.cifs-Remove-data_blob.h-include.patch deleted file mode 100644 index 07f2a57264..0000000000 --- a/meta-networking/recipes-support/cifs/files/0001-mount.cifs-Remove-data_blob.h-include.patch +++ /dev/null @@ -1,32 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: S. Lockwood-Childs <sjl@vctlabs.com> - -From 272d523a57a4e8791d625a479128613be5e401f5 Mon Sep 17 00:00:00 2001 -From: Thomas Witt <pyromaniac@exherbo.org> -Date: Wed, 15 Mar 2017 20:20:44 +0000 -Subject: [PATCH] mount.cifs: Remove data_blob.h include - -data_blob.h includes talloc.h from libtalloc, but that is only marked as -a dependency for cifs.upcall. No symbols from that header are used by -cifs.mount, so remove it to avoid the libtalloc dependency - -Signed-off-by: Thomas Witt <pyromaniac@exherbo.org> ---- - mount.cifs.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/mount.cifs.c b/mount.cifs.c -index 13b71ef..2612feb 100644 ---- a/mount.cifs.c -+++ b/mount.cifs.c -@@ -61,7 +61,6 @@ - #include "mount.h" - #include "util.h" - #include "resolve_host.h" --#include "data_blob.h" - - #ifndef MS_MOVE - #define MS_MOVE 8192 --- -1.9.4 - diff --git a/meta-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 31875ea50f..86f6a0df5d 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 @@ -4,22 +4,17 @@ SECTION = "doc" LICENSE = "DMTF" -SRC_URI = "http://dmtf.org/sites/default/files/cim/cim_schema_v2400/cim_schema_${PV}Final-Doc.zip \ +SRC_URI = "http://dmtf.org/sites/default/files/cim/cim_schema_v2400/cim_schema_${PV}Final-Doc.zip;subdir=${BP} \ file://LICENSE \ " SRC_URI[md5sum] = "3d01940bc1085c6c42184c25fb61f739" SRC_URI[sha256sum] = "3174cf0f8657b19d80dc59e184778d8e553da424728cb2966fe9d5428dd84267" -LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=eecc6f71a56ff3caf17f15bf7aeac7b4" - -do_unpack() { - unzip -q ${DL_DIR}/cim_schema_${PV}Final-Doc.zip -d ${S} - cp -f ${FILE_DIRNAME}/files/LICENSE ${WORKDIR}/ -} +LIC_FILES_CHKSUM = "file://${UNPACKDIR}/LICENSE;md5=eecc6f71a56ff3caf17f15bf7aeac7b4" do_install() { install -d -m 0755 ${D}${datadir}/doc/cim-schema-${PV}-docs cp -R --no-dereference --preserve=mode,links -v ${S}/* ${D}${datadir}/doc/cim-schema-${PV}-docs } -FILES_${PN} = "${datadir}/doc/*" -FILES_${PN}-doc = "" +FILES:${PN} = "${datadir}/doc/*" +FILES:${PN}-doc = "" diff --git a/meta-networking/recipes-support/cim-schema/cim-schema-exper_2.39.0.bb b/meta-networking/recipes-support/cim-schema/cim-schema-exper_2.50.0.bb index 2b49096078..45eee8f1b6 100644 --- a/meta-networking/recipes-support/cim-schema/cim-schema-exper_2.39.0.bb +++ b/meta-networking/recipes-support/cim-schema/cim-schema-exper_2.50.0.bb @@ -2,19 +2,19 @@ require cim-schema.inc LICENSE = "DMTF" -RCONFLICTS_${PN} = "cim-schema-final" +RCONFLICTS:${PN} = "cim-schema-final" -SRC_URI = "http://dmtf.org/sites/default/files/cim/cim_schema_v2390/cim_schema_${PV}Experimental-MOFs.zip;subdir=${BPN}-${PV} \ +SRC_URI = "http://dmtf.org/sites/default/files/cim/cim_schema_v2500/cim_schema_${PV}Experimental-MOFs.zip;subdir=${BPN}-${PV} \ file://LICENSE \ " -SRC_URI[md5sum] = "b82b31c609c6bcc69521829409f58ccc" -SRC_URI[sha256sum] = "ed2096ef1ea25d189a02bbc6603fed7a48297f2987f254265763a6eecb7fc870" -LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=eecc6f71a56ff3caf17f15bf7aeac7b4" +SRC_URI[md5sum] = "ee4ad6441a2b65ca60a3abc53e3ec629" +SRC_URI[sha256sum] = "a44d67881325e267ef46b72eabe0c69f90470b1033b1ce7c26d9ba99072adb50" +LIC_FILES_CHKSUM = "file://${UNPACKDIR}/LICENSE;md5=eecc6f71a56ff3caf17f15bf7aeac7b4" do_install() { install -d -m 0755 ${D}${datadir}/mof/cimv${PV}/ install -d -m 0755 ${D}${datadir}/doc/cim-schema-${PV} - install -m 644 ${WORKDIR}/LICENSE ${D}${datadir}/doc/cim-schema-${PV} + install -m 644 ${UNPACKDIR}/LICENSE ${D}${datadir}/doc/cim-schema-${PV} cp -R --no-dereference --preserve=mode,links -v ${S}/* ${D}${datadir}/mof/cimv${PV}/ chown -R root:root ${D}${datadir}/mof/cimv${PV} @@ -25,5 +25,5 @@ do_install() { ln -s cim_schema_${PV}.mof ${D}${datadir}/mof/cim-current/CIM_Schema.mof } -FILES_${PN} = "${datadir}/mof/* ${datadir}/doc/*" -FILES_${PN}-doc = "" +FILES:${PN} = "${datadir}/mof/* ${datadir}/doc/*" +FILES:${PN}-doc = "" 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 a14de46db6..d046622df5 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 @@ -2,24 +2,19 @@ require cim-schema.inc LICENSE = "DMTF" -RCONFLICTS_${PN} = "cim-schema-exper" +RCONFLICTS:${PN} = "cim-schema-exper" -SRC_URI = "http://dmtf.org/sites/default/files/cim/cim_schema_v2400/cim_schema_${PV}Final-MOFs.zip \ +SRC_URI = "http://dmtf.org/sites/default/files/cim/cim_schema_v2400/cim_schema_${PV}Final-MOFs.zip;subdir=${BP} \ file://LICENSE \ " SRC_URI[md5sum] = "a9bdf17c7374e3b5b7adeaac4842c4ad" SRC_URI[sha256sum] = "dbfa3064ea427acd71a4bebbc172ca2dc44b0b09a6d83b0945b9ffa988a9058a" -LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=eecc6f71a56ff3caf17f15bf7aeac7b4" - -do_unpack() { - unzip -q ${DL_DIR}/cim_schema_${PV}Final-MOFs.zip -d ${S} - cp -f ${FILE_DIRNAME}/files/LICENSE ${WORKDIR}/ -} +LIC_FILES_CHKSUM = "file://${UNPACKDIR}/LICENSE;md5=eecc6f71a56ff3caf17f15bf7aeac7b4" do_install() { install -d -m 0755 ${D}${datadir}/mof/cimv${PV}/ install -d -m 0755 ${D}${datadir}/doc/cim-schema-${PV} - install -m 644 ${WORKDIR}/LICENSE ${D}${datadir}/doc/cim-schema-${PV} + install -m 644 ${UNPACKDIR}/LICENSE ${D}${datadir}/doc/cim-schema-${PV} cp -R --no-dereference --preserve=mode,links -v ${S}/* ${D}${datadir}/mof/cimv${PV}/ chown -R root:root ${D}${datadir}/mof/cimv${PV}/ @@ -30,5 +25,5 @@ do_install() { ln -s cim_schema_${PV}.mof ${D}${datadir}/mof/cim-current/CIM_Schema.mof } -FILES_${PN} = "${datadir}/mof/* ${datadir}/doc/*" -FILES_${PN}-doc = "" +FILES:${PN} = "${datadir}/mof/* ${datadir}/doc/*" +FILES:${PN}-doc = "" diff --git a/meta-networking/recipes-support/cim-schema/cim-schema/files/LICENSE b/meta-networking/recipes-support/cim-schema/cim-schema/files/LICENSE deleted file mode 100644 index 54a28120ee..0000000000 --- a/meta-networking/recipes-support/cim-schema/cim-schema/files/LICENSE +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright 1998-2008 Distributed Management Task Force, Inc. (DMTF). -// All rights reserved. -// DMTF is a not-for-profit association of industry members dedicated -// to promoting enterprise and systems management and interoperability. -// DMTF specifications and documents may be reproduced by -// members and non-members, provided that correct attribution is given. -// As DMTF specifications may be revised from time to time, -// the particular version and release date should always be noted. -// -// Implementation of certain elements of this standard or proposed -// standard may be subject to third party patent rights, including -// provisional patent rights (herein "patent rights"). DMTF makes -// no representations to users of the standard as to the existence -// of such rights, and is not responsible to recognize, disclose, or -// identify any or all such third party patent right, owners or -// claimants, nor for any incomplete or inaccurate identification or -// disclosure of such rights, owners or claimants. DMTF shall have no -// liability to any party, in any manner or circumstance, under any -// legal theory whatsoever, for failure to recognize, disclose, or -// identify any such third party patent rights, or for such party's -// reliance on the standard or incorporation thereof in its product, -// protocols or testing procedures. DMTF shall have no liability to -// any party implementing such standard, whether such implementation -// is foreseeable or not, nor to any patent owner or claimant, and shall -// have no liability or responsibility for costs or losses incurred if -// a standard is withdrawn or modified after publication, and shall be -// indemnified and held harmless by any party implementing the -// standard from any and all claims of infringement by a patent owner -// for such implementations. -// -// For information about patents held by third-parties which have -// notified the DMTF that, in their opinion, such patent may relate to -// or impact implementations of DMTF standards, visit -// http://www.dmtf.org/about/policies/disclosures.php. diff --git a/meta-networking/recipes-support/ctdb/ctdb/01-support-cross-compile-for-linux-os.patch b/meta-networking/recipes-support/ctdb/ctdb/01-support-cross-compile-for-linux-os.patch deleted file mode 100644 index c9195b4f45..0000000000 --- a/meta-networking/recipes-support/ctdb/ctdb/01-support-cross-compile-for-linux-os.patch +++ /dev/null @@ -1,24 +0,0 @@ -support cross-compile for linux-os. - -Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com> - -diff -Nurp ctdb-2.5.1.orig/configure ctdb-2.5.1/configure ---- ctdb-2.5.1.orig/configure 2015-05-07 16:24:28.545000238 +0900 -+++ ctdb-2.5.1/configure 2015-05-07 16:28:20.894000244 +0900 -@@ -10692,10 +10692,16 @@ if test x"$libreplace_cv_HAVE_GETADDRINF - # see bug 5910, use our replacements if we detect - # a broken system. - if test "$cross_compiling" = yes; then : -+ case "$target_os" in -+ *linux*) -+ ;; -+ *) - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - as_fn_error $? "cannot run test program while cross compiling - See \`config.log' for more details" "$LINENO" 5; } -+ ;; -+ esac - else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ diff --git a/meta-networking/recipes-support/ctdb/ctdb/02-link-rep_snprintf-for-ltdbtool.patch b/meta-networking/recipes-support/ctdb/ctdb/02-link-rep_snprintf-for-ltdbtool.patch deleted file mode 100644 index 1dd9b93a5a..0000000000 --- a/meta-networking/recipes-support/ctdb/ctdb/02-link-rep_snprintf-for-ltdbtool.patch +++ /dev/null @@ -1,16 +0,0 @@ -link rep_snprintf from lib/replace/snprintf.o for ltdbtool - -Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com> - -diff -Nurp ctdb-2.5.1.orig/Makefile.in ctdb-2.5.1/Makefile.in ---- ctdb-2.5.1.orig/Makefile.in 2015-05-07 16:43:39.276000236 +0900 -+++ ctdb-2.5.1/Makefile.in 2015-05-07 16:44:09.627000237 +0900 -@@ -170,7 +170,7 @@ bin/ctdb: $(CTDB_CLIENT_OBJ) tools/ctdb. - @echo Linking $@ - $(WRAPPER) $(CC) $(CFLAGS) -o $@ tools/ctdb.o tools/ctdb_vacuum.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS) - --bin/ltdbtool: tools/ltdbtool.o $(TDB_OBJ) -+bin/ltdbtool: tools/ltdbtool.o $(TDB_OBJ) lib/replace/snprintf.o - @echo Linking $@ - $(WRAPPER) $(CC) $(CFLAGS) -o $@ $+ $(TDB_LIBS) $(LIB_FLAGS) - diff --git a/meta-networking/recipes-support/ctdb/ctdb/service-ensure-the-PID-directory-is-created.patch b/meta-networking/recipes-support/ctdb/ctdb/service-ensure-the-PID-directory-is-created.patch deleted file mode 100644 index a7e987b85f..0000000000 --- a/meta-networking/recipes-support/ctdb/ctdb/service-ensure-the-PID-directory-is-created.patch +++ /dev/null @@ -1,25 +0,0 @@ -From f02ff7383f1cc0c118732352ccbae476c7b3b3ba Mon Sep 17 00:00:00 2001 -From: Mark Asselstine <mark.asselstine@windriver.com> -Date: Tue, 17 Nov 2015 16:17:00 -0500 -Subject: [PATCH] service: ensure the PID directory is created - -Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> ---- - config/ctdb.service | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/config/ctdb.service b/config/ctdb.service -index ea37c30..8537105 100644 ---- a/config/ctdb.service -+++ b/config/ctdb.service -@@ -5,6 +5,7 @@ After=network.target - [Service] - Type=forking - LimitCORE=infinity -+RuntimeDirectory=/run/ctdb - PIDFile=/run/ctdb/ctdbd.pid - ExecStart=/usr/sbin/ctdbd_wrapper /run/ctdb/ctdbd.pid start - ExecStop=/usr/sbin/ctdbd_wrapper /run/ctdb/ctdbd.pid stop --- -2.1.4 - diff --git a/meta-networking/recipes-support/ctdb/ctdb_2.5.6.bb b/meta-networking/recipes-support/ctdb/ctdb_2.5.6.bb deleted file mode 100644 index b5a60645c5..0000000000 --- a/meta-networking/recipes-support/ctdb/ctdb_2.5.6.bb +++ /dev/null @@ -1,57 +0,0 @@ -DESCRIPTION = "CTDB is a cluster implementation of the TDB database \ -used by Samba and other projects to store temporary data. If an \ -application is already using TDB for temporary data it is very easy \ -to convert that application to be cluster aware and use CTDB instead." -HOMEPAGE = "https://ctdb.samba.org/" -LICENSE = "GPL-2.0+ & LGPL-3.0+ & GPL-3.0+" - -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://${COREBASE}/meta/files/common-licenses/LGPL-3.0;md5=bfccfe952269fff2b407dd11f2f3083b \ - file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6 \ - " - -SRC_URI = "https://ftp.samba.org/pub/${BPN}/${BP}.tar.gz \ - file://01-support-cross-compile-for-linux-os.patch \ - file://02-link-rep_snprintf-for-ltdbtool.patch \ - file://service-ensure-the-PID-directory-is-created.patch \ - " - -SRC_URI[md5sum] = "efc50109f90a4c790124c35e4ba234ad" -SRC_URI[sha256sum] = "fc1cdd7efcc91afc629f21408281bba5da107b9c17e74bdee2f28a532d14f874" - -inherit autotools-brokensep pkgconfig systemd - -PACKAGECONFIG ??= "" -PACKAGECONFIG[libtdb] = "--without-included-tdb,--with-included-tdb,libtdb" - -PARALLEL_MAKE = "" - -DEPENDS += "popt libtevent libtalloc libldb" -DEPENDS_append_libc-musl = " libtirpc" -CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc" -LDFLAGS_append_libc-musl = " -ltirpc" - -# ctdbd_wrapper requires pgrep, hence procps -RDEPENDS_${PN} += "procps" - -do_configure() { - oe_runconf -} - -do_install_append() { - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${S}/config/ctdb.service ${D}${systemd_unitdir}/system - sed -i -e 's,/usr/sbin/,${sbindir}/,' ${D}${systemd_unitdir}/system/ctdb.service - sed -i -e 's,\([=\ ]\)/run/,\1${localstatedir}/run/,' ${D}${systemd_unitdir}/system/ctdb.service - - rm -r ${D}/${localstatedir}/run -} - -# The systemd service is disabled by default, as the service will fail to -# start without /etc/ctdb/nodes. If the user supplies this, they can re-enable -# the service. -SYSTEMD_AUTO_ENABLE = "disable" -SYSTEMD_SERVICE_${PN} = "ctdb.service" - -# onnode is a shell script with bashisms and bash #! -RDEPENDS_${PN} += "bash" diff --git a/meta-networking/recipes-support/curlpp/curlpp/0001-curlpp-config.in-Remove-references-to-absolute-build.patch b/meta-networking/recipes-support/curlpp/curlpp/0001-curlpp-config.in-Remove-references-to-absolute-build.patch new file mode 100644 index 0000000000..539e9cefb6 --- /dev/null +++ b/meta-networking/recipes-support/curlpp/curlpp/0001-curlpp-config.in-Remove-references-to-absolute-build.patch @@ -0,0 +1,40 @@ +From d6eee2d52f31e034f9d84d38a749d86a63d5b769 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 22 May 2023 20:37:47 -0700 +Subject: [PATCH] curlpp-config.in: Remove references to absolute buildpaths + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + extras/curlpp-config.in | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/extras/curlpp-config.in b/extras/curlpp-config.in +index b0bd964..1416b94 100644 +--- a/extras/curlpp-config.in ++++ b/extras/curlpp-config.in +@@ -43,7 +43,7 @@ while test $# -gt 0; do + + case "$1" in + --cc) +- echo @CC@ ++ curl-config --cc + ;; + + --prefix) +@@ -73,10 +73,10 @@ while test $# -gt 0; do + ;; + + --libs) +- echo -L@libdir@ @LDFLAGS@ @LIBS@ `curl-config --libs` -lcurlpp ++ echo `curl-config --libs` -lcurlpp + ;; + --static-libs) +- echo @libdir_static@/libcurlpp.@libext@ @LDFLAGS@ @LIBS@ `curl-config --static-libs` ++ echo $prefix/@libdir_static@/libcurlpp.@libext@ `curl-config --static-libs` + ;; + + *) +-- +2.40.1 + diff --git a/meta-networking/recipes-support/curlpp/curlpp_0.8.1.bb b/meta-networking/recipes-support/curlpp/curlpp_0.8.1.bb index 340f57dc7e..131f1873a2 100644 --- a/meta-networking/recipes-support/curlpp/curlpp_0.8.1.bb +++ b/meta-networking/recipes-support/curlpp/curlpp_0.8.1.bb @@ -2,12 +2,13 @@ SUMMARY = "C++ library for client-side URL transfers" HOMEPAGE = "http://www.curlpp.org/" SECTION = "libdevel" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" +LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=fd0c9adf285a69aa3b4faf34384e1029" DEPENDS = "curl" -DEPENDS_class-native = "curl-native" +DEPENDS:class-native = "curl-native" -SRC_URI = "git://github.com/jpbarrette/curlpp.git" +SRC_URI = "git://github.com/jpbarrette/curlpp.git;branch=master;protocol=https \ + file://0001-curlpp-config.in-Remove-references-to-absolute-build.patch" SRCREV = "592552a165cc569dac7674cb7fc9de3dc829906f" @@ -15,19 +16,11 @@ S = "${WORKDIR}/git" inherit cmake pkgconfig binconfig -do_install_append () { - sed -i 's,${STAGING_DIR_TARGET},,g' ${D}${libdir}/pkgconfig/curlpp.pc -} - -PACKAGES =+ "libcurlpp libcurlpp-dev libcurlpp-staticdev" - -FILES_lib${BPN} = "${libdir}/lib*.so.*" - -FILES_lib${BPN}-dev = "${includedir} \ - ${libdir}/pkgconfig \ - ${bindir}/*-config \ -" - -FILES_lib${BPN}-staticdev = "${libdir}/lib*.a" - BBCLASSEXTEND = "native nativesdk" + +do_install:append() { + sed -e 's@[^ ]*-ffile-prefix-map=[^ "]*@@g' \ + -e 's@[^ ]*-fdebug-prefix-map=[^ "]*@@g' \ + -e 's@[^ ]*-fmacro-prefix-map=[^ "]*@@g' \ + -i ${D}${libdir}/pkgconfig/*.pc +} diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq.inc b/meta-networking/recipes-support/dnsmasq/dnsmasq.inc deleted file mode 100644 index 4f4bbf144a..0000000000 --- a/meta-networking/recipes-support/dnsmasq/dnsmasq.inc +++ /dev/null @@ -1,83 +0,0 @@ -SUMMARY = "Lightweight, easy to configure DNS forwarder and DHCP server" -HOMEPAGE = "http://www.thekelleys.org.uk/dnsmasq/doc.html" -SECTION = "net" -# GPLv3 was added in version 2.41 as license option -LICENSE = "GPLv2 | GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ - file://COPYING-v3;md5=d32239bcb673463ab874e80d47fae504" - -#at least versions 2.69 and prior are moved to the archive folder on the server -SRC_URI = "http://www.thekelleys.org.uk/dnsmasq/${@['archive/', ''][float(d.getVar('PV').split('.')[1]) > 69]}dnsmasq-${PV}.tar.gz;name=dnsmasq-${PV} \ - file://init \ - file://dnsmasq.conf \ - file://dnsmasq-resolvconf.service \ - file://dnsmasq-noresolvconf.service \ -" - -inherit pkgconfig update-rc.d systemd - -INITSCRIPT_NAME = "dnsmasq" -INITSCRIPT_PARAMS = "defaults" - -PACKAGECONFIG ?= "" -PACKAGECONFIG[dbus] = ",,dbus" -PACKAGECONFIG[idn] = ",,libidn" -PACKAGECONFIG[conntrack] = ",,libnetfilter-conntrack" -PACKAGECONFIG[lua] = ",,lua" -PACKAGECONFIG[resolvconf] = ",,,resolvconf" -EXTRA_OEMAKE = "\ - 'COPTS=${@bb.utils.contains('PACKAGECONFIG', 'dbus', '-DHAVE_DBUS', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'idn', '-DHAVE_IDN', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'conntrack', '-DHAVE_CONNTRACK', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'lua', '-DHAVE_LUASCRIPT', '', d)}' \ - 'CFLAGS=${CFLAGS}' \ - 'LDFLAGS=${LDFLAGS}' \ -" - -SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'resolvconf', 'file://dnsmasq.resolvconf file://99_dnsmasq file://dnsmasq-resolvconf-helper', '', d)}" - -do_compile_append() { - # build dhcp_release - cd ${S}/contrib/lease-tools - oe_runmake -} - -do_install () { - oe_runmake "PREFIX=${D}${prefix}" \ - "BINDIR=${D}${bindir}" \ - "MANDIR=${D}${mandir}" \ - install - install -d ${D}${sysconfdir}/ ${D}${sysconfdir}/init.d ${D}${sysconfdir}/dnsmasq.d - install -m 644 ${WORKDIR}/dnsmasq.conf ${D}${sysconfdir}/ - install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/dnsmasq - - install -d ${D}${systemd_unitdir}/system - - if [ "${@bb.utils.filter('PACKAGECONFIG', 'resolvconf', d)}" ]; then - install -m 0644 ${WORKDIR}/dnsmasq-resolvconf.service ${D}${systemd_unitdir}/system/dnsmasq.service - else - install -m 0644 ${WORKDIR}/dnsmasq-noresolvconf.service ${D}${systemd_unitdir}/system/dnsmasq.service - fi - - install -m 0755 ${S}/contrib/lease-tools/dhcp_release ${D}${bindir} - - if [ "${@bb.utils.filter('PACKAGECONFIG', 'dbus', d)}" ]; then - install -d ${D}${sysconfdir}/dbus-1/system.d - install -m 644 dbus/dnsmasq.conf ${D}${sysconfdir}/dbus-1/system.d/ - fi - if [ "${@bb.utils.filter('PACKAGECONFIG', 'resolvconf', d)}" ]; then - install -d ${D}${sysconfdir}/resolvconf/update.d/ - install -m 0755 ${WORKDIR}/dnsmasq.resolvconf ${D}${sysconfdir}/resolvconf/update.d/dnsmasq - - install -d ${D}${sysconfdir}/default/volatiles - install -m 0644 ${WORKDIR}/99_dnsmasq ${D}${sysconfdir}/default/volatiles - install -m 0755 ${WORKDIR}/dnsmasq-resolvconf-helper ${D}${bindir} - fi -} - -CONFFILES_${PN} = "${sysconfdir}/dnsmasq.conf" - -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -RCONFLICTS_${PN} += "${PN}-systemd" -SYSTEMD_SERVICE_${PN} = "dnsmasq.service" diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch b/meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch deleted file mode 100644 index 0991dd8b95..0000000000 --- a/meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch +++ /dev/null @@ -1,30 +0,0 @@ -From be1b3d2d0f1608cba5efee73d6aac5ad0709041b Mon Sep 17 00:00:00 2001 -From: Joe MacDonald <joe_macdonald@mentor.com> -Date: Tue, 9 Sep 2014 10:24:58 -0400 -Subject: [PATCH] Upstream-status: Inappropriate [OE specific] - -Signed-off-by: Christopher Larson <chris_larson@mentor.com> -Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> - ---- - Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 73ea23e..ed3eeb9 100644 ---- a/Makefile -+++ b/Makefile -@@ -59,8 +59,8 @@ idn2_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LIBIDN2 $(PKG_CONFI - idn2_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LIBIDN2 $(PKG_CONFIG) --libs libidn2` - ct_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_CONNTRACK $(PKG_CONFIG) --cflags libnetfilter_conntrack` - ct_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_CONNTRACK $(PKG_CONFIG) --libs libnetfilter_conntrack` --lua_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --cflags lua5.2` --lua_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --libs lua5.2` -+lua_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --cflags lua` -+lua_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --libs lua` - nettle_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DNSSEC $(PKG_CONFIG) --cflags nettle hogweed` - nettle_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DNSSEC $(PKG_CONFIG) --libs nettle hogweed` - gmp_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DNSSEC NO_GMP --copy -lgmp` --- -2.9.5 - diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.78.bb b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.78.bb deleted file mode 100644 index 4d1dc6e69e..0000000000 --- a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.78.bb +++ /dev/null @@ -1,8 +0,0 @@ -require dnsmasq.inc - -SRC_URI += "\ - file://lua.patch \ -" - -SRC_URI[dnsmasq-2.78.md5sum] = "3bb97f264c73853f802bf70610150788" -SRC_URI[dnsmasq-2.78.sha256sum] = "c92e5d78aa6353354d02aabf74590d08980bb1385d8a00b80ef9bc80430aa1dc" diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.90.bb b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.90.bb new file mode 100644 index 0000000000..be74759d5e --- /dev/null +++ b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.90.bb @@ -0,0 +1,129 @@ +SUMMARY = "Lightweight, easy to configure DNS forwarder and DHCP server" +HOMEPAGE = "http://www.thekelleys.org.uk/dnsmasq/doc.html" +SECTION = "net" +# GPLv3 was added in version 2.41 as license option +LICENSE = "GPL-2.0-only | GPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING-v3;md5=d32239bcb673463ab874e80d47fae504 \ + " + +DEPENDS += "gettext-native" + +#at least versions 2.69 and prior are moved to the archive folder on the server +SRC_URI = "http://www.thekelleys.org.uk/dnsmasq/${@['archive/', ''][float(d.getVar('PV').split('.')[1]) > 69]}dnsmasq-${PV}.tar.gz \ + file://init \ + file://dnsmasq.conf \ + file://dnsmasq-resolvconf.service \ + file://dnsmasq-noresolvconf.service \ + file://dnsmasq-resolved.conf \ +" +SRC_URI[sha256sum] = "8f6666b542403b5ee7ccce66ea73a4a51cf19dd49392aaccd37231a2c51b303b" + +inherit pkgconfig update-rc.d systemd + +INITSCRIPT_NAME = "dnsmasq" +INITSCRIPT_PARAMS = "defaults" + +# dnsmasq defaults +PACKAGECONFIG ?= "auth dhcp dhcp6 dumpfile inotify ipset loop script tftp" + +PACKAGECONFIG[auth] = "-DHAVE_AUTH,-DNO_AUTH" +PACKAGECONFIG[broken-rtc] = "-DHAVE_BROKEN_RTC," +PACKAGECONFIG[conntrack] = "-DHAVE_CONNTRACK,,libnetfilter-conntrack" +PACKAGECONFIG[dbus] = "-DHAVE_DBUS,,dbus" +PACKAGECONFIG[dhcp] = "-DHAVE_DHCP,-DNO_DHCP" +PACKAGECONFIG[dhcp6] = "-DHAVE_DHCP6,-DNO_DHCP6" +PACKAGECONFIG[dnssec] = "-DHAVE_DNSSEC,,nettle" +PACKAGECONFIG[dumpfile] = "-DHAVE_DUMPFILE,-DNO_DUMPFILE" +PACKAGECONFIG[idn] = "-DHAVE_LIBIDN,,libidn,,,idn2" +PACKAGECONFIG[idn2] = "-DHAVE_LIBIDN2,,libidn2,,,idn" +PACKAGECONFIG[inotify] = "-DHAVE_INOTIFY,-DNO_INOTIFY" +PACKAGECONFIG[ipset] = "-DHAVE_IPSET,-DNO_IPSET" +PACKAGECONFIG[loop] = "-DHAVE_LOOP,-DNO_LOOP" +PACKAGECONFIG[lua] = "-DHAVE_LUASCRIPT -DHAVE_SCRIPT,,lua" +PACKAGECONFIG[nftset] = "-DHAVE_NFTSET,,nftables" +PACKAGECONFIG[no-gmp] = "-DNO_GMP," +PACKAGECONFIG[no-id] = "-DNO_ID," +PACKAGECONFIG[resolvconf] = ",,,resolvconf" +PACKAGECONFIG[script] = "-DHAVE_SCRIPT,-DNO_SCRIPT" +PACKAGECONFIG[tftp] = "-DHAVE_TFTP,-DNO_TFTP" +PACKAGECONFIG[ubus] = "-DHAVE_UBUS,,ubus" + +DNSMASQ_LEASEFILE ?= "${localstatedir}/lib/misc/dnsmasq.leases" +DNSMASQ_CONFFILE ?= "${sysconfdir}/dnsmasq.conf" +DNSMASQ_RESOLVFILE ?= "${sysconfdir}/resolv.conf" + +COPTS = "${PACKAGECONFIG_CONFARGS} \ + -DLEASEFILE=\"${DNSMASQ_LEASEFILE}\" \ + -DCONFFILE=\"${DNSMASQ_CONFFILE}\" \ + -DRESOLVFILE=\"${DNSMASQ_RESOLVFILE}\" \ + -DLOCALEDIR=\"${localedir}\"" + +EXTRA_OEMAKE = "\ + 'COPTS=${COPTS}' \ + 'CFLAGS=${CFLAGS}' \ + 'LDFLAGS=${LDFLAGS}' \ +" + +SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'resolvconf', 'file://dnsmasq.resolvconf file://99_dnsmasq file://dnsmasq-resolvconf-helper', '', d)}" + +do_compile () { + oe_runmake all-i18n + if ${@bb.utils.contains_any('PACKAGECONFIG', ['dhcp', 'dhcp6'], 'true', 'false', d)}; then + # build dhcp_release + oe_runmake -C ${S}/contrib/lease-tools + fi +} + +do_install () { + oe_runmake "PREFIX=${D}${prefix}" \ + "BINDIR=${D}${bindir}" \ + "MANDIR=${D}${mandir}" \ + install-i18n + install -d ${D}${sysconfdir}/ ${D}${sysconfdir}/init.d ${D}${sysconfdir}/dnsmasq.d + install -m 644 ${UNPACKDIR}/dnsmasq.conf ${D}${sysconfdir}/ + install -m 755 ${UNPACKDIR}/init ${D}${sysconfdir}/init.d/dnsmasq + + install -d ${D}${systemd_unitdir}/system + + if [ "${@bb.utils.filter('PACKAGECONFIG', 'resolvconf', d)}" ]; then + install -m 0644 ${UNPACKDIR}/dnsmasq-resolvconf.service ${D}${systemd_unitdir}/system/dnsmasq.service + else + install -m 0644 ${UNPACKDIR}/dnsmasq-noresolvconf.service ${D}${systemd_unitdir}/system/dnsmasq.service + fi + + if [ "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" ]; then + install -d ${D}${sysconfdir}/systemd/resolved.conf.d/ + install -m 0644 ${UNPACKDIR}/dnsmasq-resolved.conf ${D}${sysconfdir}/systemd/resolved.conf.d/ + fi + + if [ "${@bb.utils.filter('PACKAGECONFIG', 'dhcp', d)}" ]; then + install -m 0755 ${S}/contrib/lease-tools/dhcp_release ${D}${bindir} + install -m 0755 ${S}/contrib/lease-tools/dhcp_lease_time ${D}${bindir} + fi + + if [ "${@bb.utils.filter('PACKAGECONFIG', 'dhcp6', d)}" ]; then + install -m 0755 ${S}/contrib/lease-tools/dhcp_release6 ${D}${bindir} + fi + + if [ "${@bb.utils.filter('PACKAGECONFIG', 'dbus', d)}" ]; then + install -d ${D}${sysconfdir}/dbus-1/system.d + install -m 644 dbus/dnsmasq.conf ${D}${sysconfdir}/dbus-1/system.d/ + fi + + if [ "${@bb.utils.filter('PACKAGECONFIG', 'resolvconf', d)}" ]; then + install -d ${D}${sysconfdir}/resolvconf/update.d/ + install -m 0755 ${UNPACKDIR}/dnsmasq.resolvconf ${D}${sysconfdir}/resolvconf/update.d/dnsmasq + + install -d ${D}${sysconfdir}/default/volatiles + install -m 0644 ${UNPACKDIR}/99_dnsmasq ${D}${sysconfdir}/default/volatiles + install -m 0755 ${UNPACKDIR}/dnsmasq-resolvconf-helper ${D}${bindir} + fi +} + +CONFFILES:${PN} = "${sysconfdir}/dnsmasq.conf" + +RPROVIDES:${PN} += "${PN}-systemd" +RREPLACES:${PN} += "${PN}-systemd" +RCONFLICTS:${PN} += "${PN}-systemd" +SYSTEMD_SERVICE:${PN} = "dnsmasq.service" diff --git a/meta-networking/recipes-support/dnsmasq/files/dnsmasq-resolvconf.service b/meta-networking/recipes-support/dnsmasq/files/dnsmasq-resolvconf.service index 2980f7def6..ef2f3f7e41 100644 --- a/meta-networking/recipes-support/dnsmasq/files/dnsmasq-resolvconf.service +++ b/meta-networking/recipes-support/dnsmasq/files/dnsmasq-resolvconf.service @@ -8,7 +8,7 @@ PIDFile=/run/dnsmasq.pid ExecStartPre=/usr/bin/dnsmasq --test ExecStart=/usr/bin/dnsmasq -x /run/dnsmasq.pid -7 /etc/dnsmasq.d --local-service ExecStartPost=/usr/bin/dnsmasq-resolvconf-helper start -ExecStopPre=/usr/bin/dnsmasq-resolvconf-helper stop +ExecStop=/usr/bin/dnsmasq-resolvconf-helper stop ExecStop=/bin/kill $MAINPID ExecReload=/bin/kill -HUP $MAINPID diff --git a/meta-networking/recipes-support/dnsmasq/files/dnsmasq-resolved.conf b/meta-networking/recipes-support/dnsmasq/files/dnsmasq-resolved.conf new file mode 100644 index 0000000000..33f4649637 --- /dev/null +++ b/meta-networking/recipes-support/dnsmasq/files/dnsmasq-resolved.conf @@ -0,0 +1,3 @@ +# Avoid conflicts between dnsmasq and systemd-resolved about port 53 +[Resolve] +DNSStubListener=no diff --git a/meta-networking/recipes-support/dnsmasq/files/dnsmasq.conf b/meta-networking/recipes-support/dnsmasq/files/dnsmasq.conf index 9e5ab9f81b..2897b90300 100755 --- a/meta-networking/recipes-support/dnsmasq/files/dnsmasq.conf +++ b/meta-networking/recipes-support/dnsmasq/files/dnsmasq.conf @@ -2,7 +2,7 @@ # # Format is one option per line, legal options are the same # as the long options legal on the command line. See -# "/usr/sbin/dnsmasq --help" or "man 8 dnsmasq" for details. +# "/usr/bin/dnsmasq --help" or "man 8 dnsmasq" for details. # Listen on this specific port instead of the standard DNS port # (53). Setting this to zero completely disables DNS function, diff --git a/meta-networking/recipes-support/dnsmasq/files/init b/meta-networking/recipes-support/dnsmasq/files/init index 51c95dfedd..43c286f9c7 100644 --- a/meta-networking/recipes-support/dnsmasq/files/init +++ b/meta-networking/recipes-support/dnsmasq/files/init @@ -16,7 +16,7 @@ fi DNSMASQ_CONF="/etc/dnsmasq.conf" test "/etc/dnsmasq.d/*" != '/etc/dnsmasq.d/*' && DNSMASQ_CONF="${DNSMASQ_CONF} /etc/dnsmasq.d/*" -test -z "${PIDFILE}" && PIFILE="/run/dnsmasq.pid" +test -z "${PIDFILE}" && PIDFILE="/run/dnsmasq.pid" if [ -z "$IGNORE_RESOLVCONF" ] then diff --git a/meta-networking/recipes-support/dnssec-conf/dnssec-conf_2.02.bb b/meta-networking/recipes-support/dnssec-conf/dnssec-conf_2.02.bb deleted file mode 100644 index ca59bd2170..0000000000 --- a/meta-networking/recipes-support/dnssec-conf/dnssec-conf_2.02.bb +++ /dev/null @@ -1,35 +0,0 @@ -SUMMARY = "DNSSEC and DLV configuration and priming tool" -DESCRIPTION = "\ -DNSSEC configuration and priming tool. Keys are required until the root \ -is signed, as well as for local unpublished DNSSEC keys to be preloaded \ -into the recursive nameserver. These DNSSEC configuration files can be \ -directly included in the bind or unbound nameserver configuration files. \ -dnssec-conf includes a commandline configuration client for Bind and \ -Unbound, known DNSSEC keys, URL's to official publication pages of keys, \ -and harvested keys, as well a script to harvest DNSKEY's from DNS. \ -See also: system-config-dnssec" -HOMEPAGE = "https://github.com/xelerance/dnssec-conf" -SECTION = "net" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://LICENSE;md5=0636e73ff0215e8d672dc4c32c317bb3" -DEPENDS += "xmlto-native docbook-xml-dtd4-native \ - docbook-xsl-stylesheets-native libxslt-native" - -SRC_URI = "git://github.com/xelerance/dnssec-conf.git" -SRCREV = "8e799683736b4a7b5e5e78f98fba0a6f48393537" - -S = "${WORKDIR}/git" - -do_install () { - rm -rf ${D} - make PREFIX=${prefix} DESTDIR=${D} ETCDIR=${D}${sysconfdir} install - # We no longer ship trust anchors. Most of these are in the DLV Registry now. - # and it prevents the problem of shipping outdated trust anchors. - # For DLV, we ship the ISC DLV Registry key - rm -rf ${D}${sysconfdir}/pki/dnssec-keys/harvest/* - rm -rf ${D}${sysconfdir}/pki/dnssec-keys/production/reverse/* - install -d -m 0755 ${D}${sysconfdir}/sysconfig - install -m 0644 packaging/fedora/dnssec.sysconfig ${D}${sysconfdir}/sysconfig/dnssec -} - -RDEPENDS_${PN} = "python" diff --git a/meta-networking/recipes-support/dovecot/dovecot/0001-configure.ac-convert-AC_TRY_RUN-to-AC_TRY_LINK-state.patch b/meta-networking/recipes-support/dovecot/dovecot/0001-configure.ac-convert-AC_TRY_RUN-to-AC_TRY_LINK-state.patch index f86235076e..4fcfa48b99 100644 --- a/meta-networking/recipes-support/dovecot/dovecot/0001-configure.ac-convert-AC_TRY_RUN-to-AC_TRY_LINK-state.patch +++ b/meta-networking/recipes-support/dovecot/dovecot/0001-configure.ac-convert-AC_TRY_RUN-to-AC_TRY_LINK-state.patch @@ -5,62 +5,69 @@ Subject: [PATCH] configure.ac: convert AC_TRY_RUN to AC_TRY_LINK statements This is not completely safe, but it's the least invasive fix. -Upstream-Status: pending +Upstream-Status: Pending Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> + +Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com> --- - configure.ac | 15 +++++---------- - 1 file changed, 5 insertions(+), 10 deletions(-) + m4/glibc.m4 | 6 ++---- + m4/ioloop.m4 | 9 +++------ + 2 files changed, 5 insertions(+), 10 deletions(-) -diff --git a/configure.ac b/configure.ac -index 3b32614..94ec002 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -519,13 +519,10 @@ have_ioloop=no - - if test "$ioloop" = "best" || test "$ioloop" = "epoll"; then - AC_CACHE_CHECK([whether we can use epoll],i_cv_epoll_works,[ +diff --git a/m4/glibc.m4 b/m4/glibc.m4 +index 5d722aa..ce088d3 100644 +--- a/m4/glibc.m4 ++++ b/m4/glibc.m4 +@@ -17,7 +17,7 @@ AC_DEFUN([DOVECOT_GLIBC], [ + dnl * Old glibcs have broken posix_fallocate(). Make sure not to use it. + dnl * It may also be broken in AIX. + AC_CACHE_CHECK([whether posix_fallocate() works],i_cv_posix_fallocate_works,[ - AC_TRY_RUN([ + AC_TRY_LINK([ - #include <sys/epoll.h> -- -- int main() -- { -- return epoll_create(5) < 1; + #define _XOPEN_SOURCE 600 + #include <stdio.h> + #include <stdlib.h> +@@ -26,7 +26,7 @@ AC_DEFUN([DOVECOT_GLIBC], [ + #if defined(__GLIBC__) && (__GLIBC__ < 2 || __GLIBC_MINOR__ < 7) + possibly broken posix_fallocate + #endif +- int main() { ++ ], [ + int fd = creat("conftest.temp", 0600); + int ret; + if (fd == -1) { +@@ -35,8 +35,6 @@ AC_DEFUN([DOVECOT_GLIBC], [ + } + ret = posix_fallocate(fd, 1024, 1024) < 0 ? 1 : 0; + unlink("conftest.temp"); +- return ret; - } -+ ], [ -+ epoll_create(5) < 1; ], [ - i_cv_epoll_works=yes + i_cv_posix_fallocate_works=yes ], [ -@@ -653,7 +650,7 @@ fi - dnl * Old glibcs have broken posix_fallocate(). Make sure not to use it. - dnl * It may also be broken in AIX. - AC_CACHE_CHECK([whether posix_fallocate() works],i_cv_posix_fallocate_works,[ -- AC_TRY_RUN([ -+ AC_TRY_LINK([ - #define _XOPEN_SOURCE 600 - #include <stdio.h> - #include <stdlib.h> -@@ -662,7 +659,7 @@ AC_CACHE_CHECK([whether posix_fallocate() works],i_cv_posix_fallocate_works,[ - #if defined(__GLIBC__) && (__GLIBC__ < 2 || __GLIBC_MINOR__ < 7) - possibly broken posix_fallocate - #endif -- int main() { -+ ], [ - int fd = creat("conftest.temp", 0600); - int ret; - if (fd == -1) { -@@ -671,8 +668,6 @@ AC_CACHE_CHECK([whether posix_fallocate() works],i_cv_posix_fallocate_works,[ - } - ret = posix_fallocate(fd, 1024, 1024) < 0 ? 1 : 0; - unlink("conftest.temp"); -- return ret; -- } - ], [ - i_cv_posix_fallocate_works=yes - ], [ +diff --git a/m4/ioloop.m4 b/m4/ioloop.m4 +index 0f7dde0..f40fd62 100644 +--- a/m4/ioloop.m4 ++++ b/m4/ioloop.m4 +@@ -4,13 +4,10 @@ AC_DEFUN([DOVECOT_IOLOOP], [ + + if test "$ioloop" = "best" || test "$ioloop" = "epoll"; then + AC_CACHE_CHECK([whether we can use epoll],i_cv_epoll_works,[ +- AC_TRY_RUN([ ++ AC_TRY_LINK([ + #include <sys/epoll.h> +- +- int main() +- { +- return epoll_create(5) < 1; +- } ++ ], [ ++ epoll_create(5) < 1; + ], [ + i_cv_epoll_works=yes + ], [ -- -1.8.4.2 +2.25.1 diff --git a/meta-networking/recipes-support/dovecot/dovecot/0001-doveadm-Fix-parallel-build.patch b/meta-networking/recipes-support/dovecot/dovecot/0001-doveadm-Fix-parallel-build.patch deleted file mode 100644 index 65ae9bf910..0000000000 --- a/meta-networking/recipes-support/dovecot/dovecot/0001-doveadm-Fix-parallel-build.patch +++ /dev/null @@ -1,38 +0,0 @@ -From be9b3809b86fe593dbb16f0b981b3d315a27b799 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 22 Oct 2017 22:10:41 -0700 -Subject: [PATCH] doveadm: Fix parallel build - -Sometimes dovetail build fails with errors like - -doveadm-util.o: file not recognized: File truncated -collect2: error: ld returned 1 exit status -make[4]: *** [Makefile:812: test-doveadm-util] Error 1 - -This is partial backport from - -https://github.com/dovecot/core/commit/b200bc3875fa06d42c8619865cc306c3297fcacc - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/doveadm/Makefile.am | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/doveadm/Makefile.am b/src/doveadm/Makefile.am -index c644646..6ae9144 100644 ---- a/src/doveadm/Makefile.am -+++ b/src/doveadm/Makefile.am -@@ -180,8 +180,8 @@ test_libs = \ - ../lib/liblib.la - test_deps = $(noinst_LTLIBRARIES) $(test_libs) - --test_doveadm_util_SOURCES = test-doveadm-util.c --test_doveadm_util_LDADD = doveadm-util.o $(test_libs) $(MODULE_LIBS) -+test_doveadm_util_SOURCES = doveadm-util.c test-doveadm-util.c -+test_doveadm_util_LDADD = $(test_libs) $(MODULE_LIBS) - test_doveadm_util_DEPENDENCIES = $(test_deps) - - check: check-am check-test --- -2.14.2 - diff --git a/meta-networking/recipes-support/dovecot/dovecot/0001-m4-Check-for-libunwind-instead-of-libunwind-generic.patch b/meta-networking/recipes-support/dovecot/dovecot/0001-m4-Check-for-libunwind-instead-of-libunwind-generic.patch new file mode 100644 index 0000000000..ec7a26a329 --- /dev/null +++ b/meta-networking/recipes-support/dovecot/dovecot/0001-m4-Check-for-libunwind-instead-of-libunwind-generic.patch @@ -0,0 +1,30 @@ +From 6c0ff65f782ad38130b18e4ecb1538d9a8633684 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 29 May 2021 14:32:17 -0700 +Subject: [PATCH] m4: Check for libunwind instead of libunwind-generic + +libunwind-generic is specific to nongnu libunwind, when using llvm +libunwind this fails, so poking for libunwind make it generic + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + m4/want_unwind.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/m4/want_unwind.m4 b/m4/want_unwind.m4 +index cadb62b..5517314 100644 +--- a/m4/want_unwind.m4 ++++ b/m4/want_unwind.m4 +@@ -2,7 +2,7 @@ AC_DEFUN([DOVECOT_WANT_UNWIND], [ + have_libunwind=no + AS_IF([test "$want_libunwind" != "no"], [ + PKG_CHECK_EXISTS([libunwind], [ +- PKG_CHECK_MODULES([LIBUNWIND], [libunwind-generic],[ ++ PKG_CHECK_MODULES([LIBUNWIND], [libunwind],[ + have_libunwind=yes + AC_DEFINE([HAVE_LIBUNWIND],,[Define this if you have libunwind]) + ]) +-- +2.31.1 + diff --git a/meta-networking/recipes-support/dovecot/dovecot/0001-not-check-pandoc.patch b/meta-networking/recipes-support/dovecot/dovecot/0001-not-check-pandoc.patch new file mode 100644 index 0000000000..af69c82f0f --- /dev/null +++ b/meta-networking/recipes-support/dovecot/dovecot/0001-not-check-pandoc.patch @@ -0,0 +1,28 @@ +From 8c7d143ff28441c8b74b0f518dd2281239aede3d Mon Sep 17 00:00:00 2001 +From: Wang Mingyu <wangmy@cn.fujitsu.com> +Date: Fri, 15 Jan 2021 11:10:22 +0900 +Subject: [PATCH] not check pandoc + +Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com> +--- +Upstream-Status: Pending + + m4/dovecot.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/m4/dovecot.m4 b/m4/dovecot.m4 +index 2b5d895..ece8489 100644 +--- a/m4/dovecot.m4 ++++ b/m4/dovecot.m4 +@@ -447,7 +447,7 @@ AC_DEFUN([DC_PANDOC], [ + dnl Optional tool for making documentation + AC_CHECK_PROGS(PANDOC, [pandoc], [true]) + +- AS_IF([test "$PANDOC" = "true"], [ ++ AS_IF([test "$PANDOC" = "false"], [ + AS_IF([test ! -e README], [ + AC_MSG_ERROR([Cannot produce documentation without pandoc - disable with PANDOC=false ./configure]) + ]) +-- +2.25.1 + diff --git a/meta-networking/recipes-support/dovecot/dovecot_2.2.29.bb b/meta-networking/recipes-support/dovecot/dovecot_2.3.21.bb index 1663408736..2f887e6018 100644 --- a/meta-networking/recipes-support/dovecot/dovecot_2.2.29.bb +++ b/meta-networking/recipes-support/dovecot/dovecot_2.3.21.bb @@ -2,30 +2,28 @@ SUMMARY = "Dovecot is an open source IMAP and POP3 email server" HOMEPAGE = "https://www.dovecot.org/" DESCRIPTION = "Dovecot is an open source IMAP and POP3 email server for Linux/UNIX-like systems, written with security primarily in mind. Dovecot is an excellent choice for both small and large installations. It's fast, simple to set up, requires no special administration and it uses very little memory." SECTION = "mail" -LICENSE = "LGPLv2.1 & MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=a981379bd0f1c362f8d1d21515e5b30b" +LICENSE = "LGPL-2.1-only & MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=2956560272e5b31d9d64f03111732048" -SRC_URI = "http://dovecot.org/releases/2.2/dovecot-${PV}.tar.gz \ +SRC_URI = "http://dovecot.org/releases/2.3/dovecot-${PV}.tar.gz \ file://0001-configure.ac-convert-AC_TRY_RUN-to-AC_TRY_LINK-state.patch \ file://dovecot.service \ file://dovecot.socket \ - file://0001-doveadm-Fix-parallel-build.patch \ + file://0001-not-check-pandoc.patch \ + file://0001-m4-Check-for-libunwind-instead-of-libunwind-generic.patch \ " +SRC_URI[sha256sum] = "05b11093a71c237c2ef309ad587510721cc93bbee6828251549fc1586c36502d" -SRC_URI[md5sum] = "ff95486a5c43025a2c3f5a712e7962b9" -SRC_URI[sha256sum] = "d939ea99126eb8a8c6955390b422b6e27ec0fa43a3b59b2b3218cb5ad67139a6" +DEPENDS = "openssl xz zlib bzip2 libcap icu libtirpc bison-native" +CFLAGS += "-I${STAGING_INCDIR}/tirpc" +LDFLAGS += "-ltirpc" -DEPENDS = "openssl xz zlib bzip2 libcap icu" +inherit autotools pkgconfig systemd useradd gettext multilib_header -DEPENDS_append_libc-musl = " libtirpc" -CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc" -LDFLAGS_append_libc-musl = " -ltirpc" - -inherit autotools pkgconfig systemd useradd - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ldap pam', d)}" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ldap pam systemd', d)}" PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam," +PACKAGECONFIG[systemd] = "--with-systemd,--without-systemd,systemd," PACKAGECONFIG[ldap] = "--with-ldap=plugin,--without-ldap,openldap," PACKAGECONFIG[lz4] = "--with-lz4,--without-lz4,lz4," @@ -43,29 +41,34 @@ CACHED_CONFIGUREVARS += "i_cv_signed_size_t=no \ # hardcode epoll() to avoid running unsafe tests # BSD needs kqueue and uclibc poll() -EXTRA_OECONF = " --with-ioloop=epoll \ - --with-systemdsystemunitdir=${systemd_unitdir}/system" +EXTRA_OECONF = " --with-ioloop=epoll" SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "dovecot.service dovecot.socket" +SYSTEMD_SERVICE:${PN} = "dovecot.service dovecot.socket" SYSTEMD_AUTO_ENABLE = "disable" -do_install_append () { +do_install:append () { + rm -rf ${D}${libdir}/dovecot/dovecot-config install -d 755 ${D}/etc/dovecot touch 644 ${D}/etc/dovecot/dovecot.conf - install -m 0644 ${WORKDIR}/dovecot.service ${D}${systemd_unitdir}/system - sed -i -e 's#@SYSCONFDIR@#${sysconfdir}#g' ${D}${systemd_unitdir}/system/dovecot.service - sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/dovecot.service + if [ "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" ]; then + install -m 0644 ${UNPACKDIR}/dovecot.service ${D}${systemd_unitdir}/system + sed -i -e 's#@SYSCONFDIR@#${sysconfdir}#g' ${D}${systemd_unitdir}/system/dovecot.service + sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/dovecot.service + fi + oe_multilib_header dovecot/config.h } USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "-r -d ${libexecdir} -M -s ${base_sbindir}/nologin -g dovecot dovecot; \ +USERADD_PARAM:${PN} = "-r -d ${libexecdir} -M -s ${base_sbindir}/nologin -g dovecot dovecot; \ -r -d ${libexecdir} -M -s ${base_sbindir}/nologin -g dovenull dovenull" -GROUPADD_PARAM_${PN} = "-f -r dovecot;-f -r dovenull" +GROUPADD_PARAM:${PN} = "-f -r dovecot;-f -r dovenull" -FILES_${PN} += "${libdir}/dovecot/*plugin.so \ +FILES:${PN} += "${libdir}/dovecot/*plugin.so \ ${libdir}/dovecot/libfs_compress.so \ ${libdir}/dovecot/libssl_iostream_openssl.so" -FILES_${PN}-staticdev += "${libdir}/dovecot/*/*.a" -FILES_${PN}-dev += "${libdir}/dovecot/libdovecot*.so" -FILES_${PN}-dbg += "${libdir}/dovecot/*/.debug" +FILES:${PN}-staticdev += "${libdir}/dovecot/*/*.a" +FILES:${PN}-dev += "${libdir}/dovecot/libdovecot*.so" +FILES:${PN}-dbg += "${libdir}/dovecot/*/.debug" + +CVE_STATUS[CVE-2016-4983] = "not-applicable-platform: Affects only postinstall script on specific distribution." diff --git a/meta-networking/recipes-support/drbd/drbd-utils/0001-Makefile.in-fix-permission-bits-for-drbd.service.patch b/meta-networking/recipes-support/drbd/drbd-utils/0001-Makefile.in-fix-permission-bits-for-drbd.service.patch deleted file mode 100644 index 90dd1f8618..0000000000 --- a/meta-networking/recipes-support/drbd/drbd-utils/0001-Makefile.in-fix-permission-bits-for-drbd.service.patch +++ /dev/null @@ -1,25 +0,0 @@ -Upstream-Status: Pending - -Subject: Makefile.in: fix permission bits for drbd.service - -Signed-off-by: Chen Qi <Qi.Chen@windriver.com> ---- - scripts/Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/scripts/Makefile.in b/scripts/Makefile.in -index 402b93b..4a45407 100644 ---- a/scripts/Makefile.in -+++ b/scripts/Makefile.in -@@ -65,7 +65,7 @@ endif - # yes, debian apparently allows installing both types from the same package - ifneq ($(initscripttype),sysv) # "systemd" or "both" - install -d $(DESTDIR)$(systemdunitdir) -- install -m 755 drbd.service $(DESTDIR)$(systemdunitdir)/ -+ install -m 644 drbd.service $(DESTDIR)$(systemdunitdir)/ - install -d $(DESTDIR)/lib/drbd/ - install -m 755 drbd $(DESTDIR)/lib/drbd/ - install -d $(DESTDIR)$(tmpfilesdir)/ --- -1.9.1 - diff --git a/meta-networking/recipes-support/drbd/drbd-utils/0001-configure.ac-Add-an-option-to-disable-host-udev-vers.patch b/meta-networking/recipes-support/drbd/drbd-utils/0001-configure.ac-Add-an-option-to-disable-host-udev-vers.patch new file mode 100644 index 0000000000..b98e1e70c7 --- /dev/null +++ b/meta-networking/recipes-support/drbd/drbd-utils/0001-configure.ac-Add-an-option-to-disable-host-udev-vers.patch @@ -0,0 +1,55 @@ +From 61991db099f66348dddbc3408e7ee8c05bda85cb Mon Sep 17 00:00:00 2001 +From: Yoann Congal <yoann.congal@smile.fr> +Date: Sat, 2 Mar 2024 16:23:07 +0100 +Subject: [PATCH] configure.ac: Add an option to disable host udev version + checks + +In cross-compilation environment, the build host might have an outdated +udev or no udev at all. But the user may still want to build with the +enabled udev rule (for its udev-enabled target). + +This patch adds a "--disable-udevchecks" option the disable build host +udev version check at configure-time and unconditionally install the +enabled udev rule. Without this new option, the behavior stays the same +(checks enabled). + +Signed-off-by: Yoann Congal <yoann.congal@smile.fr> +Upstream-Status: Backport [https://github.com/LINBIT/drbd-utils/commit/f2b5a7335ae52109dfb95a9d99ae20519c43d59a] +--- + configure.ac | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index f1d69ea3..4c56d33b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -71,6 +71,11 @@ AC_ARG_WITH([udev], + [AS_HELP_STRING([--with-udev], + [Enable udev integration])], + [WITH_UDEV=$withval]) ++AC_ARG_ENABLE([udevchecks], ++ [AS_HELP_STRING([--disable-udevchecks], ++ [Disable host udev version checks])], ++ [], ++ [enable_udevchecks=yes]) + AC_ARG_WITH([xen], + [AS_HELP_STRING([--with-xen], + [Enable Xen integration])], +@@ -315,7 +320,7 @@ if test -z $GIT; then + AC_MSG_WARN(Cannot update buildtag without git. You may safely ignore this warning when building from a tarball.) + fi + +-if test $UDEVADM = false && test $UDEVINFO = false; then ++if test "x$enable_udevchecks" != "xno" && test $UDEVADM = false && test $UDEVINFO = false; then + if test "$WITH_UDEV" = "yes"; then + AC_MSG_WARN([udev support enabled, but neither udevadm nor udevinfo found on this system.]) + fi +@@ -423,7 +428,7 @@ else + test -z $INITDIR && INITDIR="$sysconfdir/init.d" + + dnl Our udev rules file is known to work only with udev >= 85 +- if test "$WITH_UDEV" = "yes"; then ++ if test "x$enable_udevchecks" != "xno" && test "$WITH_UDEV" = "yes"; then + udev_version=$( set -- $($UDEVADM version); echo $1 ) + if test -z "$udev_version"; then + udev_version=$( set -- $($UDEVINFO -V); echo $3 ) diff --git a/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch b/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch new file mode 100644 index 0000000000..27f0a9b54a --- /dev/null +++ b/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch @@ -0,0 +1,201 @@ +From 264ae7b062ac52a5545a8a562b51001f7ce7369d Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Thu, 21 Apr 2022 17:22:35 +0800 +Subject: [PATCH] drbd-utils: support usermerge + +Upstream-Status: Inappropriate [oe-specific] + +Signed-off-by: Changqing Li <changqing.li@windriver.com> +Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> +--- + configure.ac | 2 +- + scripts/Makefile.in | 10 +++++----- + scripts/drbd-demote-or-escalate@.service | 2 +- + scripts/drbd-promote@.service | 4 ++-- + scripts/drbd-wait-promotable@.service | 2 +- + scripts/drbd.service | 6 +++--- + scripts/drbd@.service | 6 +++--- + scripts/ocf.ra@.service | 4 ++-- + user/v83/Makefile.in | 14 +++++++------- + user/v84/Makefile.in | 14 +++++++------- + 10 files changed, 32 insertions(+), 32 deletions(-) + +diff --git a/configure.ac b/configure.ac +index f1d69ea3..3289ac7d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -183,7 +183,7 @@ AC_ARG_WITH(tmpfilesdir, + AC_SUBST(tmpfilesdir) + + # set default early +-default_udevdir=/lib/udev ++default_udevdir=${prefix}/lib/udev + if test x"$with_udev" = x || \ + test x"$with_udev" = xyes ; then + if test x"$PKG_CONFIG" != x; then +diff --git a/scripts/Makefile.in b/scripts/Makefile.in +index aca15a22..a1cd2ffe 100644 +--- a/scripts/Makefile.in ++++ b/scripts/Makefile.in +@@ -91,11 +91,11 @@ ifeq ($(subst both,systemd,$(initscripttype)),systemd) + install -d $(DESTDIR)$(systemdunitdir) + install -m 644 $(SYSTEMD_UNITS) $(DESTDIR)$(systemdunitdir)/ + install -m 644 $(SYSTEMD_TEMPLATES) $(DESTDIR)$(systemdunitdir)/ +- install -d $(DESTDIR)/lib/drbd/scripts +- install -m 755 drbd $(DESTDIR)/lib/drbd/scripts +- install -m 755 drbd-service-shim.sh $(DESTDIR)/lib/drbd/scripts +- install -m 755 drbd-wait-promotable.sh $(DESTDIR)/lib/drbd/scripts +- install -m 755 ocf.ra.wrapper.sh $(DESTDIR)/lib/drbd/scripts ++ install -d $(DESTDIR)/${nonarch_libdir}/drbd/scripts ++ install -m 755 drbd $(DESTDIR)/${nonarch_libdir}/drbd/scripts ++ install -m 755 drbd-service-shim.sh $(DESTDIR)/${nonarch_libdir}/drbd/scripts ++ install -m 755 drbd-wait-promotable.sh $(DESTDIR)/${nonarch_libdir}/drbd/scripts ++ install -m 755 ocf.ra.wrapper.sh $(DESTDIR)/${nonarch_libdir}/drbd/scripts + install -d $(DESTDIR)$(tmpfilesdir)/ + install -m 444 drbd.tmpfiles.conf $(DESTDIR)$(tmpfilesdir)/drbd.conf + endif +diff --git a/scripts/drbd-demote-or-escalate@.service b/scripts/drbd-demote-or-escalate@.service +index 20932238..8b5ce4a2 100644 +--- a/scripts/drbd-demote-or-escalate@.service ++++ b/scripts/drbd-demote-or-escalate@.service +@@ -28,5 +28,5 @@ TimeoutSec=60 + # "Type=forking" would be an option to have it retry a number of times, + # and then only escalate to FailureAction if that did not help. + Type=oneshot +-ExecStart=/lib/drbd/scripts/drbd-service-shim.sh secondary-or-escalate %I ++ExecStart=@nonarch_libdir@/drbd/scripts/drbd-service-shim.sh secondary-or-escalate %I + ExecStopPost=-/bin/journalctl --sync +diff --git a/scripts/drbd-promote@.service b/scripts/drbd-promote@.service +index 71345d9b..678e0703 100644 +--- a/scripts/drbd-promote@.service ++++ b/scripts/drbd-promote@.service +@@ -24,5 +24,5 @@ RemainAfterExit=yes + # (ab)using systemd features + # if we cannot configure and promote, that's a condition, not a failure + # See the comment above wrt. FailureAction vs OnFailure +-ExecCondition=/lib/drbd/scripts/drbd-service-shim.sh primary %I +-ExecStop=/lib/drbd/scripts/drbd-service-shim.sh secondary %I ++ExecCondition=@nonarch_libdir@/drbd/scripts/drbd-service-shim.sh primary %I ++ExecStop=@nonarch_libdir@/drbd/scripts/drbd-service-shim.sh secondary %I +diff --git a/scripts/drbd-wait-promotable@.service b/scripts/drbd-wait-promotable@.service +index 81c3789f..3416abc6 100644 +--- a/scripts/drbd-wait-promotable@.service ++++ b/scripts/drbd-wait-promotable@.service +@@ -10,7 +10,7 @@ Type=oneshot + + # on first start, wait for access to "good data" + # let systemd handle timeouts +-ExecStart=/lib/drbd/scripts/drbd-wait-promotable.sh %I ++ExecStart=@nonarch_libdir@/drbd/scripts/drbd-wait-promotable.sh %I + RemainAfterExit=yes + + [Install] +diff --git a/scripts/drbd.service b/scripts/drbd.service +index 96c599e7..c81e95a6 100644 +--- a/scripts/drbd.service ++++ b/scripts/drbd.service +@@ -12,11 +12,11 @@ RemainAfterExit=yes + # A check for INIT_VERSION already exists, just set it to something. + Environment=INIT_VERSION=systemd + +-ExecStart=/lib/drbd/scripts/drbd start +-ExecStop=/lib/drbd/scripts/drbd stop ++ExecStart=@nonarch_libdir@/drbd/scripts/drbd start ++ExecStop=@nonarch_libdir@/drbd/scripts/drbd stop + + # Re-adjust everything on reload +-ExecReload=/lib/drbd/scripts/drbd reload ++ExecReload=@nonarch_libdir@/drbd/scripts/drbd reload + + [Install] + WantedBy=multi-user.target +diff --git a/scripts/drbd@.service b/scripts/drbd@.service +index 0fad10be..556f3857 100644 +--- a/scripts/drbd@.service ++++ b/scripts/drbd@.service +@@ -35,8 +35,8 @@ RemainAfterExit=yes + + # depends... do we want this as ExecCondition or as ExecStart + # failed start is "failed", failed condition is just "not startable yet" +-ExecStart=/lib/drbd/scripts/drbd-service-shim.sh adjust %I +-ExecReload=/lib/drbd/scripts/drbd-service-shim.sh adjust %I ++ExecStart=@nonarch_libdir@/drbd/scripts/drbd-service-shim.sh adjust %I ++ExecReload=@nonarch_libdir@/drbd/scripts/drbd-service-shim.sh adjust %I + + # can only succeed, if you first stop all depending services +-ExecStopPost=/lib/drbd/scripts/drbd-service-shim.sh down %I ++ExecStopPost=@nonarch_libdir@/drbd/scripts/drbd-service-shim.sh down %I +diff --git a/scripts/ocf.ra@.service b/scripts/ocf.ra@.service +index 9c2268a6..1666c482 100644 +--- a/scripts/ocf.ra@.service ++++ b/scripts/ocf.ra@.service +@@ -22,5 +22,5 @@ Environment=monitor_inverval=30 + # Only the first argument is used by the wrapper, + # the %n is just to identify which is which in the process list. + # All parameterization is done via Environment= in per instance override.conf +-ExecStart=/lib/drbd/scripts/ocf.ra.wrapper.sh start-and-monitor %n +-ExecStopPost=/lib/drbd/scripts/ocf.ra.wrapper.sh stop %n ++ExecStart=@nonarch_libdir@/drbd/scripts/ocf.ra.wrapper.sh start-and-monitor %n ++ExecStopPost=@nonarch_libdir@/drbd/scripts/ocf.ra.wrapper.sh stop %n +diff --git a/user/v83/Makefile.in b/user/v83/Makefile.in +index 08cfe574..4c4971b6 100644 +--- a/user/v83/Makefile.in ++++ b/user/v83/Makefile.in +@@ -96,19 +96,19 @@ install: + ifeq ($(WITH_83_SUPPORT),yes) + install -d $(DESTDIR)$(localstatedir)/lib/drbd + install -d $(DESTDIR)$(localstatedir)/lock +- install -d $(DESTDIR)/lib/drbd/ ++ install -d $(DESTDIR)/${nonarch_libdir}/drbd/ + if getent group haclient > /dev/null 2> /dev/null ; then \ +- install -g haclient -m 4750 drbdsetup-83 $(DESTDIR)/lib/drbd/ ; \ +- install -m 755 drbdadm-83 $(DESTDIR)/lib/drbd/ ; \ ++ install -g haclient -m 4750 drbdsetup-83 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ ++ install -m 755 drbdadm-83 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ + else \ +- install -m 755 drbdsetup-83 $(DESTDIR)/lib/drbd/ ; \ +- install -m 755 drbdadm-83 $(DESTDIR)/lib/drbd/ ; \ ++ install -m 755 drbdsetup-83 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ ++ install -m 755 drbdadm-83 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ + fi + endif + + uninstall: +- rm -f $(DESTDIR)/lib/drbd/drbdsetup-83 +- rm -f $(DESTDIR)/lib/drbd/drbdadm-83 ++ rm -f $(DESTDIR)/${nonarch_libdir}/drbd/drbdsetup-83 ++ rm -f $(DESTDIR)/${nonarch_libdir}/drbd/drbdadm-83 + + .PHONY: install uninstall clean distclean + ../../configure: +diff --git a/user/v84/Makefile.in b/user/v84/Makefile.in +index 0fcefc5f..81f7d5ec 100644 +--- a/user/v84/Makefile.in ++++ b/user/v84/Makefile.in +@@ -110,19 +110,19 @@ ifeq ($(WITH_84_SUPPORT),yes) + install -d $(DESTDIR)$(localstatedir)/lib/drbd + install -d $(DESTDIR)$(localstatedir)/run/drbd + install -d $(DESTDIR)$(localstatedir)/lock +- install -d $(DESTDIR)/lib/drbd/ ++ install -d $(DESTDIR)/${nonarch_libdir}/drbd/ + if getent group haclient > /dev/null 2> /dev/null ; then \ +- install -g haclient -m 4750 drbdsetup-84 $(DESTDIR)/lib/drbd/ ; \ +- install -m 755 drbdadm-84 $(DESTDIR)/lib/drbd/ ; \ ++ install -g haclient -m 4750 drbdsetup-84 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ ++ install -m 755 drbdadm-84 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ + else \ +- install -m 755 drbdsetup-84 $(DESTDIR)/lib/drbd/ ; \ +- install -m 755 drbdadm-84 $(DESTDIR)/lib/drbd/ ; \ ++ install -m 755 drbdsetup-84 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ ++ install -m 755 drbdadm-84 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ + fi + endif + + uninstall: +- rm -f $(DESTDIR)/lib/drbd/drbdsetup-84 +- rm -f $(DESTDIR)/lib/drbd/drbdadm-84 ++ rm -f $(DESTDIR)/${nonarch_libdir}/drbd/drbdsetup-84 ++ rm -f $(DESTDIR)/${nonarch_libdir}/drbd/drbdadm-84 + + spell: + for f in drbdadm_adjust.c drbdadm_main.c drbdadm_parser.c drbdadm_usage_cnt.c drbdsetup.c drbdtool_common.c; do \ diff --git a/meta-networking/recipes-support/drbd/drbd-utils/0001-drbdmon-add-LDFLAGS-when-linking.patch b/meta-networking/recipes-support/drbd/drbd-utils/0001-drbdmon-add-LDFLAGS-when-linking.patch new file mode 100644 index 0000000000..c7766067a1 --- /dev/null +++ b/meta-networking/recipes-support/drbd/drbd-utils/0001-drbdmon-add-LDFLAGS-when-linking.patch @@ -0,0 +1,33 @@ +From bb044160faf4ae7615ddfdb17641dd88c33cde57 Mon Sep 17 00:00:00 2001 +From: Sakib Sajal <sakib.sajal@windriver.com> +Date: Thu, 31 Mar 2022 15:09:58 -0400 +Subject: [PATCH] drbdmon: add LDFLAGS when linking + +Upstream-Status: Pending + +Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> +--- + user/drbdmon/Makefile.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/user/drbdmon/Makefile.in b/user/drbdmon/Makefile.in +index 7bd8987e..115a81b8 100644 +--- a/user/drbdmon/Makefile.in ++++ b/user/drbdmon/Makefile.in +@@ -1,6 +1,6 @@ + CXXFLAGS=-std=c++11 -I. -I../shared -Icppdsaext/src -Wall -Werror -pedantic-errors -fPIC -O2 \ + -Wsign-compare -Wpointer-arith -Wswitch-default -Wswitch-enum -Wtype-limits \ +--Wmissing-declarations -Wshadow ++-Wmissing-declarations -Wshadow -Wno-defaulted-function-deleted -Wno-unused-private-field + CXX = @CXX@ + LIBS = @LIBS@ + +@@ -72,7 +72,7 @@ $(dsaext-obj): $(basename $(dsaext-obj)).cpp $(basename $(dsaext-obj)).h + $(integerparse-obj): $(basename $(integerparse-obj)).cpp $(basename $(integerparse-obj)).h + + drbdmon: $(ls-obj) +- $(CXX) -o $@ $(CPPFLAGS) $(CXXFLAGS) $^ $(LIBS) ++ $(CXX) -o $@ $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $^ $(LIBS) + + # do not try to rebuild Makefile itself + Makefile: ; diff --git a/meta-networking/recipes-support/drbd/drbd-utils_8.9.6.bb b/meta-networking/recipes-support/drbd/drbd-utils_8.9.6.bb deleted file mode 100644 index 5f6c43f7ea..0000000000 --- a/meta-networking/recipes-support/drbd/drbd-utils_8.9.6.bb +++ /dev/null @@ -1,46 +0,0 @@ -SUMMARY = "Distributed block device driver for Linux" -DESCRIPTION = "DRBD mirrors a block device over the network to another machine.\ -DRBD mirrors a block device over the network to another machine.\ -Think of it as networked raid 1. It is a building block for\ -setting up high availability (HA) clusters." -HOMEPAGE = "http://www.drbd.org/" -SECTION = "admin" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018" - -SRC_URI = "http://oss.linbit.com/drbd/${BP}.tar.gz \ - file://0001-Makefile.in-fix-permission-bits-for-drbd.service.patch \ - " -SRC_URI[md5sum] = "76ed6d3190cd77b00890f3365353124b" -SRC_URI[sha256sum] = "297b77c9b3f88de2e7dae459234f2753ea4fc2805282b2d276e35cf51e292913" - -SYSTEMD_SERVICE_${PN} = "drbd.service" -SYSTEMD_AUTO_ENABLE = "disable" - -inherit autotools-brokensep systemd - -EXTRA_OECONF = " \ - --with-initdir=/etc/init.d \ - --without-pacemaker \ - --without-rgmanager \ - --without-bashcompletion \ - --with-distro debian \ - --with-initscripttype=both \ - --with-systemdunitdir=${systemd_unitdir}/system \ - --without-manual\ - " - -do_install_append() { - # don't install empty /var/lock to avoid conflict with base-files - rm -rf ${D}${localstatedir}/lock -} - -RDEPENDS_${PN} += "bash perl-module-getopt-long perl-module-exporter perl-module-constant perl-module-overloading perl-module-exporter-heavy" - -# The drbd items are explicitly put under /lib when installed. -# -FILES_${PN} += "/run" -FILES_${PN} += "${nonarch_base_libdir}/drbd \ - ${nonarch_libdir}/drbd \ - ${nonarch_libdir}/tmpfiles.d" -FILES_${PN}-dbg += "${nonarch_base_libdir}/drbd/.debug" diff --git a/meta-networking/recipes-support/drbd/drbd-utils_9.27.0.bb b/meta-networking/recipes-support/drbd/drbd-utils_9.27.0.bb new file mode 100644 index 0000000000..63f0fd18c1 --- /dev/null +++ b/meta-networking/recipes-support/drbd/drbd-utils_9.27.0.bb @@ -0,0 +1,76 @@ +SUMMARY = "Distributed block device driver for Linux" +DESCRIPTION = "DRBD mirrors a block device over the network to another machine.\ +Think of it as networked raid 1. It is a building block for\ +setting up high availability (HA) clusters." +HOMEPAGE = "http://www.drbd.org/" +SECTION = "admin" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018" + +SRC_URI = "git://github.com/LINBIT/drbd-utils;name=drbd-utils;branch=master;protocol=https \ + git://github.com/LINBIT/drbd-headers;name=drbd-headers;destsuffix=git/drbd-headers;branch=master;protocol=https \ + file://0001-drbdmon-add-LDFLAGS-when-linking.patch \ + ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','file://0001-drbd-utils-support-usrmerge.patch','',d)} \ + file://0001-configure.ac-Add-an-option-to-disable-host-udev-vers.patch \ + " +SRCREV_drbd-utils = "fdd9a4d603a9dc99d110d8bd0e288d7c0b6f586e" +SRCREV_drbd-headers = "0349f00825b4198d4ec3248f43884114a187676a" + +SRCREV_FORMAT = "drbd-utils_drbd-headers" + +S = "${WORKDIR}/git" + +UPSTREAM_CHECK_URI = "https://github.com/LINBIT/drbd-utils/releases" + +SYSTEMD_SERVICE:${PN} = "drbd.service" +SYSTEMD_AUTO_ENABLE = "disable" + +DEPENDS = "flex-native keyutils" + +inherit autotools-brokensep systemd + +# -Wunused-but-set-variable -Wunused-const-variable -Winconsistent-missing-override +CPPFLAGS:append = " -Wno-error" + +EXTRA_OECONF = " \ + --with-initdir=/etc/init.d \ + --without-pacemaker \ + --without-rgmanager \ + --without-bashcompletion \ + --with-distro debian \ + --with-initscripttype=both \ + --with-systemdunitdir=${systemd_unitdir}/system \ + --without-manual \ + --disable-udevchecks \ + " + +# If we have inherited reproducible_build, we want to use it. +export WANT_DRBD_REPRODUCIBLE_BUILD = "yes" + +do_install:append() { + # don't install empty /var/lock and /var/run to avoid conflict with base-files + rm -rf ${D}${localstatedir}/lock + rm -rf ${D}${localstatedir}/run + + sed -i -e 's#@nonarch_libdir@#${nonarch_libdir}#g' ${D}${systemd_unitdir}/system/drbd-demote-or-escalate@.service + sed -i -e 's#@nonarch_libdir@#${nonarch_libdir}#g' ${D}${systemd_unitdir}/system/drbd-promote@.service + sed -i -e 's#@nonarch_libdir@#${nonarch_libdir}#g' ${D}${systemd_unitdir}/system/drbd-wait-promotable@.service + sed -i -e 's#@nonarch_libdir@#${nonarch_libdir}#g' ${D}${systemd_unitdir}/system/drbd.service + sed -i -e 's#@nonarch_libdir@#${nonarch_libdir}#g' ${D}${systemd_unitdir}/system/drbd@.service + sed -i -e 's#@nonarch_libdir@#${nonarch_libdir}#g' ${D}${systemd_unitdir}/system/ocf.ra@.service +} + +RDEPENDS:${PN} += "bash perl-module-getopt-long perl-module-exporter perl-module-constant perl-module-overloading perl-module-exporter-heavy" + +# The drbd items are explicitly put under /lib when installed. +# +FILES:${PN} += "/run" +FILES:${PN} += "${nonarch_base_libdir}/drbd \ + ${nonarch_libdir}/drbd \ + ${nonarch_libdir}/tmpfiles.d \ + ${nonarch_libdir}/drbdscripts/* \ + ${systemd_unitdir}/system/* \ +" +FILES:${PN}-dbg += "${nonarch_base_libdir}/drbd/.debug" + +CLEANBROKEN = "1" diff --git a/meta-networking/recipes-support/drbd/drbd_9.0.8-1.bb b/meta-networking/recipes-support/drbd/drbd_9.2.1.bb index e943f2464a..48ce2abf09 100644 --- a/meta-networking/recipes-support/drbd/drbd_9.0.8-1.bb +++ b/meta-networking/recipes-support/drbd/drbd_9.2.1.bb @@ -4,19 +4,21 @@ DESCRIPTION = "DRBD is a block device which is designed to build high \ block device via (a dedicated) network. You could see \ it as a network raid-1." HOMEPAGE = "http://oss.linbit.com/drbd/" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018" DEPENDS = "virtual/kernel" -SRC_URI = "http://www.linbit.com/downloads/drbd/9.0/drbd-${PV}.tar.gz \ - file://check_existence_of_modules_before_installing.patch" +SRC_URI = "https://pkg.linbit.com//downloads/drbd/9/${BP}.tar.gz \ + file://check_existence_of_modules_before_installing.patch \ + " +SRC_URI[sha256sum] = "f59ee795188f21d4a62c5319c371ebad65ab3fb9b55e5212c3f1dd558978a843" -SRC_URI[md5sum] = "c1dd58043f46e9926b579aa65d4ea980" -SRC_URI[sha256sum] = "87f72d46db9bad926415b3ab9f5f1397de8c581d2e2ec1addbdd5ce2604e6123" inherit module -EXTRA_OEMAKE += "KDIR='${STAGING_KERNEL_DIR}'" +EXTRA_OEMAKE += "KDIR='${STAGING_KERNEL_DIR}' SPAAS=true" do_install () { oe_runmake install DESTDIR="${D}" } + +SKIP_RECIPE[drbd] ?= "Needs coccinelle to build with SPAAS" diff --git a/meta-networking/recipes-support/dropwatch/dropwatch/0001-fix-bug-build-with-sysroot-head-file-instead-of-loca.patch b/meta-networking/recipes-support/dropwatch/dropwatch/0001-fix-bug-build-with-sysroot-head-file-instead-of-loca.patch new file mode 100755 index 0000000000..d0baceb15b --- /dev/null +++ b/meta-networking/recipes-support/dropwatch/dropwatch/0001-fix-bug-build-with-sysroot-head-file-instead-of-loca.patch @@ -0,0 +1,30 @@ +From 4872c52f55f9cb089e6681c3f1926663145b52ae Mon Sep 17 00:00:00 2001 +From: chenheyun <chen_heyun@163.com> +Date: Sun, 18 Feb 2024 05:08:25 -0800 +Subject: [PATCH] fix bug: build with sysroot head file instead of local head + file:net_dropmon.h + +Signed-off-by: chenheyun <chen_heyun@163.com> + +Upstream-Status: Pending +--- + src/main.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/main.c b/src/main.c +index e4746d9..81dc4da 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -26,8 +26,8 @@ + #include <netlink/netlink.h> + #include <netlink/genl/genl.h> + #include <netlink/genl/ctrl.h> ++#include <net_dropmon.h> + +-#include "net_dropmon.h" + #include "lookup.h" + + /* +-- +2.25.1 + diff --git a/meta-networking/recipes-support/dropwatch/dropwatch_1.5.4.bb b/meta-networking/recipes-support/dropwatch/dropwatch_1.5.4.bb new file mode 100644 index 0000000000..baa9398a18 --- /dev/null +++ b/meta-networking/recipes-support/dropwatch/dropwatch_1.5.4.bb @@ -0,0 +1,20 @@ +SUMMARY = "Dropwatch is a utility to diagnose where packets are getting dropped" +DESCRIPTION = "\ +Dropwatch is a utility to help developers and system administrators to \ +diagnose problems in the Linux Networking stack, specifically their \ +ability to diagnose where packets are getting dropped." +HOMEPAGE = "https://github.com/nhorman/${BPN}" +SECTION = "net/misc" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a" + +SRC_URI = "git://github.com/nhorman/dropwatch.git;protocol=https;nobranch=1 \ + file://0001-fix-bug-build-with-sysroot-head-file-instead-of-loca.patch \ +" +SRCREV = "1e7e487a019a7c02f1f429c4d3a4647fa3787a13" + +S = "${WORKDIR}/git" + +DEPENDS = "binutils libnl libpcap readline" + +inherit pkgconfig autotools diff --git a/meta-networking/recipes-support/esmtp/esmtp/0001-Fix-libESMTP-dependency-check.patch b/meta-networking/recipes-support/esmtp/esmtp/0001-Fix-libESMTP-dependency-check.patch new file mode 100644 index 0000000000..18bffe55b2 --- /dev/null +++ b/meta-networking/recipes-support/esmtp/esmtp/0001-Fix-libESMTP-dependency-check.patch @@ -0,0 +1,46 @@ +From 63dbf8a9f04b34474021e8f0bf239b7446f10a7f Mon Sep 17 00:00:00 2001 +From: Jiaqing Zhao <jiaqing.zhao@linux.intel.com> +Date: Thu, 3 Mar 2022 09:01:23 +0000 +Subject: [PATCH] Fix libESMTP dependency check + +Since libesmtp-1.1.0, libesmtp-config is removed, use pkg-config to +check for existence instead. + +Signed-off-by: Jiaqing Zhao <jiaqing.zhao@linux.intel.com> +--- +Upstream-Status: Pending + + configure.ac | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 64b19b4..83346a8 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -11,6 +11,8 @@ AC_PROG_CC + + AC_HEADER_STDC + ++PKG_PROG_PKG_CONFIG ++ + dnl getopt needs this + AC_C_CONST + +@@ -30,11 +32,11 @@ then + AC_CHECK_HEADER(libesmtp.h, ,[AC_MSG_ERROR([libesmtp.h not found in $with_libesmtp])]) + fi + AC_MSG_CHECKING(for libESMTP) +-if libesmtp-config --version > /dev/null 2>&1 ++if $PKG_CONFIG --exists 'libesmtp-1.0' + then + AC_MSG_RESULT(yes) +- CFLAGS="$CFLAGS `libesmtp-config --cflags`" +- LIBS="$LIBS `libesmtp-config --libs`" ++ CFLAGS="$CFLAGS `$PKG_CONFIG --cflags 'libesmtp-1.0'`" ++ LIBS="$LIBS `$PKG_CONFIG --libs 'libesmtp-1.0'`" + else + AC_MSG_RESULT(no) + AC_MSG_ERROR(libESMTP library not found) +-- +2.32.0 + diff --git a/meta-networking/recipes-support/esmtp/esmtp_1.2.bb b/meta-networking/recipes-support/esmtp/esmtp_1.2.bb index 2da73e7756..e60e1edd1f 100644 --- a/meta-networking/recipes-support/esmtp/esmtp_1.2.bb +++ b/meta-networking/recipes-support/esmtp/esmtp_1.2.bb @@ -8,23 +8,31 @@ SECTION = "net" DEPENDS = "libesmtp" -LICENSE = "GPL-2.0" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${PV}/${BPN}-${PV}.tar.bz2" +SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${PV}/${BPN}-${PV}.tar.bz2 \ + file://0001-Fix-libESMTP-dependency-check.patch \ + " # Have to set this or we get -L/lib in LDFLAGS EXTRA_OECONF = "--with-libesmtp=${STAGING_EXECPREFIXDIR}" -inherit autotools update-alternatives - -ALTERNATIVE_${PN} = "sendmail" +inherit autotools update-alternatives pkgconfig +ALTERNATIVE:${PN} = "sendmail mailq newaliases" +# /usr/lib/sendmial is required by LSB core test +ALTERNATIVE:${PN}:linuxstdbase = "sendmail mailq newaliases usr-lib-sendmail" +ALTERNATIVE_TARGET[mailq] = "${bindir}/mailq" +ALTERNATIVE_TARGET[newaliases] = "${bindir}/newaliases" ALTERNATIVE_LINK_NAME[sendmail] = "${sbindir}/sendmail" ALTERNATIVE_TARGET[sendmail] = "${bindir}/esmtp" +ALTERNATIVE_LINK_NAME[usr-lib-sendmail] = "/usr/lib/sendmail" +ALTERNATIVE_TARGET[usr-lib-sendmail] = "${bindir}/esmtp" + ALTERNATIVE_PRIORITY = "10" -ALTERNATIVE_${PN}-doc += "mailq.1 newaliases.1 sendmail.1" +ALTERNATIVE:${PN}-doc += "mailq.1 newaliases.1 sendmail.1" ALTERNATIVE_LINK_NAME[mailq.1] = "${mandir}/man1/mailq.1" ALTERNATIVE_LINK_NAME[newaliases.1] = "${mandir}/man1/newaliases.1" ALTERNATIVE_LINK_NAME[sendmail.1] = "${mandir}/man1/sendmail.1" @@ -32,14 +40,9 @@ ALTERNATIVE_LINK_NAME[sendmail.1] = "${mandir}/man1/sendmail.1" SRC_URI[md5sum] = "79a9c1f9023d53f35bb82bf446150a72" SRC_URI[sha256sum] = "a0d26931bf731f97514da266d079d8bc7d73c65b3499ed080576ab606b21c0ce" -do_install_append() { +do_install:append() { # only one file /usr/lib/sendmail in ${D}${libdir} rm -rf ${D}${libdir} } -pkg_postinst_${PN}_linuxstdbase () { - # /usr/lib/sendmial is required by LSB core test - [ ! -L $D/usr/lib/sendmail ] && ln -sf ${sbindir}/sendmail $D/usr/lib/ -} - -FILES_${PN} += "${libdir}/" +FILES:${PN} += "${libdir}/" diff --git a/meta-networking/recipes-support/ettercap/ettercap/0001-sslstrip-Enhance-the-libcurl-version-check-to-consid.patch b/meta-networking/recipes-support/ettercap/ettercap/0001-sslstrip-Enhance-the-libcurl-version-check-to-consid.patch new file mode 100644 index 0000000000..592ea52f2e --- /dev/null +++ b/meta-networking/recipes-support/ettercap/ettercap/0001-sslstrip-Enhance-the-libcurl-version-check-to-consid.patch @@ -0,0 +1,38 @@ +From 40534662043b7d831d1f6c70448afa9d374a9b63 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 23 Mar 2023 10:23:14 -0700 +Subject: [PATCH] sslstrip: Enhance the libcurl version check to consider + version 8+ + +Lately curl has released version 8 and hence LIBCURL_VERSION_MAJOR is +reset to 0, current check assumes major version to be 7 at max and hence +on systems with libcurl 8+ this check breaks and build fails + +Fixes + +TOPDIR/build/tmp/work/cortexa15t2hf-neon-yoe-linux-gnueabi/ettercap/0.8.3.1-r0/git/plug-ins/sslstrip/sslstrip.c:57:2: error: libcurl 7.26.0 or up is needed + ^ +1 error generated. + +Upstream-Status: Backport [https://github.com/Ettercap/ettercap/commit/40534662043b7d831d1f6c70448afa9d374a9b63] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + plug-ins/sslstrip/sslstrip.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/plug-ins/sslstrip/sslstrip.c b/plug-ins/sslstrip/sslstrip.c +index 327bf58a..d9b67c8b 100644 +--- a/plug-ins/sslstrip/sslstrip.c ++++ b/plug-ins/sslstrip/sslstrip.c +@@ -51,7 +51,7 @@ + + #include <curl/curl.h> + +-#if (LIBCURL_VERSION_MAJOR < 7) || (LIBCURL_VERSION_MINOR < 26) ++#if (LIBCURL_VERSION_MAJOR < 7) || (LIBCURL_VERSION_MAJOR == 7 && LIBCURL_VERSION_MINOR < 26) + #error libcurl 7.26.0 or up is needed + #endif + +-- +2.40.0 + diff --git a/meta-networking/recipes-support/ettercap/ettercap_0.8.3.1.bb b/meta-networking/recipes-support/ettercap/ettercap_0.8.3.1.bb new file mode 100644 index 0000000000..723d7c8f78 --- /dev/null +++ b/meta-networking/recipes-support/ettercap/ettercap_0.8.3.1.bb @@ -0,0 +1,47 @@ +SUMMARY = "A suite for man in the middle attacks" +HOMEPAGE = "https://github.com/Ettercap/ettercap" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +inherit cmake + +DEPENDS += "ethtool \ + geoip \ + librepo \ + libnet \ + libpcap \ + libpcre \ + ncurses \ + openssl \ + zlib \ + bison-native \ + flex-native \ + " + +RDEPENDS:${PN} += "bash ethtool libgcc" + +SRC_URI = "gitsm://github.com/Ettercap/ettercap;branch=master;protocol=https \ + file://0001-sslstrip-Enhance-the-libcurl-version-check-to-consid.patch" + +SRCREV = "7281fbddb7da7478beb1d21e3cb105fff3778b31" + +S = "${WORKDIR}/git" + +EXTRA_OECMAKE = " \ + -DCMAKE_SKIP_RPATH=TRUE \ + -DBUNDLED_LIBS=ON \ + -DENABLE_IPV6=ON \ + -DENABLE_GTK=OFF \ + -DFLEX_TARGET_ARG_COMPILE_FLAGS='--noline' \ + -DBISON_TARGET_ARG_COMPILE_FLAGS='--no-lines' \ +" + +CFLAGS += "-D_GNU_SOURCE" +# Replaces default encoding set (ISO-8859-1) with UTF-8 in ettercap +# configuration file installed by the package. +# It ensures that all characters are properly decoded and avoids +# any fatal errors while running in text mode (-T). +do_install:append() { + sed -i 's@utf8_encoding.*@utf8_encoding = "UTF-8"@g' \ + ${D}/etc/ettercap/etter.conf +} diff --git a/meta-networking/recipes-support/fetchmail/fetchmail_6.3.26.bb b/meta-networking/recipes-support/fetchmail/fetchmail_6.3.26.bb deleted file mode 100644 index 1d78288c88..0000000000 --- a/meta-networking/recipes-support/fetchmail/fetchmail_6.3.26.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "Fetchmail retrieves mail from remote mail servers and forwards it via SMTP" -HOMEPAGE = "http://www.fetchmail.info/" -DESCRIPTION = "Fetchmail is a full-featured, robust, well-documented remote-mail retrieval and forwarding utility intended to be used over on-demand TCP/IP links (such as SLIP or PPP connections). It supports every remote-mail protocol now in use on the Internet: POP2, POP3, RPOP, APOP, KPOP, all flavors of IMAP, ETRN, and ODMR. It can even support IPv6 and IPSEC." -SECTION = "mail" -LICENSE = "GPLv2 & MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=fbb509e0303f5ded1cbfc0cc8705f28c" - -DEPENDS = "openssl" - -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "61b66faad044afa26e142bb1791aa2b3" -SRC_URI[sha256sum] = "79b4c54cdbaf02c1a9a691d9948fcb1a77a1591a813e904283a8b614b757e850" - -inherit autotools gettext python-dir pythonnative - -EXTRA_OECONF = "--with-ssl=${STAGING_DIR_HOST}${prefix}" - -PACKAGES =+ "fetchmail-python" -FILES_fetchmail-python = "${libdir}/${PYTHON_DIR}/*" diff --git a/meta-networking/recipes-support/fetchmail/fetchmail_6.4.38.bb b/meta-networking/recipes-support/fetchmail/fetchmail_6.4.38.bb new file mode 100644 index 0000000000..6cde94b202 --- /dev/null +++ b/meta-networking/recipes-support/fetchmail/fetchmail_6.4.38.bb @@ -0,0 +1,29 @@ +SUMMARY = "Fetchmail retrieves mail from remote mail servers and forwards it via SMTP" +HOMEPAGE = "http://www.fetchmail.info/" +DESCRIPTION = "Fetchmail is a full-featured, robust, well-documented remote-mail retrieval \ +and forwarding utility intended to be used over on-demand TCP/IP links (such as SLIP or PPP \ +connections). It supports every remote-mail protocol now in use on the Internet: POP2, POP3, \ +RPOP, APOP, KPOP, all flavors of IMAP, ETRN, and ODMR. It can even support IPv6 and IPSEC." +SECTION = "mail" +LICENSE = "GPL-2.0-only & MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=ee6b9f41d9324434dd11bd8a38f1b044" + +DEPENDS = "openssl" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.xz \ + " +SRC_URI[sha256sum] = "a6cb4ea863ac61d242ffb2db564a39123761578d3e40d71ce7b6f2905be609d9" + +inherit autotools gettext pkgconfig python3-dir python3native + +EXTRA_OECONF = "--with-ssl=${STAGING_DIR_HOST}${prefix}" + +INSANE_SKIP:${PN} = "already-stripped" + +do_install:append() { + sed -i 's,${RECIPE_SYSROOT_NATIVE},,g' ${D}${bindir}/fetchmailconf + sed -i 's,${RECIPE_SYSROOT},,g' ${D}${bindir}/fetchmail +} + +PACKAGES =+ "fetchmail-python" +FILES:fetchmail-python = "${libdir}/${PYTHON_DIR}/*" diff --git a/meta-networking/recipes-support/fping/fping_3.5.bb b/meta-networking/recipes-support/fping/fping_5.2.bb index 82e3bf0730..f75b6441b2 100644 --- a/meta-networking/recipes-support/fping/fping_3.5.bb +++ b/meta-networking/recipes-support/fping/fping_5.2.bb @@ -7,13 +7,15 @@ targets to ping. Instead of sending to one target until it times out or \ replies, fping will send out a ping packet and move on to the next target \ in a round-robin fashion." HOMEPAGE = "http://www.fping.org/" +BUGTRACKER = "https://github.com/schweikert/fping/issues" SECTION = "net" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=09d77789fe32be35acde9637a5ee39b1" + +LICENSE = "fping" +NO_GENERIC_LICENSE[fping] = "COPYING" +LIC_FILES_CHKSUM = "file://COPYING;md5=c6170fbadddfcd74f011515291d96901" SRC_URI = "http://www.fping.org/dist/fping-${PV}.tar.gz" -SRC_URI[md5sum] = "2e17cb655aa4eb59b5a4a38a89e746ed" -SRC_URI[sha256sum] = "09b8960e235341bae6000085d38106357eae656a79e0119bd27e816c9003656a" +SRC_URI[sha256sum] = "a7692d10d73fb0bb76e1f7459aa7f19bbcdbfc5adbedef02f468974b18b0e42f" S = "${WORKDIR}/fping-${PV}" diff --git a/meta-networking/recipes-support/fwknop/fwknop/0001-Fix-compilation-with-GCC-s-fno-common-flag-fixes-305.patch b/meta-networking/recipes-support/fwknop/fwknop/0001-Fix-compilation-with-GCC-s-fno-common-flag-fixes-305.patch new file mode 100644 index 0000000000..e696ac4ead --- /dev/null +++ b/meta-networking/recipes-support/fwknop/fwknop/0001-Fix-compilation-with-GCC-s-fno-common-flag-fixes-305.patch @@ -0,0 +1,27 @@ +From 5aea816f27a71e6c88ad50e7326fa6584eeb7ad9 Mon Sep 17 00:00:00 2001 +From: Francois Marier <francois@debian.org> +Date: Fri, 24 Jul 2020 21:22:47 -0700 +Subject: [PATCH] Fix compilation with GCC's -fno-common flag (fixes #305) + +Upstream-Status: Submitted [https://github.com/mrash/fwknop/pull/319] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + client/log_msg.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/client/log_msg.h b/client/log_msg.h +index cc17716..3dda161 100644 +--- a/client/log_msg.h ++++ b/client/log_msg.h +@@ -38,7 +38,7 @@ enum + LOG_VERBOSITY_INFO, /*!< Constant to define a INFO message */ + LOG_VERBOSITY_DEBUG, /*!< Constant to define a DEBUG message */ + LOG_LAST_VERBOSITY +-} log_level_t; ++}; + + #define LOG_DEFAULT_VERBOSITY LOG_VERBOSITY_NORMAL /*!< Default verbosity to use */ + +-- +2.28.0 + diff --git a/meta-networking/recipes-support/fwknop/fwknop/0001-Use-pkg-config-to-find-gpgme.patch b/meta-networking/recipes-support/fwknop/fwknop/0001-Use-pkg-config-to-find-gpgme.patch new file mode 100644 index 0000000000..146501c775 --- /dev/null +++ b/meta-networking/recipes-support/fwknop/fwknop/0001-Use-pkg-config-to-find-gpgme.patch @@ -0,0 +1,27 @@ +From f8f4e1a617c4610ea7dc40a60f1c696ebc37850c Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 2 Apr 2023 09:27:42 -0700 +Subject: [PATCH] Use pkg-config to find gpgme + +Upstream-Status: Inappropriate [OE specific] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + m4/gpgme.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/m4/gpgme.m4 b/m4/gpgme.m4 +index 44bf43c..c9a8ae6 100644 +--- a/m4/gpgme.m4 ++++ b/m4/gpgme.m4 +@@ -18,7 +18,7 @@ AC_DEFUN([_AM_PATH_GPGME_CONFIG], + if test "x$gpgme_config_prefix" != x ; then + GPGME_CONFIG="$gpgme_config_prefix/bin/gpgme-config" + fi +- AC_PATH_PROG(GPGME_CONFIG, gpgme-config, no) ++ GPGME_CONFIG="pkg-config gpgme" + + if test "$GPGME_CONFIG" != "no" ; then + gpgme_version=`$GPGME_CONFIG --version` +-- +2.40.0 + diff --git a/meta-networking/recipes-support/fwknop/fwknop/0001-configure.ac-Fix-missing-comma-in-AS_IF.patch b/meta-networking/recipes-support/fwknop/fwknop/0001-configure.ac-Fix-missing-comma-in-AS_IF.patch new file mode 100644 index 0000000000..f3e1707408 --- /dev/null +++ b/meta-networking/recipes-support/fwknop/fwknop/0001-configure.ac-Fix-missing-comma-in-AS_IF.patch @@ -0,0 +1,29 @@ +From fee4cb0ae2d1fcd012cb7f501c3db0d8ec910798 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 2 Apr 2023 10:01:51 -0700 +Subject: [PATCH] configure.ac: Fix missing comma in AS_IF + +this is flagged with autconf 2.72 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 47a069e..9cdfd3f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -744,7 +744,7 @@ dnl + IPFW_EXE="" + IPTABLES_EXE="" + FIREWALLD_EXE="" +- ] ++ ], + ] + ] + ] +-- +2.40.0 + diff --git a/meta-networking/recipes-support/fwknop/fwknop_2.6.10.bb b/meta-networking/recipes-support/fwknop/fwknop_2.6.10.bb new file mode 100644 index 0000000000..a1f56cdf16 --- /dev/null +++ b/meta-networking/recipes-support/fwknop/fwknop_2.6.10.bb @@ -0,0 +1,30 @@ +SUMMARY = "fwknop - Single Packet Authorization" +HOMEPAGE = "http://www.cipherdyne.org/fwknop/" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ + " +inherit autotools-brokensep pkgconfig + +SRC_URI = "http://www.cipherdyne.org/${BPN}/download/${BPN}-${PV}.tar.bz2 \ + file://0001-Fix-compilation-with-GCC-s-fno-common-flag-fixes-305.patch \ + file://0001-Use-pkg-config-to-find-gpgme.patch \ + file://0001-configure.ac-Fix-missing-comma-in-AS_IF.patch \ + " +SRC_URI[sha256sum] = "f6c09bec97ed8e474a98ae14f9f53e1bcdda33393f20667b6af3fb6bb894ca77" + +DEPENDS = "libpcap gpgme" + +EXTRA_OECONF = " --with-iptables=${sbindir}/iptables" + +do_configure:prepend () { + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/config + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}/config +} + +PACKAGES =+ "${PN}-client ${PN}-daemon" + +FILES:${PN}-client = "${bindir}/fwknop" +FILES:${PN}-daemon = "${sbindir}/fwknopd \ + ${sysconfdir}/fwknop/access.conf \ + ${sysconfdir}/fwknop/fwknopd.conf" + diff --git a/meta-networking/recipes-support/fwknop/fwknop_2.6.9.bb b/meta-networking/recipes-support/fwknop/fwknop_2.6.9.bb deleted file mode 100644 index 49b11ad335..0000000000 --- a/meta-networking/recipes-support/fwknop/fwknop_2.6.9.bb +++ /dev/null @@ -1,34 +0,0 @@ -SUMMARY = "fwknop - Single Packet Authorization" -HOMEPAGE = "http://www.cipherdyne.org/fwknop/" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ - " -inherit autotools-brokensep - -SRC_URI = "http://www.cipherdyne.org/${BPN}/download/${BPN}-${PV}.tar.bz2 \ - " - -SRC_URI[md5sum] = "e2c49e9674888a028bd443a55c3aaa22" -SRC_URI[sha256sum] = "5bf47fe1fd30e862d29464f762c0b8bf89b5e298665c37624d6707826da956d4" - -DEPENDS = "libpcap gpgme" - -EXTRA_OECONF = " --with-iptables=/usr/sbin/iptables \ - " - -do_configure () { - aclocal - libtoolize --automake --copy --force - autoconf - autoheader - automake -a - oe_runconf -} - -PACKAGES =+ "${PN}-client ${PN}-daemon" - -FILES_${PN}-client = "${bindir}/fwknop" -FILES_${PN}-daemon = "${sbindir}/fwknopd \ - ${sysconfdir}/fwknop/access.conf \ - ${sysconfdir}/fwknop/fwknopd.conf" - diff --git a/meta-networking/recipes-support/geoip/geoip-perl_1.50.bb b/meta-networking/recipes-support/geoip/geoip-perl_1.51.bb index a8c8bcf580..8e23b66c48 100644 --- a/meta-networking/recipes-support/geoip/geoip-perl_1.50.bb +++ b/meta-networking/recipes-support/geoip/geoip-perl_1.51.bb @@ -6,20 +6,15 @@ SUMMARY = "GeoIP perl API library to access location database" DESCRIPTION = "perl library for country/city/organization to IP address or hostname mapping" HOMEPAGE = "http://www.maxmind.com/app/ip-location" SECTION = "libdevel" -LICENSE = "Artistic-1.0 | GPL-1.0+" -LIC_FILES_CHKSUM = "file://LICENSE;md5=b7a36f55e8ba62aadd74e4f0886a405e" +LICENSE = "Artistic-1.0 | GPL-1.0-or-later" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e4f3ea6e9b28af88dc0321190a1f8250" -# Note that we do not want to use the upstream file name locally. -# -SRC_URI = "http://github.com/maxmind/geoip-api-perl/archive/v${PV}.tar.gz;downloadfilename=${BPN}-${PV}.tar.gz \ +S = "${WORKDIR}/git" +SRCREV = "4cdfdc38eca237c19c22a8b90490446ce6d970fa" +SRC_URI = "git://github.com/maxmind/geoip-api-perl.git;branch=main;protocol=https \ file://run-ptest \ " -SRC_URI[md5sum] = "2d7f8b1b54e6ba6d9e3fefce52675815" -SRC_URI[sha256sum] = "86da0dd67f417a43dc70f15a49bd3619f668970c117b9e7f737b4ab246c240a6" - -S = "${WORKDIR}/geoip-api-perl-${PV}" - DEPENDS += "geoip" inherit cpan ptest @@ -35,6 +30,7 @@ do_install_ptest () { install ${S}/t/*.t* ${D}${PTEST_PATH}/t install ${S}/t/data/* ${D}${PTEST_PATH}/t/data } +RDEPENDS:${PN}-ptest += "perl-modules" -FILES_${PN}-dbg += "${libdir}/perl/vendor_perl/*/auto/Geo/IP/.debug" +FILES:${PN}-dbg += "${libdir}/perl/vendor_perl/*/auto/Geo/IP/.debug" diff --git a/meta-networking/recipes-support/geoip/geoip_1.6.9.bb b/meta-networking/recipes-support/geoip/geoip_1.6.12.bb index 9e8e0714f8..b247823cd4 100644 --- a/meta-networking/recipes-support/geoip/geoip_1.6.9.bb +++ b/meta-networking/recipes-support/geoip/geoip_1.6.12.bb @@ -8,28 +8,30 @@ using reverse DNS lookups." HOMEPAGE = "http://dev.maxmind.com/geoip/" SECTION = "libdevel" -SRC_URI = "git://github.com/maxmind/geoip-api-c.git \ - http://geolite.maxmind.com/download/geoip/database/GeoLiteCountry/GeoIP.dat.gz;apply=no;name=GeoIP-dat \ - http://geolite.maxmind.com/download/geoip/database/GeoIPv6.dat.gz;apply=no;name=GeoIPv6-dat \ - http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz;apply=no;name=GeoLiteCity-dat \ - http://geolite.maxmind.com/download/geoip/database/GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz;apply=no;name=GeoLiteCityv6-dat \ +GEOIP_DATABASE_VERSION = "20181205" + +SRC_URI = "git://github.com/maxmind/geoip-api-c.git;branch=main;protocol=https \ + http://sources.openembedded.org/GeoIP.dat.${GEOIP_DATABASE_VERSION}.gz;apply=no;name=GeoIP-dat; \ + http://sources.openembedded.org/GeoIPv6.dat.${GEOIP_DATABASE_VERSION}.gz;apply=no;name=GeoIPv6-dat; \ + http://sources.openembedded.org/GeoLiteCity.dat.${GEOIP_DATABASE_VERSION}.gz;apply=no;name=GeoLiteCity-dat; \ + http://sources.openembedded.org/GeoLiteCityv6.dat.${GEOIP_DATABASE_VERSION}.gz;apply=no;name=GeoLiteCityv6-dat; \ file://run-ptest \ " -SRCREV = "4f487bf95532e0bba7783d591faff178ab0aa462" +SRCREV = "4b526e7331ca1d692b74a0509ddcc725622ed31a" -SRC_URI[GeoIP-dat.md5sum] = "37c84ead332dda0362a5ac7b049b72d4" -SRC_URI[GeoIP-dat.sha256sum] = "79ff1099e96c2dc1c2539c9a18aaa13a9afd085cae477df60d95f1644d42bc07" +SRC_URI[GeoIP-dat.md5sum] = "d538e57ad9268fdc7955c6cf9a37c4a9" +SRC_URI[GeoIP-dat.sha256sum] = "b9c05eb8bfcf90a6ddfdc6815caf40a8db2710f0ce3dd48fbd6c24d485ae0449" -SRC_URI[GeoIPv6-dat.md5sum] = "e75b84a4044e81d6d4484e33816bc762" -SRC_URI[GeoIPv6-dat.sha256sum] = "a009b0f21968d2868e6dd19d14f3c3b8cd60ae84a4bfc2970df34d771a04811e" +SRC_URI[GeoIPv6-dat.md5sum] = "52d6aa0aac1adbfa5eb7fa4742197c11" +SRC_URI[GeoIPv6.sha256sum] = "416ac92fcc35a21d5efbb32e5c88e609c37aec1aa1af6247d088b8da1af6e9bf" -SRC_URI[GeoLiteCity-dat.md5sum] = "4b6588d0bfe1af22e267ac90aa97f769" -SRC_URI[GeoLiteCity-dat.sha256sum] = "8a6467033a528f68b1a97de24d9d0ce86c8e8e83683820e16e433ddbd3f712f7" +SRC_URI[GeoLiteCity-dat.md5sum] = "d700c137232f8e077ac8db8577f699d9" +SRC_URI[GeoLiteCity-dat.sha256sum] = "90db2e52195e3d1bcdb2c2789209006d09de5c742812dbd9a1b36c12675ec4cd" -SRC_URI[GeoLiteCityv6-dat.md5sum] = "ad0cb42518af7f752499425dca0952bb" -SRC_URI[GeoLiteCityv6-dat.sha256sum] = "eda67f4204ba9fa5204a53cdb629167cca9394c712f5378bc723a8c29c0b440f" +SRC_URI[GeoLiteCityv6-dat.md5sum] = "6734ccdc644fc0ba76eb276dce73d005" +SRC_URI[GeoLiteCityv6-dat.sha256sum] = "c95a9d2643b7f53d7abeed2114388870e13fbbad4653f450a49efa7e4b86aca4" -LICENSE = "LGPL-2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=243b725d71bb5df4a1e5920b344b86ad \ file://LICENSE;md5=0388276749a542b0d611601fa7c1dcc8 " @@ -44,20 +46,20 @@ EXTRA_OECONF = "--disable-static \ do_install() { make DESTDIR=${D} install install -d ${D}/${datadir}/GeoIP - install ${WORKDIR}/GeoIP.dat ${D}/${datadir}/GeoIP/ - install ${WORKDIR}/GeoIPv6.dat ${D}/${datadir}/GeoIP/ - install ${WORKDIR}/GeoLiteCity.dat ${D}/${datadir}/GeoIP/ - install ${WORKDIR}/GeoLiteCityv6.dat ${D}/${datadir}/GeoIP/ + install ${UNPACKDIR}/GeoIP.dat.${GEOIP_DATABASE_VERSION} ${D}/${datadir}/GeoIP/GeoIP.dat + install ${UNPACKDIR}/GeoIPv6.dat.${GEOIP_DATABASE_VERSION} ${D}/${datadir}/GeoIP/GeoIPv6.dat + install ${UNPACKDIR}/GeoLiteCity.dat.${GEOIP_DATABASE_VERSION} ${D}/${datadir}/GeoIP/GeoLiteCity.dat + install ${UNPACKDIR}/GeoLiteCityv6.dat.${GEOIP_DATABASE_VERSION} ${D}/${datadir}/GeoIP/GeoLiteCityv6.dat ln -s GeoLiteCity.dat ${D}${datadir}/GeoIP/GeoIPCity.dat } PACKAGES =+ "${PN}-database" -FILES_${PN}-database = "" -FILES_${PN}-database += "${datadir}/GeoIP/*" +FILES:${PN}-database = "" +FILES:${PN}-database += "${datadir}/GeoIP/*" # We cannot do much looking up without databases. # -RDEPENDS_${PN} += "${PN}-database" +RDEPENDS:${PN} += "${PN}-database" inherit ptest diff --git a/meta-networking/recipes-support/geoip/geoipupdate-2.4.0/GeoIP.conf b/meta-networking/recipes-support/geoip/geoipupdate-2.5.0/GeoIP.conf index 134cfed1f5..134cfed1f5 100644 --- a/meta-networking/recipes-support/geoip/geoipupdate-2.4.0/GeoIP.conf +++ b/meta-networking/recipes-support/geoip/geoipupdate-2.5.0/GeoIP.conf diff --git a/meta-networking/recipes-support/geoip/geoipupdate-2.4.0/geoipupdate.cron b/meta-networking/recipes-support/geoip/geoipupdate-2.5.0/geoipupdate.cron index 40597a856e..40597a856e 100644 --- a/meta-networking/recipes-support/geoip/geoipupdate-2.4.0/geoipupdate.cron +++ b/meta-networking/recipes-support/geoip/geoipupdate-2.5.0/geoipupdate.cron diff --git a/meta-networking/recipes-support/geoip/geoipupdate_2.4.0.bb b/meta-networking/recipes-support/geoip/geoipupdate_2.5.0.bb index 3e045bb27d..e4dc9dee47 100644 --- a/meta-networking/recipes-support/geoip/geoipupdate_2.4.0.bb +++ b/meta-networking/recipes-support/geoip/geoipupdate_2.5.0.bb @@ -6,28 +6,28 @@ SECTION = "net" DEPENDS = "zlib curl" -SRC_URI = "https://github.com/maxmind/geoipupdate/releases/download/v2.4.0/geoipupdate-2.4.0.tar.gz \ +SRC_URI = "https://github.com/maxmind/geoipupdate/releases/download/v2.5.0/geoipupdate-2.5.0.tar.gz \ file://GeoIP.conf \ file://geoipupdate.cron \ " -SRC_URI[md5sum] = "02f9712fb80e8e979d3d54cda7f7704f" -SRC_URI[sha256sum] = "8b4e88ce8d84e9c75bc681704d19ec5c63c54f01e945f7669f97fb0df7e13952" +SRC_URI[md5sum] = "28f633c49ec87ab01ad3c0fb0228a696" +SRC_URI[sha256sum] = "5119fd0e338cd083e886228b26679c64bcbaade8a815be092aecf865a610ab26" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "\ -file://ChangeLog.md;md5=334337b6ecbb65093bae66b3ae21c8c2 \ +file://ChangeLog.md;md5=11d2e31df0de2be3ccc3e2286c4dafcb \ " -FILES_${PN} = "/usr/share/GeoIP \ +FILES:${PN} = "/usr/share/GeoIP \ /etc/GeoIP.conf \ /etc/cron.d/geoipupdate.cron \ /usr/bin/geoipupdate \ " inherit autotools -do_install_append() { +do_install:append() { install -d ${D}/${sysconfdir} install -d ${D}/${sysconfdir}/cron.d - install ${WORKDIR}/GeoIP.conf ${D}/${sysconfdir}/ - install ${WORKDIR}/geoipupdate.cron ${D}/${sysconfdir}/cron.d/ + install ${UNPACKDIR}/GeoIP.conf ${D}/${sysconfdir}/ + install ${UNPACKDIR}/geoipupdate.cron ${D}/${sysconfdir}/cron.d/ } diff --git a/meta-networking/recipes-support/htpdate/htpdate_1.3.7.bb b/meta-networking/recipes-support/htpdate/htpdate_1.3.7.bb new file mode 100644 index 0000000000..b6dfab0856 --- /dev/null +++ b/meta-networking/recipes-support/htpdate/htpdate_1.3.7.bb @@ -0,0 +1,31 @@ +SUMMARY = "HTTP based time synchronization tool" +DESCRIPTION = "The HTTP Time Protocol (HTP) is used to synchronize a computer's time with\ + web servers as reference time source. This program can be used instead\ + ntpdate or similar, in networks that has a firewall blocking the NTP port.\ + Htpdate will synchronize the computer time to Greenwich Mean Time (GMT),\ + using the timestamps from HTTP headers found in web servers response (the\ + HEAD method will be used to get the information).\ + Htpdate works through proxy servers. Accuracy of htpdate will be usually\ + within 0.5 seconds (better with multiple servers).\ +" +HOMEPAGE = "https://github.com/twekkel/htpdate" +BUGTRACKER = "https://github.com/twekkel/htpdate/issues" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://htpdate.c;beginline=26;endline=30;md5=2b6cdb94bd5349646d7e33f9f501eef7" + +SRC_URI = "http://www.vervest.org/htp/archive/c/htpdate-${PV}.tar.gz" +SRC_URI[sha256sum] = "88c52fe475308ee95f560fd7cf68c75bc6e9a6abf56be7fed203a7f762fe7ab2" + +TARGET_CC_ARCH += "${LDFLAGS}" + +do_configure () { + : +} + +do_compile () { + oe_runmake +} + +do_install () { + oe_runmake install 'INSTALL=install' 'STRIP=echo' 'DESTDIR=${D}' +} diff --git a/meta-networking/recipes-support/http-parser/http-parser_2.9.4.bb b/meta-networking/recipes-support/http-parser/http-parser_2.9.4.bb new file mode 100644 index 0000000000..528289b7fd --- /dev/null +++ b/meta-networking/recipes-support/http-parser/http-parser_2.9.4.bb @@ -0,0 +1,31 @@ +SUMMARY = "HTTP request/response parser for C" +DESCRIPTION = "This is a parser for HTTP messages written in C. It parses \ + both requests and responses. The parser is designed to be used \ + in performance HTTP applications. It does not make any \ + syscalls nor allocations, it does not buffer data, it can be \ + interrupted at anytime. Depending on your architecture, it \ + only requires about 40 bytes of data per message stream (in a \ + web server that is per connection)." +HOMEPAGE = "https://github.com/nodejs/http-parser" +SECTION = "libs" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE-MIT;md5=9bfa835d048c194ab30487af8d7b3778" + +SRC_URI = "git://github.com/nodejs/http-parser.git;branch=master;protocol=https" +SRCREV = "2343fd6b5214b2ded2cdcf76de2bf60903bb90cd" + +S = "${WORKDIR}/git" + +EXTRA_OEMAKE = "PLATFORM=linux" + +do_configure[noexec] = "1" + +do_compile() { + oe_runmake library package +} + +do_install() { + oe_runmake install DESTDIR=${D} PREFIX=${prefix} LIBDIR=${libdir} +} + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-networking/recipes-support/ifenslave/ifenslave_2.9.bb b/meta-networking/recipes-support/ifenslave/ifenslave_2.14.bb index ea28b34aa9..02a5520a97 100644 --- a/meta-networking/recipes-support/ifenslave/ifenslave_2.9.bb +++ b/meta-networking/recipes-support/ifenslave/ifenslave_2.14.bb @@ -2,26 +2,21 @@ SUMMARY = "Configure network interfaces for parallel routing" HOMEPAGE = "http://www.linuxfoundation.org/collaborate/workgroups/networking/bonding" SECTION = "net" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://debian/copyright;md5=acc89812938cf9ad6b1debc37cea0253" +inherit manpages +MAN_PKG = "${PN}" -SRCREV = "42bfbb9beb924672ca86b86e9679ac3d6b87d992" -SRC_URI = "git://anonscm.debian.org/collab-maint/ifenslave.git" +SRCREV = "62e60904afbe58fda0c7104fdad1c4f618266ba6" +SRC_URI = "git://salsa.debian.org/debian/ifenslave.git;protocol=https;branch=main" S = "${WORKDIR}/git" do_install() { - install -d ${D}${sbindir} - install -m 0755 ${S}/ifenslave ${D}${sbindir}/ - install -m 0755 -D ${S}/debian/ifenslave.if-pre-up ${D}${sysconfdir}/network/if-pre-up.d/ifenslave install -m 0755 -D ${S}/debian/ifenslave.if-post-down ${D}${sysconfdir}/network/if-post-down.d/ifenslave install -m 0755 -D ${S}/debian/ifenslave.if-up ${D}${sysconfdir}/network/if-up.d/ifenslave - install -m 0644 -D ${S}/debian/ifenslave.8 ${D}${mandir}/man8/ifenslave.8 } -FILES_${PN}-doc_remove = "${mandir}" -FILES_${PN} += "${mandir}/man8/ifenslave.8" - -RDEPENDS_${PN} = "man" +FILES:${PN}-doc:remove = "${mandir}" diff --git a/meta-networking/recipes-support/ifmetric/ifmetric/ifmetric.8_typo.patch b/meta-networking/recipes-support/ifmetric/ifmetric/ifmetric.8_typo.patch new file mode 100644 index 0000000000..3bd87ff457 --- /dev/null +++ b/meta-networking/recipes-support/ifmetric/ifmetric/ifmetric.8_typo.patch @@ -0,0 +1,17 @@ +Upstream-Status: Pending + +Description: Correct typo: s/ommited/omitted/ +Author: Michael Shuler <michael@pbandjelly.org> +Index: ifmetric/man/ifmetric.8 +=================================================================== +--- ifmetric.orig/man/ifmetric.8 ++++ ifmetric/man/ifmetric.8 +@@ -9,7 +9,7 @@ ifmetric is a Linux tool for setting the + + ifmetric uses the Linux NETLINK interface to manipulate the routes. Because of that it is compatible with routes created with the new iproute2 utility. + .SH OPTIONS +-You should specify the interface name as first parameter. The second parameter should be the new metric. If ommited the metric 0 (highest) is used. ++You should specify the interface name as first parameter. The second parameter should be the new metric. If omitted the metric 0 (highest) is used. + .SH RETURN VALUES + \fI0\f1 Success + diff --git a/meta-networking/recipes-support/ifmetric/ifmetric/ifmetric.c_netlink-invalid-arg.patch b/meta-networking/recipes-support/ifmetric/ifmetric/ifmetric.c_netlink-invalid-arg.patch new file mode 100644 index 0000000000..a6d1828d22 --- /dev/null +++ b/meta-networking/recipes-support/ifmetric/ifmetric/ifmetric.c_netlink-invalid-arg.patch @@ -0,0 +1,18 @@ +Upstream-Status: Pending + +Description: Fix "NETLINK: Error: Invalid argument" for links that are down, in kernel 4.4+ +Author: Jim Paris <jim@jtan.com> +Bug-Debian: http://bugs.debian.org/864889 +Index: ifmetric/src/nlrequest.c +=================================================================== +--- a/src/ifmetric.c ++++ b/src/ifmetric.c +@@ -97,6 +97,8 @@ + l = NLMSG_PAYLOAD(n, sizeof(struct rtmsg)); + a = RTM_RTA(r); + ++ r->rtm_flags &= ~(RTNH_F_DEAD | RTNH_F_LINKDOWN); ++ + while(RTA_OK(a, l)) { + switch(a->rta_type) { + case RTA_PRIORITY: diff --git a/meta-networking/recipes-support/ifmetric/ifmetric/ifmetric.c_typo.patch b/meta-networking/recipes-support/ifmetric/ifmetric/ifmetric.c_typo.patch new file mode 100644 index 0000000000..19290a59dd --- /dev/null +++ b/meta-networking/recipes-support/ifmetric/ifmetric/ifmetric.c_typo.patch @@ -0,0 +1,26 @@ +Upstream-Status: Pending + +Description: Correct spelling-error-in-binary s/Recieved/Received/ +Author: Michael Shuler <michael@pbandjelly.org> +Index: ifmetric/src/ifmetric.c +=================================================================== +--- ifmetric.orig/src/ifmetric.c 2013-09-04 18:37:59.000000000 -0500 ++++ ifmetric/src/ifmetric.c 2013-09-04 19:08:38.539750778 -0500 +@@ -38,7 +38,7 @@ + case RTA_OIF: + + if (RTA_PAYLOAD(a) != sizeof(int)) { +- fprintf(stderr, "NETLINK: Recieved corrupt RTA_OIF payload.\n"); ++ fprintf(stderr, "NETLINK: Received corrupt RTA_OIF payload.\n"); + return -1; + } + +@@ -102,7 +102,7 @@ + case RTA_PRIORITY: + + if (RTA_PAYLOAD(a) != sizeof(int)) { +- fprintf(stderr, "NETLINK: Recieved corrupt RTA_PRIORITY payload.\n"); ++ fprintf(stderr, "NETLINK: Received corrupt RTA_PRIORITY payload.\n"); + return NULL; + } + diff --git a/meta-networking/recipes-support/ifmetric/ifmetric/nlrequest.c_packet-too-small_fix.patch b/meta-networking/recipes-support/ifmetric/ifmetric/nlrequest.c_packet-too-small_fix.patch new file mode 100644 index 0000000000..89851517bf --- /dev/null +++ b/meta-networking/recipes-support/ifmetric/ifmetric/nlrequest.c_packet-too-small_fix.patch @@ -0,0 +1,18 @@ +Upstream-Status: Pending + +Description: Fix "NETLINK: Packet too small or truncated!" error. +Author: Benedek László <benedekl@gmail.com> +Bug-Debian: http://bugs.debian.org/514197 +Index: ifmetric/src/nlrequest.c +=================================================================== +--- ifmetric.orig/src/nlrequest.c 2013-09-05 14:10:42.000000000 -0500 ++++ ifmetric/src/nlrequest.c 2013-09-05 14:19:06.573420862 -0500 +@@ -44,7 +44,7 @@ + + for (;;) { + int bytes; +- char replybuf[2048]; ++ char replybuf[4096]; + struct nlmsghdr *p = (struct nlmsghdr *) replybuf; + + if ((bytes = recv(s, &replybuf, sizeof(replybuf), 0)) < 0) { diff --git a/meta-networking/recipes-support/ifmetric/ifmetric_0.3.bb b/meta-networking/recipes-support/ifmetric/ifmetric_0.3.bb new file mode 100644 index 0000000000..1e57a48970 --- /dev/null +++ b/meta-networking/recipes-support/ifmetric/ifmetric_0.3.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "Set routing metrics for a network interface" + +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f" + +SRC_URI = "http://0pointer.de/lennart/projects/ifmetric/ifmetric-${PV}.tar.gz \ + file://ifmetric.8_typo.patch \ + file://ifmetric.c_netlink-invalid-arg.patch \ + file://ifmetric.c_typo.patch \ + file://nlrequest.c_packet-too-small_fix.patch" +SRC_URI[md5sum] = "74aa3f5ee8aca16a87e124ddcc64fa36" +SRC_URI[sha256sum] = "0fa8510a4e34e555f136f9df81d26618313f2d69a4880c0fb5967f19502f1aec" + +inherit autotools + +# disable lynx support for now +EXTRA_OECONF = "--disable-lynx" diff --git a/meta-networking/recipes-support/iftop/iftop/iftop-1.0-gcc10.patch b/meta-networking/recipes-support/iftop/iftop/iftop-1.0-gcc10.patch new file mode 100644 index 0000000000..28391a57cf --- /dev/null +++ b/meta-networking/recipes-support/iftop/iftop/iftop-1.0-gcc10.patch @@ -0,0 +1,68 @@ +Patch by Robert Scheck <robert@fedoraproject.org> for iftop <= 1.0pre4 to avoid a +GCC 10 related build failure due to global variables in a header file with omitted +"extern" declaration, see also: https://gcc.gnu.org/gcc-10/porting_to.html + +Example build failure output: +/usr/bin/ld: ui_common.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:36: multiple definition of `screen_list'; iftop.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:36: first defined here +/usr/bin/ld: ui_common.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:38: multiple definition of `peaktotal'; iftop.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:38: first defined here +/usr/bin/ld: ui_common.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:38: multiple definition of `peakrecv'; iftop.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:38: first defined here +/usr/bin/ld: ui_common.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:38: multiple definition of `peaksent'; iftop.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:38: first defined here +/usr/bin/ld: ui_common.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:37: multiple definition of `totals'; iftop.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:37: first defined here +/usr/bin/ld: ui_common.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:40: multiple definition of `screen_hash'; iftop.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:40: first defined here +/usr/bin/ld: ui_common.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:41: multiple definition of `service_hash'; iftop.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:41: first defined here +/usr/bin/ld: ui.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:36: multiple definition of `screen_list'; iftop.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:36: first defined here +/usr/bin/ld: ui.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:38: multiple definition of `peaksent'; iftop.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:38: first defined here +/usr/bin/ld: ui.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:38: multiple definition of `peakrecv'; iftop.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:38: first defined here +/usr/bin/ld: ui.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:38: multiple definition of `peaktotal'; iftop.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:38: first defined here +/usr/bin/ld: ui.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:37: multiple definition of `totals'; iftop.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:37: first defined here +/usr/bin/ld: ui.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:40: multiple definition of `screen_hash'; iftop.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:40: first defined here +/usr/bin/ld: ui.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:41: multiple definition of `service_hash'; iftop.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:41: first defined here +/usr/bin/ld: tui.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:36: multiple definition of `screen_list'; iftop.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:36: first defined here +/usr/bin/ld: tui.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:37: multiple definition of `totals'; iftop.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:37: first defined here +/usr/bin/ld: tui.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:38: multiple definition of `peaksent'; iftop.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:38: first defined here +/usr/bin/ld: tui.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:38: multiple definition of `peakrecv'; iftop.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:38: first defined here +/usr/bin/ld: tui.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:38: multiple definition of `peaktotal'; iftop.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:38: first defined here +/usr/bin/ld: tui.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:40: multiple definition of `screen_hash'; iftop.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:40: first defined here +/usr/bin/ld: tui.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:41: multiple definition of `service_hash'; iftop.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:41: first defined here +collect2: error: ld returned 1 exit status + +Patch from https://src.fedoraproject.org/rpms/iftop/raw/master/f/iftop-1.0-gcc10.patch + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- a/ui_common.h ++++ b/ui_common.h +@@ -33,12 +33,12 @@ typedef struct host_pair_line_tag { + + extern options_t options; + +-sorted_list_type screen_list; +-host_pair_line totals; +-int peaksent, peakrecv, peaktotal; ++extern sorted_list_type screen_list; ++extern host_pair_line totals; ++extern int peaksent, peakrecv, peaktotal; + extern history_type history_totals; +-hash_type* screen_hash; +-hash_type* service_hash; ++extern hash_type* screen_hash; ++extern hash_type* service_hash; + + void analyse_data(void); + void screen_list_init(void); +--- a/ui_common.c ++++ b/ui_common.c +@@ -24,6 +24,12 @@ int history_divs[HISTORY_DIVISIONS] = {1 + char* unit_bits[UNIT_DIVISIONS] = { "b", "Kb", "Mb", "Gb"}; + char* unit_bytes[UNIT_DIVISIONS] = { "B", "KB", "MB", "GB"}; + ++sorted_list_type screen_list; ++host_pair_line totals; ++int peaksent, peakrecv, peaktotal; ++hash_type* screen_hash; ++hash_type* service_hash; ++ + extern hash_type* history; + extern int history_pos; + extern int history_len; diff --git a/meta-networking/recipes-support/iftop/iftop_1.0pre4.bb b/meta-networking/recipes-support/iftop/iftop_1.0pre4.bb index 0c8e494c19..517d781281 100644 --- a/meta-networking/recipes-support/iftop/iftop_1.0pre4.bb +++ b/meta-networking/recipes-support/iftop/iftop_1.0pre4.bb @@ -3,10 +3,12 @@ HOMEPAGE = "http://www.ex-parrot.com/pdw/iftop/" SECTION = "net" DEPENDS = "libpcap ncurses" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=76498170798db0f4f0fb685a225f702f" -SRC_URI = "http://www.ex-parrot.com/pdw/iftop/download/iftop-${PV}.tar.gz" +SRC_URI = "http://www.ex-parrot.com/pdw/iftop/download/iftop-${PV}.tar.gz \ + file://iftop-1.0-gcc10.patch \ + " SRC_URI[md5sum] = "7e6decb4958e8a4890cccac335239f24" SRC_URI[sha256sum] = "f733eeea371a7577f8fe353d86dd88d16f5b2a2e702bd96f5ffb2c197d9b4f97" diff --git a/meta-networking/recipes-support/ipcalc/ipcalc_1.0.3.bb b/meta-networking/recipes-support/ipcalc/ipcalc_1.0.3.bb new file mode 100644 index 0000000000..055c6e1432 --- /dev/null +++ b/meta-networking/recipes-support/ipcalc/ipcalc_1.0.3.bb @@ -0,0 +1,14 @@ +SUMMARY = "Tool to assist in network address calculations for IPv4 and IPv6." +HOMEPAGE = "https://gitlab.com/ipcalc/ipcalc" + +SECTION = "net" + +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRC_URI = "git://gitlab.com/ipcalc/ipcalc.git;protocol=https;branch=master" +SRCREV = "c341e55be386649c0a5347eefeae410753c4e753" + +S = "${WORKDIR}/git" + +inherit meson diff --git a/meta-networking/recipes-support/ipsec-tools/ipsec-tools/0001-Fix-build-with-clang.patch b/meta-networking/recipes-support/ipsec-tools/ipsec-tools/0001-Fix-build-with-clang.patch deleted file mode 100644 index 5c09147450..0000000000 --- a/meta-networking/recipes-support/ipsec-tools/ipsec-tools/0001-Fix-build-with-clang.patch +++ /dev/null @@ -1,115 +0,0 @@ -From 9135ca401186fb14e5e5110bbb04d1ccc480360a Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 15 Nov 2016 04:15:44 +0000 -Subject: [PATCH] Fix build with clang - -Fixes for following errors found by clang - -src/racoon/eaytest.c:316:6: error: comparison of array 'dnstr_w1' not equal to a null pointer is always true - [-Werror,-Wtautological-pointer-compare] - if (dnstr_w1 != NULL) { - ^~~~~~~~ ~~~~ -src/racoon/eaytest.c:326:6: error: comparison of array 'dnstr_w1' not equal to a null pointer is always true - [-Werror,-Wtautological-pointer-compare] - if (dnstr_w1 != NULL) { - ^~~~~~~~ ~~~~ - -src/racoon/isakmp.c:1134:11: error: promoted type 'int' of K&R function parameter is not compatible with the - parameter type 'u_int8_t' (aka 'unsigned char') declared in a previous prototype [-Werror,-Wknr-promoted-parameter] - u_int8_t etype; - ^ -src/racoon/isakmp.c:184:48: note: previous declaration is here - struct sockaddr *, struct sockaddr *, u_int8_t)); - ^ - 1 error generated. - -src/racoon/racoonctl.c:1457:15: error: incompatible pointer types passing 'struct evt_async *' to parameter of type - 'caddr_t' (aka 'char *') [-Werror,-Wincompatible-pointer-types] - print_cfg(ec, len); - ^~ - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/racoon/eaytest.c | 4 ++-- - src/racoon/isakmp.c | 10 +++++----- - src/racoon/racoonctl.c | 7 +++---- - 3 files changed, 10 insertions(+), 11 deletions(-) - -diff --git a/src/racoon/eaytest.c b/src/racoon/eaytest.c -index 1474bdc..d609e4f 100644 ---- a/src/racoon/eaytest.c -+++ b/src/racoon/eaytest.c -@@ -313,7 +313,7 @@ certtest(ac, av) - - printf("exact match: succeed.\n"); - -- if (dnstr_w1 != NULL) { -+ if (dnstr_w1[0] != '\0') { - asn1dn = eay_str2asn1dn(dnstr_w1, strlen(dnstr_w1)); - if (asn1dn == NULL || asn1dn->l == asn1dn0.l) - errx(1, "asn1dn length wrong for wildcard 1\n"); -@@ -323,7 +323,7 @@ certtest(ac, av) - printf("wildcard 1 match: succeed.\n"); - } - -- if (dnstr_w1 != NULL) { -+ if (dnstr_w1[0] != '\0') { - asn1dn = eay_str2asn1dn(dnstr_w2, strlen(dnstr_w2)); - if (asn1dn == NULL || asn1dn->l == asn1dn0.l) - errx(1, "asn1dn length wrong for wildcard 2\n"); -diff --git a/src/racoon/isakmp.c b/src/racoon/isakmp.c -index 2672f7a..da7ebe8 100644 ---- a/src/racoon/isakmp.c -+++ b/src/racoon/isakmp.c -@@ -567,7 +567,7 @@ isakmp_main(msg, remote, local) - - /* it must be responder's 1st exchange. */ - if (isakmp_ph1begin_r(msg, remote, local, -- isakmp->etype) < 0) -+ (u_int8_t)isakmp->etype) < 0) - return -1; - break; - -@@ -1128,10 +1128,10 @@ isakmp_ph1begin_i(rmconf, remote, local) - - /* new negotiation of phase 1 for responder */ - static int --isakmp_ph1begin_r(msg, remote, local, etype) -- vchar_t *msg; -- struct sockaddr *remote, *local; -- u_int8_t etype; -+isakmp_ph1begin_r(vchar_t *msg, -+ struct sockaddr *remote, -+ struct sockaddr *local, -+ u_int8_t etype) - { - struct isakmp *isakmp = (struct isakmp *)msg->v; - struct ph1handle *iph1; -diff --git a/src/racoon/racoonctl.c b/src/racoon/racoonctl.c -index da28ecd..bbf068e 100644 ---- a/src/racoon/racoonctl.c -+++ b/src/racoon/racoonctl.c -@@ -1299,9 +1299,8 @@ print_evt(evtdump) - * Print ISAKMP mode config info (IP and banner) - */ - void --print_cfg(buf, len) -- caddr_t buf; -- int len; -+print_cfg(caddr_t buf, -+ int len) - { - struct evt_async *evtdump = (struct evt_async *)buf; - struct isakmp_data *attr; -@@ -1454,7 +1453,7 @@ handle_recv(combuf) - else if (evt_quit_event == ec->ec_type) { - switch (ec->ec_type) { - case EVT_PHASE1_MODE_CFG: -- print_cfg(ec, len); -+ print_cfg((caddr_t)ec, len); - break; - default: - print_evt(ec); --- -1.9.1 - diff --git a/meta-networking/recipes-support/ipsec-tools/ipsec-tools/0001-Fix-header-issues-found-with-musl-libc.patch b/meta-networking/recipes-support/ipsec-tools/ipsec-tools/0001-Fix-header-issues-found-with-musl-libc.patch deleted file mode 100644 index 630ecdb5f4..0000000000 --- a/meta-networking/recipes-support/ipsec-tools/ipsec-tools/0001-Fix-header-issues-found-with-musl-libc.patch +++ /dev/null @@ -1,249 +0,0 @@ -From 7d9585be093c9cb2428b373c0b0088bb778942d0 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 20 Mar 2017 21:37:47 -0700 -Subject: [PATCH] Fix header issues found with musl libc - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/libipsec/ipsec_strerror.h | 3 +++ - src/libipsec/libpfkey.h | 4 +++- - src/racoon/admin.c | 2 +- - src/racoon/backupsa.c | 6 +++--- - src/racoon/cftoken.l | 4 ++++ - src/racoon/logger.h | 3 +++ - src/racoon/misc.h | 3 +++ - src/racoon/missing/crypto/sha2/sha2.h | 3 +++ - src/racoon/netdb_dnssec.h | 3 +++ - src/racoon/pfkey.c | 1 - - src/racoon/plog.h | 2 ++ - src/racoon/str2val.h | 3 +++ - src/racoon/vmbuf.h | 3 +++ - src/setkey/extern.h | 3 ++- - src/setkey/setkey.c | 1 - - 15 files changed, 36 insertions(+), 8 deletions(-) - -diff --git a/src/libipsec/ipsec_strerror.h b/src/libipsec/ipsec_strerror.h -index 2b4264f..dac66a1 100644 ---- a/src/libipsec/ipsec_strerror.h -+++ b/src/libipsec/ipsec_strerror.h -@@ -34,6 +34,9 @@ - #ifndef _IPSEC_STRERROR_H - #define _IPSEC_STRERROR_H - -+#undef __P -+#define __P(protos) protos /* ANSI C prototypes */ -+ - extern int __ipsec_errcode; - extern void __ipsec_set_strerror __P((const char *)); - -diff --git a/src/libipsec/libpfkey.h b/src/libipsec/libpfkey.h -index 61d2f2a..f7991b7 100644 ---- a/src/libipsec/libpfkey.h -+++ b/src/libipsec/libpfkey.h -@@ -34,6 +34,9 @@ - #ifndef _LIBPFKEY_H - #define _LIBPFKEY_H - -+#undef __P -+#define __P(protos) protos /* ANSI C prototypes */ -+ - #ifndef KAME_LIBPFKEY_H - #define KAME_LIBPFKEY_H - -@@ -43,7 +46,6 @@ - - #define PRIORITY_OFFSET_POSITIVE_MAX 0x3fffffff - #define PRIORITY_OFFSET_NEGATIVE_MAX 0x40000000 -- - struct sadb_msg; - extern void pfkey_sadump __P((struct sadb_msg *)); - extern void pfkey_sadump_withports __P((struct sadb_msg *)); -diff --git a/src/racoon/admin.c b/src/racoon/admin.c -index 4b1875b..03ea3f8 100644 ---- a/src/racoon/admin.c -+++ b/src/racoon/admin.c -@@ -36,7 +36,6 @@ - #include <sys/types.h> - #include <sys/param.h> - #include <sys/socket.h> --#include <sys/signal.h> - #include <sys/stat.h> - #include <sys/un.h> - -@@ -46,6 +45,7 @@ - #include PATH_IPSEC_H - - -+#include <signal.h> - #include <stdlib.h> - #include <stdio.h> - #include <string.h> -diff --git a/src/racoon/backupsa.c b/src/racoon/backupsa.c -index 82d74ca..95307ca 100644 ---- a/src/racoon/backupsa.c -+++ b/src/racoon/backupsa.c -@@ -276,9 +276,9 @@ do { \ - GETNEXTNUM(sa_args.a_keylen, strtoul); - GETNEXTNUM(sa_args.flags, strtoul); - GETNEXTNUM(sa_args.l_alloc, strtoul); -- GETNEXTNUM(sa_args.l_bytes, strtouq); -- GETNEXTNUM(sa_args.l_addtime, strtouq); -- GETNEXTNUM(sa_args.l_usetime, strtouq); -+ GETNEXTNUM(sa_args.l_bytes, strtoull); -+ GETNEXTNUM(sa_args.l_addtime, strtoull); -+ GETNEXTNUM(sa_args.l_usetime, strtoull); - GETNEXTNUM(sa_args.seq, strtoul); - - #undef GETNEXTNUM -diff --git a/src/racoon/cftoken.l b/src/racoon/cftoken.l -index 1701922..787f4a9 100644 ---- a/src/racoon/cftoken.l -+++ b/src/racoon/cftoken.l -@@ -77,6 +77,10 @@ - - #include "cfparse.h" - -+#ifndef GLOB_TILDE -+#define GLOB_TILDE 0 -+#endif -+ - int yyerrorcount = 0; - - #if defined(YIPS_DEBUG) -diff --git a/src/racoon/logger.h b/src/racoon/logger.h -index 3fd3e94..67af5f0 100644 ---- a/src/racoon/logger.h -+++ b/src/racoon/logger.h -@@ -34,6 +34,9 @@ - #ifndef _LOGGER_H - #define _LOGGER_H - -+#undef __P -+#define __P(protos) protos /* ANSI C prototypes */ -+ - struct log { - int head; - int siz; -diff --git a/src/racoon/misc.h b/src/racoon/misc.h -index 3e758d9..30d9825 100644 ---- a/src/racoon/misc.h -+++ b/src/racoon/misc.h -@@ -34,6 +34,9 @@ - #ifndef _MISC_H - #define _MISC_H - -+#undef __P -+#define __P(protos) protos /* ANSI C prototypes */ -+ - #define BIT2STR(b) bit2str(b, sizeof(b)<<3) - - #ifdef HAVE_FUNC_MACRO -diff --git a/src/racoon/missing/crypto/sha2/sha2.h b/src/racoon/missing/crypto/sha2/sha2.h -index 42bcc2a..c043dfe 100644 ---- a/src/racoon/missing/crypto/sha2/sha2.h -+++ b/src/racoon/missing/crypto/sha2/sha2.h -@@ -40,6 +40,9 @@ - #ifndef __SHA2_H__ - #define __SHA2_H__ - -+#undef __P -+#define __P(protos) protos /* ANSI C prototypes */ -+ - #ifdef __cplusplus - extern "C" { - #endif -diff --git a/src/racoon/netdb_dnssec.h b/src/racoon/netdb_dnssec.h -index a11209d..98fd813 100644 ---- a/src/racoon/netdb_dnssec.h -+++ b/src/racoon/netdb_dnssec.h -@@ -34,6 +34,9 @@ - #ifndef _NETDB_DNSSEC_H - #define _NETDB_DNSSEC_H - -+#undef __P -+#define __P(protos) protos /* ANSI C prototypes */ -+ - #ifndef T_CERT - #define T_CERT 37 /* defined by RFC2538 section 2 */ - #endif -diff --git a/src/racoon/pfkey.c b/src/racoon/pfkey.c -index 8f26c19..a06c30e 100644 ---- a/src/racoon/pfkey.c -+++ b/src/racoon/pfkey.c -@@ -59,7 +59,6 @@ - #include <sys/param.h> - #include <sys/socket.h> - #include <sys/queue.h> --#include <sys/sysctl.h> - - #include <net/route.h> - #include <net/pfkeyv2.h> -diff --git a/src/racoon/plog.h b/src/racoon/plog.h -index ed43c8b..920c850 100644 ---- a/src/racoon/plog.h -+++ b/src/racoon/plog.h -@@ -34,6 +34,8 @@ - #ifndef _PLOG_H - #define _PLOG_H - -+#undef __P -+#define __P(protos) protos /* ANSI C prototypes */ - #ifdef HAVE_STDARG_H - #include <stdarg.h> - #else -diff --git a/src/racoon/str2val.h b/src/racoon/str2val.h -index 4a7cec1..d3d698e 100644 ---- a/src/racoon/str2val.h -+++ b/src/racoon/str2val.h -@@ -34,6 +34,9 @@ - #ifndef _STR2VAL_H - #define _STR2VAL_H - -+#undef __P -+#define __P(protos) protos /* ANSI C prototypes */ -+ - extern caddr_t val2str __P((const char *, size_t)); - extern char *str2val __P((const char *, int, size_t *)); - -diff --git a/src/racoon/vmbuf.h b/src/racoon/vmbuf.h -index 3f2f4ea..8287a00 100644 ---- a/src/racoon/vmbuf.h -+++ b/src/racoon/vmbuf.h -@@ -34,6 +34,9 @@ - #ifndef _VMBUF_H - #define _VMBUF_H - -+#undef __P -+#define __P(protos) protos /* ANSI C prototypes */ -+ - /* - * bp v - * v v -diff --git a/src/setkey/extern.h b/src/setkey/extern.h -index 6f439fa..a1d9d14 100644 ---- a/src/setkey/extern.h -+++ b/src/setkey/extern.h -@@ -1,6 +1,7 @@ - /* $NetBSD: extern.h,v 1.5 2009/03/06 11:45:03 tteras Exp $ */ - -- -+#undef __P -+#define __P(protos) protos /* ANSI C prototypes */ - - void parse_init __P((void)); - int parse __P((FILE **)); -diff --git a/src/setkey/setkey.c b/src/setkey/setkey.c -index c400faa..51f8b75 100644 ---- a/src/setkey/setkey.c -+++ b/src/setkey/setkey.c -@@ -40,7 +40,6 @@ - #include <sys/socket.h> - #include <sys/time.h> - #include <sys/stat.h> --#include <sys/sysctl.h> - #include <err.h> - #include <netinet/in.h> - #include <net/pfkeyv2.h> --- -2.12.0 - diff --git a/meta-networking/recipes-support/ipsec-tools/ipsec-tools/0001-racoon-pfkey-avoid-potential-null-pointer-dereferenc.patch b/meta-networking/recipes-support/ipsec-tools/ipsec-tools/0001-racoon-pfkey-avoid-potential-null-pointer-dereferenc.patch deleted file mode 100644 index d5602c03db..0000000000 --- a/meta-networking/recipes-support/ipsec-tools/ipsec-tools/0001-racoon-pfkey-avoid-potential-null-pointer-dereferenc.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 738a9857be9c92ad2f70be88ccee238e3154a936 Mon Sep 17 00:00:00 2001 -From: Joe MacDonald <joe.macdonald@windriver.com> -Date: Wed, 2 Oct 2013 14:20:37 -0400 -Subject: [PATCH] racoon/pfkey: avoid potential null-pointer dereference - -Building with -Werror=maybe-uninitialized revealed that 'remote' from -pk_recvmigrate() could be used with uninitialized data in -migrate_sp_ike_addresses(). Ensure it is always at a minimum assigned -NULL. - -Upstream-Status: Pending - -Signed-off-by: Joe MacDonald <joe.macdonald@windriver.com> ---- - src/racoon/pfkey.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/racoon/pfkey.c b/src/racoon/pfkey.c -index d00b166..e0dc1db 100644 ---- a/src/racoon/pfkey.c -+++ b/src/racoon/pfkey.c -@@ -3352,7 +3352,7 @@ pk_recvmigrate(mhp) - struct sockaddr *old_saddr, *new_saddr; - struct sockaddr *old_daddr, *new_daddr; - struct sockaddr *old_local, *old_remote; -- struct sockaddr *local, *remote; -+ struct sockaddr *local, *remote = NULL; - struct sadb_x_kmaddress *kmaddr; - struct sadb_x_policy *xpl; - struct sadb_x_ipsecrequest *xisr_list; --- -1.7.9.5 - diff --git a/meta-networking/recipes-support/ipsec-tools/ipsec-tools/0002-Don-t-link-against-libfl.patch b/meta-networking/recipes-support/ipsec-tools/ipsec-tools/0002-Don-t-link-against-libfl.patch deleted file mode 100644 index 13e9d73fc4..0000000000 --- a/meta-networking/recipes-support/ipsec-tools/ipsec-tools/0002-Don-t-link-against-libfl.patch +++ /dev/null @@ -1,87 +0,0 @@ -From e48b9097dce7bc2bfbb9e9c542124d3b5cebab39 Mon Sep 17 00:00:00 2001 -From: Paul Barker <paul@paulbarker.me.uk> -Date: Wed, 5 Mar 2014 13:39:14 +0000 -Subject: [PATCH] Don't link against libfl - -We can remove all references to yywrap by adding "%option noyywrap" statements -to each flex source file that doesn't override yywrap. After this, we no longer -need to link against libfl and so no longer get errors about undefined -references to yylex. - -Signed-off-by: Paul Barker <paul@paulbarker.me.uk> -Upstream-status: Submitted 2014-03-11 - see http://sourceforge.net/p/ipsec-tools/mailman/ipsec-tools-devel/thread/CANyK_8ewmxGA3vBVJW6s1APXPmxPR%2BDFWZ61EL8pCt288aKQ6w%40mail.gmail.com/#msg32088797 ---- - src/libipsec/Makefile.am | 1 - - src/racoon/Makefile.am | 2 +- - src/racoon/cftoken.l | 2 ++ - src/setkey/Makefile.am | 1 - - src/setkey/token.l | 2 ++ - 5 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/src/libipsec/Makefile.am b/src/libipsec/Makefile.am -index 6a4e3b3..df1e106 100644 ---- a/src/libipsec/Makefile.am -+++ b/src/libipsec/Makefile.am -@@ -26,7 +26,6 @@ libipsec_la_SOURCES = \ - # version is current:revision:age. - # See: http://www.gnu.org/manual/libtool-1.4.2/html_chapter/libtool_6.html#SEC32 - libipsec_la_LDFLAGS = -version-info 0:1:0 --libipsec_la_LIBADD = $(LEXLIB) - - noinst_HEADERS = ipsec_strerror.h - -diff --git a/src/racoon/Makefile.am b/src/racoon/Makefile.am -index dbaded9..0662957 100644 ---- a/src/racoon/Makefile.am -+++ b/src/racoon/Makefile.am -@@ -38,7 +38,7 @@ racoon_SOURCES = \ - cftoken.l cfparse.y prsa_tok.l prsa_par.y - EXTRA_racoon_SOURCES = isakmp_xauth.c isakmp_cfg.c isakmp_unity.c throttle.c \ - isakmp_frag.c nattraversal.c security.c $(MISSING_ALGOS) --racoon_LDADD = $(CRYPTOBJS) $(HYBRID_OBJS) $(NATT_OBJS) $(FRAG_OBJS) $(LEXLIB) \ -+racoon_LDADD = $(CRYPTOBJS) $(HYBRID_OBJS) $(NATT_OBJS) $(FRAG_OBJS) \ - $(SECCTX_OBJS) vmbuf.o sockmisc.o misc.o ../libipsec/libipsec.la - racoon_DEPENDENCIES = \ - $(CRYPTOBJS) $(HYBRID_OBJS) $(NATT_OBJS) $(FRAG_OBJS) $(SECCTX_OBJS) \ -diff --git a/src/racoon/cftoken.l b/src/racoon/cftoken.l -index 490242c..1701922 100644 ---- a/src/racoon/cftoken.l -+++ b/src/racoon/cftoken.l -@@ -106,6 +106,8 @@ static int incstackp = 0; - static int yy_first_time = 1; - %} - -+%option noyywrap -+ - /* common seciton */ - nl \n - ws [ \t]+ -diff --git a/src/setkey/Makefile.am b/src/setkey/Makefile.am -index 746c1f1..389e6cf 100644 ---- a/src/setkey/Makefile.am -+++ b/src/setkey/Makefile.am -@@ -13,7 +13,6 @@ setkey_SOURCES = \ - - setkey_LDFLAGS = ../libipsec/libipsec.la - setkey_DEPENDENCIES = ../libipsec/libipsec.la --setkey_LDADD = $(LEXLIB) - - noinst_HEADERS = vchar.h extern.h - man8_MANS = setkey.8 -diff --git a/src/setkey/token.l b/src/setkey/token.l -index ad3d843..eb23b76 100644 ---- a/src/setkey/token.l -+++ b/src/setkey/token.l -@@ -88,6 +88,8 @@ - #endif - %} - -+%option noyywrap -+ - /* common section */ - nl \n - ws [ \t]+ --- -1.9.0 - diff --git a/meta-networking/recipes-support/ipsec-tools/ipsec-tools/0002-cfparse-clear-memory-equal-to-size-of-array.patch b/meta-networking/recipes-support/ipsec-tools/ipsec-tools/0002-cfparse-clear-memory-equal-to-size-of-array.patch deleted file mode 100644 index e9dd84aaa9..0000000000 --- a/meta-networking/recipes-support/ipsec-tools/ipsec-tools/0002-cfparse-clear-memory-equal-to-size-of-array.patch +++ /dev/null @@ -1,30 +0,0 @@ -From a5c59f6a1479947d33dba5191724cc5fc88a614b Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 22 Apr 2017 10:39:57 -0700 -Subject: [PATCH 2/2] cfparse: clear memory equal to size of array - -Fixes compiler error -cfparse.y: In function 'set_isakmp_proposal': -cfparse.y:2567:3: error: 'memset' used with length equal to number of elements without multiplication by element size [-Werror=memset-elt-size] - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/racoon/cfparse.y | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/racoon/cfparse.y b/src/racoon/cfparse.y -index 0d9bd67..5d9c67b 100644 ---- a/src/racoon/cfparse.y -+++ b/src/racoon/cfparse.y -@@ -2564,7 +2564,7 @@ set_isakmp_proposal(rmconf) - plog(LLV_DEBUG2, LOCATION, NULL, - "encklen=%d\n", s->encklen); - -- memset(types, 0, ARRAYLEN(types)); -+ memset(types, 0, sizeof(types)); - types[algclass_isakmp_enc] = s->algclass[algclass_isakmp_enc]; - types[algclass_isakmp_hash] = s->algclass[algclass_isakmp_hash]; - types[algclass_isakmp_dh] = s->algclass[algclass_isakmp_dh]; --- -2.12.2 - diff --git a/meta-networking/recipes-support/ipsec-tools/ipsec-tools/configure.patch b/meta-networking/recipes-support/ipsec-tools/ipsec-tools/configure.patch deleted file mode 100644 index 8d270a62b9..0000000000 --- a/meta-networking/recipes-support/ipsec-tools/ipsec-tools/configure.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: ipsec-tools-0.8.1/configure.ac -=================================================================== ---- ipsec-tools-0.8.1.orig/configure.ac 2013-01-08 12:43:29.000000000 +0000 -+++ ipsec-tools-0.8.1/configure.ac 2014-07-18 07:51:30.045555880 +0000 -@@ -6,7 +6,7 @@ - AC_CONFIG_SRCDIR([configure.ac]) - AC_CONFIG_HEADERS(config.h) - --AM_INIT_AUTOMAKE(dist-bzip2) -+AM_INIT_AUTOMAKE([foreign dist-bzip2]) - - AC_ENABLE_SHARED(no) - diff --git a/meta-networking/recipes-support/ipsec-tools/ipsec-tools/fix-CVE-2015-4047.patch b/meta-networking/recipes-support/ipsec-tools/ipsec-tools/fix-CVE-2015-4047.patch deleted file mode 100644 index 5286376ac6..0000000000 --- a/meta-networking/recipes-support/ipsec-tools/ipsec-tools/fix-CVE-2015-4047.patch +++ /dev/null @@ -1,36 +0,0 @@ -[PATCH] fix CVE-2015-4047 - -Upstream-Status: Backport - -http://www.openwall.com/lists/oss-security/2015/05/20/1 - -racoon/gssapi.c in IPsec-Tools 0.8.2 allows remote attackers to cause -a denial of service (NULL pointer dereference and IKE daemon crash) via -a series of crafted UDP requests. - -https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2015-4047 - -Signed-off-by: Roy Li <rongqing.li@windriver.com> ---- - src/racoon/gssapi.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/racoon/gssapi.c b/src/racoon/gssapi.c -index e64b201..1ad3b42 100644 ---- a/src/racoon/gssapi.c -+++ b/src/racoon/gssapi.c -@@ -192,6 +192,11 @@ gssapi_init(struct ph1handle *iph1) - gss_name_t princ, canon_princ; - OM_uint32 maj_stat, min_stat; - -+ if (iph1->rmconf == NULL) { -+ plog(LLV_ERROR, LOCATION, NULL, "no remote config\n"); -+ return -1; -+ } -+ - gps = racoon_calloc(1, sizeof (struct gssapi_ph1_state)); - if (gps == NULL) { - plog(LLV_ERROR, LOCATION, NULL, "racoon_calloc failed\n"); --- -1.9.1 - diff --git a/meta-networking/recipes-support/ipsec-tools/ipsec-tools/fix-CVE-2016-10396.patch b/meta-networking/recipes-support/ipsec-tools/ipsec-tools/fix-CVE-2016-10396.patch deleted file mode 100644 index bd07965543..0000000000 --- a/meta-networking/recipes-support/ipsec-tools/ipsec-tools/fix-CVE-2016-10396.patch +++ /dev/null @@ -1,207 +0,0 @@ -Upstream-Status: Backport [https://anonscm.debian.org/cgit/pkg-ipsec-tools/pkg-ipsec-tools.git/plain/debian/patches/CVE-2016-10396.patch?id=62ac12648a4eb7c5ba5dba0f81998d1acf310d8b] - -Fix CVE-2016-10396. - -Signed-off-by: Kai Kang <kai.kang@windriver.com> ---- -Description: Fix remotely exploitable DoS. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-10396 -Source: vendor; https://gnats.netbsd.org/cgi-bin/query-pr-single.pl?number=51682 -Bug-debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=867986 - -Index: pkg-ipsec-tools/src/racoon/isakmp_frag.c -=================================================================== ---- pkg-ipsec-tools.orig/src/racoon/isakmp_frag.c -+++ pkg-ipsec-tools/src/racoon/isakmp_frag.c -@@ -1,4 +1,4 @@ --/* $NetBSD: isakmp_frag.c,v 1.5 2009/04/22 11:24:20 tteras Exp $ */ -+/* $NetBSD: isakmp_frag.c,v 1.5.36.1 2017/04/21 16:50:42 bouyer Exp $ */ - - /* Id: isakmp_frag.c,v 1.4 2004/11/13 17:31:36 manubsd Exp */ - -@@ -173,6 +173,43 @@ vendorid_frag_cap(gen) - return ntohl(hp[MD5_DIGEST_LENGTH / sizeof(*hp)]); - } - -+static int -+isakmp_frag_insert(struct ph1handle *iph1, struct isakmp_frag_item *item) -+{ -+ struct isakmp_frag_item *pitem = NULL; -+ struct isakmp_frag_item *citem = iph1->frag_chain; -+ -+ /* no frag yet, just insert at beginning of list */ -+ if (iph1->frag_chain == NULL) { -+ iph1->frag_chain = item; -+ return 0; -+ } -+ -+ do { -+ /* duplicate fragment number, abort (CVE-2016-10396) */ -+ if (citem->frag_num == item->frag_num) -+ return -1; -+ -+ /* need to insert before current item */ -+ if (citem->frag_num > item->frag_num) { -+ if (pitem != NULL) -+ pitem->frag_next = item; -+ else -+ /* insert at the beginning of the list */ -+ iph1->frag_chain = item; -+ item->frag_next = citem; -+ return 0; -+ } -+ -+ pitem = citem; -+ citem = citem->frag_next; -+ } while (citem != NULL); -+ -+ /* we reached the end of the list, insert */ -+ pitem->frag_next = item; -+ return 0; -+} -+ - int - isakmp_frag_extract(iph1, msg) - struct ph1handle *iph1; -@@ -224,39 +261,43 @@ isakmp_frag_extract(iph1, msg) - item->frag_next = NULL; - item->frag_packet = buf; - -- /* Look for the last frag while inserting the new item in the chain */ -- if (item->frag_last) -- last_frag = item->frag_num; -+ /* Check for the last frag before inserting the new item in the chain */ -+ if (item->frag_last) { -+ /* if we have the last fragment, indices must match */ -+ if (iph1->frag_last_index != 0 && -+ item->frag_last != iph1->frag_last_index) { -+ plog(LLV_ERROR, LOCATION, NULL, -+ "Repeated last fragment index mismatch\n"); -+ racoon_free(item); -+ vfree(buf); -+ return -1; -+ } - -- if (iph1->frag_chain == NULL) { -- iph1->frag_chain = item; -- } else { -- struct isakmp_frag_item *current; -+ last_frag = iph1->frag_last_index = item->frag_num; -+ } - -- current = iph1->frag_chain; -- while (current->frag_next) { -- if (current->frag_last) -- last_frag = item->frag_num; -- current = current->frag_next; -- } -- current->frag_next = item; -+ /* insert fragment into chain */ -+ if (isakmp_frag_insert(iph1, item) == -1) { -+ plog(LLV_ERROR, LOCATION, NULL, -+ "Repeated fragment index mismatch\n"); -+ racoon_free(item); -+ vfree(buf); -+ return -1; - } - -- /* If we saw the last frag, check if the chain is complete */ -+ /* If we saw the last frag, check if the chain is complete -+ * we have a sorted list now, so just walk through */ - if (last_frag != 0) { -+ item = iph1->frag_chain; - for (i = 1; i <= last_frag; i++) { -- item = iph1->frag_chain; -- do { -- if (item->frag_num == i) -- break; -- item = item->frag_next; -- } while (item != NULL); -- -+ if (item->frag_num != i) -+ break; -+ item = item->frag_next; - if (item == NULL) /* Not found */ - break; - } - -- if (item != NULL) /* It is complete */ -+ if (i > last_frag) /* It is complete */ - return 1; - } - -@@ -291,15 +332,9 @@ isakmp_frag_reassembly(iph1) - } - data = buf->v; - -+ item = iph1->frag_chain; - for (i = 1; i <= frag_count; i++) { -- item = iph1->frag_chain; -- do { -- if (item->frag_num == i) -- break; -- item = item->frag_next; -- } while (item != NULL); -- -- if (item == NULL) { -+ if (item->frag_num != i) { - plog(LLV_ERROR, LOCATION, NULL, - "Missing fragment #%d\n", i); - vfree(buf); -@@ -308,6 +343,7 @@ isakmp_frag_reassembly(iph1) - } - memcpy(data, item->frag_packet->v, item->frag_packet->l); - data += item->frag_packet->l; -+ item = item->frag_next; - } - - out: -Index: pkg-ipsec-tools/src/racoon/isakmp_inf.c -=================================================================== ---- pkg-ipsec-tools.orig/src/racoon/isakmp_inf.c -+++ pkg-ipsec-tools/src/racoon/isakmp_inf.c -@@ -720,6 +720,7 @@ isakmp_info_send_nx(isakmp, remote, loca - #endif - #ifdef ENABLE_FRAG - iph1->frag = 0; -+ iph1->frag_last_index = 0; - iph1->frag_chain = NULL; - #endif - -Index: pkg-ipsec-tools/src/racoon/isakmp.c -=================================================================== ---- pkg-ipsec-tools.orig/src/racoon/isakmp.c -+++ pkg-ipsec-tools/src/racoon/isakmp.c -@@ -1072,6 +1072,7 @@ isakmp_ph1begin_i(rmconf, remote, local) - iph1->frag = 1; - else - iph1->frag = 0; -+ iph1->frag_last_index = 0; - iph1->frag_chain = NULL; - #endif - iph1->approval = NULL; -@@ -1176,6 +1177,7 @@ isakmp_ph1begin_r(msg, remote, local, et - #endif - #ifdef ENABLE_FRAG - iph1->frag = 0; -+ iph1->frag_last_index = 0; - iph1->frag_chain = NULL; - #endif - iph1->approval = NULL; -Index: pkg-ipsec-tools/src/racoon/handler.h -=================================================================== ---- pkg-ipsec-tools.orig/src/racoon/handler.h -+++ pkg-ipsec-tools/src/racoon/handler.h -@@ -1,4 +1,4 @@ --/* $NetBSD: handler.h,v 1.25 2010/11/17 10:40:41 tteras Exp $ */ -+/* $NetBSD: handler.h,v 1.26 2017/01/24 19:23:56 christos Exp $ */ - - /* Id: handler.h,v 1.19 2006/02/25 08:25:12 manubsd Exp */ - -@@ -141,6 +141,7 @@ struct ph1handle { - #endif - #ifdef ENABLE_FRAG - int frag; /* IKE phase 1 fragmentation */ -+ int frag_last_index; - struct isakmp_frag_item *frag_chain; /* Received fragments */ - #endif - diff --git a/meta-networking/recipes-support/ipsec-tools/ipsec-tools/glibc-2.20.patch b/meta-networking/recipes-support/ipsec-tools/ipsec-tools/glibc-2.20.patch deleted file mode 100644 index 36efc49179..0000000000 --- a/meta-networking/recipes-support/ipsec-tools/ipsec-tools/glibc-2.20.patch +++ /dev/null @@ -1,23 +0,0 @@ -squahes below warning - warning: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" - -Seen with glibc 2.20 - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Pending -Index: ipsec-tools-0.8.2/src/include-glibc/glibc-bugs.h -=================================================================== ---- ipsec-tools-0.8.2.orig/src/include-glibc/glibc-bugs.h 2006-09-09 09:22:08.000000000 -0700 -+++ ipsec-tools-0.8.2/src/include-glibc/glibc-bugs.h 2014-09-03 22:27:22.551563888 -0700 -@@ -4,7 +4,11 @@ - #define __GLIBC_BUGS_H__ 1 - - #define _XOPEN_SOURCE 500 -+/* Legacy feature macro.*/ - #define _BSD_SOURCE -+/* New feature macro that provides everything _BSD_SOURCE and -+ * _SVID_SOURCE provided and possibly more. */ -+#define _DEFAULT_SOURCE - - #include <features.h> - #include <sys/types.h> diff --git a/meta-networking/recipes-support/ipsec-tools/ipsec-tools/racoon-Resend-UPDATE-message-when-received-EINTR-message.patch b/meta-networking/recipes-support/ipsec-tools/ipsec-tools/racoon-Resend-UPDATE-message-when-received-EINTR-message.patch deleted file mode 100644 index e82db087c5..0000000000 --- a/meta-networking/recipes-support/ipsec-tools/ipsec-tools/racoon-Resend-UPDATE-message-when-received-EINTR-message.patch +++ /dev/null @@ -1,220 +0,0 @@ -racoon: Resend UPDATE message when received EINTR message - -Upstream-Status: Pending - -While kernel is processing the UPDATE message which is sent from racoon, -it maybe interrupted by system signal and if this case happens, -kernel responds with an EINTR message to racoon and kernel fails to -establish the corresponding SA. -Fix this problem by resend the UPDATE message when EINTR(Interrupted -system call) error happens. - -Signed-off-by: Xufeng Zhang <xufeng.zhang@windriver.com> ---- ---- a/src/libipsec/libpfkey.h -+++ b/src/libipsec/libpfkey.h -@@ -92,6 +92,12 @@ - u_int16_t ctxstrlen; /* length of security context string */ - }; - -+struct update_msg_info { -+ struct sadb_msg *update_msg; -+ int so; -+ int len; -+}; -+ - /* The options built into libipsec */ - extern int libipsec_opt; - #define LIBIPSEC_OPT_NATT 0x01 ---- a/src/libipsec/pfkey.c -+++ b/src/libipsec/pfkey.c -@@ -1219,7 +1219,8 @@ - } - #endif - -- -+struct update_msg_info update_msg_send = {NULL, 0, 0}; -+ - /* sending SADB_ADD or SADB_UPDATE message to the kernel */ - static int - pfkey_send_x1(struct pfkey_send_sa_args *sa_parms) -@@ -1483,10 +1484,24 @@ - - /* send message */ - len = pfkey_send(sa_parms->so, newmsg, len); -- free(newmsg); - -- if (len < 0) -- return -1; -+ if (newmsg->sadb_msg_type == SADB_UPDATE) { -+ if (update_msg_send.update_msg) -+ free(update_msg_send.update_msg); -+ update_msg_send.update_msg = newmsg; -+ update_msg_send.so = sa_parms->so; -+ update_msg_send.len = len; -+ -+ if (len < 0) { -+ free(update_msg_send.update_msg); -+ update_msg_send.update_msg = NULL; -+ return -1; -+ } -+ } else { -+ free(newmsg); -+ if (len < 0) -+ return -1; -+ } - - __ipsec_errcode = EIPSEC_NO_ERROR; - return len; ---- a/src/racoon/session.c -+++ b/src/racoon/session.c -@@ -100,6 +100,8 @@ - - #include "sainfo.h" - -+extern struct update_msg_info update_msg_send; -+ - struct fd_monitor { - int (*callback)(void *ctx, int fd); - void *ctx; -@@ -348,6 +350,11 @@ - close_sockets(); - backupsa_clean(); - -+ if (update_msg_send.update_msg) { -+ free(update_msg_send.update_msg); -+ update_msg_send.update_msg = NULL; -+ } -+ - plog(LLV_INFO, LOCATION, NULL, "racoon process %d shutdown\n", getpid()); - - exit(0); ---- a/src/racoon/pfkey.c -+++ b/src/racoon/pfkey.c -@@ -103,10 +103,12 @@ - #include "crypto_openssl.h" - #include "grabmyaddr.h" -+#include "../libipsec/libpfkey.h" - - #if defined(SADB_X_EALG_RIJNDAELCBC) && !defined(SADB_X_EALG_AESCBC) - #define SADB_X_EALG_AESCBC SADB_X_EALG_RIJNDAELCBC - #endif - -+extern struct update_msg_info update_msg_send; - /* prototype */ - static u_int ipsecdoi2pfkey_aalg __P((u_int)); - static u_int ipsecdoi2pfkey_ealg __P((u_int)); -@@ -253,6 +255,13 @@ - s_pfkey_type(msg->sadb_msg_type), - strerror(msg->sadb_msg_errno)); - -+ if (msg->sadb_msg_errno == EINTR && -+ update_msg_send.update_msg) { -+ plog(LLV_DEBUG, LOCATION, NULL, -+ "pfkey update resend\n"); -+ send(update_msg_send.so, (void *)update_msg_send.update_msg, (socklen_t)update_msg_send.len, 0); -+ } -+ - goto end; - } - -@@ -498,6 +507,11 @@ - { - flushsp(); - -+ if (update_msg_send.update_msg) { -+ free(update_msg_send.update_msg); -+ update_msg_send.update_msg = NULL; -+ } -+ - if (pfkey_send_spddump(lcconf->sock_pfkey) < 0) { - plog(LLV_ERROR, LOCATION, NULL, - "libipsec sending spddump failed: %s\n", -@@ -1295,6 +1309,8 @@ - return 0; - } - -+int update_received = 0; -+ - static int - pk_recvupdate(mhp) - caddr_t *mhp; -@@ -1307,6 +1323,13 @@ - int incomplete = 0; - struct saproto *pr; - -+ update_received = 1; -+ -+ if (update_msg_send.update_msg) { -+ free(update_msg_send.update_msg); -+ update_msg_send.update_msg = NULL; -+ } -+ - /* ignore this message because of local test mode. */ - if (f_local) - return 0; -@@ -4163,3 +4186,8 @@ - - return buf; - } -+ -+int receive_from_isakmp() -+{ -+ return pfkey_handler(NULL, lcconf->sock_pfkey); -+} ---- a/src/racoon/pfkey.h -+++ b/src/racoon/pfkey.h -@@ -71,5 +71,6 @@ - extern u_int32_t pk_getseq __P((void)); - extern const char *sadbsecas2str - __P((struct sockaddr *, struct sockaddr *, int, u_int32_t, int)); -+extern int receive_from_isakmp __P((void)); - - #endif /* _PFKEY_H */ ---- a/src/racoon/isakmp_quick.c -+++ b/src/racoon/isakmp_quick.c -@@ -774,6 +774,8 @@ - return error; - } - -+extern int update_received; -+ - /* - * send to responder - * HDR*, HASH(3) -@@ -892,6 +894,11 @@ - } - plog(LLV_DEBUG, LOCATION, NULL, "pfkey update sent.\n"); - -+ while (!update_received) -+ receive_from_isakmp(); -+ -+ update_received = 0; -+ - /* Do ADD for responder */ - if (pk_sendadd(iph2) < 0) { - plog(LLV_ERROR, LOCATION, NULL, "pfkey add failed.\n"); -@@ -1035,6 +1042,11 @@ - } - plog(LLV_DEBUG, LOCATION, NULL, "pfkey update sent.\n"); - -+ while (!update_received) -+ receive_from_isakmp(); -+ -+ update_received = 0; -+ - /* Do ADD for responder */ - if (pk_sendadd(iph2) < 0) { - plog(LLV_ERROR, LOCATION, NULL, "pfkey add failed.\n"); -@@ -1989,6 +2001,11 @@ - } - plog(LLV_DEBUG, LOCATION, NULL, "pfkey update sent.\n"); - -+ while (!update_received) -+ receive_from_isakmp(); -+ -+ update_received = 0; -+ - /* Do ADD for responder */ - if (pk_sendadd(iph2) < 0) { - plog(LLV_ERROR, LOCATION, NULL, "pfkey add failed.\n"); diff --git a/meta-networking/recipes-support/ipsec-tools/ipsec-tools/racoon-check-invalid-ivm.patch b/meta-networking/recipes-support/ipsec-tools/ipsec-tools/racoon-check-invalid-ivm.patch deleted file mode 100644 index e272bc20fa..0000000000 --- a/meta-networking/recipes-support/ipsec-tools/ipsec-tools/racoon-check-invalid-ivm.patch +++ /dev/null @@ -1,26 +0,0 @@ -Subject: [PATCH] ipsec-tools: racoon: check several invalid ivm - -Upstream-Status: Pending - -Add checking for invalid ivm, or it will crash racoon. - -Signed-off-by: Ming Liu <ming.liu@windriver.com> ---- - isakmp_cfg.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff -urpN a/src/racoon/isakmp_cfg.c b/src/racoon/isakmp_cfg.c ---- a/src/racoon/isakmp_cfg.c -+++ b/src/racoon/isakmp_cfg.c -@@ -171,6 +171,11 @@ isakmp_cfg_r(iph1, msg) - iph1->mode_cfg->last_msgid != packet->msgid ) - iph1->mode_cfg->ivm = - isakmp_cfg_newiv(iph1, packet->msgid); -+ if(iph1->mode_cfg->ivm == NULL) { -+ plog(LLV_ERROR, LOCATION, NULL, -+ "failed to create new IV\n"); -+ return; -+ } - ivm = iph1->mode_cfg->ivm; - - dmsg = oakley_do_decrypt(iph1, msg, ivm->iv, ivm->ive); diff --git a/meta-networking/recipes-support/ipsec-tools/ipsec-tools/racoon-check-invalid-pointers.patch b/meta-networking/recipes-support/ipsec-tools/ipsec-tools/racoon-check-invalid-pointers.patch deleted file mode 100644 index de1bdb4077..0000000000 --- a/meta-networking/recipes-support/ipsec-tools/ipsec-tools/racoon-check-invalid-pointers.patch +++ /dev/null @@ -1,61 +0,0 @@ -Subject: [PATCH] ipsec-tools: racoon: check several invalid pointers - -Upstream-Status: Pending - -Add checking for invalid pointers, or it will crash racoon. - -Signed-off-by: Ming Liu <ming.liu@windriver.com> ---- - ipsec_doi.c | 5 +++-- - isakmp_cfg.c | 7 +++++++ - isakmp_quick.c | 6 ++++-- - 3 files changed, 14 insertions(+), 4 deletions(-) - -diff -urpN a/src/racoon/ipsec_doi.c b/src/racoon/ipsec_doi.c ---- a/src/racoon/ipsec_doi.c -+++ b/src/racoon/ipsec_doi.c -@@ -3374,8 +3374,9 @@ ipsecdoi_chkcmpids( idt, ids, exact ) - - /* handle wildcard IDs */ - -- if (idt == NULL || ids == NULL) -- { -+ if (idt == NULL || ids == NULL || -+ idt->v == NULL || idt->l == 0 || -+ ids->v == NULL || ids->l == 0) { - if( !exact ) - { - plog(LLV_DEBUG, LOCATION, NULL, -diff -urpN a/src/racoon/isakmp_cfg.c b/src/racoon/isakmp_cfg.c ---- a/src/racoon/isakmp_cfg.c -+++ b/src/racoon/isakmp_cfg.c -@@ -1138,6 +1138,13 @@ isakmp_cfg_newiv(iph1, msgid) - return NULL; - } - -+ if (iph1->ivm == NULL || iph1->ivm->iv == NULL || -+ iph1->ivm->iv->v == NULL || iph1->ivm->iv->l == 0) { -+ plog(LLV_ERROR, LOCATION, NULL, -+ "isakmp_cfg_newiv called with invalid IV management\n"); -+ return NULL; -+ } -+ - if (ics->ivm != NULL) - oakley_delivm(ics->ivm); - -diff -urpN a/src/racoon/isakmp_quick.c b/src/racoon/isakmp_quick.c ---- a/src/racoon/isakmp_quick.c -+++ b/src/racoon/isakmp_quick.c -@@ -2243,8 +2243,10 @@ get_proposal_r(iph2) - int error = ISAKMP_INTERNAL_ERROR; - - /* check the existence of ID payload */ -- if ((iph2->id_p != NULL && iph2->id == NULL) -- || (iph2->id_p == NULL && iph2->id != NULL)) { -+ if ((iph2->id_p != NULL && -+ (iph2->id == NULL || iph2->id->v == NULL || iph2->id->l == 0)) || -+ (iph2->id != NULL && -+ (iph2->id_p == NULL || iph2->id_p->v == NULL || iph2->id_p->l == 0))) { - plog(LLV_ERROR, LOCATION, NULL, - "Both IDs wasn't found in payload.\n"); - return ISAKMP_NTYPE_INVALID_ID_INFORMATION; diff --git a/meta-networking/recipes-support/ipsec-tools/ipsec-tools/racoon.conf b/meta-networking/recipes-support/ipsec-tools/ipsec-tools/racoon.conf deleted file mode 100644 index 6b507508b1..0000000000 --- a/meta-networking/recipes-support/ipsec-tools/ipsec-tools/racoon.conf +++ /dev/null @@ -1,8 +0,0 @@ -# Defaults for racoon service -# sourced by racoon.service -# installed at /etc/default/racoon by the maintainer scripts -# -# This is a POSIX shell fragment -# -# Arguments to pass to racoon -RACOON_ARGS="" diff --git a/meta-networking/recipes-support/ipsec-tools/ipsec-tools/racoon.conf.sample b/meta-networking/recipes-support/ipsec-tools/ipsec-tools/racoon.conf.sample deleted file mode 100644 index 2948a4a35b..0000000000 --- a/meta-networking/recipes-support/ipsec-tools/ipsec-tools/racoon.conf.sample +++ /dev/null @@ -1,40 +0,0 @@ -# -# NOTE: This file will not be used if you use racoon-tool(8) to manage your -# IPsec connections. racoon-tool will process racoon-tool.conf(5) and -# generate a configuration (/var/lib/racoon/racoon.conf) and use it, instead -# of this file. -# -# Simple racoon.conf -# -# -# Please look in /usr/share/doc/racoon/examples for -# examples that come with the source. -# -# Please read racoon.conf(5) for details, and alsoread setkey(8). -# -# -# Also read the Linux IPSEC Howto up at -# http://www.ipsec-howto.org/t1.html -# -log notify; -path pre_shared_key "/etc/racoon/psk.txt"; -path certificate "/etc/racoon/certs"; - -#remote 172.31.1.1 { -# exchange_mode main,aggressive; -# proposal { -# encryption_algorithm 3des; -# hash_algorithm sha1; -# authentication_method pre_shared_key; -# dh_group modp1024; -# } -# generate_policy off; -#} -# -#sainfo address 192.168.203.10[any] any address 192.168.22.0/24[any] any { -# pfs_group modp768; -# encryption_algorithm 3des; -# authentication_algorithm hmac_md5; -# compression_algorithm deflate; -#} - diff --git a/meta-networking/recipes-support/ipsec-tools/ipsec-tools/racoon.service b/meta-networking/recipes-support/ipsec-tools/ipsec-tools/racoon.service deleted file mode 100644 index a10e770279..0000000000 --- a/meta-networking/recipes-support/ipsec-tools/ipsec-tools/racoon.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Racoon IKEv1 key management daemon for IPSEC -After=syslog.target network.target - -[Service] -Type=forking -EnvironmentFile=-@SYSCONFDIR@/default/racoon -ExecStart=@SBINDIR@/racoon $RACOON_ARGS - -[Install] -WantedBy=multi-user.target diff --git a/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.2.bb b/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.2.bb deleted file mode 100644 index 5cbeb15ad5..0000000000 --- a/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.2.bb +++ /dev/null @@ -1,96 +0,0 @@ -DESCRIPTION = "IPsec-Tools is a port of KAME's IPsec utilities to the \ -Linux-2.6 IPsec implementation." -HOMEPAGE = "http://ipsec-tools.sourceforge.net/" -SECTION = "net" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://src/libipsec/pfkey.c;beginline=6;endline=31;md5=bc9b7ff40beff19fe6bc6aef26bd2b24" - -DEPENDS = "virtual/kernel openssl readline flex-native bison-native" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -SRC_URI = "http://ftp.netbsd.org/pub/NetBSD/misc/ipsec-tools/0.8/ipsec-tools-${PV}.tar.bz2 \ - file://0002-Don-t-link-against-libfl.patch \ - file://configure.patch \ - file://0001-racoon-pfkey-avoid-potential-null-pointer-dereferenc.patch \ - file://racoon-check-invalid-pointers.patch \ - file://racoon-check-invalid-ivm.patch \ - file://glibc-2.20.patch \ - file://racoon-Resend-UPDATE-message-when-received-EINTR-message.patch \ - file://racoon.conf.sample \ - file://racoon.conf \ - file://racoon.service \ - file://fix-CVE-2015-4047.patch \ - file://0001-Fix-build-with-clang.patch \ - file://0001-Fix-header-issues-found-with-musl-libc.patch \ - file://0002-cfparse-clear-memory-equal-to-size-of-array.patch \ - file://fix-CVE-2016-10396.patch \ - " -SRC_URI[md5sum] = "d53ec14a0a3ece64e09e5e34b3350b41" -SRC_URI[sha256sum] = "8eb6b38716e2f3a8a72f1f549c9444c2bc28d52c9536792690564c74fe722f2d" - -inherit autotools systemd - -# Options: -# --enable-adminport enable admin port -# --enable-rc5 enable RC5 encryption (patented) -# --enable-idea enable IDEA encryption (patented) -# --enable-gssapi enable GSS-API authentication -# --enable-hybrid enable hybrid, both mode-cfg and xauth support -# --enable-frag enable IKE fragmentation payload support -# --enable-stats enable statistics logging function -# --enable-dpd enable dead peer detection -# --enable-samode-unspec enable to use unspecified a mode of SA -# --disable-ipv6 disable ipv6 support -# --enable-natt enable NAT-Traversal (yes/no/kernel) -# --enable-natt-versions=list list of supported NAT-T versions delimited by coma. -# --with-kernel-headers=/lib/modules/<uname>/build/include -# where your Linux Kernel headers are installed -# --with-readline support readline input (yes by default) -# --with-flex use directiory (default: no) -# --with-flexlib=<LIB> specify flex library. -# --with-openssl=DIR specify OpenSSL directory -# --with-libradius=DIR specify libradius path (like/usr/pkg) -# --with-libpam=DIR specify libpam path (like/usr/pkg) -# -# Note: if you give it the actual kernel headers it won't build, it actually -# needs to point at the linux-libc-headers version of the kernel headers. -# -EXTRA_OECONF = "--with-kernel-headers=${STAGING_INCDIR} \ - --with-readline \ - --with-openssl=${STAGING_LIBDIR}/.. \ - --without-libradius \ - --disable-security-context \ - --enable-shared \ - --enable-dpd \ - --enable-natt=yes \ - --sysconfdir=${sysconfdir}/racoon \ - ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '--enable-ipv6=yes', '', d)}" - -# See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=530527 -CFLAGS += "-fno-strict-aliasing" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[pam] = "--with-libpam,--without-libpam,libpam," -PACKAGECONFIG[selinux] = "--enable-security-context,--disable-security-context,libselinux," - -SYSTEMD_SERVICE_${PN} = "racoon.service" - -do_install_append() { - install -d ${D}${sysconfdir}/racoon - install -m 0644 ${WORKDIR}/racoon.conf.sample ${D}${sysconfdir}/racoon/racoon.conf - - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/racoon.service ${D}${systemd_unitdir}/system - - sed -i -e 's#@SYSCONFDIR@#${sysconfdir}#g' ${D}${systemd_unitdir}/system/racoon.service - sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/racoon.service - - install -d ${D}${sysconfdir}/default/ - install -m 0644 ${WORKDIR}/racoon.conf ${D}${sysconfdir}/default/racoon - fi -} - -FILES_${PN} += "${sysconfdir}/racoon/racoon.conf \ - ${sysconfdir}/default/racoon" diff --git a/meta-networking/recipes-support/ipvsadm/ipvsadm/0001-Add-CCFLAGS-to-cflags.patch b/meta-networking/recipes-support/ipvsadm/ipvsadm/0001-Add-CCFLAGS-to-cflags.patch new file mode 100644 index 0000000000..a2923088e8 --- /dev/null +++ b/meta-networking/recipes-support/ipvsadm/ipvsadm/0001-Add-CCFLAGS-to-cflags.patch @@ -0,0 +1,36 @@ +From 1bc180ec333d90e1a11deff46b5639ab5d40408d Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 26 May 2023 09:29:23 -0700 +Subject: [PATCH] Add CCFLAGS to cflags + +This is to append the flags from build environment. + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Makefile | 1 + + libipvs/Makefile | 3 +++ + 2 files changed, 4 insertions(+) + +--- a/Makefile ++++ b/Makefile +@@ -50,6 +50,7 @@ else + CFLAGS = -Wall -Wunused -Wstrict-prototypes -g + endif + ++CFLAGS += $(CCFLAGS) + + ##################################### + # No servicable parts below this line +--- a/libipvs/Makefile ++++ b/libipvs/Makefile +@@ -1,6 +1,9 @@ + # Makefile for libipvs + + CFLAGS = -Wall -Wunused -Wstrict-prototypes -g -fPIC ++ ++CFLAGS += $(CCFLAGS) ++ + ifneq (0,$(HAVE_NL)) + CFLAGS += -DLIBIPVS_USE_NL + CFLAGS += $(shell \ diff --git a/meta-networking/recipes-support/ipvsadm/ipvsadm/0001-Modify-the-Makefile-for-cross-compile.patch b/meta-networking/recipes-support/ipvsadm/ipvsadm/0001-Modify-the-Makefile-for-cross-compile.patch index 7c3dfe4a84..d7b0267d56 100644 --- a/meta-networking/recipes-support/ipvsadm/ipvsadm/0001-Modify-the-Makefile-for-cross-compile.patch +++ b/meta-networking/recipes-support/ipvsadm/ipvsadm/0001-Modify-the-Makefile-for-cross-compile.patch @@ -1,18 +1,22 @@ -From 58292175115bae7a4c3600d3022e59ea57213025 Mon Sep 17 00:00:00 2001 -From: Jianchuan Wang <jianchuan.wang@windriver.com> -Date: Mon, 12 Jan 2015 15:53:23 +0800 +From 801224257015788d3aff026bf2ae1cd8531d4fcc Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Wed, 25 Jul 2018 13:12:04 +0800 Subject: [PATCH] Modify the Makefile for cross compile. Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Jianchuan Wang <jianchuan.wang@windriver.com> + +update to version 1.29 + +Signed-off-by: Changqing Li <changqing.li@windriver.com> --- - Makefile | 23 ++++++----------------- + Makefile | 9 ++++----- libipvs/Makefile | 3 +-- - 2 files changed, 7 insertions(+), 19 deletions(-) + 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile -index e4e03cc..461c021 100644 +index 91a2991..906086d 100644 --- a/Makefile +++ b/Makefile @@ -35,10 +35,9 @@ ARCH = $(shell uname -m) @@ -23,57 +27,29 @@ index e4e03cc..461c021 100644 INCLUDE = SBIN = $(BUILD_ROOT)/sbin -MANDIR = usr/man -+MANDIR = usr/share/man ++MANDIR = usr/share/man MAN = $(BUILD_ROOT)/$(MANDIR)/man8 INIT = $(BUILD_ROOT)/etc/rc.d/init.d MKDIR = mkdir -@@ -62,17 +61,7 @@ RPMBUILD = $(shell \ - echo "/bin/rpm"; \ - fi ) - --ifeq (,$(FORCE_GETOPT)) --LIB_SEARCH = /lib64 /usr/lib64 /usr/local/lib64 /lib /usr/lib /usr/local/lib --POPT_LIB = $(shell for i in $(LIB_SEARCH); do \ -- if [ -f $$i/libpopt.a ]; then \ -- if nm $$i/libpopt.a | fgrep -q poptGetContext; then \ -- echo "-lpopt"; \ -- break; \ -- fi; \ -- fi; \ --done) --endif -+POPT_LIB = -lpopt - - ifneq (,$(POPT_LIB)) - POPT_DEFINE = -DHAVE_POPT -@@ -81,7 +70,7 @@ endif - OBJS = ipvsadm.o config_stream.o dynamic_array.o - LIBS = $(POPT_LIB) - ifneq (0,$(HAVE_NL)) --LIBS += -lnl -+LIBS += -lnl-3 -lnl-genl-3 - endif - DEFINES = -DVERSION=\"$(VERSION)\" -DSCHEDULERS=\"$(SCHEDULERS)\" \ - -DPE_LIST=\"$(PE_LIST)\" $(POPT_DEFINE) -@@ -91,13 +80,13 @@ DEFINES += $(shell if [ ! -f ../ip_vs.h ]; then \ +@@ -81,13 +80,13 @@ DEFINES += $(shell if [ ! -f ../ip_vs.h ]; then \ .PHONY = all clean install dist distclean rpm rpms -all: libs ipvsadm -+all: ipvsadm ++all: ipvsadm libs: make -C libipvs -ipvsadm: $(OBJS) $(STATIC_LIBS) - $(CC) $(CFLAGS) -o $@ $^ $(LIBS) -+ipvsadm: $(OBJS) libs ++ipvsadm: $(OBJS) libs + $(CC) $(CFLAGS) -o $@ $(OBJS) $(STATIC_LIBS) $(LIBS) install: all if [ ! -d $(SBIN) ]; then $(MKDIR) -p $(SBIN); fi diff --git a/libipvs/Makefile b/libipvs/Makefile -index a527a7f..b7300ec 100644 +index f845c8b..dafab30 100644 --- a/libipvs/Makefile +++ b/libipvs/Makefile @@ -1,6 +1,5 @@ @@ -83,7 +59,7 @@ index a527a7f..b7300ec 100644 CFLAGS = -Wall -Wunused -Wstrict-prototypes -g -fPIC ifneq (0,$(HAVE_NL)) CFLAGS += -DLIBIPVS_USE_NL -@@ -18,7 +17,7 @@ SHARED_LIB = libipvs.so +@@ -30,7 +29,7 @@ SHARED_LIB = libipvs.so all: $(STATIC_LIB) $(SHARED_LIB) $(STATIC_LIB): libipvs.o ip_vs_nl_policy.o @@ -93,5 +69,5 @@ index a527a7f..b7300ec 100644 $(SHARED_LIB): libipvs.o ip_vs_nl_policy.o $(CC) -shared -Wl,-soname,$@ -o $@ $^ -- -1.9.1 +2.7.4 diff --git a/meta-networking/recipes-support/ipvsadm/ipvsadm/0001-libipvs-Include-missing-sys-types.h.patch b/meta-networking/recipes-support/ipvsadm/ipvsadm/0001-libipvs-Include-missing-sys-types.h.patch new file mode 100644 index 0000000000..8b08482be7 --- /dev/null +++ b/meta-networking/recipes-support/ipvsadm/ipvsadm/0001-libipvs-Include-missing-sys-types.h.patch @@ -0,0 +1,28 @@ +From 4fc59f5733d187941e9a7ce5e9ea33714d85285c Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 26 May 2023 09:30:59 -0700 +Subject: [PATCH] libipvs: Include missing sys/types.h + +Its needed for u_intXX_t types + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + libipvs/ip_vs.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libipvs/ip_vs.h b/libipvs/ip_vs.h +index 2670c23..625b6cd 100644 +--- a/libipvs/ip_vs.h ++++ b/libipvs/ip_vs.h +@@ -8,6 +8,7 @@ + + #include <netinet/in.h> + #include <sys/socket.h> ++#include <sys/types.h> + #include <arpa/inet.h> + #include <linux/types.h> /* For __beXX types in userland */ + +-- +2.40.1 + diff --git a/meta-networking/recipes-support/ipvsadm/ipvsadm/0002-Replace-nl_handle-to-nl_sock.patch b/meta-networking/recipes-support/ipvsadm/ipvsadm/0002-Replace-nl_handle-to-nl_sock.patch deleted file mode 100644 index 7896d6d1ea..0000000000 --- a/meta-networking/recipes-support/ipvsadm/ipvsadm/0002-Replace-nl_handle-to-nl_sock.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 2686213259b15df9cf1d969c5a14d62f14cfbaae Mon Sep 17 00:00:00 2001 -From: Jianchuan Wang <jianchuan.wang@windriver.com> -Date: Thu, 8 Jan 2015 17:37:11 +0800 -Subject: [PATCH 2/2] Replace nl_handle to nl_sock. - -The nl_handle was replace with nl_sock in the libnl-3. - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Jianchuan Wang <jianchuan.wang@windriver.com> ---- - libipvs/libipvs.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/libipvs/libipvs.c b/libipvs/libipvs.c -index a157e18..21a9bfa 100644 ---- a/libipvs/libipvs.c -+++ b/libipvs/libipvs.c -@@ -32,7 +32,7 @@ static void* ipvs_func = NULL; - struct ip_vs_getinfo ipvs_info; - - #ifdef LIBIPVS_USE_NL --static struct nl_handle *sock = NULL; -+static struct nl_sock *sock = NULL; - static int family, try_nl = 1; - #endif - -@@ -73,7 +73,7 @@ int ipvs_nl_send_message(struct nl_msg *msg, nl_recvmsg_msg_cb_t func, void *arg - { - int err = EINVAL; - -- sock = nl_handle_alloc(); -+ sock = nl_socket_alloc(); - if (!sock) { - nlmsg_free(msg); - return -1; -@@ -88,7 +88,7 @@ int ipvs_nl_send_message(struct nl_msg *msg, nl_recvmsg_msg_cb_t func, void *arg - - /* To test connections and set the family */ - if (msg == NULL) { -- nl_handle_destroy(sock); -+ nl_socket_free(sock); - sock = NULL; - return 0; - } -@@ -104,12 +104,12 @@ int ipvs_nl_send_message(struct nl_msg *msg, nl_recvmsg_msg_cb_t func, void *arg - - nlmsg_free(msg); - -- nl_handle_destroy(sock); -+ nl_socket_free(sock); - - return 0; - - fail_genl: -- nl_handle_destroy(sock); -+ nl_socket_free(sock); - sock = NULL; - nlmsg_free(msg); - errno = err; --- -1.8.3.1 - diff --git a/meta-networking/recipes-support/ipvsadm/ipvsadm/makefile-add-ldflags.patch b/meta-networking/recipes-support/ipvsadm/ipvsadm/makefile-add-ldflags.patch index 1bf1eed4c3..a2c5235c37 100644 --- a/meta-networking/recipes-support/ipvsadm/ipvsadm/makefile-add-ldflags.patch +++ b/meta-networking/recipes-support/ipvsadm/ipvsadm/makefile-add-ldflags.patch @@ -1,19 +1,33 @@ -Add LDFLAGS variable to Makefile, make sure the extra linker flags can be passed. +From 8aff1e965ec17262f3a5b376f7eb3e053d81905c Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Tue, 24 Jul 2018 18:18:05 +0800 +Subject: [PATCH] Add LDFLAGS variable to Makefile, make sure the extra linker + flags can be passed. Upstream-Status: Pending Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +Update to version 1.29 + +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + diff --git a/Makefile b/Makefile -index 461c021..8bc9cde 100644 +index f29bbae..81beb5a 100644 --- a/Makefile +++ b/Makefile @@ -86,7 +86,7 @@ libs: make -C libipvs - ipvsadm: $(OBJS) libs + ipvsadm: $(OBJS) libs - $(CC) $(CFLAGS) -o $@ $(OBJS) $(STATIC_LIBS) $(LIBS) + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(STATIC_LIBS) $(LIBS) install: all if [ ! -d $(SBIN) ]; then $(MKDIR) -p $(SBIN); fi +-- +2.7.4 + diff --git a/meta-networking/recipes-support/ipvsadm/ipvsadm_1.26.bb b/meta-networking/recipes-support/ipvsadm/ipvsadm_1.31.bb index b35a9f4a40..442e231ad4 100644 --- a/meta-networking/recipes-support/ipvsadm/ipvsadm_1.26.bb +++ b/meta-networking/recipes-support/ipvsadm/ipvsadm_1.31.bb @@ -11,27 +11,35 @@ methods (NAT, tunneling, and direct routing), and eight load balancing algorithm locality-based least-connection, locality-based least-connection with replication, \ destination-hashing, and source-hashing)." SECTION = "net" -LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://README;beginline=40;endline=56;md5=a54cba37b64924aa5008881607942892" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://README;beginline=40;endline=56;md5=b4e40069f15598d0e3fe2aa177e5ec77" DEPENDS += "libnl popt" -SRC_URI = "http://www.linuxvirtualserver.org/software/kernel-2.6/${BP}.tar.gz \ +SRC_URI = "https://mirrors.edge.kernel.org/pub/linux/utils/kernel/ipvsadm/${BP}.tar.xz \ file://0001-Modify-the-Makefile-for-cross-compile.patch \ - file://0002-Replace-nl_handle-to-nl_sock.patch \ file://0003-ipvsadm-remove-dependency-on-bash.patch \ file://makefile-add-ldflags.patch \ + file://0001-Add-CCFLAGS-to-cflags.patch \ + file://0001-libipvs-Include-missing-sys-types.h.patch \ " -SRC_URI[md5sum] = "eac3ba3f62cd4dea2da353aeddd353a8" -SRC_URI[sha256sum] = "6d6c46fecb1c532a892616b4445c73b71730e8790d5630f60269fd9cbee0eb2d" +SRC_URI[md5sum] = "f6d1707c5baf684b58fd33682d67871f" +SRC_URI[sha256sum] = "1a0a5e25b5a1226435d2fb76341656f83a710183aebb0d204db39c0ec3bedfdb" + +UPSTREAM_CHECK_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/ipvsadm" + +EXTRA_OEMAKE += "CCFLAGS='${CFLAGS}'" do_compile() { - oe_runmake \ - CC="${CC} -I${STAGING_INCDIR} -I${STAGING_INCDIR}/libnl3 -L${STAGING_LIBDIR}" \ - all + oe_runmake all } do_install() { + sed -i -e "s;SBIN\t\t= \$(BUILD_ROOT)/sbin;SBIN\t\t= \$(BUILD_ROOT)$base_sbindir;" \ + -e "s;INIT\t\t= \$(BUILD_ROOT)/etc/rc.d/init.d;INIT\t\t= \$(BUILD_ROOT)${sysconfdir}/init.d;" \ + ${S}/Makefile oe_runmake 'BUILD_ROOT=${D}' install } + +inherit pkgconfig diff --git a/meta-networking/recipes-support/libconfuse/libconfuse_3.3.bb b/meta-networking/recipes-support/libconfuse/libconfuse_3.3.bb new file mode 100644 index 0000000000..b8d0536eb3 --- /dev/null +++ b/meta-networking/recipes-support/libconfuse/libconfuse_3.3.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "libConfuse is a configuration file parser library" +LICENSE = "ISC" +LIC_FILES_CHKSUM = "file://LICENSE;md5=42fa47330d4051cd219f7d99d023de3a" + +SRCREV = "a42aebf13db33afd575da6e63f55163d371f776d" +SRC_URI = "git://github.com/libconfuse/libconfuse.git;branch=master;protocol=https" + +inherit autotools-brokensep pkgconfig gettext + +S = "${WORKDIR}/git" + +do_configure:prepend(){ + (cd ${S} && ${S}/autogen.sh) +} diff --git a/meta-networking/recipes-support/libcpr/libcpr_1.10.5.bb b/meta-networking/recipes-support/libcpr/libcpr_1.10.5.bb new file mode 100644 index 0000000000..93fdb78eba --- /dev/null +++ b/meta-networking/recipes-support/libcpr/libcpr_1.10.5.bb @@ -0,0 +1,24 @@ +SUMMARY = "Curl for People - C++ Requests" +DESCRIPTION = "Curl for People C++ Requests is a simple wrapper around \ + libcurl inspired by the excellent Python Requests project." +HOMEPAGE = "https://docs.libcpr.org/" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=08beaae5deae1c43c065592da8f38095" + +DEPENDS = "curl openssl" + +SRC_URI = "git://github.com/libcpr/cpr.git;protocol=https;branch=1.10.x" +SRCREV = "3b15fa82ea74739b574d705fea44959b58142eb8" + +S = "${WORKDIR}/git" + +inherit cmake + +# building tests is currently using FetchContent for mongoose +EXTRA_OECMAKE += "\ + -DCPR_USE_SYSTEM_CURL=ON \ + -DCPR_BUILD_TESTS=OFF \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-networking/recipes-support/libesmtp/libesmtp/0001-Add-build-option-for-NTLM-support.patch b/meta-networking/recipes-support/libesmtp/libesmtp/0001-Add-build-option-for-NTLM-support.patch new file mode 100644 index 0000000000..dbdd644830 --- /dev/null +++ b/meta-networking/recipes-support/libesmtp/libesmtp/0001-Add-build-option-for-NTLM-support.patch @@ -0,0 +1,85 @@ +From 1c304e7886a08fb56485e41614ff3f8685afb59d Mon Sep 17 00:00:00 2001 +From: Jiaqing Zhao <jiaqing.zhao@intel.com> +Date: Tue, 8 Mar 2022 15:05:32 +0000 +Subject: [PATCH] Add build option for NTLM support + +Currently, NTLM plugin is built by default when openssl is available +and STARTTLS is enabled. But in libesmtp 1.0.6, there is a separate +build option. This commits adds the 'ntlm' option back. It's also +disabled by default. + +Like 1.0.6, it will check openssl MD4 algorithm support as MD4 is +insecure and modern systems may drop MD4 support. + +Upstream-Status: Backport [https://github.com/libesmtp/libESMTP/commit/1c304e7886a08fb56485e41614ff3f8685afb59d] +Signed-off-by: Jiaqing Zhao <jiaqing.zhao@intel.com> +--- + meson.build | 13 ++++++++++--- + meson_options.txt | 1 + + ntlm/meson.build | 2 +- + 3 files changed, 12 insertions(+), 4 deletions(-) + +diff --git a/meson.build b/meson.build +index 11d6ed8..d2a0e06 100644 +--- a/meson.build ++++ b/meson.build +@@ -61,6 +61,7 @@ add_project_arguments(cc.get_supported_arguments(cflags), language: 'c') + ################################################################################ + dldep = cc.find_library('dl') + ssldep = dependency('openssl', version : '>=1.1.0', required : get_option('tls')) ++ntlmdep = dependency('openssl', version : '>=1.1.0', required : get_option('ntlm')) + threaddep = dependency('threads', required : get_option('pthreads')) + + #XXX add test for libbind9.so +@@ -69,6 +70,7 @@ lwresdep = cc.find_library('lwres', required : get_option('lwres')) + deps = [ + dldep, + ssldep, ++ ntlmdep, + threaddep, + lwresdep, + ] +@@ -237,8 +239,12 @@ include_dir = include_directories('.') + subdir('login') + subdir('plain') + subdir('crammd5') +-if ssldep.found() +- subdir('ntlm') ++if ntlmdep.found() ++ if cc.has_header('openssl/md4.h') and cc.has_function('MD4_Init', dependencies : ntlmdep) ++ subdir('ntlm') ++ else ++ error('MD4 is not supported in current openssl, unable to build NTLM plugin') ++ endif + endif + + ################################################################################ +@@ -264,4 +270,5 @@ summary({'current:revision:age': libesmtp_cra, + 'STARTTLS': ssldep.found(), + 'CHUNKING': get_option('bdat'), + 'ETRN': get_option('etrn'), +- 'XUSR': get_option('xusr')}) ++ 'XUSR': get_option('xusr'), ++ 'NTLM': ntlmdep.found()}) +diff --git a/meson_options.txt b/meson_options.txt +index 8375e2c..158f38f 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -5,3 +5,4 @@ option('lwres', type : 'feature', value : 'disabled', description : 'use lwres l + option('bdat', type : 'boolean', value : 'true', description : 'enable SMTP BDAT extension') + option('etrn', type : 'boolean', value : 'true', description : 'enable SMTP ETRN extension') + option('xusr', type : 'boolean', value : 'true', description : 'enable sendmail XUSR extension') ++option('ntlm', type : 'feature', value : 'disabled', description : 'build with support for NTLM authentication') +diff --git a/ntlm/meson.build b/ntlm/meson.build +index e0eef58..11d7f58 100644 +--- a/ntlm/meson.build ++++ b/ntlm/meson.build +@@ -5,7 +5,7 @@ sasl_ntlm_sources = [ + 'ntlmstruct.c', + ] + +-ntlm_deps = [ ssldep, ] ++ntlm_deps = [ ntlmdep, ] + + sasl_ntlm = shared_module('ntlm', sasl_ntlm_sources, + name_prefix : 'sasl-', diff --git a/meta-networking/recipes-support/libesmtp/libesmtp/include-topdir.patch b/meta-networking/recipes-support/libesmtp/libesmtp/include-topdir.patch deleted file mode 100644 index 90c4ce75e1..0000000000 --- a/meta-networking/recipes-support/libesmtp/libesmtp/include-topdir.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -Nurp libesmtp-1.0.6.org/crammd5/Makefile.am libesmtp-1.0.6/crammd5/Makefile.am ---- libesmtp-1.0.6.org/crammd5/Makefile.am 2010-08-08 23:45:57.000000000 +0800 -+++ libesmtp-1.0.6/crammd5/Makefile.am 2014-11-17 11:17:21.663624295 +0800 -@@ -2,7 +2,7 @@ - - libdir = @plugindir@ - --INCLUDES = -I@srcdir@ -+INCLUDES = -I@srcdir@ -I@srcdir@/../ - AM_CFLAGS = @CFLAGS@ @EXTRA_CFLAGS@ - - lib_LTLIBRARIES = sasl-cram-md5.la -diff -Nurp libesmtp-1.0.6.org/login/Makefile.am libesmtp-1.0.6/login/Makefile.am ---- libesmtp-1.0.6.org/login/Makefile.am 2010-08-08 23:45:56.000000000 +0800 -+++ libesmtp-1.0.6/login/Makefile.am 2014-11-17 11:17:54.339623018 +0800 -@@ -2,7 +2,7 @@ - - libdir = @plugindir@ - --INCLUDES = -I@srcdir@ -+INCLUDES = -I@srcdir@ -I@srcdir@/../ - - lib_LTLIBRARIES = sasl-login.la - AM_CFLAGS = @CFLAGS@ @EXTRA_CFLAGS@ -diff -Nurp libesmtp-1.0.6.org/ntlm/Makefile.am libesmtp-1.0.6/ntlm/Makefile.am ---- libesmtp-1.0.6.org/ntlm/Makefile.am 2010-08-08 23:45:56.000000000 +0800 -+++ libesmtp-1.0.6/ntlm/Makefile.am 2014-11-17 11:18:10.551622385 +0800 -@@ -2,7 +2,7 @@ - - libdir = @plugindir@ - --INCLUDES = -I@srcdir@ -+INCLUDES = -I@srcdir@ -I@srcdir@/../ - AM_CFLAGS = @CFLAGS@ @EXTRA_CFLAGS@ - - lib_LTLIBRARIES = sasl-ntlm.la -diff -Nurp libesmtp-1.0.6.org/plain/Makefile.am libesmtp-1.0.6/plain/Makefile.am ---- libesmtp-1.0.6.org/plain/Makefile.am 2010-08-08 23:45:54.000000000 +0800 -+++ libesmtp-1.0.6/plain/Makefile.am 2014-11-17 11:18:33.355621494 +0800 -@@ -2,7 +2,7 @@ - - libdir = @plugindir@ - --INCLUDES = -I@srcdir@ -+INCLUDES = -I@srcdir@ -I@srcdir@/../ - AM_CFLAGS = @CFLAGS@ @EXTRA_CFLAGS@ - - lib_LTLIBRARIES = sasl-plain.la diff --git a/meta-networking/recipes-support/libesmtp/libesmtp/snprintf.patch b/meta-networking/recipes-support/libesmtp/libesmtp/snprintf.patch deleted file mode 100644 index d0d203eadb..0000000000 --- a/meta-networking/recipes-support/libesmtp/libesmtp/snprintf.patch +++ /dev/null @@ -1,19 +0,0 @@ -Use HAVE_WORKING_SNPRINTF to check for snprintf() - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Index: libesmtp-1.0.6/missing.h -=================================================================== ---- libesmtp-1.0.6.orig/missing.h -+++ libesmtp-1.0.6/missing.h -@@ -43,7 +43,7 @@ int strncasecmp (const char *a, const ch - void *memrchr (const void *a, int c, size_t len); - #endif - --#ifndef HAVE_SNPRINTF -+#ifndef HAVE_WORKING_SNPRINTF - #include <sys/types.h> - int snprintf(char *s, size_t n, const char *format, ...); - #endif diff --git a/meta-networking/recipes-support/libesmtp/libesmtp_1.0.6.bb b/meta-networking/recipes-support/libesmtp/libesmtp_1.0.6.bb deleted file mode 100644 index 71c5d940b7..0000000000 --- a/meta-networking/recipes-support/libesmtp/libesmtp_1.0.6.bb +++ /dev/null @@ -1,38 +0,0 @@ -SUMMARY = "SMTP client library" -DESCRIPTION = "LibESMTP is a library to manage posting \ -(or submission of) electronic mail using SMTP to a \ -preconfigured Mail Transport Agent (MTA) such as Exim or PostFix." -HOMEPAGE = "http://www.stafford.uklinux.net/libesmtp/" -LICENSE = "LGPLv2+" -SECTION = "libs" - -DEPENDS = "openssl" - -SRC_URI = "http://www.stafford.uklinux.net/libesmtp/libesmtp-${PV}.tar.bz2 \ - file://include-topdir.patch \ - file://snprintf.patch \ - " -SRC_URI[md5sum] = "bf3915e627fd8f35524a8fdfeed979c8" -SRC_URI[sha256sum] = "d0a61a5c52d99fa7ce7d00ed0a07e341dbda67101dbed1ab0cdae3f37db4eb0b" - -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06" - -inherit autotools binconfig - -EXTRA_OECONF = " \ - --with-auth-plugin-dir=${libdir}/esmtp-plugins \ - --enable-pthreads \ - --enable-debug \ - --enable-etrn \ - --disable-isoc \ - --disable-more-warnings \ - --disable-static \ -" - -FILES_${PN} = "${libdir}/lib*${SOLIBS} \ - ${libdir}/esmtp-plugins/*${SOLIBSDEV}" - -FILES_${PN}-dev += "${libdir}/esmtp-plugins/*.la" -FILES_${PN}-static += "${libdir}/esmtp-plugins/*.a" -FILES_${PN}-dbg += "${libdir}/esmtp-plugins/.debug/" diff --git a/meta-networking/recipes-support/libesmtp/libesmtp_1.1.0.bb b/meta-networking/recipes-support/libesmtp/libesmtp_1.1.0.bb new file mode 100644 index 0000000000..3d0764a3b9 --- /dev/null +++ b/meta-networking/recipes-support/libesmtp/libesmtp_1.1.0.bb @@ -0,0 +1,40 @@ +SUMMARY = "SMTP client library" +DESCRIPTION = "LibESMTP is a library to manage posting \ +(or submission of) electronic mail using SMTP to a \ +preconfigured Mail Transport Agent (MTA) such as Exim or PostFix." +HOMEPAGE = "https://libesmtp.github.io/" +LICENSE = "LGPL-2.0-or-later" +SECTION = "libs" + +DEPENDS = "openssl" + +SRC_URI = "git://github.com/libesmtp/libESMTP.git;branch=master;protocol=https \ + file://0001-Add-build-option-for-NTLM-support.patch" +SRCREV = "1d0af244310a66943ab400be56b15a9087f181eb" + +S = "${WORKDIR}/git" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=1803fa9c2c3ce8cb06b4861d75310742 \ + file://COPYING.GPL;md5=393a5ca445f6965873eca0259a17f833" + +inherit meson pkgconfig + +EXTRA_OEMESON = " \ + -Dpthreads=enabled \ + -Dtls=enabled \ + -Dxdg=false \ + -Dlwres=disabled \ + -Dbdat=true \ + -Detrn=true \ + -Dxusr=true \ + -Dntlm=disabled \ +" + +CFLAGS += "-D_GNU_SOURCE" + +do_configure:prepend:libc-glibc() { + sed -i -e "s/conf.set('HAVE_WORKING_STRERROR_R', 0)/conf.set('HAVE_WORKING_STRERROR_R', 1)/g" ${S}/meson.build +} + +FILES:${PN} = "${libdir}/lib*${SOLIBS} \ + ${libdir}/esmtp-plugins-6.2.0/*${SOLIBSDEV}" diff --git a/meta-networking/recipes-support/libexosip2/libexosip2_5.3.0.bb b/meta-networking/recipes-support/libexosip2/libexosip2_5.3.0.bb new file mode 100644 index 0000000000..541b2edce1 --- /dev/null +++ b/meta-networking/recipes-support/libexosip2/libexosip2_5.3.0.bb @@ -0,0 +1,22 @@ +SUMMARY = "Extend the capability of the oSIP library" +DESCRIPTION = "eXosip is a GPL library that extend the capability of \ +the oSIP library. It aims to implement a simple high \ +layer API to control SIP (rfc3261) for sessions establishements \ +and common extensions." +HOMEPAGE = "http://savannah.gnu.org/projects/exosip" +SECTION = "libs" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://src/eXosip.c;beginline=1;endline=32;md5=db3c08b79afd8f4d5e5dc8f0a5dc687e" +DEPENDS = "libosip2" + +SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/exosip/${BPN}-${PV}.tar.gz" +SRC_URI[sha256sum] = "5b7823986431ea5cedc9f095d6964ace966f093b2ae7d0b08404788bfcebc9c2" + +inherit autotools pkgconfig + +PACKAGECONFIG = "c-ares openssl" +PACKAGECONFIG[c-ares] = ",,c-ares" +PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl" + +PACKAGES =+ "${PN}-tools" +FILES:${PN}-tools += "${bindir}" diff --git a/meta-networking/recipes-support/libldb/libldb/0001-do-not-import-target-module-while-cross-compile.patch b/meta-networking/recipes-support/libldb/libldb/0001-do-not-import-target-module-while-cross-compile.patch new file mode 100644 index 0000000000..09c84b4405 --- /dev/null +++ b/meta-networking/recipes-support/libldb/libldb/0001-do-not-import-target-module-while-cross-compile.patch @@ -0,0 +1,71 @@ +From 6a2f229e74804f70f4419b2a1e6843aab059e098 Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Tue, 25 Jun 2019 14:25:08 +0800 +Subject: [PATCH] do not import target module while cross compile + +Some modules such as dynamic library maybe cann't be imported +while cross compile, we just check whether does the module exist. + +Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com> + +update to version 4.10.5, and switch to python3 +Signed-off-by: Changqing Li <changqing.li@windriver.com> + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + buildtools/wafsamba/samba_bundled.py | 27 +++++++++++++++++++-------- + 1 file changed, 19 insertions(+), 8 deletions(-) + +diff --git a/buildtools/wafsamba/samba_bundled.py b/buildtools/wafsamba/samba_bundled.py +index 2300565..26d9e8c 100644 +--- a/buildtools/wafsamba/samba_bundled.py ++++ b/buildtools/wafsamba/samba_bundled.py +@@ -4,6 +4,7 @@ import sys + from waflib import Build, Options, Logs + from waflib.Configure import conf + from wafsamba import samba_utils ++import importlib.util, os + + def PRIVATE_NAME(bld, name): + '''possibly rename a library to include a bundled extension''' +@@ -245,17 +246,27 @@ def CHECK_BUNDLED_SYSTEM_PYTHON(conf, libname, modulename, minversion='0.0.0'): + # versions + minversion = minimum_library_version(conf, libname, minversion) + +- try: +- m = __import__(modulename) +- except ImportError: +- found = False +- else: ++ # Find module in PYTHONPATH ++ spec = importlib.util._find_spec_from_path(modulename, [os.environ["PYTHONPATH"]]) ++ if spec: + try: +- version = m.__version__ +- except AttributeError: ++ module = importlib.util.module_from_spec(spec) ++ spec.loader.load_module(module) ++ except ImportError: + found = False ++ ++ if conf.env.CROSS_COMPILE: ++ # Some modules such as dynamic library maybe cann't be imported ++ # while cross compile, we just check whether the module exist ++ Logs.warn('Cross module[%s] has been found, but can not be loaded.' % (spec.name)) ++ found = True + else: +- found = tuplize_version(version) >= tuplize_version(minversion) ++ try: ++ version = module.__version__ ++ except AttributeError: ++ found = False ++ else: ++ found = tuplize_version(version) >= tuplize_version(minversion) + if not found and not conf.LIB_MAY_BE_BUNDLED(libname): + Logs.error('ERROR: Python module %s of version %s not found, and bundling disabled' % (libname, minversion)) + sys.exit(1) +-- +2.25.1 + diff --git a/meta-networking/recipes-support/libldb/libldb/ldb-Add-configure-options-for-packages.patch b/meta-networking/recipes-support/libldb/libldb/0002-ldb-Add-configure-options-for-packages.patch index 93bd4578e1..15e093fd68 100644 --- a/meta-networking/recipes-support/libldb/libldb/ldb-Add-configure-options-for-packages.patch +++ b/meta-networking/recipes-support/libldb/libldb/0002-ldb-Add-configure-options-for-packages.patch @@ -1,12 +1,11 @@ -From 49dde22e798fd7f39fd59250036c0ae1fe2b9152 Mon Sep 17 00:00:00 2001 -From: Jackie Huang <jackie.huang@windriver.com> -Date: Wed, 21 Sep 2016 10:06:39 +0800 +From e949da7cb100c571631cd9bc7532e528c1f74820 Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Mon, 1 Jul 2019 16:14:16 +0800 Subject: [PATCH] ldb: Add configure options for packages Add configure options for the following packages: - acl - attr - - libaio - libbsd - libcap - valgrind @@ -14,33 +13,25 @@ Add configure options for the following packages: Upstream-Status: Inappropriate [oe deterministic build specific] Signed-off-by: Jackie Huang <jackie.huang@windriver.com> + +upgrade to version 1.5.4 +Signed-off-by: Changqing Li <changqing.li@windriver.com> + +Rebase to 2.3.0 + +Rebase to 2.8.0 +Remove libaio option +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> --- - lib/replace/system/wscript_configure | 6 ++- - lib/replace/wscript | 85 ++++++++++++++++++++++++++++-------- - wscript | 7 +++ - 3 files changed, 80 insertions(+), 18 deletions(-) + lib/replace/wscript | 80 +++++++++++++++++++++++++++++++++------------ + wscript | 8 +++++ + 2 files changed, 68 insertions(+), 20 deletions(-) -diff --git a/lib/replace/system/wscript_configure b/lib/replace/system/wscript_configure -index 2035474..10f9ae7 100644 ---- a/lib/replace/system/wscript_configure -+++ b/lib/replace/system/wscript_configure -@@ -1,6 +1,10 @@ - #!/usr/bin/env python - --conf.CHECK_HEADERS('sys/capability.h') -+import Options -+ -+if Options.options.enable_libcap: -+ conf.CHECK_HEADERS('sys/capability.h') -+ - conf.CHECK_FUNCS('getpwnam_r getpwuid_r getpwent_r') - - # solaris varients of getXXent_r diff --git a/lib/replace/wscript b/lib/replace/wscript -index 145300d..8218fa5 100644 +index 37d7759..d0d6bb0 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript -@@ -23,6 +23,41 @@ def set_options(opt): +@@ -25,6 +25,34 @@ def options(opt): opt.PRIVATE_EXTENSION_DEFAULT('') opt.RECURSE('buildtools/wafsamba') @@ -58,13 +49,6 @@ index 145300d..8218fa5 100644 + help=("Disable use of attr"), + action="store_false", dest='enable_attr', default=False) + -+ opt.add_option('--with-libaio', -+ help=("Enable use of libaio"), -+ action="store_true", dest='enable_libaio') -+ opt.add_option('--without-libaio', -+ help=("Disable use of libaio"), -+ action="store_false", dest='enable_libaio', default=False) -+ + opt.add_option('--with-libbsd', + help=("Enable use of libbsd"), + action="store_true", dest='enable_libbsd') @@ -82,7 +66,7 @@ index 145300d..8218fa5 100644 @Utils.run_once def configure(conf): conf.RECURSE('buildtools/wafsamba') -@@ -32,12 +67,25 @@ def configure(conf): +@@ -38,12 +66,22 @@ def configure(conf): conf.DEFINE('HAVE_LIBREPLACE', 1) conf.DEFINE('LIBREPLACE_NETWORK_CHECKS', 1) @@ -91,10 +75,9 @@ index 145300d..8218fa5 100644 + conf.CHECK_HEADERS('linux/types.h crypt.h locale.h compat.h') + conf.CHECK_HEADERS('compat.h ctype.h dustat.h') conf.CHECK_HEADERS('fcntl.h fnmatch.h glob.h history.h krb5.h langinfo.h') -- conf.CHECK_HEADERS('libaio.h locale.h ndir.h pwd.h') + conf.CHECK_HEADERS('locale.h ndir.h pwd.h') - conf.CHECK_HEADERS('shadow.h sys/acl.h') - conf.CHECK_HEADERS('sys/attributes.h attr/attributes.h sys/capability.h sys/dir.h sys/epoll.h') -+ conf.CHECK_HEADERS('locale.h ndir.h pwd.h') + conf.CHECK_HEADERS('shadow.h') + conf.CHECK_HEADERS('sys/attributes.h sys/dir.h sys/epoll.h') + @@ -104,50 +87,54 @@ index 145300d..8218fa5 100644 + if Options.options.enable_attr: + conf.CHECK_HEADERS('attr/attributes.h attr/xattr.h') + -+ if Options.options.enable_libaio: -+ conf.CHECK_HEADERS('libaio.h') -+ + if Options.options.enable_libcap: + conf.CHECK_HEADERS('sys/capability.h') + - conf.CHECK_HEADERS('port.h') - conf.CHECK_HEADERS('sys/fcntl.h sys/filio.h sys/filsys.h sys/fs/s5param.h sys/fs/vx/quota.h') + conf.CHECK_HEADERS('sys/fcntl.h sys/filio.h sys/filsys.h sys/fs/s5param.h') conf.CHECK_HEADERS('sys/id.h sys/ioctl.h sys/ipc.h sys/mman.h sys/mode.h sys/ndir.h sys/priv.h') -@@ -73,7 +121,9 @@ def configure(conf): - - conf.CHECK_CODE('', headers='rpc/rpc.h rpcsvc/yp_prot.h', define='HAVE_RPCSVC_YP_PROT_H') + conf.CHECK_HEADERS('sys/resource.h sys/security.h sys/shm.h sys/statfs.h sys/statvfs.h sys/termio.h') +@@ -113,8 +151,9 @@ def configure(conf): + conf.CHECK_HEADERS('sys/fileio.h sys/filesys.h sys/dustat.h sys/sysmacros.h') + conf.CHECK_HEADERS('xfs/libxfs.h netgroup.h') -- conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h valgrind/memcheck.h') +- conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h') +- conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h valgrind/callgrind.h') + if Options.options.enable_valgrind: -+ conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h valgrind/memcheck.h') -+ ++ conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h') ++ conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h valgrind/callgrind.h') conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h') conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h') conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h') -@@ -248,17 +298,18 @@ def configure(conf): +@@ -443,20 +482,21 @@ def configure(conf): - conf.CHECK_FUNCS('prctl dirname basename') + strlcpy_in_bsd = False - # libbsd on some platforms provides strlcpy and strlcat - if not conf.CHECK_FUNCS('strlcpy strlcat'): -- conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', -- checklibc=True) +- if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', +- checklibc=True): +- strlcpy_in_bsd = True - if not conf.CHECK_FUNCS('getpeereid'): - conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') - if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): - conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h') +- if not conf.CHECK_FUNCS('setproctitle_init'): +- conf.CHECK_FUNCS_IN('setproctitle_init', 'bsd', headers='sys/types.h bsd/unistd.h') - - if not conf.CHECK_FUNCS('closefrom'): - conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') + if Options.options.enable_libbsd: + # libbsd on some platforms provides strlcpy and strlcat + if not conf.CHECK_FUNCS('strlcpy strlcat'): -+ conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', -+ checklibc=True) ++ if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', ++ checklibc=True): ++ strlcpy_in_bsd = True + if not conf.CHECK_FUNCS('getpeereid'): + conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') + if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): + conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h') ++ if not conf.CHECK_FUNCS('setproctitle_init'): ++ conf.CHECK_FUNCS_IN('setproctitle_init', 'bsd', headers='sys/types.h bsd/unistd.h') + + if not conf.CHECK_FUNCS('closefrom'): + conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') @@ -155,12 +142,12 @@ index 145300d..8218fa5 100644 conf.CHECK_CODE(''' struct ucred cred; diff --git a/wscript b/wscript -index 2af8571..059408b 100755 +index ed5d45f..6bb0b37 100644 --- a/wscript +++ b/wscript -@@ -29,6 +29,13 @@ def set_options(opt): - opt.RECURSE('lib/replace') - opt.tool_options('python') # options for disabling pyc or pyo compilation +@@ -40,6 +40,14 @@ def options(opt): + help='disable new LMDB backend for LDB', + action='store_true', dest='without_ldb_lmdb', default=False) + opt.add_option('--with-valgrind', + help=("enable use of valgrind"), @@ -169,9 +156,10 @@ index 2af8571..059408b 100755 + help=("disable use of valgrind"), + action="store_false", dest='enable_valgrind', default=False) + ++ + def configure(conf): conf.RECURSE('lib/tdb') - conf.RECURSE('lib/tevent') -- -2.8.3 +2.25.1 diff --git a/meta-networking/recipes-support/libldb/libldb/0003-Fix-pyext_PATTERN-for-cross-compilation.patch b/meta-networking/recipes-support/libldb/libldb/0003-Fix-pyext_PATTERN-for-cross-compilation.patch new file mode 100644 index 0000000000..71934795b1 --- /dev/null +++ b/meta-networking/recipes-support/libldb/libldb/0003-Fix-pyext_PATTERN-for-cross-compilation.patch @@ -0,0 +1,59 @@ +From 989addc0ca7be8233b413d42704c5dc900e85d81 Mon Sep 17 00:00:00 2001 +From: Yi Zhao <yi.zhao@windriver.com> +Date: Wed, 24 Nov 2021 13:33:35 +0800 +Subject: [PATCH] Fix pyext_PATTERN for cross compilation + +The pyext_PATTERN will add native arch as suffix when cross compiling. +For example, on qemuarm64, it is expanded to: +pyext_PATTERN ='%s.cpython-310-x86_64-linux-gnu.so' +which will result in the incorrect library name. + +root@qemuarm64:~# find /usr/lib/ -name \*ldb\* +/usr/lib/pkgconfig/pyldb-util.cpython-310-x86_64-linux-gnu.pc +/usr/lib/pkgconfig/ldb.pc +/usr/lib/libpyldb-util.cpython-310-x86-64-linux-gnu.so.2.3.2 +/usr/lib/libldb.so.2.3.2 +/usr/lib/libpyldb-util.cpython-310-x86-64-linux-gnu.so.2 +/usr/lib/libldb.so +/usr/lib/libldb.so.2 +/usr/lib/python3.10/site-packages/_ldb_text.py +/usr/lib/python3.10/site-packages/ldb.cpython-310-x86_64-linux-gnu.so +/usr/lib/libpyldb-util.cpython-310-x86-64-linux-gnu.so + +Set pyext_PATTERN to '%s.so' to remove the suffix. +After the patch: +root@qemuarm64:~# find /usr/lib/ -name \*ldb\* +/usr/lib/pkgconfig/pyldb-util.pc +/usr/lib/pkgconfig/ldb.pc +/usr/lib/libpyldb-util.so.2.3.2 +/usr/lib/libldb.so.2.3.2 +/usr/lib/libpyldb-util.so.2 +/usr/lib/libldb.so +/usr/lib/libldb.so.2 +/usr/lib/python3.10/site-packages/_ldb_text.py +/usr/lib/python3.10/site-packages/ldb.so +/usr/lib/libpyldb-util.so + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + third_party/waf/waflib/Tools/python.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/third_party/waf/waflib/Tools/python.py b/third_party/waf/waflib/Tools/python.py +index b2dd1a9..2bd3545 100644 +--- a/third_party/waf/waflib/Tools/python.py ++++ b/third_party/waf/waflib/Tools/python.py +@@ -339,7 +339,7 @@ def check_python_headers(conf, features='pyembed pyext'): + x = 'MACOSX_DEPLOYMENT_TARGET' + if dct[x]: + env[x] = conf.environ[x] = str(dct[x]) +- env.pyext_PATTERN = '%s' + (dct['EXT_SUFFIX'] or dct['SO']) # SO is deprecated in 3.5 and removed in 3.11 ++ env.pyext_PATTERN = '%s.so' + + + # Try to get pythonX.Y-config +-- +2.25.1 + diff --git a/meta-networking/recipes-support/libldb/libldb/avoid-openldap-unless-wanted.patch b/meta-networking/recipes-support/libldb/libldb/avoid-openldap-unless-wanted.patch index 8ab094fa7e..7e60b53051 100644 --- a/meta-networking/recipes-support/libldb/libldb/avoid-openldap-unless-wanted.patch +++ b/meta-networking/recipes-support/libldb/libldb/avoid-openldap-unless-wanted.patch @@ -1,6 +1,21 @@ ---- a/wscript 2015-11-18 12:43:33.000000000 +0100 -+++ b/wscript 2015-11-18 12:46:25.000000000 +0100 -@@ -58,9 +58,7 @@ +From 226b75a0e9654fb3c0435256af5fed0178dc0d69 Mon Sep 17 00:00:00 2001 +From: Jens Rehsack <rehsack@gmail.com> +Date: Thu, 19 Nov 2015 20:45:56 +0100 +Subject: [PATCH] avoid openldap unless wanted + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Jens Rehsack <rehsack@gmail.com> +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + wscript | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/wscript b/wscript +index 6bb0b37..8ee25b1 100644 +--- a/wscript ++++ b/wscript +@@ -154,9 +154,7 @@ def configure(conf): if conf.env.standalone_ldb: conf.CHECK_XSLTPROC_MANPAGES() @@ -11,3 +26,6 @@ # we don't want any libraries or modules to rely on runtime # resolution of symbols +-- +2.25.1 + diff --git a/meta-networking/recipes-support/libldb/libldb/do-not-import-target-module-while-cross-compile.patch b/meta-networking/recipes-support/libldb/libldb/do-not-import-target-module-while-cross-compile.patch deleted file mode 100755 index fdd312c0ad..0000000000 --- a/meta-networking/recipes-support/libldb/libldb/do-not-import-target-module-while-cross-compile.patch +++ /dev/null @@ -1,58 +0,0 @@ -Some modules such as dynamic library maybe cann't be imported while cross compile, -we just check whether does the module exist. - -Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com> - -Index: ldb-1.1.26/buildtools/wafsamba/samba_bundled.py -=================================================================== ---- ldb-1.1.26.orig/buildtools/wafsamba/samba_bundled.py -+++ ldb-1.1.26/buildtools/wafsamba/samba_bundled.py -@@ -2,6 +2,7 @@ - - import sys - import Build, Options, Logs -+import imp, os - from Configure import conf - from samba_utils import TO_LIST - -@@ -230,17 +231,32 @@ def CHECK_BUNDLED_SYSTEM_PYTHON(conf, li - # versions - minversion = minimum_library_version(conf, libname, minversion) - -- try: -- m = __import__(modulename) -- except ImportError: -- found = False -- else: -+ # Find module in PYTHONPATH -+ stuff = imp.find_module(modulename, [os.environ["PYTHONPATH"]]) -+ if stuff: - try: -- version = m.__version__ -- except AttributeError: -+ m = imp.load_module(modulename, stuff[0], stuff[1], stuff[2]) -+ except ImportError: - found = False -+ -+ if conf.env.CROSS_COMPILE: -+ # Some modules such as dynamic library maybe cann't be imported -+ # while cross compile, we just check whether the module exist -+ Logs.warn('Cross module[%s] has been found, but can not be loaded.' % (stuff[1])) -+ found = True - else: -- found = tuplize_version(version) >= tuplize_version(minversion) -+ try: -+ version = m.__version__ -+ except AttributeError: -+ found = False -+ else: -+ found = tuplize_version(version) >= tuplize_version(minversion) -+ finally: -+ if stuff[0]: -+ stuff[0].close() -+ else: -+ found = False -+ - if not found and not conf.LIB_MAY_BE_BUNDLED(libname): - Logs.error('ERROR: Python module %s of version %s not found, and bundling disabled' % (libname, minversion)) - sys.exit(1) diff --git a/meta-networking/recipes-support/libldb/libldb/run-ptest b/meta-networking/recipes-support/libldb/libldb/run-ptest new file mode 100644 index 0000000000..f0de0578c4 --- /dev/null +++ b/meta-networking/recipes-support/libldb/libldb/run-ptest @@ -0,0 +1,17 @@ +#!/bin/sh + +ptestdir=$(dirname "$(readlink -f "$0")") +cd "$ptestdir"/tests || exit + +tests="test_ldb_dn test_ldb_qsort" + +for f in $tests +do + if test -x ./"$f"; then + if ./"$f" > ./"$f".out 2> ./"$f".err; then + echo "PASS: $f" + else + echo "FAIL: $f" + fi + fi +done diff --git a/meta-networking/recipes-support/libldb/libldb_1.2.2.bb b/meta-networking/recipes-support/libldb/libldb_2.8.0.bb index cb9ea92838..bdd87993d7 100644 --- a/meta-networking/recipes-support/libldb/libldb_1.2.2.bb +++ b/meta-networking/recipes-support/libldb/libldb_2.8.0.bb @@ -1,14 +1,19 @@ SUMMARY = "Hierarchical, reference counted memory pool system with destructors" -HOMEPAGE = "http://ldb.samba.org" +HOMEPAGE = "https://ldb.samba.org" SECTION = "libs" -LICENSE = "LGPL-3.0+ & LGPL-2.1+ & GPL-3.0+" +LICENSE = "LGPL-3.0-or-later & LGPL-2.1-or-later & GPL-3.0-or-later" -DEPENDS += "libtdb libtalloc libtevent popt" -RDEPENDS_pyldb += "python" +DEPENDS += "libtdb libtalloc libtevent popt cmocka" +RDEPENDS:pyldb += "python3" + +export PYTHONHASHSEED="1" +export PYTHONARCHDIR = "${PYTHON_SITEPACKAGES_DIR}" SRC_URI = "http://samba.org/ftp/ldb/ldb-${PV}.tar.gz \ - file://do-not-import-target-module-while-cross-compile.patch \ - file://ldb-Add-configure-options-for-packages.patch \ + file://0001-do-not-import-target-module-while-cross-compile.patch \ + file://0002-ldb-Add-configure-options-for-packages.patch \ + file://0003-Fix-pyext_PATTERN-for-cross-compilation.patch \ + file://run-ptest \ " PACKAGECONFIG ??= "\ @@ -18,10 +23,10 @@ PACKAGECONFIG ??= "\ PACKAGECONFIG[acl] = "--with-acl,--without-acl,acl" PACKAGECONFIG[attr] = "--with-attr,--without-attr,attr" PACKAGECONFIG[ldap] = ",,openldap" -PACKAGECONFIG[libaio] = "--with-libaio,--without-libaio,libaio" PACKAGECONFIG[libbsd] = "--with-libbsd,--without-libbsd,libbsd" PACKAGECONFIG[libcap] = "--with-libcap,--without-libcap,libcap" PACKAGECONFIG[valgrind] = "--with-valgrind,--without-valgrind,valgrind" +PACKAGECONFIG[lmdb] = ",--without-ldb-lmdb,lmdb," SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'ldap', '', 'file://avoid-openldap-unless-wanted.patch', d)}" @@ -29,16 +34,19 @@ LIC_FILES_CHKSUM = "file://pyldb.h;endline=24;md5=dfbd238cecad76957f7f860fbe9ada file://man/ldb.3.xml;beginline=261;endline=262;md5=137f9fd61040c1505d1aa1019663fd08 \ file://tools/ldbdump.c;endline=19;md5=a7d4fc5d1f75676b49df491575a86a42" -SRC_URI[md5sum] = "91284a12423def99a6592e393e3b7fbb" -SRC_URI[sha256sum] = "0cedeadb75de401c9735127f654dbc1a391c4327a2b83be54078be286fed1113" +SRC_URI[sha256sum] = "358dca10fcd27207ac857a0d7f435a46dbc6cd1f7c10dbb840c1931bf1965f08" -inherit waf-samba +inherit pkgconfig waf-samba ptest S = "${WORKDIR}/ldb-${PV}" +# Cross_compile cannot use preforked process, since fork process earlier than point subproces.popen +# to cross Popen +export WAF_NO_PREFORK="yes" + EXTRA_OECONF += "--disable-rpath \ --disable-rpath-install \ - --bundled-libraries=cmocka \ + --bundled-libraries=NONE \ --builtin-libraries=replace \ --with-modulesdir=${libdir}/ldb/modules \ --with-privatelibdir=${libdir}/ldb \ @@ -49,15 +57,31 @@ PACKAGES =+ "pyldb pyldb-dbg pyldb-dev" NOAUTOPACKAGEDEBUG = "1" -FILES_${PN} += "${libdir}/ldb/*" -FILES_${PN}-dbg += "${bindir}/.debug/* \ +FILES:${PN} += "${libdir}/ldb/*" +FILES:${PN}-dbg += "${bindir}/.debug/* \ ${libdir}/.debug/* \ ${libdir}/ldb/.debug/* \ ${libdir}/ldb/modules/ldb/.debug/*" -FILES_pyldb = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/* \ - ${libdir}/libpyldb-util.so.* \ +FILES:pyldb = "${PYTHON_SITEPACKAGES_DIR}/* \ + ${libdir}/libpyldb-util.*.so.* \ " -FILES_pyldb-dbg = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/.debug \ - ${libdir}/.debug/libpyldb-util.so.*" -FILES_pyldb-dev = "${libdir}/libpyldb-util.so" +FILES:pyldb-dbg = "${PYTHON_SITEPACKAGES_DIR}/.debug \ + ${libdir}/.debug/libpyldb-util.*.so.*" +FILES:pyldb-dev = "${libdir}/libpyldb-util.*.so" + +# Prevent third_party/waf/waflib/Configure.py checking host's path which is +# incorrect for cross building. +export PREFIX = "/" +export LIBDIR = "${libdir}" +export BINDIR = "${bindir}" + +do_configure:prepend() { + # For a clean rebuild + rm -fr bin/ +} + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + install -m 0755 ${B}/bin/test_ldb_* ${D}${PTEST_PATH}/tests/ +} diff --git a/meta-networking/recipes-support/libmaxminddb/libmaxminddb_1.4.3.bb b/meta-networking/recipes-support/libmaxminddb/libmaxminddb_1.4.3.bb new file mode 100644 index 0000000000..204148e638 --- /dev/null +++ b/meta-networking/recipes-support/libmaxminddb/libmaxminddb_1.4.3.bb @@ -0,0 +1,18 @@ +SUMMARY = "C library for the MaxMind DB file format" +DESCRIPTION = "The libmaxminddb library provides a C library for reading MaxMind DB files, \ +ncluding the GeoIP2 databases from MaxMind. This is a custom binary \ +format designed to facilitate fast lookups of IP addresses while allowing \ +for great flexibility in the type of data associated with an address." + +HOMEPAGE = "https://github.com/maxmind/libmaxminddb" +SECTION = "libs" +LICENSE = " Apache-2.0" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ +" +SRC_URI = "https://github.com/maxmind/libmaxminddb/releases/download/${PV}/${BPN}-${PV}.tar.gz \ +" +SRC_URI[sha256sum] = "a5fdf6c7b4880fdc7620f8ace5bd5cbe9f65650c9493034b5b9fc7d83551a439" + +inherit autotools-brokensep + diff --git a/meta-networking/recipes-support/libmemcached/files/0001-Fix-comparison-types.patch b/meta-networking/recipes-support/libmemcached/files/0001-Fix-comparison-types.patch index 26b5e250cb..9e5121fed7 100644 --- a/meta-networking/recipes-support/libmemcached/files/0001-Fix-comparison-types.patch +++ b/meta-networking/recipes-support/libmemcached/files/0001-Fix-comparison-types.patch @@ -8,6 +8,8 @@ error: comparison between pointer and integer ('char *' and 'int') Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + clients/memflush.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-networking/recipes-support/libmemcached/files/0001-configure.ac-Do-not-configure-build-aux.patch b/meta-networking/recipes-support/libmemcached/files/0001-configure.ac-Do-not-configure-build-aux.patch index 06febc5b13..1c1d814b50 100644 --- a/meta-networking/recipes-support/libmemcached/files/0001-configure.ac-Do-not-configure-build-aux.patch +++ b/meta-networking/recipes-support/libmemcached/files/0001-configure.ac-Do-not-configure-build-aux.patch @@ -8,6 +8,8 @@ configure: error: cannot find install-sh, install.sh, or shtool Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + configure.ac | 1 - 1 file changed, 1 deletion(-) diff --git a/meta-networking/recipes-support/libmemcached/files/0002-POSIX_SPAWN_USEVFORK-is-not-linux-specific-but-glibc.patch b/meta-networking/recipes-support/libmemcached/files/0002-POSIX_SPAWN_USEVFORK-is-not-linux-specific-but-glibc.patch index e1e1be8c68..4d38fe452e 100644 --- a/meta-networking/recipes-support/libmemcached/files/0002-POSIX_SPAWN_USEVFORK-is-not-linux-specific-but-glibc.patch +++ b/meta-networking/recipes-support/libmemcached/files/0002-POSIX_SPAWN_USEVFORK-is-not-linux-specific-but-glibc.patch @@ -9,6 +9,8 @@ cmdline.cc:206:12: error: use of undeclared identifier 'POSIX_SPAWN_USEVFORK' Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + libtest/cmdline.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-networking/recipes-support/libmemcached/files/crosscompile.patch b/meta-networking/recipes-support/libmemcached/files/crosscompile.patch index 63511bff5f..441b8d4177 100644 --- a/meta-networking/recipes-support/libmemcached/files/crosscompile.patch +++ b/meta-networking/recipes-support/libmemcached/files/crosscompile.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + libmemcached/backtrace.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-networking/recipes-support/libmemcached/libmemcached.inc b/meta-networking/recipes-support/libmemcached/libmemcached.inc index e86f832f8d..319ab29ce7 100644 --- a/meta-networking/recipes-support/libmemcached/libmemcached.inc +++ b/meta-networking/recipes-support/libmemcached/libmemcached.inc @@ -1,11 +1,13 @@ DESCRIPTION = "open source C/C++ client library and tools for the memcached server" DEPENDS = "libevent util-linux" SECTION = "libdevel" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=865490941c91ba790f0ea78dec93bd60" SRC_URI = "http://launchpad.net/libmemcached/1.0/${PV}/+download/libmemcached-${PV}.tar.gz" +UPSTREAM_CHECK_URI = "https://launchpad.net/libmemcached" + TARGET_LDFLAGS += "-luuid" TARGET_CFLAGS += "-D__USE_GNU -D_GNU_SOURCE" diff --git a/meta-networking/recipes-support/libosip2/libosip2_5.3.1.bb b/meta-networking/recipes-support/libosip2/libosip2_5.3.1.bb new file mode 100644 index 0000000000..fa99d33e1c --- /dev/null +++ b/meta-networking/recipes-support/libosip2/libosip2_5.3.1.bb @@ -0,0 +1,15 @@ +SUMMARY = "The GNU oSIP library is an implementation of SIP - rfc3261" +DESCRIPTION = "SIP stands for the Session Initiation Protocol and is described \ +by the rfc3261 (wich deprecates rfc2543). This library aims to provide multimedia \ +and telecom software developers an easy and powerful interface to initiate and \ +control SIP based sessions in their applications. SIP is a open standard \ +replacement from IETF for H323." +HOMEPAGE = "http://www.gnu.org/software/osip/osip.html" +SECTION = "libs" +LICENSE = "LGPL-2.1-or-later" +LIC_FILES_CHKSUM = "file://src/osip2/osip.c;beginline=1;endline=19;md5=22ca0da0e41276c50c81b733953c208d" + +SRC_URI = "${GNU_MIRROR}/osip/${BPN}-${PV}.tar.gz" +SRC_URI[sha256sum] = "fe82fe841608266ac15a5c1118216da00c554d5006e2875a8ac3752b1e6adc79" + +inherit autotools diff --git a/meta-networking/recipes-support/libtalloc/libtalloc/options-2.1.10.patch b/meta-networking/recipes-support/libtalloc/libtalloc/0001-talloc-Add-configure-options-for-packages.patch index 35f8eaf7da..6c92beb30b 100644 --- a/meta-networking/recipes-support/libtalloc/libtalloc/options-2.1.10.patch +++ b/meta-networking/recipes-support/libtalloc/libtalloc/0001-talloc-Add-configure-options-for-packages.patch @@ -1,12 +1,11 @@ -From efc1b02144f23fdf84dbc5ff15307815e0f2a425 Mon Sep 17 00:00:00 2001 -From: Jackie Huang <jackie.huang@windriver.com> -Date: Wed, 14 Sep 2016 11:11:35 +0800 +From 18e3d62f5c8f957acc45695cb99c24510d23b457 Mon Sep 17 00:00:00 2001 +From: Wang Mingyu <wangmy@cn.fujitsu.com> +Date: Fri, 25 Dec 2020 14:14:08 +0900 Subject: [PATCH] talloc: Add configure options for packages Add configure options for the following packages: - acl - attr - - libaio - libbsd - libcap - valgrind @@ -19,33 +18,25 @@ Modified to apply to version 2.1.10. Signed-off-by: Joe Slater <joe.slater@windriver.com> +Modified tp apply to version 2.2.0 +Signed-off-by: Changqing Li <changqing.li@windriver.com> + +Rebase to 2.4.1 +Remove libaio option +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> + +Rebase to 2.4.2 +Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> --- - lib/replace/system/wscript_configure | 6 ++- - lib/replace/wscript | 85 ++++++++++++++++++++++++++++-------- - wscript | 7 ++- - 3 files changed, 79 insertions(+), 19 deletions(-) + lib/replace/wscript | 100 ++++++++++++++++++++++++++++++-------------- + wscript | 7 +++- + 2 files changed, 75 insertions(+), 32 deletions(-) -diff --git a/lib/replace/system/wscript_configure b/lib/replace/system/wscript_configure -index 2035474..10f9ae7 100644 ---- a/lib/replace/system/wscript_configure -+++ b/lib/replace/system/wscript_configure -@@ -1,6 +1,10 @@ - #!/usr/bin/env python - --conf.CHECK_HEADERS('sys/capability.h') -+import Options -+ -+if Options.options.enable_libcap: -+ conf.CHECK_HEADERS('sys/capability.h') -+ - conf.CHECK_FUNCS('getpwnam_r getpwuid_r getpwent_r') - - # solaris varients of getXXent_r diff --git a/lib/replace/wscript b/lib/replace/wscript -index fc43e1a..12d2a70 100644 +index 77e655b..2fd7dfb 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript -@@ -23,6 +23,41 @@ def set_options(opt): +@@ -25,6 +25,34 @@ def options(opt): opt.PRIVATE_EXTENSION_DEFAULT('') opt.RECURSE('buildtools/wafsamba') @@ -63,13 +54,6 @@ index fc43e1a..12d2a70 100644 + help=("Disable use of attr"), + action="store_false", dest='enable_attr', default=False) + -+ opt.add_option('--with-libaio', -+ help=("Enable use of libaio"), -+ action="store_true", dest='enable_libaio') -+ opt.add_option('--without-libaio', -+ help=("Disable use of libaio"), -+ action="store_false", dest='enable_libaio', default=False) -+ + opt.add_option('--with-libbsd', + help=("Enable use of libbsd"), + action="store_true", dest='enable_libbsd') @@ -87,7 +71,7 @@ index fc43e1a..12d2a70 100644 @Utils.run_once def configure(conf): conf.RECURSE('buildtools/wafsamba') -@@ -32,12 +67,25 @@ def configure(conf): +@@ -38,18 +66,27 @@ def configure(conf): conf.DEFINE('HAVE_LIBREPLACE', 1) conf.DEFINE('LIBREPLACE_NETWORK_CHECKS', 1) @@ -96,72 +80,103 @@ index fc43e1a..12d2a70 100644 + conf.CHECK_HEADERS('linux/types.h crypt.h locale.h compat.h') + conf.CHECK_HEADERS('compat.h ctype.h dustat.h') conf.CHECK_HEADERS('fcntl.h fnmatch.h glob.h history.h krb5.h langinfo.h') -- conf.CHECK_HEADERS('libaio.h locale.h ndir.h pwd.h') + conf.CHECK_HEADERS('locale.h ndir.h pwd.h') - conf.CHECK_HEADERS('shadow.h sys/acl.h') - conf.CHECK_HEADERS('sys/attributes.h attr/attributes.h sys/capability.h sys/dir.h sys/epoll.h') -+ conf.CHECK_HEADERS('locale.h ndir.h pwd.h') + conf.CHECK_HEADERS('shadow.h') + conf.CHECK_HEADERS('sys/attributes.h sys/dir.h sys/epoll.h') -+ + conf.CHECK_HEADERS('sys/fcntl.h sys/filio.h sys/filsys.h sys/fs/s5param.h') + conf.CHECK_HEADERS('sys/id.h sys/ioctl.h sys/ipc.h sys/mman.h sys/mode.h sys/ndir.h sys/priv.h') + conf.CHECK_HEADERS('sys/resource.h sys/security.h sys/shm.h sys/statfs.h sys/statvfs.h sys/termio.h') + conf.CHECK_HEADERS('sys/vfs.h sys/xattr.h termio.h termios.h sys/file.h') + conf.CHECK_HEADERS('sys/ucontext.h sys/wait.h sys/stat.h') + + if Options.options.enable_acl: + conf.CHECK_HEADERS('acl/libacl.h sys/acl.h') + + if Options.options.enable_attr: + conf.CHECK_HEADERS('attr/attributes.h attr/xattr.h') + -+ if Options.options.enable_libaio: -+ conf.CHECK_HEADERS('libaio.h') -+ + if Options.options.enable_libcap: + conf.CHECK_HEADERS('sys/capability.h') + - conf.CHECK_HEADERS('port.h') - conf.CHECK_HEADERS('sys/fcntl.h sys/filio.h sys/filsys.h sys/fs/s5param.h sys/fs/vx/quota.h') - conf.CHECK_HEADERS('sys/id.h sys/ioctl.h sys/ipc.h sys/mman.h sys/mode.h sys/ndir.h sys/priv.h') -@@ -73,7 +121,9 @@ def configure(conf): + if not conf.CHECK_DECLS('malloc', headers='stdlib.h'): + conf.CHECK_HEADERS('malloc.h') - conf.CHECK_CODE('', headers='rpc/rpc.h rpcsvc/yp_prot.h', define='HAVE_RPCSVC_YP_PROT_H') +@@ -113,8 +150,9 @@ def configure(conf): + conf.CHECK_HEADERS('sys/fileio.h sys/filesys.h sys/dustat.h sys/sysmacros.h') + conf.CHECK_HEADERS('xfs/libxfs.h netgroup.h') -- conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h valgrind/memcheck.h') +- conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h') +- conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h valgrind/callgrind.h') + if Options.options.enable_valgrind: -+ conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h valgrind/memcheck.h') -+ ++ conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h') ++ conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h valgrind/callgrind.h') conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h') conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h') conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h') -@@ -248,17 +298,18 @@ def configure(conf): +@@ -443,31 +481,31 @@ def configure(conf): - conf.CHECK_FUNCS('prctl dirname basename') + strlcpy_in_bsd = False - # libbsd on some platforms provides strlcpy and strlcat - if not conf.CHECK_FUNCS('strlcpy strlcat'): -- conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', -- checklibc=True) +- if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', +- checklibc=True): +- strlcpy_in_bsd = True +- elif conf.env.enable_fuzzing: +- # Just to complicate it more, some versions of Honggfuzz have +- # got strlcpy and strlcat in libc, but not in <string.h> +- # (unless it is there coincidentally, on a BSD). Therefore we +- # can't use CHECK_FUNCS alone to decide whether to add the +- # headers to replace.h. +- # +- # As this is only known to happen on a fuzzing compiler, we'll +- # skip the check when not in fuzzing mode. +- conf.CHECK_HEADERS('bsd/string.h') +- - if not conf.CHECK_FUNCS('getpeereid'): - conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') - if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): - conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h') +- if not conf.CHECK_FUNCS('setproctitle_init'): +- conf.CHECK_FUNCS_IN('setproctitle_init', 'bsd', headers='sys/types.h bsd/unistd.h') - - if not conf.CHECK_FUNCS('closefrom'): - conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') + if Options.options.enable_libbsd: + # libbsd on some platforms provides strlcpy and strlcat + if not conf.CHECK_FUNCS('strlcpy strlcat'): -+ conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', -+ checklibc=True) ++ if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', ++ checklibc=True): ++ strlcpy_in_bsd = True ++ elif conf.env.enable_fuzzing: ++ # Just to complicate it more, some versions of Honggfuzz have ++ # got strlcpy and strlcat in libc, but not in <string.h> ++ # (unless it is there coincidentally, on a BSD). Therefore we ++ # can't use CHECK_FUNCS alone to decide whether to add the ++ # headers to replace.h. ++ # ++ # As this is only known to happen on a fuzzing compiler, we'll ++ # skip the check when not in fuzzing mode. ++ conf.CHECK_HEADERS('bsd/string.h') ++ + if not conf.CHECK_FUNCS('getpeereid'): + conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') + if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): + conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h') -+ ++ if not conf.CHECK_FUNCS('setproctitle_init'): ++ conf.CHECK_FUNCS_IN('setproctitle_init', 'bsd', headers='sys/types.h bsd/unistd.h') + if not conf.CHECK_FUNCS('closefrom'): + conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') conf.CHECK_CODE(''' struct ucred cred; +diff --git a/wscript b/wscript +index 8b5e02d..b6e2614 100644 --- a/wscript +++ b/wscript -@@ -32,7 +32,12 @@ def set_options(opt): +@@ -31,7 +31,12 @@ def options(opt): opt.add_option('--enable-talloc-compat1', help=("Build talloc 1.x.x compat library [False]"), action="store_true", dest='TALLOC_COMPAT1', default=False) @@ -172,9 +187,9 @@ index fc43e1a..12d2a70 100644 + opt.add_option('--without-valgrind', + help=("disable use of valgrind"), + action="store_false", dest='enable_valgrind', default=False) - + def configure(conf): conf.RECURSE('lib/replace') -- -2.8.3 +2.34.1 diff --git a/meta-networking/recipes-support/libtalloc/libtalloc/0002-Fix-pyext_PATTERN-for-cross-compilation.patch b/meta-networking/recipes-support/libtalloc/libtalloc/0002-Fix-pyext_PATTERN-for-cross-compilation.patch new file mode 100644 index 0000000000..59461412a6 --- /dev/null +++ b/meta-networking/recipes-support/libtalloc/libtalloc/0002-Fix-pyext_PATTERN-for-cross-compilation.patch @@ -0,0 +1,57 @@ +From 843d1dc810efc61275b1121d6b35649d00570851 Mon Sep 17 00:00:00 2001 +From: Yi Zhao <yi.zhao@windriver.com> +Date: Wed, 24 Nov 2021 13:33:35 +0800 +Subject: [PATCH] Fix pyext_PATTERN for cross compilation + +The pyext_PATTERN will add native arch as suffix when cross compiling. +For example, on qemuarm64, it is expanded to: +pyext_PATTERN ='%s.cpython-310-x86_64-linux-gnu.so' +which will result in the incorrect library name. + +root@qemuarm64:~# find /usr/lib -name \*talloc\* +/usr/lib/pkgconfig/talloc.pc +/usr/lib/pkgconfig/pytalloc-util.cpython-310-x86_64-linux-gnu.pc +/usr/lib/libpytalloc-util.cpython-310-x86-64-linux-gnu.so.2.3.3 +/usr/lib/libtalloc.so.2 +/usr/lib/libpytalloc-util.cpython-310-x86-64-linux-gnu.so.2 +/usr/lib/libpytalloc-util.cpython-310-x86-64-linux-gnu.so +/usr/lib/libtalloc.so +/usr/lib/libtalloc.so.2.3.3 +/usr/lib/python3.10/site-packages/talloc.cpython-310-x86_64-linux-gnu.so + +Set pyext_PATTERN to '%s.so' to remove the suffix. +After the patch: +root@qemuarm64:~# find /usr/lib -name \*talloc\* +/usr/lib/pkgconfig/talloc.pc +/usr/lib/pkgconfig/pytalloc-util.pc +/usr/lib/libpytalloc-util.so.2.3.3 +/usr/lib/libtalloc.so.2 +/usr/lib/libpytalloc-util.so.2 +/usr/lib/libpytalloc-util.so +/usr/lib/libtalloc.so +/usr/lib/libtalloc.so.2.3.3 +/usr/lib/python3.10/site-packages/talloc.so + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + third_party/waf/waflib/Tools/python.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/third_party/waf/waflib/Tools/python.py b/third_party/waf/waflib/Tools/python.py +index b2dd1a9..2bd3545 100644 +--- a/third_party/waf/waflib/Tools/python.py ++++ b/third_party/waf/waflib/Tools/python.py +@@ -339,7 +339,7 @@ def check_python_headers(conf, features='pyembed pyext'): + x = 'MACOSX_DEPLOYMENT_TARGET' + if dct[x]: + env[x] = conf.environ[x] = str(dct[x]) +- env.pyext_PATTERN = '%s' + (dct['EXT_SUFFIX'] or dct['SO']) # SO is deprecated in 3.5 and removed in 3.11 ++ env.pyext_PATTERN = '%s.so' + + + # Try to get pythonX.Y-config +-- +2.25.1 + diff --git a/meta-networking/recipes-support/libtalloc/libtalloc/avoid-attr-unless-wanted.patch b/meta-networking/recipes-support/libtalloc/libtalloc/avoid-attr-unless-wanted.patch index a3ee9ccd97..93c8a1e846 100644 --- a/meta-networking/recipes-support/libtalloc/libtalloc/avoid-attr-unless-wanted.patch +++ b/meta-networking/recipes-support/libtalloc/libtalloc/avoid-attr-unless-wanted.patch @@ -1,20 +1,35 @@ ---- a/lib/replace/wscript 2015-11-13 16:04:04.000000000 +0100 -+++ b/lib/replace/wscript 2015-11-13 16:23:20.000000000 +0100 -@@ -636,8 +636,6 @@ +From 9130d340c37861a59e812e334e2b13577e705a6c Mon Sep 17 00:00:00 2001 +From: Wang Mingyu <wangmy@cn.fujitsu.com> +Date: Fri, 25 Dec 2020 15:10:58 +0900 +Subject: [PATCH] avoid attr unless wanted + +Upstream-Status: Inappropriate [embedded specific] +--- + lib/replace/wscript | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/lib/replace/wscript b/lib/replace/wscript +index 3593eaf..504a1cb 100644 +--- a/lib/replace/wscript ++++ b/lib/replace/wscript +@@ -968,8 +968,6 @@ def build(bld): if not bld.CONFIG_SET('HAVE_INET_ATON'): REPLACE_SOURCE += ' inet_aton.c' if not bld.CONFIG_SET('HAVE_INET_NTOP'): REPLACE_SOURCE += ' inet_ntop.c' if not bld.CONFIG_SET('HAVE_INET_PTON'): REPLACE_SOURCE += ' inet_pton.c' - if not bld.CONFIG_SET('HAVE_GETXATTR') or bld.CONFIG_SET('XATTR_ADDITIONAL_OPTIONS'): - REPLACE_SOURCE += ' xattr.c' - bld.SAMBA_LIBRARY('replace', - source=REPLACE_SOURCE, -@@ -648,7 +646,7 @@ - # at the moment: + if not bld.CONFIG_SET('HAVE_CLOSEFROM'): + REPLACE_SOURCE += ' closefrom.c' +@@ -984,7 +982,7 @@ def build(bld): # hide_symbols=bld.BUILTIN_LIBRARY('replace'), private_library=True, -- deps='crypt dl nsl socket rt attr' + extra_libs) -+ deps='crypt dl nsl socket rt ' + extra_libs) + provide_builtin_linking=True, +- deps='dl attr' + extra_libs) ++ deps='dl' + extra_libs) - bld.SAMBA_SUBSYSTEM('replace-test', - source='''test/testsuite.c test/strptime.c + replace_test_cflags = '' + if bld.CONFIG_SET('HAVE_WNO_FORMAT_TRUNCATION'): +-- +2.25.1 + diff --git a/meta-networking/recipes-support/libtalloc/libtalloc/run-ptest b/meta-networking/recipes-support/libtalloc/libtalloc/run-ptest new file mode 100644 index 0000000000..84e5381501 --- /dev/null +++ b/meta-networking/recipes-support/libtalloc/libtalloc/run-ptest @@ -0,0 +1,17 @@ +#!/bin/sh + +ptestdir=$(dirname "$(readlink -f "$0")") +cd "$ptestdir"/tests || exit + +tests="replace_testsuite talloc_testsuite" + +for f in $tests +do + if test -x ./"$f"; then + if ./"$f" > ./"$f".out 2> ./"$f".err; then + echo "PASS: $f" + else + echo "FAIL: $f" + fi + fi +done diff --git a/meta-networking/recipes-support/libtalloc/libtalloc_2.1.10.bb b/meta-networking/recipes-support/libtalloc/libtalloc_2.4.2.bb index 23dca15fd8..b617f097cf 100644 --- a/meta-networking/recipes-support/libtalloc/libtalloc_2.1.10.bb +++ b/meta-networking/recipes-support/libtalloc/libtalloc_2.4.2.bb @@ -1,19 +1,22 @@ SUMMARY = "Hierarchical, reference counted memory pool system with destructors" -HOMEPAGE = "http://talloc.samba.org" +HOMEPAGE = "https://talloc.samba.org" SECTION = "libs" -LICENSE = "LGPL-3.0+ & GPL-3.0+" +LICENSE = "LGPL-3.0-or-later & GPL-3.0-or-later" LIC_FILES_CHKSUM = "file://talloc.h;beginline=3;endline=27;md5=a301712782cad6dd6d5228bfa7825249 \ - file://pytalloc.h;beginline=1;endline=18;md5=2c498cc6f2263672483237b20f46b43d" + file://pytalloc.h;beginline=1;endline=18;md5=21ab13bd853679d7d47a1739cb3b7db6 \ + " +export PYTHONHASHSEED="1" +export PYTHONARCHDIR = "${PYTHON_SITEPACKAGES_DIR}" -SRC_URI = "https://samba.org/ftp/talloc/talloc-${PV}.tar.gz \ - file://options-2.1.10.patch \ +SRC_URI = "https://www.samba.org/ftp/talloc/talloc-${PV}.tar.gz \ + file://0001-talloc-Add-configure-options-for-packages.patch \ + file://0002-Fix-pyext_PATTERN-for-cross-compilation.patch \ + file://run-ptest \ " +SRC_URI[sha256sum] = "85ecf9e465e20f98f9950a52e9a411e14320bc555fa257d87697b7e7a9b1d8a6" -SRC_URI[md5sum] = "48b8822a76797bb143e3e38ed738c320" -SRC_URI[sha256sum] = "c985e94bebd6ec2f6af3d95dcc3fcb192a2ddb7781a021d70ee899e26221f619" - -inherit waf-samba +inherit waf-samba pkgconfig ptest PACKAGECONFIG ??= "\ ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)} \ @@ -21,7 +24,6 @@ PACKAGECONFIG ??= "\ " PACKAGECONFIG[acl] = "--with-acl,--without-acl,acl" PACKAGECONFIG[attr] = "--with-attr,--without-attr,attr" -PACKAGECONFIG[libaio] = "--with-libaio,--without-libaio,libaio" PACKAGECONFIG[libbsd] = "--with-libbsd,--without-libbsd,libbsd" PACKAGECONFIG[libcap] = "--with-libcap,--without-libcap,libcap" PACKAGECONFIG[valgrind] = "--with-valgrind,--without-valgrind,valgrind" @@ -30,6 +32,10 @@ SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'attr', '', 'file://avoid-attr S = "${WORKDIR}/talloc-${PV}" +# Cross_compile cannot use preforked process, since fork process earlier than point subproces.popen +# to cross Popen +export WAF_NO_PREFORK="yes" + EXTRA_OECONF += "--disable-rpath \ --disable-rpath-install \ --bundled-libraries=NONE \ @@ -38,13 +44,18 @@ EXTRA_OECONF += "--disable-rpath \ --with-libiconv=${STAGING_DIR_HOST}${prefix}\ " -PACKAGES += "pytalloc pytalloc-dbg pytalloc-dev" +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + install -m 0755 ${B}/bin/*_testsuite ${D}${PTEST_PATH}/tests/ +} + +PACKAGES += "pytalloc pytalloc-dev" + +RPROVIDES:${PN}-dbg += "pytalloc-dbg" -FILES_pytalloc = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/* \ +FILES:pytalloc = "${PYTHON_SITEPACKAGES_DIR}/* \ ${libdir}/libpytalloc-util.so.2 \ ${libdir}/libpytalloc-util.so.2.1.1 \ " -FILES_pytalloc-dbg = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/.debug \ - ${libdir}/.debug/libpytalloc-util.so.2.1.1" -FILES_pytalloc-dev = "${libdir}/libpytalloc-util.so" -RDEPENDS_pytalloc = "python" +FILES:pytalloc-dev = "${libdir}/libpytalloc-util.so" +RDEPENDS:pytalloc = "python3" diff --git a/meta-networking/recipes-support/libtdb/libtdb/tdb-Add-configure-options-for-packages.patch b/meta-networking/recipes-support/libtdb/libtdb/0001-tdb-Add-configure-options-for-packages.patch index 272921e568..5c811c4686 100644 --- a/meta-networking/recipes-support/libtdb/libtdb/tdb-Add-configure-options-for-packages.patch +++ b/meta-networking/recipes-support/libtdb/libtdb/0001-tdb-Add-configure-options-for-packages.patch @@ -1,15 +1,11 @@ -From 24911f36bcb00412e5dc4cd11fda139e09d58798 Mon Sep 17 00:00:00 2001 -From: Huang Qiyu <huangqy.fnst@cn.fujitsu.com> -Date: Tue, 1 Aug 2017 03:12:09 +0900 -Subject: [PATCH] From 10ac5e5fdda44adcc2a159b6f9a2d51a51361057 Mon Sep 17 - 00:00:00 2001 From: Jackie Huang <jackie.huang@windriver.com> Date: Wed, 21 - Sep 2016 10:46:19 +0800 Subject: [PATCH] tdb: Add configure options for - packages +From 613cfb43622f0138edfcf3ad7a8fecc568e17db4 Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Wed, 19 Jun 2019 17:53:34 +0800 +Subject: [PATCH] tdb: Add configure options for packages Add configure options for the following packages: - acl - attr - - libaio - libbsd - libcap - valgrind @@ -18,36 +14,26 @@ Upstream-Status: Inappropriate [oe deterministic build specific] Signed-off-by: Jackie Huang <jackie.huang@windriver.com> -Update for libtdb_1.3.14. +Update to 1.4.0 -Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com> +Signed-off-by: Changqing Li <changqing.li@windriver.com> + +Rebase to 1.4.9 +Remove libaio option +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> + +Rebase to 1.4.10 +Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> --- - lib/replace/system/wscript_configure | 6 ++- - lib/replace/wscript | 85 ++++++++++++++++++++++++++++-------- - wscript | 7 ++- - 3 files changed, 79 insertions(+), 19 deletions(-) + lib/replace/wscript | 101 ++++++++++++++++++++++++++++++-------------- + wscript | 6 +++ + 2 files changed, 76 insertions(+), 31 deletions(-) -diff --git a/lib/replace/system/wscript_configure b/lib/replace/system/wscript_configure -index 2035474..10f9ae7 100644 ---- a/lib/replace/system/wscript_configure -+++ b/lib/replace/system/wscript_configure -@@ -1,6 +1,10 @@ - #!/usr/bin/env python - --conf.CHECK_HEADERS('sys/capability.h') -+import Options -+ -+if Options.options.enable_libcap: -+ conf.CHECK_HEADERS('sys/capability.h') -+ - conf.CHECK_FUNCS('getpwnam_r getpwuid_r getpwent_r') - - # solaris varients of getXXent_r diff --git a/lib/replace/wscript b/lib/replace/wscript -index 7c50e1d..15df5c3 100644 +index 77e655b..e6d50b3 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript -@@ -23,6 +23,41 @@ def set_options(opt): +@@ -25,6 +25,34 @@ def options(opt): opt.PRIVATE_EXTENSION_DEFAULT('') opt.RECURSE('buildtools/wafsamba') @@ -65,13 +51,6 @@ index 7c50e1d..15df5c3 100644 + help=("Disable use of attr"), + action="store_false", dest='enable_attr', default=False) + -+ opt.add_option('--with-libaio', -+ help=("Enable use of libaio"), -+ action="store_true", dest='enable_libaio') -+ opt.add_option('--without-libaio', -+ help=("Disable use of libaio"), -+ action="store_false", dest='enable_libaio', default=False) -+ + opt.add_option('--with-libbsd', + help=("Enable use of libbsd"), + action="store_true", dest='enable_libbsd') @@ -89,7 +68,7 @@ index 7c50e1d..15df5c3 100644 @Utils.run_once def configure(conf): conf.RECURSE('buildtools/wafsamba') -@@ -32,12 +67,25 @@ def configure(conf): +@@ -38,12 +66,21 @@ def configure(conf): conf.DEFINE('HAVE_LIBREPLACE', 1) conf.DEFINE('LIBREPLACE_NETWORK_CHECKS', 1) @@ -98,63 +77,87 @@ index 7c50e1d..15df5c3 100644 + conf.CHECK_HEADERS('linux/types.h crypt.h locale.h compat.h') + conf.CHECK_HEADERS('compat.h ctype.h dustat.h') conf.CHECK_HEADERS('fcntl.h fnmatch.h glob.h history.h krb5.h langinfo.h') -- conf.CHECK_HEADERS('libaio.h locale.h ndir.h pwd.h') + conf.CHECK_HEADERS('locale.h ndir.h pwd.h') - conf.CHECK_HEADERS('shadow.h sys/acl.h') - conf.CHECK_HEADERS('sys/attributes.h attr/attributes.h sys/capability.h sys/dir.h sys/epoll.h') -+ conf.CHECK_HEADERS('locale.h ndir.h pwd.h') + conf.CHECK_HEADERS('shadow.h') + conf.CHECK_HEADERS('sys/attributes.h sys/dir.h sys/epoll.h') -+ + if Options.options.enable_acl: + conf.CHECK_HEADERS('acl/libacl.h sys/acl.h') + + if Options.options.enable_attr: + conf.CHECK_HEADERS('attr/attributes.h attr/xattr.h') + -+ if Options.options.enable_libaio: -+ conf.CHECK_HEADERS('libaio.h') -+ + if Options.options.enable_libcap: + conf.CHECK_HEADERS('sys/capability.h') + - conf.CHECK_HEADERS('port.h') - conf.CHECK_HEADERS('sys/fcntl.h sys/filio.h sys/filsys.h sys/fs/s5param.h sys/fs/vx/quota.h') + conf.CHECK_HEADERS('sys/fcntl.h sys/filio.h sys/filsys.h sys/fs/s5param.h') conf.CHECK_HEADERS('sys/id.h sys/ioctl.h sys/ipc.h sys/mman.h sys/mode.h sys/ndir.h sys/priv.h') -@@ -73,7 +121,9 @@ def configure(conf): - - conf.CHECK_CODE('', headers='rpc/rpc.h rpcsvc/yp_prot.h', define='HAVE_RPCSVC_YP_PROT_H') + conf.CHECK_HEADERS('sys/resource.h sys/security.h sys/shm.h sys/statfs.h sys/statvfs.h sys/termio.h') +@@ -113,8 +150,9 @@ def configure(conf): + conf.CHECK_HEADERS('sys/fileio.h sys/filesys.h sys/dustat.h sys/sysmacros.h') + conf.CHECK_HEADERS('xfs/libxfs.h netgroup.h') -- conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h valgrind/memcheck.h') +- conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h') +- conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h valgrind/callgrind.h') + if Options.options.enable_valgrind: -+ conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h valgrind/memcheck.h') -+ ++ conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h') ++ conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h valgrind/callgrind.h') conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h') conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h') conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h') -@@ -251,17 +301,18 @@ def configure(conf): +@@ -443,31 +481,32 @@ def configure(conf): - conf.CHECK_FUNCS('prctl dirname basename') + strlcpy_in_bsd = False - # libbsd on some platforms provides strlcpy and strlcat - if not conf.CHECK_FUNCS('strlcpy strlcat'): -- conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', -- checklibc=True) +- if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', +- checklibc=True): +- strlcpy_in_bsd = True +- elif conf.env.enable_fuzzing: +- # Just to complicate it more, some versions of Honggfuzz have +- # got strlcpy and strlcat in libc, but not in <string.h> +- # (unless it is there coincidentally, on a BSD). Therefore we +- # can't use CHECK_FUNCS alone to decide whether to add the +- # headers to replace.h. +- # +- # As this is only known to happen on a fuzzing compiler, we'll +- # skip the check when not in fuzzing mode. +- conf.CHECK_HEADERS('bsd/string.h') +- - if not conf.CHECK_FUNCS('getpeereid'): - conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') - if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): - conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h') +- if not conf.CHECK_FUNCS('setproctitle_init'): +- conf.CHECK_FUNCS_IN('setproctitle_init', 'bsd', headers='sys/types.h bsd/unistd.h') - - if not conf.CHECK_FUNCS('closefrom'): - conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') + if Options.options.enable_libbsd: + # libbsd on some platforms provides strlcpy and strlcat + if not conf.CHECK_FUNCS('strlcpy strlcat'): -+ conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', -+ checklibc=True) ++ if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', ++ checklibc=True): ++ strlcpy_in_bsd = True ++ elif conf.env.enable_fuzzing: ++ # Just to complicate it more, some versions of Honggfuzz have ++ # got strlcpy and strlcat in libc, but not in <string.h> ++ # (unless it is there coincidentally, on a BSD). Therefore we ++ # can't use CHECK_FUNCS alone to decide whether to add the ++ # headers to replace.h. ++ # ++ # As this is only known to happen on a fuzzing compiler, we'll ++ # skip the check when not in fuzzing mode. ++ conf.CHECK_HEADERS('bsd/string.h') ++ + if not conf.CHECK_FUNCS('getpeereid'): + conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') + if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): + conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h') ++ if not conf.CHECK_FUNCS('setproctitle_init'): ++ conf.CHECK_FUNCS_IN('setproctitle_init', 'bsd', headers='sys/types.h bsd/unistd.h') + + if not conf.CHECK_FUNCS('closefrom'): + conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') @@ -162,14 +165,13 @@ index 7c50e1d..15df5c3 100644 conf.CHECK_CODE(''' struct ucred cred; diff --git a/wscript b/wscript -index 1c9655a..8c20d3b 100644 +index 2c587fb..b2164b2 100644 --- a/wscript +++ b/wscript -@@ -62,7 +62,12 @@ def set_options(opt): - help=("Disable the use of pthread robust mutexes"), +@@ -69,6 +69,12 @@ def options(opt): action="store_true", dest='disable_tdb_mutex_locking', default=False) -- + + opt.add_option('--with-valgrind', + help=("enable use of valgrind"), + action="store_true", dest='enable_valgrind') @@ -180,5 +182,5 @@ index 1c9655a..8c20d3b 100644 def configure(conf): conf.env.disable_tdb_mutex_locking = getattr(Options.options, -- -2.7.4 +2.34.1 diff --git a/meta-networking/recipes-support/libtdb/libtdb/0002-Fix-pyext_PATTERN-for-cross-compilation.patch b/meta-networking/recipes-support/libtdb/libtdb/0002-Fix-pyext_PATTERN-for-cross-compilation.patch new file mode 100644 index 0000000000..00ec8a4775 --- /dev/null +++ b/meta-networking/recipes-support/libtdb/libtdb/0002-Fix-pyext_PATTERN-for-cross-compilation.patch @@ -0,0 +1,42 @@ +From de39c696a62894fd9c6626d3e2931e42e3407be5 Mon Sep 17 00:00:00 2001 +From: Yi Zhao <yi.zhao@windriver.com> +Date: Wed, 24 Nov 2021 13:33:35 +0800 +Subject: [PATCH] Fix pyext_PATTERN for cross compilation + +The pyext_PATTERN will add native arch as suffix when cross compiling. +For example, on qemuarm64, it is expanded to: +pyext_PATTERN ='%s.cpython-310-x86_64-linux-gnu.so' +which will result in the incorrect library name. + +root@qemuarm64:~# find /usr/lib/python3.10/ -name tdb\* +/usr/lib/python3.10/site-packages/tdb.so +/usr/lib/python3.10/site-packages/tdb.cpython-310-x86_64-linux-gnu.so + +Set pyext_PATTERN to '%s.so' to remove the suffix. +After the patch: +root@qemuarm64:~# find /usr/lib/python3.10/ -name tdb\* +/usr/lib/python3.10/site-packages/tdb.so + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + third_party/waf/waflib/Tools/python.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/third_party/waf/waflib/Tools/python.py b/third_party/waf/waflib/Tools/python.py +index b2dd1a9..2bd3545 100644 +--- a/third_party/waf/waflib/Tools/python.py ++++ b/third_party/waf/waflib/Tools/python.py +@@ -339,7 +339,7 @@ def check_python_headers(conf, features='pyembed pyext'): + x = 'MACOSX_DEPLOYMENT_TARGET' + if dct[x]: + env[x] = conf.environ[x] = str(dct[x]) +- env.pyext_PATTERN = '%s' + (dct['EXT_SUFFIX'] or dct['SO']) # SO is deprecated in 3.5 and removed in 3.11 ++ env.pyext_PATTERN = '%s.so' + + + # Try to get pythonX.Y-config +-- +2.25.1 + diff --git a/meta-networking/recipes-support/libtdb/libtdb/do-not-check-xsltproc-manpages.patch b/meta-networking/recipes-support/libtdb/libtdb/do-not-check-xsltproc-manpages.patch deleted file mode 100644 index bcc45c9fc3..0000000000 --- a/meta-networking/recipes-support/libtdb/libtdb/do-not-check-xsltproc-manpages.patch +++ /dev/null @@ -1,15 +0,0 @@ -Don't check manpages for xsltproc. - -Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com> - ---- tdb-1.3.0.orig/wscript 2015-04-22 09:52:32.366000222 +0900 -+++ tdb-1.3.0/wscript 2015-04-22 09:51:57.720000205 +0900 -@@ -90,7 +90,7 @@ def configure(conf): - not conf.env.disable_tdb_mutex_locking): - conf.define('USE_TDB_MUTEX_LOCKING', 1) - -- conf.CHECK_XSLTPROC_MANPAGES() -+ conf.find_program('xsltproc', var='XSLTPROC') - - if not conf.env.disable_python: - # also disable if we don't have the python libs installed diff --git a/meta-networking/recipes-support/libtdb/libtdb/run-ptest b/meta-networking/recipes-support/libtdb/libtdb/run-ptest new file mode 100644 index 0000000000..7bc56f77c0 --- /dev/null +++ b/meta-networking/recipes-support/libtdb/libtdb/run-ptest @@ -0,0 +1,17 @@ +#!/bin/sh + +ptestdir=$(dirname "$(readlink -f "$0")") +cd "$ptestdir"/tests || exit + +tests=$(find * -type f -name 'tdb1-*') + +for f in replace_testsuite $tests +do + if test -x ./"$f"; then + if ./"$f" > ./"$f".out 2> ./"$f".err; then + echo "PASS: $f" + else + echo "FAIL: $f" + fi + fi +done diff --git a/meta-networking/recipes-support/libtdb/libtdb_1.3.15.bb b/meta-networking/recipes-support/libtdb/libtdb_1.3.15.bb deleted file mode 100644 index 302a306b34..0000000000 --- a/meta-networking/recipes-support/libtdb/libtdb_1.3.15.bb +++ /dev/null @@ -1,44 +0,0 @@ -SUMMARY = "The tdb library" -HOMEPAGE = "http://tdb.samba.org/" -SECTION = "libs" -LICENSE = "LGPL-3.0+ & GPL-3.0+" - -LIC_FILES_CHKSUM = "file://tools/tdbdump.c;endline=18;md5=b59cd45aa8624578126a8c98f48018c4 \ - file://include/tdb.h;endline=27;md5=f5bb544641d3081821bcc1dd58310be6" - -SRC_URI = "https://samba.org/ftp/tdb/tdb-${PV}.tar.gz \ - file://do-not-check-xsltproc-manpages.patch \ - file://tdb-Add-configure-options-for-packages.patch \ -" - -SRC_URI[md5sum] = "60ece3996acc8d85b6f713199da971a6" -SRC_URI[sha256sum] = "b4a1bf3833601bd9f10aff363cb750860aef9ce5b4617989239923192f946728" - -PACKAGECONFIG ??= "\ - ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)} \ -" -PACKAGECONFIG[acl] = "--with-acl,--without-acl,acl" -PACKAGECONFIG[attr] = "--with-attr,--without-attr,attr" -PACKAGECONFIG[libaio] = "--with-libaio,--without-libaio,libaio" -PACKAGECONFIG[libbsd] = "--with-libbsd,--without-libbsd,libbsd" -PACKAGECONFIG[libcap] = "--with-libcap,--without-libcap,libcap" -PACKAGECONFIG[valgrind] = "--with-valgrind,--without-valgrind,valgrind" - -S = "${WORKDIR}/tdb-${PV}" - -inherit waf-samba - -EXTRA_OECONF += "--disable-rpath \ - --bundled-libraries=NONE \ - --builtin-libraries=replace \ - --with-libiconv=${STAGING_DIR_HOST}${prefix}\ - " - -PACKAGES += "tdb-tools python-tdb python-tdb-dbg" - -FILES_${PN} = "${libdir}/*.so.*" -FILES_tdb-tools = "${bindir}/*" -FILES_python-tdb = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*" -FILES_python-tdb-dbg = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/.debug/*" -RDEPENDS_python-tdb = "python" diff --git a/meta-networking/recipes-support/libtdb/libtdb_1.4.10.bb b/meta-networking/recipes-support/libtdb/libtdb_1.4.10.bb new file mode 100644 index 0000000000..bd3f9f63a9 --- /dev/null +++ b/meta-networking/recipes-support/libtdb/libtdb_1.4.10.bb @@ -0,0 +1,63 @@ +SUMMARY = "The tdb library" +HOMEPAGE = "https://tdb.samba.org/" +SECTION = "libs" +LICENSE = "LGPL-3.0-or-later & GPL-3.0-or-later" + +LIC_FILES_CHKSUM = "file://tools/tdbdump.c;endline=18;md5=b59cd45aa8624578126a8c98f48018c4 \ + file://include/tdb.h;endline=27;md5=f5bb544641d3081821bcc1dd58310be6" + +export PYTHONHASHSEED="1" +export PYTHONARCHDIR = "${PYTHON_SITEPACKAGES_DIR}" + +SRC_URI = "https://samba.org/ftp/tdb/tdb-${PV}.tar.gz \ + file://0001-tdb-Add-configure-options-for-packages.patch \ + file://0002-Fix-pyext_PATTERN-for-cross-compilation.patch \ + file://run-ptest \ +" + +SRC_URI[sha256sum] = "02338e33c16c21c9e29571cef523e76b2b708636254f6f30c6cf195d48c62daf" + +PACKAGECONFIG ??= "\ + ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)} \ +" + +PACKAGECONFIG[acl] = "--with-acl,--without-acl,acl" +PACKAGECONFIG[attr] = "--with-attr,--without-attr,attr" +PACKAGECONFIG[libbsd] = "--with-libbsd,--without-libbsd,libbsd" +PACKAGECONFIG[libcap] = "--with-libcap,--without-libcap,libcap" +PACKAGECONFIG[valgrind] = "--with-valgrind,--without-valgrind,valgrind" + +S = "${WORKDIR}/tdb-${PV}" + +inherit waf-samba pkgconfig ptest + +# Cross_compile cannot use preforked process, since fork process earlier than point subproces.popen +# to cross Popen +export WAF_NO_PREFORK="yes" + +EXTRA_OECONF += "--disable-rpath \ + --disable-rpath-install \ + --bundled-libraries=NONE \ + --builtin-libraries=replace \ + --with-libiconv=${STAGING_DIR_HOST}${prefix}\ + " + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + install -m 0755 ${B}/bin/tdb1-* ${D}${PTEST_PATH}/tests/ + install -m 0755 ${B}/bin/replace_testsuite ${D}${PTEST_PATH}/tests/ + install -d ${D}${PTEST_PATH}/tests/test + install -m 0644 ${B}/test/*.tdb ${D}${PTEST_PATH}/tests/test/ + install -m 0644 ${B}/test/*.corrupt ${D}${PTEST_PATH}/tests/test/ +} + +PACKAGES += "tdb-tools python3-tdb" + +RPROVIDES:${PN}-dbg += "python3-tdb-dbg" + +FILES:${PN} = "${libdir}/*.so.*" +FILES:tdb-tools = "${bindir}/*" +FILES:python3-tdb = "${PYTHON_SITEPACKAGES_DIR}/*" +RDEPENDS:python3-tdb = "python3" +INSANE_SKIP:${MLPREFIX}python3-tdb = "dev-so" diff --git a/meta-networking/recipes-support/libtevent/libtevent/options-0.9.33.patch b/meta-networking/recipes-support/libtevent/libtevent/0001-Add-configure-options-for-packages.patch index 84b1a36881..7fdeec61f4 100644 --- a/meta-networking/recipes-support/libtevent/libtevent/options-0.9.33.patch +++ b/meta-networking/recipes-support/libtevent/libtevent/0001-Add-configure-options-for-packages.patch @@ -1,12 +1,11 @@ -From c00f6d35bdc06dffb54daa815e57b44210a5de04 Mon Sep 17 00:00:00 2001 -From: Jackie Huang <jackie.huang@windriver.com> -Date: Wed, 21 Sep 2016 09:57:49 +0800 -Subject: [PATCH] tevent: Add configure options for packages +From c2241d7a1371ece3b89dfdad4861dcf0a152d5d4 Mon Sep 17 00:00:00 2001 +From: Wang Mingyu <wangmy@cn.fujitsu.com> +Date: Fri, 25 Dec 2020 15:03:17 +0900 +Subject: [PATCH] Add configure options for packages Add configure options for the following packages: - acl - attr - - libaio - libbsd - libcap - valgrind @@ -18,34 +17,26 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Modified to apply to version 0.9.33. Signed-off-by: Joe Slater <joe.slater@windriver.com> + +Update patch to version 0.10.0 +Signed-off-by: Changqing Li <changqing.li@windriver.com> + +Update patch to version 0.14.1 +Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> + +Rebase to 0.16.0 +Remove libaio option +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> --- - lib/replace/system/wscript_configure | 6 ++- - lib/replace/wscript | 85 ++++++++++++++++++++++++++++-------- - wscript | 7 ++- - 3 files changed, 79 insertions(+), 19 deletions(-) - mode change 100755 => 100644 wscript + lib/replace/wscript | 100 +++++++++++++++++++++++++++++++------------- + wscript | 6 +++ + 2 files changed, 77 insertions(+), 29 deletions(-) -diff --git a/lib/replace/system/wscript_configure b/lib/replace/system/wscript_configure -index 2035474..10f9ae7 100644 ---- a/lib/replace/system/wscript_configure -+++ b/lib/replace/system/wscript_configure -@@ -1,6 +1,10 @@ - #!/usr/bin/env python - --conf.CHECK_HEADERS('sys/capability.h') -+import Options -+ -+if Options.options.enable_libcap: -+ conf.CHECK_HEADERS('sys/capability.h') -+ - conf.CHECK_FUNCS('getpwnam_r getpwuid_r getpwent_r') - - # solaris varients of getXXent_r diff --git a/lib/replace/wscript b/lib/replace/wscript -index fc43e1a..12d2a70 100644 +index 77e655b..452c741 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript -@@ -23,6 +23,41 @@ def set_options(opt): +@@ -25,6 +25,34 @@ def options(opt): opt.PRIVATE_EXTENSION_DEFAULT('') opt.RECURSE('buildtools/wafsamba') @@ -63,13 +54,6 @@ index fc43e1a..12d2a70 100644 + help=("Disable use of attr"), + action="store_false", dest='enable_attr', default=False) + -+ opt.add_option('--with-libaio', -+ help=("Enable use of libaio"), -+ action="store_true", dest='enable_libaio') -+ opt.add_option('--without-libaio', -+ help=("Disable use of libaio"), -+ action="store_false", dest='enable_libaio', default=False) -+ + opt.add_option('--with-libbsd', + help=("Enable use of libbsd"), + action="store_true", dest='enable_libbsd') @@ -87,7 +71,7 @@ index fc43e1a..12d2a70 100644 @Utils.run_once def configure(conf): conf.RECURSE('buildtools/wafsamba') -@@ -32,12 +67,25 @@ def configure(conf): +@@ -38,12 +66,24 @@ def configure(conf): conf.DEFINE('HAVE_LIBREPLACE', 1) conf.DEFINE('LIBREPLACE_NETWORK_CHECKS', 1) @@ -96,10 +80,9 @@ index fc43e1a..12d2a70 100644 + conf.CHECK_HEADERS('linux/types.h crypt.h locale.h compat.h') + conf.CHECK_HEADERS('compat.h ctype.h dustat.h') conf.CHECK_HEADERS('fcntl.h fnmatch.h glob.h history.h krb5.h langinfo.h') -- conf.CHECK_HEADERS('libaio.h locale.h ndir.h pwd.h') -- conf.CHECK_HEADERS('shadow.h sys/acl.h') -- conf.CHECK_HEADERS('sys/attributes.h attr/attributes.h sys/capability.h sys/dir.h sys/epoll.h') -+ conf.CHECK_HEADERS('locale.h ndir.h pwd.h') + conf.CHECK_HEADERS('locale.h ndir.h pwd.h') + conf.CHECK_HEADERS('shadow.h sys/acl.h') + conf.CHECK_HEADERS('sys/attributes.h attr/attributes.h sys/capability.h sys/dir.h sys/epoll.h') + conf.CHECK_HEADERS('shadow.h') + conf.CHECK_HEADERS('sys/attributes.h sys/dir.h sys/epoll.h') + @@ -109,63 +92,90 @@ index fc43e1a..12d2a70 100644 + if Options.options.enable_attr: + conf.CHECK_HEADERS('attr/attributes.h attr/xattr.h') + -+ if Options.options.enable_libaio: -+ conf.CHECK_HEADERS('libaio.h') -+ + if Options.options.enable_libcap: + conf.CHECK_HEADERS('sys/capability.h') + - conf.CHECK_HEADERS('port.h') - conf.CHECK_HEADERS('sys/fcntl.h sys/filio.h sys/filsys.h sys/fs/s5param.h sys/fs/vx/quota.h') + conf.CHECK_HEADERS('sys/fcntl.h sys/filio.h sys/filsys.h sys/fs/s5param.h') conf.CHECK_HEADERS('sys/id.h sys/ioctl.h sys/ipc.h sys/mman.h sys/mode.h sys/ndir.h sys/priv.h') -@@ -73,7 +121,9 @@ def configure(conf): - - conf.CHECK_CODE('', headers='rpc/rpc.h rpcsvc/yp_prot.h', define='HAVE_RPCSVC_YP_PROT_H') + conf.CHECK_HEADERS('sys/resource.h sys/security.h sys/shm.h sys/statfs.h sys/statvfs.h sys/termio.h') +@@ -113,8 +153,9 @@ def configure(conf): + conf.CHECK_HEADERS('sys/fileio.h sys/filesys.h sys/dustat.h sys/sysmacros.h') + conf.CHECK_HEADERS('xfs/libxfs.h netgroup.h') -- conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h valgrind/memcheck.h') +- conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h') +- conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h valgrind/callgrind.h') + if Options.options.enable_valgrind: -+ conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h valgrind/memcheck.h') -+ ++ conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h') ++ conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h valgrind/callgrind.h') conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h') conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h') conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h') -@@ -248,17 +298,18 @@ def configure(conf): +@@ -443,31 +484,32 @@ def configure(conf): - conf.CHECK_FUNCS('prctl dirname basename') + strlcpy_in_bsd = False - # libbsd on some platforms provides strlcpy and strlcat - if not conf.CHECK_FUNCS('strlcpy strlcat'): -- conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', -- checklibc=True) +- if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', +- checklibc=True): +- strlcpy_in_bsd = True +- elif conf.env.enable_fuzzing: +- # Just to complicate it more, some versions of Honggfuzz have +- # got strlcpy and strlcat in libc, but not in <string.h> +- # (unless it is there coincidentally, on a BSD). Therefore we +- # can't use CHECK_FUNCS alone to decide whether to add the +- # headers to replace.h. +- # +- # As this is only known to happen on a fuzzing compiler, we'll +- # skip the check when not in fuzzing mode. +- conf.CHECK_HEADERS('bsd/string.h') +- - if not conf.CHECK_FUNCS('getpeereid'): - conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') - if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): - conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h') +- if not conf.CHECK_FUNCS('setproctitle_init'): +- conf.CHECK_FUNCS_IN('setproctitle_init', 'bsd', headers='sys/types.h bsd/unistd.h') - - if not conf.CHECK_FUNCS('closefrom'): - conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') + if Options.options.enable_libbsd: + # libbsd on some platforms provides strlcpy and strlcat + if not conf.CHECK_FUNCS('strlcpy strlcat'): -+ conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', -+ checklibc=True) ++ if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', ++ checklibc=True): ++ strlcpy_in_bsd = True ++ elif conf.env.enable_fuzzing: ++ # Just to complicate it more, some versions of Honggfuzz have ++ # got strlcpy and strlcat in libc, but not in <string.h> ++ # (unless it is there coincidentally, on a BSD). Therefore we ++ # can't use CHECK_FUNCS alone to decide whether to add the ++ # headers to replace.h. ++ # ++ # As this is only known to happen on a fuzzing compiler, we'll ++ # skip the check when not in fuzzing mode. ++ conf.CHECK_HEADERS('bsd/string.h') ++ + if not conf.CHECK_FUNCS('getpeereid'): + conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') + if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): + conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h') ++ if not conf.CHECK_FUNCS('setproctitle_init'): ++ conf.CHECK_FUNCS_IN('setproctitle_init', 'bsd', headers='sys/types.h bsd/unistd.h') + + if not conf.CHECK_FUNCS('closefrom'): + conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') conf.CHECK_CODE(''' struct ucred cred; +diff --git a/wscript b/wscript +index d912a8a..484a6fa 100644 --- a/wscript +++ b/wscript -@@ -22,7 +22,12 @@ def set_options(opt): - opt.PRIVATE_EXTENSION_DEFAULT('tevent', noextension='tevent') +@@ -28,6 +28,12 @@ def options(opt): opt.RECURSE('lib/replace') opt.RECURSE('lib/talloc') -- + + opt.add_option('--with-valgrind', + help=("enable use of valgrind"), + action="store_true", dest='enable_valgrind') @@ -176,5 +186,5 @@ index fc43e1a..12d2a70 100644 def configure(conf): conf.RECURSE('lib/replace') -- -2.8.3 +2.25.1 diff --git a/meta-networking/recipes-support/libtevent/libtevent/0002-Fix-pyext_PATTERN-for-cross-compilation.patch b/meta-networking/recipes-support/libtevent/libtevent/0002-Fix-pyext_PATTERN-for-cross-compilation.patch new file mode 100644 index 0000000000..f1b8f8e9b1 --- /dev/null +++ b/meta-networking/recipes-support/libtevent/libtevent/0002-Fix-pyext_PATTERN-for-cross-compilation.patch @@ -0,0 +1,42 @@ +From 2bb7bf2d945d4ea0dafe3858adc6b8faae18b1e8 Mon Sep 17 00:00:00 2001 +From: Yi Zhao <yi.zhao@windriver.com> +Date: Wed, 24 Nov 2021 13:33:35 +0800 +Subject: [PATCH] Fix pyext_PATTERN for cross compilation + +The pyext_PATTERN will add native arch as suffix when cross compiling. +For example, on qemuarm64, it is expanded to: +pyext_PATTERN ='%s.cpython-310-x86_64-linux-gnu.so' +which will result in the incorrect library name. + +root@qemuarm64:~# find /usr/lib/python3.10/ -name \*tevent\*.so +/usr/lib/python3.10/site-packages/_tevent.cpython-310-x86_64-linux-gnu.so +/usr/lib/python3.10/site-packages/_tevent.so + +Set pyext_PATTERN to '%s.so' to remove the suffix. +After the patch: +root@qemuarm64:~# find /usr/lib/python3.10/ -name \*tevent\*.so +/usr/lib/python3.10/site-packages/_tevent.so + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + third_party/waf/waflib/Tools/python.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/third_party/waf/waflib/Tools/python.py b/third_party/waf/waflib/Tools/python.py +index b2dd1a9..2bd3545 100644 +--- a/third_party/waf/waflib/Tools/python.py ++++ b/third_party/waf/waflib/Tools/python.py +@@ -339,7 +339,7 @@ def check_python_headers(conf, features='pyembed pyext'): + x = 'MACOSX_DEPLOYMENT_TARGET' + if dct[x]: + env[x] = conf.environ[x] = str(dct[x]) +- env.pyext_PATTERN = '%s' + (dct['EXT_SUFFIX'] or dct['SO']) # SO is deprecated in 3.5 and removed in 3.11 ++ env.pyext_PATTERN = '%s.so' + + + # Try to get pythonX.Y-config +-- +2.25.1 + diff --git a/meta-networking/recipes-support/libtevent/libtevent/avoid-attr-unless-wanted.patch b/meta-networking/recipes-support/libtevent/libtevent/avoid-attr-unless-wanted.patch index 2fc55239c3..a8cddcd045 100644 --- a/meta-networking/recipes-support/libtevent/libtevent/avoid-attr-unless-wanted.patch +++ b/meta-networking/recipes-support/libtevent/libtevent/avoid-attr-unless-wanted.patch @@ -1,20 +1,35 @@ ---- a/lib/replace/wscript 2015-11-18 15:40:19.000000000 +0100 -+++ b/lib/replace/wscript 2015-11-18 15:48:09.000000000 +0100 -@@ -618,8 +618,6 @@ +From ace8fed037ec3d03f65f861b4da217faff94015b Mon Sep 17 00:00:00 2001 +From: Wang Mingyu <wangmy@cn.fujitsu.com> +Date: Fri, 25 Dec 2020 15:10:58 +0900 +Subject: [PATCH] avoid attr unless wanted + +Upstream-Status: Inappropriate [embedded specific] +--- + lib/replace/wscript | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/lib/replace/wscript b/lib/replace/wscript +index 452c741..61fcde0 100644 +--- a/lib/replace/wscript ++++ b/lib/replace/wscript +@@ -983,8 +983,6 @@ def build(bld): if not bld.CONFIG_SET('HAVE_INET_ATON'): REPLACE_SOURCE += ' inet_aton.c' if not bld.CONFIG_SET('HAVE_INET_NTOP'): REPLACE_SOURCE += ' inet_ntop.c' if not bld.CONFIG_SET('HAVE_INET_PTON'): REPLACE_SOURCE += ' inet_pton.c' - if not bld.CONFIG_SET('HAVE_GETXATTR') or bld.CONFIG_SET('XATTR_ADDITIONAL_OPTIONS'): - REPLACE_SOURCE += ' xattr.c' - bld.SAMBA_LIBRARY('replace', - source=REPLACE_SOURCE, -@@ -630,7 +628,7 @@ - # at the moment: + if not bld.CONFIG_SET('HAVE_CLOSEFROM'): + REPLACE_SOURCE += ' closefrom.c' +@@ -999,7 +997,7 @@ def build(bld): # hide_symbols=bld.BUILTIN_LIBRARY('replace'), private_library=True, -- deps='crypt dl nsl socket rt attr' + extra_libs) -+ deps='crypt dl nsl socket rt ' + extra_libs) + provide_builtin_linking=True, +- deps='dl attr' + extra_libs) ++ deps='dl' + extra_libs) - bld.SAMBA_SUBSYSTEM('replace-test', - source='''test/testsuite.c test/strptime.c + replace_test_cflags = '' + if bld.CONFIG_SET('HAVE_WNO_FORMAT_TRUNCATION'): +-- +2.25.1 + diff --git a/meta-networking/recipes-support/libtevent/libtevent/run-ptest b/meta-networking/recipes-support/libtevent/libtevent/run-ptest new file mode 100644 index 0000000000..19f7a4a3a6 --- /dev/null +++ b/meta-networking/recipes-support/libtevent/libtevent/run-ptest @@ -0,0 +1,17 @@ +#!/bin/sh + +ptestdir=$(dirname "$(readlink -f "$0")") +cd "$ptestdir"/tests || exit + +tests="replace_testsuite test_tevent_tag test_tevent_trace" + +for f in $tests +do + if test -x ./"$f"; then + if ./"$f" > ./"$f".out 2> ./"$f".err; then + echo "PASS: $f" + else + echo "FAIL: $f" + fi + fi +done diff --git a/meta-networking/recipes-support/libtevent/libtevent_0.16.1.bb b/meta-networking/recipes-support/libtevent/libtevent_0.16.1.bb new file mode 100644 index 0000000000..0a37d7977d --- /dev/null +++ b/meta-networking/recipes-support/libtevent/libtevent_0.16.1.bb @@ -0,0 +1,62 @@ +SUMMARY = "Hierarchical, reference counted memory pool system with destructors" +HOMEPAGE = "https://tevent.samba.org" +SECTION = "libs" +LICENSE = "LGPL-3.0-or-later" + +DEPENDS += "libtalloc libtirpc cmocka" +RDEPENDS:python3-tevent = "python3" + +export PYTHONHASHSEED="1" +export PYTHONARCHDIR = "${PYTHON_SITEPACKAGES_DIR}" + +SRC_URI = "https://samba.org/ftp/tevent/tevent-${PV}.tar.gz \ + file://0001-Add-configure-options-for-packages.patch \ + file://0002-Fix-pyext_PATTERN-for-cross-compilation.patch \ + file://run-ptest \ + " + +LIC_FILES_CHKSUM = "file://tevent.h;endline=26;md5=47386b7c539bf2706b7ce52dc9341681" + +SRC_URI[sha256sum] = "362971e0f32dc1905f6fe4736319c4b8348c22dc85aa6c3f690a28efe548029e" + +inherit pkgconfig ptest waf-samba + +PACKAGECONFIG ??= "\ + ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)} \ +" +PACKAGECONFIG[acl] = "--with-acl,--without-acl,acl" +PACKAGECONFIG[attr] = "--with-attr,--without-attr,attr" +PACKAGECONFIG[libbsd] = "--with-libbsd,--without-libbsd,libbsd" +PACKAGECONFIG[libcap] = "--with-libcap,--without-libcap,libcap" +PACKAGECONFIG[valgrind] = "--with-valgrind,--without-valgrind,valgrind" + +SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'attr', '', 'file://avoid-attr-unless-wanted.patch', d)}" + +S = "${WORKDIR}/tevent-${PV}" + +# Cross_compile cannot use preforked process, since fork process earlier than point subproces.popen +# to cross Popen +export WAF_NO_PREFORK="yes" + +EXTRA_OECONF += "--disable-rpath \ + --disable-rpath-install \ + --bundled-libraries=NONE \ + --builtin-libraries=replace \ + --with-libiconv=${STAGING_DIR_HOST}${prefix}\ + --without-gettext \ + " + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + install -m 0755 ${B}/bin/test_tevent_* ${D}${PTEST_PATH}/tests/ + install -m 0755 ${B}/bin/replace_testsuite ${D}${PTEST_PATH}/tests/ +} + +PACKAGES += "python3-tevent" + +RPROVIDES:${PN}-dbg += "python3-tevent-dbg" + +FILES:python3-tevent = "${PYTHON_SITEPACKAGES_DIR}/*" + +INSANE_SKIP:${MLPREFIX}python3-tevent = "dev-so" diff --git a/meta-networking/recipes-support/libtevent/libtevent_0.9.33.bb b/meta-networking/recipes-support/libtevent/libtevent_0.9.33.bb deleted file mode 100644 index f508300692..0000000000 --- a/meta-networking/recipes-support/libtevent/libtevent_0.9.33.bb +++ /dev/null @@ -1,44 +0,0 @@ -SUMMARY = "Hierarchical, reference counted memory pool system with destructors" -HOMEPAGE = "http://tevent.samba.org" -SECTION = "libs" -LICENSE = "LGPLv3+" - -DEPENDS += "libtalloc" -RDEPENDS_python-tevent = "python" - -SRC_URI = "https://samba.org/ftp/tevent/tevent-${PV}.tar.gz \ - file://options-0.9.33.patch \ -" -LIC_FILES_CHKSUM = "file://tevent.h;endline=26;md5=4e458d658cb25e21efc16f720e78b85a" - -SRC_URI[md5sum] = "527a43f35b4251e46f28921342895223" -SRC_URI[sha256sum] = "22712ee981fd4298fcd5f3afb27d87a72257cebad37812cfbd3da5d968ed1bdc" - -inherit waf-samba - -PACKAGECONFIG ??= "\ - ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)} \ -" -PACKAGECONFIG[acl] = "--with-acl,--without-acl,acl" -PACKAGECONFIG[attr] = "--with-attr,--without-attr,attr" -PACKAGECONFIG[libaio] = "--with-libaio,--without-libaio,libaio" -PACKAGECONFIG[libbsd] = "--with-libbsd,--without-libbsd,libbsd" -PACKAGECONFIG[libcap] = "--with-libcap,--without-libcap,libcap" -PACKAGECONFIG[valgrind] = "--with-valgrind,--without-valgrind,valgrind" - -SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'attr', '', 'file://avoid-attr-unless-wanted.patch', d)}" - -S = "${WORKDIR}/tevent-${PV}" - -EXTRA_OECONF += "--disable-rpath \ - --bundled-libraries=NONE \ - --builtin-libraries=replace \ - --with-libiconv=${STAGING_DIR_HOST}${prefix}\ - --without-gettext \ - " - -PACKAGES += "python-tevent python-tevent-dbg" - -FILES_python-tevent = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*" -FILES_python-tevent-dbg = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/.debug" diff --git a/meta-networking/recipes-support/linux-atm/linux-atm/0001-IFNAMSIZ-is-defined-in-net-if.h.patch b/meta-networking/recipes-support/linux-atm/linux-atm/0001-IFNAMSIZ-is-defined-in-net-if.h.patch new file mode 100644 index 0000000000..a7c7093e09 --- /dev/null +++ b/meta-networking/recipes-support/linux-atm/linux-atm/0001-IFNAMSIZ-is-defined-in-net-if.h.patch @@ -0,0 +1,48 @@ +From 29b37e45577c0921846c1709a190f08a3b032666 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 8 Mar 2019 09:08:38 -0800 +Subject: [PATCH] IFNAMSIZ is defined in net/if.h + +Fixes +/mnt/a/yoe/build/tmp/work/qemuriscv64-yoe-linux-musl/linux-atm/2.5.2-r0/recipe-sysroot/usr/include/linux/if_arp.h:121:16: error: 'IFNAMSIZ' undeclared here (not in a function) +| char arp_dev[IFNAMSIZ]; +| ^~~~~~~~ +In file included from ../../../linux-atm-2.5.2/src/arpd/itf.c:17: +/mnt/a/yoe/build/tmp/work/qemuriscv64-yoe-linux-musl/linux-atm/2.5.2-r0/recipe-sysroot/usr/include/linux/if_arp.h:121:16: error: 'IFNAMSIZ' undeclared here (not in a function) +| char arp_dev[IFNAMSIZ]; +| ^~~~~~~~ + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/arpd/arp.c | 1 + + src/arpd/itf.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/src/arpd/arp.c b/src/arpd/arp.c +index 92d3787..ff1574c 100644 +--- a/src/arpd/arp.c ++++ b/src/arpd/arp.c +@@ -17,6 +17,7 @@ + #include <netinet/in.h> /* for ntohs, etc. */ + #define _LINUX_NETDEVICE_H /* very crude hack for glibc2 */ + #include <linux/types.h> ++#include <net/if.h> + #include <linux/if_arp.h> + #include <linux/if_ether.h> + #include <atm.h> +diff --git a/src/arpd/itf.c b/src/arpd/itf.c +index 92f0951..d285e3b 100644 +--- a/src/arpd/itf.c ++++ b/src/arpd/itf.c +@@ -14,6 +14,7 @@ + #include <sys/socket.h> + #define _LINUX_NETDEVICE_H /* glibc2 */ + #include <linux/types.h> ++#include <net/if.h> + #include <linux/if_arp.h> + + #include "atmd.h" +-- +2.21.0 + diff --git a/meta-networking/recipes-support/linux-atm/linux-atm/0001-configure-Check-for-symbol-from-libresolv-instead-of.patch b/meta-networking/recipes-support/linux-atm/linux-atm/0001-configure-Check-for-symbol-from-libresolv-instead-of.patch new file mode 100644 index 0000000000..abae366d28 --- /dev/null +++ b/meta-networking/recipes-support/linux-atm/linux-atm/0001-configure-Check-for-symbol-from-libresolv-instead-of.patch @@ -0,0 +1,28 @@ +From a2a2e1b7a3f4f90e32912b5ba9b79e1a02275775 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 1 Sep 2022 11:17:13 -0700 +Subject: [PATCH] configure: Check for symbol from libresolv instead of main + +This checks will fail with modern autoconf and compilers + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/configure.in ++++ b/configure.in +@@ -45,12 +45,7 @@ AC_CHECK_HEADER(linux/atmsap.h, , + ) + + dnl Check for libraries +-dnl libresolv is required +-AC_CHECK_LIB(resolv, main, , +- AC_MSG_ERROR([*** Unable to find libresolv!!!]) +-) + +-dnl We don't want libresolv everywhere, just with libatm + LIBS="" + + INCLUDES="-I\$(top_srcdir)/src/include" diff --git a/meta-networking/recipes-support/linux-atm/linux-atm/0001-fix-compile-error-with-linux-kernel-v4.8.patch b/meta-networking/recipes-support/linux-atm/linux-atm/0001-fix-compile-error-with-linux-kernel-v4.8.patch index 583a6ca60b..403146e603 100644 --- a/meta-networking/recipes-support/linux-atm/linux-atm/0001-fix-compile-error-with-linux-kernel-v4.8.patch +++ b/meta-networking/recipes-support/linux-atm/linux-atm/0001-fix-compile-error-with-linux-kernel-v4.8.patch @@ -13,7 +13,7 @@ We should exclude the linux time.h by disable linux/atm_zatm.h and move some useful definition in linux/atm_zatm.h to zntune.c to resolve it. -Upstream-status: Pending +Upstream-Status: Pending Signed-off-by: Dengke Du <dengke.du@windriver.com> --- diff --git a/meta-networking/recipes-support/linux-atm/linux-atm/0001-include-string-h-from-memcpy-and-strcpy-function-pro.patch b/meta-networking/recipes-support/linux-atm/linux-atm/0001-include-string-h-from-memcpy-and-strcpy-function-pro.patch new file mode 100644 index 0000000000..81c5efd173 --- /dev/null +++ b/meta-networking/recipes-support/linux-atm/linux-atm/0001-include-string-h-from-memcpy-and-strcpy-function-pro.patch @@ -0,0 +1,87 @@ +From 5217cb7c829cf87771096c4ce41fd4648dca47cb Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 29 Aug 2022 16:36:21 -0700 +Subject: [PATCH] include string,h from memcpy and strcpy function prototype + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/led/address.c | 1 + + src/led/display.c | 1 + + src/lib/unix.c | 1 + + src/maint/hediag.c | 1 + + src/sigd/kernel.c | 1 + + src/sigd/policy.c | 1 + + 6 files changed, 6 insertions(+) + +diff --git a/src/led/address.c b/src/led/address.c +index 574e881..b5c5fbb 100644 +--- a/src/led/address.c ++++ b/src/led/address.c +@@ -31,6 +31,7 @@ + #endif + + #include <sys/ioctl.h> ++#include <string.h> + #include <unistd.h> + #include <errno.h> + +diff --git a/src/led/display.c b/src/led/display.c +index d78a15d..b835e89 100644 +--- a/src/led/display.c ++++ b/src/led/display.c +@@ -5,6 +5,7 @@ + #if HAVE_CONFIG_H + #include <config.h> + #endif ++#include <string.h> + + #include <atm.h> + #include <atmd.h> +diff --git a/src/lib/unix.c b/src/lib/unix.c +index 34aa465..d5bef54 100644 +--- a/src/lib/unix.c ++++ b/src/lib/unix.c +@@ -8,6 +8,7 @@ + + #include <stdlib.h> + #include <stdio.h> ++#include <string.h> + #include <unistd.h> + #include <errno.h> + #include <sys/types.h> +diff --git a/src/maint/hediag.c b/src/maint/hediag.c +index 8a4312a..a4f792f 100644 +--- a/src/maint/hediag.c ++++ b/src/maint/hediag.c +@@ -1,5 +1,6 @@ + #include <stdio.h> + #include <stdlib.h> ++#include <string.h> + #include <unistd.h> + #include <sys/ioctl.h> + #include <sys/types.h> +diff --git a/src/sigd/kernel.c b/src/sigd/kernel.c +index 9ee74b1..2491626 100644 +--- a/src/sigd/kernel.c ++++ b/src/sigd/kernel.c +@@ -8,6 +8,7 @@ + + #include <stdlib.h> + #include <stdio.h> ++#include <string.h> + #include <errno.h> + #include <assert.h> + +diff --git a/src/sigd/policy.c b/src/sigd/policy.c +index 2cfb42d..87223a7 100644 +--- a/src/sigd/policy.c ++++ b/src/sigd/policy.c +@@ -6,6 +6,7 @@ + #include <config.h> + #endif + ++#include <string.h> + #include <atm.h> + #include <atmd.h> + diff --git a/meta-networking/recipes-support/linux-atm/linux-atm/0001-make-Add-PREFIX-knob.patch b/meta-networking/recipes-support/linux-atm/linux-atm/0001-make-Add-PREFIX-knob.patch new file mode 100644 index 0000000000..9c83ef0af4 --- /dev/null +++ b/meta-networking/recipes-support/linux-atm/linux-atm/0001-make-Add-PREFIX-knob.patch @@ -0,0 +1,31 @@ +From 94cb952207e44a5c29578c9c56912190a5422876 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 23 Apr 2022 09:41:51 -0700 +Subject: [PATCH] make: Add PREFIX knob + +This will be used to pass appropriate root prefix which is different +when using usrmerge + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/extra/Makefile.am | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +--- a/src/extra/Makefile.am ++++ b/src/extra/Makefile.am +@@ -8,10 +8,10 @@ BUILT_SOURCES = pca200e.bin pca200e_ecd. + CLEANFILES = pca200e.bin pca200e_ecd.bin2 sba200e_ecd.bin2 + + install-exec-hook: +- $(MKDIR_P) $(DESTDIR)/lib/firmware +- $(INSTALL_DATA) $(builddir)/pca200e.bin $(DESTDIR)/lib/firmware +- $(INSTALL_DATA) $(builddir)/pca200e_ecd.bin2 $(DESTDIR)/lib/firmware +- $(INSTALL_DATA) $(builddir)/sba200e_ecd.bin2 $(DESTDIR)/lib/firmware ++ $(MKDIR_P) $(DESTDIR)$(ROOTPREFIX)/lib/firmware ++ $(INSTALL_DATA) $(builddir)/pca200e.bin $(DESTDIR)$(ROOTPREFIX)/lib/firmware ++ $(INSTALL_DATA) $(builddir)/pca200e_ecd.bin2 $(DESTDIR)$(ROOTPREFIX)/lib/firmware ++ $(INSTALL_DATA) $(builddir)/sba200e_ecd.bin2 $(DESTDIR)$(ROOTPREFIX)/lib/firmware + + %.bin %.bin2: %.data + objcopy -Iihex $< -Obinary $@.gz diff --git a/meta-networking/recipes-support/linux-atm/linux-atm/0001-saaldump-atmdump-Include-linux-sockios.h-for-SIOCGST.patch b/meta-networking/recipes-support/linux-atm/linux-atm/0001-saaldump-atmdump-Include-linux-sockios.h-for-SIOCGST.patch new file mode 100644 index 0000000000..a54869db89 --- /dev/null +++ b/meta-networking/recipes-support/linux-atm/linux-atm/0001-saaldump-atmdump-Include-linux-sockios.h-for-SIOCGST.patch @@ -0,0 +1,59 @@ +From 4456e13880803a300e4b6f263ad22a37481b5df5 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 29 Aug 2019 09:33:43 -0700 +Subject: [PATCH] saaldump,atmdump: Include linux/sockios.h for SIOCGSTAMP + +In linux kernel commit 0768e17073dc527ccd18ed5f96ce85f9985e9115 +the asm-generic/sockios.h header no longer defines SIOCGSTAMP. +Instead it provides only SIOCGSTAMP_OLD. + +The linux/sockios.h header now defines SIOCGSTAMP using either +SIOCGSTAMP_OLD or SIOCGSTAMP_NEW as appropriate. This linux only +header file is not pulled so we get a build failure. + +Fixes +../../../linux-atm-2.5.2/src/maint/atmdump.c:142:18: error: use of undeclared identifier 'SIOCGSTAMP' + if (ioctl(s,SIOCGSTAMP,&stamp) < 0) { + ^ +1 error generated. +make[3]: *** [Makefile:623: atmdump.o] Error 1 +make[3]: *** Waiting for unfinished jobs.... +../../../linux-atm-2.5.2/src/maint/saaldump.c:169:14: error: use of undeclared identifier 'SIOCGSTAMP' + if (ioctl(s,SIOCGSTAMP,&stamp) < 0) { + ^ +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/maint/atmdump.c | 2 +- + src/maint/saaldump.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/maint/atmdump.c b/src/maint/atmdump.c +index 8b17826..9e4853b 100644 +--- a/src/maint/atmdump.c ++++ b/src/maint/atmdump.c +@@ -5,7 +5,7 @@ + #if HAVE_CONFIG_H + #include <config.h> + #endif +- ++#include <linux/sockios.h> + #include <stdlib.h> + #include <stdio.h> + #include <unistd.h> +diff --git a/src/maint/saaldump.c b/src/maint/saaldump.c +index 83bdde9..69429a8 100644 +--- a/src/maint/saaldump.c ++++ b/src/maint/saaldump.c +@@ -5,7 +5,7 @@ + #if HAVE_CONFIG_H + #include <config.h> + #endif +- ++#include <linux/sockios.h> + #include <stdlib.h> + #include <stdarg.h> + #include <stdio.h> +-- +2.23.0 + diff --git a/meta-networking/recipes-support/linux-atm/linux-atm/0002-sigd-Replace-on_exit-API-with-atexit.patch b/meta-networking/recipes-support/linux-atm/linux-atm/0002-sigd-Replace-on_exit-API-with-atexit.patch deleted file mode 100644 index ce061231ca..0000000000 --- a/meta-networking/recipes-support/linux-atm/linux-atm/0002-sigd-Replace-on_exit-API-with-atexit.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 27fa80dc8045e71c30dd2abea835206d5c8f6c71 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 17 Jun 2017 16:18:56 -0700 -Subject: [PATCH 2/3] sigd: Replace on_exit() API with atexit() - -on_exit is not universally available - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/sigd/atmsigd.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/sigd/atmsigd.c b/src/sigd/atmsigd.c -index 52e41c7..b766606 100644 ---- a/src/sigd/atmsigd.c -+++ b/src/sigd/atmsigd.c -@@ -517,7 +517,7 @@ int main(int argc,char **argv) - exit(0); - } - } -- (void) on_exit(trace_on_exit,NULL); -+ atexit(trace_on_exit); - poll_loop(); - close_all(); - for (sig = entities; sig; sig = sig->next) stop_saal(&sig->saal); --- -2.13.1 - diff --git a/meta-networking/recipes-support/linux-atm/linux-atm/install-from-buildir.patch b/meta-networking/recipes-support/linux-atm/linux-atm/install-from-buildir.patch index d1380eb2aa..08cb817f77 100644 --- a/meta-networking/recipes-support/linux-atm/linux-atm/install-from-buildir.patch +++ b/meta-networking/recipes-support/linux-atm/linux-atm/install-from-buildir.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + install binaries from builddir not srcdir. Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com> diff --git a/meta-networking/recipes-support/linux-atm/linux-atm/link-with-ldflags.patch b/meta-networking/recipes-support/linux-atm/linux-atm/link-with-ldflags.patch index 62fad2a54a..8324040da9 100644 --- a/meta-networking/recipes-support/linux-atm/linux-atm/link-with-ldflags.patch +++ b/meta-networking/recipes-support/linux-atm/linux-atm/link-with-ldflags.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + LDFLAGS_FOR_BUILD should be required when doing link for qgen. Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com> diff --git a/meta-networking/recipes-support/linux-atm/linux-atm/musl-no-on_exit.patch b/meta-networking/recipes-support/linux-atm/linux-atm/musl-no-on_exit.patch new file mode 100644 index 0000000000..25211d7c10 --- /dev/null +++ b/meta-networking/recipes-support/linux-atm/linux-atm/musl-no-on_exit.patch @@ -0,0 +1,37 @@ +Description: musl lacks on_exit +Author: Adrian Bunk <bunk@stusta.de> + +Only prints a trace on nonzero exit(), +so can safely be disabled in musl builds. + +Signed-off-by: Adrian Bunk <bunk@stusta.de> +Upstream-Status: Inappropriate [musl specific] + +--- linux-atm-2.5.1.orig/src/sigd/atmsigd.c ++++ linux-atm-2.5.1/src/sigd/atmsigd.c +@@ -283,6 +283,7 @@ static void setup_signals(void) + /* ------------------------------- main ... ------------------------------- */ + + ++#if 0 + static void trace_on_exit(int status,void *dummy) + { + char path[PATH_MAX+1]; +@@ -300,6 +301,7 @@ static void trace_on_exit(int status,voi + dump_trace(file,"Message trace (after error exit)"); + if (file != stderr) (void) fclose(file); + } ++#endif + + + static void manual_override(void) +@@ -517,7 +519,9 @@ int main(int argc,char **argv) + exit(0); + } + } ++#if 0 + (void) on_exit(trace_on_exit,NULL); ++#endif + poll_loop(); + close_all(); + for (sig = entities; sig; sig = sig->next) stop_saal(&sig->saal); diff --git a/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb b/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb index 9fce4fba63..391e0e4ab6 100644 --- a/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb +++ b/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb @@ -1,22 +1,25 @@ SUMMARY = "Drivers and tools to support ATM networking under Linux" HOMEPAGE = "http://linux-atm.sourceforge.net/" SECTION = "libs" -LICENSE = "GPL-2.0 & LGPL-2.0" +LICENSE = "GPL-2.0-only & LGPL-2.0-only" -DEPENDS = "virtual/kernel flex flex-native" - -PACKAGE_ARCH = "${MACHINE_ARCH}" +DEPENDS = "flex flex-native" SRC_URI = "http://nchc.dl.sourceforge.net/project/${BPN}/${BPN}/${PV}/${BPN}-${PV}.tar.gz \ file://link-with-ldflags.patch \ file://install-from-buildir.patch \ file://0001-fix-compile-error-with-linux-kernel-v4.8.patch \ file://0001-ttcp-Add-printf-format-string.patch \ - file://0002-sigd-Replace-on_exit-API-with-atexit.patch \ file://0003-mpoad-Drop-old-hack-to-compile-with-very-old-glibc.patch \ -" + file://0001-IFNAMSIZ-is-defined-in-net-if.h.patch \ + file://0001-saaldump-atmdump-Include-linux-sockios.h-for-SIOCGST.patch \ + file://0001-make-Add-PREFIX-knob.patch \ + file://0001-include-string-h-from-memcpy-and-strcpy-function-pro.patch \ + file://0001-configure-Check-for-symbol-from-libresolv-instead-of.patch \ + " + +SRC_URI:append:libc-musl = " file://musl-no-on_exit.patch" -SRC_URI[md5sum] = "d49499368c3cf15f73a05d9bce8824a8" SRC_URI[sha256sum] = "9645481a2b16476b59220aa2d6bc5bc41043f291326c9b37581018fbd16dd53a" LIC_FILES_CHKSUM = "\ @@ -26,7 +29,10 @@ file://COPYING.LGPL;md5=6e29c688d912da12b66b73e32b03d812" inherit autotools pkgconfig -# The firmware is explicitly put under /lib when installed. -# +EXTRA_OEMAKE += "ROOTPREFIX=${root_prefix}" + +FILES:${PN} += "${nonarch_base_libdir}/firmware" -FILES_${PN} += "/lib/firmware" +# http://errors.yoctoproject.org/Errors/Details/766901/ +# linux-atm-2.5.2/src/led/conn.c:414:57: error: passing argument 3 of 'accept' from incompatible pointer type [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.17.bb b/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.19.bb index 121cc9945e..0243f2a1db 100644 --- a/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.17.bb +++ b/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.19.bb @@ -1,20 +1,20 @@ SUMMARY = "The Linux Kernel Stream Control Transmission Protocol (lksctp) project" HOMEPAGE = "http://lksctp.org" SECTION = "net" -LICENSE = "LGPLv2.1 & GPLv2" +LICENSE = "LGPL-2.1-only & GPL-2.0-only" LIC_FILES_CHKSUM = " \ file://COPYING.lib;md5=0a1b79af951c42a9c8573533fbba9a92 \ file://COPYING;md5=0c56db0143f4f80c369ee3af7425af6e \ " -SRCREV = "736b91d340e3f2519714f2930ed63b164d363511" +SRCREV = "05b50d379ff0037de4957bb2a1befcce88b70225" -PV .= "+git${SRCPV}" -LK_REL = "1.0.17" +PV .= "+git" +LK_REL = "1.0.19" SRC_URI = " \ - git://github.com/sctp/lksctp-tools.git \ + git://github.com/sctp/lksctp-tools.git;branch=master;protocol=https \ file://run-ptest \ file://v4test.sh \ file://v6test.sh \ @@ -24,11 +24,11 @@ S = "${WORKDIR}/git" BBCLASSEXTEND = "native" -inherit autotools pkgconfig binconfig ptest +inherit autotools-brokensep pkgconfig binconfig ptest do_install_ptest () { - install -m 0755 ${WORKDIR}/v4test.sh ${D}${PTEST_PATH} - install -m 0755 ${WORKDIR}/v6test.sh ${D}${PTEST_PATH} + install -m 0755 ${UNPACKDIR}/v4test.sh ${D}${PTEST_PATH} + install -m 0755 ${UNPACKDIR}/v6test.sh ${D}${PTEST_PATH} for testcase in `find ${B}/src/apps/.libs ${B}/src/func_tests/.libs -maxdepth 1 -type f -executable`; do install $testcase ${D}${PTEST_PATH} done @@ -39,24 +39,25 @@ SOLIBMAJORVERSION="1" PACKAGES =+ "${PN}-withsctp ${PN}-utils" -FILES_${PN} = " \ +FILES:${PN} = " \ ${libdir}/libsctp.so.${SOLIBVERSION} \ ${libdir}/libsctp.so.${SOLIBMAJORVERSION} \ " -FILES_${PN}-withsctp = " \ +FILES:${PN}-withsctp = " \ ${libdir}/lksctp-tools/libwithsctp.so.${SOLIBVERSION} \ ${libdir}/lksctp-tools/libwithsctp.so.${SOLIBMAJORVERSION} \ " -FILES_${PN}-dev += " \ +FILES:${PN}-dev += " \ ${libdir}/libsctp.so \ ${libdir}/lksctp-tools/libwithsctp.so \ ${datadir}/lksctp-tools/*.c \ ${datadir}/lksctp-tools/*.h \ " -FILES_${PN}-utils = "${bindir}/*" +FILES:${PN}-utils = "${bindir}/*" -RRECOMMENDS_${PN}-utils += "kernel-module-sctp" -RRECOMMENDS_${PN}-ptest += "kernel-module-sctp" +RRECOMMENDS:${PN} += "kernel-module-sctp" +RRECOMMENDS:${PN}-utils += "kernel-module-sctp" +RRECOMMENDS:${PN}-ptest += "kernel-module-sctp" diff --git a/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-Fix-potential-string-truncation-in-strncpy.patch b/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-Fix-potential-string-truncation-in-strncpy.patch new file mode 100644 index 0000000000..e621d8f2a8 --- /dev/null +++ b/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-Fix-potential-string-truncation-in-strncpy.patch @@ -0,0 +1,139 @@ +From 58b6d9a2efe101e5b80fd708e6f84c7ca779ce93 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 31 May 2018 20:27:43 -0700 +Subject: [PATCH] Fix potential string truncation in strncpy() + +GCC 8 complains about the string truncation during copy + +error: 'strncpy' specified bound 16 equals destination size + +Upstream-Status: Inappropriate [depricated component] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + tests/listen-packet.c | 3 ++- + tests/listen.c | 3 ++- + tests/test2.c | 4 ++-- + tests/test3.c | 3 ++- + tests/test4.c | 3 ++- + tests/test5.c | 3 ++- + tests/test6.c | 3 ++- + tests/test7.c | 3 ++- + 8 files changed, 16 insertions(+), 9 deletions(-) + +diff --git a/tests/listen-packet.c b/tests/listen-packet.c +index e40af81..eae0c71 100644 +--- a/tests/listen-packet.c ++++ b/tests/listen-packet.c +@@ -50,7 +50,8 @@ int main(int argc, char **argv) { + return 1; + } + +- strncpy(req.ifr_name, iface, IF_NAMESIZE); ++ strncpy(req.ifr_name, iface, IF_NAMESIZE - 1); ++ req.ifr_name[IF_NAMESIZE - 1] = '\0'; + ret = ioctl(sd, SIOCGIFINDEX, &req); + if (ret < 0) + perror("ioctl: SIOCGIFINDEX"); +diff --git a/tests/listen.c b/tests/listen.c +index 75c320b..5ce1ed9 100644 +--- a/tests/listen.c ++++ b/tests/listen.c +@@ -47,7 +47,8 @@ int main(int argc, char **argv) { + return 1; + } + +- strncpy(req.ifr_name, iface, IFNAMSIZ); ++ strncpy(req.ifr_name, iface, IFNAMSIZ - 1); ++ req.ifr_name[IF_NAMESIZE - 1] = '\0'; + ret = ioctl(sd, SIOCGIFHWADDR, &req); + if (ret < 0) + perror("ioctl: SIOCGIFHWADDR"); +diff --git a/tests/test2.c b/tests/test2.c +index 58eb74b..5d02838 100644 +--- a/tests/test2.c ++++ b/tests/test2.c +@@ -45,8 +45,8 @@ int main(int argc, char **argv) { + perror("socket"); + return 1; + } +- +- strncpy(req.ifr_name, argv[1] ?: "wpan0", IF_NAMESIZE); ++ strncpy(req.ifr_name, argv[1] ?: "wpan0", IF_NAMESIZE - 1); ++ req.ifr_name[IF_NAMESIZE - 1] = '\0'; + ret = ioctl(sd, SIOCGIFHWADDR, &req); + if (ret < 0) + perror("ioctl: SIOCGIFHWADDR"); +diff --git a/tests/test3.c b/tests/test3.c +index fb36627..2f50a5a 100644 +--- a/tests/test3.c ++++ b/tests/test3.c +@@ -46,7 +46,8 @@ int main(int argc, char **argv) { + return 1; + } + +- strncpy(req.ifr_name, argv[1] ?: "wpan0", IF_NAMESIZE); ++ strncpy(req.ifr_name, argv[1] ?: "wpan0", IF_NAMESIZE - 1); ++ req.ifr_name[IF_NAMESIZE - 1] = '\0'; + ret = ioctl(sd, SIOCGIFHWADDR, &req); + if (ret < 0) + perror("ioctl: SIOCGIFHWADDR"); +diff --git a/tests/test4.c b/tests/test4.c +index 33c274c..8737149 100644 +--- a/tests/test4.c ++++ b/tests/test4.c +@@ -46,7 +46,8 @@ int main(int argc, char **argv) { + return 1; + } + +- strncpy(req.ifr_name, argv[1] ?: "wpan0", IF_NAMESIZE); ++ strncpy(req.ifr_name, argv[1] ?: "wpan0", IF_NAMESIZE - 1); ++ req.ifr_name[IF_NAMESIZE - 1] = '\0'; + ret = ioctl(sd, SIOCGIFHWADDR, &req); + if (ret < 0) + perror("ioctl: SIOCGIFHWADDR"); +diff --git a/tests/test5.c b/tests/test5.c +index 4439dfa..28db562 100644 +--- a/tests/test5.c ++++ b/tests/test5.c +@@ -45,7 +45,8 @@ int main(int argc, char **argv) { + return 1; + } + +- strncpy(req.ifr_name, argv[1] ?: "wpan0", IF_NAMESIZE); ++ strncpy(req.ifr_name, argv[1] ?: "wpan0", IF_NAMESIZE - 1); ++ req.ifr_name[IF_NAMESIZE - 1] = '\0'; + ret = ioctl(sd, SIOCGIFADDR, &req); + if (ret < 0) { + perror("ioctl: SIOCGIFADDR"); +diff --git a/tests/test6.c b/tests/test6.c +index e375bfb..ce7de59 100644 +--- a/tests/test6.c ++++ b/tests/test6.c +@@ -45,7 +45,8 @@ int main(int argc, char **argv) { + return 1; + } + +- strncpy(req.ifr_name, argv[1] ?: "wpan0", IF_NAMESIZE); ++ strncpy(req.ifr_name, argv[1] ?: "wpan0", IF_NAMESIZE - 1); ++ req.ifr_name[IF_NAMESIZE - 1] = '\0'; + ret = ioctl(sd, SIOCGIFADDR, &req); + if (ret < 0) { + perror("ioctl: SIOCGIFADDR"); +diff --git a/tests/test7.c b/tests/test7.c +index e9a5a55..37da22d 100644 +--- a/tests/test7.c ++++ b/tests/test7.c +@@ -58,7 +58,8 @@ int main(int argc, char **argv) { + if (ret) + perror("setsockopt"); + +- strncpy(req.ifr_name, argv[1] ?: "wpan0", IF_NAMESIZE); ++ strncpy(req.ifr_name, argv[1] ?: "wpan0", IF_NAMESIZE - 1); ++ req.ifr_name[IF_NAMESIZE - 1] = '\0'; + ret = ioctl(sd, SIOCGIFHWADDR, &req); + if (ret < 0) + perror("ioctl: SIOCGIFHWADDR"); +-- +2.17.1 + diff --git a/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-Remove-newline-from-format-line.patch b/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-Remove-newline-from-format-line.patch index 1453b75d56..b8fe66f346 100644 --- a/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-Remove-newline-from-format-line.patch +++ b/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-Remove-newline-from-format-line.patch @@ -11,6 +11,8 @@ error: '__builtin___snprintf_chk' output truncated before the last format charac Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + addrdb/addrdb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-addrdb-coord-config-parse.y-add-missing-time.h-inclu.patch b/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-addrdb-coord-config-parse.y-add-missing-time.h-inclu.patch index 0a81a22526..81a3f52d90 100644 --- a/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-addrdb-coord-config-parse.y-add-missing-time.h-inclu.patch +++ b/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-addrdb-coord-config-parse.y-add-missing-time.h-inclu.patch @@ -21,6 +21,8 @@ Yacc. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + addrdb/coord-config-parse.y | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-coordinator-Fix-strncpy-range-warning.patch b/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-coordinator-Fix-strncpy-range-warning.patch new file mode 100644 index 0000000000..aadfae238d --- /dev/null +++ b/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-coordinator-Fix-strncpy-range-warning.patch @@ -0,0 +1,32 @@ +From f017353b8f3170ce79e7addc127056c0142f087b Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 1 Apr 2018 14:31:05 -0700 +Subject: [PATCH] coordinator: Fix strncpy range warning + +Fixes +error: 'strncpy' specified bound 4096 equals destination size [-Werror=stringop-truncation] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + src/coordinator.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/coordinator.c b/src/coordinator.c +index c139aae..ca49418 100644 +--- a/src/coordinator.c ++++ b/src/coordinator.c +@@ -296,7 +296,8 @@ int main(int argc, char **argv) + if(!lease_file) + lease_file = LEASE_FILE; + +- strncpy(pname, argv[0], PATH_MAX); ++ strncpy(pname, argv[0], PATH_MAX - 1); ++ pname[PATH_MAX - 1] = '\0'; + + pid_file = getenv("PID_FILE"); + if (!pid_file) +-- +2.16.3 + diff --git a/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-src-iz.c-Undef-dprintf-before-redefining.patch b/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-src-iz.c-Undef-dprintf-before-redefining.patch index 68393067d0..fec9b5736d 100644 --- a/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-src-iz.c-Undef-dprintf-before-redefining.patch +++ b/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-src-iz.c-Undef-dprintf-before-redefining.patch @@ -7,6 +7,8 @@ Clang is picky and warns about macros redefinition Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + src/iz.c | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb b/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb index be73f8ae4b..f0b7e9184e 100644 --- a/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb +++ b/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb @@ -2,34 +2,38 @@ SUMMARY = "Utilities for managing the Linux LoWPAN stack" DESCRIPTION = "This is a set of utils to manage the Linux LoWPAN stack. \ The LoWPAN stack aims for IEEE 802.15.4-2003 (and for lesser extent IEEE 802.15.4-2006) compatibility." SECTION = "net" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" DEPENDS = "flex-native bison-native libnl python" -PV = "0.3.1+git${SRCPV}" -SRC_URI = "git://git.code.sf.net/p/linux-zigbee/linux-zigbee \ +PV = "0.3.1+git" +SRC_URI = "git://github.com/linux-wpan/lowpan-tools;branch=master;protocol=https \ file://no-help2man.patch \ file://0001-Fix-build-errors-with-clang.patch \ file://0001-addrdb-coord-config-parse.y-add-missing-time.h-inclu.patch \ file://0001-src-iz.c-Undef-dprintf-before-redefining.patch \ file://0001-Remove-newline-from-format-line.patch \ + file://0001-coordinator-Fix-strncpy-range-warning.patch \ + file://0001-Fix-potential-string-truncation-in-strncpy.patch \ " -SRCREV = "38f42dbfce9e13629263db3bd3b81f14c69bb733" +SRCREV = "1c2d8674cc6f4b1166a066e8822e295c105ae7a2" S = "${WORKDIR}/git" -inherit autotools python-dir pkgconfig +inherit autotools python3-dir pkgconfig CACHED_CONFIGUREVARS += "am_cv_python_pythondir=${PYTHON_SITEPACKAGES_DIR}/lowpan-tools" CFLAGS += "-Wno-initializer-overrides" -do_install_append() { +do_install:append() { rmdir ${D}${localstatedir}/run } -FILES_${PN}-dbg += "${libexecdir}/lowpan-tools/.debug/" +FILES:${PN}-dbg += "${libexecdir}/lowpan-tools/.debug/" PACKAGES =+ "${PN}-python" -FILES_${PN}-python = "${libdir}/python*" +FILES:${PN}-python = "${libdir}/python*" + +SKIP_RECIPE[lowpan-tools] ?= "WARNING these tools are deprecated! Use wpan-tools instead" diff --git a/meta-networking/recipes-support/macchanger/macchanger/0001-Fix-musl-build.patch b/meta-networking/recipes-support/macchanger/macchanger/0001-Fix-musl-build.patch new file mode 100644 index 0000000000..5231015701 --- /dev/null +++ b/meta-networking/recipes-support/macchanger/macchanger/0001-Fix-musl-build.patch @@ -0,0 +1,33 @@ +From 12d1cc9da14b0cd0265bca3c4289a335ddf2e357 Mon Sep 17 00:00:00 2001 +From: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> +Date: Mon, 8 Apr 2019 21:00:20 +0200 +Subject: [PATCH] Fix musl build + +Fixes compilation error on musl: +| ../macchanger-1.7.0/src/netinfo.c:116:26: error: expected ';' before 'epa' +| req.ifr_data = (caddr_t)epa; + +Missing data type is defined in <sys/types.h>. + +Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> +--- +Upstream-Status: Pending + + src/netinfo.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/netinfo.c b/src/netinfo.c +index 3525123..1aa3293 100644 +--- a/src/netinfo.c ++++ b/src/netinfo.c +@@ -28,6 +28,7 @@ + #include <string.h> + #include <unistd.h> + #include <sys/ioctl.h> ++#include <sys/types.h> + + #include <linux/ethtool.h> + #include <linux/sockios.h> +-- +2.17.1 + diff --git a/meta-networking/recipes-support/macchanger/macchanger_1.5.0.bb b/meta-networking/recipes-support/macchanger/macchanger_1.5.0.bb deleted file mode 100644 index a90177f19a..0000000000 --- a/meta-networking/recipes-support/macchanger/macchanger_1.5.0.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "Tool to view/change network interface MAC addresses" -DESCRIPTION = "A GNU/Linux utility for viewing/manipulating the MAC address of network interfaces." -HOMEPAGE = "http://www.alobbs.com/macchanger" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -SECTION = "net" - -SRC_URI = "${GNU_MIRROR}/macchanger/${BPN}-${PV}.tar.gz" - -SRC_URI[md5sum] = "79b7cdaeca3d8ebafa764c4b0dd03ab7" -SRC_URI[sha256sum] = "d44bfa27cb29c5a718627cb3ef3aa42eb5130426545eb2031120826cd73fa8fe" - -FILES_${PN} = " \ - ${bindir}/${BPN} \ - ${datadir}/${BPN}/wireless.list \ - ${datadir}/${BPN}/OUI.list \ -" - -FILES_${PN}-doc = " \ - ${datadir}/info \ - ${datadir}/man \ -" - -inherit autotools diff --git a/meta-networking/recipes-support/macchanger/macchanger_1.7.0.bb b/meta-networking/recipes-support/macchanger/macchanger_1.7.0.bb new file mode 100644 index 0000000000..f965c0db1b --- /dev/null +++ b/meta-networking/recipes-support/macchanger/macchanger_1.7.0.bb @@ -0,0 +1,25 @@ +SUMMARY = "Tool to view/change network interface MAC addresses" +DESCRIPTION = "A GNU/Linux utility for viewing/manipulating the MAC address of network interfaces." +HOMEPAGE = "https://github.com/alobbs/macchanger" +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" +SECTION = "net" + +SRC_URI = "https://github.com/alobbs/macchanger/releases/download/${PV}/${BPN}-${PV}.tar.gz \ + file://0001-Fix-musl-build.patch \ +" +SRC_URI[md5sum] = "ca56f16142914337391dac91603eb332" +SRC_URI[sha256sum] = "dae2717c270fd5f62d790dbf80c19793c651b1b26b62c101b82d5fdf25a845bf" + +FILES:${PN} = " \ + ${bindir}/${BPN} \ + ${datadir}/${BPN}/wireless.list \ + ${datadir}/${BPN}/OUI.list \ +" + +FILES:${PN}-doc = " \ + ${datadir}/info \ + ${datadir}/man \ +" + +inherit autotools diff --git a/meta-networking/recipes-support/mctp/mctp_1.1.bb b/meta-networking/recipes-support/mctp/mctp_1.1.bb new file mode 100644 index 0000000000..bf3961be42 --- /dev/null +++ b/meta-networking/recipes-support/mctp/mctp_1.1.bb @@ -0,0 +1,42 @@ +SUMMARY = "Management Component Control Protocol utilities" +HOMEPAGE = "http://www.github.com/CodeConstruct/mctp" +SECTION = "net" +LICENSE = "GPL-2.0-only" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=4cc91856b08b094b4f406a29dc61db21" + +SRCREV = "a591ad885aa28f113cb45870b2fd5bce48378d6f" + +SRC_URI = "git://github.com/CodeConstruct/mctp;branch=main;protocol=https" + +S = "${WORKDIR}/git" + +inherit meson pkgconfig systemd + +PACKAGECONFIG ??= " \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ +" + +# mctpd will only be built if pkg-config detects libsystemd; in which case +# we'll want to declare the dep and install the service. +PACKAGECONFIG[systemd] = ",,systemd,libsystemd" +SYSTEMD_SERVICE:${PN} = "mctpd.service mctp.target mctp-local.target" +SYSTEMD_AUTO_ENABLE:${PN} = "enable" + +do_install:append () { + if ${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'true', 'false', d)}; then + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${S}/conf/mctpd.service \ + ${D}${systemd_system_unitdir}/mctpd.service + install -m 0644 ${S}/conf/*.target \ + ${D}${systemd_system_unitdir}/ + install -d ${D}${datadir}/dbus-1/system.d + install -m 0644 ${S}/conf/mctpd-dbus.conf \ + ${D}${datadir}/dbus-1/system.d/mctpd.conf + fi +} + +FILES:${PN} += " \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', \ + '${datadir}/dbus-1/system.d/mctpd.conf', '', d)} \ +" 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 new file mode 100644 index 0000000000..3867b89052 --- /dev/null +++ b/meta-networking/recipes-support/mdio-tools/mdio-netlink_1.3.1.bb @@ -0,0 +1,14 @@ +require mdio-tools.inc + +DEPENDS += "virtual/kernel libmnl" +# This module requires Linux 5.6 higher + +S = "${WORKDIR}/git" + +inherit module + +EXTRA_OEMAKE = "-C kernel/ KDIR=${STAGING_KERNEL_DIR}" +MODULES_MODULE_SYMVERS_LOCATION="kernel" +MODULES_INSTALL_TARGET = "install" + +RPROVIDES:${PN} += "kernel-module-mdio-netlink" diff --git a/meta-networking/recipes-support/mdio-tools/mdio-tools.inc b/meta-networking/recipes-support/mdio-tools/mdio-tools.inc new file mode 100644 index 0000000000..b99ce82810 --- /dev/null +++ b/meta-networking/recipes-support/mdio-tools/mdio-tools.inc @@ -0,0 +1,8 @@ +DESCRIPTION = "A low-level debug tool for communicating with devices attached to an MDIO bus" +SECTION = "networking" +HOMEPAGE = "https://github.com/wkz/mdio-tools" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://${WORKDIR}/git/COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRC_URI = "git://github.com/wkz/mdio-tools.git;protocol=https;branch=master" +SRCREV = "f74eaf38dbda441df4fcaeb21ca4465957953a2f" diff --git a/meta-networking/recipes-support/mdio-tools/mdio-tools_1.3.1.bb b/meta-networking/recipes-support/mdio-tools/mdio-tools_1.3.1.bb new file mode 100644 index 0000000000..0c64889bc3 --- /dev/null +++ b/meta-networking/recipes-support/mdio-tools/mdio-tools_1.3.1.bb @@ -0,0 +1,9 @@ +require mdio-tools.inc + +DEPENDS += "virtual/kernel libmnl" + +S = "${WORKDIR}/git" + +inherit pkgconfig autotools + +RDEPENDS:${PN} = "kernel-module-mdio-netlink" diff --git a/meta-networking/recipes-support/memcached/memcached/0001-Fix-function-protypes.patch b/meta-networking/recipes-support/memcached/memcached/0001-Fix-function-protypes.patch new file mode 100644 index 0000000000..15ef54f80e --- /dev/null +++ b/meta-networking/recipes-support/memcached/memcached/0001-Fix-function-protypes.patch @@ -0,0 +1,110 @@ +From 6021d3d60e64d9174f41515d2d962df9b5d7645e Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 29 Aug 2022 17:15:28 -0700 +Subject: [PATCH] Fix function protypes + +clang-15+ has started diagnosing them as errors + +thread.c:925:18: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes] +| void STATS_UNLOCK() { +| ^ +| void + +Upstream-Status: Submitted [https://github.com/memcached/memcached/pull/928] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + assoc.c | 4 ++-- + memcached.c | 4 ++-- + slabs.c | 2 +- + testapp.c | 2 +- + thread.c | 4 ++-- + 5 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/assoc.c b/assoc.c +index bc68695..01063a9 100644 +--- a/assoc.c ++++ b/assoc.c +@@ -261,7 +261,7 @@ static void *assoc_maintenance_thread(void *arg) { + + static pthread_t maintenance_tid; + +-int start_assoc_maintenance_thread() { ++int start_assoc_maintenance_thread(void) { + int ret; + char *env = getenv("MEMCACHED_HASH_BULK_MOVE"); + if (env != NULL) { +@@ -279,7 +279,7 @@ int start_assoc_maintenance_thread() { + return 0; + } + +-void stop_assoc_maintenance_thread() { ++void stop_assoc_maintenance_thread(void) { + mutex_lock(&maintenance_lock); + do_run_maintenance_thread = 0; + pthread_cond_signal(&maintenance_cond); +diff --git a/memcached.c b/memcached.c +index 7871fe8..4d3b54a 100644 +--- a/memcached.c ++++ b/memcached.c +@@ -84,7 +84,7 @@ static int try_read_command_udp(conn *c); + static enum try_read_result try_read_network(conn *c); + static enum try_read_result try_read_udp(conn *c); + +-static int start_conn_timeout_thread(); ++static int start_conn_timeout_thread(void); + + /* stats */ + static void stats_init(void); +@@ -374,7 +374,7 @@ static void *conn_timeout_thread(void *arg) { + return NULL; + } + +-static int start_conn_timeout_thread() { ++static int start_conn_timeout_thread(void) { + int ret; + + if (settings.idle_timeout == 0) +diff --git a/slabs.c b/slabs.c +index 3c78d8a..0dadd35 100644 +--- a/slabs.c ++++ b/slabs.c +@@ -638,7 +638,7 @@ static void *memory_allocate(size_t size) { + } + + /* Must only be used if all pages are item_size_max */ +-static void memory_release() { ++static void memory_release(void) { + void *p = NULL; + if (mem_base != NULL) + return; +diff --git a/testapp.c b/testapp.c +index 5face54..387a847 100644 +--- a/testapp.c ++++ b/testapp.c +@@ -80,7 +80,7 @@ static struct conn *con = NULL; + static bool allow_closed_read = false; + static bool enable_ssl = false; + +-static void close_conn() { ++static void close_conn(void) { + if (con == NULL) return; + #ifdef TLS + if (con->ssl) { +diff --git a/thread.c b/thread.c +index d5ed052..f5efdc3 100644 +--- a/thread.c ++++ b/thread.c +@@ -918,11 +918,11 @@ enum store_item_type store_item(item *item, int comm, conn* c) { + + /******************************* GLOBAL STATS ******************************/ + +-void STATS_LOCK() { ++void STATS_LOCK(void) { + pthread_mutex_lock(&stats_lock); + } + +-void STATS_UNLOCK() { ++void STATS_UNLOCK(void) { + pthread_mutex_unlock(&stats_lock); + } + diff --git a/meta-networking/recipes-support/memcached/memcached/memcached-add-hugetlbfs-check.patch b/meta-networking/recipes-support/memcached/memcached/memcached-add-hugetlbfs-check.patch index 544b840fea..45428ed234 100644 --- a/meta-networking/recipes-support/memcached/memcached/memcached-add-hugetlbfs-check.patch +++ b/meta-networking/recipes-support/memcached/memcached/memcached-add-hugetlbfs-check.patch @@ -9,24 +9,19 @@ Signed-off-by: Chong Lu <Chong.Lu@windriver.com> configure.ac | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) -diff --git a/configure.ac b/configure.ac -index 7f22f21..21691b9 100644 --- a/configure.ac +++ b/configure.ac -@@ -314,7 +314,12 @@ fi - dnl ---------------------------------------------------------------------------- +@@ -488,8 +488,12 @@ if test "x$enable_static" = "xyes"; then + fi - AC_SEARCH_LIBS(umem_cache_create, umem) --AC_SEARCH_LIBS(gethugepagesizes, hugetlbfs) + dnl ---------------------------------------------------------------------------- +AC_ARG_ENABLE(hugetlbfs, + [AS_HELP_STRING([--enable-hugetlbfs],[Enable hugetlbfs])]) -+ + +-AC_SEARCH_LIBS(gethugepagesizes, hugetlbfs) +if test "x$enable_hugetlbfs" = "xyes"; then + AC_SEARCH_LIBS(gethugepagesizes, hugetlbfs) +fi AC_HEADER_STDBOOL AH_BOTTOM([#if HAVE_STDBOOL_H --- -1.8.3.4 - diff --git a/meta-networking/recipes-support/memcached/memcached_1.5.0.bb b/meta-networking/recipes-support/memcached/memcached_1.6.17.bb index fd3d171f0c..270ad5486d 100644 --- a/meta-networking/recipes-support/memcached/memcached_1.5.0.bb +++ b/meta-networking/recipes-support/memcached/memcached_1.6.17.bb @@ -12,21 +12,24 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=7e5ded7363d335e1bb18013ca08046ff" -inherit autotools +inherit autotools pkgconfig DEPENDS += "libevent" -RDEPENDS_${PN} += "perl perl-module-posix perl-module-autoloader \ +RDEPENDS:${PN} += "perl perl-module-posix perl-module-autoloader \ perl-module-tie-hash bash \ " SRC_URI = "http://www.memcached.org/files/${BP}.tar.gz \ file://memcached-add-hugetlbfs-check.patch \ + file://0001-Fix-function-protypes.patch \ " -SRC_URI[md5sum] = "81326513f60d7ba482f8131975cd55ae" -SRC_URI[sha256sum] = "c001f812024bb461b5e4d7d0506daab63dff9614eea26f46536c3b7e1e601c32" +SRC_URI[sha256sum] = "2055e373613d8fc21529aff9f0adce3e23b9ce01ba0478d30e7941d9f2bd1224" # set the same COMPATIBLE_HOST as libhugetlbfs -COMPATIBLE_HOST = '(i.86|x86_64|powerpc|powerpc64|arm).*-linux' +COMPATIBLE_HOST = "(i.86|x86_64|powerpc|powerpc64|aarch64|arm).*-linux*" + +# assoc.c:83:9: error: variable 'depth' set but not used [-Werror,-Wunused-but-set-variable] +CFLAGS:append:toolchain-clang = " -Wno-error=unused-but-set-variable" python __anonymous () { endianness = d.getVar('SITEINFO_ENDIANNESS') @@ -44,7 +47,7 @@ inherit update-rc.d INITSCRIPT_NAME = "memcached" INITSCRIPT_PARAMS = "defaults" -do_install_append() { +do_install:append() { install -D -m 755 ${S}/scripts/memcached-init ${D}${sysconfdir}/init.d/memcached mkdir -p ${D}/usr/share/memcached/scripts install -m 755 ${S}/scripts/memcached-tool ${D}/usr/share/memcached/scripts diff --git a/meta-networking/recipes-support/mtr/mtr_0.87.bb b/meta-networking/recipes-support/mtr/mtr_0.95.bb index 9d3275e2d2..92f9c4bfc0 100644 --- a/meta-networking/recipes-support/mtr/mtr_0.87.bb +++ b/meta-networking/recipes-support/mtr/mtr_0.95.bb @@ -4,14 +4,12 @@ HOMEPAGE = "http://www.bitwizard.nl/mtr/" SECTION = "net" DEPENDS = "ncurses" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://ui/mtr.c;beginline=5;endline=16;md5=af1fafbbfa1bfd48af839f4bb3221106" + file://ui/mtr.c;beginline=5;endline=16;md5=00a894a39d53726a27386534d1c4e468" -PV .= "+git${SRCPV}" - -SRCREV = "e6d0a7e93129e8023654ebf58dfa8135d1b1af56" -SRC_URI = "git://github.com/traviscross/mtr" +SRCREV = "852e5617fbf331cf292723702161f0ac9afe257c" +SRC_URI = "git://github.com/traviscross/mtr;branch=master;protocol=https" S = "${WORKDIR}/git" @@ -24,4 +22,4 @@ PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," PACKAGES += "${PN}-bash-completions" -FILES_${PN}-bash-completions = "${datadir}/bash-completion/" +FILES:${PN}-bash-completions = "${datadir}/bash-completion/" 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 0000000000..15b439e255 --- /dev/null +++ b/meta-networking/recipes-support/nbd/nbd/0001-nbd-client-Fix-build-on-musl-gcc14.patch @@ -0,0 +1,43 @@ +From 909d20a2ee4afecd5ae4cc5950c8ee599f72972d Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 20 May 2024 17:48:13 -0700 +Subject: [PATCH] nbd-client: Fix build on musl + gcc14 + +GCC-14 has promoted incompatible-pointer-types warning into error which is +now flagged especially with when building on musl + +Fixes following error + +| ../nbd-3.26.1/nbd-client.c: In function 'openunix': +| ../nbd-3.26.1/nbd-client.c:345:27: error: passing argument 2 of 'connect' from incompatible pointer type [-Wincompatible-pointer-types] +| 345 | if (connect(sock, &un_addr, sizeof(un_addr)) == -1) { +| | ^~~~~~~~ +| | | +| | struct sockaddr_un * +| In file included from ../nbd-3.26.1/nbd-client.c:25: +| /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 *' +| 386 | int connect (int, const struct sockaddr *, socklen_t); +| | ^~~~~~~~~~~~~~~~~~~~~~~ + +Upstream-Status: Submitted [https://lists.debian.org/nbd/2024/05/msg00012.html] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + nbd-client.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/nbd-client.c b/nbd-client.c +index 8d1101b..7b25c67 100644 +--- a/nbd-client.c ++++ b/nbd-client.c +@@ -342,7 +342,7 @@ int openunix(const char *path) { + return -1; + }; + +- if (connect(sock, &un_addr, sizeof(un_addr)) == -1) { ++ if (connect(sock, (struct sockaddr*)&un_addr, sizeof(un_addr)) == -1) { + err_nonfatal("CONNECT failed"); + close(sock); + return -1; +-- +2.45.1 + 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 0000000000..716ded55be --- /dev/null +++ b/meta-networking/recipes-support/nbd/nbd/f0418b0d8b54c21a1e5b0c6dce3277e938d07e7c.patch @@ -0,0 +1,50 @@ +From f0418b0d8b54c21a1e5b0c6dce3277e938d07e7c Mon Sep 17 00:00:00 2001 +From: Dave Jones <dave.jones@canonical.com> +Date: Thu, 14 Mar 2024 11:13:05 +0000 +Subject: [PATCH] Fix the check & no cases of enable_manpages + +Currently, running "configure --disable-manpages" while docbook2man *is* +installed results in the error "don't know what to do here" when it +should disable manpages. + +There also appears to be a missing conditional at the start of the line; +there's closing un-matched ]) at the end of the line. Still, at this +point the check can be done in pure shell; no need for AC macros. I've +also removed the confusing m4_divert_text call on the check case. Not +sure why that was there, but it appears unnecessary. + +Upstream-Status: Backport [https://github.com/NetworkBlockDevice/nbd/commit/f0418b0d8b54c21a1e5b0c6dce3277e938d07e7c] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 13 +++++++++---- + 1 file changed, 9 insertions(+), 4 deletions(-) + +--- a/configure.ac ++++ b/configure.ac +@@ -328,7 +328,7 @@ AC_MSG_CHECKING([whether man pages are r + AC_ARG_ENABLE([manpages], + AS_HELP_STRING([--disable-manpages], [Do not install man pages]), + [], +- [: m4_divert_text([DEFAULTS], [enable_manpages=check])] ++ [enable_manpages=check] + ) + AC_MSG_RESULT([$enable_manpages]) + +@@ -337,9 +337,14 @@ AS_IF([test "x$enable_manpages" != "xno" + ]) + AS_IF([test "x$enable_manpages" = "xyes" -a "x$DB2M" = "x"], [ + AC_MSG_ERROR([docbook2man not found, but is required to build manpages]) +- ], +- [test "x$DB2M" != "x"], [enable_manpages=yes], +- [AC_MSG_ERROR([don't know what to do here])]) ++ ]) ++if test "x$enable_manpages" = "xcheck"; then ++ if test "x$DB2M" = "x"; then ++ enable_manpages=no ++ else ++ enable_manpages=yes ++ fi ++fi + AC_MSG_CHECKING([whether to build manpages]) + AC_MSG_RESULT([$enable_manpages]) + diff --git a/meta-networking/recipes-support/nbd/nbd_3.11.bb b/meta-networking/recipes-support/nbd/nbd_3.11.bb deleted file mode 100644 index 2ad75bda6b..0000000000 --- a/meta-networking/recipes-support/nbd/nbd_3.11.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "Network Block Device" -HOMEPAGE = "http://nbd.sourceforge.net" -SECTION = "net" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -DEPENDS = "glib-2.0" - -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "73d11644a28b9f335292cdb3bdc4b74b" -SRC_URI[sha256sum] = "14420f74cb16dc609a9302ed1efd653064bed7a8357e9d73daabc33608e3f2a0" - -inherit autotools pkgconfig - -PACKAGES = "${PN}-client ${PN}-server ${PN}-dbg ${PN}-trdump ${PN}-doc" - -FILES_${PN}-client = "${sbindir}/${BPN}-client" -FILES_${PN}-server = "${bindir}/${BPN}-server" -FILES_${PN}-trdump = "${bindir}/${BPN}-trdump" 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 0000000000..a69d35fa96 --- /dev/null +++ b/meta-networking/recipes-support/nbd/nbd_3.26.1.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "Network Block Device user-space tools (TCP version)" +HOMEPAGE = "https://github.com/NetworkBlockDevice/nbd" +SECTION = "net" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = "autoconf-archive bison-native glib-2.0 libnl zlib bison-native" + +SRC_URI = "https://github.com/NetworkBlockDevice/${BPN}/releases/download/${BP}/${BP}.tar.xz \ + file://f0418b0d8b54c21a1e5b0c6dce3277e938d07e7c.patch \ + file://0001-nbd-client-Fix-build-on-musl-gcc14.patch \ + " +SRC_URI[sha256sum] = "f0cf509fa5b20b1a07f7904eb637e9b47d3e30b6ed6f00075af5d8b701c78fef" + +inherit autotools pkgconfig + +EXTRA_OECONF += "--enable-syslog --enable-lfs --disable-manpages" + +PACKAGES = "${PN}-client ${PN}-dbg ${PN}-doc ${PN}-server ${PN}-trdump ${PN}-trplay" + +FILES:${PN}-client = "${sbindir}/${BPN}-client" +FILES:${PN}-server = "${bindir}/${BPN}-server" +FILES:${PN}-trdump = "${bindir}/${BPN}-trdump" +FILES:${PN}-trplay = "${bindir}/${BPN}-trplay" diff --git a/meta-networking/recipes-support/nbdkit/nbdkit/0001-plugins-Avoid-absolute-buildpaths-in-binaries.patch b/meta-networking/recipes-support/nbdkit/nbdkit/0001-plugins-Avoid-absolute-buildpaths-in-binaries.patch new file mode 100644 index 0000000000..75377dfb80 --- /dev/null +++ b/meta-networking/recipes-support/nbdkit/nbdkit/0001-plugins-Avoid-absolute-buildpaths-in-binaries.patch @@ -0,0 +1,38 @@ +From 1ccbd8fdbd2e367a702e48c8703b2f010d067b23 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 22 May 2023 18:16:24 -0700 +Subject: [PATCH] plugins: Avoid absolute buildpaths in binaries + +plugins seems to add CC to the plugins shared objects via compiler +cmdline which ends up in real code. Therefore scrub buildpaths from CC +and CFLAGS before passing them to plugin's build. + +Upstream-Status: Submitted [https://gitlab.com/nbdkit/nbdkit/-/merge_requests/30] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + plugins/cc/Makefile.am | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/plugins/cc/Makefile.am b/plugins/cc/Makefile.am +index df8b5d15..80586a17 100644 +--- a/plugins/cc/Makefile.am ++++ b/plugins/cc/Makefile.am +@@ -44,9 +44,12 @@ nbdkit_cc_plugin_la_SOURCES = \ + $(top_srcdir)/include/nbdkit-plugin.h \ + $(NULL) + ++workdir := $(shell dirname $(abs_top_builddir)) ++cc_no_sysroot := $(shell echo \"$(CC)\"|sed -e 's#$(workdir)#<WORKDIR>#g') ++cflags_no_sysroot := $(shell echo \"$(CFLAGS)\"|sed -e 's#$(workdir)#<WORKDIR>#g') + nbdkit_cc_plugin_la_CPPFLAGS = \ +- -DCC="\"$(CC)\"" \ +- -DCFLAGS="\"$(CFLAGS)\"" \ ++ -DCC=\"$(cc_no_sysroot)\" \ ++ -DCFLAGS=\"$(cflags_no_sysroot)\" \ + -I$(top_srcdir)/include \ + -I$(top_builddir)/include \ + -I$(top_srcdir)/common/include \ +-- +2.40.1 + diff --git a/meta-networking/recipes-support/nbdkit/nbdkit_1.33.11.bb b/meta-networking/recipes-support/nbdkit/nbdkit_1.33.11.bb new file mode 100644 index 0000000000..cdf2677f13 --- /dev/null +++ b/meta-networking/recipes-support/nbdkit/nbdkit_1.33.11.bb @@ -0,0 +1,33 @@ +SUMMARY = "nbdkit is a toolkit for creating NBD servers." +DESCRIPTION = "NBD — Network Block Device — is a protocol \ +for accessing Block Devices (hard disks and disk-like things) \ +over a Network. \ +\ +nbdkit is a toolkit for creating NBD servers." + +HOMEPAGE = "https://github.com/libguestfs/nbdkit" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=26250adec854bc317493f6fb98efe049" + +SRC_URI = "git://github.com/libguestfs/nbdkit.git;protocol=https;branch=master \ + file://0001-plugins-Avoid-absolute-buildpaths-in-binaries.patch" +SRCREV = "6c02c6a469d62a047f230b0ccf03f72328312d2b" + +S = "${WORKDIR}/git" + +DEPENDS = "curl xz e2fsprogs zlib" + +# autotools-brokensep is needed as nbdkit does not support build in external directory +inherit pkgconfig python3native perlnative bash-completion autotools-brokensep + +# Those are required to build standalone +EXTRA_OECONF = " --without-libvirt --without-libguestfs --disable-perl" + +# Disable some extended support (not desired for small embedded systems) +#EXTRA_OECONF += " --disable-python" +#EXTRA_OECONF += " --disable-ocaml" +#EXTRA_OECONF += " --disable-rust" +#EXTRA_OECONF += " --disable-ruby" +#EXTRA_OECONF += " --disable-tcl" +#EXTRA_OECONF += " --disable-lua" +#EXTRA_OECONF += " --disable-vddk" diff --git a/meta-networking/recipes-support/ncp/libowfat/0001-Depend-on-haveuint128.h-for-umult64.c.patch b/meta-networking/recipes-support/ncp/libowfat/0001-Depend-on-haveuint128.h-for-umult64.c.patch new file mode 100644 index 0000000000..6226e2c038 --- /dev/null +++ b/meta-networking/recipes-support/ncp/libowfat/0001-Depend-on-haveuint128.h-for-umult64.c.patch @@ -0,0 +1,44 @@ +From 7f6a104a682d59f28f7df889129f4467cc45e912 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 6 Nov 2019 19:55:42 -0800 +Subject: [PATCH] Depend on haveuint128.h for umult64.c + +This fixes parallel build issue e.g. +mult/umult64.c:9:10: fatal error: 'haveuint128.h' file not found + ^~~~~~~~~~~~~~~ + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + GNUmakefile | 1 + + Makefile | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/GNUmakefile b/GNUmakefile +index 3f3193d..751ca60 100644 +--- a/GNUmakefile ++++ b/GNUmakefile +@@ -126,6 +126,7 @@ $(CDB_OBJS): cdb.h uint32.h + $(CRITBIT_OBJS): critbit.h + + mult64.o: haveuint128.h ++umult64.o: haveuint128.h + + + iob_addbuf.o iob_addfile.o iob_new.o iob_reset.o iob_send.o: iob_internal.h iob.h +diff --git a/Makefile b/Makefile +index 0d08da4..02df6c6 100644 +--- a/Makefile ++++ b/Makefile +@@ -430,7 +430,7 @@ range_str4inbuf.o: mult/range_str4inbuf.c rangecheck.h + range_strinbuf.o: mult/range_strinbuf.c rangecheck.h + umult16.o: mult/umult16.c uint16.h + umult32.o: mult/umult32.c uint32.h +-umult64.o: mult/umult64.c uint64.h ++umult64.o: mult/umult64.c uint64.h haveuint128.h + open_append.o: open/open_append.c open.h + open_excl.o: open/open_excl.c open.h + open_read.o: open/open_read.c open.h +-- +2.24.0 + diff --git a/meta-networking/recipes-support/ncp/libowfat/0001-replace-__pure__-with-compiler-attribute-pure.patch b/meta-networking/recipes-support/ncp/libowfat/0001-replace-__pure__-with-compiler-attribute-pure.patch new file mode 100644 index 0000000000..880d80b106 --- /dev/null +++ b/meta-networking/recipes-support/ncp/libowfat/0001-replace-__pure__-with-compiler-attribute-pure.patch @@ -0,0 +1,562 @@ +From 408e7dfaf2eb735804f62728de679972867c30d5 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 3 May 2021 13:53:10 -0700 +Subject: [PATCH] replace __pure__ with compiler attribute 'pure' + +Remove defining __deprecated__ + +Upstream-Status: Inappropriate [Untested with dietlibc] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + byte.h | 22 ++++++---- + critbit.h | 12 ++++-- + fmt.h | 100 +++++++++++++++++++++++--------------------- + str.h | 22 ++++++---- + stralloc.h | 20 +++++---- + 5 files changed, 103 insertions(+), 73 deletions(-) + +--- a/byte.h ++++ b/byte.h +@@ -2,6 +2,16 @@ + #ifndef BYTE_H + #define BYTE_H + ++#ifndef __has_attribute ++ #define __has_attribute(x) 0 ++#endif ++ ++#if __has_attribute(pure) ++#define __PURE __attribute__ ((pure)) ++#else ++#define __PURE ++#endif ++ + /* for size_t: */ + #include <stddef.h> + +@@ -9,17 +19,13 @@ + extern "C" { + #endif + +-#ifndef __pure__ +-#define __pure__ +-#endif +- + /* byte_chr returns the smallest integer i between 0 and len-1 + * inclusive such that one[i] equals needle, or len if not found. */ +-size_t byte_chr(const void* haystack, size_t len, char needle) __pure__; ++size_t byte_chr(const void* haystack, size_t len, char needle) __PURE; + + /* byte_rchr returns the largest integer i between 0 and len-1 inclusive + * such that one[i] equals needle, or len if not found. */ +-size_t byte_rchr(const void* haystack,size_t len,char needle) __pure__; ++size_t byte_rchr(const void* haystack,size_t len,char needle) __PURE; + + /* byte_copy copies in[0] to out[0], in[1] to out[1], ... and in[len-1] + * to out[len-1]. */ +@@ -34,14 +40,14 @@ void byte_copyr(void* out, size_t len, c + * than, equal to, or greater than the string b[0], b[1], ..., + * b[len-1]. When the strings are different, byte_diff does not read + * bytes past the first difference. */ +-int byte_diff(const void* a, size_t len, const void* b) __pure__; ++int byte_diff(const void* a, size_t len, const void* b) __PURE; + + /* byte_zero sets the bytes out[0], out[1], ..., out[len-1] to 0 */ + void byte_zero(void* out, size_t len); + + #define byte_equal(s,n,t) (!byte_diff((s),(n),(t))) + +-int byte_equal_notimingattack(const void* a, size_t len,const void* b) __pure__; ++int byte_equal_notimingattack(const void* a, size_t len,const void* b) __PURE; + + #if defined(__i386__) || defined(__x86_64__) + #define UNALIGNED_ACCESS_OK +--- a/critbit.h ++++ b/critbit.h +@@ -8,15 +8,21 @@ extern "C" { + /* for __pure__ if we are compiling under dietlibc */ + #include <stddef.h> + +-#ifndef __pure__ +-#define __pure__ ++#ifndef __has_attribute ++ #define __has_attribute(x) 0 ++#endif ++ ++#if __has_attribute(pure) ++#define __PURE __attribute__ ((pure)) ++#else ++#define __PURE + #endif + + typedef struct { + void *root; + } critbit0_tree; + +-int critbit0_contains(critbit0_tree *t, const char *u) __pure__; ++int critbit0_contains(critbit0_tree *t, const char *u) __PURE; + int critbit0_insert(critbit0_tree *t, const char *u); + int critbit0_delete(critbit0_tree *t, const char *u); + void critbit0_clear(critbit0_tree *t); +--- a/fmt.h ++++ b/fmt.h +@@ -2,6 +2,16 @@ + #ifndef FMT_H + #define FMT_H + ++#ifndef __has_attribute ++ #define __has_attribute(x) 0 ++#endif ++ ++#if __has_attribute(pure) ++#define __PURE __attribute__ ((pure)) ++#else ++#define __PURE ++#endif ++ + /* for size_t: */ + #include <stddef.h> + /* for uint32_t */ +@@ -15,10 +25,6 @@ + extern "C" { + #endif + +-#ifndef __pure__ +-#define __pure__ +-#endif +- + #define FMT_LONG 41 /* enough space to hold -2^127 in decimal, plus \0 */ + #define FMT_ULONG 40 /* enough space to hold 2^128 - 1 in decimal, plus \0 */ + #define FMT_8LONG 44 /* enough space to hold 2^128 - 1 in octal, plus \0 */ +@@ -46,31 +52,31 @@ extern "C" { + /* convert signed src integer -23 to ASCII '-','2','3', return number of + * bytes of value in output format (3 in this example). + * If dest is not NULL, write result to dest */ +-size_t fmt_long(char *dest,signed long src) __pure__; ++size_t fmt_long(char *dest,signed long src) __PURE; + + /* convert unsigned src integer 23 to ASCII '2','3', return number of + * bytes of value in output format (2 in this example). + * If dest is not NULL, write result to dest */ +-size_t fmt_ulong(char *dest,unsigned long src) __pure__; ++size_t fmt_ulong(char *dest,unsigned long src) __PURE; + + /* convert unsigned src integer 0x23 to ASCII '2','3', return number of + * bytes of value in output format (2 in this example). + * If dest is not NULL, write result to dest */ +-size_t fmt_xlong(char *dest,unsigned long src) __pure__; ++size_t fmt_xlong(char *dest,unsigned long src) __PURE; + + /* convert unsigned src integer 023 to ASCII '2','3', return number of + * bytes of value in output format (2 in this example). + * If dest is not NULL, write result to dest */ +-size_t fmt_8long(char *dest,unsigned long src) __pure__; ++size_t fmt_8long(char *dest,unsigned long src) __PURE; + + /* like fmt_long but for long long */ +-size_t fmt_longlong(char *dest,signed long long src) __pure__; ++size_t fmt_longlong(char *dest,signed long long src) __PURE; + + /* like fmt_ulong but for unsigned long long */ +-size_t fmt_ulonglong(char *dest,unsigned long long src) __pure__; ++size_t fmt_ulonglong(char *dest,unsigned long long src) __PURE; + + /* like fmt_xlong but for unsigned long long */ +-size_t fmt_xlonglong(char *dest,unsigned long long src) __pure__; ++size_t fmt_xlonglong(char *dest,unsigned long long src) __PURE; + + #define fmt_uint(dest,src) fmt_ulong(dest,src) + #define fmt_int(dest,src) fmt_long(dest,src) +@@ -81,22 +87,22 @@ size_t fmt_xlonglong(char *dest,unsigned + * Does not truncate! */ + /* fmt_ulong0(buf,23,4) -> '0','0','2','3' return 4 */ + /* fmt_ulong0(buf,234,2) -> '2','3','4', return 3 */ +-size_t fmt_ulong0(char *,unsigned long src,size_t padto) __pure__; ++size_t fmt_ulong0(char *,unsigned long src,size_t padto) __PURE; + + #define fmt_uint0(buf,src,padto) fmt_ulong0(buf,src,padto) + + /* convert src double 1.7 to ASCII '1','.','7', return length. + * If dest is not NULL, write result to dest */ +-size_t fmt_double(char *dest, double d,int max,int prec) __pure__; ++size_t fmt_double(char *dest, double d,int max,int prec) __PURE; + + /* if src is negative, write '-' and return 1. + * if src is positive, write '+' and return 1. + * otherwise return 0 */ +-size_t fmt_plusminus(char *dest,int src) __pure__; ++size_t fmt_plusminus(char *dest,int src) __PURE; + + /* if src is negative, write '-' and return 1. + * otherwise return 0. */ +-size_t fmt_minus(char *dest,int src) __pure__; ++size_t fmt_minus(char *dest,int src) __PURE; + + /* copy str to dest until \0 byte, return number of copied bytes. */ + /* fmt_str(NULL,str) == strlen(str) */ +@@ -108,11 +114,11 @@ size_t fmt_minus(char *dest,int src) __p + * This is more efficient because strcat needs to scan the string to + * find the end and append. + */ +-size_t fmt_str(char *dest,const char *src) __pure__; ++size_t fmt_str(char *dest,const char *src) __PURE; + + /* copy str to dest until \0 byte or limit bytes copied. + * return number of copied bytes. */ +-size_t fmt_strn(char *dest,const char *src,size_t limit) __pure__; ++size_t fmt_strn(char *dest,const char *src,size_t limit) __PURE; + + /* copy n bytes from src to dest, return n */ + static inline size_t fmt_copybytes(char* dest,const char* src,size_t n) { +@@ -124,56 +130,56 @@ static inline size_t fmt_copybytes(char* + * write padlen-srclen spaces, if that is >= 0. Then copy srclen + * characters from src. Truncate only if total length is larger than + * maxlen. Return number of characters written. */ +-size_t fmt_pad(char* dest,const char* src,size_t srclen,size_t padlen,size_t maxlen) __pure__; ++size_t fmt_pad(char* dest,const char* src,size_t srclen,size_t padlen,size_t maxlen) __PURE; + + /* "foo" -> "foo " + * append padlen-srclen spaces after dest, if that is >= 0. Truncate + * only if total length is larger than maxlen. Return number of + * characters written. */ +-size_t fmt_fill(char* dest,size_t srclen,size_t padlen,size_t maxlen) __pure__; ++size_t fmt_fill(char* dest,size_t srclen,size_t padlen,size_t maxlen) __PURE; + + /* 1 -> "1", 4900 -> "4.9k", 2300000 -> "2.3M" */ +-size_t fmt_human(char* dest,unsigned long long l) __pure__; ++size_t fmt_human(char* dest,unsigned long long l) __PURE; + + /* 1 -> "1", 4900 -> "4.8k", 2300000 -> "2.2M" */ +-size_t fmt_humank(char* dest,unsigned long long l) __pure__; ++size_t fmt_humank(char* dest,unsigned long long l) __PURE; + + /* "Sun, 06 Nov 1994 08:49:37 GMT" */ + size_t fmt_httpdate(char* dest,time_t t); /* not marked pure because it calls gmtime */ + + /* "2014-05-27T19:22:16.247Z" */ +-size_t fmt_iso8601(char* dest,time_t t) __pure__; ++size_t fmt_iso8601(char* dest,time_t t) __PURE; + + #define FMT_UTF8 5 + #define FMT_ASN1LENGTH 17 /* enough space to hold 2^128-1 */ + #define FMT_ASN1TAG 19 /* enough space to hold 2^128-1 */ + + /* some variable length encodings for integers */ +-size_t fmt_utf8(char* dest,uint32_t n) __pure__; /* can store 0-0x7fffffff */ +-size_t fmt_asn1derlength(char* dest,unsigned long long l) __pure__; /* 0-0x7f: 1 byte, above that 1+bytes_needed bytes */ +-size_t fmt_asn1dertag(char* dest,unsigned long long l) __pure__; /* 1 byte for each 7 bits; upper bit = more bytes coming */ ++size_t fmt_utf8(char* dest,uint32_t n) __PURE; /* can store 0-0x7fffffff */ ++size_t fmt_asn1derlength(char* dest,unsigned long long l) __PURE; /* 0-0x7f: 1 byte, above that 1+bytes_needed bytes */ ++size_t fmt_asn1dertag(char* dest,unsigned long long l) __PURE; /* 1 byte for each 7 bits; upper bit = more bytes coming */ + + /* Google Protocol Buffers, https://developers.google.com/protocol-buffers/docs/encoding */ +-size_t fmt_varint(char* dest,unsigned long long l) __pure__; /* protocol buffers encoding; like asn1dertag but little endian */ +-size_t fmt_pb_tag(char* dest,size_t fieldno,unsigned char type) __pure__; /* protocol buffer tag */ +-size_t fmt_pb_type0_int(char* dest,unsigned long long l) __pure__; /* protocol buffers encoding: type 0 bool/enum/int32/uint32/int64/uint64 */ +-size_t fmt_pb_type0_sint(char* dest,signed long long l) __pure__;/* protocol buffers encoding: type 0 sint32/sint64 */ +-size_t fmt_pb_type1_double(char* dest,double d) __pure__; /* protocol buffers encoding: double (64-bit little endian blob) */ +-size_t fmt_pb_type1_fixed64(char* dest,uint64_t l) __pure__; /* protocol buffers encoding: 64-bit little endian blob */ ++size_t fmt_varint(char* dest,unsigned long long l) __PURE; /* protocol buffers encoding; like asn1dertag but little endian */ ++size_t fmt_pb_tag(char* dest,size_t fieldno,unsigned char type) __PURE; /* protocol buffer tag */ ++size_t fmt_pb_type0_int(char* dest,unsigned long long l) __PURE; /* protocol buffers encoding: type 0 bool/enum/int32/uint32/int64/uint64 */ ++size_t fmt_pb_type0_sint(char* dest,signed long long l) __PURE;/* protocol buffers encoding: type 0 sint32/sint64 */ ++size_t fmt_pb_type1_double(char* dest,double d) __PURE; /* protocol buffers encoding: double (64-bit little endian blob) */ ++size_t fmt_pb_type1_fixed64(char* dest,uint64_t l) __PURE; /* protocol buffers encoding: 64-bit little endian blob */ + + /* fmt_pb_type2_string can return 0 if (s,l) is clearly invalid */ +-size_t fmt_pb_type2_string(char* dest,const char* s,size_t l) __pure__; /* protocol buffers encoding: varint length + blob */ +-size_t fmt_pb_type5_float(char* dest,float f) __pure__; /* protocol buffers encoding: float (32-bit little endian blob) */ +-size_t fmt_pb_type5_fixed32(char* dest,uint32_t l) __pure__; /* protocol buffers encoding: 32-bit little endian blob */ +- +-size_t fmt_pb_int(char* dest,size_t fieldno,unsigned long long l) __pure__; +-size_t fmt_pb_sint(char* dest,size_t fieldno,signed long long l) __pure__; +-size_t fmt_pb_double(char* dest,size_t fieldno,double d) __pure__; +-size_t fmt_pb_float(char* dest,size_t fieldno,float f) __pure__; +-size_t fmt_pb_string(char* dest,size_t fieldno,const char* s,size_t l) __pure__; ++size_t fmt_pb_type2_string(char* dest,const char* s,size_t l) __PURE; /* protocol buffers encoding: varint length + blob */ ++size_t fmt_pb_type5_float(char* dest,float f) __PURE; /* protocol buffers encoding: float (32-bit little endian blob) */ ++size_t fmt_pb_type5_fixed32(char* dest,uint32_t l) __PURE; /* protocol buffers encoding: 32-bit little endian blob */ ++ ++size_t fmt_pb_int(char* dest,size_t fieldno,unsigned long long l) __PURE; ++size_t fmt_pb_sint(char* dest,size_t fieldno,signed long long l) __PURE; ++size_t fmt_pb_double(char* dest,size_t fieldno,double d) __PURE; ++size_t fmt_pb_float(char* dest,size_t fieldno,float f) __PURE; ++size_t fmt_pb_string(char* dest,size_t fieldno,const char* s,size_t l) __PURE; + + /* fmt_netstring can return 0 if (src,len) is clearly invalid */ +-size_t fmt_netstring(char* dest,const char* src,size_t len) __pure__; ++size_t fmt_netstring(char* dest,const char* src,size_t len) __PURE; + + /* Marshaling helper functions. + * Escape one character, no matter if it needs escaping or not. +@@ -185,27 +191,27 @@ size_t fmt_netstring(char* dest,const ch + * unicode codepoint) may be limited to 0x7f, 0xff or 0x10ffff. */ + + /* XML escaping: '&' -> '&', '<' -> '<', 'ö' -> 'ö' */ +-size_t fmt_escapecharxml(char* dest,uint32_t ch) __pure__; ++size_t fmt_escapecharxml(char* dest,uint32_t ch) __PURE; + /* HTML escaping is the same as XML escaping. */ +-size_t fmt_escapecharhtml(char* dest,uint32_t ch) __pure__; ++size_t fmt_escapecharhtml(char* dest,uint32_t ch) __PURE; + + /* JSON escaping: '\' -> '\\', '"' -> '\"', 'ö' -> '\u00f6' */ +-size_t fmt_escapecharjson(char* dest,uint32_t ch) __pure__; ++size_t fmt_escapecharjson(char* dest,uint32_t ch) __PURE; + + /* MIME quoted-printable escaping: 'ö' -> '=f6', characters > 0xff not supported */ +-size_t fmt_escapecharquotedprintable(char* dest,uint32_t ch) __pure__; ++size_t fmt_escapecharquotedprintable(char* dest,uint32_t ch) __PURE; + + /* MIME quoted-printable escaping with UTF-8: 'ö' -> '=c3=b6', characters > 0x7fffffff not supported */ +-size_t fmt_escapecharquotedprintableutf8(char* dest,uint32_t ch) __pure__; ++size_t fmt_escapecharquotedprintableutf8(char* dest,uint32_t ch) __PURE; + + /* C99 style escaping: '\' -> '\\', newline -> '\n', 0xc2 -> '\302' */ +-size_t fmt_escapecharc(char* dest,uint32_t ch) __pure__; ++size_t fmt_escapecharc(char* dest,uint32_t ch) __PURE; + + /* internal functions, may be independently useful */ + char fmt_tohex(char c) __attribute__((__const__)); + + #define fmt_strm(b,...) fmt_strm_internal(b,__VA_ARGS__,(char*)0) +-size_t fmt_strm_internal(char* dest,...) __pure__; ++size_t fmt_strm_internal(char* dest,...) __PURE; + + #ifndef MAX_ALLOCA + #define MAX_ALLOCA 100000 +--- a/str.h ++++ b/str.h +@@ -8,8 +8,14 @@ + extern "C" { + #endif + +-#ifndef __pure__ +-#define __pure__ ++#ifndef __has_attribute ++ #define __has_attribute(x) 0 ++#endif ++ ++#if __has_attribute(pure) ++#define __PURE __attribute__ ((pure)) ++#else ++#define __PURE + #endif + + /* str_copy copies leading bytes from in to out until \0. +@@ -21,7 +27,7 @@ size_t str_copy(char *out,const char *in + * equal to, or greater than the string b[0], b[1], ..., b[m-1]=='\0'. + * If the strings are different, str_diff does not read bytes past the + * first difference. */ +-int str_diff(const char *a,const char *b) __pure__; ++int str_diff(const char *a,const char *b) __PURE; + + /* str_diffn returns negative, 0, or positive, depending on whether the + * string a[0], a[1], ..., a[n]=='\0' is lexicographically smaller than, +@@ -29,24 +35,24 @@ int str_diff(const char *a,const char *b + * If the strings are different, str_diffn does not read bytes past the + * first difference. The strings will be considered equal if the first + * limit characters match. */ +-int str_diffn(const char *a,const char *b,size_t limit) __pure__; ++int str_diffn(const char *a,const char *b,size_t limit) __PURE; + + #ifdef __dietlibc__ + #include <string.h> + #define str_len(foo) strlen(foo) + #else + /* str_len returns the index of \0 in s */ +-size_t str_len(const char *s) __pure__; ++size_t str_len(const char *s) __PURE; + #endif + + /* str_chr returns the index of the first occurance of needle or \0 in haystack */ +-size_t str_chr(const char *haystack,char needle) __pure__; ++size_t str_chr(const char *haystack,char needle) __PURE; + + /* str_rchr returns the index of the last occurance of needle or \0 in haystack */ +-size_t str_rchr(const char *haystack,char needle) __pure__; ++size_t str_rchr(const char *haystack,char needle) __PURE; + + /* str_start returns 1 if the b is a prefix of a, 0 otherwise */ +-int str_start(const char *a,const char *b) __pure__; ++int str_start(const char *a,const char *b) __PURE; + + /* convenience shortcut to test for string equality */ + #define str_equal(s,t) (!str_diff((s),(t))) +--- a/stralloc.h ++++ b/stralloc.h +@@ -2,16 +2,22 @@ + #ifndef STRALLOC_H + #define STRALLOC_H + ++#ifndef __has_attribute ++ #define __has_attribute(x) 0 ++#endif ++ ++#if __has_attribute(pure) ++#define __PURE __attribute__ ((pure)) ++#else ++#define __PURE ++#endif ++ + #include <stddef.h> + + #ifdef __cplusplus + extern "C" { + #endif + +-#ifndef __pure__ +-#define __pure__ +-#endif +- + /* stralloc is the internal data structure all functions are working on. + * s is the string. + * len is the used length of the string. +@@ -101,17 +107,17 @@ static inline int stralloc_APPEND(strall + /* stralloc_starts returns 1 if the \0-terminated string in "in", without + * the terminating \0, is a prefix of the string stored in sa. Otherwise + * it returns 0. sa must already be allocated. */ +-int stralloc_starts(stralloc* sa,const char* in) __pure__; ++int stralloc_starts(stralloc* sa,const char* in) __PURE; + + /* stralloc_diff returns negative, 0, or positive, depending on whether + * a is lexicographically smaller than, equal to, or greater than the + * string b. */ +-int stralloc_diff(const stralloc* a,const stralloc* b) __pure__; ++int stralloc_diff(const stralloc* a,const stralloc* b) __PURE; + + /* stralloc_diffs returns negative, 0, or positive, depending on whether + * a is lexicographically smaller than, equal to, or greater than the + * string b[0], b[1], ..., b[n]=='\0'. */ +-int stralloc_diffs(const stralloc* a,const char* b) __pure__; ++int stralloc_diffs(const stralloc* a,const char* b) __PURE; + + #define stralloc_equal(a,b) (!stralloc_diff((a),(b))) + #define stralloc_equals(a,b) (!stralloc_diffs((a),(b))) +--- a/scan.h ++++ b/scan.h +@@ -15,8 +15,14 @@ + extern "C" { + #endif + +-#ifndef __pure__ +-#define __pure__ ++#ifndef __has_attribute ++ #define __has_attribute(x) 0 ++#endif ++ ++#if __has_attribute(pure) ++#define __PURE __attribute__ ((pure)) ++#else ++#define __PURE + #endif + + /* This file declared functions used to decode / scan / unmarshal +@@ -84,18 +90,18 @@ size_t scan_double(const char *in, doubl + size_t scan_plusminus(const char *src,signed int *dest); + + /* return the highest integer n<=limit so that isspace(in[i]) for all 0<=i<=n */ +-size_t scan_whitenskip(const char *in,size_t limit) __pure__; ++size_t scan_whitenskip(const char *in,size_t limit) __PURE; + + /* return the highest integer n<=limit so that !isspace(in[i]) for all 0<=i<=n */ +-size_t scan_nonwhitenskip(const char *in,size_t limit) __pure__; ++size_t scan_nonwhitenskip(const char *in,size_t limit) __PURE; + + /* return the highest integer n<=limit so that in[i] is element of + * charset (ASCIIZ string) for all 0<=i<=n */ +-size_t scan_charsetnskip(const char *in,const char *charset,size_t limit) __pure__; ++size_t scan_charsetnskip(const char *in,const char *charset,size_t limit) __PURE; + + /* return the highest integer n<=limit so that in[i] is not element of + * charset (ASCIIZ string) for all 0<=i<=n */ +-size_t scan_noncharsetnskip(const char *in,const char *charset,size_t limit) __pure__; ++size_t scan_noncharsetnskip(const char *in,const char *charset,size_t limit) __PURE; + + /* try to parse ASCII GMT date; does not understand time zones. */ + /* example dates: +@@ -103,17 +109,17 @@ size_t scan_noncharsetnskip(const char * + * "Sunday, 06-Nov-94 08:49:37 GMT" + * "Sun Nov 6 08:49:37 1994" + */ +-size_t scan_httpdate(const char *in,time_t *t) __pure__; ++size_t scan_httpdate(const char *in,time_t *t) __PURE; + + /* try to parse ASCII ISO-8601 date; does not understand time zones. */ + /* example date: "2014-05-27T19:22:16Z" */ +-size_t scan_iso8601(const char* in,struct timespec* t) __pure__; ++size_t scan_iso8601(const char* in,struct timespec* t) __PURE; + + /* some variable length encodings for integers */ +-size_t scan_utf8(const char* in,size_t len,uint32_t* n) __pure__; +-size_t scan_utf8_sem(const char* in,size_t len,uint32_t* n) __pure__; +-size_t scan_asn1derlength(const char* in,size_t len,unsigned long long* n) __pure__; +-size_t scan_asn1dertag(const char* in,size_t len,unsigned long long* n) __pure__; ++size_t scan_utf8(const char* in,size_t len,uint32_t* n) __PURE; ++size_t scan_utf8_sem(const char* in,size_t len,uint32_t* n) __PURE; ++size_t scan_asn1derlength(const char* in,size_t len,unsigned long long* n) __PURE; ++size_t scan_asn1dertag(const char* in,size_t len,unsigned long long* n) __PURE; + + /* Google protocol buffers */ + /* A protocol buffer is a sequence of (tag,value). +@@ -121,16 +127,16 @@ size_t scan_asn1dertag(const char* in,si + * which field in your struct is being sent. Integers must have type + * 0, double type 1, strings type 2 and floats type 5. However, you + * have to check this yourself. +- */ +-size_t scan_varint(const char* in,size_t len, unsigned long long* n) __pure__; /* internal */ +-size_t scan_pb_tag(const char* in,size_t len, size_t* fieldno,unsigned char* type) __pure__; ++ */ ++size_t scan_varint(const char* in,size_t len, unsigned long long* n) __PURE; /* internal */ ++size_t scan_pb_tag(const char* in,size_t len, size_t* fieldno,unsigned char* type) __PURE; + + /* Then, depending on the field number, validate the type and call the + * corresponding of these functions to parse the value */ +-size_t scan_pb_type0_int(const char* in,size_t len,unsigned long long* l) __pure__; +-size_t scan_pb_type0_sint(const char* in,size_t len,signed long long* l) __pure__; +-size_t scan_pb_type1_double(const char* in,size_t len,double* d) __pure__; +-size_t scan_pb_type1_fixed64(const char* in,size_t len,uint64_t* b) __pure__; ++size_t scan_pb_type0_int(const char* in,size_t len,unsigned long long* l) __PURE; ++size_t scan_pb_type0_sint(const char* in,size_t len,signed long long* l) __PURE; ++size_t scan_pb_type1_double(const char* in,size_t len,double* d) __PURE; ++size_t scan_pb_type1_fixed64(const char* in,size_t len,uint64_t* b) __PURE; + /* NOTE: scan_pb_type2_stringlen only parses the length of the string, + * not the string itself. It will return the number of bytes parsed in + * the length, then set slen to the value of the length integer it just +@@ -141,9 +147,9 @@ size_t scan_pb_type1_fixed64(const char* + * parsing early without having to read and allocate memory for the rest + * (potentially gigabytes) of the data announced by one unreasonable + * string length value. */ +-size_t scan_pb_type2_stringlen(const char* in,size_t len,const char** string, size_t* slen) __pure__; +-size_t scan_pb_type5_float(const char* in,size_t len,float* f) __pure__; +-size_t scan_pb_type5_fixed32(const char* in,size_t len,uint32_t* b) __pure__; ++size_t scan_pb_type2_stringlen(const char* in,size_t len,const char** string, size_t* slen) __PURE; ++size_t scan_pb_type5_float(const char* in,size_t len,float* f) __PURE; ++size_t scan_pb_type5_fixed32(const char* in,size_t len,uint32_t* b) __PURE; + + /* parse a netstring, input buffer is in (len bytes). + * if parsing is successful: +@@ -153,7 +159,7 @@ size_t scan_pb_type5_fixed32(const char* + * return 0 + * Note: *dest will point inside the input buffer! + */ +-size_t scan_netstring(const char* in,size_t len,char** dest,size_t* slen) __pure__; ++size_t scan_netstring(const char* in,size_t len,char** dest,size_t* slen) __PURE; + + /* internal function that might be useful independently */ + /* convert from hex ASCII, return 0 to 15 for success or -1 for failure */ +--- a/scan/scan_httpdate.c ++++ b/scan/scan_httpdate.c +@@ -1,5 +1,4 @@ + #define _GNU_SOURCE +-#define __deprecated__ + #include "scan.h" + #include "byte.h" + #include "case.h" +--- a/scan/scan_iso8601.c ++++ b/scan/scan_iso8601.c +@@ -1,5 +1,4 @@ + #define _GNU_SOURCE +-#define __deprecated__ + #include "scan.h" + #include "byte.h" + #include "case.h" diff --git a/meta-networking/recipes-support/ncp/libowfat_0.31.bb b/meta-networking/recipes-support/ncp/libowfat_0.32.bb index 4b072f7e7d..94f36f904a 100644 --- a/meta-networking/recipes-support/ncp/libowfat_0.31.bb +++ b/meta-networking/recipes-support/ncp/libowfat_0.32.bb @@ -3,12 +3,15 @@ DESCRIPTION = "libowfat is a library of general purpose APIs extracted from Dan Bernstein's software (libdjb), reimplemented and covered by the GNU \ General Public License Version 2 (no later versions)." HOMEPAGE = "http://www.fefe.de/libowfat" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" -SRC_URI = "https://www.fefe.de/${BPN}/${BP}.tar.xz" -SRC_URI[md5sum] = "120798fab86cfd72dc6b12284d248dd0" -SRC_URI[sha256sum] = "d1e4ac1cfccbb7dc51d77d96398e6302d229ba7538158826c84cb4254c7e8a12" +SRC_URI = "https://www.fefe.de/${BPN}/${BP}.tar.xz \ + file://0001-Depend-on-haveuint128.h-for-umult64.c.patch \ + file://0001-replace-__pure__-with-compiler-attribute-pure.patch \ + " +SRC_URI[md5sum] = "ee015ccf45cb2bc61c942642038c2bdc" +SRC_URI[sha256sum] = "f4b9b3d9922dc25bc93adedf9e9ff8ddbebaf623f14c8e7a5f2301bfef7998c1" EXTRA_OEMAKE = "\ DIET= \ @@ -19,9 +22,11 @@ EXTRA_OEMAKE = "\ do_install() { make install \ DESTDIR=${D} \ - INCLUDEDIR=${includedir}/${BPN} \ + INCLUDEDIR=${includedir} \ LIBDIR=${libdir} \ MAN3DIR=${mandir}/man3 } +ALLOW_EMPTY:${PN} = "1" + BBCLASSEXTEND = "native nativesdk" diff --git a/meta-networking/recipes-support/ncp/ncp_1.2.4.bb b/meta-networking/recipes-support/ncp/ncp_1.2.4.bb index f42223b1f8..516beede5f 100644 --- a/meta-networking/recipes-support/ncp/ncp_1.2.4.bb +++ b/meta-networking/recipes-support/ncp/ncp_1.2.4.bb @@ -3,8 +3,8 @@ DESCRIPTION = "ncp is a utility for copying files in a LAN. It has absolutely no security or integrity checking, no throttling, no features, except \ one: you don't have to type the coordinates of your peer." HOMEPAGE = "http://www.fefe.de/ncp" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" DEPENDS = "libowfat" SRC_URI = "https://dl.fefe.de/${BP}.tar.bz2" diff --git a/meta-networking/recipes-support/ndisc6/ndisc6/0001-replace-VLAIS-with-malloc-free-pair.patch b/meta-networking/recipes-support/ndisc6/ndisc6/0001-replace-VLAIS-with-malloc-free-pair.patch deleted file mode 100644 index dc58b5b79e..0000000000 --- a/meta-networking/recipes-support/ndisc6/ndisc6/0001-replace-VLAIS-with-malloc-free-pair.patch +++ /dev/null @@ -1,124 +0,0 @@ -From 3a7d5396e633e6c02a4583be7faf3d79d0d33748 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 31 Aug 2017 11:14:41 -0700 -Subject: [PATCH 1/2] replace VLAIS with malloc/free pair - -Makes it compatible with non-gnu compilers - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending - - src/trace-icmp.c | 7 +++++-- - src/trace-tcp.c | 14 ++++++++++---- - src/trace-udp.c | 7 +++++-- - 3 files changed, 20 insertions(+), 8 deletions(-) - -diff --git a/src/trace-icmp.c b/src/trace-icmp.c -index 842938e..c76cb54 100644 ---- a/src/trace-icmp.c -+++ b/src/trace-icmp.c -@@ -43,16 +43,19 @@ send_echo_probe (int fd, unsigned ttl, unsigned n, size_t plen, uint16_t port) - struct - { - struct icmp6_hdr ih; -- uint8_t payload[plen - sizeof (struct icmp6_hdr)]; -+ uint8_t *payload; - } packet; - memset (&packet, 0, plen); -+ packet.payload = malloc(plen - sizeof (struct icmp6_hdr)); - - packet.ih.icmp6_type = ICMP6_ECHO_REQUEST; - packet.ih.icmp6_id = htons (getpid ()); - packet.ih.icmp6_seq = htons ((ttl << 8) | (n & 0xff)); - (void)port; - -- return send_payload (fd, &packet.ih, plen, ttl); -+ ssize_t ret = send_payload (fd, &packet.ih, plen, ttl); -+ free(packet.payload); -+ return ret; - } - - -diff --git a/src/trace-tcp.c b/src/trace-tcp.c -index 940f918..62d22ff 100644 ---- a/src/trace-tcp.c -+++ b/src/trace-tcp.c -@@ -54,10 +54,11 @@ send_syn_probe (int fd, unsigned ttl, unsigned n, size_t plen, uint16_t port) - struct - { - struct tcphdr th; -- uint8_t payload[plen - sizeof (struct tcphdr)]; -+ uint8_t *payload; - } packet; - - memset (&packet, 0, sizeof (packet)); -+ packet.payload = malloc(plen - sizeof (struct tcphdr)); - packet.th.th_sport = sport; - packet.th.th_dport = port; - packet.th.th_seq = htonl ((ttl << 24) | (n << 16) | (uint16_t)getpid ()); -@@ -65,7 +66,9 @@ send_syn_probe (int fd, unsigned ttl, unsigned n, size_t plen, uint16_t port) - packet.th.th_flags = TH_SYN | (ecn ? (TH_ECE | TH_CWR) : 0); - packet.th.th_win = htons (TCP_WINDOW); - -- return send_payload (fd, &packet, plen, ttl); -+ ssize_t ret = send_payload (fd, &packet, plen, ttl); -+ free(packet.payload); -+ return ret; - } - - -@@ -131,10 +134,11 @@ send_ack_probe (int fd, unsigned ttl, unsigned n, size_t plen, uint16_t port) - struct - { - struct tcphdr th; -- uint8_t payload[plen - sizeof (struct tcphdr)]; -+ uint8_t *payload; - } packet; - - memset (&packet, 0, sizeof (packet)); -+ packet.payload = malloc(plen - sizeof (struct tcphdr)); - packet.th.th_sport = sport; - packet.th.th_dport = port; - packet.th.th_ack = htonl ((ttl << 24) | (n << 16) | (uint16_t)getpid ()); -@@ -142,7 +146,9 @@ send_ack_probe (int fd, unsigned ttl, unsigned n, size_t plen, uint16_t port) - packet.th.th_flags = TH_ACK; - packet.th.th_win = htons (TCP_WINDOW); - -- return send_payload (fd, &packet, plen, ttl); -+ ssize_t ret = send_payload (fd, &packet, plen, ttl); -+ free(packet.payload); -+ return ret; - } - - -diff --git a/src/trace-udp.c b/src/trace-udp.c -index 4adde6b..a6cbb07 100644 ---- a/src/trace-udp.c -+++ b/src/trace-udp.c -@@ -46,9 +46,10 @@ send_udp_probe (int fd, unsigned ttl, unsigned n, size_t plen, uint16_t port) - struct - { - struct udphdr uh; -- uint8_t payload[plen - sizeof (struct udphdr)]; -+ uint8_t *payload; - } packet; - memset (&packet, 0, plen); -+ packet.payload = malloc(plen - sizeof (struct udphdr)); - - (void)n; - packet.uh.uh_sport = sport; -@@ -61,7 +62,9 @@ send_udp_probe (int fd, unsigned ttl, unsigned n, size_t plen, uint16_t port) - /*if (plen > sizeof (struct udphdr)) - packet.payload[0] = (uint8_t)ttl;*/ - -- return send_payload (fd, &packet, plen, ttl); -+ ssize_t ret = send_payload (fd, &packet, plen, ttl); -+ free(packet.payload); -+ return ret; - } - - --- -2.14.1 - diff --git a/meta-networking/recipes-support/ndisc6/ndisc6/0002-Do-not-undef-_GNU_SOURCE.patch b/meta-networking/recipes-support/ndisc6/ndisc6/0002-Do-not-undef-_GNU_SOURCE.patch deleted file mode 100644 index 3cc2ba80c2..0000000000 --- a/meta-networking/recipes-support/ndisc6/ndisc6/0002-Do-not-undef-_GNU_SOURCE.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 2a50154fbce38fd36be7e14f5cd4a8b03c65c72f Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 31 Aug 2017 11:15:37 -0700 -Subject: [PATCH 2/2] Do not undef _GNU_SOURCE - -There are functions from tcp.h which are under _GNU_SOURCE -in musl - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending - - src/trace-tcp.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/trace-tcp.c b/src/trace-tcp.c -index 62d22ff..380008e 100644 ---- a/src/trace-tcp.c -+++ b/src/trace-tcp.c -@@ -21,7 +21,6 @@ - # include <config.h> - #endif - --#undef _GNU_SOURCE - #define _DEFAULT_SOURCE 1 - - #include <string.h> --- -2.14.1 - diff --git a/meta-networking/recipes-support/ndisc6/ndisc6_git.bb b/meta-networking/recipes-support/ndisc6/ndisc6_1.0.8.bb index 48a83b8305..a827e7f42a 100644 --- a/meta-networking/recipes-support/ndisc6/ndisc6_git.bb +++ b/meta-networking/recipes-support/ndisc6/ndisc6_1.0.8.bb @@ -2,71 +2,71 @@ DESCRIPTION = "This package includes some useful diagnostics tools for \ IPv6 networks, including ndisc6, rdisc6, tcptraceroute6 and traceroute6." SECTION = "net" HOMEPAGE = "http://www.remlab.net/ndisc6/" -LICENSE = "GPL-2.0" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -PV = "1.0.4+git${SRCPV}" -SRCREV = "4c794b5512d23c649def1f94a684225dcbb6ac3e" -SRC_URI = "git://git.remlab.net/git/ndisc6.git;protocol=http \ - file://0001-replace-VLAIS-with-malloc-free-pair.patch \ - file://0002-Do-not-undef-_GNU_SOURCE.patch \ +SRCREV = "92e5d1cf6547fe40316b2a6ca2f7b8195ae0cbe5" +SRC_URI = "git://git.remlab.net/git/ndisc6.git;protocol=http;branch=master \ file://0001-autogen-Do-not-symlink-gettext.h-from-build-host.patch \ " S = "${WORKDIR}/git" +DEPENDS = "coreutils-native" + inherit autotools gettext EXTRA_OECONF += "PERL=${USRBINPATH}/perl" -LDFLAGS += "-fuse-ld=gold" -TOOLCHAIN = "gcc" +USE_NLS = "yes" + +EXTRA_OECONF += "--disable-rpath" -do_configure_prepend() { +do_configure:prepend() { cp ${STAGING_DATADIR_NATIVE}/gettext/gettext.h ${S}/include ${S}/autogen.sh } -do_install_append () { +do_install:append () { rm -rf ${D}${localstatedir} # Enable SUID bit for applications that need it chmod 4555 ${D}${bindir}/rltraceroute6 chmod 4555 ${D}${bindir}/ndisc6 chmod 4555 ${D}${bindir}/rdisc6 } -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" # Split into seperate packages since we normal don't want them all # The main package is left empty and therefore not created. PACKAGES += "${PN}-ndisc6 ${PN}-tcpspray6 ${PN}-rdisc6 \ ${PN}-tcptraceroute6 ${PN}-rltraceroute6 \ ${PN}-tracert6 ${PN}-rdnssd ${PN}-misc" -FILES_${PN} = "" -FILES_${PN}-ndisc6 = "${bindir}/ndisc6" -FILES_${PN}-tcpspray6 = "${bindir}/tcpspray6" -FILES_${PN}-rdisc6 = "${bindir}/rdisc6" -FILES_${PN}-tcptraceroute6 = "${bindir}/tcptraceroute6" -FILES_${PN}-rltraceroute6 = "${bindir}/rltraceroute6" -FILES_${PN}-tracert6 = "${bindir}/tracert6" -FILES_${PN}-rdnssd = "${sbindir}/rdnssd ${sysconfdir}/rdnssd" -FILES_${PN}-misc = "${bindir}/dnssort ${bindir}/name2addr ${bindir}/tcpspray ${bindir}/addr2name" +FILES:${PN} = "" +FILES:${PN}-ndisc6 = "${bindir}/ndisc6" +FILES:${PN}-tcpspray6 = "${bindir}/tcpspray6" +FILES:${PN}-rdisc6 = "${bindir}/rdisc6" +FILES:${PN}-tcptraceroute6 = "${bindir}/tcptraceroute6" +FILES:${PN}-rltraceroute6 = "${bindir}/rltraceroute6" +FILES:${PN}-tracert6 = "${bindir}/tracert6" +FILES:${PN}-rdnssd = "${sbindir}/rdnssd ${sysconfdir}/rdnssd" +FILES:${PN}-misc = "${bindir}/dnssort ${bindir}/name2addr ${bindir}/tcpspray ${bindir}/addr2name" -DESCRIPTION_${PN}-ndisc6 = "ICMPv6 Neighbor Discovery tool. \ +DESCRIPTION:${PN}-ndisc6 = "ICMPv6 Neighbor Discovery tool. \ Performs IPv6 neighbor discovery in userland. Replaces arping from the \ IPv4 world." -DESCRIPTION_${PN}-rdisc6 = "ICMPv6 Router Discovery tool. \ +DESCRIPTION:${PN}-rdisc6 = "ICMPv6 Router Discovery tool. \ Queries IPv6 routers on the network for advertised prefixes. Can be used \ to detect rogue IPv6 routers, monitor legitimate IPv6 routers." -DESCRITPION_${PN}-tcpspray6 = "Performs bandwidth measurements of TCP \ +DESCRIPTION:${PN}-tcpspray6 = "Performs bandwidth measurements of TCP \ sessions between the local system and a remote echo server in either IPv6 \ or IPv4." -DESCRITPION_${PN}-rdnssd = "Daemon to autoconfigure the list of DNS \ +DESCRIPTION:${PN}-rdnssd = "Daemon to autoconfigure the list of DNS \ servers through slateless IPv6 autoconfiguration." # The tcptraceroute6 and tracert6 commands depend on rltraceroute6 to # perform the actual trace operation. -RDEPENDS_${PN}-tcptraceroute6 = "${PN}-rltraceroute6" -RDEPENDS_${PN}-tracert6 = "${PN}-rltraceroute6" -RDEPENDS_${PN}-misc += "perl" +RDEPENDS:${PN}-tcptraceroute6 = "${PN}-rltraceroute6" +RDEPENDS:${PN}-tracert6 = "${PN}-rltraceroute6" +RDEPENDS:${PN}-misc += "perl" diff --git a/meta-networking/recipes-support/netcat/netcat-openbsd/0001-bundle-own-base64-encode-decode-functions.patch b/meta-networking/recipes-support/netcat/netcat-openbsd/0001-bundle-own-base64-encode-decode-functions.patch index 0966b65808..929f63f4a9 100644 --- a/meta-networking/recipes-support/netcat/netcat-openbsd/0001-bundle-own-base64-encode-decode-functions.patch +++ b/meta-networking/recipes-support/netcat/netcat-openbsd/0001-bundle-own-base64-encode-decode-functions.patch @@ -1,40 +1,47 @@ -From ccd166b73eaae4dd1e1785c63ceb9b303568ed46 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 21 Mar 2017 11:30:49 -0700 +From 3da48ec13a44b71ca51adbc803b42c1b29a43f57 Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Tue, 24 Jul 2018 14:03:51 +0800 Subject: [PATCH] bundle own base64 encode/decode functions Not all libc implementations provide it. as an aside libresolv is no longer needed +Upstream-Status: Pending + Signed-off-by: Khem Raj <raj.khem@gmail.com> + +Update to version 1.190-2 +Signed-off-by: Changqing Li <changqing.li@windriver.com> --- Makefile | 4 +- base64.c | 313 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - netcat.c | 2 + + netcat.c | 3 + socks.c | 3 + - 4 files changed, 320 insertions(+), 2 deletions(-) + 4 files changed, 321 insertions(+), 2 deletions(-) create mode 100644 base64.c -Index: netcat-openbsd-1.105/Makefile -=================================================================== ---- netcat-openbsd-1.105.orig/Makefile -+++ netcat-openbsd-1.105/Makefile -@@ -1,9 +1,9 @@ - # $OpenBSD: Makefile,v 1.6 2001/09/02 18:45:41 jakob Exp $ +diff --git a/Makefile b/Makefile +index 8247cfd..b8d8547 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,10 +1,10 @@ + # $OpenBSD: Makefile,v 1.7 2015/09/11 21:07:01 beck Exp $ PROG= nc -SRCS= netcat.c atomicio.c socks.c +SRCS= netcat.c atomicio.c socks.c base64.c --LIBS= `pkg-config --libs libbsd` -lresolv -+LIBS= `pkg-config --libs libbsd` + PKG_CONFIG ?= pkg-config +-LIBS= `$(PKG_CONFIG) --libs libbsd` -lresolv ++LIBS= `$(PKG_CONFIG) --libs libbsd` OBJS= $(SRCS:.c=.o) CFLAGS= -g -O2 LDFLAGS= -Wl,--no-add-needed -Index: netcat-openbsd-1.105/base64.c -=================================================================== +diff --git a/base64.c b/base64.c +new file mode 100644 +index 0000000..b0ee6c2 --- /dev/null -+++ netcat-openbsd-1.105/base64.c ++++ b/base64.c @@ -0,0 +1,313 @@ +/* + * Copyright (c) 1996-1999 by Internet Software Consortium. @@ -349,31 +356,34 @@ Index: netcat-openbsd-1.105/base64.c + + return (tarindex); +} -Index: netcat-openbsd-1.105/netcat.c -=================================================================== ---- netcat-openbsd-1.105.orig/netcat.c -+++ netcat-openbsd-1.105/netcat.c -@@ -169,6 +169,9 @@ static int connect_with_timeout(int fd, - socklen_t salen, int ctimeout); +diff --git a/netcat.c b/netcat.c +index a0fb51b..9c4ed23 100644 +--- a/netcat.c ++++ b/netcat.c +@@ -240,6 +240,9 @@ static int connect_with_timeout(int fd, const struct sockaddr *sa, + static void quit(); -+int b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize); -+int b64_pton(char const *src, u_char *target, size_t targsize); ++int b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize); ++int b64_pton(char const *src, u_char *target, size_t targsize); + int main(int argc, char *argv[]) { -Index: netcat-openbsd-1.105/socks.c -=================================================================== ---- netcat-openbsd-1.105.orig/socks.c -+++ netcat-openbsd-1.105/socks.c +diff --git a/socks.c b/socks.c +index 9068f39..c576f6b 100644 +--- a/socks.c ++++ b/socks.c @@ -53,6 +53,9 @@ #define SOCKS_DOMAIN 3 #define SOCKS_IPV6 4 -+int b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize); -+int b64_pton(char const *src, u_char *target, size_t targsize); ++int b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize); ++int b64_pton(char const *src, u_char *target, size_t targsize); + int remote_connect(const char *, const char *, struct addrinfo); int socks_connect(const char *, const char *, struct addrinfo, const char *, const char *, struct addrinfo, int, +-- +2.7.4 + diff --git a/meta-networking/recipes-support/netcat/netcat-openbsd_1.105.bb b/meta-networking/recipes-support/netcat/netcat-openbsd_1.195.bb index 9d7420f8c2..20ad43a4d5 100644 --- a/meta-networking/recipes-support/netcat/netcat-openbsd_1.105.bb +++ b/meta-networking/recipes-support/netcat/netcat-openbsd_1.195.bb @@ -1,21 +1,21 @@ require netcat.inc SUMMARY = "OpenBSD Netcat" HOMEPAGE = "http://ftp.debian.org" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://debian/copyright;md5=ee6bbaacb5db5f2973818f0902c3ae6f" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://debian/copyright;md5=f39e60ae4ea9fdb559c833be2e59de99" DEPENDS += "glib-2.0 libbsd" do_patch[depends] = "quilt-native:do_populate_sysroot" -SRC_URI = "${DEBIAN_MIRROR}/main/n/netcat-openbsd/netcat-openbsd_${PV}.orig.tar.gz;name=netcat \ - ${DEBIAN_MIRROR}/main/n/netcat-openbsd/netcat-openbsd_${PV}-7.debian.tar.gz;name=netcat-patch;subdir=${BP} \ +SRC_URI = "http://snapshot.debian.org/archive/debian/20181022T085404Z/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}.orig.tar.gz;name=netcat \ + http://snapshot.debian.org/archive/debian/20181022T085404Z/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}-1.debian.tar.xz;name=netcat-patch;subdir=${BP} \ file://0001-bundle-own-base64-encode-decode-functions.patch \ " -SRC_URI[netcat.md5sum] = "7e67b22f1ad41a1b7effbb59ff28fca1" -SRC_URI[netcat.sha256sum] = "40653fe66c1516876b61b07e093d826e2a5463c5d994f1b7e6ce328f3edb211e" -SRC_URI[netcat-patch.md5sum] = "e914f8eb7eda5c75c679dd77787ac76b" -SRC_URI[netcat-patch.sha256sum] = "eee759327ffea293e81d0dde67921b7fcfcad279ffd7a2c9d037bbc8f882b363" +SRC_URI[netcat.md5sum] = "219d5e49c45658e229a3bda63063a986" +SRC_URI[netcat.sha256sum] = "0e283b2a214313c69447cd962c528ac19afb3ddfe606b25de6d179f187cde4c3" +SRC_URI[netcat-patch.md5sum] = "7eba241989dbef6caa78ec4bc8e35151" +SRC_URI[netcat-patch.sha256sum] = "c6736fcbab5254cbbc52278993a951da1126e42800a297c27db297e332e2017e" inherit pkgconfig @@ -30,7 +30,7 @@ netcat_do_patch() { rm -rf ${S}/.pc mv ${S}/.pc-netcat ${S}/.pc QUILT_PATCHES=${S}/debian/patches quilt pop -a - rm -rf ${S}/.pc ${S}/debian + rm -rf ${S}/.pc fi QUILT_PATCHES=${S}/debian/patches quilt push -a mv ${S}/.pc ${S}/.pc-netcat diff --git a/meta-networking/recipes-support/netcat/netcat.inc b/meta-networking/recipes-support/netcat/netcat.inc index 15441645b0..9a8775b6c8 100644 --- a/meta-networking/recipes-support/netcat/netcat.inc +++ b/meta-networking/recipes-support/netcat/netcat.inc @@ -11,5 +11,5 @@ capabilities." SECTION = "net" inherit update-alternatives gettext pkgconfig -ALTERNATIVE_${PN} = "nc" +ALTERNATIVE:${PN} = "nc" diff --git a/meta-networking/recipes-support/netcat/netcat/gettext.patch b/meta-networking/recipes-support/netcat/netcat/gettext.patch new file mode 100644 index 0000000000..f2e5f99270 --- /dev/null +++ b/meta-networking/recipes-support/netcat/netcat/gettext.patch @@ -0,0 +1,16 @@ +Fix build with gettext 0.20.x + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- a/configure.ac ++++ b/configure.ac +@@ -49,7 +49,7 @@ AC_SUBST(all_libraries) + dnl I18n support + ALL_LINGUAS="it sk" + AM_GNU_GETTEXT([external], need-ngettext) +-AM_INTL_SUBDIR ++#AM_INTL_SUBDIR + + dnl find resolver functions and the socket library on some broken OS + AC_LBL_LIBRARY_NET diff --git a/meta-networking/recipes-support/netcat/netcat_0.7.1.bb b/meta-networking/recipes-support/netcat/netcat_0.7.1.bb index d961af542c..fd36aadd7e 100644 --- a/meta-networking/recipes-support/netcat/netcat_0.7.1.bb +++ b/meta-networking/recipes-support/netcat/netcat_0.7.1.bb @@ -1,13 +1,13 @@ require netcat.inc -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -PR = "r3" SRC_URI = "${SOURCEFORGE_MIRROR}/netcat/netcat-${PV}.tar.bz2 \ file://obsolete_autoconf_macros.patch \ file://netcat-locale_h.patch \ file://make-netcat_flag_count_work.patch \ + file://gettext.patch \ " SRC_URI[md5sum] = "0a29eff1736ddb5effd0b1ec1f6fe0ef" @@ -15,7 +15,9 @@ SRC_URI[sha256sum] = "b55af0bbdf5acc02d1eb6ab18da2acd77a400bafd074489003f3df0967 inherit autotools -do_install_append() { +CVE_PRODUCT = "netcat_project:netcat" + +do_install:append() { install -d ${D}${bindir} mv ${D}${bindir}/nc ${D}${bindir}/nc.${BPN} } diff --git a/meta-networking/recipes-support/netcf/netcf/0001-Adopt-to-new-gnulib-read_file-fread_file-signature.patch b/meta-networking/recipes-support/netcf/netcf/0001-Adopt-to-new-gnulib-read_file-fread_file-signature.patch new file mode 100644 index 0000000000..b188248fff --- /dev/null +++ b/meta-networking/recipes-support/netcf/netcf/0001-Adopt-to-new-gnulib-read_file-fread_file-signature.patch @@ -0,0 +1,83 @@ +From af256680926e166ac21bc0f11172ea6c077a9b55 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 9 Mar 2024 10:40:48 -0800 +Subject: [PATCH] Adopt to new gnulib read_file/fread_file signature + +It now expects a flag parameter in latest gnulib +see [1] + +[1] https://public-inbox.org/bug-gnulib/87tv01c1z2.fsf-ueno@gnu.org/ + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/dutil_linux.c | 4 ++-- + src/dutil_posix.c | 2 +- + src/ncftool.c | 2 +- + src/ncftransform.c | 2 +- + 4 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/dutil_linux.c b/src/dutil_linux.c +index 742153a..eb72eb2 100644 +--- a/src/dutil_linux.c ++++ b/src/dutil_linux.c +@@ -1113,7 +1113,7 @@ static void add_link_info(struct netcf *ncf, + + xasprintf(&path, "/sys/class/net/%s/operstate", ifname); + ERR_NOMEM(!path, ncf); +- state = read_file(path, &length); ++ state = read_file(path, 0, &length); + if (!state) { + /* missing operstate is *not* an error. It could be due to an + * alias interface, which has no entry in /sys/class/net at +@@ -1132,7 +1132,7 @@ static void add_link_info(struct netcf *ncf, + FREE(path); + xasprintf(&path, "/sys/class/net/%s/speed", ifname); + ERR_NOMEM(path == NULL, ncf); +- speed = read_file(path, &length); ++ speed = read_file(path, 0, &length); + if (!speed && errno == EINVAL) { + /* attempts to read $ifname/speed result in EINVAL if the + * interface is ifconfiged down (which isn't exactly the +diff --git a/src/dutil_posix.c b/src/dutil_posix.c +index 1313514..b9884f0 100644 +--- a/src/dutil_posix.c ++++ b/src/dutil_posix.c +@@ -211,7 +211,7 @@ int run_program(struct netcf *ncf, const char *const *argv, char **output) + "Failed to create file stream for output while executing '%s': %s", + argv_str, errbuf); + +- *output = fread_file(outfile, &outlen); ++ *output = fread_file(outfile, 0, &outlen); + ERR_THROW_STRERROR(*output == NULL, ncf, EEXEC, + "Error while reading output from execution of '%s': %s", + argv_str, errbuf); +diff --git a/src/ncftool.c b/src/ncftool.c +index f1b5642..c878cb0 100644 +--- a/src/ncftool.c ++++ b/src/ncftool.c +@@ -351,7 +351,7 @@ static int cmd_define(const struct command *cmd) { + struct netcf_if *nif = NULL; + int result = CMD_RES_ERR; + +- xml = read_file(fname, &length); ++ xml = read_file(fname, 0, &length); + if (xml == NULL) { + fprintf(stderr, "Failed to read %s\n", fname); + goto done; +diff --git a/src/ncftransform.c b/src/ncftransform.c +index fbabfc3..4c9a56d 100644 +--- a/src/ncftransform.c ++++ b/src/ncftransform.c +@@ -54,7 +54,7 @@ int main(int argc, char **argv) { + if (argc != 3 || (STRNEQ(argv[1], "get") && STRNEQ(argv[1], "put"))) + die("Usage: ncftransform (put|get) FILE\n"); + +- in_xml = read_file(argv[2], &length); ++ in_xml = read_file(argv[2], 0, &length); + if (in_xml == NULL) + die("Failed to read %s\n", argv[2]); + +-- +2.44.0 + diff --git a/meta-networking/recipes-support/netcf/netcf_0.2.8.bb b/meta-networking/recipes-support/netcf/netcf_0.2.8.bb index 9a6f60ea22..c68974f9f0 100644 --- a/meta-networking/recipes-support/netcf/netcf_0.2.8.bb +++ b/meta-networking/recipes-support/netcf/netcf_0.2.8.bb @@ -2,30 +2,34 @@ SUMMARY = "netcf" DESCRIPTION = "netcf is a cross-platform network configuration library." HOMEPAGE = "https://pagure.io/netcf" SECTION = "libs" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=fb919cc88dbe06ec0b0bd50e001ccf1f" SRCREV = "2c5d4255857531bc09d91dcd02e86545f29004d4" -PV .= "+git${SRCPV}" +PV .= "+git" -SRC_URI = "git://pagure.io/netcf.git;protocol=https \ -" +SRC_URI = "git://pagure.io/netcf.git;protocol=https;branch=master \ + file://0001-Adopt-to-new-gnulib-read_file-fread_file-signature.patch" -DEPENDS += "augeas libnl libxslt libxml2 gnulib" +UPSTREAM_CHECK_GITTAGREGEX = "release-(?P<pver>(\d+(\.\d+)+))" + +DEPENDS += "augeas libnl libxslt libxml2" + +do_configure[depends] += "${MLPREFIX}gnulib:do_populate_sysroot" S = "${WORKDIR}/git" -inherit gettext autotools pkgconfig systemd +inherit gettext autotools perlnative pkgconfig systemd -EXTRA_OECONF_append_class-target = " --with-driver=redhat" +EXTRA_OECONF:append:class-target = " --with-driver=redhat" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" PACKAGECONFIG[systemd] = "--with-sysinit=systemd,--with-sysinit=initscripts," EXTRA_AUTORECONF += "-I ${S}/gnulib/m4" -do_configure_prepend() { +do_configure:prepend() { currdir=`pwd` cd ${S} @@ -45,7 +49,7 @@ do_configure_prepend() { cd $currdir } -do_install_append() { +do_install:append() { if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${systemd_unitdir}/system if [ -d "${D}${libdir}/systemd/system" ]; then @@ -63,9 +67,9 @@ do_install_append() { fi } -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir} \ ${nonarch_libdir} \ " -SYSTEMD_SERVICE_${PN} = "netcf-transaction.service" +SYSTEMD_SERVICE:${PN} = "netcf-transaction.service" diff --git a/meta-networking/recipes-support/netperf/files/0001-netlib.c-Move-including-sched.h-out-og-function.patch b/meta-networking/recipes-support/netperf/files/0001-netlib.c-Move-including-sched.h-out-og-function.patch new file mode 100644 index 0000000000..515737c8e5 --- /dev/null +++ b/meta-networking/recipes-support/netperf/files/0001-netlib.c-Move-including-sched.h-out-og-function.patch @@ -0,0 +1,50 @@ +From 51a092ebb36dcc6180ceb93a9777258e826d9990 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 26 Sep 2018 18:11:10 -0700 +Subject: [PATCH] netlib.c: Move including sched.h out og function + +The shutdown_control() has this code where system headers are being +included inside function body and this results in compile errors on musl +especially when sched.h is included because sched.h defines a macro +which defines a static function. This means it ends up being a static +function inside another function and compiler calls it out + +In function 'bind_to_specific_processor': +| +/mnt/a/yoe/build/tmp/work/i586-yoe-linux-musl/netperf/2.7.0+git999-r0/recipe-sysroot/usr/include/sched.h:102:1: +error: invalid storage class for function '__CPU_AND_S' +| __CPU_op_func_S(AND, &) +| ^~~~~~~~~~~~~~~ + +Moving the definition out of function definition fixes the problem + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/netlib.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/netlib.c b/src/netlib.c +index 9258424..60b032d 100644 +--- a/src/netlib.c ++++ b/src/netlib.c +@@ -2262,6 +2262,10 @@ shutdown_control() + + } + ++#if HAVE_SCHED_SETAFFINITY ++#include <sched.h> ++#endif ++ + /* + bind_to_specific_processor will bind the calling process to the + processor in "processor" It has lots of ugly ifdefs to deal with +@@ -2308,7 +2312,6 @@ bind_to_specific_processor(int processor_affinity, int use_cpu_map) + value will not tell you if you are bound vs unbound. */ + bindprocessor(BINDPROCESS,getpid(),(cpu_t)mapped_affinity); + #elif HAVE_SCHED_SETAFFINITY +-#include <sched.h> + /* in theory this should cover systems with more CPUs than bits in a + long, without having to specify __USE_GNU. we "cheat" by taking + defines from /usr/include/bits/sched.h, which we ass-u-me is diff --git a/meta-networking/recipes-support/netperf/files/0001-nettest_omni-Remove-duplicate-variable-definitions.patch b/meta-networking/recipes-support/netperf/files/0001-nettest_omni-Remove-duplicate-variable-definitions.patch new file mode 100644 index 0000000000..08376417ba --- /dev/null +++ b/meta-networking/recipes-support/netperf/files/0001-nettest_omni-Remove-duplicate-variable-definitions.patch @@ -0,0 +1,37 @@ +From 6dd5b2b1f3ae3479647e2ef66e390d031066defe Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 12 Aug 2020 09:57:23 -0700 +Subject: [PATCH] nettest_omni: Remove duplicate variable definitions + +These defines are already defined in nettest_bsd.c and exported by +nettest_bsd.h this should fix build with -fno-common + +Upstream-Status: Submitted [https://github.com/HewlettPackard/netperf/pull/46] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/nettest_omni.c | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/src/nettest_omni.c b/src/nettest_omni.c +index 852eeb1..862088a 100644 +--- a/src/nettest_omni.c ++++ b/src/nettest_omni.c +@@ -458,14 +458,6 @@ static int client_port_max = 65535; + + /* different options for the sockets */ + +-int +- loc_nodelay, /* don't/do use NODELAY locally */ +- rem_nodelay, /* don't/do use NODELAY remotely */ +- loc_sndavoid, /* avoid send copies locally */ +- loc_rcvavoid, /* avoid recv copies locally */ +- rem_sndavoid, /* avoid send copies remotely */ +- rem_rcvavoid; /* avoid recv_copies remotely */ +- + extern int + loc_tcpcork, + rem_tcpcork, +-- +2.28.0 + diff --git a/meta-networking/recipes-support/netperf/files/netserver.service b/meta-networking/recipes-support/netperf/files/netserver.service new file mode 100644 index 0000000000..0876a0d223 --- /dev/null +++ b/meta-networking/recipes-support/netperf/files/netserver.service @@ -0,0 +1,9 @@ +[Unit] +Description=Netperf Benchmark Server +After=network.target + +[Service] +ExecStart=/usr/sbin/netserver -D + +[Install] +WantedBy=multi-user.target diff --git a/meta-networking/recipes-support/netperf/files/netserver_permissions.patch b/meta-networking/recipes-support/netperf/files/netserver_permissions.patch new file mode 100644 index 0000000000..55316363e0 --- /dev/null +++ b/meta-networking/recipes-support/netperf/files/netserver_permissions.patch @@ -0,0 +1,29 @@ +From 78c9ae7d9a6735575bc72dd28a19b2bc3a251981 Mon Sep 17 00:00:00 2001 +From: Andrew Elble <aweits@rit.edu> +Date: Mon, 8 Oct 2018 14:31:20 -0400 +Subject: [PATCH] netserver: don't change permissions on /dev/null + +the (now default) suppress_debug=1 changes permissions on /dev/null +to 0644. Don't do this. + +Upstream-Status: Pending [https://github.com/HewlettPackard/netperf/pull/27/commits/78c9ae7d9a6735575bc72dd28a19b2bc3a251981] +Signed-off-by: Ashish Sharma <asharma@mvista.com> + +--- + src/netserver.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/netserver.c b/src/netserver.c +index 00c8d23..86a1c45 100644 +--- a/src/netserver.c ++++ b/src/netserver.c +@@ -278,7 +278,8 @@ open_debug_file() + + #if !defined(WIN32) + +- chmod(FileName,0644); ++ if (!suppress_debug) ++ chmod(FileName,0644); + + /* redirect stdin to "/dev/null" */ + rd_null_fp = fopen(NETPERF_NULL,"r"); diff --git a/meta-networking/recipes-support/netperf/netperf_git.bb b/meta-networking/recipes-support/netperf/netperf_git.bb index f0e0f9cf1f..579a04b86f 100644 --- a/meta-networking/recipes-support/netperf/netperf_git.bb +++ b/meta-networking/recipes-support/netperf/netperf_git.bb @@ -2,47 +2,54 @@ SUMMARY = "A networking benchmarking tool" DESCRIPTION = "Network performance benchmark including tests for TCP, UDP, sockets, ATM and more." SECTION = "net" HOMEPAGE = "http://www.netperf.org/" -LICENSE = "netperf" -LICENSE_FLAGS = "non-commercial" -LIC_FILES_CHKSUM = "file://COPYING;md5=a0ab17253e7a3f318da85382c7d5d5d6" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=e661ab33a2a71ad6652c178dedf8aaa2" -PV = "2.7.0+git${SRCPV}" +PV = "2.7.0+git" -SRC_URI="git://github.com/HewlettPackard/netperf.git \ - file://cpu_set.patch \ - file://vfork.patch \ - file://init" +SRC_URI = "git://github.com/HewlettPackard/netperf.git;branch=master;protocol=https \ + file://cpu_set.patch \ + file://vfork.patch \ + file://init \ + file://netserver.service \ + file://0001-netlib.c-Move-including-sched.h-out-og-function.patch \ + file://0001-nettest_omni-Remove-duplicate-variable-definitions.patch \ + file://netserver_permissions.patch \ + " -SRCREV = "f482bab49fcedee46fc5b755da127f608325cd13" +SRCREV = "3bc455b23f901dae377ca0a558e1e32aa56b31c4" S = "${WORKDIR}/git" -inherit update-rc.d autotools +inherit update-rc.d autotools texinfo systemd # cpu_set.patch plus _GNU_SOURCE makes src/netlib.c compile with CPU_ macros -CFLAGS_append = " -DDO_UNIX -DDO_IPV6 -D_GNU_SOURCE" +CFLAGS:append = " -DDO_UNIX -DDO_IPV6 -D_GNU_SOURCE" # set the "_FILE_OFFSET_BITS" preprocessor symbol to 64 to support files # larger than 2GB -CFLAGS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'largefile', \ - ' -D_FILE_OFFSET_BITS=64', '', d)}" +CFLAGS:append = " -D_FILE_OFFSET_BITS=64" PACKAGECONFIG ??= "" PACKAGECONFIG[sctp] = "--enable-sctp,--disable-sctp,lksctp-tools," +PACKAGECONFIG[intervals] = "--enable-intervals,--disable-intervals,," +PACKAGECONFIG[histogram] = "--enable-histogram,--disable-histogram,," # autotools.bbclass attends to include m4 files with path depth <= 2 by # "find ${S} -maxdepth 2 -name \*.m4", so move m4 files from m4/m4. -do_configure_prepend() { +do_configure:prepend() { test -d ${S}/m4/m4 && mv -f ${S}/m4/m4 ${S}/m4-files } do_install() { - sed -e 's#/usr/sbin/#${sbindir}/#g' -i ${WORKDIR}/init - - install -d ${D}${sbindir} ${D}${bindir} ${D}${sysconfdir}/init.d + sed -e 's#/usr/sbin/#${sbindir}/#g' -i ${UNPACKDIR}/init + install -d ${D}${sbindir} ${D}${bindir} ${D}${sysconfdir}/init.d ${D}${systemd_system_unitdir} + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + sed -e 's#/usr/sbin/#${sbindir}/#g' ${UNPACKDIR}/netserver.service > ${D}${systemd_system_unitdir}/netserver.service + fi install -m 4755 src/netperf ${D}${bindir} install -m 4755 src/netserver ${D}${sbindir} - install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/netperf + install -m 0755 ${UNPACKDIR}/init ${D}${sysconfdir}/init.d/netperf # man install -d ${D}${mandir}/man1/ @@ -60,7 +67,8 @@ do_install() { install -m 0644 ${S}/doc/netperf_old.ps ${D}${docdir}/netperf } -RRECOMMENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'sctp', 'kernel-module-sctp', '', d)}" +RRECOMMENDS:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'sctp', 'kernel-module-sctp', '', d)}" INITSCRIPT_NAME="netperf" INITSCRIPT_PARAMS="defaults" +SYSTEMD_SERVICE:${PN} = "netserver.service" diff --git a/meta-networking/recipes-support/netsniff-ng/files/0001-Cmds-automatically-create-folder.patch b/meta-networking/recipes-support/netsniff-ng/files/0001-Cmds-automatically-create-folder.patch new file mode 100644 index 0000000000..490990d29d --- /dev/null +++ b/meta-networking/recipes-support/netsniff-ng/files/0001-Cmds-automatically-create-folder.patch @@ -0,0 +1,28 @@ +From 7c00d75d16da18a9998fc4cca28d3c953dd54ceb Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= <peron.clem@gmail.com> +Date: Mon, 14 Feb 2022 18:37:22 +0100 +Subject: [PATCH] Cmds: automatically create folder + +--- +Upstream-Status: Pending + + Cmds | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Cmds b/Cmds +index e590b38..3df23b8 100644 +--- a/Cmds ++++ b/Cmds +@@ -44,7 +44,8 @@ ifeq ("$(origin PREFIX)", "$(filter $(origin PREFIX), file command line)") + INSTX = echo -e " INST\t$(1)" && install -d $(2) && \ + install -C $(1) $(2)/$(shell basename $(1)) + else +- INSTX = echo -e " INST\t$(1)" && install -C $(1) $(2)/$(shell basename $(1)) ++ INSTX = echo -e " INST\t$(1)" && install -d $(2) && \ ++ install -C $(1) $(2)/$(shell basename $(1)) + endif + + MKDIR = echo -e " MKDIR\t$(1)" && mkdir -p $(1) +-- +2.32.0 + diff --git a/meta-networking/recipes-support/netsniff-ng/netsniff-ng_0.6.8.bb b/meta-networking/recipes-support/netsniff-ng/netsniff-ng_0.6.8.bb new file mode 100644 index 0000000000..341eab015c --- /dev/null +++ b/meta-networking/recipes-support/netsniff-ng/netsniff-ng_0.6.8.bb @@ -0,0 +1,36 @@ +DESCRIPTION = "Netsniff-ng is a fast zero-copy analyzer, pcap capturing and replaying tool" +HOMEPAGE = "http://netsniff-ng.org" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=9dd40dfb621eed702c0775577fbb7011" +DEPENDS = "libpcap" + +SRCREV = "be3e706f00295024ebc199e70177343fdaebbc9e" +SRC_URI = " \ + git://github.com/netsniff-ng/netsniff-ng.git;protocol=https;branch=master \ + file://0001-Cmds-automatically-create-folder.patch \ + " + +S = "${WORKDIR}/git" + +inherit pkgconfig + +EXTRA_OEMAKE += " TERM='' " + +PACKAGECONFIG ??= "" +PACKAGECONFIG[zlib] = ",--disable-zlib,zlib," +PACKAGECONFIG[libnl] = ",--disable-libnl,libnl," +PACKAGECONFIG[geoip] = ",--disable-geoip,geoip," + +do_configure() { + ./configure --prefix=${prefix} +} + +do_compile() { + oe_runmake +} + +do_install() { + oe_runmake DESTDIR=${D} netsniff-ng_install +} + +BBCLASSEXTEND = "native" diff --git a/meta-networking/recipes-support/nis/nis.inc b/meta-networking/recipes-support/nis/nis.inc index e027a1c6f8..56b7ab0d69 100644 --- a/meta-networking/recipes-support/nis/nis.inc +++ b/meta-networking/recipes-support/nis/nis.inc @@ -6,7 +6,7 @@ DESCRIPTION = "NIS Server and Tools" HOMEPAGE = "http://www.linux-nis.org/nis/" SECTION = "net" -LICENSE = "GPL-2.0" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" inherit autotools gettext pkgconfig @@ -20,12 +20,3 @@ inherit autotools gettext pkgconfig do_install() { oe_runmake 'DESTDIR=${D}' install-strip } - -# An attempt to build on uclibc will fail, causing annoyance, -# so force the package to be skipped here (this will cause a -# 'nothing provides' error) -python () { - os = d.getVar("TARGET_OS", True) - if os == "linux-uclibc": - raise bb.parse.SkipPackage("NIS functionality requires rpcsvc/yp.h, uClibC does not provide this") -} diff --git a/meta-networking/recipes-support/nis/yp-tools/0001-ypbind3_binding_dup.c-Include-string.h-for-strdup-de.patch b/meta-networking/recipes-support/nis/yp-tools/0001-ypbind3_binding_dup.c-Include-string.h-for-strdup-de.patch deleted file mode 100644 index 3d4d4f278d..0000000000 --- a/meta-networking/recipes-support/nis/yp-tools/0001-ypbind3_binding_dup.c-Include-string.h-for-strdup-de.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 420cb6927553bbca5b49b7681cf208e6df6e4d7c Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 8 Sep 2017 08:42:45 -0700 -Subject: [PATCH 1/2] ypbind3_binding_dup.c: Include string.h for strdup - declaration - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Submitted - - lib/ypbind3_binding_dup.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lib/ypbind3_binding_dup.c b/lib/ypbind3_binding_dup.c -index ce4aadf..8199c0b 100644 ---- a/lib/ypbind3_binding_dup.c -+++ b/lib/ypbind3_binding_dup.c -@@ -19,6 +19,7 @@ - - #if defined(HAVE_YPBIND3) - -+#include <string.h> - #include <rpcsvc/yp_prot.h> - #include "internal.h" - --- -2.14.1 - diff --git a/meta-networking/recipes-support/nis/yp-tools/0002-yp_dump_bindings.c-Include-string.h-for-memset.patch b/meta-networking/recipes-support/nis/yp-tools/0002-yp_dump_bindings.c-Include-string.h-for-memset.patch deleted file mode 100644 index 0562e58afb..0000000000 --- a/meta-networking/recipes-support/nis/yp-tools/0002-yp_dump_bindings.c-Include-string.h-for-memset.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 03ccabb6264c008430c4b1739351df5a63829f8e Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 8 Sep 2017 08:52:32 -0700 -Subject: [PATCH 2/2] yp_dump_bindings.c: Include string.h for memset - -Fixes -error: implicitly declaring library function 'memset' - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Submitted - - src/yp_dump_binding.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/yp_dump_binding.c b/src/yp_dump_binding.c -index a5ab920..d75e2c2 100644 ---- a/src/yp_dump_binding.c -+++ b/src/yp_dump_binding.c -@@ -26,6 +26,7 @@ - #include <libintl.h> - #include <locale.h> - #include <getopt.h> -+#include <string.h> - #include <sys/stat.h> - #include <arpa/inet.h> - #include <rpcsvc/ypclnt.h> --- -2.14.1 - diff --git a/meta-networking/recipes-support/nis/yp-tools_2.14.bb b/meta-networking/recipes-support/nis/yp-tools_2.14.bb index 8c6837bac9..0e147826f0 100644 --- a/meta-networking/recipes-support/nis/yp-tools_2.14.bb +++ b/meta-networking/recipes-support/nis/yp-tools_2.14.bb @@ -20,15 +20,15 @@ SRC_URI[md5sum] = "ba1f121c17e3ad65368be173b977cd13" SRC_URI[sha256sum] = "d01f70fadc643a55107a0edc47c6be99d0306bcc4f66df56f65e74238b0124c9" inherit systemd -SYSTEMD_SERVICE_${PN} = "domainname.service" +SYSTEMD_SERVICE:${PN} = "domainname.service" -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -RCONFLICTS_${PN} += "${PN}-systemd" +RPROVIDES:${PN} += "${PN}-systemd" +RREPLACES:${PN} += "${PN}-systemd" +RCONFLICTS:${PN} += "${PN}-systemd" CACHED_CONFIGUREVARS += "ac_cv_prog_STRIP=/bin/true" -do_install_append() { +do_install:append() { install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/domainname.service ${D}${systemd_unitdir}/system + install -m 0644 ${UNPACKDIR}/domainname.service ${D}${systemd_unitdir}/system } diff --git a/meta-networking/recipes-support/nis/yp-tools_4.2.2.bb b/meta-networking/recipes-support/nis/yp-tools_4.2.2.bb deleted file mode 100644 index 9ac973812c..0000000000 --- a/meta-networking/recipes-support/nis/yp-tools_4.2.2.bb +++ /dev/null @@ -1,46 +0,0 @@ -# This package builds tools to manage NIS -# The source package is utils/net/NIS/yp-tools -# -require nis.inc - -SUMMARY = "NIS client programs" -DESCRIPTION = " \ -Network Information Service tools. \ -This package contains ypcat, ypmatch, ypset, \ -ypwhich, yppasswd, domainname, nisdomainname \ -and ypdomainname. \ -" - -SRC_URI = "http://www.linux-nis.org/download/yp-tools/${BP}.tar.bz2 \ - file://domainname.service \ - file://0001-ypbind3_binding_dup.c-Include-string.h-for-strdup-de.patch \ - file://0002-yp_dump_bindings.c-Include-string.h-for-memset.patch \ - " -SRC_URI[md5sum] = "fb4a8bffb44ae5d3390351d67f320ef3" -SRC_URI[sha256sum] = "137f19a986382b275bf4a2b1a69eb26689d6f4ac056ddaa21784d6b80eb98faa" - -DEPENDS = "libtirpc libnsl2" - -inherit autotools systemd -SYSTEMD_SERVICE_${PN} = "domainname.service" - -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -RCONFLICTS_${PN} += "${PN}-systemd" - -CACHED_CONFIGUREVARS += "ac_cv_prog_STRIP=/bin/true" - -EXTRA_OECONF = " \ - --disable-rpath --disable-domainname \ - " -CFLAGS_append_libc-musl = " -Wno-error=cpp" - -FILES_${PN} += " ${libdir}/yp-nis/*.so.*.* ${libdir}/yp-nis/pkgconfig/" -FILES_${PN}-dbg += " ${libdir}/yp-nis/.debug" -FILES_${PN}-dev += " ${libdir}/yp-nis/*.so ${libdir}/yp-nis/*.so.[12] ${libdir}/yp-nis/*.la" -FILES_${PN}-staticdev += " ${libdir}/yp-nis/*.a" - -do_install_append() { - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/domainname.service ${D}${systemd_unitdir}/system -} 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 new file mode 100644 index 0000000000..9b2c186873 --- /dev/null +++ b/meta-networking/recipes-support/nis/yp-tools_4.2.3.bb @@ -0,0 +1,47 @@ +# This package builds tools to manage NIS +# The source package is utils/net/NIS/yp-tools +# +require nis.inc + +SUMMARY = "NIS client programs" +DESCRIPTION = " \ +Network Information Service tools. \ +This package contains ypcat, ypmatch, ypset, \ +ypwhich, yppasswd, domainname, nisdomainname \ +and ypdomainname. \ +" + +# v4.2.3 +SRCREV = "1bfda29c342a81b97cb1995ffd9e8da5de63e7ab" + +SRC_URI = "git://github.com/thkukuk/yp-tools;branch=master;protocol=https \ + file://domainname.service \ + " + +S = "${WORKDIR}/git" + +DEPENDS = "libtirpc libnsl2 virtual/crypt" + +inherit autotools systemd +SYSTEMD_SERVICE:${PN} = "domainname.service" + +RPROVIDES:${PN} += "${PN}-systemd" +RREPLACES:${PN} += "${PN}-systemd" +RCONFLICTS:${PN} += "${PN}-systemd" + +CACHED_CONFIGUREVARS += "ac_cv_prog_STRIP=/bin/true" + +EXTRA_OECONF = " \ + --disable-rpath --disable-domainname \ + " +CFLAGS:append:libc-musl = " -Wno-error=cpp" + +FILES:${PN} += " ${libdir}/yp-nis/*.so.*.* ${libdir}/yp-nis/pkgconfig/" +FILES:${PN}-dbg += " ${libdir}/yp-nis/.debug" +FILES:${PN}-dev += " ${libdir}/yp-nis/*.so ${libdir}/yp-nis/*.so.[12] ${libdir}/yp-nis/*.la" +FILES:${PN}-staticdev += " ${libdir}/yp-nis/*.a" + +do_install:append() { + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${UNPACKDIR}/domainname.service ${D}${systemd_unitdir}/system +} diff --git a/meta-networking/recipes-support/nis/ypbind-mt_2.4.bb b/meta-networking/recipes-support/nis/ypbind-mt_2.7.2.bb index 9822f455ec..e29730a23f 100644 --- a/meta-networking/recipes-support/nis/ypbind-mt_2.4.bb +++ b/meta-networking/recipes-support/nis/ypbind-mt_2.7.2.bb @@ -16,47 +16,48 @@ the server which answered as first. \ \ This is the final IPv4-only version of ypbind-mt. \ " -HOMEPAGE = "http://www.linux-nis.org/nis/ypbind-mt/index.html" +HOMEPAGE = "https://github.com/thkukuk/ypbind-mt/" DEPENDS = " \ yp-tools \ ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ " -DEPENDS_append_libc-musl = " bsd-headers nss" -RDEPENDS_${PN} += "yp-tools" +DEPENDS:append:libc-musl = " bsd-headers nss" +RDEPENDS:${PN} += "yp-tools" # ypbind-mt now provides all the functionality of ypbind # and is used in place of it. PROVIDES += "ypbind" -SRC_URI = "http://www.linux-nis.org/download/ypbind-mt/${BP}.tar.bz2 \ +SRC_URI = "https://github.com/thkukuk/ypbind-mt/releases/download/v${PV}/${BPN}-${PV}.tar.xz \ + file://0001-dns_hosts-Fix-build-with-musl.patch \ file://ypbind.init \ file://ypbind.service \ - file://0001-dns_hosts-Fix-build-with-musl.patch \ " -SRC_URI[md5sum] = "1aeccd0d11c064d5d59c56941bca682b" -SRC_URI[sha256sum] = "a2e1fa8fc992a12b289c229e00e38c20d59070c3bcf08babf40c692515c340e0" +SRC_URI[sha256sum] = "064f2f185673c5493df83f6400b799f3a359de56118b6ba37c4327111f2fcd8b" inherit systemd update-rc.d -SYSTEMD_SERVICE_${PN} = "ypbind.service" +SYSTEMD_SERVICE:${PN} = "ypbind.service" INITSCRIPT_NAME = "ypbind" INITSCRIPT_PARAMS = "start 44 3 5 . stop 70 0 1 2 6 ." CACHED_CONFIGUREVARS = "ac_cv_prog_STRIP=/bin/true" -CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/nss3" +CFLAGS:append = " -I${STAGING_INCDIR}/nss3 -I${STAGING_INCDIR}/nspr" -do_install_append () { +do_install:append () { install -d ${D}${sysconfdir}/init.d install -d ${D}${sysconfdir}/rcS.d - install -m 0755 ${WORKDIR}/ypbind.init ${D}${sysconfdir}/init.d/ypbind + install -m 0755 ${UNPACKDIR}/ypbind.init ${D}${sysconfdir}/init.d/ypbind install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/ypbind.service ${D}${systemd_unitdir}/system + install -m 0644 ${UNPACKDIR}/ypbind.service ${D}${systemd_unitdir}/system } +# uses glibc internal APIs e.g. _hostalias +COMPATIBLE_HOST:libc-musl = "null" -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -RCONFLICTS_${PN} += "${PN}-systemd" +RPROVIDES:${PN} += "${PN}-systemd" +RREPLACES:${PN} += "${PN}-systemd" +RCONFLICTS:${PN} += "${PN}-systemd" diff --git a/meta-networking/recipes-support/ntimed/ntimed_git.bb b/meta-networking/recipes-support/ntimed/ntimed_git.bb index 527ea33b55..955c03f42d 100644 --- a/meta-networking/recipes-support/ntimed/ntimed_git.bb +++ b/meta-networking/recipes-support/ntimed/ntimed_git.bb @@ -6,18 +6,18 @@ HOMEPAGE = "https://github.com/bsdphk/Ntimed" SECTION = "net" LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://main.c;startline=2;endline=24;md5=eda11d21005319bb76cbb6f911f0f66d" +LIC_FILES_CHKSUM = "file://main.c;beginline=2;endline=24;md5=89db8e76f2951f3fad167e7aa9718a44" -SRC_URI = "git://github.com/bsdphk/Ntimed \ +SRC_URI = "git://github.com/bsdphk/Ntimed;branch=master;protocol=https \ file://use-ldflags.patch" -PV = "0.0+git${SRCPV}" +PV = "0.0+git" SRCREV = "db0abbb4c80f2ecef6bc5d9639bca5bea28532a2" S = "${WORKDIR}/git" # use adjtimex on musl -CFLAGS_append_libc-musl = " -Dntp_adjtime=adjtimex" +CFLAGS:append:libc-musl = " -Dntp_adjtime=adjtimex" EXTRA_OEMAKE = "\ 'CC=${CC}' \ @@ -33,8 +33,8 @@ do_install () { install -D -m 0755 ntimed-client ${D}${sbindir}/ntimed-client } -ALLOW_EMPTY_${PN} = "1" -RDEPENDS_${PN} += "ntimed-client" +ALLOW_EMPTY:${PN} = "1" +RDEPENDS:${PN} += "ntimed-client" PACKAGE_BEFORE_PN += "ntimed-client" -FILES_ntimed-client = "${sbindir}/ntimed-client" +FILES:ntimed-client = "${sbindir}/ntimed-client" diff --git a/meta-networking/recipes-support/ntop/ntop/0001-nDPI-Include-sys-types.h.patch b/meta-networking/recipes-support/ntop/ntop/0001-nDPI-Include-sys-types.h.patch deleted file mode 100644 index 81ffeec21b..0000000000 --- a/meta-networking/recipes-support/ntop/ntop/0001-nDPI-Include-sys-types.h.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 6543f3e2d5fe214e2fc6c050289bf1ae73b18724 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 30 Aug 2017 13:56:24 -0700 -Subject: [PATCH] nDPI: Include sys/types.h - -Needed for uint_t types - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending - - nDPI/src/include/ipq_api.h | 1 + - 1 file changed, 1 insertion(+) - -Index: ntop-5.0.1/nDPI/src/include/ipq_api.h -=================================================================== ---- ntop-5.0.1.orig/nDPI/src/include/ipq_api.h -+++ ntop-5.0.1/nDPI/src/include/ipq_api.h -@@ -24,6 +24,7 @@ - #ifndef __IPOQUE_API_INCLUDE_FILE__
- #define __IPOQUE_API_INCLUDE_FILE__
-
-+#include <sys/types.h>
-
- #if defined(HAVE_NTOP) && defined(WIN32)
- #include <winsock2.h>
diff --git a/meta-networking/recipes-support/ntop/ntop/ntop.service b/meta-networking/recipes-support/ntop/ntop/ntop.service deleted file mode 100644 index 1ead2a0c5f..0000000000 --- a/meta-networking/recipes-support/ntop/ntop/ntop.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=A network traffic probe similar to the UNIX top command -Requires=network.target - -ConditionPathExists=@SYSCONFDIR@/ntop.conf -After=syslog.target network.target - -[Service] -Type=oneshot -RemainAfterExit=yes -ExecStart=@LIBEXECDIR@/ntop-helper start -ExecStop=@LIBEXECDIR@/ntop-helper stop - -[Install] -WantedBy=multi-user.target diff --git a/meta-networking/recipes-support/ntop/ntop/ntop_configure_in.patch b/meta-networking/recipes-support/ntop/ntop/ntop_configure_in.patch deleted file mode 100644 index 392cb082b7..0000000000 --- a/meta-networking/recipes-support/ntop/ntop/ntop_configure_in.patch +++ /dev/null @@ -1,164 +0,0 @@ -1)add --with-pcap-config option to use libpcap's pcap-config -2)add AC_CHECK_LIB if user didn't specify PCAP_ROOT and pcap-config - put it before host check to make cross-compiling easier. - pcap doesn't need extra include and libs so it is fine. -3)remove old rrd configure code but use pkg-config to config rrd - rrdtool should have the pkg-config file installed. -4)fix python-config -5)change AC_TRY_RUN to AC_COMPILE_IFELSE for pthread_rwlock_t checking -6)fix a net-snmp-config bug - -Upstream-Status: Pending - -Signed-off-by: Yao Zhao <yao.zhao@windriver.com> ---- -diff --git a/configure.in b/configure.in -index 0c7c0a5..cad40be 100644 ---- a/configure.in -+++ b/configure.in -@@ -230,14 +230,14 @@ dnl> - AC_ARG_WITH(void, - [ +-External-source-locations:-------------------------------------------------+]) - --AC_ARG_WITH( rrd-home, -- [ --with-rrd-home=DIR Usually /usr/local/rrdtool-1.2.x], -- RRD_HOME="$withval", -- RRD_HOME=/usr/local/rrdtool-1.2.19) - AC_ARG_WITH( pcap-root, - [ --with-pcap-root=DIR LBNL pcap located in DIR], - PCAP_ROOT="$withval", - PCAP_ROOT=) -+AC_ARG_WITH( pcap-config, -+ [ --with-pcap-config=path/pcap-config where to find pcap-config], -+ PCAP_CONFIG="$withval", -+ PCAP_CONFIG=) - AC_ARG_WITH( gdbm-root, - [ --with-gdbm-root=DIR gdbm located in DIR], - GDBM_DIRECTORY="$withval", -@@ -556,6 +556,7 @@ if test ".${PCAPRING_DIR}" != .; then - else - - TMP_ROOT=${HOME}/PF_RING/userland/libpcap/ -+FOUND_PCAP=1 - if test ".${PCAP_ROOT}" == . && - test -d ${TMP_ROOT} && - test -r ${TMP_ROOT}/libpcap.a; then -@@ -563,6 +564,18 @@ if test ".${PCAP_ROOT}" == . && - CORELIBS="${CORELIBS} -L${TMP_ROOT} -L${HOME}/PF_RING/userland/lib -lpfring -lpcap " - INCS="${INCS} -I ${PCAP_ROOT}" - AC_MSG_RESULT([found in $PCAP_ROOT]) -+elif test -n "${PCAP_CONFIG}" && test -x "${PCAP_CONFIG}"; then -+ CORELIBS="${CORELIBS} $(${PCAP_CONFIG} --libs)" -+ INCS="${INCS} $(${PCAP_CONFIG} --cflags)" -+ AC_DEFINE_UNQUOTED(HAVE_LIBPCAP, 1, [have libpcap ]) -+ AC_MSG_RESULT([found pcap-config: $PCAP_CONFIG, libs:$(${PCAP_CONFIG} --libs) cflags:$(${PCAP_CONFIG} --cflags)]) -+else -+ AC_CHECK_LIB(pcap, pcap_lookupdev, , -+ [FOUND_PCAP=]) -+fi -+ -+if test -n "$FOUND_PCAP"; then -+ : - elif test ".${PCAP_ROOT}" != .; then - if test -d $PCAP_ROOT && - test -r $PCAP_ROOT/lib/libpcap.a && -@@ -880,44 +893,11 @@ AC_CHECK_LIB([z], [zlibVersion], [], [ - exit -1 - ]) - --# RRD --if test -d "$RRD_HOME"; then -- AC_MSG_RESULT(checking for RRD home... yes) --else -- RRD_HOME=/usr/local/rrdtool -- if test -d "$RRD_HOME"; then -- AC_MSG_RESULT(Checking rrdtool in $RRD_HOME) -- else -- RRD_HOME=/usr/local -- fi --fi -- --RRD_LIB="-L${RRD_HOME}/lib -lrrd_th" -- --if test -f "$RRD_HOME/lib/librrd_th.so"; then -- AC_MSG_RESULT(checking for rrdtool... yes) --else -- if test -f "$RRD_HOME/lib/librrd_th.dylib"; then # OSX -- AC_MSG_RESULT(checking for rrdtool... yes) -- else -- if test -f "$RRD_HOME/lib/librrd_th.a"; then -- AC_MSG_RESULT(checking for rrdtool... yes) -- else -- AC_CHECK_LIB([rrd_th], [main]) -- if test ".${ac_cv_lib_rrd_th_main}" != ".yes"; then -- AC_MSG_ERROR(Unable to find RRD at $RRD_HOME: please use --with-rrd-home=DIR); -- AC_MSG_ERROR(RRD source can be downloaded from http://www.rrdtool.org/); -- else -- RRD_LIB= -- fi -- fi -- fi --fi -- --RRD_INC= --if test -d "${RRD_HOME}/include"; then -- RRD_INC="-I${RRD_HOME}/include" --fi -+PKG_CHECK_MODULES( [RRD], [librrd] ) -+AC_SUBST(RRD_CFLAGS) -+AC_SUBST(RRD_LIBS) -+RRD_INC=$RRD_FLAGS -+RRD_LIB=$RRD_LIBS - - dnl> The failed recheck stuff below is courtesy of Chris Turbeville [turbo@verio.net] - dnl> Chris developed this for Solaris 9, confirming work I had done earlier for FreeBSD -@@ -1041,7 +1021,7 @@ AC_CHECK_HEADERS([sched.h sys/sched.h]) - AC_CHECK_HEADERS([pthread.h]) - - AC_MSG_CHECKING([if r/w locks are supported]) --AC_TRY_RUN([ -+AC_COMPILE_IFELSE([ - #include <pthread.h> - - int main() -@@ -1443,15 +1423,15 @@ dnl> NET-SNMP - dnl> - if test ".${ac_disable_snmp}" != ".yes"; then - AC_CHECK_TOOL(NETSNMP, net-snmp-config) -- if test "x$ac_cv_prog_ac_ct_NETSNMP" = "xnet-snmp-config"; then -+ if test -n "$NETSNMP"; then - AC_DEFINE_UNQUOTED(HAVE_SNMP, 1, [SNMP is supported]) -- SNMPLIBS="`net-snmp-config --libs`" -+ SNMPLIBS="`$NETSNMP --libs`" - SNMPLIBS="`echo ${SNMPLIBS}|sed -e s,'-R../lib',,g`" - echo "net-snmp libs: ${SNMPLIBS}" - LIBS="${LIBS} ${SNMPLIBS}" - dnl remove unecessary path - LIBS=`echo ${LIBS}|sed -e s,'-R../lib',,g` -- INCS="${INCS} `net-snmp-config --cflags`" -+ INCS="${INCS} `$NETSNMP --cflags`" - else - AC_MSG_RESULT(NETSNMP is not present: SNMP support is disabled) - fi -@@ -1464,10 +1444,9 @@ SAVED_LIBS=$LIBS - dnl> - dnl> PYTHON - dnl> -- AC_CHECK_TOOL(PYTHON, python-config) -- PYTHON_CONFIG="" -+ AC_CHECK_TOOL(PYTHON_CONFIG, python-config) - -- if test "x$ac_cv_prog_ac_ct_PYTHON" != "xpython-config"; then -+ if test -z "$PYTHON_CONFIG"; then - if test -f "/etc/debian_version"; then - AC_MSG_RESULT(Please install python-dev and rerun configure) - exit 1 -@@ -1481,8 +1460,6 @@ dnl> - PYTHON_CONFIG="python-config" - fi - fi -- else -- PYTHON_CONFIG="python-config" - fi - - if test "x$PYTHON_CONFIG" != "x"; then diff --git a/meta-networking/recipes-support/ntop/ntop/ntop_configure_in_net_snmp_config_exist.patch b/meta-networking/recipes-support/ntop/ntop/ntop_configure_in_net_snmp_config_exist.patch deleted file mode 100644 index 269138df93..0000000000 --- a/meta-networking/recipes-support/ntop/ntop/ntop_configure_in_net_snmp_config_exist.patch +++ /dev/null @@ -1,21 +0,0 @@ -Check net-snmp-config's existence in case user specified the -ac_cv_prog_NETSNMP to avoid HAVE_SNMP defined if the specified -net-snmp-config doesn't exist. - -Upstream-Status: Inappropriate [Embedded specific] - -Signed-off-by: Yao Zhao <yao.zhao@windriver.com> ---- -diff --git a/configure.in b/configure.in -index 6f3e88f..8ddf017 100755 ---- a/configure.in -+++ b/configure.in -@@ -1423,7 +1423,7 @@ dnl> NET-SNMP - dnl> - if test ".${ac_disable_snmp}" != ".yes"; then - AC_CHECK_TOOL(NETSNMP, net-snmp-config) -- if test -n "$NETSNMP"; then -+ if test -n "$NETSNMP" -a -e "$NETSNMP"; then - AC_DEFINE_UNQUOTED(HAVE_SNMP, 1, [SNMP is supported]) - SNMPLIBS="`$NETSNMP --libs`" - SNMPLIBS="`echo ${SNMPLIBS}|sed -e s,'-R../lib',,g`" diff --git a/meta-networking/recipes-support/ntop/ntop/ntop_init.patch b/meta-networking/recipes-support/ntop/ntop/ntop_init.patch deleted file mode 100644 index e7684c1b4c..0000000000 --- a/meta-networking/recipes-support/ntop/ntop/ntop_init.patch +++ /dev/null @@ -1,228 +0,0 @@ -Modify ntop.init to WRLinux 5.0 style. - -Fix a small problem that when ntop not running, -/etc/init.d/ntop stop will return 1 - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Yao Zhao <yao.zhao@windriver.com> ---- - packages/RedHat/ntop.init | 102 +++++++++----------------------------------- - 1 files changed, 21 insertions(+), 81 deletions(-) - -diff --git a/packages/RedHat/ntop.init b/packages/RedHat/ntop.init -index 40d49f1..a189c59 100755 ---- a/packages/RedHat/ntop.init -+++ b/packages/RedHat/ntop.init -@@ -10,19 +10,9 @@ - # You have set the admin password - read docs/1STRUN.txt - # You have created /etc/ntop.conf with appropriate parameters. - --# To identify an interface to ntop, use the following flags --# in /etc/sysconfig/network-scripts/ifcfg-ethx -- --# NTOP="yes" <--- means for ntop to use this interface --# NTOPCONFIG="yes" <--- means for ntop to configure this interface -- - # Note that if you give a -i parameter in either /etc/ntop.conf or - # the command line, the scan is NOT performed. - --# However, when it comes to the configuration step, with NTOPCONFIG="yes" --# the interface is configured regardless of how the interface list was --# specified. -- - # - # -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- - # -@@ -107,11 +97,7 @@ ntopusesyslog="local3" - invoked=$0 - - # Source function library. --. /etc/rc.d/init.d/functions -- --# Source networking configuration. --. /etc/sysconfig/network -- -+. /etc/init.d/functions - - # Basic sanity checks... - if ! [ -x $prog ]; then -@@ -124,16 +110,6 @@ if ! [ -x $prog ]; then - exit 1 - fi - --if [ ${NETWORKING} = "no" ]; then -- echo "" -- echo "ERROR -" -- echo " Networking is not up!" -- echo "" -- echo "Aborting..." -- echo "" -- exit 1 --fi -- - if ! [ -f ${conf} ]; then - echo "" - echo "ERROR -" -@@ -180,8 +156,8 @@ fi - if [ "${debug}" = "y" ]; then echo "DEBUG: parm file temp is ${parmfile}"; fi - - cmd=`echo \ -- @${conf} \ - -i tbd \ -+ @${conf} \ - $extra $@` - - echo ${cmd} | awk ' \ -@@ -305,42 +281,6 @@ logger -p ${ntopusesyslog} -t ${name}${instance} -- "INITD - Configuration - - # Build list of interfaces, e.g eth0 eth1 eth1:1 - # (Yeah, we'll have to convert that to eth0,eth1,eth1:1 later --if [ ".${ntopinterface}" = ".tbd" ]; then -- -- ntopinterface="" -- iflist=`ip link show | \ -- awk '/^[0-9]*:\ eth/ { printf("%s ", substr($2, 1, length($2)-1)) }'` -- logger -p ${ntopusesyslog} -t ${name}${instance} -- "INITD - Scanning all interfaces $iflist" -- if [ "${debug}" = "y" ]; then echo "DEBUG: Interface candidates are ${iflist}"; fi -- -- for eth in $iflist; do -- -- if ! LANG=C egrep -L "^[Nn][Tt][Oo][Pp]=['\"]?[Yy][Ee][Ss]['\"]?" \ -- /etc/sysconfig/network-scripts/ifcfg-$eth > /dev/null ; then -- logger -p ${ntopusesyslog} -t ${name}${instance} -- "INITD - $eth is not ntop=yes, skipping" -- if [ "${debug}" = "y" ]; then echo "DEBUG: $eth not ntop=yes"; fi -- continue -- fi -- -- ntopinterface="${ntopinterface} $eth" -- -- ip=`ip addr show $eth | \ -- awk '/inet/ { printf("%s", substr($2, 1, index($2, "/")-1)) }'` -- -- if [ ".$ip" = "." ]; then -- is="is unnumbered interface" -- else -- is="has IP address $ip" -- fi -- logger -p ${ntopusesyslog} -t ${name}${instance} -- "INITD - $eth is ntop=yes, ${is}" -- if [ "${debug}" = "y" ]; then echo "DEBUG: $eth ntop=yes, ${is}"; fi -- -- done -- --else -- logger -p ${ntopusesyslog} -t ${name}${instance} -- "INITD - Skipping interface scan - list in parms" --fi -- - if [ "x${ntopinterface}" = "x" ]; then - ntopinterface="none" - fi -@@ -462,12 +402,6 @@ config_interfaces () { - if="${if},${eth}" - fi - -- if ! LANG=C egrep -L "^[Nn][Tt][Oo][Pp][Cc].*=['\"]?[Yy][Ee][Ss]['\"]?" \ -- /etc/sysconfig/network-scripts/ifcfg-$eth > /dev/null ; then -- logger -p ${ntopusesyslog} -t ${name}${instance} -- "INITD - $eth is not ntopconfigure=yes, skipping" -- continue -- fi -- - logger -p ${ntopusesyslog} -t ${name}${instance} -- "INITD - Configuring $eth" - if [ "${debug}" = "y" ]; then echo "DEBUG: Configuring $eth"; fi - -@@ -527,7 +461,7 @@ start () { - show_extra - config_interfaces - -- cmd=`echo $prog \ -+ cmd=`echo \ - @${conf} \ - -i $if \ - $extra $@` -@@ -541,7 +475,7 @@ start () { - if [ ".${ldlibpath}" != "." ]; then - export LD_LIBRARY_PATH="${ldlibpath}" - fi -- daemon ${cmd} -+ start-stop-daemon --start --quiet --exec $prog -- ${cmd} - RETVAL=$? - - [ $RETVAL = 0 ] && touch /var/lock/subsys/${name}${instance} -@@ -551,6 +485,7 @@ start () { - stop () { - # stop daemon - -+ NOT_RUNNING=1 - RETVAL=1 - echo -n $"Stopping ${name}${instance}: " - logger -p ${ntopusesyslog} -t ${name}${instance} -- "INITD - Stopping: ${name}${instance}" -@@ -563,13 +498,14 @@ stop () { - if [ $rc = 0 ]; then - logger -p ${ntopusesyslog} -t ${name}${instance} -- "INITD - Sending SIGTERM to ${pid}" - if [ "${debug}" = "y" ]; then echo "Sending SIGTERM to ${pid}"; fi -- kill -s SIGTERM ${pid} -+ kill -TERM ${pid} 2>&1 > /dev/null - RETVAL=$? - rm -f ${ntopdbfilepath}/ntop.pid - else - logger -p ${ntopusesyslog} -t ${name}${instance} -- "INITD - Unable to find process ${pid} ... will kill by name" - if [ "${debug}" = "y" ]; then echo "Unable to find process ${pid} ... will kill by name"; fi - fi -+ NOT_RUNNING=0 - else - - logger -p ${ntopusesyslog} -t ${name}${instance} -- "INITD - Unable to find ${ntopdbfilepath}/ntop.pid file ... will kill by name" -@@ -577,15 +513,16 @@ stop () { - - fi - -- echo -- - if [ $RETVAL != 0 ]; then - pids=`ps axf | grep '\/usr\/bin\/ntop' | awk '{ printf(" %s", $1) }; END { print "" }'` -- if [ "${pids}" != " " ]; then -+ if [ "${pids}" != "" ]; then - logger -p ${ntopusesyslog} -t ${name}${instance} -- "INITD - Sending SIGTERM to ${prog}...${pids}" - if [ "${debug}" = "y" ]; then echo "Sending SIGTERM to ${prog}...${pids}"; fi -- kill -INT ${pids} -+ kill -TERM ${pids} > /dev/null 2>&1 - RETVAL=$? -+ NOT_RUNNING=0 -+ else -+ NOT_RUNNING=1 - fi - fi - -@@ -597,13 +534,9 @@ stop () { - if [ "${debug}" = "y" ]; then echo "DEBUG: Unconfiguring interfaces"; fi - - for eth in ${ntopinterface}; do -- if ! LANG=C egrep -L "^[Nn][Tt][Oo][Pp][Cc].*=['\"]?[Yy][Ee][Ss]['\"]?" \ -- /etc/sysconfig/network-scripts/ifcfg-$eth > /dev/null ; then -- logger -p ${ntopusesyslog} -t ${name}${instance} -- "INITD - $eth is not ntopconfigure=yes, skipping" -- if [ "${debug}" = "y" ]; then echo "DEBUG: $eth is not ntopconfigure=yes"; fi -- continue -+ if [ "$eth" = "none" ]; then -+ continue - fi -- - logger -p ${ntopusesyslog} -t ${name}${instance} -- "INITD - Unconfiguring $eth" - if [ "${debug}" = "y" ]; then echo "DEBUG: Unconfiguring $eth"; fi - -@@ -623,6 +556,13 @@ stop () { - if [ "${debug}" = "y" ]; then echo "DEBUG: Interfaces are unconfigured"; fi - fi - -+ if [ $NOT_RUNNING -eq 1 -o $RETVAL -eq 0 ]; then -+ echo " [ OK ]" -+ RETVAL=0 -+ else -+ echo " [ FAILED ]" -+ fi -+ - return $RETVAL - } - --- -1.7.5.4 - diff --git a/meta-networking/recipes-support/ntop/ntop/ntop_webInterface.patch b/meta-networking/recipes-support/ntop/ntop/ntop_webInterface.patch deleted file mode 100644 index 9f57ca4255..0000000000 --- a/meta-networking/recipes-support/ntop/ntop/ntop_webInterface.patch +++ /dev/null @@ -1,19 +0,0 @@ -change osName to version as it prints out "ntop Version". - -Upstream-Status: Pending - -Signed-off-by: Yao Zhao <yao.zhao@windriver.com> ---- -diff --git a/webInterface.c b/webInterface.c -index 5622e69..8cb7a67 100644 ---- a/webInterface.c -+++ b/webInterface.c -@@ -5816,7 +5816,7 @@ static void printNtopConfigInfoData(int textPrintFlag, UserPref *pref) { - printInfoSectionTitle(textPrintFlag, "Basic Information"); - - safe_snprintf(__FILE__, __LINE__, formatBuf, sizeof(formatBuf), "%s (%d bit)", -- osName, sizeof(long) == 8 ? 64 : 32); -+ version, sizeof(long) == 8 ? 64 : 32); - printFeatureConfigInfo(textPrintFlag, "ntop Version", formatBuf); - - #ifndef WIN32 diff --git a/meta-networking/recipes-support/ntop/ntop/use-static-inline.patch b/meta-networking/recipes-support/ntop/ntop/use-static-inline.patch deleted file mode 100644 index 2b001c13e8..0000000000 --- a/meta-networking/recipes-support/ntop/ntop/use-static-inline.patch +++ /dev/null @@ -1,32 +0,0 @@ -[PATCH] replace 'inline' with 'static inline' for gcc 5.x - -gcc 5.x defaults to -std=gnu11 instead of -std=gnu89 which change -the semantics for inline functions and the standalone 'inline' -causes error with "gcc5 -g -o0" - -Replace inline with static inline to be compatible with both gcc 4 -and 5. - -Upstream-status: Pending - -Signed-off-by: Roy Li <rongqing.li@windriver.com> ---- - nDPI/src/lib/protocols/ssl.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/nDPI/src/lib/protocols/ssl.c b/nDPI/src/lib/protocols/ssl.c -index 245b8c3..72beda9 100644 ---- a/nDPI/src/lib/protocols/ssl.c -+++ b/nDPI/src/lib/protocols/ssl.c -@@ -39,7 +39,7 @@ static void ipoque_int_ssl_add_connection(struct ipoque_detection_module_struct - - #ifdef HAVE_NTOP - #ifndef WIN32 --inline int min(int a, int b) { return(a < b ? a : b); } -+static inline int min(int a, int b) { return(a < b ? a : b); } - #endif - - static void stripCertificateTrailer(char *buffer, int buffer_len) { --- -1.9.1 - diff --git a/meta-networking/recipes-support/ntop/ntop_5.0.1.bb b/meta-networking/recipes-support/ntop/ntop_5.0.1.bb deleted file mode 100644 index 298fbec61b..0000000000 --- a/meta-networking/recipes-support/ntop/ntop_5.0.1.bb +++ /dev/null @@ -1,137 +0,0 @@ -SUMMARY = "ntop is network top" -DESCRIPTION = "ntop is a network traffic probe that shows the network usage, \ -similar to what the popular top Unix command does." - -SECTION = "console/network" - -LICENSE = "GPLv2+ & GPLv3 & OpenSSL" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://LICENSE-OpenSSL.txt;md5=a409f902e447ddd889cffa0c70e7c7c2 \ - " - -SRC_URI = "${SOURCEFORGE_MIRROR}/ntop/ntop-${PV}.tar.gz \ - file://ntop_configure_in.patch \ - file://ntop_init.patch \ - file://ntop_webInterface.patch \ - file://ntop_configure_in_net_snmp_config_exist.patch \ - file://ntop.service \ - file://use-static-inline.patch \ - file://0001-nDPI-Include-sys-types.h.patch \ - " -SRC_URI[md5sum] = "01710b6925a8a5ffe1a41b8b512ebd69" -SRC_URI[sha256sum] = "7e8e84cb14d2173beaca4d4cb991a14d84a4bef84ec37b2276bc363f45c52ef8" - -inherit autotools-brokensep useradd pythonnative pkgconfig systemd - -DEPENDS = "geoip rrdtool python zlib libpcap gdbm" - -PACKAGECONFIG ??= "openssl snmp plugins" -PACKAGECONFIG[openssl] = "--with-ssl, --without-ssl, openssl, openssl" -PACKAGECONFIG[snmp] = "--enable-snmp=yes NETSNMP=${STAGING_BINDIR_CROSS}/net-snmp-config, \ ---disable-snmp,net-snmp," -PACKAGECONFIG[plugins] = "--enable-plugins=yes, --disable-plugins, ," - -EXTRA_OECONF += "ac_cv_file_aclocal_m4=yes ac_cv_file_depcomp=no" - -do_configure() { - cp ${STAGING_DATADIR_NATIVE}/aclocal/libtool.m4 libtool.m4.in - install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S} - install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S} - install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/nDPI - install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}/nDPI - cat acinclude.m4.in acinclude.m4.ntop libtool.m4.in > acinclude.m4 - cp 3rd_party/* ./ - - # config nDPI - cd nDPI - ./configure ${CONFIGUREOPTS} --with-pic - cd .. - - sed -i -e 's:^CFG_DBFILE_DIR=$localstatedir/ntop:CFG_DBFILE_DIR=$localstatedir/lib/ntop:' ${S}/configure.in - - # fix the CFLAGS, CPPFLAGS, LDFLAGS, remove the host include - sed -i \ - -e 's:\(^CFLAGS="\$.*\) -I/usr/local/include -I/opt/local/include":\1":' \ - -e 's:\(^CPPFLAGS="\$.*\) -I/usr/local/include -I/opt/local/include":\1":' \ - -e 's:\(^LDFLAGS="\$.*\) -L/usr/local/lib -L/opt/local/lib":\1":' \ - ${S}/configure.in - - # replace the DISTRO RELEASE in configure.in which are host's - # with our release, although those doesn't affect functionality - sed -i -e \ - '/DEFINEOS="LINUX"/{N;s/DISTRO=.*/DISTRO="${DISTRO}"/;N;s/RELEASE=.*/RELEASE="${DISTRO_VERSION}"/;}' \ - ${S}/configure.in - - # osName in original configure.in should be ${TARGET_SYS} - # which will show in ntop's "show configuration" - sed -i -e \ - 's:^osName=.*:osName=${TARGET_SYS}:' \ - ${S}/configure.in - - # rename configureextra to configureextra_rename to avoid - # configure.in to guess host OS and pull in more configure, non needed - # which will cause some cross-compiling failure on specific host - # e.g. SUSE(SLED...) - test ! -f configureextra || mv -f configureextra configureextra_rename - - # make sure configure finds python includdirs/libs with these envs - export BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ - STAGING_INCDIR=${STAGING_INCDIR} \ - STAGING_LIBDIR=${STAGING_LIBDIR} - - autotools_do_configure -} - -do_compile_prepend() { - cd nDPI - oe_runmake - cd .. -} - -do_install_append() { - # remove the empty dirs - rm -rf ${D}${libdir}/plugins - - install -D -m 0755 ${S}/packages/RedHat/ntop.init \ - ${D}${sysconfdir}/init.d/ntop - install -D -m 0644 ${S}/packages/RedHat/ntop.conf.sample \ - ${D}${sysconfdir}/ntop.conf - - # change ntop dir in ntop.conf - # don't use the -P as the ntop.init didn't support it - sed -i -e "s:^--db-file-path /usr/share/ntop:--db-file-path /var/lib/ntop:" \ - -e "s:^#? -P /var/ntop:#? -P /var/lib/ntop:" \ - ${D}${sysconfdir}/ntop.conf - - # For systemd - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -D -m 0755 ${S}/packages/RedHat/ntop.init ${D}${libexecdir}/ntop-helper - install -D -m 0644 ${WORKDIR}/ntop.service ${D}${systemd_system_unitdir}/ntop.service - sed -i -e 's,@LIBEXECDIR@,${libexecdir},g' \ - -e 's,@SYSCONFDIR@,${sysconfdir},g' \ - ${D}${systemd_system_unitdir}/ntop.service - fi - - # Fix host-user-contaminated issue - chown -R root:root ${D} - - chown -R ntop.ntop ${D}${datadir}/ntop - chown -R ntop:ntop ${D}${localstatedir}/lib/ntop -} - -USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "-M -g ntop -r -d ${localstatedir}/lib/ntop \ --s /usr/sbin/nologin -c 'ntop' ntop" -GROUPADD_PARAM_${PN} = "-r ntop" - -SYSTEMD_SERVICE_${PN} = "ntop.service" -SYSTEMD_AUTO_ENABLE = "disable" - -FILES_${PN}_append = "${libdir}/ntop/plugins ${libdir}/libntop-*.so \ - ${libdir}/libntopreport-*.so ${libdir}/lib*-${PV}.so" -FILES_${PN}-dev = "${includedir} ${libdir}/libntop.so \ - ${libdir}/libntopreport.so \ - ${libdir}/libnetflowPlugin.so ${libdir}/libsflowPlugin.so \ - ${libdir}/librrdPlugin.so \ - ${libdir}/*.a ${libdir}/libntopreport.a ${libdir}/*.la" - diff --git a/meta-networking/recipes-support/ntopng/files/0001-Makefile.in-don-t-use-the-internal-lua.patch b/meta-networking/recipes-support/ntopng/files/0001-Makefile.in-don-t-use-the-internal-lua.patch new file mode 100644 index 0000000000..bb5bcfbd63 --- /dev/null +++ b/meta-networking/recipes-support/ntopng/files/0001-Makefile.in-don-t-use-the-internal-lua.patch @@ -0,0 +1,39 @@ +From 52953ab99c727a19e88243dda2702d6814f7974d Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Wed, 4 Nov 2020 08:55:10 +0000 +Subject: [PATCH] Makefile.in: don't use the internal lua + +ntopng depends on lua and it will compile the lua under +third-party sub dir of source tree, but this one supports +cross-compiling badly, so use the one under RECIPE_SYSROOT. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + Makefile.in | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index d737e74..a611b16 100755 +--- a/Makefile.in ++++ b/Makefile.in +@@ -36,7 +36,6 @@ MONGOOSE_INC=-I$(MONGOOSE_HOME) + LUA_PLATFORM=generic + LUA_HOME=${PWD}/third-party/lua-5.4.3 + LUA_INC=-I$(LUA_HOME)/src +-LUA_LIB=$(LUA_HOME)/src/liblua.a + + ifeq ($(OS),Linux) + LUA_PLATFORM=linux +@@ -102,7 +101,6 @@ RPM_PKG = $(TARGET)-$(NTOPNG_VERSION)-@REVISION@.$(PLATFORM).rpm + RPM_DATA_PKG = $(TARGET)-data-$(NTOPNG_VERSION)-@REVISION@.noarch.rpm + ###### + +-LIB_TARGETS = $(LUA_LIB) + + ifneq ($(HAS_ZEROMQ), 0) + LIB_TARGETS += $(ZEROMQ_LIB) +-- +2.25.1 + diff --git a/meta-networking/recipes-support/ntopng/files/0001-autogen.sh-generate-configure.ac-only.patch b/meta-networking/recipes-support/ntopng/files/0001-autogen.sh-generate-configure.ac-only.patch new file mode 100644 index 0000000000..8d62147b9e --- /dev/null +++ b/meta-networking/recipes-support/ntopng/files/0001-autogen.sh-generate-configure.ac-only.patch @@ -0,0 +1,36 @@ +From 22f0bec462763f1b0b92daa33133e274d3b45f4f Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Thu, 5 Nov 2020 00:05:21 -0800 +Subject: [PATCH] autogen.sh: generate configure.ac only + +The autogen.sh should only generate configure.ac and the +logic used to generate configure script should follow the +autotools.bbclass in oe. Otherwise there may comes below +do_configure error: + | checking whether we are cross compiling... configure: error: in `/path/tmp/work/core2-64-poky-linux/ndpi/3.4-r0/git': + | configure: error: cannot run C compiled programs. + | If you meant to cross compile, use `--host'. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + autogen.sh | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/autogen.sh b/autogen.sh +index 73f8d0ebe..15ff0aa84 100755 +--- a/autogen.sh ++++ b/autogen.sh +@@ -73,8 +73,3 @@ cat configure.seed | sed \ + > configure.ac + + rm -f config.h config.h.in *~ #* +- +-echo "Wait please..." +-autoreconf -if +-echo "" +-echo "Now run ./configure" +-- +2.17.1 + diff --git a/meta-networking/recipes-support/ntopng/files/0001-autogen.sh-not-generate-configure.patch b/meta-networking/recipes-support/ntopng/files/0001-autogen.sh-not-generate-configure.patch new file mode 100644 index 0000000000..d5c7f5f1cc --- /dev/null +++ b/meta-networking/recipes-support/ntopng/files/0001-autogen.sh-not-generate-configure.patch @@ -0,0 +1,35 @@ +From d482bcc8fca90afc95ac3cbe848a3c9d7ad81ddc Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Wed, 4 Nov 2020 23:37:44 -0800 +Subject: [PATCH] autogen.sh: not generate configure + +Only use autogen.sh to generate configure.ac. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> + +refresh patch to 4.0 +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + autogen.sh | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/autogen.sh b/autogen.sh +index 0aa7507..36e0423 100755 +--- a/autogen.sh ++++ b/autogen.sh +@@ -33,10 +33,3 @@ if test -z $PKG_CONFIG; then + echo "pkg-config is missing: please install it (apt-get install pkg-config) and try again" + exit + fi +- +-autoreconf -ivf +- +-echo "./configure $@" +-chmod +x configure +-./configure $@ +- +-- +2.25.1 + diff --git a/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-Allow-dynamic-linking-against-ndpi-3.patch b/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-Allow-dynamic-linking-against-ndpi-3.patch new file mode 100644 index 0000000000..c645110f22 --- /dev/null +++ b/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-Allow-dynamic-linking-against-ndpi-3.patch @@ -0,0 +1,39 @@ +From a913b85f720f41bf7e5819c0dc4acc252467a8a4 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 15 Feb 2022 14:25:07 -0800 +Subject: [PATCH] configure.ac.in: Allow dynamic linking against ndpi 3.0 + +Linking statically is problematic since NDPI_LIBS is '-lndpi -lm' +and when we use -Bstatic it also brings in -lm to use libm.a and on some +architectures ( x86 ) which this does not work and results in missing symbols + +Fixes +ipe-sysroot/usr/lib/libm.a(e_logf.o): in function `logf_ifunc_selector': +/usr/src/debug/glibc/2.35-r0/git/math/../sysdeps/i386/i686/multiarch/ifunc-sse2.h:30: undefined reference to `_dl_x86_cpu_features' + +Upstream-Status: Submitted [https://github.com/ntop/ntopng/pull/6318] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac.in | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/configure.ac.in b/configure.ac.in +index 7f4c0f893..c3299fda2 100644 +--- a/configure.ac.in ++++ b/configure.ac.in +@@ -193,10 +193,8 @@ if test -d /usr/local/include/ndpi ; then : + fi + + PKG_CHECK_MODULES([NDPI], [libndpi >= 2.0], [ +- NDPI_INC=`echo $NDPI_CFLAGS | sed -e "s/[ ]*$//"` +- # Use static libndpi library as building against the dynamic library fails +- NDPI_LIB="-Wl,-Bstatic $NDPI_LIBS -Wl,-Bdynamic" +- #NDPI_LIB="$NDPI_LIBS" ++ NDPI_INC="$NDPI_CFLAGS" ++ NDPI_LIB="$NDPI_LIBS" + NDPI_LIB_DEP= + ], [ + AC_MSG_CHECKING(for nDPI source) +-- +2.35.1 + diff --git a/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-fix-configure-error.patch b/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-fix-configure-error.patch new file mode 100644 index 0000000000..d4908e3227 --- /dev/null +++ b/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-fix-configure-error.patch @@ -0,0 +1,42 @@ +From 29797dd037009d38e4976249ed21b2076240751e Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Wed, 4 Nov 2020 04:36:46 +0000 +Subject: [PATCH] configure.ac.in: fix configure error + +fix the below error: +configure: error: cannot run test program while cross compiling + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + configure.ac.in | 13 +------------ + 1 file changed, 1 insertion(+), 12 deletions(-) + +diff --git a/configure.ac.in b/configure.ac.in +index a321f9bbf..03f9a31b0 100644 +--- a/configure.ac.in ++++ b/configure.ac.in +@@ -642,18 +642,7 @@ if test x$radcli = xtrue; then + fi + fi + +-AC_CACHE_CHECK([if pthread rwlocks are supported], [my_cv_rw_locks_supported], [ +- AC_TRY_RUN([ +- #include <pthread.h> +- +- int main() { +- pthread_rwlock_t t; +- return 0; +- } +-] +-, [my_cv_rw_locks_supported=yes], [my_cv_rw_locks_supported=no]) +-] +-) ++AC_CACHE_CHECK([if pthread rwlocks are supported], [my_cv_rw_locks_supported]) + + if test "$my_cv_rw_locks_supported" = yes; then + AC_DEFINE_UNQUOTED(HAVE_RW_LOCK, 1, [pthread rwlocks supported]) +-- +2.26.2 + diff --git a/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-fix-host-contamination.patch b/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-fix-host-contamination.patch new file mode 100644 index 0000000000..5e1440b3d6 --- /dev/null +++ b/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-fix-host-contamination.patch @@ -0,0 +1,82 @@ +From d9458227ddb4bbb8c63c607202a6854886d66090 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Wed, 4 Nov 2020 06:28:28 +0000 +Subject: [PATCH] configure.ac.in: fix host contamination + +Fix below error: +This autoconf log indicates errors, it looked at host include and/or +library paths while determining system capabilities. + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + configure.ac.in | 43 +++---------------------------------------- + 1 file changed, 3 insertions(+), 40 deletions(-) + +diff --git a/configure.ac.in b/configure.ac.in +index 1d6380c..beffc6c 100644 +--- a/configure.ac.in ++++ b/configure.ac.in +@@ -167,31 +167,6 @@ fi + # + REVISION=`git log --pretty=oneline | wc -l` + +-if test -d "/usr/local/include"; then +- CFLAGS="${CFLAGS} -I/usr/local/include" +- CPPFLAGS="${CPPFLAGS} -I/usr/local/include" +-fi +- +-if test -d "/usr/local/lib"; then +- LIBS="${LIBS} -L/usr/local/lib" +-fi +- +-if test -d /opt/local/include; then : +- CFLAGS="${CFLAGS} -I/opt/local/include" +- CPPFLAGS="${CPPFLAGS} -I/opt/local/include" +-fi +- +-if test -d /opt/local/lib; then : +- LIBS="${LIBS} -L/opt/local/lib" +-fi +- +-if [ test -f /usr/bin/lsb_release ]; then +- CODENAME=`/usr/bin/lsb_release -c|cut -f 2` +- if [[ $CODENAME == "wheezy" ]]; then : +- CPPFLAGS="${CPPFLAGS} -DOLD_NETFILTER_INTERFACE=1" +- fi +-fi +- + SHORT_MACHINE=`uname -m | cut -b1-3` + + GIT_RELEASE="@GIT_RELEASE@" +@@ -300,23 +275,11 @@ fi + pkg-config --exists libssl + if test "$?" -ne 1; then + AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl]) +- SSL_INC="`pkg-config --cflags libssl` -I/usr/include/openssl" ++ SSL_INC="`pkg-config --cflags libssl`" + SSL_LIB="`pkg-config --libs libssl` -lssl -lcrypto" + else +- dnl Workaround for MacOS Brew +- if test -d "/usr/local/opt/openssl/lib"; then +- AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl]) +- SSL_INC="-I/usr/local/opt/openssl/include" +- SSL_LIB="-L/usr/local/opt/openssl/lib -lssl -lcrypto" +- dnl Workaround for FreeBSD +- elif test -f "/usr/lib/libssl.so"; then +- AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl]) +- SSL_INC="-I/usr/include" +- SSL_LIB="-L/usr/lib -lssl -lcrypto" +- else +- echo "Please install openssl-dev(el) package prerequisite" +- exit -1 +- fi ++ echo "Please install openssl-dev(el) package prerequisite" ++ exit -1 + fi + + AC_CHECK_LIB([gcrypt], [gcry_cipher_checktag], [LIBS="${LIBS} -lgcrypt"]) +-- +2.25.1 + diff --git a/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-not-check-clang-on-host.patch b/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-not-check-clang-on-host.patch new file mode 100644 index 0000000000..ffb106723c --- /dev/null +++ b/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-not-check-clang-on-host.patch @@ -0,0 +1,44 @@ +From 5867be19e53a3cc09730b83282c83bdd26147cc3 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Mon, 9 Nov 2020 04:05:25 +0000 +Subject: [PATCH] configure.ac.in: not check clang on host + +Don't check clang on host to avoid host contamination. + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + configure.ac.in | 16 ---------------- + 1 file changed, 16 deletions(-) + +diff --git a/configure.ac.in b/configure.ac.in +index 55bd49678..94bc0bc48 100644 +--- a/configure.ac.in ++++ b/configure.ac.in +@@ -90,22 +90,6 @@ if test $SYSTEM = "FreeBSD" || test $SYSTEM = "Darwin"; then + CFLAGS="-fno-color-diagnostics $CFLAGS" + fi + fi +-else +- if test $SYSTEM = "Linux"; then +- if [ test -f /usr/bin/clang++ ]; then +- CC=clang +- CXX=clang++ +- AC_MSG_RESULT(Using clang++ compiler) +- fi +- +- if [ test -f /etc/redhat-release ]; then +- OS=`cat /etc/redhat-release` +- else +- if [ test -f /usr/bin/lsb_release ]; then +- OS=`/usr/bin/lsb_release -d|cut -d ':' -f 2` +- fi +- fi +- fi + fi + + dnl> Remove spaces +-- +2.17.1 + diff --git a/meta-networking/recipes-support/ntopng/files/ntopng.service b/meta-networking/recipes-support/ntopng/files/ntopng.service new file mode 100644 index 0000000000..66912fbefa --- /dev/null +++ b/meta-networking/recipes-support/ntopng/files/ntopng.service @@ -0,0 +1,13 @@ +[Unit] +Description=ntopng - High-Speed Web-based Traffic Analysis and Flow Collection Tool +After=network.target + +[Service] +Type=forking +StandardOutput=syslog +StandardError=inherit +ExecStart=/usr/bin/ntopng -e -w 3000 +Restart=on-abort + +[Install] +WantedBy=multi-user.target diff --git a/meta-networking/recipes-support/ntopng/ndpi_4.2.bb b/meta-networking/recipes-support/ntopng/ndpi_4.2.bb new file mode 100644 index 0000000000..13c3398c2b --- /dev/null +++ b/meta-networking/recipes-support/ntopng/ndpi_4.2.bb @@ -0,0 +1,28 @@ +SUMMARY = "A library for deep-packet inspection." +DESCRIPTION = "nDPI is an open source LGPLv3 library for deep-packet \ +inspection. Based on OpenDPI it includes ntop extensions" + +SECTION = "libdevel" +DEPENDS = "libpcap json-c" +RDEPENDS:${PN} += " libpcap" +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b52f2d57d10c4f7ee67a7eb9615d5d24" + +SRCREV = "8b5c6af71b562549f8416b31803daae223e09f46" +SRC_URI = "git://github.com/ntop/nDPI.git;branch=4.2-stable;protocol=https \ + file://0001-autogen.sh-not-generate-configure.patch \ + " + +S = "${WORKDIR}/git" + +inherit autotools-brokensep pkgconfig + +CPPFLAGS += "${SELECTED_OPTIMIZATION}" + +do_configure:prepend() { + ${S}/autogen.sh +} + +EXTRA_OEMAKE = " \ + libdir=${libdir} \ +" diff --git a/meta-networking/recipes-support/ntopng/ntopng_5.2.1.bb b/meta-networking/recipes-support/ntopng/ntopng_5.2.1.bb new file mode 100644 index 0000000000..a9ace9b412 --- /dev/null +++ b/meta-networking/recipes-support/ntopng/ntopng_5.2.1.bb @@ -0,0 +1,50 @@ +SUMMARY = "Web-based Traffic and Security Network Traffic Monitoring" +DESCRIPTION = "ntopng is a web-based network traffic monitoring application \ +released under GPLv3. It is the new incarnation of the original \ +ntop written in 1998, and now revamped in terms of performance, \ +usability, and features." + +SECTION = "console/network" + +DEPENDS = "curl hiredis libmaxminddb libpcap lua mariadb ndpi json-c rrdtool zeromq" +RDEPENDS:${PN} = "bash redis" +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +SRCREV = "d3ce78948e8d81dc1e2c5298ce556f9f2247aac1" +SRC_URI = "git://github.com/ntop/ntopng.git;protocol=https;branch=5.2-stable \ + file://0001-configure.ac.in-fix-configure-error.patch \ + file://0001-configure.ac.in-fix-host-contamination.patch \ + file://0001-Makefile.in-don-t-use-the-internal-lua.patch \ + file://0001-autogen.sh-generate-configure.ac-only.patch \ + file://0001-configure.ac.in-not-check-clang-on-host.patch \ + file://0001-configure.ac.in-Allow-dynamic-linking-against-ndpi-3.patch \ + file://ntopng.service \ + " + +S = "${WORKDIR}/git" + +# don't use the lua under thirdparty as it supports cross compiling badly +export LUA_LIB = "${STAGING_LIBDIR}/liblua.a" + +LDFLAGS:append:mipsarch = " -latomic" +LDFLAGS:append:powerpc = " -latomic" +LDFLAGS:append:riscv32 = " -latomic" +inherit autotools-brokensep gettext pkgconfig systemd + +do_install:append() { + install -d ${D}${systemd_unitdir}/system/ + install -m 0644 ${UNPACKDIR}/ntopng.service ${D}${systemd_unitdir}/system +} + +FILES:${PN} += "\ + ${systemd_unitdir}/system/ntopng.service" + +FILES:${PN}-doc += "\ + /usr/man/man8/ntopng.8" + +do_configure:prepend() { + ${S}/autogen.sh +} + +SYSTEMD_SERVICE:${PN} = "ntopng.service" diff --git a/meta-networking/recipes-support/ntp/ntp/0001-libntp-Do-not-use-PTHREAD_STACK_MIN-on-glibc.patch b/meta-networking/recipes-support/ntp/ntp/0001-libntp-Do-not-use-PTHREAD_STACK_MIN-on-glibc.patch new file mode 100644 index 0000000000..d61a6e70b8 --- /dev/null +++ b/meta-networking/recipes-support/ntp/ntp/0001-libntp-Do-not-use-PTHREAD_STACK_MIN-on-glibc.patch @@ -0,0 +1,33 @@ +From 082a504cfcc046c3d8adaae1164268bc94e5108a Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 31 Jul 2021 10:51:41 -0700 +Subject: [PATCH] libntp: Do not use PTHREAD_STACK_MIN on glibc + +In glibc 2.34+ PTHREAD_STACK_MIN is not a compile-time constant which +could mean different stack sizes at runtime on different architectures +and it also causes compile failure. Default glibc thread stack size +or 64Kb set by ntp should be good in glibc these days. + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> +--- + libntp/work_thread.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libntp/work_thread.c b/libntp/work_thread.c +index c1fe5c2..21db4a0 100644 +--- a/libntp/work_thread.c ++++ b/libntp/work_thread.c +@@ -598,7 +598,7 @@ start_blocking_thread_internal( + /* now clamp on lower stack limit. */ + if (nstacksize < THREAD_MINSTACKSIZE) + nstacksize = THREAD_MINSTACKSIZE; +-# ifdef PTHREAD_STACK_MIN ++# ifdef PTHREAD_STACK_MIN && !defined(__GLIBC__) + if (nstacksize < PTHREAD_STACK_MIN) + nstacksize = PTHREAD_STACK_MIN; + # endif +-- +2.34.1 + diff --git a/meta-networking/recipes-support/ntp/ntp/0001-sntp-Fix-types-in-check-for-pthread_detach.patch b/meta-networking/recipes-support/ntp/ntp/0001-sntp-Fix-types-in-check-for-pthread_detach.patch new file mode 100644 index 0000000000..ca15470ace --- /dev/null +++ b/meta-networking/recipes-support/ntp/ntp/0001-sntp-Fix-types-in-check-for-pthread_detach.patch @@ -0,0 +1,33 @@ +From 864f43ae09d18b1114d5c894e836698743e4e44c Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 6 Sep 2022 21:36:35 -0700 +Subject: [PATCH] sntp: Fix types in check for pthread_detach + +New compilers are stricter and flag assigning NULL to pthread_t as error +therefore using a pthread_t variable constructed from -1 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + sntp/m4/openldap-thread-check.m4 | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/sntp/m4/openldap-thread-check.m4 b/sntp/m4/openldap-thread-check.m4 +index 7768a5c..b9e54ad 100644 +--- a/sntp/m4/openldap-thread-check.m4 ++++ b/sntp/m4/openldap-thread-check.m4 +@@ -262,10 +262,7 @@ pthread_rwlock_t rwlock; + dnl save the flags + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ + #include <pthread.h> +-#ifndef NULL +-#define NULL (void*)0 +-#endif +-]], [[pthread_detach(NULL);]])],[ol_cv_func_pthread_detach=yes],[ol_cv_func_pthread_detach=no]) ++]], [[pthread_detach((pthread_t)-1);]])],[ol_cv_func_pthread_detach=yes],[ol_cv_func_pthread_detach=no]) + ]) + + if test $ol_cv_func_pthread_detach = no ; then +-- +2.37.3 + diff --git a/meta-networking/recipes-support/ntp/ntp/0001-test-Fix-build-with-new-compiler-defaults-to-fno-com.patch b/meta-networking/recipes-support/ntp/ntp/0001-test-Fix-build-with-new-compiler-defaults-to-fno-com.patch new file mode 100644 index 0000000000..24019e974b --- /dev/null +++ b/meta-networking/recipes-support/ntp/ntp/0001-test-Fix-build-with-new-compiler-defaults-to-fno-com.patch @@ -0,0 +1,56 @@ +From 778f3cddc20930185a917fa3f8ffe1ef2b0b0ea0 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 31 Jul 2021 13:27:16 -0700 +Subject: [PATCH] test: Fix build with new compiler defaults to -fno-common + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> +--- + sntp/tests/run-packetHandling.c | 2 +- + sntp/tests/run-t-log.c | 2 +- + sntp/tests/run-utilities.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/sntp/tests/run-packetHandling.c b/sntp/tests/run-packetHandling.c +index 7790b20..c58380c 100644 +--- a/sntp/tests/run-packetHandling.c ++++ b/sntp/tests/run-packetHandling.c +@@ -64,7 +64,7 @@ void resetTest(void) + setUp(); + } + +-char const *progname; ++extern char const *progname; + + + //=======MAIN===== +diff --git a/sntp/tests/run-t-log.c b/sntp/tests/run-t-log.c +index 268bf41..cd835bc 100644 +--- a/sntp/tests/run-t-log.c ++++ b/sntp/tests/run-t-log.c +@@ -50,7 +50,7 @@ void resetTest(void) + setUp(); + } + +-char const *progname; ++extern char const *progname; + + + //=======MAIN===== +diff --git a/sntp/tests/run-utilities.c b/sntp/tests/run-utilities.c +index f717882..98d9bf1 100644 +--- a/sntp/tests/run-utilities.c ++++ b/sntp/tests/run-utilities.c +@@ -58,7 +58,7 @@ void resetTest(void) + setUp(); + } + +-char const *progname; ++extern char const *progname; + + + //=======MAIN===== +-- +2.34.1 + diff --git a/meta-networking/recipes-support/ntp/ntp/ntp-4.2.4_p6-nano.patch b/meta-networking/recipes-support/ntp/ntp/ntp-4.2.4_p6-nano.patch index cb1e2f7341..d8e0ad3309 100644 --- a/meta-networking/recipes-support/ntp/ntp/ntp-4.2.4_p6-nano.patch +++ b/meta-networking/recipes-support/ntp/ntp/ntp-4.2.4_p6-nano.patch @@ -1,6 +1,18 @@ ---- a/include/ntp_syscall.h.orig 2009-05-19 16:44:55.048156467 -0400 -+++ b/include/ntp_syscall.h 2009-05-19 16:46:19.293323686 -0400 -@@ -14,6 +14,14 @@ +From 2310898533f059d875dcffd26ab6cf1b280292fd Mon Sep 17 00:00:00 2001 +From: Koen Kooi <koen@dominion.thruhere.net> +Date: Wed, 12 Jan 2011 21:38:46 +0100 + +--- +Upstream-Status: Pending + + include/ntp_syscall.h | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/include/ntp_syscall.h b/include/ntp_syscall.h +index d1ce03e..9e18432 100644 +--- a/include/ntp_syscall.h ++++ b/include/ntp_syscall.h +@@ -10,6 +10,14 @@ # include <sys/timex.h> #endif @@ -13,5 +25,5 @@ +#endif + #ifndef NTP_SYSCALLS_LIBC - #ifdef NTP_SYSCALLS_STD - # define ntp_adjtime(t) syscall(SYS_ntp_adjtime, (t)) + # ifdef NTP_SYSCALLS_STD + # define ntp_adjtime(t) syscall(SYS_ntp_adjtime, (t)) diff --git a/meta-networking/recipes-support/ntp/ntp/ntp.conf b/meta-networking/recipes-support/ntp/ntp/ntp.conf index 676e186453..b59003092b 100644 --- a/meta-networking/recipes-support/ntp/ntp/ntp.conf +++ b/meta-networking/recipes-support/ntp/ntp/ntp.conf @@ -14,4 +14,8 @@ driftfile /var/lib/ntp/drift server 127.127.1.0 fudge 127.127.1.0 stratum 14 # Defining a default security setting -restrict default +restrict -4 default notrap nomodify nopeer noquery +restrict -6 default notrap nomodify nopeer noquery + +restrict 127.0.0.1 # allow local host +restrict ::1 # allow local host diff --git a/meta-networking/recipes-support/ntp/ntp/ntpd.service b/meta-networking/recipes-support/ntp/ntp/ntpd.service index 0e3d7cd37b..d793db4a78 100644 --- a/meta-networking/recipes-support/ntp/ntp/ntpd.service +++ b/meta-networking/recipes-support/ntp/ntp/ntpd.service @@ -3,9 +3,8 @@ Description=Network Time Service After=network.target [Service] -Type=forking -PIDFile=/run/ntpd.pid -ExecStart=/usr/sbin/ntpd -u ntp:ntp -p /run/ntpd.pid -g +Type=simple +ExecStart=/usr/sbin/ntpd -u ntp:ntp -n -g [Install] WantedBy=multi-user.target diff --git a/meta-networking/recipes-support/ntp/ntp/ntpdate b/meta-networking/recipes-support/ntp/ntp/ntpdate deleted file mode 100755 index 17b64d1335..0000000000 --- a/meta-networking/recipes-support/ntp/ntp/ntpdate +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/sh - -PATH=/sbin:/bin:/usr/bin:/usr/sbin - -test -x /usr/sbin/ntpdate || exit 0 - -if test -f /etc/default/ntpdate ; then -. /etc/default/ntpdate -fi - -if [ "$NTPSERVERS" = "" ] ; then - if [ "$METHOD" = "" -a "$1" != "silent" ] ; then - echo "Please set NTPSERVERS in /etc/default/ntpdate" - exit 1 - else - exit 0 - fi -fi - -# This is a heuristic: The idea is that if a static interface is brought -# up, that is a major event, and we can put in some extra effort to fix -# the system time. Feel free to change this, especially if you regularly -# bring up new network interfaces. -if [ "$METHOD" = static ]; then - OPTS="-b" -fi - -if [ "$METHOD" = loopback ]; then - exit 0 -fi - -( - -LOCKFILE=/var/lock/ntpdate - -# Avoid running more than one at a time -if [ -x /usr/bin/lockfile-create ]; then - lockfile-create $LOCKFILE - lockfile-touch $LOCKFILE & - LOCKTOUCHPID="$!" -fi - -if /usr/sbin/ntpdate -s $OPTS $NTPSERVERS 2>/dev/null; then - if [ "$UPDATE_HWCLOCK" = "yes" ]; then - hwclock --systohc || : - fi -fi - -if [ -x /usr/bin/lockfile-create ] ; then - kill $LOCKTOUCHPID - lockfile-remove $LOCKFILE -fi - -) & diff --git a/meta-networking/recipes-support/ntp/ntp/ntpdate.default b/meta-networking/recipes-support/ntp/ntp/ntpdate.default deleted file mode 100644 index 486b6e07d3..0000000000 --- a/meta-networking/recipes-support/ntp/ntp/ntpdate.default +++ /dev/null @@ -1,7 +0,0 @@ -# Configuration script used by ntpdate-sync script - -NTPSERVERS="" - -# Set to "yes" to write time to hardware clock on success -UPDATE_HWCLOCK="no" - diff --git a/meta-networking/recipes-support/ntp/ntp/ntpdate.service b/meta-networking/recipes-support/ntp/ntp/ntpdate.service deleted file mode 100644 index 10cbd70f99..0000000000 --- a/meta-networking/recipes-support/ntp/ntp/ntpdate.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Network Time Service (one-shot ntpdate mode) -Before=ntpd.service - -[Service] -Type=oneshot -ExecStart=/usr/bin/ntpdate-sync silent -RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target diff --git a/meta-networking/recipes-support/ntp/ntp/reproducibility-fixed-path-to-posix-shell.patch b/meta-networking/recipes-support/ntp/ntp/reproducibility-fixed-path-to-posix-shell.patch new file mode 100644 index 0000000000..036c61a78f --- /dev/null +++ b/meta-networking/recipes-support/ntp/ntp/reproducibility-fixed-path-to-posix-shell.patch @@ -0,0 +1,28 @@ +reproducibility fixed path to posixshell +--- +Upstream-Status: Pending + + sntp/libopts/m4/libopts.m4 | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/sntp/libopts/m4/libopts.m4 b/sntp/libopts/m4/libopts.m4 +index 23738ca..4e18187 100644 +--- a/sntp/libopts/m4/libopts.m4 ++++ b/sntp/libopts/m4/libopts.m4 +@@ -107,13 +107,6 @@ AC_DEFUN([INVOKE_LIBOPTS_MACROS_FIRST],[ + AC_PROG_SED + [while : + do +- test -x "$POSIX_SHELL" && break +- POSIX_SHELL=`which bash` +- test -x "$POSIX_SHELL" && break +- POSIX_SHELL=`which dash` +- test -x "$POSIX_SHELL" && break +- POSIX_SHELL=/usr/xpg4/bin/sh +- test -x "$POSIX_SHELL" && break + POSIX_SHELL=`/bin/sh -c ' + exec 2>/dev/null + if ! true ; then exit 1 ; fi +-- +2.34.1 + diff --git a/meta-networking/recipes-support/ntp/ntp_4.2.8p10.bb b/meta-networking/recipes-support/ntp/ntp_4.2.8p17.bb index 719c60b97e..5fa8db9eeb 100644 --- a/meta-networking/recipes-support/ntp/ntp_4.2.8p10.bb +++ b/meta-networking/recipes-support/ntp/ntp_4.2.8p17.bb @@ -6,25 +6,52 @@ or satellite receiver or modem." HOMEPAGE = "http://support.ntp.org" SECTION = "net" LICENSE = "NTP" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=e877a1d567a6a58996d2b66e3e387003" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=3a8ffebbcad335abf2c39fec38671eec" DEPENDS = "libevent" SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${PV}.tar.gz \ file://ntp-4.2.4_p6-nano.patch \ + file://reproducibility-fixed-path-to-posix-shell.patch \ + file://0001-libntp-Do-not-use-PTHREAD_STACK_MIN-on-glibc.patch \ + file://0001-test-Fix-build-with-new-compiler-defaults-to-fno-com.patch \ + file://0001-sntp-Fix-types-in-check-for-pthread_detach.patch \ file://ntpd \ file://ntp.conf \ - file://ntpdate \ - file://ntpdate.default \ - file://ntpdate.service \ file://ntpd.service \ file://sntp.service \ file://sntp \ file://ntpd.list \ " -SRC_URI[md5sum] = "745384ed0dedb3f66b33fe84d66466f9" -SRC_URI[sha256sum] = "ddd2366e64219b9efa0f7438e06800d0db394ac5c88e13c17b70d0dcdf99b99f" +SRC_URI[sha256sum] = "103dd272e6a66c5b8df07dce5e9a02555fcd6f1397bdfb782237328e89d3a866" + +CVE_STATUS[CVE-2016-9312] = "not-applicable-platform: Issue only applies on Windows" +CVE_STATUS[CVE-2019-11331] = "upstream-wontfix: inherent to RFC 5905 and cannot be fixed without breaking compatibility" +CVE_STATUS_GROUPS += "CVE_STATUS_NTP" +CVE_STATUS_NTP[status] = "fixed-version: Yocto CVE check can not handle 'p' in ntp version" +CVE_STATUS_NTP = " \ + CVE-2015-5146 \ + CVE-2015-5300 \ + CVE-2015-7975 \ + CVE-2015-7976 \ + CVE-2015-7977 \ + CVE-2015-7978 \ + CVE-2015-7979 \ + CVE-2015-8138 \ + CVE-2015-8139 \ + CVE-2015-8140 \ + CVE-2015-8158 \ + CVE-2016-1547 \ + CVE-2016-2516 \ + CVE-2016-2517 \ + CVE-2016-2519 \ + CVE-2016-7429 \ + CVE-2016-7433 \ + CVE-2016-9310 \ + CVE-2016-9311 \ +" + inherit autotools update-rc.d useradd systemd pkgconfig @@ -37,11 +64,11 @@ EXTRA_OECONF += "--with-net-snmp-config=no \ --with-locfile=redhat \ --without-rpath \ " -CFLAGS_append = " -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED" +CFLAGS:append = " -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED" USERADD_PACKAGES = "${PN}" NTP_USER_HOME ?= "/var/lib/ntp" -USERADD_PARAM_${PN} = "--system --home-dir ${NTP_USER_HOME} \ +USERADD_PARAM:${PN} = "--system --home-dir ${NTP_USER_HOME} \ --no-create-home \ --shell /bin/false --user-group ntp" @@ -61,22 +88,19 @@ PACKAGECONFIG[debug] = "--enable-debugging,--disable-debugging" PACKAGECONFIG[mdns] = "ac_cv_header_dns_sd_h=yes,ac_cv_header_dns_sd_h=no,mdns" PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," -do_install_append() { +do_install:append() { install -d ${D}${sysconfdir}/init.d - install -m 644 ${WORKDIR}/ntp.conf ${D}${sysconfdir} - install -m 755 ${WORKDIR}/ntpd ${D}${sysconfdir}/init.d - install -d ${D}${bindir} - install -m 755 ${WORKDIR}/ntpdate ${D}${bindir}/ntpdate-sync + install -m 644 ${UNPACKDIR}/ntp.conf ${D}${sysconfdir} + install -m 755 ${UNPACKDIR}/ntpd ${D}${sysconfdir}/init.d install -m 755 -d ${D}${NTP_USER_HOME} chown ntp:ntp ${D}${NTP_USER_HOME} # Fix hardcoded paths in scripts - sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/ntpd ${D}${bindir}/ntpdate-sync - sed -i 's!/usr/bin/!${bindir}/!g' ${D}${sysconfdir}/init.d/ntpd ${D}${bindir}/ntpdate-sync - sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/ntpd ${D}${bindir}/ntpdate-sync - sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/ntpd ${D}${bindir}/ntpdate-sync - sed -i 's!^PATH=.*!PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}${bindir}/ntpdate-sync + sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/ntpd + sed -i 's!/usr/bin/!${bindir}/!g' ${D}${sysconfdir}/init.d/ntpd + sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/ntpd + sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/ntpd sed -i '1s,#!.*perl -w,#! ${bindir}/env perl,' ${D}${sbindir}/ntptrace sed -i '/use/i use warnings;' ${D}${sbindir}/ntptrace sed -i '1s,#!.*perl,#! ${bindir}/env perl,' ${D}${sbindir}/ntp-wait @@ -85,86 +109,76 @@ do_install_append() { sed -i '/use/i use warnings;' ${D}${sbindir}/calc_tickadj install -d ${D}/${sysconfdir}/default - install -m 644 ${WORKDIR}/ntpdate.default ${D}${sysconfdir}/default/ntpdate - install -m 0644 ${WORKDIR}/sntp ${D}${sysconfdir}/default/ - - install -d ${D}/${sysconfdir}/network/if-up.d - ln -s ${bindir}/ntpdate-sync ${D}/${sysconfdir}/network/if-up.d + install -m 0644 ${UNPACKDIR}/sntp ${D}${sysconfdir}/default/ install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/ntpdate.service ${D}${systemd_unitdir}/system/ - install -m 0644 ${WORKDIR}/ntpd.service ${D}${systemd_unitdir}/system/ - install -m 0644 ${WORKDIR}/sntp.service ${D}${systemd_unitdir}/system/ + install -m 0644 ${UNPACKDIR}/ntpd.service ${D}${systemd_unitdir}/system/ + install -m 0644 ${UNPACKDIR}/sntp.service ${D}${systemd_unitdir}/system/ install -d ${D}${systemd_unitdir}/ntp-units.d - install -m 0644 ${WORKDIR}/ntpd.list ${D}${systemd_unitdir}/ntp-units.d/60-ntpd.list + install -m 0644 ${UNPACKDIR}/ntpd.list ${D}${systemd_unitdir}/ntp-units.d/60-ntpd.list - # Remove an empty libexecdir. + # Remove the empty libexecdir and bindir. rmdir --ignore-fail-on-non-empty ${D}${libexecdir} + rmdir --ignore-fail-on-non-empty ${D}${bindir} } -PACKAGES += "ntpdate sntp ${PN}-tickadj ${PN}-utils" -# NOTE: you don't need ntpdate, use "ntpd -q -g -x" +PACKAGES += "sntp ntpdc ntpq ${PN}-tickadj ${PN}-utils" # ntp originally includes tickadj. It's split off for inclusion in small firmware images on platforms # with wonky clocks (e.g. OpenSlug) -RDEPENDS_${PN} = "${PN}-tickadj" +RDEPENDS:${PN} = "${PN}-tickadj" +# ntpd & sntp require libgcc for execution due to phtread_cancel/pthread_exit calls +RDEPENDS:${PN} += "libgcc" +RDEPENDS:sntp += "libgcc" # Handle move from bin to utils package -RPROVIDES_${PN}-utils = "${PN}-bin" -RREPLACES_${PN}-utils = "${PN}-bin" -RCONFLICTS_${PN}-utils = "${PN}-bin" - -SYSTEMD_PACKAGES = "${PN} ntpdate sntp" -SYSTEMD_SERVICE_${PN} = "ntpd.service" -SYSTEMD_SERVICE_ntpdate = "ntpdate.service" -SYSTEMD_SERVICE_sntp = "sntp.service" - -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -RCONFLICTS_${PN} += "${PN}-systemd" - -RPROVIDES_ntpdate += "ntpdate-systemd" -RREPLACES_ntpdate += "ntpdate-systemd" -RCONFLICTS_ntpdate += "ntpdate-systemd" - -RSUGGESTS_${PN} = "iana-etc" - -FILES_${PN} = "${sbindir}/ntpd.ntp ${sysconfdir}/ntp.conf ${sysconfdir}/init.d/ntpd ${libdir} \ +RPROVIDES:${PN}-utils = "${PN}-bin" +RREPLACES:${PN}-utils = "${PN}-bin" +RCONFLICTS:${PN}-utils = "${PN}-bin" +# ntpdc and ntpq were split out of ntp-utils +RDEPENDS:${PN}-utils = "ntpdc ntpq \ + perl-module-lib \ + perl-module-exporter \ + perl-module-carp \ + perl-module-version \ + perl-module-socket \ + perl-module-getopt-long \ + " + +SYSTEMD_PACKAGES = "${PN} sntp" +SYSTEMD_SERVICE:${PN} = "ntpd.service" +SYSTEMD_SERVICE:sntp = "sntp.service" +SYSTEMD_AUTO_ENABLE:sntp = "disable" + +RPROVIDES:${PN} += "${PN}-systemd" +RREPLACES:${PN} += "${PN}-systemd" +RCONFLICTS:${PN} += "${PN}-systemd" + +RSUGGESTS:${PN} = "iana-etc" + +FILES:${PN} = "${sbindir}/ntpd.ntp ${sysconfdir}/ntp.conf ${sysconfdir}/init.d/ntpd \ ${NTP_USER_HOME} \ - ${systemd_unitdir}/ntp-units.d/60-ntpd.list ${libexecdir}\ -" -FILES_${PN}-tickadj = "${sbindir}/tickadj" -FILES_${PN}-utils = "${sbindir} ${datadir}/ntp/lib" -RDEPENDS_${PN}-utils += "perl" -FILES_ntpdate = "${sbindir}/ntpdate \ - ${sysconfdir}/network/if-up.d/ntpdate-sync \ - ${bindir}/ntpdate-sync \ - ${sysconfdir}/default/ntpdate \ - ${systemd_unitdir}/system/ntpdate.service \ + ${systemd_unitdir}/ntp-units.d/60-ntpd.list \ " -FILES_sntp = "${sbindir}/sntp \ +FILES:${PN}-tickadj = "${sbindir}/tickadj" +FILES:${PN}-utils = "${sbindir} ${datadir}/ntp/lib" +RDEPENDS:${PN}-utils += "perl" +FILES:sntp = "${sbindir}/sntp \ ${sysconfdir}/default/sntp \ ${systemd_unitdir}/system/sntp.service \ " +FILES:ntpdc = "${sbindir}/ntpdc" +FILES:ntpq = "${sbindir}/ntpq" -CONFFILES_${PN} = "${sysconfdir}/ntp.conf" -CONFFILES_ntpdate = "${sysconfdir}/default/ntpdate" +CONFFILES:${PN} = "${sysconfdir}/ntp.conf" INITSCRIPT_NAME = "ntpd" # No dependencies, so just go in at the standard level (20) INITSCRIPT_PARAMS = "defaults" -pkg_postinst_ntpdate() { - if ! grep -q -s ntpdate $D/var/spool/cron/root; then - echo "adding crontab" - test -d $D/var/spool/cron || mkdir -p $D/var/spool/cron - echo "30 * * * * ${bindir}/ntpdate-sync silent" >> $D/var/spool/cron/root - fi -} - inherit update-alternatives ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE_${PN} = "ntpd" +ALTERNATIVE:${PN} = "ntpd" ALTERNATIVE_LINK_NAME[ntpd] = "${sbindir}/ntpd" diff --git a/meta-networking/recipes-support/ntpsec/ntpsec/0001-wscript-Add-BISONFLAGS-support.patch b/meta-networking/recipes-support/ntpsec/ntpsec/0001-wscript-Add-BISONFLAGS-support.patch new file mode 100644 index 0000000000..fb29fdc47e --- /dev/null +++ b/meta-networking/recipes-support/ntpsec/ntpsec/0001-wscript-Add-BISONFLAGS-support.patch @@ -0,0 +1,31 @@ +From 792cb4f9d13450251c6344eed2b35f382c98df0d Mon Sep 17 00:00:00 2001 +From: Alex Kiernan <alexk@zuma.ai> +Date: Thu, 19 Jan 2023 13:00:45 +0000 +Subject: [PATCH] wscript: Add BISONFLAGS support + +--- +Upstream-Status: Pending + + wscript | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/wscript b/wscript +index 7329d6e46889..de51f1e9cdd9 100644 +--- a/wscript ++++ b/wscript +@@ -140,6 +140,7 @@ def configure(ctx): + # Ensure m4 is present, or bison will fail with SIGPIPE + ctx.find_program('m4') + ctx.load('bison') ++ ctx.add_os_flags('BISONFLAGS') + + for opt in opt_map: + ctx.env[opt] = opt_map[opt] +@@ -911,6 +912,7 @@ int main(int argc, char **argv) { + msg_setting("CFLAGS", " ".join(ctx.env.CFLAGS)) + msg_setting("LDFLAGS", " ".join(ctx.env.LDFLAGS)) + msg_setting("LINKFLAGS_NTPD", " ".join(ctx.env.LINKFLAGS_NTPD)) ++ msg_setting("BISONFLAGS", ctx.env.BISONFLAGS) + msg_setting("PREFIX", ctx.env.PREFIX) + msg_setting("LIBDIR", ctx.env.LIBDIR) + msg_setting("Droproot Support", droproot_type) diff --git a/meta-networking/recipes-support/ntpsec/ntpsec/volatiles.ntpsec b/meta-networking/recipes-support/ntpsec/ntpsec/volatiles.ntpsec new file mode 100644 index 0000000000..b5f93568cd --- /dev/null +++ b/meta-networking/recipes-support/ntpsec/ntpsec/volatiles.ntpsec @@ -0,0 +1,3 @@ +d ntp ntp 0755 @NTP_USER_HOME@ none +d ntp ntp 0755 /var/log/ntpstats none +f ntp ntp 0644 /var/log/ntpd.log none diff --git a/meta-networking/recipes-support/ntpsec/ntpsec_1.2.2a.bb b/meta-networking/recipes-support/ntpsec/ntpsec_1.2.2a.bb new file mode 100644 index 0000000000..872d1ce4f7 --- /dev/null +++ b/meta-networking/recipes-support/ntpsec/ntpsec_1.2.2a.bb @@ -0,0 +1,129 @@ +SUMMARY = "The Network Time Protocol suite, refactored" +HOMEPAGE = "https://www.ntpsec.org/" + +LICENSE = "CC-BY-4.0 & BSD-2-Clause & NTP & BSD-3-Clause & MIT" +LIC_FILES_CHKSUM = "file://LICENSES/BSD-2;md5=653830da7b770a32f6f50f6107e0b186 \ + file://LICENSES/BSD-3;md5=55e9dcf6a625a2dcfcda4ef6a647fbfd \ + file://LICENSES/CC-BY-4.0;md5=2ab724713fdaf49e4523c4503bfd068d \ + file://LICENSES/MIT;md5=5a9dfc801af3eb49df2055c9b07918b2 \ + file://LICENSES/NTP;md5=cb56b7747f86157c78ca81f224806694" + +DEPENDS += "bison-native \ + openssl \ + python3" + +SRC_URI = "https://ftp.ntpsec.org/pub/releases/ntpsec-${PV}.tar.gz \ + file://volatiles.ntpsec \ + file://0001-wscript-Add-BISONFLAGS-support.patch \ + " + +SRC_URI[sha256sum] = "e0ce93af222a0a9860e6f5a51aadba9bb5ca601d80b2aea118a62f0a3226950e" + +UPSTREAM_CHECK_URI = "ftp://ftp.ntpsec.org/pub/releases/" + +inherit pkgconfig python3-dir python3targetconfig systemd update-alternatives update-rc.d useradd waf features_check + +# RDEPENDS on gnuplot with this restriction +REQUIRED_DISTRO_FEATURES = "x11" + +PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'seccomp systemd', d)} \ + cap \ + leap-smear \ + mdns \ + mssntp \ + nts \ + refclocks" + +PACKAGECONFIG:remove:riscv32 = "seccomp" + +PACKAGECONFIG[cap] = ",,libcap" +PACKAGECONFIG[docs] = "--enable-doc --enable-manpage,--disable-doc --disable-manpage," +PACKAGECONFIG[leap-smear] = "--enable-leap-smear" +PACKAGECONFIG[mdns] = ",,mdns" +PACKAGECONFIG[mssntp] = "--enable-mssntp" +PACKAGECONFIG[nts] = ",--disable-nts" +PACKAGECONFIG[refclocks] = "--refclock=all,,pps-tools" +PACKAGECONFIG[seccomp] = "--enable-seccomp,,libseccomp" +PACKAGECONFIG[systemd] = ",,systemd" + +CC[unexport] = "1" +CFLAGS[unexport] = "1" +LDFLAGS[unexport] = "1" + +export PYTHON_VERSION = "${PYTHON_BASEVERSION}" +export PYTAG = "cpython${@ d.getVar('PYTHON_BASEVERSION').replace('.', '')}" +export pyext_PATTERN = "%s.so" +export PYTHON_LDFLAGS = "-lpthread -ldl" + +CFLAGS:append = " -I${PYTHON_INCLUDE_DIR} -D_GNU_SOURCE" + +EXTRA_OECONF = "--cross-compiler='${CC}' \ + --cross-cflags='${CFLAGS}' \ + --cross-ldflags='${LDFLAGS}' \ + --pyshebang=${bindir}/python3 \ + --pythondir=${PYTHON_SITEPACKAGES_DIR} \ + --pythonarchdir=${PYTHON_SITEPACKAGES_DIR} \ + --enable-debug-gdb \ + --enable-early-droproot" + +EXTRA_OEWAF_BUILD ?= "-v" + +NTP_USER_HOME ?= "/var/lib/ntp" + +BISONFLAGS = "--file-prefix-map=${WORKDIR}=${TARGET_DBGSRC_DIR}" + +do_configure:prepend() { + export BISONFLAGS="${BISONFLAGS}" +} + +do_install:append() { + install -d ${D}${sysconfdir}/init.d + install -m 755 ${S}/etc/rc/ntpd ${D}${sysconfdir}/init.d + cp -r ${S}/etc/ntp.d ${D}${sysconfdir} + + sed -e 's:@NTP_USER_HOME@:${NTP_USER_HOME}:g' ${UNPACKDIR}/volatiles.ntpsec >${T}/volatiles.ntpsec + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + cp ${B}/main/etc/* ${D}${systemd_system_unitdir} + awk '{print $1, $5, $4, $2, $3, "-"}' ${T}/volatiles.ntpsec >${T}/tmpfiles.ntpsec + install -D -m 0644 ${T}/tmpfiles.ntpsec ${D}${nonarch_libdir}/tmpfiles.d/${BPN}.conf + else + install -D -m 0644 ${T}/volatiles.ntpsec ${D}${sysconfdir}/default/volatiles/99_${BPN} + fi +} + +PACKAGE_BEFORE_PN = "${PN}-python ${PN}-utils ${PN}-viz" + +FILES:${PN} += "${nonarch_libdir}/tmpfiles.d/ntpsec.conf" +FILES:${PN}-python = "${PYTHON_SITEPACKAGES_DIR} \ + ${libdir}/libntpc.so.*" +FILES:${PN}-utils = "${bindir}/ntpdig \ + ${bindir}/ntpkeygen \ + ${bindir}/ntpleapfetch \ + ${bindir}/ntpmon \ + ${bindir}/ntpq \ + ${bindir}/ntpsnmpd \ + ${bindir}/ntpsweep \ + ${bindir}/ntptrace \ + ${bindir}/ntpwait" +FILES:${PN}-viz = "${bindir}/ntplogtemp \ + ${bindir}/ntpviz" + +RDEPENDS:${PN} += "libgcc" +RDEPENDS:${PN}-utils += "${PN}-python python3-core" +RDEPENDS:${PN}-viz += "gnuplot ${PN}-python python3-core python3-compression python3-ctypes python3-logging python3-shell" + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM:${PN} = "--system --home-dir ${NTP_USER_HOME} \ + --no-create-home \ + --shell /bin/false --user-group ntp" + +INITSCRIPT_NAME = "ntpd" + +SYSTEMD_PACKAGES = "${PN} ${PN}-viz" +SYSTEMD_SERVICE:${PN} = "ntpd.service ntp-wait.service" +SYSTEMD_SERVICE:${PN}-viz = "ntplogtemp.service ntpviz-weekly.timer ntpviz-weekly.service ntpviz-daily.timer ntpviz-daily.service ntplogtemp.timer" + +ALTERNATIVE_PRIORITY = "80" + +ALTERNATIVE:${PN} = "ntpd" +ALTERNATIVE_LINK_NAME[ntpd] = "${sbindir}/ntpd" diff --git a/meta-networking/recipes-support/nuttcp/nuttcp/nuttcp.socket b/meta-networking/recipes-support/nuttcp/nuttcp/nuttcp.socket new file mode 100644 index 0000000000..a8ae74fb88 --- /dev/null +++ b/meta-networking/recipes-support/nuttcp/nuttcp/nuttcp.socket @@ -0,0 +1,9 @@ +[Unit] +Description=Network Performance Testing Server Activation Socket + +[Socket] +ListenStream=5000 +Accept=true + +[Install] +WantedBy=sockets.target diff --git a/meta-networking/recipes-support/nuttcp/nuttcp/nuttcp@.service b/meta-networking/recipes-support/nuttcp/nuttcp/nuttcp@.service new file mode 100644 index 0000000000..b778e8552b --- /dev/null +++ b/meta-networking/recipes-support/nuttcp/nuttcp/nuttcp@.service @@ -0,0 +1,8 @@ +[Unit] +Description=Network Performance Testing Server +After=local-fs.target + +[Service] +User=nobody +ExecStart=/usr/bin/nuttcp -S +StandardInput=socket diff --git a/meta-networking/recipes-support/nuttcp/nuttcp_7.2.1.bb b/meta-networking/recipes-support/nuttcp/nuttcp_7.2.1.bb deleted file mode 100644 index 9430add487..0000000000 --- a/meta-networking/recipes-support/nuttcp/nuttcp_7.2.1.bb +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (C) 2013 Khem Raj <raj.khem@gmail.com> -# Released under the MIT license (see COPYING.MIT for the terms) - -SUMMARY = "network performance measurement tool" -DESCRIPTION = "nuttcp is a network performance measurement tool intended for use by network \ -and system managers. Its most basic usage is to determine the raw TCP (or UDP) \ -network layer throughput by transferring memory buffers from a source system \ -across an interconnecting network to a destination system, either transferring \ -data for a specified time interval, or alternatively transferring a specified \ -number of bytes." -HOMEPAGE = "http://www.nuttcp.net/Welcome%20Page.html" -LICENSE = "GPL-2.0" -SECTION = "net" -LIC_FILES_CHKSUM = "file://${BP}.c;beginline=4;endline=30;md5=ae7045c3c3616092e07d87f04ba0d960" - -SRC_URI = "http://nuttcp.net/${BPN}/beta/${BP}.c" -SRC_URI[md5sum] = "1ebf4a08bad2a295a8155f02995e8754" -SRC_URI[sha256sum] = "c6e33810ccce67260f8d5d627f60e429d44f532365c58ed5673d035e2a59c4db" - -S = "${WORKDIR}" - -do_compile () { - ${CC} ${CFLAGS} ${LDFLAGS} -o nuttcp nuttcp-${PV}.c -} - -do_install () { - install -d ${D}${bindir} - install -m 0755 nuttcp ${D}${bindir} -} diff --git a/meta-networking/recipes-support/nuttcp/nuttcp_8.2.2.bb b/meta-networking/recipes-support/nuttcp/nuttcp_8.2.2.bb new file mode 100644 index 0000000000..b02f775a55 --- /dev/null +++ b/meta-networking/recipes-support/nuttcp/nuttcp_8.2.2.bb @@ -0,0 +1,39 @@ +SUMMARY = "network performance measurement tool" +DESCRIPTION = "nuttcp is a network performance measurement tool intended for use by network \ +and system managers. Its most basic usage is to determine the raw TCP (or UDP) \ +network layer throughput by transferring memory buffers from a source system \ +across an interconnecting network to a destination system, either transferring \ +data for a specified time interval, or alternatively transferring a specified \ +number of bytes." +HOMEPAGE = "http://www.nuttcp.net/Welcome%20Page.html" +LICENSE = "GPL-2.0-only" +SECTION = "net" +LIC_FILES_CHKSUM = "file://${BP}.c;beginline=4;endline=30;md5=496a7c0bb83c07ff528d226bf85e05c5" + +UPSTREAM_CHECK_URI = "https://www.nuttcp.net/nuttcp/beta/" + +SRC_URI = "http://nuttcp.net/${BPN}/beta/${BP}.c \ + file://nuttcp@.service \ + file://nuttcp.socket" +SRC_URI[md5sum] = "d3c92c4d2f261221193c3726c1b9a42f" +SRC_URI[sha256sum] = "8c5595bcd27c2fd66831be74c390df078cfb1870aa427f2511ac2586d236c8a1" + +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + +do_compile () { + ${CC} ${CFLAGS} ${LDFLAGS} -o nuttcp nuttcp-${PV}.c +} + +do_install () { + install -d ${D}${bindir} + install -d ${D}${systemd_system_unitdir} + install -m 0755 nuttcp ${D}${bindir} + install -m 0644 ${UNPACKDIR}/nuttcp@.service ${D}${systemd_system_unitdir} + install -m 0644 ${UNPACKDIR}/nuttcp.socket ${D}${systemd_system_unitdir} +} + +FILES:${PN} += " \ + ${bindir} \ + ${systemd_system_unitdir} \ +" diff --git a/meta-networking/recipes-support/open-isns/files/0001-isnsd.socket-use-run-instead-of-var-run.patch b/meta-networking/recipes-support/open-isns/files/0001-isnsd.socket-use-run-instead-of-var-run.patch new file mode 100644 index 0000000000..1dde1cae88 --- /dev/null +++ b/meta-networking/recipes-support/open-isns/files/0001-isnsd.socket-use-run-instead-of-var-run.patch @@ -0,0 +1,26 @@ +From 9413921d5af5e5e38541f97fee0f1aa40024a3ed Mon Sep 17 00:00:00 2001 +From: Chen Qi <Qi.Chen@windriver.com> +Date: Tue, 20 Oct 2020 13:21:57 +0800 +Subject: [PATCH] isnsd.socket: use /run instead of /var/run + +Upstream-Status: Pending + +Signed-off-by: Chen Qi <Qi.Chen@windriver.com> +--- + isnsd.socket | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/isnsd.socket b/isnsd.socket +index 652cd46..7dfcf51 100644 +--- a/isnsd.socket ++++ b/isnsd.socket +@@ -1,5 +1,5 @@ + [Socket] +-ListenStream=/var/run/isnsctl ++ListenStream=/run/isnsctl + PassCredentials=true + + [Socket] +-- +2.17.1 + diff --git a/meta-networking/recipes-support/open-isns/open-isns/0001-util.h-endian.h-is-available-on-musl-on-linux.patch b/meta-networking/recipes-support/open-isns/open-isns/0001-util.h-endian.h-is-available-on-musl-on-linux.patch deleted file mode 100644 index 825e2bf6ab..0000000000 --- a/meta-networking/recipes-support/open-isns/open-isns/0001-util.h-endian.h-is-available-on-musl-on-linux.patch +++ /dev/null @@ -1,38 +0,0 @@ -From e0d86318227a23f00cf0f6639a6685bb9f5771a1 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 12 Dec 2017 09:42:19 -0800 -Subject: [PATCH] util.h: endian.h is available on musl on linux - -just checking for glibc alone is not enough since -it excludes musl, therefore check for platform -being linux as well - -Fixes build issues - -include/libisns/util.h:114:12: fatal error: sys/endian.h: No such file or directory - # include <sys/endian.h> - ^~~~~~~~~~~~~~ - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Submitted - - include/libisns/util.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/libisns/util.h b/include/libisns/util.h -index 9a2bd13..6cc1a1b 100644 ---- a/include/libisns/util.h -+++ b/include/libisns/util.h -@@ -100,7 +100,7 @@ enum { - * There's no htonll yet - */ - #ifndef htonll --# ifdef __GLIBC__ -+# if defined(__GLIBC__) || defined(__linux__) - # include <endian.h> - # include <byteswap.h> - # if __BYTE_ORDER == __BIG_ENDIAN --- -2.15.1 - diff --git a/meta-networking/recipes-support/open-isns/open-isns_0.97.bb b/meta-networking/recipes-support/open-isns/open-isns_0.102.bb index abfa7510e5..24c520901d 100644 --- a/meta-networking/recipes-support/open-isns/open-isns_0.97.bb +++ b/meta-networking/recipes-support/open-isns/open-isns_0.102.bb @@ -7,17 +7,17 @@ Storage Name Service (iSNS). The distribution includes the iSNS server, \ supporting persisten storage of registrations, isnsadm, a command line \ utility for managing nodes, and isnsdd, a corresponding discovery daemon." HOMEPAGE = "http://github.com/gonzoleeman/open-isns/" -LICENSE = "GPLv2+ & LGPLv2+" +LICENSE = "GPL-2.0-or-later & LGPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=321bf41f280cf805086dd5a720b37785" SECTION = "net" DEPENDS = "openssl" -SRC_URI = "git://github.com/open-iscsi/open-isns \ - file://0001-util.h-endian.h-is-available-on-musl-on-linux.patch \ +SRC_URI = "git://github.com/open-iscsi/open-isns;branch=master;protocol=https \ + file://0001-isnsd.socket-use-run-instead-of-var-run.patch \ " -SRCREV ?= "09954404e948e41eb0fce8e28836018b4ce3d20d" +SRCREV = "c0e6d9fedc5a7041260de477fe1a8455fa074113" S = "${WORKDIR}/git" @@ -26,7 +26,7 @@ inherit systemd autotools-brokensep update-rc.d EXTRA_OECONF = " --prefix=${prefix} --enable-shared" EXTRA_OEMAKE += "SYSTEMDDIR=${D}${systemd_unitdir}/system" -do_install_append () { +do_install:append () { oe_runmake INCDIR=${D}${includedir}/libisns/ install_hdrs oe_runmake LIBDIR=${D}${libdir} install_lib @@ -35,6 +35,6 @@ do_install_append () { ${D}${sysconfdir}/init.d/openisns } -FILES_${PN} += "${libdir} ${systemd_unitdir}" +FILES:${PN} += "${libdir} ${systemd_unitdir}" INITSCRIPT_NAME = "openisns" diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-Add-resolv_compat.h-for-musl-builds.patch b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-Add-resolv_compat.h-for-musl-builds.patch new file mode 100644 index 0000000000..96270f860b --- /dev/null +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-Add-resolv_compat.h-for-musl-builds.patch @@ -0,0 +1,72 @@ +From 148aadcc1b61da6f6b9ee4bcd35c38b7fbaeb8a8 Mon Sep 17 00:00:00 2001 +From: Trevor Gamblin <trevor.gamblin@windriver.com> +Date: Wed, 14 Apr 2021 10:24:52 -0400 +Subject: [PATCH] Add resolv_compat.h for musl builds + +musl doesn't implement res_ninit, so it needs to be defined +independently for musl builds. This patch is based on the one at +https://gitweb.gentoo.org/proj/musl.git/tree/dev-qt/qtwebengine/files/qtwebengine-5.7.0-musl-resolver.patch?id=7f4100326793d55d45d0f5bb6178827ce6173513 + +Upstream-Status: Pending + +Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com> +--- + open-vm-tools/lib/nicInfo/nicInfoPosix.c | 4 +++ + open-vm-tools/lib/nicInfo/resolv_compat.h | 30 +++++++++++++++++++++++ + 2 files changed, 34 insertions(+) + create mode 100644 open-vm-tools/lib/nicInfo/resolv_compat.h + +diff --git a/open-vm-tools/lib/nicInfo/nicInfoPosix.c b/open-vm-tools/lib/nicInfo/nicInfoPosix.c +index 6f20547b2..f5064a9c0 100644 +--- a/open-vm-tools/lib/nicInfo/nicInfoPosix.c ++++ b/open-vm-tools/lib/nicInfo/nicInfoPosix.c +@@ -70,6 +70,10 @@ + # include <net/if.h> + #endif + ++#if !defined(__GLIBC__) ++#include "resolv_compat.h" ++#endif ++ + /* + * resolver(3) and IPv6: + * +diff --git a/open-vm-tools/lib/nicInfo/resolv_compat.h b/open-vm-tools/lib/nicInfo/resolv_compat.h +new file mode 100644 +index 000000000..d768464b9 +--- /dev/null ++++ b/open-vm-tools/lib/nicInfo/resolv_compat.h +@@ -0,0 +1,30 @@ ++#if !defined(__GLIBC__) ++/*************************************************************************** ++ * resolv_compat.h ++ * ++ * Mimick GLIBC's res_ninit() and res_nclose() for musl libc ++ * Note: res_init() is actually deprecated according to ++ * http://docs.oracle.com/cd/E36784_01/html/E36875/res-nclose-3resolv.html ++ **************************************************************************/ ++#include <string.h> ++ ++static inline int res_ninit(res_state statp) ++{ ++ int rc = res_init(); ++ if (statp != &_res) { ++ memcpy(statp, &_res, sizeof(*statp)); ++ } ++ return rc; ++} ++ ++static inline int res_nclose(res_state statp) ++{ ++ if (!statp) ++ return -1; ++ if (statp != &_res) { ++ memset(statp, 0, sizeof(*statp)); ++ } ++ return 0; ++} ++#endif ++ +-- +2.25.1 + diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-configure.ac-don-t-use-dnet-config.patch b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-configure.ac-don-t-use-dnet-config.patch new file mode 100644 index 0000000000..69c8253117 --- /dev/null +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-configure.ac-don-t-use-dnet-config.patch @@ -0,0 +1,41 @@ +From 547d05ca417c6b75ad06bf3119e1df8869742a70 Mon Sep 17 00:00:00 2001 +From: Martin Kelly <mkelly@xevo.com> +Date: Fri, 7 Apr 2017 15:20:30 -0700 +Subject: [PATCH] configure.ac: don't use dnet-config + +The dnet-config tool doesn't know about cross-compilation, so it injects +-I/usr/include into the path, causing compiler errors. So instead find dnet via +-ldnet. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Martin Kelly <mkelly@xevo.com> +--- + open-vm-tools/configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac +index 26bfdb682..9e2a1d6e3 100644 +--- a/open-vm-tools/configure.ac ++++ b/open-vm-tools/configure.ac +@@ -1227,7 +1227,7 @@ if test "$with_dnet" = "yes"; then + AC_VMW_CHECK_LIB([dnet], + [DNET], + [], +- [dnet-config], ++ [], + [], + [dnet.h], + [intf_open], +@@ -1237,7 +1237,7 @@ if test "$with_dnet" = "yes"; then + + if test $have_dnet = "no"; then + AC_MSG_ERROR( +- [dnet-config was not found on your PATH. Please configure without dnet or install dnet - http://libdnet.sourceforge.net]) ++ [dnet was not found. Please configure without dnet (using --without-dnet) or install dnet - http://libdnet.sourceforge.net]) + fi + fi + +-- +2.25.1 + diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0002-Use-configure-test-for-struct-timespec.patch b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0002-Use-configure-test-for-struct-timespec.patch new file mode 100644 index 0000000000..1029252c76 --- /dev/null +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0002-Use-configure-test-for-struct-timespec.patch @@ -0,0 +1,50 @@ +From 74ab6b05fcba32031255624a31676e2aa0db133f Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Wed, 18 Nov 2015 09:03:00 +0000 +Subject: [PATCH] Use configure test for struct timespec + +Use the configure script to test for struct time spec instead of trying +to keep track of what platforms has it. + +Upstream-Status: Pending + +Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> +--- + open-vm-tools/configure.ac | 1 + + open-vm-tools/lib/include/hgfsUtil.h | 8 +------- + 2 files changed, 2 insertions(+), 7 deletions(-) + +diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac +index 9e2a1d6e3..2f34f6eda 100644 +--- a/open-vm-tools/configure.ac ++++ b/open-vm-tools/configure.ac +@@ -1441,6 +1441,7 @@ AC_TYPE_OFF_T + AC_TYPE_PID_T + AC_TYPE_SIZE_T + AC_CHECK_MEMBERS([struct stat.st_rdev]) ++AC_CHECK_MEMBERS([struct timespec.tv_sec],[],[],[[#include <time.h>]]) + AC_HEADER_TIME + AC_STRUCT_TM + AC_C_VOLATILE +diff --git a/open-vm-tools/lib/include/hgfsUtil.h b/open-vm-tools/lib/include/hgfsUtil.h +index 609f4c000..a3a022d42 100644 +--- a/open-vm-tools/lib/include/hgfsUtil.h ++++ b/open-vm-tools/lib/include/hgfsUtil.h +@@ -53,13 +53,7 @@ + # include <time.h> + # endif + # include "vm_basic_types.h" +-# if !defined _STRUCT_TIMESPEC && \ +- !defined _TIMESPEC_DECLARED && \ +- !defined __timespec_defined && \ +- !defined sun && \ +- !defined __FreeBSD__ && \ +- !__APPLE__ && \ +- !defined _WIN32 ++# if !defined HAVE_STRUCT_TIMESPEC_TV_SEC + struct timespec { + time_t tv_sec; + long tv_nsec; +-- +2.25.1 + diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0003-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0003-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch new file mode 100644 index 0000000000..b4bd646d61 --- /dev/null +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0003-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch @@ -0,0 +1,63 @@ +From ef466581b53a1e64f53d4839bdacfab1d65cc6b9 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Wed, 18 Nov 2015 09:10:14 +0000 +Subject: [PATCH] Fix definition of ALLPERMS and ACCESSPERMS + +The ALLPERMS and ACCESSPERMS defines are not specified in POSIX so +assume it is not there instead of testing for specific implementations. + +This is needed for musl libc. + +Upstream-Status: Pending + +Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> +--- + open-vm-tools/lib/hgfsServer/hgfsServerLinux.c | 8 +++++--- + open-vm-tools/services/plugins/dndcp/dnd/dndLinux.c | 3 +-- + 2 files changed, 6 insertions(+), 5 deletions(-) + +diff --git a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c +index 4a0bc9378..6ed49e2b7 100644 +--- a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c ++++ b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c +@@ -105,11 +105,13 @@ typedef struct DirectoryEntry { + #endif + + /* +- * ALLPERMS (mode 07777) and ACCESSPERMS (mode 0777) are not defined in the +- * Solaris version of <sys/stat.h>. ++ * ALLPERMS (mode 07777) and ACCESSPERMS (mode 0777) are not specified in ++ * POSIX. + */ +-#ifdef sun ++#ifndef ACCESSPERMS + # define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO) ++#endif ++#ifndef ALLPERMS + # define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO) + #endif + +diff --git a/open-vm-tools/services/plugins/dndcp/dnd/dndLinux.c b/open-vm-tools/services/plugins/dndcp/dnd/dndLinux.c +index 219065f74..b5b7e6203 100644 +--- a/open-vm-tools/services/plugins/dndcp/dnd/dndLinux.c ++++ b/open-vm-tools/services/plugins/dndcp/dnd/dndLinux.c +@@ -53,7 +53,7 @@ + + #define DND_ROOTDIR_PERMS (S_IRWXU | S_IRWXG | S_IRWXO) + #define DND_STAGINGDIR_PERMS (S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH) +-#ifdef sun ++#ifndef ACCESSPERMS + #define ACCESSPERMS (S_IRWXU | S_IRWXG | S_IRWXO) + #endif + #ifdef __ANDROID__ +@@ -62,7 +62,6 @@ + */ + #define NO_SETMNTENT + #define NO_ENDMNTENT +-#define ACCESSPERMS (S_IRWXU | S_IRWXG | S_IRWXO) + #endif + + +-- +2.25.1 + diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0004-Use-configure-to-test-for-feature-instead-of-platfor.patch b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0004-Use-configure-to-test-for-feature-instead-of-platfor.patch new file mode 100644 index 0000000000..f23235e902 --- /dev/null +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0004-Use-configure-to-test-for-feature-instead-of-platfor.patch @@ -0,0 +1,144 @@ +From 4462efefdd61bff1e39e946b917b01433898be88 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Wed, 18 Nov 2015 10:05:07 +0000 +Subject: [PATCH] Use configure to test for feature instead of platform + +Test for various functions instead of trying to keep track of what +platform and what version of the given platform has support for what. + +This should make it easier to port to currently unknown platforms and +will solve the issue if a platform add support for a missing feature in +the future. + +The features we test for are: +- getifaddrs +- getauxval +- issetugid +- __secure_getenv + +This is needed for musl libc. + +Upstream-Status: Pending + +Refit patch of open-vm-tools/lib/nicInfo/nicInfoPosix.c + +Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> +Signed-off-by: Randy MacLeod <randy.macleod@windriver.com> +--- + open-vm-tools/configure.ac | 4 ++++ + open-vm-tools/lib/misc/idLinux.c | 30 +++++++++++------------- + open-vm-tools/lib/nicInfo/nicInfoPosix.c | 6 ++++- + 3 files changed, 23 insertions(+), 17 deletions(-) + +diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac +index 2f34f6eda..daa0939c3 100644 +--- a/open-vm-tools/configure.ac ++++ b/open-vm-tools/configure.ac +@@ -1169,6 +1169,7 @@ AC_CHECK_FUNCS( + + AC_CHECK_FUNCS([ecvt]) + AC_CHECK_FUNCS([fcvt]) ++AC_CHECK_FUNCS([getifaddrs getauxval issetugid __secure_getenv]) + + AC_CHECK_FUNC([mkdtemp], [have_mkdtemp=yes]) + +@@ -1378,10 +1379,13 @@ fi + ### + + AC_CHECK_HEADERS([crypt.h]) ++AC_CHECK_HEADERS([ifaddrs.h]) + AC_CHECK_HEADERS([inttypes.h]) + AC_CHECK_HEADERS([stdint.h]) + AC_CHECK_HEADERS([stdlib.h]) + AC_CHECK_HEADERS([wchar.h]) ++AC_CHECK_HEADERS([net/if.h]) ++AC_CHECK_HEADERS([sys/auxv.h]) + AC_CHECK_HEADERS([sys/inttypes.h]) + AC_CHECK_HEADERS([sys/io.h]) + AC_CHECK_HEADERS([sys/param.h]) # Required to make the sys/user.h check work correctly on FreeBSD +diff --git a/open-vm-tools/lib/misc/idLinux.c b/open-vm-tools/lib/misc/idLinux.c +index 3d7d1e303..0e12ac5bd 100644 +--- a/open-vm-tools/lib/misc/idLinux.c ++++ b/open-vm-tools/lib/misc/idLinux.c +@@ -27,12 +27,9 @@ + #include <sys/syscall.h> + #include <string.h> + #include <unistd.h> +-#ifdef __linux__ +-#if defined(__GLIBC__) && \ +- (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 16)) ++#ifdef HAVE_SYS_AUXV_H + #include <sys/auxv.h> + #endif +-#endif + #ifdef __APPLE__ + #include <sys/socket.h> + #include <TargetConditionals.h> +@@ -1025,24 +1022,23 @@ Id_EndSuperUser(uid_t uid) // IN: + static Bool + IdIsSetUGid(void) + { +-#if defined(__ANDROID__) +- /* Android does not have a secure_getenv, so be conservative. */ +- return TRUE; +-#else + /* + * We use __secure_getenv, which returns NULL if the binary is +- * setuid or setgid. Alternatives include, ++ * setuid or setgid, when issetugid or getauxval(AT_SECURE) is not ++ * available. Alternatives include, + * +- * a) getauxval(AT_SECURE); not available until glibc 2.16. +- * b) __libc_enable_secure; may not be exported. ++ * a) issetugid(); not (yet?) available in glibc. ++ * b) getauxval(AT_SECURE); not available until glibc 2.16. ++ * c) __libc_enable_secure; may not be exported. + * +- * Use (a) when we are based on glibc 2.16, or newer. ++ * Use (b) when we are based on glibc 2.16, or newer. + */ + +-#if defined(__GLIBC__) && \ +- (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 16)) ++#if HAVE_ISSETUGID ++ return issetugid(); ++#elif HAVE_GETAUXVAL + return getauxval(AT_SECURE) != 0; +-#else ++#elif HAVE___SECURE_GETENV + static const char envName[] = "VMW_SETUGID_TEST"; + + /* +@@ -1062,7 +1058,9 @@ IdIsSetUGid(void) + return secure_getenv(envName) == NULL; + } + return TRUE; +-#endif ++#else ++ /* Android does not have a secure_getenv, so be conservative. */ ++ return TRUE; + #endif + } + #endif +diff --git a/open-vm-tools/lib/nicInfo/nicInfoPosix.c b/open-vm-tools/lib/nicInfo/nicInfoPosix.c +index 0135e6a09..6f20547b2 100644 +--- a/open-vm-tools/lib/nicInfo/nicInfoPosix.c ++++ b/open-vm-tools/lib/nicInfo/nicInfoPosix.c +@@ -35,9 +35,13 @@ + #include <sys/stat.h> + #include <errno.h> + #include <limits.h> +-#if defined(__FreeBSD__) || defined(__APPLE__) ++#if HAVE_SYS_SYSCTL_H + # include <sys/sysctl.h> ++#endif ++#if HAVE_IFADDRS_H + # include <ifaddrs.h> ++#endif ++#if HAVE_NET_IF_H + # include <net/if.h> + #endif + #ifndef NO_DNET +-- +2.25.1 + diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0005-Use-configure-test-for-sys-stat.h-include.patch b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0005-Use-configure-test-for-sys-stat.h-include.patch new file mode 100644 index 0000000000..fda4c37e59 --- /dev/null +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0005-Use-configure-test-for-sys-stat.h-include.patch @@ -0,0 +1,30 @@ +From 79675399124b61f4e3da1f64f4b265f83dd26cdc Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Wed, 18 Nov 2015 10:41:01 +0000 +Subject: [PATCH] Use configure test for sys/stat.h include + +This is needed for musl libc. + +Upstream-Status: Pending + +Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> +--- + open-vm-tools/services/plugins/vix/vixTools.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/open-vm-tools/services/plugins/vix/vixTools.c b/open-vm-tools/services/plugins/vix/vixTools.c +index 75d24a29e..d11c42178 100644 +--- a/open-vm-tools/services/plugins/vix/vixTools.c ++++ b/open-vm-tools/services/plugins/vix/vixTools.c +@@ -66,7 +66,7 @@ + #include <unistd.h> + #endif + +-#if defined(sun) || defined(__FreeBSD__) || defined(__APPLE__) ++#ifdef HAVE_SYS_STAT_H + #include <sys/stat.h> + #endif + +-- +2.25.1 + diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0006-Fix-subdir-objects-configure-error.patch b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0006-Fix-subdir-objects-configure-error.patch new file mode 100644 index 0000000000..4c6f6ce022 --- /dev/null +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0006-Fix-subdir-objects-configure-error.patch @@ -0,0 +1,38 @@ +From 37ad9845b5b8ab7170a2aaba31a505b2a36ba0f8 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 13 Jun 2018 23:48:04 -0700 +Subject: [PATCH] Fix subdir objects configure error + +Fix build on musl while here + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + open-vm-tools/configure.ac | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac +index daa0939c3..497e9459a 100644 +--- a/open-vm-tools/configure.ac ++++ b/open-vm-tools/configure.ac +@@ -326,7 +326,6 @@ AC_ARG_ENABLE( + [], + [enable_resolutionkms="auto"]) + +- + AC_ARG_ENABLE( + vmwgfxctrl, + AS_HELP_STRING( +@@ -335,7 +334,7 @@ AC_ARG_ENABLE( + [], + [enable_vmwgfxctrl="auto"]) + +-AM_INIT_AUTOMAKE ++AM_INIT_AUTOMAKE([subdir-objects]) + + ### + ### Constants +-- +2.25.1 + diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0007-include-poll.h-instead-of-sys-poll.h.patch b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0007-include-poll.h-instead-of-sys-poll.h.patch new file mode 100644 index 0000000000..fc0ce961c2 --- /dev/null +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0007-include-poll.h-instead-of-sys-poll.h.patch @@ -0,0 +1,31 @@ +From d138b808a8b47a02a370b411149ef8ce7883ca6f Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 13 Jun 2018 23:02:50 -0700 +Subject: [PATCH] include poll.h instead of sys/poll.h + +including sys/poll.h is deprecated + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + open-vm-tools/lib/asyncsocket/asyncsocket.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/open-vm-tools/lib/asyncsocket/asyncsocket.c b/open-vm-tools/lib/asyncsocket/asyncsocket.c +index 26aee553a..4f413db73 100644 +--- a/open-vm-tools/lib/asyncsocket/asyncsocket.c ++++ b/open-vm-tools/lib/asyncsocket/asyncsocket.c +@@ -70,8 +70,8 @@ + #else + #include <stddef.h> + #include <ctype.h> ++#include <poll.h> + #include <sys/types.h> +-#include <sys/poll.h> + #include <sys/socket.h> + #include <sys/un.h> + #include <netdb.h> +-- +2.25.1 + diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0008-Rename-poll.h-to-vm_poll.h.patch b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0008-Rename-poll.h-to-vm_poll.h.patch new file mode 100644 index 0000000000..2654767099 --- /dev/null +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0008-Rename-poll.h-to-vm_poll.h.patch @@ -0,0 +1,114 @@ +From e86d7b309bdf5b7c6c38faeded157e220d4ccc78 Mon Sep 17 00:00:00 2001 +From: Randy MacLeod <Randy.MacLeod@windriver.com> +Date: Wed, 24 Mar 2021 16:21:35 -0400 +Subject: [PATCH] Rename poll.h to vm_poll.h + +Rename poll.h to vm_poll.h and switch from: + #include <sys/poll.h> +to + #include <poll.h> + +musl libc's system headers pulls in open-vm-tools' poll.h. To avoid this +we rename poll.h to vm_poll.h. + +Update for open-vm-tools-11.2.5. + +Upstream-Status: Pending + +Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com> +--- + open-vm-tools/lib/asyncsocket/asyncsocket.c | 2 +- + open-vm-tools/lib/hgfsServer/hgfsServer.c | 2 +- + open-vm-tools/lib/include/asyncsocket.h | 2 +- + open-vm-tools/lib/include/pollImpl.h | 2 +- + open-vm-tools/lib/include/{poll.h => vm_poll.h} | 2 +- + open-vm-tools/lib/rpcIn/rpcin.c | 2 +- + 6 files changed, 6 insertions(+), 6 deletions(-) + rename open-vm-tools/lib/include/{poll.h => vm_poll.h} (99%) + +diff --git a/open-vm-tools/lib/asyncsocket/asyncsocket.c b/open-vm-tools/lib/asyncsocket/asyncsocket.c +index 4f413db73..684008d34 100644 +--- a/open-vm-tools/lib/asyncsocket/asyncsocket.c ++++ b/open-vm-tools/lib/asyncsocket/asyncsocket.c +@@ -87,7 +87,7 @@ + #include "random.h" + #include "asyncsocket.h" + #include "asyncSocketBase.h" +-#include "poll.h" ++#include "vm_poll.h" + #include "log.h" + #include "err.h" + #include "hostinfo.h" +diff --git a/open-vm-tools/lib/hgfsServer/hgfsServer.c b/open-vm-tools/lib/hgfsServer/hgfsServer.c +index c7b4cdd0f..d6e0cdc0e 100644 +--- a/open-vm-tools/lib/hgfsServer/hgfsServer.c ++++ b/open-vm-tools/lib/hgfsServer/hgfsServer.c +@@ -51,7 +51,7 @@ + #include "hgfsDirNotify.h" + #include "hgfsThreadpool.h" + #include "userlock.h" +-#include "poll.h" ++#include "vm_poll.h" + #include "mutexRankLib.h" + #include "vm_basic_asm.h" + #include "unicodeOperations.h" +diff --git a/open-vm-tools/lib/include/asyncsocket.h b/open-vm-tools/lib/include/asyncsocket.h +index 09947002e..3800f5971 100644 +--- a/open-vm-tools/lib/include/asyncsocket.h ++++ b/open-vm-tools/lib/include/asyncsocket.h +@@ -177,7 +177,7 @@ typedef struct AsyncSocket AsyncSocket; + * Or the client can specify its favorite poll class and locking behavior. + * Use of IVmdbPoll is only supported for regular sockets and for Attach. + */ +-#include "poll.h" ++#include "vm_poll.h" + struct IVmdbPoll; + typedef struct AsyncSocketPollParams { + int flags; /* Default 0, only POLL_FLAG_NO_BULL is valid */ +diff --git a/open-vm-tools/lib/include/pollImpl.h b/open-vm-tools/lib/include/pollImpl.h +index 46442e556..8bc669970 100644 +--- a/open-vm-tools/lib/include/pollImpl.h ++++ b/open-vm-tools/lib/include/pollImpl.h +@@ -44,7 +44,7 @@ + #define INCLUDE_ALLOW_USERLEVEL + #include "includeCheck.h" + +-#include "poll.h" ++#include "vm_poll.h" + #include "vm_basic_asm.h" + + #if defined(__cplusplus) +diff --git a/open-vm-tools/lib/include/poll.h b/open-vm-tools/lib/include/vm_poll.h +similarity index 99% +rename from open-vm-tools/lib/include/poll.h +rename to open-vm-tools/lib/include/vm_poll.h +index ade356b9f..8759fb960 100644 +--- a/open-vm-tools/lib/include/poll.h ++++ b/open-vm-tools/lib/include/vm_poll.h +@@ -60,7 +60,7 @@ extern "C" { + #if !defined(TARGET_OS_IPHONE) || TARGET_OS_IPHONE == 0 + #include <sys/kernel.h> + #endif +-#include <sys/poll.h> ++#include <poll.h> + #define HZ 100 + #endif + #ifdef __ANDROID__ +diff --git a/open-vm-tools/lib/rpcIn/rpcin.c b/open-vm-tools/lib/rpcIn/rpcin.c +index f1709fe03..c1a5dfdba 100644 +--- a/open-vm-tools/lib/rpcIn/rpcin.c ++++ b/open-vm-tools/lib/rpcIn/rpcin.c +@@ -57,7 +57,7 @@ + + #if defined(VMTOOLS_USE_VSOCKET) + # include <glib.h> +-# include "poll.h" ++# include "vm_poll.h" + # include "asyncsocket.h" + # include "vmci_defs.h" + #include "dataMap.h" +-- +2.25.1 + diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0009-use-posix-strerror_r-unless-on-gnu-libc-system.patch b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0009-use-posix-strerror_r-unless-on-gnu-libc-system.patch new file mode 100644 index 0000000000..a6638adb9a --- /dev/null +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0009-use-posix-strerror_r-unless-on-gnu-libc-system.patch @@ -0,0 +1,44 @@ +From 666a043be7d6fe07a36599260f7214cbd29a79e7 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 13 Jun 2018 23:16:53 -0700 +Subject: [PATCH] use posix strerror_r unless on gnu libc system + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + open-vm-tools/lib/err/errPosix.c | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/open-vm-tools/lib/err/errPosix.c b/open-vm-tools/lib/err/errPosix.c +index c81b4c13f..7a4036402 100644 +--- a/open-vm-tools/lib/err/errPosix.c ++++ b/open-vm-tools/lib/err/errPosix.c +@@ -31,6 +31,7 @@ + #include <errno.h> + #include <string.h> + #include <locale.h> ++#include <stdio.h> + + #include "vmware.h" + #include "errInt.h" +@@ -63,11 +64,13 @@ ErrErrno2String(Err_Number errorNumber, // IN + { + char *p; + +-#if defined(__linux__) && !defined(__ANDROID__) ++#if defined(__GLIBC__) && !defined(__ANDROID__) + p = strerror_r(errorNumber, buf, bufSize); + #else +- p = strerror(errorNumber); +-#endif ++ if (strerror_r(errorNumber, buf, bufSize) != 0) ++ snprintf(buf, bufSize, "unknown error %i", errorNumber); ++ p = buf; ++#endif /* defined __GLIBC__ */ + ASSERT(p != NULL); + return p; + } +-- +2.25.1 + diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0010-Use-uintmax_t-for-handling-rlim_t.patch b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0010-Use-uintmax_t-for-handling-rlim_t.patch new file mode 100644 index 0000000000..6d0f8a3ae0 --- /dev/null +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0010-Use-uintmax_t-for-handling-rlim_t.patch @@ -0,0 +1,38 @@ +From b294005f3748c6caee002fd7588964f7bf9b1d09 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 24 Mar 2021 17:26:53 -0400 +Subject: [PATCH] Use uintmax_t for handling rlim_t + +rlimit types are not representable with long or long long +formats, therefore use uintmax_t to typecast rlim_t types +and use %j to print it + +Upstream-Status: Pending + +Refit patch for open-vm-tools-11.2.5. + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com> +Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com> +--- + open-vm-tools/lib/hgfsServer/hgfsServerLinux.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c +index 6ed49e2b7..0cc7c4094 100644 +--- a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c ++++ b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c +@@ -5294,8 +5294,8 @@ HgfsWriteCheckIORange(off_t offset, // IN: + goto exit; + } + +- LOG(6, "%s: File Size limits: 0x%"FMT64"x 0x%"FMT64"x\n", +- __FUNCTION__, fileSize.rlim_cur, fileSize.rlim_max); ++ //LOG(6, ("%s: File Size limits: 0x%jx 0x%jx\n", ++ // __FUNCTION__, (uintmax_t)fileSize.rlim_cur, (uintmax_t)fileSize.rlim_max)); + + /* + * Check the offset is within the file size range. +-- +2.25.1 + diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0011-Use-off64_t-instead-of-__off64_t.patch b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0011-Use-off64_t-instead-of-__off64_t.patch new file mode 100644 index 0000000000..c6ab4d44d6 --- /dev/null +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0011-Use-off64_t-instead-of-__off64_t.patch @@ -0,0 +1,35 @@ +From a8ef33b0623ba3494594a040ff5c77771168fdd6 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 27 Aug 2018 23:22:21 -0700 +Subject: [PATCH] Use off64_t instead of __off64_t + +Fixes +unknown type name '__off64_t' + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + open-vm-tools/lib/file/fileIOPosix.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/open-vm-tools/lib/file/fileIOPosix.c b/open-vm-tools/lib/file/fileIOPosix.c +index 492a4bf4a..a80a884cd 100644 +--- a/open-vm-tools/lib/file/fileIOPosix.c ++++ b/open-vm-tools/lib/file/fileIOPosix.c +@@ -211,10 +211,10 @@ static AlignedPool alignedPool; + * the symbols (and anyone building XOPEN<700 gets nothing). + */ + extern ssize_t preadv64(int fd, const struct iovec *iov, int iovcnt, +- __off64_t offset) __attribute__ ((weak)); ++ off64_t offset) __attribute__ ((weak)); + + extern ssize_t pwritev64(int fd, const struct iovec *iov, int iovcnt, +- __off64_t offset) __attribute__ ((weak)); ++ off64_t offset) __attribute__ ((weak)); + #else + #error "Large file support is unavailable." + #endif +-- +2.25.1 + diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0012-hgfsServerLinux-Consider-64bit-time_t-possibility.patch b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0012-hgfsServerLinux-Consider-64bit-time_t-possibility.patch new file mode 100644 index 0000000000..388857fc10 --- /dev/null +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0012-hgfsServerLinux-Consider-64bit-time_t-possibility.patch @@ -0,0 +1,44 @@ +From 2904454f3408a3abe3f2b0681504a66ea5ce713c Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 24 Mar 2021 17:36:26 -0400 +Subject: [PATCH] hgfsServerLinux: Consider 64bit time_t possibility + +Upstream-Status: Pending + +Refit for open-vm-tools-11.2.5. + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com> +Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com> +--- + open-vm-tools/lib/hgfsServer/hgfsServerLinux.c | 14 -------------- + 1 file changed, 14 deletions(-) + +diff --git a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c +index 0cc7c4094..445a53881 100644 +--- a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c ++++ b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c +@@ -2559,20 +2559,6 @@ HgfsStatToFileAttr(struct stat *stats, // IN: stat information + LOG(4, "%s: done, permissions %o%o%o%o, size %"FMT64"u\n", __FUNCTION__, + attr->specialPerms, attr->ownerPerms, attr->groupPerms, + attr->otherPerms, attr->size); +-#ifdef __FreeBSD__ +-# if !defined(VM_X86_64) && !defined(VM_ARM_64) +-# define FMTTIMET "" +-# else +-# define FMTTIMET "l" +-# endif +-#else +-# define FMTTIMET "l" +-#endif +- LOG(4, "access: %"FMTTIMET"d/%"FMT64"u \nwrite: %"FMTTIMET"d/%"FMT64"u \n" +- "attr: %"FMTTIMET"d/%"FMT64"u\n", +- stats->st_atime, attr->accessTime, stats->st_mtime, attr->writeTime, +- stats->st_ctime, attr->attrChangeTime); +-#undef FMTTIMET + + attr->userId = stats->st_uid; + attr->groupId = stats->st_gid; +-- +2.25.1 + diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0013-open-vm-tools-Correct-include-path-for-poll.h.patch b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0013-open-vm-tools-Correct-include-path-for-poll.h.patch new file mode 100644 index 0000000000..f2f6893db0 --- /dev/null +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0013-open-vm-tools-Correct-include-path-for-poll.h.patch @@ -0,0 +1,37 @@ +From eae0a65a9d6c9df20d05b4208aee23656915480b Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 7 Feb 2022 13:32:32 -0800 +Subject: [PATCH] open-vm-tools: Correct include path for poll.h + +sys/poll.h is deprecated and musl calls it out explicitly. + +Fixes +| In file included from ../../../../git/open-vm-tools/services/plugins/gdp/gdpPlugin.c:35: +| /mnt/b/yoe/master/build/tmp/work/core2-32-yoe-linux-musl/open-vm-tools/11.3.5-r0/recipe-sysroot/usr/include/sys/poll.h:1:2: error: redirecting incorrect #include <sys/poll.h> to <poll.h> [-Werror,-W#warnings] +| #warning redirecting incorrect #include <sys/poll.h> to <poll.h> +| ^ +| 1 error generated. + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + open-vm-tools/services/plugins/gdp/gdpPlugin.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/open-vm-tools/services/plugins/gdp/gdpPlugin.c b/open-vm-tools/services/plugins/gdp/gdpPlugin.c +index 96e6d717b..0b8a583b8 100644 +--- a/open-vm-tools/services/plugins/gdp/gdpPlugin.c ++++ b/open-vm-tools/services/plugins/gdp/gdpPlugin.c +@@ -32,7 +32,7 @@ + #include <sys/types.h> + #include <sys/socket.h> + #include <sys/eventfd.h> +-#include <sys/poll.h> ++#include <poll.h> + #include <unistd.h> + #endif + +-- +2.25.1 + diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0014-timeSync-Portable-way-to-print-64bit-time_t.patch b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0014-timeSync-Portable-way-to-print-64bit-time_t.patch new file mode 100644 index 0000000000..39eea767a0 --- /dev/null +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0014-timeSync-Portable-way-to-print-64bit-time_t.patch @@ -0,0 +1,55 @@ +From 09cc01b2fa15e319afafa13d7365b399a60f443c Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 3 Jan 2023 13:36:01 -0800 +Subject: [PATCH] timeSync: Portable way to print 64bit time_t + +This ensures when 64bit time_t is used on 32bit architectures ( +-D_TIME_BITS=64 ) then it can print it correctly as well. + +Fixes +pllLinux.c:43:20: error: format specifies type 'long' but the argument has type 'long long' [-Werror,-Wformat] +| prefix, tx->offset, tx->freq, tx->maxerror, tx->esterror, +| ^~~~~~~~~~ + +Upstream-Status: Submitted [https://github.com/vmware/open-vm-tools/pull/631] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + open-vm-tools/services/plugins/timeSync/pllLinux.c | 8 ++++---- + open-vm-tools/services/plugins/timeSync/slewLinux.c | 2 +- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/open-vm-tools/services/plugins/timeSync/pllLinux.c b/open-vm-tools/services/plugins/timeSync/pllLinux.c +index e9c8e61de..90ba8c63f 100644 +--- a/open-vm-tools/services/plugins/timeSync/pllLinux.c ++++ b/open-vm-tools/services/plugins/timeSync/pllLinux.c +@@ -38,10 +38,10 @@ + static void + TimeSyncLogPLLState(const char *prefix, struct timex *tx) + { +- g_debug("%s : off %ld freq %ld maxerr %ld esterr %ld status %d " +- "const %ld precision %ld tolerance %ld tick %ld\n", +- prefix, tx->offset, tx->freq, tx->maxerror, tx->esterror, +- tx->status, tx->constant, tx->precision, tx->tolerance, tx->tick); ++ g_debug("%s : off %jd freq %jd maxerr %jd esterr %jd status %d " ++ "const %jd precision %jd tolerance %jd tick %jd\n", ++ prefix, (intmax_t)tx->offset, (intmax_t)tx->freq, (intmax_t)tx->maxerror, (intmax_t)tx->esterror, ++ tx->status, (intmax_t)tx->constant, (intmax_t)tx->precision, (intmax_t)tx->tolerance, (intmax_t)tx->tick); + } + + /* +diff --git a/open-vm-tools/services/plugins/timeSync/slewLinux.c b/open-vm-tools/services/plugins/timeSync/slewLinux.c +index 1ab6e3584..0c304b5d7 100644 +--- a/open-vm-tools/services/plugins/timeSync/slewLinux.c ++++ b/open-vm-tools/services/plugins/timeSync/slewLinux.c +@@ -156,6 +156,6 @@ TimeSync_Slew(int64 delta, + g_debug("adjtimex failed: %s\n", strerror(errno)); + return FALSE; + } +- g_debug("time slew start: %ld\n", tx.tick); ++ g_debug("time slew start: %jd\n", (intmax_t)tx.tick); + return TRUE; + } +-- +2.25.1 + diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/tools.conf b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/tools.conf new file mode 100644 index 0000000000..f6cae70cc5 --- /dev/null +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/tools.conf @@ -0,0 +1,2 @@ +[guestinfo] +disable-perf-mon=1 diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/vmtoolsd.init b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/vmtoolsd.init new file mode 100644 index 0000000000..38280464a7 --- /dev/null +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/vmtoolsd.init @@ -0,0 +1,66 @@ +#!/bin/sh +# +# vmtoolsd Start/stop the vmware tools daemon +# +# chkconfig: 2345 90 60 +# description: vmtoolsd is a daemon that starts up. for some reason, it +# doesn't include a sysv init startup file in the latest release. +# so i have to write this +# + +### BEGIN INIT INFO +# Provides: vmtoolsd +# Required-Start: $local_fs $syslog +# Required-Stop: $local_fs $syslog +# Default-Start: 2345 +# Default-Stop: 90 +# Short-Description: Run vmware tools daemon +### END INIT INFO + +PATH=/sbin:/bin:/usr/sbin:/usr/bin +DAEMON=/usr/bin/vmtoolsd +NAME=vmtoolsd +DESC="vmware tools daemon" +VMTOOLSDARGS=" -b /var/run/vmtoolsd.pid " +RETVAL="1" + +# source function library +. /etc/init.d/functions + +test -f $DAEMON || exit 0 + + +case "$1" in + start) + echo -n "Starting vmware tools daemon: " + start-stop-daemon --start --quiet --exec $DAEMON -- $VMTOOLSDARGS + RETVAL=$? + if [ $RETVAL -eq 0 ] ; then + echo "OK" + else + echo "FAIL" + fi + ;; + stop) + echo -n "Stopping vmware tools daemon: " + start-stop-daemon --stop --quiet --pidfile /var/run/vmtoolsd.pid + RETVAL=$? + if [ $RETVAL -eq 0 ] ; then + echo "OK" + else + echo "FAIL" + fi + ;; + status) + status vmtoolsd + exit $? + ;; + restart) + $0 stop && sleep 1 && $0 start + ;; + *) + echo "Usage: /etc/init.d/vmtoolsd {start|stop|status|restart}" + exit 1 +esac + +exit $RETVAL diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/vmtoolsd.service b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/vmtoolsd.service new file mode 100644 index 0000000000..d30e38055c --- /dev/null +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/vmtoolsd.service @@ -0,0 +1,11 @@ +[Unit] +Description=Open Virtual Machine Tools (VMware Tools) +ConditionVirtualization=vmware + +[Service] +ExecStart=/usr/bin/vmtoolsd +Restart=on-failure +KillSignal=SIGKILL + +[Install] +WantedBy=multi-user.target 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 new file mode 100644 index 0000000000..7e3fe5601f --- /dev/null +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.3.5.bb @@ -0,0 +1,124 @@ +# This recipe is modified from the recipe originally found in the Open-Switch +# repository: +# +# https://github.com/open-switch/ops-build +# yocto/openswitch/meta-foss-openswitch/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.0.5.bb +# Commit 9008de2d8e100f3f868c66765742bca9fa98f3f9 +# +# The recipe packaging has been relicensed under the MIT license for inclusion +# in meta-openembedded by agreement of the author (Diego Dompe). +# + +SUMMARY = "Tools to enhance VMWare guest integration and performance" +HOMEPAGE = "https://github.com/vmware/open-vm-tools" +DESCRIPTION = "\ +open-vm-tools is a set of services and modules that enable several features in VMware products \ +for better management of and seamless user interactions with guests.\ +" +SECTION = "vmware-tools" + +LICENSE = "LGPL-2.0-only & GPL-2.0-only & BSD-2-Clause & CDDL-1.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=559317809c5444fb39ceaf6ac45c43ac" +LICENSE:modules/freebsd/vmblock = "BSD-2-Clause" +LICENSE:modules/freebsd/vmmemctl = "GPL-2.0-only" +LICENSE:modules/freebsd/vmxnet = "GPL-2.0-only" +LICENSE:modules/linux = "GPL-2.0-only" +LICENSE:modules/solaris = "CDDL-1.0" + +SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https;branch=stable-12.3.x \ + file://tools.conf \ + file://vmtoolsd.service \ + file://vmtoolsd.init \ + file://0001-configure.ac-don-t-use-dnet-config.patch;patchdir=.. \ + file://0002-Use-configure-test-for-struct-timespec.patch;patchdir=.. \ + file://0003-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch;patchdir=.. \ + file://0004-Use-configure-to-test-for-feature-instead-of-platfor.patch;patchdir=.. \ + file://0005-Use-configure-test-for-sys-stat.h-include.patch;patchdir=.. \ + file://0006-Fix-subdir-objects-configure-error.patch;patchdir=.. \ + file://0007-include-poll.h-instead-of-sys-poll.h.patch;patchdir=.. \ + file://0008-Rename-poll.h-to-vm_poll.h.patch;patchdir=.. \ + file://0009-use-posix-strerror_r-unless-on-gnu-libc-system.patch;patchdir=.. \ + file://0010-Use-uintmax_t-for-handling-rlim_t.patch;patchdir=.. \ + file://0011-Use-off64_t-instead-of-__off64_t.patch;patchdir=.. \ + file://0012-hgfsServerLinux-Consider-64bit-time_t-possibility.patch;patchdir=.. \ + file://0013-open-vm-tools-Correct-include-path-for-poll.h.patch;patchdir=.. \ + file://0014-timeSync-Portable-way-to-print-64bit-time_t.patch;patchdir=.. \ + " + +UPSTREAM_CHECK_GITTAGREGEX = "stable-(?P<pver>\d+(\.\d+)+)" + +SRC_URI:append:libc-musl = " file://0001-Add-resolv_compat.h-for-musl-builds.patch;patchdir=.. \ +" + +SRCREV = "1b362b9eb449fb5de3809aaea4a636ece30ee5b7" + +S = "${WORKDIR}/git/open-vm-tools" + +DEPENDS = "glib-2.0 glib-2.0-native util-linux libdnet procps libtirpc" + +# open-vm-tools is supported only on x86. +COMPATIBLE_HOST = '(x86_64.*|i.86.*)-linux' + +inherit autotools pkgconfig systemd update-rc.d + +SYSTEMD_SERVICE:${PN} = "vmtoolsd.service" + +EXTRA_OECONF = "--without-icu --disable-multimon --disable-docs \ + --disable-tests --without-gtkmm --without-xerces --without-pam \ + --disable-vgauth --disable-deploypkg --disable-containerinfo \ + --without-root-privileges --without-kernel-modules --with-tirpc \ + --with-udev-rules-dir=${nonarch_base_libdir}/udev/rules.d" + +NO_X11_FLAGS = "--without-x --without-gtk2 --without-gtk3" +X11_DEPENDS = "libxext libxi libxrender libxrandr libxtst gtk+ gdk-pixbuf" +PACKAGECONFIG[x11] = ",${NO_X11_FLAGS},${X11_DEPENDS}" + +# fuse gets implicitly detected; there is no --without-fuse option. +PACKAGECONFIG[fuse] = ",,fuse" + +CFLAGS:append:toolchain-clang = " -Wno-address-of-packed-member -Wno-error=unused-function" +FILES:${PN} += "\ + ${libdir}/open-vm-tools/plugins/vmsvc/lib*.so \ + ${libdir}/open-vm-tools/plugins/common/lib*.so \ + ${sysconfdir}/vmware-tools/tools.conf \ +" +FILES:${PN}-locale += "${datadir}/open-vm-tools/messages" +FILES:${PN}-dev += "${libdir}/open-vm-tools/plugins/common/lib*.la" + +CONFFILES:${PN} += "${sysconfdir}/vmware-tools/tools.conf" + +RDEPENDS:${PN} = "util-linux libdnet fuse" + +do_install:append() { + if ! ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','true','false',d)}; then + install -d ${D}/sbin + ln -sf ${sbindir}/mount.vmhgfs ${D}/sbin/mount.vmhgfs + fi + install -d ${D}${sysconfdir}/vmware-tools + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${systemd_unitdir}/system + install -m 644 ${UNPACKDIR}/*.service ${D}${systemd_unitdir}/system + else + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${UNPACKDIR}/vmtoolsd.init ${D}${sysconfdir}/init.d/vmtoolsd + fi + install -m 0644 ${UNPACKDIR}/tools.conf ${D}${sysconfdir}/vmware-tools/tools.conf +} + +do_configure:prepend() { + export CUSTOM_DNET_NAME=dnet + export CUSTOM_DNET_LIBS=-L${STAGING_LIBDIR}/libdnet.so +} + +INITSCRIPT_PACKAGES = "${PN}" +INITSCRIPT_NAME:${PN} = "vmtoolsd" +INITSCRIPT_PARAMS:${PN} = "start 90 2 3 4 5 . stop 60 0 1 6 ." + +python() { + if 'filesystems-layer' not in d.getVar('BBFILE_COLLECTIONS').split(): + raise bb.parse.SkipRecipe('Requires meta-filesystems to be present to provide fuse.') +} + +CVE_PRODUCT = "open-vm-tools vmware:tools" +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" +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/files/0001-lanserv-Rename-struct-parameter-printf-for-namespace.patch b/meta-networking/recipes-support/openipmi/files/0001-lanserv-Rename-struct-parameter-printf-for-namespace.patch deleted file mode 100644 index 25057fbce5..0000000000 --- a/meta-networking/recipes-support/openipmi/files/0001-lanserv-Rename-struct-parameter-printf-for-namespace.patch +++ /dev/null @@ -1,618 +0,0 @@ -From 8b51a6bf5a4829d8add535a098c0c06a049a9958 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 26 Aug 2017 22:50:57 -0700 -Subject: [PATCH] lanserv: Rename struct parameter printf for namespace - collision - -This comes to fore when we use hardening flags where printf -is treated as macro and gets replaced with printf_chk - -Fixes errors like - -error: no member named '__printf_chk' in 'struct emu_out_s' - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - lanserv/OpenIPMI/serv.h | 2 +- - lanserv/emu_cmd.c | 132 ++++++++++++++++++++++++------------------------ - lanserv/ipmi_sim.c | 10 ++-- - 3 files changed, 72 insertions(+), 72 deletions(-) - -diff --git a/lanserv/OpenIPMI/serv.h b/lanserv/OpenIPMI/serv.h -index d12d63a..8555c85 100644 ---- a/lanserv/OpenIPMI/serv.h -+++ b/lanserv/OpenIPMI/serv.h -@@ -522,7 +522,7 @@ uint8_t ipmb_checksum(uint8_t *data, int size, uint8_t start); - typedef struct emu_data_s emu_data_t; - typedef struct emu_out_s - { -- void (*printf)(struct emu_out_s *out, char *format, ...); -+ void (*eprintf)(struct emu_out_s *out, char *format, ...); - void *data; - } emu_out_t; - -diff --git a/lanserv/emu_cmd.c b/lanserv/emu_cmd.c -index ca44032..54b6f7b 100644 ---- a/lanserv/emu_cmd.c -+++ b/lanserv/emu_cmd.c -@@ -76,7 +76,7 @@ emu_get_uchar(emu_out_t *out, char **toks, unsigned char *val, char *errstr, - if (empty_ok) - return ENOSPC; - if (errstr) -- out->printf(out, "**No %s given\n", errstr); -+ out->eprintf(out, "**No %s given\n", errstr); - return EINVAL; - } - if (str[0] == '\'') { -@@ -86,7 +86,7 @@ emu_get_uchar(emu_out_t *out, char **toks, unsigned char *val, char *errstr, - *val = strtoul(str, &tmpstr, 0); - if (*tmpstr != '\0') { - if (errstr) -- out->printf(out, "**Invalid %s given\n", errstr); -+ out->eprintf(out, "**Invalid %s given\n", errstr); - return EINVAL; - } - -@@ -108,7 +108,7 @@ emu_get_uchar_with_vals(emu_out_t *out, char **toks, - if (empty_ok) - return ENOSPC; - if (errstr) -- out->printf(out, "**No %s given\n", errstr); -+ out->eprintf(out, "**No %s given\n", errstr); - return EINVAL; - } - if (str[0] == '\'') { -@@ -131,7 +131,7 @@ emu_get_uchar_with_vals(emu_out_t *out, char **toks, - *val = strtoul(str, &tmpstr, 0); - if (*tmpstr != '\0') { - if (errstr) -- out->printf(out, "**Invalid %s given\n", errstr); -+ out->eprintf(out, "**Invalid %s given\n", errstr); - return EINVAL; - } - out: -@@ -150,12 +150,12 @@ emu_get_bitmask(emu_out_t *out, char **toks, uint16_t *val, char *errstr, - if (empty_ok) - return ENOSPC; - if (errstr) -- out->printf(out, "**No %s given\n", errstr); -+ out->eprintf(out, "**No %s given\n", errstr); - return EINVAL; - } - if (strlen(str) != size) { - if (errstr) -- out->printf(out, "**invalid number of bits in %s\n", errstr); -+ out->eprintf(out, "**invalid number of bits in %s\n", errstr); - return EINVAL; - } - *val = 0; -@@ -166,7 +166,7 @@ emu_get_bitmask(emu_out_t *out, char **toks, uint16_t *val, char *errstr, - *val |= 1 << i; - } else { - if (errstr) -- out->printf(out, "**Invalid bit value '%c' in %s\n", str[j], -+ out->eprintf(out, "**Invalid bit value '%c' in %s\n", str[j], - errstr); - return EINVAL; - } -@@ -184,13 +184,13 @@ emu_get_uint(emu_out_t *out, char **toks, unsigned int *val, char *errstr) - str = mystrtok(NULL, " \t\n", toks); - if (!str) { - if (errstr) -- out->printf(out, "**No %s given\n", errstr); -+ out->eprintf(out, "**No %s given\n", errstr); - return EINVAL; - } - *val = strtoul(str, &tmpstr, 0); - if (*tmpstr != '\0') { - if (errstr) -- out->printf(out, "**Invalid %s given\n", errstr); -+ out->eprintf(out, "**Invalid %s given\n", errstr); - return EINVAL; - } - -@@ -206,7 +206,7 @@ emu_get_bytes(emu_out_t *out, char **tokptr, unsigned char *data, char *errstr, - - if (!tok) { - if (errstr) -- out->printf(out, "**No %s given\n", errstr); -+ out->eprintf(out, "**No %s given\n", errstr); - return EINVAL; - } - if (*tok == '"') { -@@ -215,7 +215,7 @@ emu_get_bytes(emu_out_t *out, char **tokptr, unsigned char *data, char *errstr, - tok++; - end = strlen(tok) - 1; - if (tok[end] != '"') { -- out->printf(out, "**ASCII %s doesn't end in '\"'", errstr); -+ out->eprintf(out, "**ASCII %s doesn't end in '\"'", errstr); - return EINVAL; - } - if (end > (len - 1)) -@@ -228,7 +228,7 @@ emu_get_bytes(emu_out_t *out, char **tokptr, unsigned char *data, char *errstr, - char c[3]; - /* HEX pw */ - if (strlen(tok) != 32) { -- out->printf(out, "**HEX %s not 32 HEX characters long", errstr); -+ out->eprintf(out, "**HEX %s not 32 HEX characters long", errstr); - return EINVAL; - } - c[2] = '\0'; -@@ -239,7 +239,7 @@ emu_get_bytes(emu_out_t *out, char **tokptr, unsigned char *data, char *errstr, - tok++; - data[i] = strtoul(c, &end, 16); - if (*end != '\0') { -- out->printf(out, "**Invalid HEX character in %s", errstr); -+ out->eprintf(out, "**Invalid HEX character in %s", errstr); - return -1; - } - } -@@ -263,12 +263,12 @@ read_command_file(emu_out_t *out, emu_data_t *emu, const char *command_file) - - buffer = malloc(INPUT_BUFFER_SIZE); - if (!buffer) { -- out->printf(out, "Could not allocate buffer memory\n"); -+ out->eprintf(out, "Could not allocate buffer memory\n"); - rv = ENOMEM; - goto out; - } - while (fgets(buffer+pos, INPUT_BUFFER_SIZE-pos, f)) { -- out->printf(out, "%s", buffer+pos); -+ out->eprintf(out, "%s", buffer+pos); - if (buffer[pos] == '#') - continue; - pos = strlen(buffer); -@@ -318,7 +318,7 @@ sel_enable(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks) - - rv = ipmi_mc_enable_sel(mc, max_records, flags); - if (rv) -- out->printf(out, "**Unable to enable sel, error 0x%x\n", rv); -+ out->eprintf(out, "**Unable to enable sel, error 0x%x\n", rv); - return rv; - } - -@@ -343,9 +343,9 @@ sel_add(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks) - - rv = ipmi_mc_add_to_sel(mc, record_type, data, &r); - if (rv) -- out->printf(out, "**Unable to add to sel, error 0x%x\n", rv); -+ out->eprintf(out, "**Unable to add to sel, error 0x%x\n", rv); - else -- out->printf(out, "Added record %d\n", r); -+ out->eprintf(out, "Added record %d\n", r); - return rv; - } - -@@ -361,14 +361,14 @@ main_sdr_add(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks) - if (rv == ENOSPC) - break; - if (rv) { -- out->printf(out, "**Error 0x%x in data byte %d\n", rv, i); -+ out->eprintf(out, "**Error 0x%x in data byte %d\n", rv, i); - return rv; - } - } - - rv = ipmi_mc_add_main_sdr(mc, data, i); - if (rv) -- out->printf(out, "**Unable to add to sdr, error 0x%x\n", rv); -+ out->eprintf(out, "**Unable to add to sdr, error 0x%x\n", rv); - return rv; - } - -@@ -389,14 +389,14 @@ device_sdr_add(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks) - if (rv == ENOSPC) - break; - if (rv) { -- out->printf(out, "**Error 0x%x in data byte %d\n", rv, i); -+ out->eprintf(out, "**Error 0x%x in data byte %d\n", rv, i); - return rv; - } - } - - rv = ipmi_mc_add_device_sdr(mc, lun, data, i); - if (rv) -- out->printf(out, "**Unable to add to sdr, error 0x%x\n", rv); -+ out->eprintf(out, "**Unable to add to sdr, error 0x%x\n", rv); - return rv; - } - -@@ -439,7 +439,7 @@ sensor_add(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks) - while (tok) { - if (strcmp(tok, "poll") == 0) { - if (handler) { -- out->printf(out, "**poll given twice in sensor\n", tok); -+ out->eprintf(out, "**poll given twice in sensor\n", tok); - return -1; - } - -@@ -449,27 +449,27 @@ sensor_add(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks) - - tok = mystrtok(NULL, " \t\n", toks); - if (!tok) { -- out->printf(out, "**No polled sensor handler given\n", tok); -+ out->eprintf(out, "**No polled sensor handler given\n", tok); - return -1; - } - - handler = ipmi_sensor_find_handler(tok); - if (!handler) { -- out->printf(out, "**Invalid sensor handler: %s\n", tok); -+ out->eprintf(out, "**Invalid sensor handler: %s\n", tok); - return -1; - } - - rv = handler->init(mc, lun, num, toks, handler->cb_data, &rcb_data, - &errstr); - if (rv) { -- out->printf(out, "**Error initializing sensor handler: %s\n", -+ out->eprintf(out, "**Error initializing sensor handler: %s\n", - errstr); - return rv; - } - } else if (strcmp(tok, "event-only") == 0) { - event_only = 1; - } else { -- out->printf(out, "**Unknown sensor option: %s\n", tok); -+ out->eprintf(out, "**Unknown sensor option: %s\n", tok); - return -1; - } - -@@ -477,7 +477,7 @@ sensor_add(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks) - } - - if (handler && event_only) { -- out->printf(out, "**An event-only sensor cannot be polled\n"); -+ out->eprintf(out, "**An event-only sensor cannot be polled\n"); - return -1; - } - -@@ -488,7 +488,7 @@ sensor_add(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks) - if (!rv && handler->postinit) { - rv = handler->postinit(rcb_data, &errstr); - if (rv) { -- out->printf(out, "**Error in sensor handler postinit: %s\n", -+ out->eprintf(out, "**Error in sensor handler postinit: %s\n", - errstr); - } - } -@@ -496,7 +496,7 @@ sensor_add(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks) - rv = ipmi_mc_add_sensor(mc, lun, num, type, code, event_only); - } - if (rv) -- out->printf(out, "**Unable to add to sensor, error 0x%x\n", rv); -+ out->eprintf(out, "**Unable to add to sensor, error 0x%x\n", rv); - return rv; - } - -@@ -532,7 +532,7 @@ sensor_set_bit(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks) - - rv = ipmi_mc_sensor_set_bit(mc, lun, num, bit, value, gen_event); - if (rv) -- out->printf(out, "**Unable to set sensor bit, error 0x%x\n", rv); -+ out->eprintf(out, "**Unable to set sensor bit, error 0x%x\n", rv); - return rv; - } - -@@ -563,7 +563,7 @@ sensor_set_bit_clr_rest(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char ** - - rv = ipmi_mc_sensor_set_bit_clr_rest(mc, lun, num, bit, gen_event); - if (rv) -- out->printf(out, "**Unable to set sensor bit, error 0x%x\n", rv); -+ out->eprintf(out, "**Unable to set sensor bit, error 0x%x\n", rv); - return rv; - } - -@@ -594,7 +594,7 @@ sensor_set_value(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks) - - rv = ipmi_mc_sensor_set_value(mc, lun, num, value, gen_event); - if (rv) -- out->printf(out, "**Unable to set sensor value, error 0x%x\n", rv); -+ out->eprintf(out, "**Unable to set sensor value, error 0x%x\n", rv); - return rv; - } - -@@ -637,7 +637,7 @@ sensor_set_hysteresis(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **to - rv = ipmi_mc_sensor_set_hysteresis(mc, lun, num, support, positive, - negative); - if (rv) -- out->printf(out, "**Unable to set sensor hysteresis, error 0x%x\n", rv); -+ out->eprintf(out, "**Unable to set sensor hysteresis, error 0x%x\n", rv); - return rv; - } - -@@ -682,7 +682,7 @@ sensor_set_threshold(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **tok - rv = ipmi_mc_sensor_set_threshold(mc, lun, num, support, - enabled, 1, thresholds); - if (rv) -- out->printf(out, "**Unable to set sensor thresholds, error 0x%x\n", rv); -+ out->eprintf(out, "**Unable to set sensor thresholds, error 0x%x\n", rv); - return rv; - } - -@@ -759,7 +759,7 @@ sensor_set_event_support(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char * - assert_support, deassert_support, - assert_enabled, deassert_enabled); - if (rv) -- out->printf(out, "**Unable to set sensor thresholds, error 0x%x\n", rv); -+ out->eprintf(out, "**Unable to set sensor thresholds, error 0x%x\n", rv); - return rv; - } - -@@ -819,7 +819,7 @@ mc_add(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks) - else if (strcmp("persist_sdr", tok) == 0) - flags |= IPMI_MC_PERSIST_SDR; - else { -- out->printf(out, "**Invalid MC flag: %s\n", tok); -+ out->eprintf(out, "**Invalid MC flag: %s\n", tok); - return -1; - } - } -@@ -833,7 +833,7 @@ mc_add(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks) - device_revision, major_fw_rev, minor_fw_rev, - device_support, mfg_id, product_id, flags); - if (rv) -- out->printf(out, "**Unable to add the MC, error 0x%x\n", rv); -+ out->eprintf(out, "**Unable to add the MC, error 0x%x\n", rv); - return rv; - } - -@@ -890,7 +890,7 @@ mc_set_power(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks) - - rv = ipmi_mc_set_power(mc, power, gen_int); - if (rv) -- out->printf(out, "**Unable to set power, error 0x%x\n", rv); -+ out->eprintf(out, "**Unable to set power, error 0x%x\n", rv); - return rv; - } - -@@ -916,7 +916,7 @@ mc_add_fru_data(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks) - - tok = mystrtok(NULL, " \t\n", toks); - if (!tok) { -- out->printf(out, "**No FRU data type given"); -+ out->eprintf(out, "**No FRU data type given"); - return -1; - } - if (strcmp(tok, "file") == 0) { -@@ -929,13 +929,13 @@ mc_add_fru_data(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks) - - rv = get_delim_str(toks, &frufn, &errstr); - if (rv) { -- out->printf(out, "**Error with FRU filename: %d", strerror(rv)); -+ out->eprintf(out, "**Error with FRU filename: %d", strerror(rv)); - return rv; - } - rv = ipmi_mc_add_fru_file(mc, devid, length, file_offset, - (void *) frufn); - if (rv) -- out->printf(out, "**Unable to add FRU file, error 0x%x\n", rv); -+ out->eprintf(out, "**Unable to add FRU file, error 0x%x\n", rv); - - } else if (strcmp(tok, "data") == 0) { - for (i=0; i<length; i++) { -@@ -943,14 +943,14 @@ mc_add_fru_data(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks) - if (rv == ENOSPC) - break; - if (rv) { -- out->printf(out, "**Error 0x%x in data byte %d\n", rv, i); -+ out->eprintf(out, "**Error 0x%x in data byte %d\n", rv, i); - return rv; - } - } - - rv = emu_get_uchar(out, toks, &data[i], "data byte", 1); - if (rv != ENOSPC) { -- out->printf(out, "**Error: input data too long for FRU\n", rv, i); -+ out->eprintf(out, "**Error: input data too long for FRU\n", rv, i); - return EINVAL; - } - -@@ -958,9 +958,9 @@ mc_add_fru_data(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks) - - rv = ipmi_mc_add_fru_data(mc, devid, length, NULL, data); - if (rv) -- out->printf(out, "**Unable to add FRU data, error 0x%x\n", rv); -+ out->eprintf(out, "**Unable to add FRU data, error 0x%x\n", rv); - } else { -- out->printf(out, "**FRU type not given, need file or data\n"); -+ out->eprintf(out, "**FRU type not given, need file or data\n"); - rv = EINVAL; - } - return rv; -@@ -981,28 +981,28 @@ mc_dump_fru_data(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks) - - rv = ipmi_mc_get_fru_data_len(mc, devid, &length); - if (rv) { -- out->printf(out, "**Unable to dump FRU data, error 0x%x\n", rv); -+ out->eprintf(out, "**Unable to dump FRU data, error 0x%x\n", rv); - goto out; - } - - data = malloc(length); - if (!data) { -- out->printf(out, "**Unable to dump FRU data, out of memory\n", rv); -+ out->eprintf(out, "**Unable to dump FRU data, out of memory\n", rv); - goto out; - } - - rv = ipmi_mc_get_fru_data(mc, devid, length, data); - if (rv) { -- out->printf(out, "**Unable to dump FRU data, error 0x%x\n", rv); -+ out->eprintf(out, "**Unable to dump FRU data, error 0x%x\n", rv); - goto out; - } - - for (i=0; i<length; i++) { - if ((i > 0) && ((i % 8) == 0)) -- out->printf(out, "\n"); -- out->printf(out, " 0x%2.2x", data[i]); -+ out->eprintf(out, "\n"); -+ out->eprintf(out, " 0x%2.2x", data[i]); - } -- out->printf(out, "\n"); -+ out->eprintf(out, "\n"); - - out: - if (data) -@@ -1021,7 +1021,7 @@ mc_setbmc(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks) - return rv; - rv = ipmi_emu_set_bmc_mc(emu, ipmb); - if (rv) -- out->printf(out, "**Invalid IPMB address\n"); -+ out->eprintf(out, "**Invalid IPMB address\n"); - return rv; - } - -@@ -1032,7 +1032,7 @@ atca_enable(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks) - - rv = ipmi_emu_atca_enable(emu); - if (rv) -- out->printf(out, "**Unable to enable ATCA mode, error 0x%x\n", rv); -+ out->eprintf(out, "**Unable to enable ATCA mode, error 0x%x\n", rv); - return rv; - } - -@@ -1056,7 +1056,7 @@ atca_set_site(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks) - - rv = ipmi_emu_atca_set_site(emu, hw_address, site_type, site_number); - if (rv) -- out->printf(out, "**Unable to set site type, error 0x%x\n", rv); -+ out->eprintf(out, "**Unable to set site type, error 0x%x\n", rv); - return rv; - } - -@@ -1072,7 +1072,7 @@ mc_set_num_leds(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks) - - rv = ipmi_mc_set_num_leds(mc, count); - if (rv) -- out->printf(out, "**Unable to set number of LEDs, error 0x%x\n", rv); -+ out->eprintf(out, "**Unable to set number of LEDs, error 0x%x\n", rv); - return rv; - } - -@@ -1085,7 +1085,7 @@ read_cmds(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks) - - err = get_delim_str(toks, &filename, &errstr); - if (err) { -- out->printf(out, "Could not get include filename: %s\n", errstr); -+ out->eprintf(out, "Could not get include filename: %s\n", errstr); - return err; - } - -@@ -1097,7 +1097,7 @@ read_cmds(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks) - { - char *nf = malloc(strlen(BASE_CONF_STR) + strlen(filename) + 2); - if (!nf) { -- out->printf(out, "Out of memory in include\n", errstr); -+ out->eprintf(out, "Out of memory in include\n", errstr); - goto out_err; - } - strcpy(nf, BASE_CONF_STR); -@@ -1107,7 +1107,7 @@ read_cmds(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks) - filename = nf; - err = read_command_file(out, emu, filename); - if (err) { -- out->printf(out, "Could not read include file %s\n", filename); -+ out->eprintf(out, "Could not read include file %s\n", filename); - } - } - -@@ -1147,7 +1147,7 @@ debug_cmd(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks) - } else if (strcmp(tok, "sol") == 0) { - level |= DEBUG_SOL; - } else { -- out->printf(out, "Invalid debug level '%s', options are 'raw' and 'msg'\n", -+ out->eprintf(out, "Invalid debug level '%s', options are 'raw' and 'msg'\n", - tok); - return EINVAL; - } -@@ -1168,7 +1168,7 @@ persist_cmd(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks) - } else if (strcmp(tok, "off") == 0) { - persist_enable = 0; - } else { -- out->printf(out, "Invalid persist vale '%s', options are 'on' and 'off'\n", -+ out->eprintf(out, "Invalid persist vale '%s', options are 'on' and 'off'\n", - tok); - return EINVAL; - } -@@ -1194,18 +1194,18 @@ do_define(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks) - - name = mystrtok(NULL, " \t\n", toks); - if (!name) { -- out->printf(out, "No variable name given for define\n"); -+ out->eprintf(out, "No variable name given for define\n"); - return EINVAL; - } - err = get_delim_str(toks, &value, &errstr); - if (err) { -- out->printf(out, "Could not get variable %s value: %s\n", name, errstr); -+ out->eprintf(out, "Could not get variable %s value: %s\n", name, errstr); - return err; - } - err = add_variable(name, value); - if (err) { - free(value); -- out->printf(out, "Out of memory setting variable %s\n", name); -+ out->eprintf(out, "Out of memory setting variable %s\n", name); - return err; - } - return 0; -@@ -1301,7 +1301,7 @@ ipmi_emu_cmd(emu_out_t *out, emu_data_t *emu, char *cmd_str) - return rv; - rv = ipmi_emu_get_mc_by_addr(emu, ipmb, &mc); - if (rv) { -- out->printf(out, "**Invalid MC address\n"); -+ out->eprintf(out, "**Invalid MC address\n"); - return rv; - } - } -@@ -1312,7 +1312,7 @@ ipmi_emu_cmd(emu_out_t *out, emu_data_t *emu, char *cmd_str) - } - } - -- out->printf(out, "**Unknown command: %s\n", cmd); -+ out->eprintf(out, "**Unknown command: %s\n", cmd); - - out: - return rv; -diff --git a/lanserv/ipmi_sim.c b/lanserv/ipmi_sim.c -index 9472cce..30c4f27 100644 ---- a/lanserv/ipmi_sim.c -+++ b/lanserv/ipmi_sim.c -@@ -607,8 +607,8 @@ isim_log(sys_data_t *sys, int logtype, msg_t *msg, const char *format, - - con = data->consoles; - while (con) { -- con->out.printf(&con->out, "%s", str); -- con->out.printf(&con->out, "\n"); -+ con->out.eprintf(&con->out, "%s", str); -+ con->out.eprintf(&con->out, "\n"); - con = con->next; - } - #if HAVE_SYSLOG -@@ -956,7 +956,7 @@ console_bind_ready(int fd, void *cb_data, os_hnd_fd_id_t *id) - newcon->shutdown_on_close = 0; - newcon->telnet = 1; - newcon->tn_pos = 0; -- newcon->out.printf = emu_printf; -+ newcon->out.eprintf = emu_printf; - newcon->out.data = newcon; - - setsockopt(rv, IPPROTO_TCP, TCP_NODELAY, (char *)&val, sizeof(val)); -@@ -1463,10 +1463,10 @@ main(int argc, const char *argv[]) - stdio_console.telnet = 0; - stdio_console.tn_pos = 0; - if (nostdio) { -- stdio_console.out.printf = dummy_printf; -+ stdio_console.out.eprintf = dummy_printf; - stdio_console.out.data = &stdio_console; - } else { -- stdio_console.out.printf = emu_printf; -+ stdio_console.out.eprintf = emu_printf; - stdio_console.out.data = &stdio_console; - } - stdio_console.next = NULL; --- -2.14.1 - diff --git a/meta-networking/recipes-support/openipmi/files/do-not-install-pyc-and-pyo.patch b/meta-networking/recipes-support/openipmi/files/do-not-install-pyc-and-pyo.patch deleted file mode 100644 index d4e02be450..0000000000 --- a/meta-networking/recipes-support/openipmi/files/do-not-install-pyc-and-pyo.patch +++ /dev/null @@ -1,25 +0,0 @@ -Do not install pyc and pyo for python module - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Yi Zhao <yi.zhao@windriver.com> ---- - swig/python/Makefile.am | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/swig/python/Makefile.am b/swig/python/Makefile.am -index da95a81..97a62bf 100644 ---- a/swig/python/Makefile.am -+++ b/swig/python/Makefile.am -@@ -33,8 +33,6 @@ CLEANFILES = OpenIPMI_wrap.c OpenIPMI.py OpenIPMI.pyo OpenIPMI.pyc - install-exec-local: _OpenIPMI.la OpenIPMI.py OpenIPMI.pyc OpenIPMI.pyo - $(INSTALL) -d $(DESTDIR)$(PYTHON_INSTALL_DIR) - $(INSTALL_DATA) OpenIPMI.py "$(DESTDIR)$(PYTHON_INSTALL_DIR)" -- $(INSTALL_DATA) OpenIPMI.pyc "$(DESTDIR)$(PYTHON_INSTALL_DIR)" -- $(INSTALL_DATA) OpenIPMI.pyo "$(DESTDIR)$(PYTHON_INSTALL_DIR)" - if test "x$(PYTHON_GUI_DIR)" = "xopenipmigui"; then \ - $(INSTALL) -d $(DESTDIR)$(bindir); \ - $(INSTALL_SCRIPT) $(srcdir)/openipmigui.py "$(DESTDIR)$(bindir)/openipmigui";\ --- -1.9.1 - diff --git a/meta-networking/recipes-support/openipmi/files/fix-symlink-install-error-in-cmdlang.patch b/meta-networking/recipes-support/openipmi/files/fix-symlink-install-error-in-cmdlang.patch index 9a568b2b22..5bbccdcbf6 100644 --- a/meta-networking/recipes-support/openipmi/files/fix-symlink-install-error-in-cmdlang.patch +++ b/meta-networking/recipes-support/openipmi/files/fix-symlink-install-error-in-cmdlang.patch @@ -1,20 +1,26 @@ -Author: Aws Ismail <aws.ismail@windriver.com> -Date: Thu Jun 7 16:00:13 2012 -0400 +From 0ccfefe624e25f937b27b2caf3671e80c2c29391 Mon Sep 17 00:00:00 2001 +From: Aws Ismail <aws.ismail@windriver.com> +Date: Thu, 7 Jun 2012 16:00:13 -0400 +Subject: [PATCH] Fix symlink install error in cmdlang - This patch fixes the error during the install stage when - creating a symbolic link for opeipmish in openipmi/cmdlang - - Upstream-Status: Pending - - Signed-off-by: Aws Ismail <aws.ismail@windriver.com> +This patch fixes the error during the install stage when +creating a symbolic link for opeipmish in openipmi/cmdlang + +Upstream-Status: Pending + +Signed-off-by: Aws Ismail <aws.ismail@windriver.com> + +--- + cmdlang/Makefile.am | 1 + + 1 file changed, 1 insertion(+) diff --git a/cmdlang/Makefile.am b/cmdlang/Makefile.am -index 92d6e83..f6039f9 100644 +index 7235446..4a81ae3 100644 --- a/cmdlang/Makefile.am +++ b/cmdlang/Makefile.am -@@ -36,6 +36,7 @@ CLEANFILES = libOpenIPMIcmdlang.map +@@ -41,6 +41,7 @@ openipmish_CFLAGS = -Wall -Wsign-compare -I$(top_builddir)/include \ # compatability. - install-data-local: + install-exec-hook: rm -f $(DESTDIR)$(bindir)/ipmish + mkdir -p $(DESTDIR)$(bindir)/ $(LN_S) openipmish $(DESTDIR)$(bindir)/ipmish diff --git a/meta-networking/recipes-support/openipmi/files/include_sys_types.patch b/meta-networking/recipes-support/openipmi/files/include_sys_types.patch index 58ec5d8834..18129e6fcb 100644 --- a/meta-networking/recipes-support/openipmi/files/include_sys_types.patch +++ b/meta-networking/recipes-support/openipmi/files/include_sys_types.patch @@ -1,12 +1,26 @@ +From d667aedc37aeabdb9f8574ee0b9cf85b844ca2d2 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 2 Jun 2017 21:58:32 -0700 +Subject: [PATCH] openipmi: Fix build with musl + include sys/types.h for u_int32_t ui.c:340:5: error: unknown type name 'u_int32_t'; did you mean 'uint32_t'? u_int32_t addr; ^~~~~~~~~ -Index: OpenIPMI-2.0.22/ui/ui.c -=================================================================== ---- OpenIPMI-2.0.22.orig/ui/ui.c -+++ OpenIPMI-2.0.22/ui/ui.c + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- + ui/ui.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/ui/ui.c b/ui/ui.c +index 9c6a51f..34f7e34 100644 +--- a/ui/ui.c ++++ b/ui/ui.c @@ -42,6 +42,7 @@ #include <fcntl.h> #include <time.h> @@ -14,4 +28,4 @@ Index: OpenIPMI-2.0.22/ui/ui.c +#include <sys/types.h> #include <ctype.h> - #include <OpenIPMI/selector.h> + #include <OpenIPMI/ipmi_err.h> diff --git a/meta-networking/recipes-support/openipmi/files/ipmi-init-fix-the-arguments.patch b/meta-networking/recipes-support/openipmi/files/ipmi-init-fix-the-arguments.patch index 51a398ba53..d9ee5cc28f 100644 --- a/meta-networking/recipes-support/openipmi/files/ipmi-init-fix-the-arguments.patch +++ b/meta-networking/recipes-support/openipmi/files/ipmi-init-fix-the-arguments.patch @@ -1,3 +1,6 @@ +From 7d9f6526dbcd46130d279c363d38781969807f74 Mon Sep 17 00:00:00 2001 +From: Jackie Huang <jackie.huang@windriver.com> +Date: Mon, 29 Dec 2014 18:16:04 +0800 Subject: [PATCH] ipmi-init: fix the arguments The functions success/failure/warning defined in /etc/init.d/functions @@ -7,12 +10,13 @@ not a string. Upstream-Status: Inappropriate [OE specific] Signed-off-by: Jackie Huang <jackie.huang@windriver.com> + --- ipmi.init | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ipmi.init b/ipmi.init -index 2ebcd94..d8161c5 100644 +index bd80f0d..53305bb 100644 --- a/ipmi.init +++ b/ipmi.init @@ -45,17 +45,17 @@ elif [ -r /etc/init.d/functions ]; then @@ -36,6 +40,3 @@ index 2ebcd94..d8161c5 100644 echo ;; *) --- -1.9.1 - diff --git a/meta-networking/recipes-support/openipmi/files/openipmi-helper b/meta-networking/recipes-support/openipmi/files/openipmi-helper index 4cebfb9c6a..4cebfb9c6a 100755..100644 --- a/meta-networking/recipes-support/openipmi/files/openipmi-helper +++ b/meta-networking/recipes-support/openipmi/files/openipmi-helper diff --git a/meta-networking/recipes-support/openipmi/files/openipmi-no-openipmigui-man.patch b/meta-networking/recipes-support/openipmi/files/openipmi-no-openipmigui-man.patch index 1fa68f9bac..f14626a38d 100644 --- a/meta-networking/recipes-support/openipmi/files/openipmi-no-openipmigui-man.patch +++ b/meta-networking/recipes-support/openipmi/files/openipmi-no-openipmigui-man.patch @@ -1,16 +1,20 @@ -Author: Aws Ismail <aws.ismail@windriver.com> -Date: Thu Jun 7 12:28:34 2012 -0400 +From c76e727433ed895c605f9e7a3612bbc16ff558de Mon Sep 17 00:00:00 2001 +From: Aws Ismail <aws.ismail@windriver.com> +Date: Thu, 7 Jun 2012 12:28:34 -0400 +Subject: [PATCH] Do not build openipmigui man page - This patch was carried over from WRL4.3 (openipmi v2.0.16) - - It was updated for openipmi v2.0.19 - - Disable making openipmigui man page since we don't need it - - Upstream-Status: Pending - - Signed-off-by: Aws Ismail <aws.ismail@windriver.com> - Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +This patch was carried over from WRL4.3 (openipmi v2.0.16) +It was updated for openipmi v2.0.19 +Disable making openipmigui man page since we don't need it + +Upstream-Status: Pending + +Signed-off-by: Aws Ismail <aws.ismail@windriver.com> +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> + +--- + man/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man/Makefile.am b/man/Makefile.am index 632f55b..5ce79f5 100644 diff --git a/meta-networking/recipes-support/openipmi/files/openipmi-remove-host-path-from-la_LDFLAGS.patch b/meta-networking/recipes-support/openipmi/files/openipmi-remove-host-path-from-la_LDFLAGS.patch deleted file mode 100644 index 83485a9e60..0000000000 --- a/meta-networking/recipes-support/openipmi/files/openipmi-remove-host-path-from-la_LDFLAGS.patch +++ /dev/null @@ -1,50 +0,0 @@ -From aa0dc0783a6ff5fb56c914b640836223e3c192bb Mon Sep 17 00:00:00 2001 -From: Jackie Huang <jackie.huang@windriver.com> -Date: Mon, 29 Dec 2014 18:16:04 +0800 -Subject: [PATCH] remove host path from la_LDFLAGS - -Upstream-Status: Inappropriate [ cross compile specific ] - -Signed-off-by: Jackie Huang <jackie.huang@windriver.com> ---- - cmdlang/Makefile.am | 2 +- - glib/Makefile.am | 4 ++-- - tcl/Makefile.am | 2 +- - unix/Makefile.am | 4 ++-- - 4 files changed, 6 insertions(+), 6 deletions(-) - -Index: OpenIPMI-2.0.24/cmdlang/Makefile.am -=================================================================== ---- OpenIPMI-2.0.24.orig/cmdlang/Makefile.am -+++ OpenIPMI-2.0.24/cmdlang/Makefile.am -@@ -15,8 +15,7 @@ libOpenIPMIcmdlang_la_SOURCES = cmdlang. - libOpenIPMIcmdlang_la_LIBADD = -lm \ - $(top_builddir)/utils/libOpenIPMIutils.la \ - $(top_builddir)/lib/libOpenIPMI.la --libOpenIPMIcmdlang_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ -- -L$(libdir) -+libOpenIPMIcmdlang_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) - - bin_PROGRAMS = openipmish - -Index: OpenIPMI-2.0.24/unix/Makefile.am -=================================================================== ---- OpenIPMI-2.0.24.orig/unix/Makefile.am -+++ OpenIPMI-2.0.24/unix/Makefile.am -@@ -10,14 +10,12 @@ lib_LTLIBRARIES = libOpenIPMIposix.la li - libOpenIPMIpthread_la_SOURCES = posix_thread_os_hnd.c selector.c - libOpenIPMIpthread_la_LIBADD = -lpthread $(GDBM_LIB) \ - $(top_builddir)/utils/libOpenIPMIutils.la $(RT_LIB) --libOpenIPMIpthread_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ -- -L$(libdir) -+libOpenIPMIpthread_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) - - libOpenIPMIposix_la_SOURCES = posix_os_hnd.c selector.c - libOpenIPMIposix_la_LIBADD = $(top_builddir)/utils/libOpenIPMIutils.la \ - $(GDBM_LIB) $(RT_LIB) --libOpenIPMIposix_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ -- -L$(libdir) -+libOpenIPMIposix_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) - - noinst_HEADERS = heap.h - diff --git a/meta-networking/recipes-support/openipmi/openipmi_2.0.24.bb b/meta-networking/recipes-support/openipmi/openipmi_2.0.35.bb index a4f63c5f4d..c7c7573677 100644 --- a/meta-networking/recipes-support/openipmi/openipmi_2.0.24.bb +++ b/meta-networking/recipes-support/openipmi/openipmi_2.0.35.bb @@ -11,11 +11,12 @@ DEPENDS = " \ net-snmp \ openssl \ popt \ - python \ + python3 \ swig-native \ + readline \ " -LICENSE = "GPLv2 & LGPLv2.1 & BSD" +LICENSE = "GPL-2.0-only & LGPL-2.1-only & BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://COPYING.LIB;md5=d8045f3b8f929c1cb29a1e3fd737b499 \ @@ -25,46 +26,45 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ SRC_URI = "${SOURCEFORGE_MIRROR}/openipmi/OpenIPMI-${PV}.tar.gz \ file://fix-symlink-install-error-in-cmdlang.patch \ file://openipmi-no-openipmigui-man.patch \ - file://openipmi-remove-host-path-from-la_LDFLAGS.patch \ file://ipmi-init-fix-the-arguments.patch \ - file://do-not-install-pyc-and-pyo.patch \ file://include_sys_types.patch \ file://openipmi-helper \ file://ipmi.service \ - file://0001-lanserv-Rename-struct-parameter-printf-for-namespace.patch \ " S = "${WORKDIR}/OpenIPMI-${PV}" -SRC_URI[md5sum] = "58f9542cbfcb5fe250b77cf88345e1ec" -SRC_URI[sha256sum] = "bca39a27071278a8b74610181ede8df51e155e5e9031bc8eaa3699d1720292b4" -inherit autotools-brokensep pkgconfig pythonnative perlnative update-rc.d systemd +SRC_URI[sha256sum] = "b059114f6299d73f04ff6e76a0857a0ab81aa362dee99644d256b223872437ad" + +inherit autotools-brokensep pkgconfig perlnative update-rc.d systemd cpan-base python3targetconfig + +CFLAGS += "-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" EXTRA_OECONF = "--disable-static \ --with-perl='${STAGING_BINDIR_NATIVE}/perl-native/perl' \ - --with-python='${STAGING_BINDIR_NATIVE}/python-native/python' \ - --with-pythoninstall='${PYTHON_SITEPACKAGES_DIR}' \ - --with-glibver=2.0" + --with-glibver=2.0 \ + --with-pythoncflags='-I${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}' \ + " PACKAGECONFIG ??= "gdbm" PACKAGECONFIG[gdbm] = "ac_cv_header_gdbm_h=yes,ac_cv_header_gdbm_h=no,gdbm," PACKAGES += "${PN}-perl ${PN}-python" +PRIVATE_LIBS:${PN}-perl = "libOpenIPMI.so.0" -FILES_${PN}-perl = " \ +FILES:${PN}-perl = " \ ${libdir}/perl/vendor_perl/*/OpenIPMI.pm \ ${libdir}/perl/vendor_perl/*/auto/OpenIPMI/OpenIPMI.so \ " -FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}" +FILES:${PN}-python = "${PYTHON_SITEPACKAGES_DIR}" -FILES_${PN}-dbg += " \ +FILES:${PN}-dbg += " \ ${libdir}/perl/vendor_perl/*/auto/OpenIPMI/.debug \ ${PYTHON_SITEPACKAGES_DIR}/.debug \ " do_configure () { - # Let's perform regular configuration first then handle perl issues. autotools_do_configure @@ -78,11 +78,16 @@ do_configure () { echo "SAL: STAGING_INCDIR_NATIVE = $STAGING_INCDIR_NATIVE" echo "SAL: libdir = $libdir" sed -i -e "/^PERL_CFLAGS/s:-I/usr/local/include:-I${STAGING_INCDIR_NATIVE}:g" $i + sed -i -e "/^PERL_CFLAGS/s:-I .* :-I ${STAGING_LIBDIR}${PERL_OWN_DIR}/perl5/${@get_perl_version(d)}/${@get_perl_arch(d)}/CORE :g" $i sed -i -e "/^PERL_INSTALL_DIR/s:^PERL_INSTALL_DIR = .*:PERL_INSTALL_DIR = ${libdir}/perl/vendor_perl/$perl_ver:g" $i done } -do_install_append () { +do_compile:append () { + sed -i -e 's#${RECIPE_SYSROOT_NATIVE}##g' ${S}/swig/perl/OpenIPMI_wrap.c +} + +do_install:append () { echo "SAL: D = $D" echo "SAL: libdir = $libdir" install -m 0755 -d ${D}${sysconfdir}/sysconfig ${D}${sysconfdir}/init.d @@ -97,14 +102,14 @@ do_install_append () { # for systemd install -d ${D}${systemd_unitdir}/system - install -m 0664 ${WORKDIR}/ipmi.service ${D}${systemd_unitdir}/system + install -m 0664 ${UNPACKDIR}/ipmi.service ${D}${systemd_unitdir}/system sed -i -e "s,@LIBEXECDIR@,${libexecdir},g" ${D}${systemd_unitdir}/system/ipmi.service install -d ${D}${libexecdir} - install -m 0755 ${WORKDIR}/openipmi-helper ${D}${libexecdir} + install -m 0755 ${UNPACKDIR}/openipmi-helper ${D}${libexecdir} } INITSCRIPT_NAME = "ipmi" INITSCRIPT_PARAMS = "start 30 . stop 70 0 1 2 3 4 5 6 ." -SYSTEMD_SERVICE_${PN} = "ipmi.service" +SYSTEMD_SERVICE:${PN} = "ipmi.service" SYSTEMD_AUTO_ENABLE = "disable" diff --git a/meta-networking/recipes-support/openvpn/openvpn/0001-configure.ac-eliminate-build-path-from-openvpn-versi.patch b/meta-networking/recipes-support/openvpn/openvpn/0001-configure.ac-eliminate-build-path-from-openvpn-versi.patch new file mode 100644 index 0000000000..03b454d625 --- /dev/null +++ b/meta-networking/recipes-support/openvpn/openvpn/0001-configure.ac-eliminate-build-path-from-openvpn-versi.patch @@ -0,0 +1,48 @@ +From ea179d83b0aa62719d90748cd1fb260f40055f15 Mon Sep 17 00:00:00 2001 +From: Yi Zhao <yi.zhao@windriver.com> +Date: Mon, 13 Jun 2022 22:44:28 +0800 +Subject: [PATCH] configure.ac: eliminate build path from openvpn --version + option + +Before the patch: +$ openvpn --version +OpenVPN 2.5.7 x86_64-poky-linux-gnu [SSL (OpenSSL)] [LZO] [LZ4] [EPOLL] +[snip] +Compile time defines: enable_async_push=no enable_comp_stub=no +[snip] +with_crypto_library=openssl with_gnu_ld=yes +with_libtool_sysroot=/buildarea/build/tmp/work/core2-64-poky-linux/openvpn/2.5.7-r0/recipe-sysroot +with_mem_check=no with_openssl_engine=auto + +After the patch: +$ openvpn --version +OpenVPN 2.5.7 x86_64-poky-linux-gnu [SSL (OpenSSL)] [LZO] [LZ4] [EPOLL] +[snip] +Compile time defines: enable_async_push=no enable_comp_stub=no +[snip] +with_crypto_library=openssl with_gnu_ld=yes with_mem_check=no +with_openssl_engine=auto + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 2f5f6bc..eddcbc5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1377,7 +1377,7 @@ if test "${enable_async_push}" = "yes"; then + esac + fi + +-CONFIGURE_DEFINES="`set | grep '^enable_.*=' ; set | grep '^with_.*='`" ++CONFIGURE_DEFINES="`set | grep '^enable_.*=' ; set | grep '^with_.*=' | grep -v 'libtool_sysroot'`" + AC_DEFINE_UNQUOTED([CONFIGURE_DEFINES], ["`echo ${CONFIGURE_DEFINES}`"], [Configuration settings]) + + TAP_WIN_COMPONENT_ID="PRODUCT_TAP_WIN_COMPONENT_ID" +-- +2.25.1 + diff --git a/meta-networking/recipes-support/openvpn/openvpn/openvpn b/meta-networking/recipes-support/openvpn/openvpn/openvpn index a3cd6a2f49..e5af4b2301 100755..100644 --- a/meta-networking/recipes-support/openvpn/openvpn/openvpn +++ b/meta-networking/recipes-support/openvpn/openvpn/openvpn @@ -4,6 +4,7 @@ # <rob@mars.org>, edited by iwj and cs # Modified for openvpn by Alberto Gonzalez Iniesta <agi@agi.as> # Modified for restarting / starting / stopping single tunnels by Richard Mueller <mueller@teamix.net> +# Modified for respecting pid file on service start by Fabian Klemp <fabian.klemp@axino-group.com> test $DEBIAN_SCRIPT_DEBUG && set -v -x @@ -14,10 +15,17 @@ test -d $CONFIG_DIR || exit 0 start_vpn () { modprobe tun >/dev/null 2>&1 || true - $DAEMON --daemon --writepid /var/run/openvpn.$NAME.pid \ - --config $CONFIG_DIR/$NAME.conf --cd $CONFIG_DIR || echo -n " FAILED->" + start-stop-daemon --start --quiet --pidfile /var/run/openvpn.$NAME.pid \ + --exec $DAEMON -- \ + --daemon --writepid /var/run/openvpn.$NAME.pid \ + --config $CONFIG_DIR/$NAME.conf --cd $CONFIG_DIR || rc="$?" + case $rc in + 1) echo -n " ALREADY STARTED->";; + 3) echo -n " FAILED->";; + esac echo -n " $NAME" } + stop_vpn () { kill `cat $PIDFILE` || true rm $PIDFILE diff --git a/meta-networking/recipes-support/openvpn/openvpn/openvpn-volatile.conf b/meta-networking/recipes-support/openvpn/openvpn/openvpn-volatile.conf deleted file mode 100644 index 1205806d52..0000000000 --- a/meta-networking/recipes-support/openvpn/openvpn/openvpn-volatile.conf +++ /dev/null @@ -1 +0,0 @@ -d @LOCALSTATEDIR@/run/openvpn 0755 root root - diff --git a/meta-networking/recipes-support/openvpn/openvpn/openvpn@.service b/meta-networking/recipes-support/openvpn/openvpn/openvpn@.service deleted file mode 100644 index 358dcb791a..0000000000 --- a/meta-networking/recipes-support/openvpn/openvpn/openvpn@.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=OpenVPN Robust And Highly Flexible Tunneling Application On %I -After=syslog.target network.target - -[Service] -PrivateTmp=true -Type=forking -PIDFile=/var/run/openvpn/%i.pid -ExecStart=/usr/sbin/openvpn --daemon --writepid /var/run/openvpn/%i.pid --cd /etc/openvpn/ --config %i.conf - -[Install] -WantedBy=multi-user.target diff --git a/meta-networking/recipes-support/openvpn/openvpn_2.4.4.bb b/meta-networking/recipes-support/openvpn/openvpn_2.4.4.bb deleted file mode 100644 index 4cad998693..0000000000 --- a/meta-networking/recipes-support/openvpn/openvpn_2.4.4.bb +++ /dev/null @@ -1,67 +0,0 @@ -SUMMARY = "A full-featured SSL VPN solution via tun device." -HOMEPAGE = "http://openvpn.sourceforge.net" -SECTION = "net" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=e9b64491ec98eb6c6493ac5e4118f107" -DEPENDS = "lzo openssl iproute2 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" - -inherit autotools systemd - -SRC_URI = "http://swupdate.openvpn.org/community/releases/${BP}.tar.gz \ - file://openvpn \ - file://openvpn@.service \ - file://openvpn-volatile.conf" - -SRC_URI[md5sum] = "705a79d005558d94fa1e2b74e4413e97" -SRC_URI[sha256sum] = "1ae883d9522c9fa6d189e5e4aaa058a93edd3d0b897e3c2664107c4785099fc3" - -SYSTEMD_SERVICE_${PN} += "openvpn@loopback-server.service openvpn@loopback-client.service" -SYSTEMD_AUTO_ENABLE = "disable" - -CFLAGS += "-fno-inline" - -# I want openvpn to be able to read password from file (hrw) -EXTRA_OECONF += "--enable-iproute2" -EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '', '--disable-plugin-auth-pam', d)}" - -# Explicitly specify IPROUTE to bypass the configure-time check for /sbin/ip on the host. -EXTRA_OECONF += "IPROUTE=${base_sbindir}/ip" - -do_install_append() { - install -d ${D}/${sysconfdir}/init.d - install -m 755 ${WORKDIR}/openvpn ${D}/${sysconfdir}/init.d - - install -d ${D}/${sysconfdir}/openvpn - install -d ${D}/${sysconfdir}/openvpn/sample - install -m 755 ${S}/sample/sample-config-files/loopback-server ${D}${sysconfdir}/openvpn/sample/loopback-server.conf - install -m 755 ${S}/sample/sample-config-files/loopback-client ${D}${sysconfdir}/openvpn/sample/loopback-client.conf - install -dm 755 ${D}${sysconfdir}/openvpn/sample/sample-keys - install -m 644 ${S}/sample/sample-keys/* ${D}${sysconfdir}/openvpn/sample/sample-keys - - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -d ${D}/${systemd_unitdir}/system - install -m 644 ${WORKDIR}/openvpn@.service ${D}/${systemd_unitdir}/system - install -m 644 ${WORKDIR}/openvpn@.service ${D}/${systemd_unitdir}/system/openvpn@loopback-server.service - install -m 644 ${WORKDIR}/openvpn@.service ${D}/${systemd_unitdir}/system/openvpn@loopback-client.service - - install -d ${D}/${localstatedir} - install -d ${D}/${localstatedir}/lib - install -d -m 710 ${D}/${localstatedir}/lib/openvpn - - install -d ${D}${sysconfdir}/tmpfiles.d - install -m 0644 ${WORKDIR}/openvpn-volatile.conf ${D}${sysconfdir}/tmpfiles.d/openvpn.conf - sed -i -e 's#@LOCALSTATEDIR@#${localstatedir}#g' ${D}${sysconfdir}/tmpfiles.d/openvpn.conf - fi -} - -PACKAGES =+ " ${PN}-sample " - -RRECOMMENDS_${PN} = "kernel-module-tun" - -FILES_${PN}-dbg += "${libdir}/openvpn/plugins/.debug" -FILES_${PN} += "${systemd_unitdir}/system/openvpn@.service \ - ${sysconfdir}/tmpfiles.d \ - " -FILES_${PN}-sample += "${systemd_unitdir}/system/openvpn@loopback-server.service \ - ${systemd_unitdir}/system/openvpn@loopback-client.service \ - ${sysconfdir}/openvpn/sample/" diff --git a/meta-networking/recipes-support/openvpn/openvpn_2.6.10.bb b/meta-networking/recipes-support/openvpn/openvpn_2.6.10.bb new file mode 100644 index 0000000000..ba53d40f47 --- /dev/null +++ b/meta-networking/recipes-support/openvpn/openvpn_2.6.10.bb @@ -0,0 +1,76 @@ +SUMMARY = "A full-featured SSL VPN solution via tun device." +HOMEPAGE = "https://openvpn.net/" +SECTION = "net" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=89196bacc47ed37a5b242a535661a049" +DEPENDS = "lzo lz4 openssl iproute2 libcap-ng ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" + +inherit autotools systemd update-rc.d pkgconfig + +SRC_URI = "http://swupdate.openvpn.org/community/releases/${BP}.tar.gz \ + file://0001-configure.ac-eliminate-build-path-from-openvpn-versi.patch \ + file://openvpn \ + " + +UPSTREAM_CHECK_URI = "https://openvpn.net/community-downloads" + +SRC_URI[sha256sum] = "1993bbb7b9edb430626eaa24573f881fd3df642f427fcb824b1aed1fca1bcc9b" + +CVE_STATUS[CVE-2020-27569] = "not-applicable-config: Applies only Aviatrix OpenVPN client, not openvpn" + +INITSCRIPT_PACKAGES = "${PN}" +INITSCRIPT_NAME:${PN} = "openvpn" +INITSCRIPT_PARAMS:${PN} = "start 10 2 3 4 5 . stop 70 0 1 6 ." + +CFLAGS += "-fno-inline" + +# I want openvpn to be able to read password from file (hrw) +EXTRA_OECONF += "--enable-iproute2" +EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '', '--disable-plugin-auth-pam', d)}" + +# Explicitly specify IPROUTE to bypass the configure-time check for /sbin/ip on the host. +EXTRA_OECONF += "IPROUTE=${base_sbindir}/ip" + +EXTRA_OECONF += "SYSTEMD_UNIT_DIR=${systemd_system_unitdir} \ + TMPFILES_DIR=${nonarch_libdir}/tmpfiles.d \ + " + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)} \ + " + +PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd" +PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" + +do_install:append() { + install -d ${D}/${sysconfdir}/init.d + install -m 755 ${UNPACKDIR}/openvpn ${D}/${sysconfdir}/init.d + + install -d ${D}/${sysconfdir}/openvpn + install -d ${D}/${sysconfdir}/openvpn/server + install -d ${D}/${sysconfdir}/openvpn/client + + install -d ${D}/${sysconfdir}/openvpn/sample + install -m 644 ${S}/sample/sample-config-files/loopback-server ${D}${sysconfdir}/openvpn/sample/loopback-server.conf + install -m 644 ${S}/sample/sample-config-files/loopback-client ${D}${sysconfdir}/openvpn/sample/loopback-client.conf + install -dm 755 ${D}${sysconfdir}/openvpn/sample/sample-config-files + install -dm 755 ${D}${sysconfdir}/openvpn/sample/sample-keys + install -dm 755 ${D}${sysconfdir}/openvpn/sample/sample-scripts + install -m 644 ${S}/sample/sample-config-files/* ${D}${sysconfdir}/openvpn/sample/sample-config-files + install -m 644 ${S}/sample/sample-keys/* ${D}${sysconfdir}/openvpn/sample/sample-keys + install -m 644 ${S}/sample/sample-scripts/* ${D}${sysconfdir}/openvpn/sample/sample-scripts + + install -d -m 710 ${D}/${localstatedir}/lib/openvpn +} + +PACKAGES =+ " ${PN}-sample " + +RRECOMMENDS:${PN} = "kernel-module-tun" + +FILES:${PN}-dbg += "${libdir}/openvpn/plugins/.debug" +FILES:${PN} += "${systemd_system_unitdir}/openvpn-server@.service \ + ${systemd_system_unitdir}/openvpn-client@.service \ + ${nonarch_libdir}/tmpfiles.d \ + " +FILES:${PN}-sample = "${sysconfdir}/openvpn/sample/ \ + " diff --git a/meta-networking/recipes-support/pgpool2/pgpool2/0001-Fix-build-error-when-build-this-file.patch b/meta-networking/recipes-support/pgpool2/pgpool2/0001-Fix-build-error-when-build-this-file.patch new file mode 100644 index 0000000000..52bcc3b7e3 --- /dev/null +++ b/meta-networking/recipes-support/pgpool2/pgpool2/0001-Fix-build-error-when-build-this-file.patch @@ -0,0 +1,32 @@ +From f8ab74a76049f69adeebe92c62593547e05a075d Mon Sep 17 00:00:00 2001 +From: Lei Maohui <leimaohui@fujitsu.com> +Date: Wed, 11 Jan 2023 17:22:41 +0900 +Subject: [PATCH] Fix build error when build this file. + +| snprintf.c:770:64: error: 'PG_STRERROR_R_BUFLEN' undeclared (first use in this function) +| 770 | char errbuf[PG_STRERROR_R_BUFLEN]; +| | ^~~~~~~~~~~~~~~~~~~~ + +PG_STRERROR_R_BUFLEN is defined in postgresql, but pgpool doesn't +include the header of postgresql. + +Upstream-Status: Inappropriate [OE-Specific] +Signed-off-by: Lei Maohui <leimaohui@fujitsu.com> +--- + src/parser/snprintf.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/parser/snprintf.c b/src/parser/snprintf.c +index 84ebdb2..3387897 100644 +--- a/src/parser/snprintf.c ++++ b/src/parser/snprintf.c +@@ -46,6 +46,7 @@ + #include "pool_parser.h" + #include "stringinfo.h" + #include "utils/palloc.h" ++#include "postgresql/server/port.h" + + /* + * We used to use the platform's NL_ARGMAX here, but that's a bad idea, +-- +2.25.1 diff --git a/meta-networking/recipes-support/pgpool2/pgpool2/define_SIGNAL_ARGS.patch b/meta-networking/recipes-support/pgpool2/pgpool2/define_SIGNAL_ARGS.patch new file mode 100644 index 0000000000..3ae9b1bd9a --- /dev/null +++ b/meta-networking/recipes-support/pgpool2/pgpool2/define_SIGNAL_ARGS.patch @@ -0,0 +1,25 @@ +Define SIGNAL_ARGS if its not defined, this is flagged with +newer C compilers e.g. clang18, where if it is not defined +then it ends up with compiler errors + +/usr/include/postgresql/server/port.h:488:28: error: a parameter l +ist without types is only allowed in a function definition +| 488 | typedef void (*pqsigfunc) (SIGNAL_ARGS); +| | ^ + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- a/src/include/pool_type.h ++++ b/src/include/pool_type.h +@@ -125,7 +125,9 @@ extern void ExceptionalCondition(const c + #define LONGALIGN(LEN) TYPEALIGN(ALIGNOF_LONG, (LEN)) + #define DOUBLEALIGN(LEN) TYPEALIGN(ALIGNOF_DOUBLE, (LEN)) + #define MAXALIGN(LEN) TYPEALIGN(MAXIMUM_ALIGNOF, (LEN)) +- ++#ifndef SIGNAL_ARGS ++#define SIGNAL_ARGS int postgres_signal_arg ++#endif + /* + * It seems that sockaddr_storage is now commonly used in place of sockaddr. + * So, define it if it is not define yet, and create new SockAddr structure diff --git a/meta-networking/recipes-support/pgpool2/pgpool2/pgpool.service b/meta-networking/recipes-support/pgpool2/pgpool2/pgpool.service new file mode 100644 index 0000000000..bf2d323639 --- /dev/null +++ b/meta-networking/recipes-support/pgpool2/pgpool2/pgpool.service @@ -0,0 +1,17 @@ +[Unit] +Description=Pgpool-II +After=syslog.target network.target + +[Service] + +User=postgres +Group=postgres + +EnvironmentFile=-/etc/sysconfig/pgpool + +ExecStart=/usr/bin/pgpool -f /etc/pgpool-II/pgpool.conf $OPTS +ExecStop=/usr/bin/pgpool -f /etc/pgpool-II/pgpool.conf $STOP_OPTS stop +ExecReload=/usr/bin/pgpool -f /etc/pgpool-II/pgpool.conf reload + +[Install] +WantedBy=multi-user.target diff --git a/meta-networking/recipes-support/pgpool2/pgpool2/pgpool.sysconfig b/meta-networking/recipes-support/pgpool2/pgpool2/pgpool.sysconfig new file mode 100644 index 0000000000..ea13089b7b --- /dev/null +++ b/meta-networking/recipes-support/pgpool2/pgpool2/pgpool.sysconfig @@ -0,0 +1,7 @@ +# Options for pgpool + +# -n: don't run in daemon mode. does not detach control tty +# -d: debug mode. lots of debug information will be printed + +#OPTS=" -d -n" +OPTS=" -n" diff --git a/meta-networking/recipes-support/pgpool2/pgpool2_4.5.1.bb b/meta-networking/recipes-support/pgpool2/pgpool2_4.5.1.bb new file mode 100644 index 0000000000..ddcad46beb --- /dev/null +++ b/meta-networking/recipes-support/pgpool2/pgpool2_4.5.1.bb @@ -0,0 +1,50 @@ +SUMMARY = "A language independent connection pool server for PostgreSQL." + +DESCRIPTION = "Pgpool-II is a middleware that works between PostgreSQL \ + servers and a PostgreSQL database client. It is distributed \ + under a license similar to BSD and MIT. It provides the \ + following features." + +HOMEPAGE = "http://pgpool.net" + +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=e4b38de086d73e0521de0bbdbaa4a1a9" + +SRC_URI = "http://www.pgpool.net/mediawiki/images/pgpool-II-${PV}.tar.gz \ + file://0001-Fix-build-error-when-build-this-file.patch \ + file://define_SIGNAL_ARGS.patch \ + file://pgpool.sysconfig \ + file://pgpool.service \ + " +SRC_URI[sha256sum] = "8e14b0558a15dae8767c8e1acee3f2f6c7c08ebfffda66a359367eaaa56c3936" + +S = "${WORKDIR}/pgpool-II-${PV}" + +inherit autotools-brokensep systemd + +SYSTEMD_SERVICE:${PN} = "pgpool.service" + +PACKAGECONFIG ??= " openssl libmemcached postgresql \ +" +PACKAGECONFIG[pam] = "--with-pam,,libpam" +PACKAGECONFIG[openssl] = "--with-openssl,,openssl" +PACKAGECONFIG[libmemcached] = "--with-memcached=${STAGING_INCDIR}/libmemcachedutil-1.0,,libmemcached" +PACKAGECONFIG[postgresql] = "--with-pgsql-includedir=${STAGING_INCDIR}/postgresql,, postgresql" + +EXTRA_OECONF += "--disable-static \ + --disable-rpath \ + " +FILES:${PN} += "${datadir}/pgpool-II/ " + +do_configure:append() { + echo "#define HAVE_STRCHRNUL 1" >> ${S}/src/include/config.h + sed -i "s,#define USE_REPL_SNPRINTF 1,/* #undef USE_REPL_SNPRINTF*/,g" ${S}/src/include/config.h +} + +do_install:append() { + install -d ${D}${sysconfdir}/pgpool-II + install -D -m 0644 ${UNPACKDIR}/pgpool.sysconfig ${D}${sysconfdir}/pgpool-II/pgpool.conf + install -D -m 0644 ${S}/src/sample/pcp.conf.sample ${D}${sysconfdir}/pgpool-II/pcp.conf + install -D -m 0644 ${S}/src/sample/pool_hba.conf.sample ${D}${sysconfdir}/pgpool-II/pool_hba.conf + install -Dm 0644 ${UNPACKDIR}/pgpool.service ${D}${systemd_system_unitdir}/pgpool.service +} diff --git a/meta-networking/recipes-support/phytool/phytool.bb b/meta-networking/recipes-support/phytool/phytool.bb index 4ed3ed1e40..b918e50c68 100644 --- a/meta-networking/recipes-support/phytool/phytool.bb +++ b/meta-networking/recipes-support/phytool/phytool.bb @@ -1,10 +1,10 @@ SUMMARY = "PHY interface tool for Linux" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=39bba7d2cf0ba1036f2a6e2be52fe3f0" -PV = "1.0.1+git${SRCPV}" -SRCREV = "3149bfdb4f513e2f0da0a7d0bc5d0873578696f2" -SRC_URI = "git://github.com/wkz/phytool.git" +PV = "2+git" +SRCREV = "8882328c08ba2efb13c049812098f1d0cb8adf0c" +SRC_URI = "git://github.com/wkz/phytool.git;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-networking/recipes-support/pimd/pimd/0001-configure-Dont-use-uname-to-determine-target-OS.patch b/meta-networking/recipes-support/pimd/pimd/0001-configure-Dont-use-uname-to-determine-target-OS.patch index eb549ded9d..cacb84a1ca 100644 --- a/meta-networking/recipes-support/pimd/pimd/0001-configure-Dont-use-uname-to-determine-target-OS.patch +++ b/meta-networking/recipes-support/pimd/pimd/0001-configure-Dont-use-uname-to-determine-target-OS.patch @@ -7,6 +7,8 @@ Helps with cross-compiling Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-networking/recipes-support/pimd/pimd_2.3.2.bb b/meta-networking/recipes-support/pimd/pimd_2.3.2.bb index 2faa7cb1ce..647f9df515 100644 --- a/meta-networking/recipes-support/pimd/pimd_2.3.2.bb +++ b/meta-networking/recipes-support/pimd/pimd_2.3.2.bb @@ -4,17 +4,20 @@ SECTION = "net" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=94f108f91fab720d62425770b70dd790" -SRC_URI = "ftp://ftp.troglobit.com/pimd/${BP}.tar.gz \ +SRC_URI = "https://ftp.troglobit.com/pimd/${BP}.tar.gz \ file://0001-configure-Dont-use-uname-to-determine-target-OS.patch \ " -SRC_URI[md5sum] = "a3c03e40540980b2c06e265a17988e60" SRC_URI[sha256sum] = "c77a9812751f114490a28a6839b16aac8b020c8d9fd6aa22bf3880c054e19f1d" -EXTRA_OECONF_append_libc-musl = " --embedded-libc" +EXTRA_OECONF:append:libc-musl = " --embedded-libc" -inherit autotools-brokensep +inherit autotools-brokensep update-alternatives do_configure() { oe_runconf } +ALTERNATIVE_PRIORITY = "100" + +ALTERNATIVE:${PN} = "pimd" +ALTERNATIVE_LINK_NAME[pimd] = "${sbindir}/pimd" diff --git a/meta-networking/recipes-support/rdma-core/rdma-core/0001-cmake-Allow-SYSTEMCTL_BIN-to-be-overridden-from-envi.patch b/meta-networking/recipes-support/rdma-core/rdma-core/0001-cmake-Allow-SYSTEMCTL_BIN-to-be-overridden-from-envi.patch new file mode 100644 index 0000000000..e181ee2872 --- /dev/null +++ b/meta-networking/recipes-support/rdma-core/rdma-core/0001-cmake-Allow-SYSTEMCTL_BIN-to-be-overridden-from-envi.patch @@ -0,0 +1,31 @@ +From 209f346d55eeaf74e21c541d70ec43d39b6c8c3c Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 27 May 2023 17:22:10 -0700 +Subject: [PATCH] cmake: Allow SYSTEMCTL_BIN to be overridden from environment + +This allows to encode correct paths which are inside the target rootfs +for systemctl + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- + CMakeLists.txt | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 98985e7ee..001efb800 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -237,7 +237,10 @@ else() + endif() + endif() + +-find_program(SYSTEMCTL_BIN systemctl HINTS "/usr/bin" "/bin") ++if (NOT SYSTEMCTL_BIN) ++ find_program(SYSTEMCTL_BIN systemctl HINTS "/usr/bin" "/bin") ++endif() ++ + if (NOT SYSTEMCTL_BIN) + set (SYSTEMCTL_BIN "/bin/systemctl") + endif() diff --git a/meta-networking/recipes-support/rdma-core/rdma-core/0001-include-libgen.h-for-basename.patch b/meta-networking/recipes-support/rdma-core/rdma-core/0001-include-libgen.h-for-basename.patch new file mode 100644 index 0000000000..a093e47048 --- /dev/null +++ b/meta-networking/recipes-support/rdma-core/rdma-core/0001-include-libgen.h-for-basename.patch @@ -0,0 +1,58 @@ +From ae6adc4c748e67919fdf8ae1d44c619ee104c271 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 25 Mar 2024 11:37:41 -0700 +Subject: [PATCH] include libgen.h for basename + +basename prototype has been removed from string.h from latest musl [1] +compilers e.g. clang-18 flags the absense of prototype as error. therefore +include libgen.h for providing it. + +[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7 + +Upstream-Status: Submitted [https://github.com/linux-rdma/rdma-core/pull/1443] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + kernel-boot/rdma_rename.c | 1 + + librdmacm/examples/rping.c | 1 + + providers/mlx5/mlx5_vfio.c | 1 + + 3 files changed, 3 insertions(+) + +diff --git a/kernel-boot/rdma_rename.c b/kernel-boot/rdma_rename.c +index 4af9e4a39..5193ac411 100644 +--- a/kernel-boot/rdma_rename.c ++++ b/kernel-boot/rdma_rename.c +@@ -2,6 +2,7 @@ + /* Copyright (c) 2019, Mellanox Technologies. All rights reserved. See COPYING file */ + + #define _GNU_SOURCE ++#include <libgen.h> + #include <stdio.h> + #include <stdlib.h> + #include <string.h> +diff --git a/librdmacm/examples/rping.c b/librdmacm/examples/rping.c +index cc16ad910..0f1321458 100644 +--- a/librdmacm/examples/rping.c ++++ b/librdmacm/examples/rping.c +@@ -33,6 +33,7 @@ + #define _GNU_SOURCE + #include <endian.h> + #include <getopt.h> ++#include <libgen.h> + #include <stdlib.h> + #include <string.h> + #include <stdio.h> +diff --git a/providers/mlx5/mlx5_vfio.c b/providers/mlx5/mlx5_vfio.c +index cd0c41462..4d064b1fc 100644 +--- a/providers/mlx5/mlx5_vfio.c ++++ b/providers/mlx5/mlx5_vfio.c +@@ -6,6 +6,7 @@ + #define _GNU_SOURCE + #include <config.h> + ++#include <libgen.h> + #include <stdio.h> + #include <stdlib.h> + #include <unistd.h> +-- +2.44.0 + diff --git a/meta-networking/recipes-support/rdma-core/rdma-core_51.0.bb b/meta-networking/recipes-support/rdma-core/rdma-core_51.0.bb new file mode 100644 index 0000000000..7c26a8c436 --- /dev/null +++ b/meta-networking/recipes-support/rdma-core/rdma-core_51.0.bb @@ -0,0 +1,46 @@ +SUMMARY = "Userspace support for InfiniBand/RDMA verbs" +DESCRIPTION = "This is the userspace components for the Linux Kernel's drivers Infiniband/RDMA subsystem." +SECTION = "libs" + +DEPENDS = "libnl" +RDEPENDS:${PN} = "bash perl" + +SRC_URI = "git://github.com/linux-rdma/rdma-core.git;branch=master;protocol=https \ + file://0001-cmake-Allow-SYSTEMCTL_BIN-to-be-overridden-from-envi.patch \ + file://0001-include-libgen.h-for-basename.patch \ +" +SRCREV = "6cd09097ad2eebde9a7fa3d3bb09a2cea6e3c2d6" +S = "${WORKDIR}/git" + +#Default Dual License https://github.com/linux-rdma/rdma-core/blob/master/COPYING.md +LICENSE = "BSD-2-Clause | GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING.BSD_FB;md5=0ec18bae1a9df92c8d6ae01f94a289ae \ + file://COPYING.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +EXTRA_OECMAKE = " \ + -DCMAKE_INSTALL_SYSTEMD_SERVICEDIR=${systemd_system_unitdir} \ + -DSYSTEMCTL_BIN=${base_bindir}/systemctl \ + -DCMAKE_INSTALL_PERLDIR=${libdir}/perl5/${@get_perl_version(d)} \ + -DNO_MAN_PAGES=1 \ +" + +LTO = "" + +FILES_SOLIBSDEV = "" +FILES:${PN} += "${libdir}/*" +INSANE_SKIP:${PN} += "dev-so" + +inherit cmake cpan-base pkgconfig python3native python3targetconfig systemd + +SYSTEMD_SERVICE:${PN} = " \ + srp_daemon.service \ + iwpmd.service \ + ibacm.socket \ + rdma-load-modules@.service \ + srp_daemon_port@.service \ + rdma-hw.target \ + ibacm.service \ +" +SYSTEMD_AUTO_ENABLE = "disable" + +OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "BOTH" diff --git a/meta-networking/recipes-support/ruli/files/0001-Fix-build-with-format-string-checks.patch b/meta-networking/recipes-support/ruli/files/0001-Fix-build-with-format-string-checks.patch index f8eb3ae67a..8ca26b51bb 100644 --- a/meta-networking/recipes-support/ruli/files/0001-Fix-build-with-format-string-checks.patch +++ b/meta-networking/recipes-support/ruli/files/0001-Fix-build-with-format-string-checks.patch @@ -15,11 +15,9 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> src/ruli_addr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/src/ruli_addr.c b/src/ruli_addr.c -index 00d5d0d..f1eabae 100644 --- a/src/ruli_addr.c +++ b/src/ruli_addr.c -@@ -415,7 +415,7 @@ int ruli_in_print(FILE *out, const _ruli_addr *addr, int family) +@@ -415,7 +415,7 @@ int ruli_in_print(FILE *out, const _ruli { switch (family) { case PF_INET: @@ -28,6 +26,25 @@ index 00d5d0d..f1eabae 100644 case PF_INET6: return ruli_inet6_print(out, &addr->ipv6); --- -2.13.1 - +--- a/sample/getaddrinfo.c ++++ b/sample/getaddrinfo.c +@@ -174,7 +174,7 @@ static void solve(const char *fullname) + + for (ai = ai_res; ai; ai = ai->ai_next) { + +- printf(fullname); ++ printf("%s", fullname); + + switch (ai->ai_family) { + case PF_INET: +--- a/sample/ruli-getaddrinfo.c ++++ b/sample/ruli-getaddrinfo.c +@@ -176,7 +176,7 @@ static void solve(const char *fullname) + + for (ai = ai_res; ai; ai = ai->ai_next) { + +- printf(fullname); ++ printf("%s", fullname); + + switch (ai->ai_family) { + case PF_INET: diff --git a/meta-networking/recipes-support/ruli/files/0001-Make-space-for-flags-from-environment.patch b/meta-networking/recipes-support/ruli/files/0001-Make-space-for-flags-from-environment.patch new file mode 100644 index 0000000000..c3ca07a390 --- /dev/null +++ b/meta-networking/recipes-support/ruli/files/0001-Make-space-for-flags-from-environment.patch @@ -0,0 +1,95 @@ +From bb19a2c7e5b3142d70d3e13c2d8a92a63f2b840a Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 20 Nov 2019 22:12:52 -0800 +Subject: [PATCH] Make space for flags from environment + +Add force option to ln cmd, so do_install can be rerun in same directory + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + sample/Makefile | 20 ++++++++++---------- + src/Makefile | 8 ++++---- + 2 files changed, 14 insertions(+), 14 deletions(-) + +diff --git a/sample/Makefile b/sample/Makefile +index 15cafd9..d83641f 100644 +--- a/sample/Makefile ++++ b/sample/Makefile +@@ -35,9 +35,9 @@ ifeq ($(PLATFORM),SunOS) + SOLARIS_LIBS = -lresolv -lnsl -lsocket + endif + +-CC = gcc +-CFLAGS = -O2 -pipe -Wall -g -I../src -I$(OOP_INCLUDE_DIR) +-LDFLAGS = -L../src -L$(OOP_LIB_DIR) $(SOLARIS_LDFLAGS) ++CC ?= gcc ++CFLAGS += -O2 -pipe -Wall -g -I../src -I$(OOP_INCLUDE_DIR) ++LDFLAGS += -L../src -L$(OOP_LIB_DIR) $(SOLARIS_LDFLAGS) + UNRULI_LINK = $(CC) $(ARCH) $(LDFLAGS) -o $@ $^ $(SOLARIS_LIBS) + LINK = $(UNRULI_LINK) -lruli -loop + +@@ -65,13 +65,13 @@ install: $(TARGETS) + mkdir -p $(INSTALL_BIN_DIR) $(INSTALL_MAN1_DIR) + cp $(TARGETS) $(INSTALL_BIN_DIR) + cp ../doc/man/*.1 $(INSTALL_MAN1_DIR) +- cd $(INSTALL_MAN_DIR)/man1 && ln -s srvsearch.1 smtpsearch.1 +- cd $(INSTALL_MAN_DIR)/man1 && ln -s srvsearch.1 httpsearch.1 +- cd $(INSTALL_MAN_DIR)/man1 && ln -s srvsearch.1 sync_srvsearch.1 +- cd $(INSTALL_MAN_DIR)/man1 && ln -s srvsearch.1 sync_smtpsearch.1 +- cd $(INSTALL_MAN_DIR)/man1 && ln -s srvsearch.1 sync_httpsearch.1 +- cd $(INSTALL_MAN_DIR)/man1 && ln -s srvsearch.1 ruli-getaddrinfo.1 +- cd $(INSTALL_MAN_DIR)/man1 && ln -s srvsearch.1 getaddrinfo.1 ++ cd $(INSTALL_MAN_DIR)/man1 && ln -sf srvsearch.1 smtpsearch.1 ++ cd $(INSTALL_MAN_DIR)/man1 && ln -sf srvsearch.1 httpsearch.1 ++ cd $(INSTALL_MAN_DIR)/man1 && ln -sf srvsearch.1 sync_srvsearch.1 ++ cd $(INSTALL_MAN_DIR)/man1 && ln -sf srvsearch.1 sync_smtpsearch.1 ++ cd $(INSTALL_MAN_DIR)/man1 && ln -sf srvsearch.1 sync_httpsearch.1 ++ cd $(INSTALL_MAN_DIR)/man1 && ln -sf srvsearch.1 ruli-getaddrinfo.1 ++ cd $(INSTALL_MAN_DIR)/man1 && ln -sf srvsearch.1 getaddrinfo.1 + + %.o: %.c + $(CC) $(ARCH) $(CPPFLAGS) $(CFLAGS) -c $< +diff --git a/src/Makefile b/src/Makefile +index 9b56b5e..39a5ea1 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -45,7 +45,7 @@ endif + + WARN = -pedantic -ansi -Wshadow -Wpointer-arith -Wcast-qual \ + -Wcast-align -Wwrite-strings -Wredundant-decls +-CC = gcc ++CC ?= gcc + + # gcc-specific options (not valid for g++) + ifeq ($(CC),gcc) +@@ -58,7 +58,7 @@ SHARED = -fPIC + FLAGS = $(DEBUG) -O2 -pipe -Wall -g -shared -D_REENTRANT \ + $(DEFINE_SOLARIS) -I. -I$(OOP_INCLUDE_DIR) + SOFT_CFLAGS = $(WARN) $(FLAGS) +-CFLAGS = $(WARN) -Werror $(FLAGS) ++CFLAGS += $(WARN) -Werror $(FLAGS) + LIBOBJ = ruli_isaac.o ruli_mem.o ruli_rand.o ruli_util.o ruli_list.o \ + ruli_addr.o ruli_sock.o ruli_txt.o ruli_msg.o ruli_fsm.o \ + ruli_res.o ruli_parse.o ruli_host.o ruli_srv.o ruli_conf.o \ +@@ -66,7 +66,7 @@ LIBOBJ = ruli_isaac.o ruli_mem.o ruli_rand.o ruli_util.o ruli_list.o \ + ruli_getaddrinfo.o + SHAREDOBJ = $(LIBOBJ:%.o=%.os) + SONAME = libruli.so.4 +-LDFLAGS = -L$(OOP_LIB_DIR) ++LDFLAGS += -L$(OOP_LIB_DIR) + + COMPILE = $(CC) $(ARCH) $(CPPFLAGS) $(CFLAGS) -c + SHARED_COMPILE = $(CC) $(ARCH) $(CPPFLAGS) $(SHARED) $(CFLAGS) -o $@ -c +@@ -95,7 +95,7 @@ install: ruli + cp $(SONAME) libruli.a $(INSTALL_LIB_DIR) + cp *.h $(INSTALL_INCLUDE_DIR) + cp ../doc/man/*.3 $(INSTALL_MAN3_DIR) +- cd $(INSTALL_LIB_DIR) && ln -s $(SONAME) libruli.so ++ cd $(INSTALL_LIB_DIR) && ln -sf $(SONAME) libruli.so + @echo + @echo "REMINDER:" + @echo "Add $(INSTALL_LIB_DIR) to your dynamic loader path:" +-- +2.24.0 + diff --git a/meta-networking/recipes-support/ruli/files/0001-ruli_srv-Mark-prev_addr_list_size-as-unused.patch b/meta-networking/recipes-support/ruli/files/0001-ruli_srv-Mark-prev_addr_list_size-as-unused.patch new file mode 100644 index 0000000000..213006a677 --- /dev/null +++ b/meta-networking/recipes-support/ruli/files/0001-ruli_srv-Mark-prev_addr_list_size-as-unused.patch @@ -0,0 +1,35 @@ +From 895ae26e36c4498677ad0b2695a6e5af05548a29 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 20 Nov 2019 22:02:43 -0800 +Subject: [PATCH] ruli_srv: Mark prev_addr_list_size as unused + +This ensures that compiler does not trip on building it + +ruli_srv.c:157:20: error: variable 'prev_addr_list_size' set but not used [-Werror=unused-but-set-variable] +| int prev_addr_list_size; +| ^~~~~~~~~~~~~~~~~~~ +cc1: all warnings being treated as errors + +Upstream-Status: Inappropriate [Workaround] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/ruli_srv.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/ruli_srv.c b/src/ruli_srv.c +index 45c70c7..ff82349 100644 +--- a/src/ruli_srv.c ++++ b/src/ruli_srv.c +@@ -154,7 +154,7 @@ static void *on_walk_answer(ruli_host_t *host_qry, void *qry_arg) + walk_t *walk_qry = (walk_t *) qry_arg; + ruli_srv_t *srv_qry = walk_qry->srv_query; + ruli_srv_entry_t *srv_entry; +- int prev_addr_list_size; ++ __attribute__((unused)) int prev_addr_list_size; + + assert(ruli_host_answer_code(host_qry) != RULI_SRV_CODE_VOID); + +-- +2.24.0 + diff --git a/meta-networking/recipes-support/ruli/files/Makefile.patch b/meta-networking/recipes-support/ruli/files/Makefile.patch deleted file mode 100644 index 60789a3d56..0000000000 --- a/meta-networking/recipes-support/ruli/files/Makefile.patch +++ /dev/null @@ -1,122 +0,0 @@ -diff -Naur patch.org/ruli-0.36/Makefile patch.new/ruli-0.36/Makefile ---- ruli-0.36/Makefile 2015-09-10 15:14:13.952262350 -0400 -+++ ruli-0.36/Makefile 2015-09-10 15:14:38.628261620 -0400 -@@ -7,17 +7,17 @@ - .PHONY: default - default: - $(MAKE) -C src -- $(MAKE) -C sample -+# $(MAKE) -C sample - - .PHONY: clean - clean: - $(MAKE) -C src clean -- $(MAKE) -C sample clean -+# $(MAKE) -C sample clean - - .PHONY: install - install: - $(MAKE) -C src install -- $(MAKE) -C sample install -+# $(MAKE) -C sample install - - .PHONY: dpkg - dpkg: - -===================================================================== - -diff -Naur patch.org/git/src/Makefile patch.new/git/src/Makefile ---- ruli-0.36/src/Makefile 2005-06-13 12:34:53.000000000 -0400 -+++ ruli-0.36/src/Makefile 2015-09-11 09:46:06.290287347 -0400 -@@ -18,9 +18,9 @@ - # - # Debian packaging likes this: OOP_BASE_DIR = /usr - # --OOP_BASE_DIR = /usr/local/oop --OOP_INCLUDE_DIR = $(OOP_BASE_DIR)/include --OOP_LIB_DIR = $(OOP_BASE_DIR)/lib -+#OOP_BASE_DIR = /usr/local/oop -+OOP_INCLUDE_DIR = ${PKG_CONFIG_SYSROOT_DIR}/$(includedir)/ -+#OOP_LIB_DIR = $(OOP_BASE_DIR)/lib - - # - # INSTALL_BASE_DIR indicates where RULI -@@ -30,11 +30,11 @@ - # - # Debian packaging likes this: INSTALL_BASE_DIR = $(DESTDIR)/usr - # --INSTALL_BASE_DIR = ../install/ruli --INSTALL_INCLUDE_DIR = $(INSTALL_BASE_DIR)/include --INSTALL_LIB_DIR = $(INSTALL_BASE_DIR)/lib --INSTALL_MAN_DIR = $(INSTALL_BASE_DIR)/share/man --INSTALL_MAN3_DIR = $(INSTALL_MAN_DIR)/man3 -+#INSTALL_BASE_DIR = ../install/ruli -+#INSTALL_INCLUDE_DIR = $(INSTALL_BASE_DIR)/include -+#INSTALL_LIB_DIR = $(INSTALL_BASE_DIR)/lib -+#INSTALL_MAN_DIR = $(INSTALL_BASE_DIR)/share/man -+#INSTALL_MAN3_DIR = $(INSTALL_MAN_DIR)/man3 - - # SunOS, Linux - PLATFORM=$(shell uname) -@@ -45,7 +45,7 @@ - - WARN = -pedantic -ansi -Wshadow -Wpointer-arith -Wcast-qual \ - -Wcast-align -Wwrite-strings -Wredundant-decls --CC = gcc -+#CC = gcc - - # gcc-specific options (not valid for g++) - ifeq ($(CC),gcc) -@@ -58,7 +58,7 @@ - FLAGS = $(DEBUG) -O2 -pipe -Wall -g -shared -D_REENTRANT \ - $(DEFINE_SOLARIS) -I. -I$(OOP_INCLUDE_DIR) - SOFT_CFLAGS = $(WARN) $(FLAGS) --CFLAGS = $(WARN) -Werror $(FLAGS) -+CFLAGS = $(WARN) $(FLAGS) - LIBOBJ = ruli_isaac.o ruli_mem.o ruli_rand.o ruli_util.o ruli_list.o \ - ruli_addr.o ruli_sock.o ruli_txt.o ruli_msg.o ruli_fsm.o \ - ruli_res.o ruli_parse.o ruli_host.o ruli_srv.o ruli_conf.o \ -@@ -66,7 +66,7 @@ - ruli_getaddrinfo.o - SHAREDOBJ = $(LIBOBJ:%.o=%.os) - SONAME = libruli.so.4 --LDFLAGS = -L$(OOP_LIB_DIR) -+#LDFLAGS = -L$(OOP_LIB_DIR) - - COMPILE = $(CC) $(ARCH) $(CPPFLAGS) $(CFLAGS) -c - SHARED_COMPILE = $(CC) $(ARCH) $(CPPFLAGS) $(SHARED) $(CFLAGS) -o $@ -c -@@ -89,19 +89,19 @@ - strip: ruli - strip $(SONAME) libruli.a - --.PHONY: install --install: ruli -- mkdir -p $(INSTALL_LIB_DIR) $(INSTALL_INCLUDE_DIR) $(INSTALL_MAN3_DIR) -- cp $(SONAME) libruli.a $(INSTALL_LIB_DIR) -- cp *.h $(INSTALL_INCLUDE_DIR) -- cp ../doc/man/*.3 $(INSTALL_MAN3_DIR) -- cd $(INSTALL_LIB_DIR) && ln -s $(SONAME) libruli.so -- @echo -- @echo "REMINDER:" -- @echo "Add $(INSTALL_LIB_DIR) to your dynamic loader path:" -- @echo "# echo $(INSTALL_LIB_DIR) >> /etc/ld.so.conf" -- @echo "# ldconfig" -- @echo -+#.PHONY: install -+#install: ruli -+# mkdir -p $(INSTALL_LIB_DIR) $(INSTALL_INCLUDE_DIR) $(INSTALL_MAN3_DIR) -+# cp $(SONAME) libruli.a $(INSTALL_LIB_DIR) -+# cp *.h $(INSTALL_INCLUDE_DIR) -+# cp ../doc/man/*.3 $(INSTALL_MAN3_DIR) -+# cd $(INSTALL_LIB_DIR) && ln -s $(SONAME) libruli.so -+# @echo -+# @echo "REMINDER:" -+# @echo "Add $(INSTALL_LIB_DIR) to your dynamic loader path:" -+# @echo "# echo $(INSTALL_LIB_DIR) >> /etc/ld.so.conf" -+# @echo "# ldconfig" -+# @echo - - .PHONY: ruli - ruli: $(SONAME) libruli.a - - diff --git a/meta-networking/recipes-support/ruli/files/float-conversion.patch b/meta-networking/recipes-support/ruli/files/float-conversion.patch new file mode 100644 index 0000000000..999f23fc6a --- /dev/null +++ b/meta-networking/recipes-support/ruli/files/float-conversion.patch @@ -0,0 +1,19 @@ +clarify type conversion + +fixes +| ruli_rand.c:54:47: error: implicit conversion from 'unsigned int' to 'float' changes value from 4294967295 to 4294967296 [-Werror,-Wimplicit-int-float-conversion] +| + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- a/src/ruli_rand.c ++++ b/src/ruli_rand.c +@@ -51,7 +51,7 @@ int ruli_rand_next(ruli_rand_t *rand_ctx + + u = isaac_rand(&rand_ctx->isaac_ctx); + +- r = (int) ((float) (1.0 + max - min) * u / ISAAC_UB4MAXVAL + min); ++ r = (int) ((float) (1.0 + max - min) * u / (float) (ISAAC_UB4MAXVAL + min)); + + assert(min <= r); + assert(r <= max); diff --git a/meta-networking/recipes-support/ruli/ruli_0.36.bb b/meta-networking/recipes-support/ruli/ruli_0.36.bb index 885796d2a5..178906b7b5 100644 --- a/meta-networking/recipes-support/ruli/ruli_0.36.bb +++ b/meta-networking/recipes-support/ruli/ruli_0.36.bb @@ -2,24 +2,33 @@ SUMMARY = "RULI stands for Resolver User Layer Interface It's a library built on HOMEPAGE = "http://www.nongnu.org/ruli/" -LICENSE = "GPL-2.0" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" DEPENDS = "liboop" SRC_URI = "http://download.savannah.gnu.org/releases/ruli/ruli_${PV}.orig.tar.gz \ - file://Makefile.patch \ file://0001-Fix-build-with-format-string-checks.patch \ file://0001-src-ruli_addr.c-Add-missing-format-string.patch \ + file://0001-ruli_srv-Mark-prev_addr_list_size-as-unused.patch \ + file://0001-Make-space-for-flags-from-environment.patch \ + file://float-conversion.patch \ " SRC_URI[md5sum] = "e73fbfdeadddb68a703a70cea5271468" SRC_URI[sha256sum] = "11d32def5b514748fbd9ea8c88049ae99e1bb358efc74eb91a4d268a3999dbfa" -do_install1() { - install -d ${D}${includedir}/ruli - install -d ${D}${libdir} - install -m 0644 ${S}/src/ruli*.h ${D}${includedir}/ruli - install -m 0644 ${S}/src/libruli.so ${D}${libdir} - install -m 0644 ${S}/src/libruli.so.4 ${D}${libdir} +EXTRA_OEMAKE = 'CC="${CC}" CPPFLAGS="${CFLAGS}" OOP_BASE_DIR="${STAGING_EXECPREFIXDIR}" \ + INSTALL_BASE_DIR="${D}${exec_prefix}" \ + OOP_LIB_DIR=${STAGING_EXECPREFIXDIR}/${baselib} \ + INSTALL_LIB_DIR=${D}${libdir}' + +do_configure() { + touch configure-stamp +} + +do_install() { + oe_runmake install } + +PACKAGES =+ "${PN}-bin" diff --git a/meta-networking/recipes-support/smcroute/smcroute_2.0.0.bb b/meta-networking/recipes-support/smcroute/smcroute_2.5.7.bb index 9b6fc2f38a..950f6a2e21 100644 --- a/meta-networking/recipes-support/smcroute/smcroute_2.0.0.bb +++ b/meta-networking/recipes-support/smcroute/smcroute_2.5.7.bb @@ -2,12 +2,12 @@ SUMMARY = "Static Multicast Routing Daemon" DESCRIPTION = "SMCRoute is a daemon and command line tool to manipulate the multicast routing table in the UNIX kernel." HOMEPAGE = "http://troglobit.github.io/smcroute.html" SECTION = "net" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -SRCREV = "d6280e64b27d5a4bd7f37dac36b455f4ae5f9ab3" -SRC_URI = "git://github.com/troglobit/smcroute.git;branch=master;protocol=git" +SRCREV = "b315d06ddb0dad16a52fe91e5831b4030ce37010" +SRC_URI = "git://github.com/troglobit/smcroute.git;branch=master;protocol=https" S = "${WORKDIR}/git" -inherit autotools +inherit autotools pkgconfig diff --git a/meta-networking/recipes-support/sngrep/sngrep_1.8.1.bb b/meta-networking/recipes-support/sngrep/sngrep_1.8.1.bb new file mode 100644 index 0000000000..50248078a2 --- /dev/null +++ b/meta-networking/recipes-support/sngrep/sngrep_1.8.1.bb @@ -0,0 +1,37 @@ +SUMMARY = "Ncurses SIP Messages flow viewer" +DESCRIPTION = "Tool for displaying SIP calls message flows from terminal" +HOMEPAGE = "https://github.com/irontec/sngrep" +BUGTRACKER = "https://github.com/irontec/sngrep/issues" +SECTION = "console/network" +LICENSE = "GPL-3.0-or-later & OpenSSL" +LIC_FILES_CHKSUM = "\ + file://LICENSE;md5=d32239bcb673463ab874e80d47fae504 \ + file://LICENSE.OpenSSL;md5=e39170c41c6f83de36426dbf49a03632 \ + file://README;beginline=100;endline=124;md5=758a88cf2b27572df05996a3810066b3 \ +" + +DEPENDS = "\ + libpcap \ + ncurses \ +" + +SRC_URI = "git://github.com/irontec/sngrep.git;protocol=https;branch=master" +SRCREV = "373abb90804ba71f980c7120e62f90d3a5c81213" + +S = "${WORKDIR}/git" + +inherit cmake pkgconfig + +PACKAGECONFIG ?= "\ + openssl \ + ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ + unicode \ +" + +PACKAGECONFIG[openssl] = "-DWITH_OPENSSL=ON,-DWITH_OPENSSL=OFF,openssl" +PACKAGECONFIG[gnutls] = "-DWITH_GNUTLS=ON,-DWITH_GNUTLS=OFF,gnutls libgcrypt" +PACKAGECONFIG[pcre] = "-DWITH_PCRE=OFF,-DWITH_PCRE=OFF,libpcre" +PACKAGECONFIG[zlib] = "-DWITH_ZLIB=ON,-DWITH_ZLIB=OFF,zlib" +PACKAGECONFIG[unicode] = "-DWITH_UNICODE=ON,-DWITH_UNICODE=OFF" +PACKAGECONFIG[ipv6] = "-DUSE_IPV6=ON,-DUSE_IPV6=OFF" +PACKAGECONFIG[eep] = "-DUSE_EEP=ON,-DUSE_EEP=OFF" diff --git a/meta-networking/recipes-support/spice/libcacard_2.8.1.bb b/meta-networking/recipes-support/spice/libcacard_2.8.1.bb new file mode 100644 index 0000000000..65f2f80ace --- /dev/null +++ b/meta-networking/recipes-support/spice/libcacard_2.8.1.bb @@ -0,0 +1,17 @@ +SUMMARY = "This library provides emulation of smart cards to a virtual card reader running in a guest virtual machine." +LICENSE = "LGPL-2.1-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=79ffa0ec772fa86740948cb7327a0cc7" + +DEPENDS = "glib-2.0 pcsc-lite nss" + +SRCREV = "7b07684ea6698d4885ff2062350ad8798a04de42" + +SRC_URI = "git://gitlab.freedesktop.org/spice/libcacard.git;protocol=https;branch=master" + +S = "${WORKDIR}/git" + +inherit meson pkgconfig + +do_configure:prepend() { + echo ${PV} > ${S}/.tarball-version +} diff --git a/meta-networking/recipes-support/spice/phodav_3.0.bb b/meta-networking/recipes-support/spice/phodav_3.0.bb new file mode 100644 index 0000000000..08c65eb259 --- /dev/null +++ b/meta-networking/recipes-support/spice/phodav_3.0.bb @@ -0,0 +1,24 @@ +SUMMARY = "phodav is a WebDav server implementation using libsoup (RFC 4918)." +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +DEPENDS = " \ + glib-2.0 \ + libsoup \ +" + +GTKDOC_MESON_OPTION = 'gtk_doc' +GTKDOC_MESON_ENABLE_FLAG = 'enabled' +GTKDOC_MESON_DISABLE_FLAG = 'disabled' + +PACKAGECONFIG ??= "avahi" +PACKAGECONFIG[avahi] = "-Davahi=enabled,-Davahi=disabled,avahi" + +inherit pkgconfig gnomebase gettext gtk-doc + +EXTRA_OEMESON += "-Dsystemdsystemunitdir=${systemd_system_unitdir}" + +SRC_URI = "https://download.gnome.org/sources/phodav/3.0/phodav-${PV}.tar.xz;name=archive" +SRC_URI[archive.sha256sum] = "392ec2d06d50300dcff1ef269a2a985304e29bce3520002fca29f2edc1d138d1" + +FILES:${PN} += "${libdir} ${systemd_system_unitdir}" diff --git a/meta-networking/recipes-support/spice/spice-gtk_0.42.bb b/meta-networking/recipes-support/spice/spice-gtk_0.42.bb new file mode 100644 index 0000000000..c8a3f7f532 --- /dev/null +++ b/meta-networking/recipes-support/spice/spice-gtk_0.42.bb @@ -0,0 +1,69 @@ +SUMMARY = "A Gtk client and libraries for SPICE remote desktop servers." +HOMEPAGE = "https://spice-space.org" +LICENSE = "LGPL-2.1-only & BSD-3-Clause & GPL-2.0-only" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=4fbd65380cdd255951079008b364516c \ + file://subprojects/spice-common/COPYING;md5=4b54a1fd55a448865a0b32d41598759d \ + file://subprojects/keycodemapdb/LICENSE.BSD;md5=5ae30ba4123bc4f2fa49aa0b0dce887b \ + file://subprojects/keycodemapdb/LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ +" + +SRCREV = "f04479c16f0969fb394ebe74b6eff74e560a42f0" + +SRC_URI = "gitsm://gitlab.freedesktop.org/spice/spice-gtk.git;protocol=https;branch=master" + +S = "${WORKDIR}/git" + +DEPENDS = " \ + ${@bb.utils.filter('DISTRO_FEATURES', 'polkit', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland wayland-native wayland-protocols', '', d)} \ + acl \ + cyrus-sasl \ + gstreamer1.0 \ + gstreamer1.0-plugins-base \ + gstreamer1.0-vaapi \ + gtk+3 \ + jpeg \ + json-glib \ + libcap-ng \ + libepoxy \ + libopus \ + libusb1 \ + lz4 \ + pixman \ + python3-pyparsing-native \ + python3-six-native \ + spice-protocol \ + usbredir \ + usbutils \ + zlib \ +" +DEPENDS:append:libc-musl = " libucontext" + +RDEPENDS:${PN} = "python3-pyparsing python3-six hwdata" + +inherit meson pkgconfig vala gobject-introspection features_check gtk-doc + +REQUIRED_DISTRO_FEATURES = "opengl" + +GIR_MESON_ENABLE_FLAG = 'enabled' +GIR_MESON_DISABLE_FLAG = 'disabled' +GTKDOC_MESON_OPTION = 'gtk_doc' +GTKDOC_MESON_ENABLE_FLAG = 'enabled' +GTKDOC_MESON_DISABLE_FLAG = 'disabled' + +do_configure:prepend() { + echo ${PV} > ${S}/.tarball-version +} + +PACKAGECONFIG ??= "${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'vapi', '', d)} smartcard" +PACKAGECONFIG[vapi] = "-Dvapi=enabled,-Dvapi=disabled" +PACKAGECONFIG[smartcard] = "-Dsmartcard=enabled,-Dsmartcard=disabled,libcacard" +PACKAGECONFIG[webdav] = "-Dwebdav=enabled,-Dwebdav=disabled,phodav libsoup" + +EXTRA_OEMESON = "-Dpie=true -Dusb-ids-path=${datadir}/hwdata/usb.ids " +EXTRA_OEMESON:append:libc-musl = " -Dcoroutine=libucontext" + +LDFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' -Wl,--undefined-version', '', d)}" + +FILES:${PN} += "${datadir}" diff --git a/meta-networking/recipes-support/spice/spice-guest-vdagent_0.22.1.bb b/meta-networking/recipes-support/spice/spice-guest-vdagent_0.22.1.bb new file mode 100644 index 0000000000..3af973eed1 --- /dev/null +++ b/meta-networking/recipes-support/spice/spice-guest-vdagent_0.22.1.bb @@ -0,0 +1,25 @@ +SUMMARY = "Spice agent for Linux" +HOMEPAGE = "https://spice-space.org" +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +SRCREV = "aa08162f036840d3e33502dc0a836b03b9cec97c" + +SRC_URI = "git://gitlab.freedesktop.org/spice/linux/vd_agent.git;protocol=https;branch=master" + +S = "${WORKDIR}/git" + +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" +REQUIRED_DISTRO_FEATURES = "opengl x11" + +inherit autotools pkgconfig features_check + +DEPENDS = "glib-2.0 alsa-lib gtk4 dbus libdrm spice-protocol libxfixes xrandr xinerama libx11" + +EXTRA_OECONF = " \ + --with-gtk4 \ + --enable-pie \ +" + +FILES:${PN} += "${datadir}" + diff --git a/meta-networking/recipes-support/spice/spice-protocol_0.14.4.bb b/meta-networking/recipes-support/spice/spice-protocol_0.14.4.bb new file mode 100644 index 0000000000..3c8458baac --- /dev/null +++ b/meta-networking/recipes-support/spice/spice-protocol_0.14.4.bb @@ -0,0 +1,21 @@ +# +# Copyright (C) 2013 Wind River Systems, Inc. +# + +SUMMARY = "Simple Protocol for Independent Computing Environments (protocol definition" +HOMEPAGE = "https://spice-space.org" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=b37311cb5604f3e5cc2fb0fd23527e95" + +SRCREV = "6f453a775d87087c6ba59fc180c1a1e466631a47" + +SRC_URI = "git://gitlab.freedesktop.org/spice/spice-protocol.git;protocol=https;branch=master" + +S = "${WORKDIR}/git" + +inherit meson pkgconfig + +ALLOW_EMPTY:${PN} = "1" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-networking/recipes-support/spice/spice_git.bb b/meta-networking/recipes-support/spice/spice_git.bb new file mode 100644 index 0000000000..419316a26e --- /dev/null +++ b/meta-networking/recipes-support/spice/spice_git.bb @@ -0,0 +1,48 @@ +# +# Copyright (C) 2013 Wind River Systems, Inc. +# + +SUMMARY = "Simple Protocol for Independent Computing Environments" +DESCRIPTION = "SPICE (the Simple Protocol for Independent Computing \ +Environments) is a remote-display system built for virtual \ +environments which allows users to view a computing 'desktop' \ +environment - not only on its computer-server machine, but also from \ +anywhere on the Internet and using a wide variety of machine \ +architectures." + +LICENSE = "LGPL-2.1-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +PV = "0.15.2" + +SRCREV = "0c2c1413a8b387ea597a95b6c867470a7c56c8ab" + +SRC_URI = "gitsm://gitlab.freedesktop.org/spice/spice;branch=master;protocol=https" + +S = "${WORKDIR}/git" + +CVE_STATUS[CVE-2018-10893] = "fixed-version: patched already, caused by inaccurate CPE in the NVD database." + +inherit meson gettext python3native python3-dir pkgconfig + +DEPENDS = "spice-protocol jpeg pixman alsa-lib glib-2.0 gdk-pixbuf lz4 orc python3-pyparsing-native python3-six-native glib-2.0-native zlib" +DEPENDS:append:class-nativesdk = " nativesdk-openssl" + +export PYTHON="${STAGING_BINDIR_NATIVE}/python3-native/python3" + +do_configure:prepend() { + echo ${PV} > ${S}/.tarball-version +} + +PACKAGECONFIG:class-native = "" +PACKAGECONFIG:class-nativesdk = "" +PACKAGECONFIG ?= "sasl opus smartcard gstreamer" + +PACKAGECONFIG[gstreamer] = "-Dgstreamer=1.0,-Dgstreamer=no,gstreamer1.0 gstreamer1.0-plugins-base" +PACKAGECONFIG[smartcard] = "-Dsmartcard=enabled,-Dsmartcard=disabled,libcacard,libcacard" +PACKAGECONFIG[sasl] = "-Dsasl=true,-Dsasl=false,cyrus-sasl," +PACKAGECONFIG[opus] = "-Dopus=enabled,-Dopus=disabled,libopus," + +COMPATIBLE_HOST = '(x86_64|i.86|aarch64).*-linux' + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-networking/recipes-support/spice/usbredir_0.13.0.bb b/meta-networking/recipes-support/spice/usbredir_0.13.0.bb new file mode 100644 index 0000000000..3a73f9b189 --- /dev/null +++ b/meta-networking/recipes-support/spice/usbredir_0.13.0.bb @@ -0,0 +1,18 @@ +SUMMARY = "usbredir libraries and utilities" + +LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING.LIB;md5=4b54a1fd55a448865a0b32d41598759d \ +" + +DEPENDS = "libusb1 glib-2.0" + +SRCREV = "5fc0e1c43194d948545941d408f4c10d084eb6ed" + +SRC_URI = "git://gitlab.freedesktop.org/spice/usbredir;branch=main;protocol=https" + +S = "${WORKDIR}/git" + +inherit meson pkgconfig + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-networking/recipes-support/ssmping/files/0001-Makefile-tweak-install-dir.patch b/meta-networking/recipes-support/ssmping/files/0001-Makefile-tweak-install-dir.patch index 0cb981cf7a..4e1498a366 100644 --- a/meta-networking/recipes-support/ssmping/files/0001-Makefile-tweak-install-dir.patch +++ b/meta-networking/recipes-support/ssmping/files/0001-Makefile-tweak-install-dir.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Makefile: tweak install dir For oe-core, the man doc should be installed to /usr/share/man rather than /usr/locale/man. -Upstream-Status: inappropriate (oe specific) +Upstream-Status: Inappropriate [oe specific] Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- diff --git a/meta-networking/recipes-support/ssmping/ssmping_0.9.1.bb b/meta-networking/recipes-support/ssmping/ssmping_0.9.1.bb index 0531ffe640..2d63119750 100644 --- a/meta-networking/recipes-support/ssmping/ssmping_0.9.1.bb +++ b/meta-networking/recipes-support/ssmping/ssmping_0.9.1.bb @@ -15,3 +15,7 @@ CFLAGS += "-D_GNU_SOURCE " do_install() { oe_runmake 'DESTDIR=${D}' 'PREFIX=${prefix}' install } + +# http://errors.yoctoproject.org/Errors/Details/766895/ +# ssmping.c:55:51: error: passing argument 3 of 'getsockname' from incompatible pointer type [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-networking/recipes-support/ssmtp/ssmtp/0001-include-libgen.h-for-basename.patch b/meta-networking/recipes-support/ssmtp/ssmtp/0001-include-libgen.h-for-basename.patch new file mode 100644 index 0000000000..094ba5afa2 --- /dev/null +++ b/meta-networking/recipes-support/ssmtp/ssmtp/0001-include-libgen.h-for-basename.patch @@ -0,0 +1,32 @@ +From b48840952ec9a68363bed960e98dd6c7aaa3acec Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 25 Mar 2024 11:55:59 -0700 +Subject: [PATCH] include libgen.h for basename + +basename prototype has been removed from string.h from latest musl [1] +compilers e.g. clang-18 flags the absense of prototype as error. therefore +include libgen.h for providing it. + +[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + ssmtp.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/ssmtp.c b/ssmtp.c +index 0a719ac..4dedaf8 100644 +--- a/ssmtp.c ++++ b/ssmtp.c +@@ -23,6 +23,7 @@ + #include <signal.h> + #include <setjmp.h> + #include <string.h> ++#include <libgen.h> + #include <ctype.h> + #include <netdb.h> + #ifdef HAVE_SSL +-- +2.44.0 + diff --git a/meta-networking/recipes-support/ssmtp/ssmtp/0001-ssmtp-Correct-the-null-pointer-assignment-to-char-po.patch b/meta-networking/recipes-support/ssmtp/ssmtp/0001-ssmtp-Correct-the-null-pointer-assignment-to-char-po.patch new file mode 100644 index 0000000000..c7468fe17f --- /dev/null +++ b/meta-networking/recipes-support/ssmtp/ssmtp/0001-ssmtp-Correct-the-null-pointer-assignment-to-char-po.patch @@ -0,0 +1,51 @@ +From 58cfb4f86b7fbf19eb643dfba87fdd890b3d4a4a Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 24 Aug 2022 19:27:31 -0700 +Subject: [PATCH] ssmtp: Correct the null pointer assignment to char pointers + +Fixes +error: incompatible integer to pointer conversion initializing 'char *' with an expression of type 'char' [-Wint-conversion] +| char *from = (char)NULL; /* Use this as the From: address */ + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + ssmtp.c | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +diff --git a/ssmtp.c b/ssmtp.c +index a74ba4e..0a719ac 100644 +--- a/ssmtp.c ++++ b/ssmtp.c +@@ -55,21 +55,21 @@ bool_t use_oldauth = False; /* use old AUTH LOGIN username style */ + + #define ARPADATE_LENGTH 32 /* Current date in RFC format */ + char arpadate[ARPADATE_LENGTH]; +-char *auth_user = (char)NULL; +-char *auth_pass = (char)NULL; +-char *auth_method = (char)NULL; /* Mechanism for SMTP authentication */ +-char *mail_domain = (char)NULL; +-char *from = (char)NULL; /* Use this as the From: address */ ++char *auth_user = NULL; ++char *auth_pass = NULL; ++char *auth_method = NULL; /* Mechanism for SMTP authentication */ ++char *mail_domain = NULL; ++char *from = NULL; /* Use this as the From: address */ + char *hostname; + char *mailhost = "mailhub"; +-char *minus_f = (char)NULL; +-char *minus_F = (char)NULL; ++char *minus_f = NULL; ++char *minus_F = NULL; + char *gecos; +-char *prog = (char)NULL; ++char *prog = NULL; + char *root = NULL; + char *tls_cert = "/etc/ssl/certs/ssmtp.pem"; /* Default Certificate */ +-char *uad = (char)NULL; +-char *config_file = (char)NULL; /* alternate configuration file */ ++char *uad = NULL; ++char *config_file = NULL; /* alternate configuration file */ + + headers_t headers, *ht; + diff --git a/meta-networking/recipes-support/ssmtp/ssmtp_2.64.bb b/meta-networking/recipes-support/ssmtp/ssmtp_2.64.bb index 07e3ffed42..499a79d1ed 100644 --- a/meta-networking/recipes-support/ssmtp/ssmtp_2.64.bb +++ b/meta-networking/recipes-support/ssmtp/ssmtp_2.64.bb @@ -1,18 +1,20 @@ SUMMARY = "extremely simple MTA to get mail off the system to a mail hub" HOMEPAGE = "http://packages.qa.debian.org/s/ssmtp.html" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=0c56db0143f4f80c369ee3af7425af6e" SRC_URI = "${DEBIAN_MIRROR}/main/s/${BPN}/${BPN}_${PV}.orig.tar.bz2 \ file://ssmtp-bug584162-fix.patch \ file://build-ouside_srcdir.patch \ file://use-DESTDIR.patch \ -" + file://0001-ssmtp-Correct-the-null-pointer-assignment-to-char-po.patch \ + file://0001-include-libgen.h-for-basename.patch \ + " SRC_URI[md5sum] = "65b4e0df4934a6cd08c506cabcbe584f" SRC_URI[sha256sum] = "22c37dc90c871e8e052b2cab0ad219d010fa938608cd66b21c8f3c759046fa36" -inherit autotools +inherit autotools update-alternatives PACKAGECONFIG ?= "ssl ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" @@ -25,7 +27,7 @@ EXTRA_OEMAKE = "GEN_CONFIG='/bin/true'" LDFLAGS += "${@bb.utils.contains('PACKAGECONFIG', 'ssl', '-lssl -lcrypto', '', d)}" -do_install_append () { +do_install:append () { install -d ${D}${mandir}/ mv ${D}${exec_prefix}/man/* ${D}${mandir}/ rmdir ${D}${exec_prefix}/man @@ -33,3 +35,10 @@ do_install_append () { ln -s ssmtp ${D}${sbindir}/newaliases ln -s ssmtp ${D}${sbindir}/mailq } + +ALTERNATIVE_PRIORITY_${PN} = "100" + +ALTERNATIVE:${PN} = "mailq newaliases sendmail" +ALTERNATIVE_LINK_NAME[sendmail] = "${sbindir}/sendmail" +ALTERNATIVE_LINK_NAME[newaliases] = "${sbindir}/newaliases" +ALTERNATIVE_LINK_NAME[mailq] = "${sbindir}/mailq" diff --git a/meta-networking/recipes-support/strongswan/files/0001-memory.h-Include-stdint.h-for-uintptr_t.patch b/meta-networking/recipes-support/strongswan/files/0001-memory.h-Include-stdint.h-for-uintptr_t.patch deleted file mode 100644 index 7ebc398180..0000000000 --- a/meta-networking/recipes-support/strongswan/files/0001-memory.h-Include-stdint.h-for-uintptr_t.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 2a3ab04bbdc4624792886aa51579eadb427ef99e Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 27 Jun 2017 07:42:11 -0700 -Subject: [PATCH] memory.h: Include stdint.h for uintptr_t - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/libstrongswan/utils/utils/memory.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/libstrongswan/utils/utils/memory.h b/src/libstrongswan/utils/utils/memory.h -index b978e7c..55aaaf5 100644 ---- a/src/libstrongswan/utils/utils/memory.h -+++ b/src/libstrongswan/utils/utils/memory.h -@@ -22,6 +22,8 @@ - #ifndef MEMORY_H_ - #define MEMORY_H_ - -+#include <stdint.h> -+ - /** - * Helper function that compares two binary blobs for equality - */ --- -2.13.2 - diff --git a/meta-networking/recipes-support/strongswan/files/fix-funtion-parameter.patch b/meta-networking/recipes-support/strongswan/files/fix-funtion-parameter.patch deleted file mode 100644 index da96983e6d..0000000000 --- a/meta-networking/recipes-support/strongswan/files/fix-funtion-parameter.patch +++ /dev/null @@ -1,98 +0,0 @@ -fix the function parameter - -Upstream-Status: pending - -Original openssl_diffie_hellman_create has three parameters, but -it is reassigned a function pointer which has one parameter, and -is called with one parameter, which will lead to segment fault -on PPC, Now we simply correct the number of parameters. - - #0 0x484d4aa0 in __GI_raise (sig=6) - at ../nptl/sysdeps/unix/sysv/linux/raise.c:64 - #1 0x484d9930 in __GI_abort () at abort.c:91 - #2 0x10002064 in segv_handler (signal=11) at charon.c:224 - #3 <signal handler called> - #4 0x48d89630 in openssl_diffie_hellman_create (group=MODP_1024_BIT, g=..., - p=<error reading variable: Cannot access memory at address 0x0>) - at openssl_diffie_hellman.c:143 - #5 0x482c54f8 in create_dh (this=0x11ac6e68, group=MODP_1024_BIT) - at crypto/crypto_factory.c:358 - #6 0x48375884 in create_dh (this=<optimized out>, group=<optimized out>) - at sa/keymat.c:132 - #7 0x483843b8 in process_payloads (this=0x51400a78, message=<optimized - out>) - at sa/tasks/ike_init.c:200 - #8 0x483844d0 in process_r (this=0x51400a78, message=0x51500778) - at sa/tasks/ike_init.c:319 - #9 0x48374c9c in process_request (message=0x51500778, this=0x51400d20) - at sa/task_manager.c:870 - #10 process_message (this=0x51400d20, msg=0x51500778) at - sa/task_manager.c:925 - #11 0x4836c378 in process_message (this=0x514005f0, message=0x51500778) - at sa/ike_sa.c:1317 - #12 0x48362270 in execute (this=0x515008d0) - at processing/jobs/process_message_job.c:74 - -Signed-off-by: Roy.Li <rongqing.li@windriver.com> ---- - src/libstrongswan/plugins/openssl/openssl_diffie_hellman.c | 8 +++++++- - src/libstrongswan/plugins/openssl/openssl_diffie_hellman.h | 4 +++- - src/libstrongswan/plugins/openssl/openssl_plugin.c | 1 + - 3 files changed, 11 insertions(+), 2 deletions(-) - -diff --git a/src/libstrongswan/plugins/openssl/openssl_diffie_hellman.c b/src/libstrongswan/plugins/openssl/openssl_diffie_hellman.c -index ff33824..bd21446 100644 ---- a/src/libstrongswan/plugins/openssl/openssl_diffie_hellman.c -+++ b/src/libstrongswan/plugins/openssl/openssl_diffie_hellman.c -@@ -142,7 +142,7 @@ METHOD(diffie_hellman_t, destroy, void, - /* - * Described in header. - */ --openssl_diffie_hellman_t *openssl_diffie_hellman_create( -+openssl_diffie_hellman_t *openssl_diffie_hellman_create_custom( - diffie_hellman_group_t group, chunk_t g, chunk_t p) - { - private_openssl_diffie_hellman_t *this; -@@ -197,5 +197,11 @@ openssl_diffie_hellman_t *openssl_diffie_hellman_create( - - return &this->public; - } -+openssl_diffie_hellman_t *openssl_diffie_hellman_create( diffie_hellman_group_t group) -+{ -+ chunk_t g; -+ chunk_t p; -+ openssl_diffie_hellman_create_custom(group, g, p); -+} - - #endif /* OPENSSL_NO_DH */ -diff --git a/src/libstrongswan/plugins/openssl/openssl_diffie_hellman.h b/src/libstrongswan/plugins/openssl/openssl_diffie_hellman.h -index 53dc59c..eb69eaa 100644 ---- a/src/libstrongswan/plugins/openssl/openssl_diffie_hellman.h -+++ b/src/libstrongswan/plugins/openssl/openssl_diffie_hellman.h -@@ -44,8 +44,10 @@ struct openssl_diffie_hellman_t { - * @param p custom prime, if MODP_CUSTOM - * @return openssl_diffie_hellman_t object, NULL if not supported - */ --openssl_diffie_hellman_t *openssl_diffie_hellman_create( -+openssl_diffie_hellman_t *openssl_diffie_hellman_create_custom( - diffie_hellman_group_t group, chunk_t g, chunk_t p); -+openssl_diffie_hellman_t *openssl_diffie_hellman_create( -+ diffie_hellman_group_t group); - - #endif /** OPENSSL_DIFFIE_HELLMAN_H_ @}*/ - -diff --git a/src/libstrongswan/plugins/openssl/openssl_plugin.c b/src/libstrongswan/plugins/openssl/openssl_plugin.c -index ff25086..c76873d 100644 ---- a/src/libstrongswan/plugins/openssl/openssl_plugin.c -+++ b/src/libstrongswan/plugins/openssl/openssl_plugin.c -@@ -388,6 +388,7 @@ METHOD(plugin_t, get_features, int, - PLUGIN_PROVIDE(DH, MODP_1024_BIT), - PLUGIN_PROVIDE(DH, MODP_1024_160), - PLUGIN_PROVIDE(DH, MODP_768_BIT), -+ PLUGIN_REGISTER(DH, openssl_diffie_hellman_create_custom), - PLUGIN_PROVIDE(DH, MODP_CUSTOM), - #endif - #ifndef OPENSSL_NO_RSA --- -1.8.3 - diff --git a/meta-networking/recipes-support/strongswan/strongswan_5.5.3.bb b/meta-networking/recipes-support/strongswan/strongswan_5.5.3.bb deleted file mode 100644 index 3fb56bcfe7..0000000000 --- a/meta-networking/recipes-support/strongswan/strongswan_5.5.3.bb +++ /dev/null @@ -1,131 +0,0 @@ -DESCRIPTION = "strongSwan is an OpenSource IPsec implementation for the \ -Linux operating system." -SUMMARY = "strongSwan is an OpenSource IPsec implementation" -HOMEPAGE = "http://www.strongswan.org" -SECTION = "net" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS = "gmp openssl flex-native flex bison-native" - -SRC_URI = "http://download.strongswan.org/strongswan-${PV}.tar.bz2 \ - file://fix-funtion-parameter.patch \ - file://0001-memory.h-Include-stdint.h-for-uintptr_t.patch \ - " - -SRC_URI[md5sum] = "4afffe3c219bb2e04f09510905af836b" -SRC_URI[sha256sum] = "c5ea54b199174708de11af9b8f4ecf28b5b0743d4bc0e380e741f25b28c0f8d4" - -EXTRA_OECONF = " \ - --without-lib-prefix \ -" - -EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}" - - -PACKAGECONFIG ??= "charon curl gmp openssl stroke sqlite3 \ - ${@bb.utils.filter('DISTRO_FEATURES', 'ldap', d)} \ -" -PACKAGECONFIG[aesni] = "--enable-aesni,--disable-aesni,,${PN}-plugin-aesni" -PACKAGECONFIG[charon] = "--enable-charon,--disable-charon," -PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl,${PN}-plugin-curl" -PACKAGECONFIG[gmp] = "--enable-gmp,--disable-gmp,gmp,${PN}-plugin-gmp" -PACKAGECONFIG[ldap] = "--enable-ldap,--disable-ldap,openldap,${PN}-plugin-ldap" -PACKAGECONFIG[mysql] = "--enable-mysql,--disable-mysql,mysql5,${PN}-plugin-mysql" -PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl,${PN}-plugin-openssl" -PACKAGECONFIG[scep] = "--enable-scepclient,--disable-scepclient," -PACKAGECONFIG[soup] = "--enable-soup,--disable-soup,libsoup-2.4,${PN}-plugin-soup" -PACKAGECONFIG[sqlite3] = "--enable-sqlite,--disable-sqlite,sqlite3,${PN}-plugin-sqlite" -PACKAGECONFIG[stroke] = "--enable-stroke,--disable-stroke,,${PN}-plugin-stroke" -PACKAGECONFIG[swanctl] = "--enable-swanctl,--disable-swanctl,,libgcc" - -# requires swanctl -PACKAGECONFIG[systemd-charon] = "--enable-systemd,--disable-systemd,systemd," - -inherit autotools systemd pkgconfig - -RRECOMMENDS_${PN} = "kernel-module-ipsec" - -FILES_${PN} += "${libdir}/ipsec/lib*${SOLIBS}" -FILES_${PN}-dbg += "${bindir}/.debug ${libdir}/ipsec/.debug ${libexecdir}/ipsec/.debug" -FILES_${PN}-dev += "${libdir}/ipsec/lib*${SOLIBSDEV} ${libdir}/ipsec/*.la" -FILES_${PN}-staticdev += "${libdir}/ipsec/*.a" - -CONFFILES_${PN} = "${sysconfdir}/*.conf ${sysconfdir}/ipsec.d/*.conf ${sysconfdir}/strongswan.d/*.conf" - -PACKAGES += "${PN}-plugins" -ALLOW_EMPTY_${PN}-plugins = "1" - -PACKAGES_DYNAMIC += "^${PN}-plugin-.*$" -NOAUTOPACKAGEDEBUG = "1" - -python split_strongswan_plugins () { - sysconfdir = d.expand('${sysconfdir}/strongswan.d/charon') - libdir = d.expand('${libdir}/ipsec/plugins') - dbglibdir = os.path.join(libdir, '.debug') - - def add_plugin_conf(f, pkg, file_regex, output_pattern, modulename): - dvar = d.getVar('PKGD', True) - oldfiles = d.getVar('CONFFILES_' + pkg, True) - newfile = '/' + os.path.relpath(f, dvar) - - if not oldfiles: - d.setVar('CONFFILES_' + pkg, newfile) - else: - d.setVar('CONFFILES_' + pkg, oldfiles + " " + newfile) - - split_packages = do_split_packages(d, libdir, 'libstrongswan-(.*)\.so', '${PN}-plugin-%s', 'strongSwan %s plugin', prepend=True) - do_split_packages(d, sysconfdir, '(.*)\.conf', '${PN}-plugin-%s', 'strongSwan %s plugin', prepend=True, hook=add_plugin_conf) - - split_dbg_packages = do_split_packages(d, dbglibdir, 'libstrongswan-(.*)\.so', '${PN}-plugin-%s-dbg', 'strongSwan %s plugin - Debugging files', prepend=True, extra_depends='${PN}-dbg') - split_dev_packages = do_split_packages(d, libdir, 'libstrongswan-(.*)\.la', '${PN}-plugin-%s-dev', 'strongSwan %s plugin - Development files', prepend=True, extra_depends='${PN}-dev') - split_staticdev_packages = do_split_packages(d, libdir, 'libstrongswan-(.*)\.a', '${PN}-plugin-%s-staticdev', 'strongSwan %s plugin - Development files (Static Libraries)', prepend=True, extra_depends='${PN}-staticdev') - - if split_packages: - pn = d.getVar('PN', True) - d.setVar('RRECOMMENDS_' + pn + '-plugins', ' '.join(split_packages)) - d.appendVar('RRECOMMENDS_' + pn + '-dbg', ' ' + ' '.join(split_dbg_packages)) - d.appendVar('RRECOMMENDS_' + pn + '-dev', ' ' + ' '.join(split_dev_packages)) - d.appendVar('RRECOMMENDS_' + pn + '-staticdev', ' ' + ' '.join(split_staticdev_packages)) -} - -PACKAGESPLITFUNCS_prepend = "split_strongswan_plugins " - -# Install some default plugins based on default strongSwan ./configure options -# See https://wiki.strongswan.org/projects/strongswan/wiki/Pluginlist -RDEPENDS_${PN} += "\ - ${PN}-plugin-aes \ - ${PN}-plugin-attr \ - ${PN}-plugin-cmac \ - ${PN}-plugin-constraints \ - ${PN}-plugin-des \ - ${PN}-plugin-dnskey \ - ${PN}-plugin-hmac \ - ${PN}-plugin-kernel-netlink \ - ${PN}-plugin-md5 \ - ${PN}-plugin-nonce \ - ${PN}-plugin-pem \ - ${PN}-plugin-pgp \ - ${PN}-plugin-pkcs1 \ - ${PN}-plugin-pkcs7 \ - ${PN}-plugin-pkcs8 \ - ${PN}-plugin-pkcs12 \ - ${PN}-plugin-pubkey \ - ${PN}-plugin-random \ - ${PN}-plugin-rc2 \ - ${PN}-plugin-resolve \ - ${PN}-plugin-revocation \ - ${PN}-plugin-sha1 \ - ${PN}-plugin-sha2 \ - ${PN}-plugin-socket-default \ - ${PN}-plugin-sshkey \ - ${PN}-plugin-updown \ - ${PN}-plugin-vici \ - ${PN}-plugin-x509 \ - ${PN}-plugin-xauth-generic \ - ${PN}-plugin-xcbc \ - " - -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -RCONFLICTS_${PN} += "${PN}-systemd" -SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'swanctl', '${BPN}-swanctl.service', '${BPN}.service', d)}" diff --git a/meta-networking/recipes-support/strongswan/strongswan_5.9.14.bb b/meta-networking/recipes-support/strongswan/strongswan_5.9.14.bb new file mode 100644 index 0000000000..2e2da8274b --- /dev/null +++ b/meta-networking/recipes-support/strongswan/strongswan_5.9.14.bb @@ -0,0 +1,194 @@ +DESCRIPTION = "strongSwan is an OpenSource IPsec implementation for the \ +Linux operating system." +SUMMARY = "strongSwan is an OpenSource IPsec implementation" +HOMEPAGE = "http://www.strongswan.org" +SECTION = "net" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +DEPENDS = "flex-native flex bison-native" +DEPENDS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'tpm2', ' tpm2-tss', '', d)}" + +SRC_URI = "https://download.strongswan.org/strongswan-${PV}.tar.bz2 \ + " + +SRC_URI[sha256sum] = "728027ddda4cb34c67c4cec97d3ddb8c274edfbabdaeecf7e74693b54fc33678" + +UPSTREAM_CHECK_REGEX = "strongswan-(?P<pver>\d+(\.\d+)+)\.tar" + +EXTRA_OECONF = " \ + --without-lib-prefix \ + --with-dev-headers=${includedir}/strongswan \ +" + +EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}" + +PACKAGECONFIG ?= "curl gmp openssl sqlite3 swanctl curve25519\ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd-charon', 'charon', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'tpm2', 'tpm2', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ima', 'tnc-imc imc-hcd imc-os imc-scanner imc-attestation', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ima', 'tnc-imv imv-hcd imv-os imv-scanner imv-attestation', '', d)} \ +" + +PACKAGECONFIG[aesni] = "--enable-aesni,--disable-aesni,,${PN}-plugin-aesni" +PACKAGECONFIG[bfd] = "--enable-bfd-backtraces,--disable-bfd-backtraces,binutils" +PACKAGECONFIG[charon] = "--enable-charon,--disable-charon," +PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl,${PN}-plugin-curl" +PACKAGECONFIG[eap-identity] = "--enable-eap-identity,--disable-eap-identity,,${PN}-plugin-eap-identity" +PACKAGECONFIG[eap-mschapv2] = "--enable-eap-mschapv2,--disable-eap-mschapv2,,${PN}-plugin-eap-mschapv2" +PACKAGECONFIG[gmp] = "--enable-gmp,--disable-gmp,gmp,${PN}-plugin-gmp" +PACKAGECONFIG[ldap] = "--enable-ldap,--disable-ldap,openldap,${PN}-plugin-ldap" +PACKAGECONFIG[mysql] = "--enable-mysql,--disable-mysql,mysql5,${PN}-plugin-mysql" +PACKAGECONFIG[nm] = "--enable-nm,--disable-nm,networkmanager,${PN}-nm" +PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl,${PN}-plugin-openssl" +PACKAGECONFIG[soup] = "--enable-soup,--disable-soup,libsoup-2.4,${PN}-plugin-soup" +PACKAGECONFIG[sqlite3] = "--enable-sqlite,--disable-sqlite,sqlite3,${PN}-plugin-sqlite" +PACKAGECONFIG[stroke] = "--enable-stroke,--disable-stroke,,${PN}-plugin-stroke" +PACKAGECONFIG[swanctl] = "--enable-swanctl,--disable-swanctl,,libgcc" +PACKAGECONFIG[curve25519] = "--enable-curve25519,--disable-curve25519,, ${PN}-plugin-curve25519" + +# requires swanctl +PACKAGECONFIG[systemd-charon] = "--enable-systemd,--disable-systemd,systemd," + +# tpm needs meta-tpm layer +PACKAGECONFIG[tpm2] = "--enable-tpm,--disable-tpm,,${PN}-plugin-tpm" + + +# integraty configuration needs meta-integraty +#imc +PACKAGECONFIG[tnc-imc] = "--enable-tnc-imc,--disable-tnc-imc,, ${PN}-plugin-tnc-imc ${PN}-plugin-tnc-tnccs" +PACKAGECONFIG[imc-test] = "--enable-imc-test,--disable-imc-test,," +PACKAGECONFIG[imc-scanner] = "--enable-imc-scanner,--disable-imc-scanner,," +PACKAGECONFIG[imc-os] = "--enable-imc-os,--disable-imc-os,," +PACKAGECONFIG[imc-attestation] = "--enable-imc-attestation,--disable-imc-attestation,," +PACKAGECONFIG[imc-swima] = "--enable-imc-swima, --disable-imc-swima, json-c," +PACKAGECONFIG[imc-hcd] = "--enable-imc-hcd, --disable-imc-hcd,," + +#imv set +PACKAGECONFIG[tnc-imv] = "--enable-tnc-imv,--disable-tnc-imv,, ${PN}-plugin-tnc-imv ${PN}-plugin-tnc-tnccs" +PACKAGECONFIG[imv-test] = "--enable-imv-test,--disable-imv-test,," +PACKAGECONFIG[imv-scanner] = "--enable-imv-scanner,--disable-imv-scanner,," +PACKAGECONFIG[imv-os] = "--enable-imv-os,--disable-imv-os,," +PACKAGECONFIG[imv-attestation] = "--enable-imv-attestation,--disable-imv-attestation,," +PACKAGECONFIG[imv-swima] = "--enable-imv-swima, --disable-imv-swima, json-c," +PACKAGECONFIG[imv-hcd] = "--enable-imv-hcd, --disable-imv-hcd,," + +PACKAGECONFIG[tnc-ifmap] = "--enable-tnc-ifmap,--disable-tnc-ifmap, libxml2, ${PN}-plugin-tnc-ifmap" +PACKAGECONFIG[tnc-pdp] = "--enable-tnc-pdp,--disable-tnc-pdp,, ${PN}-plugin-tnc-pdp" + +PACKAGECONFIG[tnccs-11] = "--enable-tnccs-11,--disable-tnccs-11,libxml2, ${PN}-plugin-tnccs-11" +PACKAGECONFIG[tnccs-20] = "--enable-tnccs-20,--disable-tnccs-20,, ${PN}-plugin-tnccs-20" +PACKAGECONFIG[tnccs-dynamic] = "--enable-tnccs-dynamic,--disable-tnccs-dynamic,,${PN}-plugin-tnccs-dynamic" + +inherit autotools systemd pkgconfig + +RRECOMMENDS:${PN} = "kernel-module-ah4 \ + kernel-module-esp4 \ + kernel-module-xfrm-user \ + " + +FILES:${PN} += "${libdir}/ipsec/lib*${SOLIBS}" +FILES:${PN}-dbg += "${bindir}/.debug ${sbindir}/.debug ${libdir}/ipsec/.debug ${libexecdir}/ipsec/.debug" +FILES:${PN}-dev += "${libdir}/ipsec/lib*${SOLIBSDEV} ${libdir}/ipsec/*.la ${libdir}/ipsec/include/config.h" +FILES:${PN}-staticdev += "${libdir}/ipsec/*.a" + +CONFFILES:${PN} = "${sysconfdir}/*.conf ${sysconfdir}/ipsec.d/*.conf ${sysconfdir}/strongswan.d/*.conf" + +PACKAGES += "${PN}-plugins" +ALLOW_EMPTY:${PN}-plugins = "1" + +PACKAGE_BEFORE_PN = "${PN}-imcvs ${PN}-imcvs-dbg" +ALLOW_EMPTY:${PN}-imcvs = "1" + +FILES:${PN}-imcvs = "${libdir}/ipsec/imcvs/*.so" +FILES:${PN}-imcvs-dbg += "${libdir}/ipsec/imcvs/.debug" + +PACKAGES =+ "${PN}-nm ${PN}-nm-dbg" +FILES:${PN}-nm = "${libexecdir}/ipsec/charon-nm ${datadir}/dbus-1/system.d/nm-strongswan-service.conf" +FILES:${PN}-nm-dbg = "${libexecdir}/ipsec/.debug/charon-nm" + +PACKAGES_DYNAMIC += "^${PN}-plugin-.*$" +NOAUTOPACKAGEDEBUG = "1" + +python split_strongswan_plugins () { + sysconfdir = d.expand('${sysconfdir}/strongswan.d/charon') + libdir = d.expand('${libdir}/ipsec/plugins') + dbglibdir = os.path.join(libdir, '.debug') + + def add_plugin_conf(f, pkg, file_regex, output_pattern, modulename): + dvar = d.getVar('PKGD') + oldfiles = d.getVar('CONFFILES:' + pkg) + newfile = '/' + os.path.relpath(f, dvar) + + if not oldfiles: + d.setVar('CONFFILES:' + pkg, newfile) + else: + d.setVar('CONFFILES:' + pkg, oldfiles + " " + newfile) + + split_packages = do_split_packages(d, libdir, r'libstrongswan-(.*)\.so', '${PN}-plugin-%s', 'strongSwan %s plugin', prepend=True) + do_split_packages(d, sysconfdir, r'(.*)\.conf', '${PN}-plugin-%s', 'strongSwan %s plugin', prepend=True, hook=add_plugin_conf) + + split_dbg_packages = do_split_packages(d, dbglibdir, r'libstrongswan-(.*)\.so', '${PN}-plugin-%s-dbg', 'strongSwan %s plugin - Debugging files', prepend=True, extra_depends='${PN}-dbg') + split_dev_packages = do_split_packages(d, libdir, r'libstrongswan-(.*)\.la', '${PN}-plugin-%s-dev', 'strongSwan %s plugin - Development files', prepend=True, extra_depends='${PN}-dev') + split_staticdev_packages = do_split_packages(d, libdir, r'libstrongswan-(.*)\.a', '${PN}-plugin-%s-staticdev', 'strongSwan %s plugin - Development files (Static Libraries)', prepend=True, extra_depends='${PN}-staticdev') + + if split_packages: + pn = d.getVar('PN') + d.setVar('RRECOMMENDS:' + pn + '-plugins', ' '.join(split_packages)) + d.appendVar('RRECOMMENDS:' + pn + '-dbg', ' ' + ' '.join(split_dbg_packages)) + d.appendVar('RRECOMMENDS:' + pn + '-dev', ' ' + ' '.join(split_dev_packages)) + d.appendVar('RRECOMMENDS:' + pn + '-staticdev', ' ' + ' '.join(split_staticdev_packages)) +} + +PACKAGESPLITFUNCS:prepend = "split_strongswan_plugins " + +# Install some default plugins based on default strongSwan ./configure options +# See https://wiki.strongswan.org/projects/strongswan/wiki/Pluginlist +RDEPENDS:${PN} += "\ + ${PN}-plugin-aes \ + ${PN}-plugin-attr \ + ${PN}-plugin-cmac \ + ${PN}-plugin-constraints \ + ${PN}-plugin-des \ + ${PN}-plugin-dnskey \ + ${PN}-plugin-drbg \ + ${PN}-plugin-fips-prf \ + ${PN}-plugin-gcm \ + ${PN}-plugin-hmac \ + ${PN}-plugin-kdf \ + ${PN}-plugin-kernel-netlink \ + ${PN}-plugin-md5 \ + ${PN}-plugin-mgf1 \ + ${PN}-plugin-nonce \ + ${PN}-plugin-pem \ + ${PN}-plugin-pgp \ + ${PN}-plugin-pkcs1 \ + ${PN}-plugin-pkcs7 \ + ${PN}-plugin-pkcs8 \ + ${PN}-plugin-pkcs12 \ + ${PN}-plugin-pubkey \ + ${PN}-plugin-random \ + ${PN}-plugin-rc2 \ + ${PN}-plugin-resolve \ + ${PN}-plugin-revocation \ + ${PN}-plugin-sha1 \ + ${PN}-plugin-sha2 \ + ${PN}-plugin-socket-default \ + ${PN}-plugin-sshkey \ + ${PN}-plugin-updown \ + ${PN}-plugin-vici \ + ${PN}-plugin-x509 \ + ${PN}-plugin-xauth-generic \ + ${PN}-plugin-xcbc \ + " + +RPROVIDES:${PN} += "${PN}-systemd" +RREPLACES:${PN} += "${PN}-systemd" +RCONFLICTS:${PN} += "${PN}-systemd" + +# The deprecated legacy 'strongswan-starter' service should only be used when charon and +# stroke are enabled. When swanctl is in use, 'strongswan.service' is needed. +# See: https://wiki.strongswan.org/projects/strongswan/wiki/Charon-systemd +SYSTEMD_SERVICE:${PN} = " \ + ${@bb.utils.contains('PACKAGECONFIG', 'swanctl', '${BPN}.service', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'charon', '${BPN}-starter.service', '', d)} \ +" diff --git a/meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch b/meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch index 209b0dd409..82d3551019 100644 --- a/meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch +++ b/meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch @@ -1,3 +1,8 @@ +From 7ff4eba20b5c4fc7365e5ee0dfb775ed29bdd5ce Mon Sep 17 00:00:00 2001 +From: Kai Kang <kai.kang@windriver.com> +Date: Wed, 1 Nov 2017 09:23:41 -0400 +Subject: [PATCH] stunnel: fix compile error when openssl disable des support + Upstream-Status: Pending When openssl disable des support with configure option 'no-des', it doesn't @@ -7,11 +12,15 @@ library conditionaly. Signed-off-by: Kai Kang <kai.kang@windriver.com> --- + src/common.h | 2 ++ + src/protocol.c | 6 +++--- + 2 files changed, 5 insertions(+), 3 deletions(-) + diff --git a/src/common.h b/src/common.h -index f7d38b0..bf485af 100644 +index 2b4869f..180d31a 100644 --- a/src/common.h +++ b/src/common.h -@@ -471,7 +471,9 @@ extern char *sys_errlist[]; +@@ -492,7 +492,9 @@ extern char *sys_errlist[]; #ifndef OPENSSL_NO_MD4 #include <openssl/md4.h> #endif /* !defined(OPENSSL_NO_MD4) */ @@ -22,29 +31,29 @@ index f7d38b0..bf485af 100644 #include <openssl/dh.h> #if OPENSSL_VERSION_NUMBER<0x10100000L diff --git a/src/protocol.c b/src/protocol.c -index 587df09..8198eb6 100644 +index cfe6d3b..3936aea 100644 --- a/src/protocol.c +++ b/src/protocol.c -@@ -66,7 +66,7 @@ NOEXPORT char *imap_server(CLI *, SERVICE_OPTIONS *, const PHASE); - NOEXPORT char *nntp_client(CLI *, SERVICE_OPTIONS *, const PHASE); - NOEXPORT char *connect_server(CLI *, SERVICE_OPTIONS *, const PHASE); - NOEXPORT char *connect_client(CLI *, SERVICE_OPTIONS *, const PHASE); +@@ -81,7 +81,7 @@ NOEXPORT void ldap_client_middle(CLI *); + + NOEXPORT void connect_server_early(CLI *); + NOEXPORT void connect_client_middle(CLI *); -#ifndef OPENSSL_NO_MD4 +#if !defined(OPENSSL_NO_MD4) && !defined(OPENSSL_NO_DES) - NOEXPORT void ntlm(CLI *, SERVICE_OPTIONS *); - NOEXPORT char *ntlm1(); + NOEXPORT void ntlm(CLI *); + NOEXPORT char *ntlm1(void); NOEXPORT char *ntlm3(char *, char *, char *, char *); -@@ -1175,7 +1175,7 @@ NOEXPORT char *connect_client(CLI *c, SERVICE_OPTIONS *opt, const PHASE phase) { - fd_printf(c, c->remote_fd.fd, "Host: %s", opt->protocol_host); - if(opt->protocol_username && opt->protocol_password) { - if(!strcasecmp(opt->protocol_authentication, "ntlm")) { +@@ -1331,7 +1331,7 @@ NOEXPORT void connect_client_middle(CLI *c) { + fd_printf(c, c->remote_fd.fd, "Host: %s", c->opt->protocol_host); + if(c->opt->protocol_username && c->opt->protocol_password) { + if(!strcasecmp(c->opt->protocol_authentication, "ntlm")) { -#ifndef OPENSSL_NO_MD4 +#if !defined(OPENSSL_NO_MD4) && !defined(OPENSSL_NO_DES) - ntlm(c, opt); + ntlm(c); #else s_log(LOG_ERR, "NTLM authentication is not available"); -@@ -1216,7 +1216,7 @@ NOEXPORT char *connect_client(CLI *c, SERVICE_OPTIONS *opt, const PHASE phase) { - return NULL; +@@ -1374,7 +1374,7 @@ NOEXPORT void connect_client_middle(CLI *c) { + str_free(line); } -#ifndef OPENSSL_NO_MD4 @@ -52,3 +61,6 @@ index 587df09..8198eb6 100644 /* * NTLM code is based on the following documentation: +-- +2.34.1 + diff --git a/meta-networking/recipes-support/stunnel/stunnel_5.35.bb b/meta-networking/recipes-support/stunnel/stunnel_5.35.bb deleted file mode 100644 index ec8478d6be..0000000000 --- a/meta-networking/recipes-support/stunnel/stunnel_5.35.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "Program for providing universal TLS/SSL tunneling service" -HOMEPAGE = "http://www.stunnel.org/" -DESCRIPTION = "SSL encryption wrapper between remote client and local (inetd-startable) or remote server." -SECTION = "net" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=866cdc7459d91e092b174388fab8d283" -DEPENDS = "openssl zlib tcp-wrappers" - -RDEPENDS_${PN} += "perl" - -SRC_URI = "ftp://ftp.stunnel.org/stunnel/archive/5.x/${BP}.tar.gz \ - file://fix-openssl-no-des.patch \ -" - -SRC_URI[md5sum] = "9079f5fafbccaf88b7d92b227d78249a" -SRC_URI[sha256sum] = "ffa386ae4c825f35f35157c285e7402a6d58779ad8c3822f74a9d355b54aba1d" - -inherit autotools - -EXTRA_OECONF += "--with-ssl='${STAGING_EXECPREFIXDIR}' --disable-fips" - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 systemd', d)}" -PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd" -PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," diff --git a/meta-networking/recipes-support/stunnel/stunnel_5.72.bb b/meta-networking/recipes-support/stunnel/stunnel_5.72.bb new file mode 100644 index 0000000000..6d21027a16 --- /dev/null +++ b/meta-networking/recipes-support/stunnel/stunnel_5.72.bb @@ -0,0 +1,33 @@ +SUMMARY = "Program for providing universal TLS/SSL tunneling service" +DESCRIPTION = "SSL encryption wrapper between remote client and local (inetd-startable) or remote server." +HOMEPAGE = "https://www.stunnel.org/" +SECTION = "net" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING.md;md5=906ac034adaee9d093318e51b53453ca" + +DEPENDS = "autoconf-archive libnsl2 openssl" + +SRC_URI = "https://stunnel.org/archive/5.x/${BP}.tar.gz \ + file://fix-openssl-no-des.patch \ +" + +SRC_URI[sha256sum] = "3d532941281ae353319735144e4adb9ae489a10b7e309c58a48157f08f42e949" + +inherit autotools bash-completion pkgconfig + +PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 systemd', d)} libwrap" + +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," +PACKAGECONFIG[libwrap] = "--enable-libwrap,--disable-libwrap,tcp-wrappers" +PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd" + +EXTRA_OECONF += "--with-ssl='${STAGING_EXECPREFIXDIR}' --disable-fips" + +# When cross compiling, configure defaults to nobody, but provides no option to change it. +EXTRA_OEMAKE += "DEFAULT_GROUP='nogroup'" + +# stunnel3 is a Perl wrapper to allow use of the legacy stunnel 3.x commandline +# syntax with stunnel >= 4.05 +PACKAGES =+ "stunnel3" +FILES:stunnel3 = "${bindir}/stunnel3" +RDEPENDS:stunnel3 += "${PN} perl" diff --git a/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch b/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch index 196cec7f20..c46de4b963 100644 --- a/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch +++ b/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch @@ -1,20 +1,28 @@ -From 7b259580800e259d232229dc89f97058b56e2fe8 Mon Sep 17 00:00:00 2001 -From: "Hongjun.Yang" <hongjun.yang@windriver.com> -Date: Wed, 22 Oct 2014 10:02:48 +0800 +From 5f0f70192b0e20336e642b02ca9662ba2fef66cf Mon Sep 17 00:00:00 2001 +From: Yi Fan Yu <yifan.yu@windriver.com> +Date: Fri, 19 Feb 2021 15:21:18 -0500 Subject: [PATCH] Add ptest for tcpdump Upstream-Status: Pending Signed-off-by: Hongjun.Yang <hongjun.yang@windriver.com> +Signed-off-by: Peiran Hong <peiran.hong@windriver.com> + +remove perl script not required by ptest causing QA problems + +reference upstream issue/commit: +https://github.com/the-tcpdump-group/tcpdump/issues/26 + +Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com> --- - Makefile.in | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) + Makefile.in | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) -Index: tcpdump-4.9.0/Makefile.in -=================================================================== ---- tcpdump-4.9.0.orig/Makefile.in -+++ tcpdump-4.9.0/Makefile.in -@@ -436,9 +436,17 @@ distclean: +diff --git a/Makefile.in b/Makefile.in +index ea1ef1d0..e7987bd8 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -445,9 +445,18 @@ distclean: tests/failure-outputs.txt rm -rf autom4te.cache tests/DIFF tests/NEW @@ -22,14 +30,18 @@ Index: tcpdump-4.9.0/Makefile.in +buildtest-TESTS: tcpdump + +runtest-PTEST: - (cd tests && ./TESTrun.sh) + $(srcdir)/tests/TESTrun +install-ptest: + cp -r tests $(DESTDIR) ++ rm $(DESTDIR)/tests/setkey2esp-secrets.pl + cp -r config.h $(DESTDIR) + install -m 0755 Makefile $(DESTDIR) -+ ln -sf /usr/sbin/tcpdump $(DESTDIR)/tcpdump ++ ln -s /usr/bin/tcpdump $(DESTDIR)/tcpdump + extags: $(TAGFILES) ctags $(TAGFILES) +-- +2.29.2 + diff --git a/meta-networking/recipes-support/tcpdump/tcpdump/run-ptest b/meta-networking/recipes-support/tcpdump/tcpdump/run-ptest index c03a8b8ef3..2bfb2267da 100755 --- a/meta-networking/recipes-support/tcpdump/tcpdump/run-ptest +++ b/meta-networking/recipes-support/tcpdump/tcpdump/run-ptest @@ -1,5 +1,5 @@ #!/bin/sh make -k runtest-PTEST | sed -e '/: passed/ s/^/PASS: /g' \ - -e '/: failed/ s/^/FAIL: /g' \ + -e '/: TEST FAILED.*/ s/^/FAIL: /g' \ -e 's/: passed//g' \ - -e 's/: failed//g' + -e 's/: TEST FAILED.*//g' diff --git a/meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch b/meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch deleted file mode 100644 index d7a3ac23b1..0000000000 --- a/meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch +++ /dev/null @@ -1,33 +0,0 @@ -unnecessary to check libpcap - -Upstream-Status: Pending - -since the check of libpcap did not consider the cross-compile, lead to the -below error: - This autoconf log indicates errors, it looked at host include and/or - library paths while determining system capabilities. - -In fact, the libpcap has been added into the tcpdump's DEPENDS, not need to -check if libpcap existed. - -Signed-off-by: Roy Li <rongqing.li@windriver.com> ---- - configure.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.in b/configure.in -index 06fade1..9125de7 100644 ---- a/configure.in -+++ b/configure.in -@@ -567,7 +567,7 @@ AC_SEARCH_LIBS(getrpcbynumber, nsl, - dnl AC_CHECK_LIB(z, uncompress) - dnl AC_CHECK_HEADERS(zlib.h) - --AC_LBL_LIBPCAP(V_PCAPDEP, V_INCLS) -+#AC_LBL_LIBPCAP(V_PCAPDEP, V_INCLS) - - # - # Check for these after AC_LBL_LIBPCAP, so we link with the appropriate --- -1.7.9.5 - diff --git a/meta-networking/recipes-support/tcpdump/tcpdump_4.9.2.bb b/meta-networking/recipes-support/tcpdump/tcpdump_4.9.2.bb deleted file mode 100644 index d38540e34d..0000000000 --- a/meta-networking/recipes-support/tcpdump/tcpdump_4.9.2.bb +++ /dev/null @@ -1,51 +0,0 @@ -SUMMARY = "A sophisticated network protocol analyzer" -HOMEPAGE = "http://www.tcpdump.org/" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1d4b0366557951c84a94fabe3529f867" -SECTION = "net" -DEPENDS = "libpcap" - -SRC_URI = " \ - http://www.tcpdump.org/release/${BP}.tar.gz \ - file://unnecessary-to-check-libpcap.patch \ - file://add-ptest.patch \ - file://run-ptest \ -" - -SRC_URI[md5sum] = "9bbc1ee33dab61302411b02dd0515576" -SRC_URI[sha256sum] = "798b3536a29832ce0cbb07fafb1ce5097c95e308a6f592d14052e1ef1505fe79" - -export LIBS=" -lpcap" - -inherit autotools-brokensep ptest -CACHED_CONFIGUREVARS = "ac_cv_linux_vers=${ac_cv_linux_vers=2}" - -PACKAGECONFIG ??= "openssl" -PACKAGECONFIG[openssl] = "--with-crypto=yes, --without-openssl --without-crypto, openssl" -PACKAGECONFIG[smi] = "--with-smi, --without-smi,libsmi" -PACKAGECONFIG[libcap-ng] = "--with-cap-ng=yes,--with-cap-ng=no,libcap-ng" - -EXTRA_AUTORECONF += " -I m4" - -do_configure_prepend() { - mkdir -p ${S}/m4 - if [ -f aclocal.m4 ]; then - mv aclocal.m4 ${S}/m4 - fi - # AC_CHECK_LIB(dlpi.. was looking to host /lib - sed -i 's:-L/lib::g' ./configure.in -} -do_configure_append() { - sed -i 's:-L/usr/lib::' ./Makefile - sed -i 's:-Wl,-rpath,${STAGING_LIBDIR}::' ./Makefile - sed -i 's:-I/usr/include::' ./Makefile -} - -do_install_append() { - # tcpdump 4.0.0 installs a copy to /usr/sbin/tcpdump.4.0.0 - rm -f ${D}${sbindir}/tcpdump.${PV} -} - -do_compile_ptest() { - oe_runmake buildtest-TESTS -} diff --git a/meta-networking/recipes-support/tcpdump/tcpdump_4.99.4.bb b/meta-networking/recipes-support/tcpdump/tcpdump_4.99.4.bb new file mode 100644 index 0000000000..803a9bb5f5 --- /dev/null +++ b/meta-networking/recipes-support/tcpdump/tcpdump_4.99.4.bb @@ -0,0 +1,52 @@ +SUMMARY = "A sophisticated network protocol analyzer" +HOMEPAGE = "http://www.tcpdump.org/" +SECTION = "net" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=5eb289217c160e2920d2e35bddc36453" + +DEPENDS = "libpcap" + +RDEPENDS:${PN}-ptest += " make perl \ + perl-module-file-basename \ + perl-module-file-spec \ + perl-module-file-spec-unix \ + perl-module-file-path \ + perl-module-file-glob \ + perl-module-data-dumper \ + perl-module-bytes \ + perl-module-posix \ + perl-module-carp \ + perl-module-cwd \ + perl-module-constant \ +" + +SRC_URI = " \ + http://www.tcpdump.org/release/${BP}.tar.gz \ + file://add-ptest.patch \ + file://run-ptest \ +" + +SRC_URI[sha256sum] = "0232231bb2f29d6bf2426e70a08a7e0c63a0d59a9b44863b7f5e2357a6e49fea" + +UPSTREAM_CHECK_REGEX = "tcpdump-(?P<pver>\d+(\.\d+)+)\.tar" + +inherit autotools-brokensep pkgconfig ptest + +PACKAGECONFIG ?= "openssl" + +PACKAGECONFIG[libcap-ng] = "--with-cap-ng,--without-cap-ng,libcap-ng" +PACKAGECONFIG[openssl] = "--with-crypto,--without-crypto,openssl" +PACKAGECONFIG[smi] = "--with-smi,--without-smi,libsmi" +# Note: CVE-2018-10103 (SMB - partially fixed, but SMB printing disabled) +PACKAGECONFIG[smb] = "--enable-smb,--disable-smb" + +EXTRA_AUTORECONF += "--exclude=aclocal" + +do_install:append() { + # make install installs an unneeded extra copy of the tcpdump binary + rm ${D}${bindir}/tcpdump.${PV} +} + +do_compile_ptest() { + oe_runmake buildtest-TESTS +} diff --git a/meta-networking/recipes-support/tcpdump/tcpslice/tcpslice-1.2a3-time.patch b/meta-networking/recipes-support/tcpdump/tcpslice/tcpslice-1.2a3-time.patch deleted file mode 100644 index 386b7f83ac..0000000000 --- a/meta-networking/recipes-support/tcpdump/tcpslice/tcpslice-1.2a3-time.patch +++ /dev/null @@ -1,75 +0,0 @@ -Upstream-Status: Pending [from tcpdump-4.1.1-1.fc14.src.rpm] - -Signed-off-by: Roy Li <rongqing.li@windriver.com> - ---- tcpslice-1.2a3.orig/search.c 2000-09-10 10:52:40.000000000 +0200 -+++ tcpslice-1.2a3/search.c 2006-07-28 14:56:55.000000000 +0200 -@@ -53,7 +53,7 @@ - /* Size of a packet header in bytes; easier than typing the sizeof() all - * the time ... - */ --#define PACKET_HDR_LEN (sizeof( struct pcap_pkthdr )) -+#define PACKET_HDR_LEN (sizeof( struct pcap_sf_pkthdr )) - - extern int snaplen; - -@@ -111,16 +111,24 @@ - static void - extract_header( pcap_t *p, u_char *buf, struct pcap_pkthdr *hdr ) - { -- memcpy((char *) hdr, (char *) buf, sizeof(struct pcap_pkthdr)); -+ struct pcap_sf_pkthdr hdri; -+ -+ memcpy((char *) &hdri, (char *) buf, sizeof(struct pcap_sf_pkthdr)); - - if ( pcap_is_swapped( p ) ) - { -- hdr->ts.tv_sec = SWAPLONG(hdr->ts.tv_sec); -- hdr->ts.tv_usec = SWAPLONG(hdr->ts.tv_usec); -- hdr->len = SWAPLONG(hdr->len); -- hdr->caplen = SWAPLONG(hdr->caplen); -+ hdr->ts.tv_sec = SWAPLONG(hdri.ts.tv_sec); -+ hdr->ts.tv_usec = SWAPLONG(hdri.ts.tv_usec); -+ hdr->len = SWAPLONG(hdri.len); -+ hdr->caplen = SWAPLONG(hdri.caplen); -+ } -+ else -+ { -+ hdr->ts.tv_sec = hdri.ts.tv_sec; -+ hdr->ts.tv_usec = hdri.ts.tv_usec; -+ hdr->len = hdri.len; -+ hdr->caplen = hdri.caplen; - } -- - /* - * From bpf/libpcap/savefile.c: - * ---- tcpslice-1.2a3.orig/tcpslice.h 1995-11-02 00:40:53.000000000 +0100 -+++ tcpslice-1.2a3/tcpslice.h 2006-07-28 14:56:55.000000000 +0200 -@@ -20,6 +20,26 @@ - */ - - -+#include <time.h> -+/* #include <net/bpf.h> */ -+ -+/* -+ * This is a timeval as stored in disk in a dumpfile. -+ * It has to use the same types everywhere, independent of the actual -+ * `struct timeval' -+ */ -+ -+struct pcap_timeval { -+ bpf_int32 tv_sec; /* seconds */ -+ bpf_int32 tv_usec; /* microseconds */ -+}; -+ -+struct pcap_sf_pkthdr { -+ struct pcap_timeval ts; /* time stamp */ -+ bpf_u_int32 caplen; /* length of portion present */ -+ bpf_u_int32 len; /* length this packet (off wire) */ -+}; -+ - time_t gwtm2secs( struct tm *tm ); - - int sf_find_end( struct pcap *p, struct timeval *first_timestamp, diff --git a/meta-networking/recipes-support/tcpdump/tcpslice/tcpslice-CVS.20010207-bpf.patch b/meta-networking/recipes-support/tcpdump/tcpslice/tcpslice-CVS.20010207-bpf.patch deleted file mode 100644 index 0a7359311d..0000000000 --- a/meta-networking/recipes-support/tcpdump/tcpslice/tcpslice-CVS.20010207-bpf.patch +++ /dev/null @@ -1,15 +0,0 @@ -Upstream-Status: Pending [from tcpdump-4.1.1-1.fc14.src.rpm] - -Signed-off-by: Roy Li <rongqing.li@windriver.com> -diff -ur tcpdump-3.8.1/tcpslice/tcpslice.c tcpdump-3.8.1.new/tcpslice/tcpslice.c ---- tcpslice/tcpslice.c 2004-01-15 17:35:53.000000000 +0100 -+++ tcpslice/tcpslice.c 2004-01-15 16:12:57.000000000 +0100 -@@ -35,7 +35,7 @@ - #include <sys/file.h> - #include <sys/stat.h> - --#include <net/bpf.h> -+/* #include <net/bpf.h> */ - - #include <ctype.h> - #ifdef HAVE_FCNTL_H diff --git a/meta-networking/recipes-support/tcpdump/tcpslice_1.2a3.bb b/meta-networking/recipes-support/tcpdump/tcpslice_1.2a3.bb deleted file mode 100644 index e65739a5c7..0000000000 --- a/meta-networking/recipes-support/tcpdump/tcpslice_1.2a3.bb +++ /dev/null @@ -1,36 +0,0 @@ -SUMMARY = "tcpslice" -DESCRIPTION = "A tool for extracting parts of a tcpdump packet trace." -HOMEPAGE = "http://www.tcpdump.org/related.html" -SECTION = "net" - -LICENSE = "BSD-4-Clause" -LIC_FILES_CHKSUM = "file://tcpslice.c;endline=20;md5=99519e2e5234d1662a4ce16baa62c64e" - -SRC_URI = "ftp://ftp.ee.lbl.gov/${BP}.tar.gz \ - file://tcpslice-1.2a3-time.patch \ - file://tcpslice-CVS.20010207-bpf.patch \ - " -SRC_URI[md5sum] = "e329cbeb7e589f132d92c3447c477190" -SRC_URI[sha256sum] = "4096e8debc898cfaa16b5306f1c42f8d18b19e30e60da8d4deb781c8f684c840" - -inherit autotools-brokensep - -DEPENDS += "libpcap" - -# We do not want to autoreconf. We must specify srcdir as ".". -# We have to set the ac_cv_* cache variables as well as pass the normal -# cross-compilation options to configure! -# -do_configure () { - oe_runconf \ - --srcdir="." \ - ac_cv_build=${BUILD_SYS} \ - ac_cv_host=${HOST_SYS} \ - ac_cv_target=${HOST_SYS} -} - -do_install () { - mkdir -p ${D}/usr/sbin - install -c -m 555 tcpslice ${D}/usr/sbin -} - diff --git a/meta-networking/recipes-support/tcpdump/tcpslice_1.7.bb b/meta-networking/recipes-support/tcpdump/tcpslice_1.7.bb new file mode 100644 index 0000000000..93197dc3bc --- /dev/null +++ b/meta-networking/recipes-support/tcpdump/tcpslice_1.7.bb @@ -0,0 +1,24 @@ +SUMMARY = "tcpslice" +DESCRIPTION = "A tool for extracting parts of a tcpdump packet trace." +HOMEPAGE = "http://www.tcpdump.org/related.html" +SECTION = "net" + +LICENSE = "BSD-4-Clause" +LIC_FILES_CHKSUM = "file://tcpslice.c;endline=20;md5=99519e2e5234d1662a4ce16baa62c64e" + +SRC_URI = "http://www.tcpdump.org/release/${BP}.tar.gz \ + " +SRC_URI[sha256sum] = "e513f0710c4ab45ec627e5df6f7b80d12e488146e1bd500c92247e20ca608903" + +UPSTREAM_CHECK_REGEX = "tcpslice-(?P<pver>\d+(\.\d+)+)\.tar" + +inherit autotools-brokensep pkgconfig + +DEPENDS = "libpcap" + +EXTRA_AUTORECONF += "--exclude=aclocal" + +do_install () { + install -d ${D}${sbindir} + install -m 0755 tcpslice ${D}${sbindir} +} diff --git a/meta-networking/recipes-support/tcpreplay/tcpreplay/0001-configure.ac-do-not-run-conftest-in-case-of-cross-co.patch b/meta-networking/recipes-support/tcpreplay/tcpreplay/0001-configure.ac-do-not-run-conftest-in-case-of-cross-co.patch new file mode 100644 index 0000000000..08cb3b88fa --- /dev/null +++ b/meta-networking/recipes-support/tcpreplay/tcpreplay/0001-configure.ac-do-not-run-conftest-in-case-of-cross-co.patch @@ -0,0 +1,51 @@ +From 42f7bbc1ce4913fe2c0bc76293c5445d31690f5d Mon Sep 17 00:00:00 2001 +From: Chen Qi <Qi.Chen@windriver.com> +Date: Thu, 7 Mar 2024 21:02:07 -0800 +Subject: [PATCH] configure.ac: do not run conftest in case of cross + compilation + +It'll give us nothing but error like below: + + ./conftest: cannot execute binary file: Exec format error + ... + ./configure: line 23950: test: -eq: unary operator expected + +The version check only has effect on Apple systems. We'd better +avoid error like above when cross compilation. + +Also, in case of cross compilation, instead of having the above +Exec format error and resulting in unaligned_cv_fail to yes, set +it directly to yes. + +Upstream-Status: Submitted [https://github.com/appneta/tcpreplay/pull/849] + +Signed-off-by: Chen Qi <Qi.Chen@windriver.com> +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 387219de..15201601 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -928,7 +928,7 @@ cat >conftest.c <<EOF + EOF + ${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LPCAPLIB \ + conftest.c $LIBS >/dev/null 2>&1 +-if test -x conftest ; then ++if test -x conftest -a "$cross_compiling" != "yes"; then + full_libpcap_version=$(LD_LIBRARY_PATH="$LPCAP_LD_LIBRARY_PATH" ./conftest) + libpcap_version=$(echo "$full_libpcap_version" | ${CUT} -d' ' -f3) + pcap_version_ok=yes +@@ -1709,7 +1709,7 @@ case "$host_os" in + EOF + ${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS \ + conftest.c $LIBS >/dev/null 2>&1 +- if test ! -x conftest ; then ++ if test ! -x conftest -o "$cross_compiling" = "yes" ; then + dnl failed to compile for some reason + unaligned_cv_fail=yes + else +-- +2.42.0 + diff --git a/meta-networking/recipes-support/tcpreplay/tcpreplay/0001-configure.ac-unify-search-dirs-for-pcap-and-add-lib3.patch b/meta-networking/recipes-support/tcpreplay/tcpreplay/0001-configure.ac-unify-search-dirs-for-pcap-and-add-lib3.patch new file mode 100644 index 0000000000..709d2cccbc --- /dev/null +++ b/meta-networking/recipes-support/tcpreplay/tcpreplay/0001-configure.ac-unify-search-dirs-for-pcap-and-add-lib3.patch @@ -0,0 +1,82 @@ +From 5f8c78362b3b1e06f5adff2d4b140509c4799894 Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Sun, 3 Sep 2023 12:31:59 +0200 +Subject: [PATCH] configure.ac: unify search dirs for pcap and add lib32 + +* add lib32 because when building lib32-tcpreplay it's + impossible to set --with-libpcap so that it would find + both include files as well as the library in lib32 directory + +* maybe it would be beneficial to split --with-libpcap + into --with-libpcap-includedir --with-libpcap-libdir as this + already searches in the --with-libpcap value with and + without any "lib" prefix, but include files always expect + "include" dir there + +* most of this code was added in: + https://github.com/appneta/tcpreplay/commit/202b8e82f9fd3c84ce5804577caeb36a33baabe7#diff-49473dca262eeab3b4a43002adb08b4db31020d190caaad1594b47f1d5daa810R570 + +* then search for + ${host_cpu} lib/${host_cpu} (without -${host_os} suffix) + and ${build_arch}-${host_os} lib/${build_arch}-${host_os} + was added, but only for search of dynamic library in: + https://github.com/appneta/tcpreplay/commit/c3d5236563985a99f8bb02c3f1bd6950e3929047 + +* ${build_arch}-${host_os} lib/${build_arch}-${host_os} + was later replaced with: + lib/${MULTIARCH} ${MULTIARCH} + and it was added to static library search as well + + but for dynamic library it was searching in reversed order: + ${MULTIARCH} lib/${MULTIARCH} + https://github.com/appneta/tcpreplay/commit/ed9e3a818bde04813144014561e62f018c9eb85f + + I don't think this reversed order was intentional, just unify all 4 cases + to use the same directories in the same order + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +Upstream-Status: Submitted [https://github.com/appneta/tcpreplay/pull/819] +--- + configure.ac | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 387219de..26ba31a5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -671,7 +671,7 @@ AC_ARG_WITH(libpcap, + LPCAPINCDIR=${testdir} + if test $dynamic_link = yes; then + for ext in .dylib .so .tbd ; do +- for dir in . lib lib64 lib/${host_cpu}-${host_os} ${host_cpu}-${host_os} lib/${MULTIARCH} ${MULTIARCH}; do ++ for dir in . lib lib64 lib32 lib/${host_cpu}-${host_os} ${host_cpu}-${host_os} lib/${MULTIARCH} ${MULTIARCH}; do + sharefile=$(ls ${testdir}/$dir/libpcap${ext}* 2> /dev/null | sort | head -n1) + if test -n "${sharefile}"; then + LPCAP_LD_LIBRARY_PATH="$(dirname ${sharefile})" +@@ -690,7 +690,7 @@ AC_ARG_WITH(libpcap, + dnl If dynamic library not found, try static + dnl + for ext in ${libext} .a .A.tbd ; do +- for dir in . lib lib64 lib/${host_cpu}-${host_os} ${host_cpu}-${host_os} lib/${MULTIARCH} ${MULTIARCH}; do ++ for dir in . lib lib64 lib32 lib/${host_cpu}-${host_os} ${host_cpu}-${host_os} lib/${MULTIARCH} ${MULTIARCH}; do + staticfile=$(ls ${testdir}/$dir/libpcap${ext} 2> /dev/null | sort | head -n1) + if test -n "${staticfile}"; then + LPCAPLIB="${staticfile}" +@@ -771,7 +771,7 @@ AC_ARG_WITH(libpcap, + LPCAPINCDIR="${testdir}/include" + if test $dynamic_link = yes; then + for ext in .dylib .so .tbd; do +- for dir in . lib lib64 ${host_cpu} lib/${host_cpu} ${host_cpu}-${host_os} lib/${host_cpu}-${host_os} ${MULTIARCH} lib/${MULTIARCH}; do ++ for dir in . lib lib64 lib32 lib/${host_cpu}-${host_os} ${host_cpu}-${host_os} lib/${MULTIARCH} ${MULTIARCH}; do + sharefile=$(ls "${testdir}/$dir/libpcap${ext}" 2> /dev/null | sort | head -n1) + if test -n "${sharefile}"; then + LPCAPLIB="-L$(dirname ${sharefile}) -lpcap" +@@ -790,7 +790,7 @@ AC_ARG_WITH(libpcap, + dnl If dynamic library not found, try static + dnl + for ext in ${libext} .a .A.tbd ; do +- for dir in . lib lib64 lib/${host_cpu}-${host_os} ${host_cpu}-${host_os} lib/${MULTIARCH} ${MULTIARCH}; do ++ for dir in . lib lib64 lib32 lib/${host_cpu}-${host_os} ${host_cpu}-${host_os} lib/${MULTIARCH} ${MULTIARCH}; do + staticfile=$(ls "${testdir}/$dir/libpcap${ext}" 2> /dev/null | sort | head -n1) + if test -n "${staticfile}"; then + LPCAPLIB="${staticfile}" diff --git a/meta-networking/recipes-support/tcpreplay/tcpreplay/0001-libopts.m4-set-POSIX_SHELL-to-bin-sh.patch b/meta-networking/recipes-support/tcpreplay/tcpreplay/0001-libopts.m4-set-POSIX_SHELL-to-bin-sh.patch new file mode 100644 index 0000000000..448455fffb --- /dev/null +++ b/meta-networking/recipes-support/tcpreplay/tcpreplay/0001-libopts.m4-set-POSIX_SHELL-to-bin-sh.patch @@ -0,0 +1,45 @@ +From 769e96b60f631e8c208fd7f72900d0bb17760f88 Mon Sep 17 00:00:00 2001 +From: Yi Zhao <yi.zhao@windriver.com> +Date: Tue, 30 Aug 2022 09:54:11 +0800 +Subject: [PATCH] libopts.m4: set POSIX_SHELL to /bin/sh + +POSIX_SHELL is specified a host tool path as it searches path on build +host using `which` when configure. Set it to a fixed path '/bin/sh'. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + m4/libopts.m4 | 16 +--------------- + 1 file changed, 1 insertion(+), 15 deletions(-) + +diff --git a/m4/libopts.m4 b/m4/libopts.m4 +index cfbd477..c8047eb 100644 +--- a/m4/libopts.m4 ++++ b/m4/libopts.m4 +@@ -111,21 +111,7 @@ AC_DEFUN([INVOKE_LIBOPTS_MACROS_FIRST],[ + AC_CHECK_FUNCS([mmap canonicalize_file_name snprintf strdup strchr \ + strrchr strsignal fchmod fstat chmod]) + AC_PROG_SED +- [while : +- do +- POSIX_SHELL=`which bash` +- test -x "$POSIX_SHELL" && break +- POSIX_SHELL=`which dash` +- test -x "$POSIX_SHELL" && break +- POSIX_SHELL=/usr/xpg4/bin/sh +- test -x "$POSIX_SHELL" && break +- POSIX_SHELL=`/bin/sh -c ' +- exec 2>/dev/null +- if ! true ; then exit 1 ; fi +- echo /bin/sh'` +- test -x "$POSIX_SHELL" && break +- ]AC_MSG_ERROR([cannot locate a working POSIX shell])[ +- done] ++ POSIX_SHELL='/bin/sh' + AC_DEFINE_UNQUOTED([POSIX_SHELL], ["${POSIX_SHELL}"], + [define to a working POSIX compliant shell]) + AC_SUBST([POSIX_SHELL]) +-- +2.25.1 + diff --git a/meta-networking/recipes-support/tcpreplay/tcpreplay_4.2.6.bb b/meta-networking/recipes-support/tcpreplay/tcpreplay_4.2.6.bb deleted file mode 100644 index 681ef02bb4..0000000000 --- a/meta-networking/recipes-support/tcpreplay/tcpreplay_4.2.6.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "Use previously captured traffic to test network devices" - -HOMEPAGE = "http://tcpreplay.synfin.net/" -SECTION = "net" - -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://docs/LICENSE;md5=890b830b22fd632e9ffd996df20338f8" - -SRC_URI = "https://github.com/appneta/tcpreplay/releases/download/v${PV}/tcpreplay-${PV}.tar.gz" - -SRC_URI[md5sum] = "3e65d5b872e441c6a0038191a3dc7ce9" -SRC_URI[sha256sum] = "043756c532dab93e2be33a517ef46b1341f7239278a1045ae670041dd8a4531d" - -DEPENDS = "libpcap" - -EXTRA_OECONF += "--with-libpcap=${STAGING_DIR_HOST}/usr" - -inherit siteinfo autotools-brokensep - diff --git a/meta-networking/recipes-support/tcpreplay/tcpreplay_4.4.4.bb b/meta-networking/recipes-support/tcpreplay/tcpreplay_4.4.4.bb new file mode 100644 index 0000000000..26de40a65a --- /dev/null +++ b/meta-networking/recipes-support/tcpreplay/tcpreplay_4.4.4.bb @@ -0,0 +1,28 @@ +SUMMARY = "Use previously captured traffic to test network devices" + +HOMEPAGE = "https://tcpreplay.appneta.com/" + +SECTION = "net" + +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://docs/LICENSE;md5=10f0474a2f0e5dccfca20f69d6598ad8" + +SRC_URI = "https://github.com/appneta/${BPN}/releases/download/v${PV}/${BP}.tar.gz \ + file://0001-libopts.m4-set-POSIX_SHELL-to-bin-sh.patch \ + file://0001-configure.ac-unify-search-dirs-for-pcap-and-add-lib3.patch \ + file://0001-configure.ac-do-not-run-conftest-in-case-of-cross-co.patch \ +" + +SRC_URI[sha256sum] = "44f18fb6d3470ecaf77a51b901a119dae16da5be4d4140ffbb2785e37ad6d4bf" + +UPSTREAM_CHECK_URI = "https://github.com/appneta/tcpreplay/releases" + +DEPENDS = "libpcap" + +EXTRA_OECONF += "--with-libpcap=${STAGING_DIR_HOST}${prefix}" + +inherit siteinfo autotools-brokensep + +do_install:append() { + sed -i -e 's:${RECIPE_SYSROOT}::g' ${S}/src/defines.h +} diff --git a/meta-networking/recipes-support/tinyproxy/tinyproxy/CVE-2022-40468.patch b/meta-networking/recipes-support/tinyproxy/tinyproxy/CVE-2022-40468.patch new file mode 100644 index 0000000000..4e2157ca75 --- /dev/null +++ b/meta-networking/recipes-support/tinyproxy/tinyproxy/CVE-2022-40468.patch @@ -0,0 +1,33 @@ +From 3764b8551463b900b5b4e3ec0cd9bb9182191cb7 Mon Sep 17 00:00:00 2001 +From: rofl0r <rofl0r@users.noreply.github.com> +Date: Thu, 8 Sep 2022 15:18:04 +0000 +Subject: [PATCH] prevent junk from showing up in error page in invalid + requests + +fixes #457 + +https://github.com/tinyproxy/tinyproxy/commit/3764b8551463b900b5b4e3ec0cd9bb9182191cb7 +Upstream-Status: Backport +CVE: CVE-2022-40468 +Signed-off-by: Chee Yang Lee <chee.yang.lee@intel.com> +--- + src/reqs.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/reqs.c b/src/reqs.c +index bce69819..45db118d 100644 +--- a/src/reqs.c ++++ b/src/reqs.c +@@ -343,8 +343,12 @@ static struct request_s *process_request (struct conn_s *connptr, + goto fail; + } + ++ /* zero-terminate the strings so they don't contain junk in error page */ ++ request->method[0] = url[0] = request->protocol[0] = 0; ++ + ret = sscanf (connptr->request_line, "%[^ ] %[^ ] %[^ ]", + request->method, url, request->protocol); ++ + if (ret == 2 && !strcasecmp (request->method, "GET")) { + request->protocol[0] = 0; + diff --git a/meta-networking/recipes-support/tinyproxy/tinyproxy/disable-documentation.patch b/meta-networking/recipes-support/tinyproxy/tinyproxy/disable-documentation.patch index 01d0236be5..faefd1d4ea 100644 --- a/meta-networking/recipes-support/tinyproxy/tinyproxy/disable-documentation.patch +++ b/meta-networking/recipes-support/tinyproxy/tinyproxy/disable-documentation.patch @@ -1,19 +1,50 @@ ---- a/configure.ac 2016-01-01 17:42:27.000000000 +0100 -+++ b/configure.ac 2017-04-20 14:03:37.238254471 +0200 -@@ -284,24 +284,12 @@ +From b71eb384522b5ce4629dee6e8be257fb4880fef3 Mon Sep 17 00:00:00 2001 +From: Benjamin Gaignard <benjamin.gaignard@linaro.org> +Date: Thu, 20 Apr 2017 14:25:18 +0200 + +--- +Upstream-Status: Pending + + Makefile.am | 1 - + configure.ac | 17 ----------------- + 2 files changed, 18 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 4a3ead6..a12cb98 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -2,7 +2,6 @@ SUBDIRS = \ + src \ + data \ + etc \ +- docs \ + m4macros \ + tests \ + scripts +diff --git a/configure.ac b/configure.ac +index 3849383..9f3a633 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -179,18 +179,6 @@ AC_SUBST(CPPFLAGS) AC_SUBST(LIBS) AC_SUBST(ADDITIONAL_OBJECTS) --# Check for asciidoc --AC_PATH_PROG(A2X, a2x, no) --AM_CONDITIONAL(HAVE_A2X, test "x$A2X" != "xno") --if test x"$A2X" = x"no"; then -- AC_MSG_ERROR([Test for asciidoc failed. See the file 'INSTALL' for help.]) +-if test x"$manpage_support_enabled" = x"yes"; then +-AC_PATH_PROG(POD2MAN, pod2man, no) +- +-if test "x$POD2MAN" = "xno" && \ +- ! test -e docs/man5/tinyproxy.conf.5 -a -e docs/man8/tinyproxy.8 ; then +-AC_MSG_ERROR([ +- manpage generation requested, but neither pod2man +- nor pre-generated manpages found. +- Use --disable-manpage-support if you want to compile anyway.]) -fi +-fi #manpage_support_enabled - - AC_CONFIG_FILES([ - Makefile - src/Makefile + AM_CONDITIONAL(HAVE_POD2MAN, test "x$POD2MAN" != "x" -a "x$POD2MAN" != "xno") + + AC_PATH_PROG(GPERF, gperf, no) +@@ -216,11 +204,6 @@ src/Makefile data/Makefile data/templates/Makefile etc/Makefile @@ -25,13 +56,6 @@ m4macros/Makefile tests/Makefile tests/scripts/Makefile ---- a/Makefile.am 2016-01-01 17:42:27.000000000 +0100 -+++ b/Makefile.am 2017-04-20 14:03:53.842822997 +0200 -@@ -2,7 +2,6 @@ - src \ - data \ - etc \ -- docs \ - m4macros \ - tests - +-- +2.25.1 + diff --git a/meta-networking/recipes-support/tinyproxy/tinyproxy/tinyproxy.conf b/meta-networking/recipes-support/tinyproxy/tinyproxy/tinyproxy.conf new file mode 100644 index 0000000000..4ca18efa56 --- /dev/null +++ b/meta-networking/recipes-support/tinyproxy/tinyproxy/tinyproxy.conf @@ -0,0 +1,330 @@ +## +## tinyproxy.conf -- tinyproxy daemon configuration file +## +## This example tinyproxy.conf file contains example settings +## with explanations in comments. For decriptions of all +## parameters, see the tinproxy.conf(5) manual page. +## + +# +# User/Group: This allows you to set the user and group that will be +# used for tinyproxy after the initial binding to the port has been done +# as the root user. Either the user or group name or the UID or GID +# number may be used. +# +User tinyproxy +Group nogroup + +# +# Port: Specify the port which tinyproxy will listen on. Please note +# that should you choose to run on a port lower than 1024 you will need +# to start tinyproxy using root. +# +Port 8888 + +# +# Listen: If you have multiple interfaces this allows you to bind to +# only one. If this is commented out, tinyproxy will bind to all +# interfaces present. +# +#Listen 192.168.0.1 + +# +# Bind: This allows you to specify which interface will be used for +# outgoing connections. This is useful for multi-home'd machines where +# you want all traffic to appear outgoing from one particular interface. +# +#Bind 192.168.0.1 + +# +# BindSame: If enabled, tinyproxy will bind the outgoing connection to the +# ip address of the incoming connection. +# +#BindSame yes + +# +# Timeout: The maximum number of seconds of inactivity a connection is +# allowed to have before it is closed by tinyproxy. +# +Timeout 600 + +# +# ErrorFile: Defines the HTML file to send when a given HTTP error +# occurs. You will probably need to customize the location to your +# particular install. The usual locations to check are: +# /usr/local/share/tinyproxy +# /usr/share/tinyproxy +# /etc/tinyproxy +# +#ErrorFile 404 "/usr/share/tinyproxy/404.html" +#ErrorFile 400 "/usr/share/tinyproxy/400.html" +#ErrorFile 503 "/usr/share/tinyproxy/503.html" +#ErrorFile 403 "/usr/share/tinyproxy/403.html" +#ErrorFile 408 "/usr/share/tinyproxy/408.html" + +# +# DefaultErrorFile: The HTML file that gets sent if there is no +# HTML file defined with an ErrorFile keyword for the HTTP error +# that has occured. +# +DefaultErrorFile "/usr/share/tinyproxy/default.html" + +# +# StatHost: This configures the host name or IP address that is treated +# as the stat host: Whenever a request for this host is received, +# Tinyproxy will return an internal statistics page instead of +# forwarding the request to that host. The default value of StatHost is +# tinyproxy.stats. +# +#StatHost "tinyproxy.stats" +# + +# +# StatFile: The HTML file that gets sent when a request is made +# for the stathost. If this file doesn't exist a basic page is +# hardcoded in tinyproxy. +# +StatFile "/usr/share/tinyproxy/stats.html" + +# +# LogFile: Allows you to specify the location where information should +# be logged to. If you would prefer to log to syslog, then disable this +# and enable the Syslog directive. These directives are mutually +# exclusive. +# +#LogFile "/var/log/tinyproxy/tinyproxy.log" + +# +# Syslog: Tell tinyproxy to use syslog instead of a logfile. This +# option must not be enabled if the Logfile directive is being used. +# These two directives are mutually exclusive. +# +#Syslog On + +# +# LogLevel: +# +# Set the logging level. Allowed settings are: +# Critical (least verbose) +# Error +# Warning +# Notice +# Connect (to log connections without Info's noise) +# Info (most verbose) +# +# The LogLevel logs from the set level and above. For example, if the +# LogLevel was set to Warning, then all log messages from Warning to +# Critical would be output, but Notice and below would be suppressed. +# +LogLevel Info + +# +# PidFile: Write the PID of the main tinyproxy thread to this file so it +# can be used for signalling purposes. +# +PidFile "/var/run/tinyproxy/tinyproxy.pid" + +# +# XTinyproxy: Tell Tinyproxy to include the X-Tinyproxy header, which +# contains the client's IP address. +# +#XTinyproxy Yes + +# +# Upstream: +# +# Turns on upstream proxy support. +# +# The upstream rules allow you to selectively route upstream connections +# based on the host/domain of the site being accessed. +# +# For example: +# # connection to test domain goes through testproxy +# upstream testproxy:8008 ".test.domain.invalid" +# upstream testproxy:8008 ".our_testbed.example.com" +# upstream testproxy:8008 "192.168.128.0/255.255.254.0" +# +# # no upstream proxy for internal websites and unqualified hosts +# no upstream ".internal.example.com" +# no upstream "www.example.com" +# no upstream "10.0.0.0/8" +# no upstream "192.168.0.0/255.255.254.0" +# no upstream "." +# +# # connection to these boxes go through their DMZ firewalls +# upstream cust1_firewall:8008 "testbed_for_cust1" +# upstream cust2_firewall:8008 "testbed_for_cust2" +# +# # default upstream is internet firewall +# upstream firewall.internal.example.com:80 +# +# The LAST matching rule wins the route decision. As you can see, you +# can use a host, or a domain: +# name matches host exactly +# .name matches any host in domain "name" +# . matches any host with no domain (in 'empty' domain) +# IP/bits matches network/mask +# IP/mask matches network/mask +# +#Upstream some.remote.proxy:port + +# +# MaxClients: This is the absolute highest number of threads which will +# be created. In other words, only MaxClients number of clients can be +# connected at the same time. +# +MaxClients 100 + +# +# MinSpareServers/MaxSpareServers: These settings set the upper and +# lower limit for the number of spare servers which should be available. +# +# If the number of spare servers falls below MinSpareServers then new +# server processes will be spawned. If the number of servers exceeds +# MaxSpareServers then the extras will be killed off. +# +MinSpareServers 5 +MaxSpareServers 20 + +# +# StartServers: The number of servers to start initially. +# +StartServers 10 + +# +# MaxRequestsPerChild: The number of connections a thread will handle +# before it is killed. In practise this should be set to 0, which +# disables thread reaping. If you do notice problems with memory +# leakage, then set this to something like 10000. +# +MaxRequestsPerChild 0 + +# +# Allow: Customization of authorization controls. If there are any +# access control keywords then the default action is to DENY. Otherwise, +# the default action is ALLOW. +# +# The order of the controls are important. All incoming connections are +# tested against the controls based on order. +# +Allow 127.0.0.1 + +# +# AddHeader: Adds the specified headers to outgoing HTTP requests that +# Tinyproxy makes. Note that this option will not work for HTTPS +# traffic, as Tinyproxy has no control over what headers are exchanged. +# +#AddHeader "X-My-Header" "Powered by Tinyproxy" + +# +# ViaProxyName: The "Via" header is required by the HTTP RFC, but using +# the real host name is a security concern. If the following directive +# is enabled, the string supplied will be used as the host name in the +# Via header; otherwise, the server's host name will be used. +# +ViaProxyName "tinyproxy" + +# +# DisableViaHeader: When this is set to yes, Tinyproxy does NOT add +# the Via header to the requests. This virtually puts Tinyproxy into +# stealth mode. Note that RFC 2616 requires proxies to set the Via +# header, so by enabling this option, you break compliance. +# Don't disable the Via header unless you know what you are doing... +# +#DisableViaHeader Yes + +# +# Filter: This allows you to specify the location of the filter file. +# +#Filter "/etc/filter" + +# +# FilterURLs: Filter based on URLs rather than domains. +# +#FilterURLs On + +# +# FilterExtended: Use POSIX Extended regular expressions rather than +# basic. +# +#FilterExtended On + +# +# FilterCaseSensitive: Use case sensitive regular expressions. +# +#FilterCaseSensitive On + +# +# FilterDefaultDeny: Change the default policy of the filtering system. +# If this directive is commented out, or is set to "No" then the default +# policy is to allow everything which is not specifically denied by the +# filter file. +# +# However, by setting this directive to "Yes" the default policy becomes +# to deny everything which is _not_ specifically allowed by the filter +# file. +# +#FilterDefaultDeny Yes + +# +# Anonymous: If an Anonymous keyword is present, then anonymous proxying +# is enabled. The headers listed are allowed through, while all others +# are denied. If no Anonymous keyword is present, then all headers are +# allowed through. You must include quotes around the headers. +# +# Most sites require cookies to be enabled for them to work correctly, so +# you will need to allow Cookies through if you access those sites. +# +#Anonymous "Host" +#Anonymous "Authorization" +#Anonymous "Cookie" + +# +# ConnectPort: This is a list of ports allowed by tinyproxy when the +# CONNECT method is used. To disable the CONNECT method altogether, set +# the value to 0. If no ConnectPort line is found, all ports are +# allowed (which is not very secure.) +# +# The following two ports are used by SSL. +# +ConnectPort 443 +ConnectPort 563 + +# +# Configure one or more ReversePath directives to enable reverse proxy +# support. With reverse proxying it's possible to make a number of +# sites appear as if they were part of a single site. +# +# If you uncomment the following two directives and run tinyproxy +# on your own computer at port 8888, you can access Google using +# http://localhost:8888/google/ and Wired News using +# http://localhost:8888/wired/news/. Neither will actually work +# until you uncomment ReverseMagic as they use absolute linking. +# +#ReversePath "/google/" "http://www.google.com/" +#ReversePath "/wired/" "http://www.wired.com/" + +# +# When using tinyproxy as a reverse proxy, it is STRONGLY recommended +# that the normal proxy is turned off by uncommenting the next directive. +# +#ReverseOnly Yes + +# +# Use a cookie to track reverse proxy mappings. If you need to reverse +# proxy sites which have absolute links you must uncomment this. +# +#ReverseMagic Yes + +# +# The URL that's used to access this reverse proxy. The URL is used to +# rewrite HTTP redirects so that they won't escape the proxy. If you +# have a chain of reverse proxies, you'll need to put the outermost +# URL here (the address which the end user types into his/her browser). +# +# If not set then no rewriting occurs. +# +#ReverseBaseURL "http://localhost:8888/" + + + diff --git a/meta-networking/recipes-support/tinyproxy/tinyproxy/tinyproxy.service b/meta-networking/recipes-support/tinyproxy/tinyproxy/tinyproxy.service index ea079f9556..78df437f68 100644 --- a/meta-networking/recipes-support/tinyproxy/tinyproxy/tinyproxy.service +++ b/meta-networking/recipes-support/tinyproxy/tinyproxy/tinyproxy.service @@ -3,12 +3,12 @@ Description=Tinyproxy, Lightweight http(s) proxy daemon RequiresMountsFor=/var [Service] -Group=tinyproxy ExecStartPre=/bin/mkdir -p /var/log/tinyproxy -ExecStartPre=/bin/chown -R nobody.tinyproxy /var/log/tinyproxy +ExecStartPre=/bin/chown -R tinyproxy.nogroup /var/log/tinyproxy ExecStartPre=/bin/mkdir -p /var/run/tinyproxy -ExecStartPre=/bin/chown -R nobody.tinyproxy /var/run/tinyproxy -ExecStart=/usr/sbin/tinyproxy -d +ExecStartPre=/bin/chown -R tinyproxy.nogroup /var/run/tinyproxy +ExecStart=/usr/bin/tinyproxy -d +PIDFile=/var/run/tinyproxy/tinyproxy.pid [Install] WantedBy=multi-user.target diff --git a/meta-networking/recipes-support/tinyproxy/tinyproxy_1.11.1.bb b/meta-networking/recipes-support/tinyproxy/tinyproxy_1.11.1.bb new file mode 100644 index 0000000000..4f52ee2ba6 --- /dev/null +++ b/meta-networking/recipes-support/tinyproxy/tinyproxy_1.11.1.bb @@ -0,0 +1,42 @@ +SUMMARY = "Lightweight http(s) proxy daemon" +HOMEPAGE = "https://tinyproxy.github.io/" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.gz \ + file://disable-documentation.patch \ + file://tinyproxy.service \ + file://tinyproxy.conf \ + file://CVE-2022-40468.patch \ + " + +SRC_URI[sha256sum] = "1574acf7ba83c703a89e98bb2758a4ed9fda456f092624b33cfcf0ce2d3b2047" + +UPSTREAM_CHECK_URI = "https://github.com/tinyproxy/tinyproxy/releases" + +EXTRA_OECONF += " \ + --enable-filter \ + --enable-transparent \ + --enable-reverse \ + --enable-upstream \ + --enable-xtinyproxy \ + " + +inherit autotools systemd useradd + +#User specific +USERADD_PACKAGES = "${PN}" +USERADD_PARAM:${PN} = "--system --home /dev/null \ + --no-user-group --gid nogroup tinyproxy" + +SYSTEMD_PACKAGES += "${BPN}" +SYSTEMD_SERVICE:${PN} = "tinyproxy.service" +SYSTEMD_AUTO_ENABLE:${PN} = "enable" + +do_install:append() { + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${UNPACKDIR}/tinyproxy.service ${D}${systemd_system_unitdir} + fi + install -m 0644 ${UNPACKDIR}/tinyproxy.conf ${D}${sysconfdir}/tinyproxy.conf +} diff --git a/meta-networking/recipes-support/tinyproxy/tinyproxy_1.8.4.bb b/meta-networking/recipes-support/tinyproxy/tinyproxy_1.8.4.bb deleted file mode 100644 index 98192dc99f..0000000000 --- a/meta-networking/recipes-support/tinyproxy/tinyproxy_1.8.4.bb +++ /dev/null @@ -1,38 +0,0 @@ -SUMMARY = "Lightweight http(s) proxy daemon" -HOMEPAGE = "https://tinyproxy.github.io/" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" - -SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.gz \ - file://disable-documentation.patch \ - file://tinyproxy.service" - -SRC_URI[md5sum] = "3b60f7d08e0821ed1a3e2cf1e5778cac" -SRC_URI[sha256sum] = "8234c879a129feee61efa98bac14a1a3e46e5cf08f01696a216940872aa70faf" - -EXTRA_OECONF += " \ - --enable-filter \ - --enable-transparent \ - --disable-regexcheck \ - --enable-reverse \ - --enable-upstream \ - --enable-xtinyproxy \ - " - -inherit autotools systemd useradd - -#User specific -USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--system --home /dev/null \ - --no-user-group --gid nogroup tinypoxy" - -SYSTEMD_PACKAGES += "${BPN}" -SYSTEMD_SERVICE_${PN} = "tinyproxy.service" -SYSTEMD_AUTO_ENABLE_${PN} = "enable" - -do_install_append() { - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/tinyproxy.service ${D}${systemd_system_unitdir} - fi -} diff --git a/meta-networking/recipes-support/tnftp/tnftp/0001-libedit-Include-missing-header-stdc-predef.h.patch b/meta-networking/recipes-support/tnftp/tnftp/0001-libedit-Include-missing-header-stdc-predef.h.patch new file mode 100644 index 0000000000..07a3c739b8 --- /dev/null +++ b/meta-networking/recipes-support/tnftp/tnftp/0001-libedit-Include-missing-header-stdc-predef.h.patch @@ -0,0 +1,31 @@ +From 9f2797d1ab8557b44a1f8d6d4d0b6de368d55e80 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 14 Jan 2022 09:22:59 -0800 +Subject: [PATCH] libedit: Include missing header stdc-predef.h + +__STDC_ISO_10646__ is defined in stdc-predef.h instead of expecting +every other file including this header, add it here + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + libedit/chartype.h | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/libedit/chartype.h b/libedit/chartype.h +index 319be30..2d3e20c 100644 +--- a/libedit/chartype.h ++++ b/libedit/chartype.h +@@ -30,6 +30,9 @@ + #ifndef _h_chartype_f + #define _h_chartype_f + ++/* for __STDC_ISO_10646__ */ ++#include <stdc-predef.h> ++ + /* Ideally we should also test the value of the define to see if it + * supports non-BMP code points without requiring UTF-16, but nothing + * seems to actually advertise this properly, despite Unicode 3.1 having +-- +2.34.1 + diff --git a/meta-networking/recipes-support/tnftp/tnftp/tnftp-autotools.patch b/meta-networking/recipes-support/tnftp/tnftp/tnftp-autotools.patch deleted file mode 100644 index 1bda576bc2..0000000000 --- a/meta-networking/recipes-support/tnftp/tnftp/tnftp-autotools.patch +++ /dev/null @@ -1,42 +0,0 @@ -[PATCH] Update configure.ac and Makefile.am to resolve warnings/errors - -Upstream-Status: Pending - -Signed-off-by: Roy Li <rongqing.li@windriver.com> ---- - configure.ac | 2 ++ - libnetbsd/Makefile.am | 2 +- - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index a96d2ab..b3b3069 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -71,9 +71,11 @@ AH_TEMPLATE([WITH_SSL], - # - # Checks for programs. - # -+AM_PROG_AR() - AC_PROG_CC() - AC_PROG_AWK() - AC_PROG_LIBTOOL() -+AM_PROG_CC_C_O() - - # - # Checks for tool features. -diff --git a/libnetbsd/Makefile.am b/libnetbsd/Makefile.am -index 3e5c3ce..39bb12d 100644 ---- a/libnetbsd/Makefile.am -+++ b/libnetbsd/Makefile.am -@@ -5,7 +5,7 @@ noinst_LTLIBRARIES = libnetbsd.la - libnetbsd_la_SOURCES = - - --CPPFLAGS = \ -+AM_CPPFLAGS = \ - -I$(srcdir) \ - -I$(top_srcdir) \ - -I$(top_builddir) --- -1.7.10.4 - diff --git a/meta-networking/recipes-support/tnftp/tnftp_20151004.bb b/meta-networking/recipes-support/tnftp/tnftp_20230507.bb index 83ad11b0e9..bdd9759f26 100644 --- a/meta-networking/recipes-support/tnftp/tnftp_20151004.bb +++ b/meta-networking/recipes-support/tnftp/tnftp_20230507.bb @@ -10,27 +10,26 @@ SOCKS support, TIS FWTK gate-ftp server support, and transfer rate \ throttling." SECTION = "net" -LICENSE = "BSD-4-Clause" +LICENSE = "BSD-2-Clause" DEPENDS = "ncurses" -SRC_URI = "ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/${BPN}-${PV}.tar.gz \ - file://tnftp-autotools.patch \ +SRC_URI = "https://ftp.netbsd.org/pub/NetBSD/misc/tnftp/${BPN}-${PV}.tar.gz \ + file://0001-libedit-Include-missing-header-stdc-predef.h.patch \ " inherit autotools update-alternatives pkgconfig ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE_${PN} = "ftp" -ALTERNATIVE_LINK_NAME_${PN} = "${bindir}/ftp" -ALTERNATIVE_TARGET_${PN} = "${bindir}/tnftp" +ALTERNATIVE:${PN} = "ftp" +ALTERNATIVE_LINK_NAME[ftp] = "${bindir}/ftp" +ALTERNATIVE_TARGET[ftp] = "${bindir}/tnftp" -FILES_${PN} = "${bindir}/tnftp" +FILES:${PN} = "${bindir}/tnftp" -LIC_FILES_CHKSUM = "file://COPYING;md5=6d6796cb166a9bb050958241dad9479e" -SRC_URI[md5sum] = "a49fbe752318d5a7893f900046ea00d5" -SRC_URI[sha256sum] = "c94a8a49d3f4aec1965feea831d4d5bf6f90c65fd8381ee0863d11a5029a43a0" +LIC_FILES_CHKSUM = "file://COPYING;md5=fbbb944979c7466ed5509b4bbc6c328b" +SRC_URI[sha256sum] = "be0134394bd7d418a3b34892b0709eeb848557e86474e1786f0d1a887d3a6580" PACKAGECONFIG ?= "openssl \ ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ diff --git a/meta-networking/recipes-support/traceroute/traceroute/filter-out-the-patches-from-subdirs.patch b/meta-networking/recipes-support/traceroute/traceroute/filter-out-the-patches-from-subdirs.patch deleted file mode 100644 index 2c030b55dd..0000000000 --- a/meta-networking/recipes-support/traceroute/traceroute/filter-out-the-patches-from-subdirs.patch +++ /dev/null @@ -1,47 +0,0 @@ -From e273e0ebc753645555909bcc4874c72458b17891 Mon Sep 17 00:00:00 2001 -From: Robert Yang <liezhi.yang@windriver.com> -Date: Fri, 17 Jan 2014 03:17:44 -0500 -Subject: [PATCH] Make.rules: filter-out the patches from subdirs - -The $(subdirs) contains all the dirs under the ${B}, and this one: - -do_unpack[cleandirs] = "${S}/patches" - -will create a "patches" dir, then there will be compile errors, filter -out the patches will fix the problem. - -Note: poky doesn't have this problem since it separates the ${S} and -${B} - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Robert Yang <liezhi.yang@windriver.com> ---- - Make.rules | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Make.rules b/Make.rules -index b077cd5..0bfce2d 100644 ---- a/Make.rules -+++ b/Make.rules -@@ -97,7 +97,7 @@ endif - subdirs := $(filter-out $(SKIPDIRS), $(subdirs)) - endif - --install install-%: subdirs := $(filter-out $(SKIPINSTALL), $(subdirs)) -+install install-%: subdirs := $(filter-out $(SKIPINSTALL) patches, $(subdirs)) - - - override MAKE += srcdir=$(srcdir) subdirs="$(subdirs)" shared=$(shared) -@@ -106,7 +106,7 @@ override MAKE += srcdir=$(srcdir) subdirs="$(subdirs)" shared=$(shared) - INCLUDEDIRS := $(filter $(INCLUDEDIRS), $(subdirs)) - LIBDIRS := $(filter $(LIBDIRS), $(subdirs)) - MODDIRS := $(filter $(MODDIRS), $(subdirs)) --EXEDIRS := $(filter-out $(INCLUDEDIRS) $(LIBDIRS) $(MODDIRS), $(subdirs)) -+EXEDIRS := $(filter-out $(INCLUDEDIRS) $(LIBDIRS) $(MODDIRS) patches, $(subdirs)) - MODUSERS := $(filter $(MODUSERS), $(subdirs)) - SBINUSERS := $(filter $(SBINUSERS), $(subdirs)) - --- -1.7.10.4 - diff --git a/meta-networking/recipes-support/traceroute/traceroute_2.1.0.bb b/meta-networking/recipes-support/traceroute/traceroute_2.1.5.bb index 8f17d3fdbe..862cba91e9 100644 --- a/meta-networking/recipes-support/traceroute/traceroute_2.1.0.bb +++ b/meta-networking/recipes-support/traceroute/traceroute_2.1.5.bb @@ -7,23 +7,22 @@ tool. If you're having network connectivity problems, traceroute will \ show you where the trouble is coming from along the route." SECTION = "net" HOMEPAGE = "http://traceroute.sourceforge.net/" -LICENSE = "GPL-2.0+ & LGPL-2.1+" +LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c" inherit update-alternatives +UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/traceroute/files/traceroute/" + SRC_URI = "${SOURCEFORGE_MIRROR}/traceroute/traceroute/${BP}/${BP}.tar.gz \ - file://filter-out-the-patches-from-subdirs.patch \ " - -SRC_URI[md5sum] = "84d329d67abc3fb83fc8cb12aeaddaba" -SRC_URI[sha256sum] = "3669d22a34d3f38ed50caba18cd525ba55c5c00d5465f2d20d7472e5d81603b6" +SRC_URI[sha256sum] = "9c6c260d96eaab51e3ce461b0a84fe87123ebc6dd6c9a59fab803f95b35a859e" EXTRA_OEMAKE = "VPATH=${STAGING_LIBDIR}" +LTOEXTRA += "-flto-partition=none" do_compile() { - export LDFLAGS="${TARGET_LDFLAGS} -L${S}/libsupp" oe_runmake "env=yes" } @@ -40,6 +39,6 @@ do_install() { } -ALTERNATIVE_PRIORITY = "60" -ALTERNATIVE_${PN} = "traceroute" +ALTERNATIVE_PRIORITY = "100" +ALTERNATIVE:${PN} = "traceroute" ALTERNATIVE_LINK_NAME[traceroute] = "${bindir}/traceroute" diff --git a/meta-networking/recipes-support/tunctl/tunctl.inc b/meta-networking/recipes-support/tunctl/tunctl.inc index 1c11823dd5..07e6dc217d 100644 --- a/meta-networking/recipes-support/tunctl/tunctl.inc +++ b/meta-networking/recipes-support/tunctl/tunctl.inc @@ -1,6 +1,6 @@ SUMMARY = "Tool for controlling the Linux TUN/TAP driver" SECTION = "net" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://tunctl.c;beginline=1;endline=4;md5=ff3a09996bc5fff6bc5d4e0b4c28f999" SRC_URI = "${SOURCEFORGE_MIRROR}/tunctl/tunctl-${PV}.tar.gz \ diff --git a/meta-networking/recipes-support/uftp/uftp_4.9.3.bb b/meta-networking/recipes-support/uftp/uftp_5.0.3.bb index 1166f9a8db..6f0858cc95 100644 --- a/meta-networking/recipes-support/uftp/uftp_4.9.3.bb +++ b/meta-networking/recipes-support/uftp/uftp_5.0.3.bb @@ -1,13 +1,13 @@ DESCRIPTION = "Encrypted UDP based FTP with multicast" HOMEPAGE = "https://sourceforge.net/projects/uftp-multicast" SECTION = "libs/network" - -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=d32239bcb673463ab874e80d47fae504" +UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/uftp-multicast/files/source-tar/" + SRC_URI = "${SOURCEFORGE_MIRROR}/uftp-multicast/source-tar/uftp-${PV}.tar.gz" -SRC_URI[md5sum] = "231d6ba7820d89a712fe7d727ab0f8e6" -SRC_URI[sha256sum] = "9e9215af0315257c6cc4f40fbc6161057e861be1fff10a38a5564f699e99c78f" +SRC_URI[sha256sum] = "cb8668c19b1f10bc63a16ffa893e205dc3ec86361037d477d8003260ebc40080" DEPENDS = "openssl" diff --git a/meta-networking/recipes-support/unbound/unbound_1.20.0.bb b/meta-networking/recipes-support/unbound/unbound_1.20.0.bb new file mode 100644 index 0000000000..fe0111f595 --- /dev/null +++ b/meta-networking/recipes-support/unbound/unbound_1.20.0.bb @@ -0,0 +1,46 @@ +SUMMARY = "Unbound is a validating, recursive, and caching DNS resolver" +DESCRIPTION = "Unbound's design is a set of modular components which incorporate \ + features including enhanced security (DNSSEC) validation, Internet Protocol \ + Version 6 (IPv6), and a client resolver library API as an integral part of the \ + architecture" + +HOMEPAGE = "https://www.unbound.net/" +SECTION = "net" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=5308494bc0590c0cb036afd781d78f06" + +SRC_URI = "git://github.com/NLnetLabs/unbound.git;protocol=https;branch=branch-1.20.0" +SRCREV = "b9525c5fd47ba481a29b90109017d2253beb105d" + +inherit autotools pkgconfig systemd update-rc.d + +DEPENDS = "openssl libtool-native bison-native expat" +RDEPENDS:${PN} = "bash openssl-bin daemonize" + +S = "${WORKDIR}/git" + +EXTRA_OECONF = "--with-libexpat=${STAGING_EXECPREFIXDIR} \ + --with-ssl=${STAGING_EXECPREFIXDIR} \ + --enable-largefile" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG[dnscrypt] = "--enable-dnscrypt, --disable-dnscrypt, libsodium" +PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd" +PACKAGECONFIG[libevent] = "--with-libevent=${STAGING_EXECPREFIXDIR},,libevent" + +do_configure:append() { + sed -i -e 's#${RECIPE_SYSROOT}##g' ${B}/config.h +} + +do_install:append() { + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${B}/contrib/unbound.service ${D}${systemd_unitdir}/system + + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${S}/contrib/unbound.init_yocto ${D}${sysconfdir}/init.d/unbound +} + +SYSTEMD_SERVICE:${PN} = "${BPN}.service" + +INITSCRIPT_NAME = "unbound" +INITSCRIPT_PARAMS = "defaults" diff --git a/meta-networking/recipes-support/vnstat/vnstat_2.6.bb b/meta-networking/recipes-support/vnstat/vnstat_2.6.bb new file mode 100644 index 0000000000..cf3f41c5a1 --- /dev/null +++ b/meta-networking/recipes-support/vnstat/vnstat_2.6.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "vnStat is a console-based network traffic monitor for Linux and BSD that keeps a log of network traffic for the selected interface(s)." +HOMEPAGE = "https://humdi.net/vnstat/" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +SECTION = "net" +DEPENDS = "gd sqlite3" + +SRC_URI = "https://github.com/vergoh/vnstat/releases/download/v${PV}/${BPN}-${PV}.tar.gz" +SRC_URI[md5sum] = "fe2928a81243cc8a532a357f97221736" +SRC_URI[sha256sum] = "89276e0a7281943edb554b874078278ad947dc312938a2451e03eb80679f7ff7" + +inherit autotools pkgconfig systemd + +EXTRA_OECONF = "--disable-extra-paths" + +do_install:append() { + install -Dm644 ${S}/examples/systemd/vnstat.service "${D}${systemd_system_unitdir}/vnstat.service" +} + +PARALLEL_MAKEINST = "" + +SYSTEMD_SERVICE:${PN} = "vnstat.service" diff --git a/meta-networking/recipes-support/wavemon/wavemon_0.9.5.bb b/meta-networking/recipes-support/wavemon/wavemon_0.9.5.bb new file mode 100644 index 0000000000..9da43cf9f4 --- /dev/null +++ b/meta-networking/recipes-support/wavemon/wavemon_0.9.5.bb @@ -0,0 +1,28 @@ +SUMMARY = "wavemon is a wireless device monitoring application" +HOMEPAGE = "https://github.com/uoaerg/wavemon" +DESCRIPTION = "wavemon is a wireless device monitoring application that \ + allows you to watch signal and noise levels, packet \ + statistics, device configuration and network parameters of \ + your wireless network hardware." + +LICENSE = "GPL-3.0-or-later" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1ebbd3e34237af26da5dc08a4e440464" + +PACKAGECONFIG ??= "cap" +PACKAGECONFIG[cap] = "--with-libcap,--without-libcap,libcap" + +DEPENDS = "libnl ncurses" + +SRC_URI = "git://github.com/uoaerg/wavemon;branch=master;protocol=https" +SRCREV = "a7c2f190e010db508ead31fa952478e2a1c13d64" + +# Needs some help to find libnl3 headers. +# Reorder -pthread flag on the command line. +EXTRA_OEMAKE = "\ + CC='${CC}' CFLAGS='${CFLAGS} -pthread -I${STAGING_INCDIR}/libnl3' \ +" + +S = "${WORKDIR}/git" + +# wavemon does not support using out-of-tree builds +inherit autotools-brokensep pkgconfig diff --git a/meta-networking/recipes-support/wireshark/README b/meta-networking/recipes-support/wireshark/README index 63b5b72631..f5e4d04777 100644 --- a/meta-networking/recipes-support/wireshark/README +++ b/meta-networking/recipes-support/wireshark/README @@ -14,12 +14,12 @@ Adding the wireshark to your build ======================================== via local.conf -IMAGE_INSTALL_append = " wireshark" +IMAGE_INSTALL:append = " wireshark" Adding the wireshark to your graphical build ======================================== via local.conf -IMAGE_INSTALL_append = " wireshark" +IMAGE_INSTALL:append = " wireshark" and one of: diff --git a/meta-networking/recipes-support/wireshark/files/0001-UseLemon.cmake-do-not-use-lemon-data-from-the-host.patch b/meta-networking/recipes-support/wireshark/files/0001-UseLemon.cmake-do-not-use-lemon-data-from-the-host.patch new file mode 100644 index 0000000000..1903f38f5d --- /dev/null +++ b/meta-networking/recipes-support/wireshark/files/0001-UseLemon.cmake-do-not-use-lemon-data-from-the-host.patch @@ -0,0 +1,32 @@ +From 802d3cafa888b36aa72007d48232a010dbb0231d Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex@linutronix.de> +Date: Wed, 27 Dec 2023 16:57:28 +0100 +Subject: [PATCH] UseLemon.cmake: do not use lemon data from the host + +We use native lemon, and not the host one, so +the data should be taken from the source tree as well. + +Upstream-Status: Inappropriate [cross-specific] +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + cmake/modules/UseLemon.cmake | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/cmake/modules/UseLemon.cmake b/cmake/modules/UseLemon.cmake +index fa4034e..83a7ca3 100644 +--- a/cmake/modules/UseLemon.cmake ++++ b/cmake/modules/UseLemon.cmake +@@ -13,11 +13,12 @@ if(LEMON_EXECUTABLE) + ${_out}.out + COMMAND ${LEMON_EXECUTABLE} + -l +- -T/usr/share/lemon/lempar.c ++ -T${CMAKE_SOURCE_DIR}/tools/lemon/lempar.c + -d. + ${_in} + DEPENDS + ${_in} ++ ${CMAKE_SOURCE_DIR}/tools/lemon/lempar.c + ) + endmacro() + add_custom_target(lemon) diff --git a/meta-networking/recipes-support/wireshark/files/0001-wireshark-src-improve-reproducibility.patch b/meta-networking/recipes-support/wireshark/files/0001-wireshark-src-improve-reproducibility.patch new file mode 100644 index 0000000000..202de62606 --- /dev/null +++ b/meta-networking/recipes-support/wireshark/files/0001-wireshark-src-improve-reproducibility.patch @@ -0,0 +1,28 @@ +From d9c4cdad0c48becab491ea4e80e5cd81f7d1dc97 Mon Sep 17 00:00:00 2001 +From: Oleksiy Obitotskyy <oobitots@cisco.com> +Date: Thu, 26 Nov 2020 05:38:31 -0800 +Subject: [PATCH] wireshark-src: improve reproducibility + +Cut absolute path for filename in generated code +comments. + +Upstream-Status: Pending +Signed-off-by: Oleksiy Obitotskyy <oobitots@cisco.com> + +--- + tools/ncp2222.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/ncp2222.py b/tools/ncp2222.py +index f14d0c5..05073b9 100755 +--- a/tools/ncp2222.py ++++ b/tools/ncp2222.py +@@ -5891,7 +5891,7 @@ def produce_code(): + + print("/*") + print(" * Do not modify this file. Changes will be overwritten.") +- print(" * Generated automatically from %s" % (sys.argv[0])) ++ print(" * Generated automatically from %s" % (os.path.basename(sys.argv[0]))) + print(" */\n") + + print(""" diff --git a/meta-networking/recipes-support/wireshark/files/0002-flex-Remove-line-directives.patch b/meta-networking/recipes-support/wireshark/files/0002-flex-Remove-line-directives.patch new file mode 100644 index 0000000000..0e6249c939 --- /dev/null +++ b/meta-networking/recipes-support/wireshark/files/0002-flex-Remove-line-directives.patch @@ -0,0 +1,44 @@ +From e4e88c2f55286cf24af230b265d0e059363baa6c Mon Sep 17 00:00:00 2001 +From: Oleksiy Obitotskyy <oobitots@cisco.com> +Date: Thu, 26 Nov 2020 12:00:43 -0800 +Subject: [PATCH] flex: Remove #line directives + +Append --noline option to flex to not +generate #line directives with absolute file patch. + +Upstream-Status: Pending +Signed-off-by: Oleksiy Obitotskyy <oobitots@cisco.com> + +--- + cmake/modules/FindLEX.cmake | 18 +++++++++++++----- + 1 file changed, 13 insertions(+), 5 deletions(-) + +diff --git a/cmake/modules/FindLEX.cmake b/cmake/modules/FindLEX.cmake +index 20caa09..174f452 100644 +--- a/cmake/modules/FindLEX.cmake ++++ b/cmake/modules/FindLEX.cmake +@@ -32,11 +32,19 @@ MACRO(ADD_LEX_FILES _source _generated) + SET(_outc ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.c) + SET(_outh ${CMAKE_CURRENT_BINARY_DIR}/${_basename}_lex.h) + +- ADD_CUSTOM_COMMAND( +- OUTPUT ${_outc} ${_outh} +- COMMAND ${LEX_EXECUTABLE} $<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:--debug> -o${_outc} --header-file=${_outh} ${_in} +- DEPENDS ${_in} +- ) ++ IF (DEFINED ENV{SOURCE_DATE_EPOCH}) ++ ADD_CUSTOM_COMMAND( ++ OUTPUT ${_outc} ${_outh} ++ COMMAND ${LEX_EXECUTABLE} $<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:--debug> --noline -o${_outc} --header-file=${_outh} ${_in} ++ DEPENDS ${_in} ++ ) ++ ELSE () ++ ADD_CUSTOM_COMMAND( ++ OUTPUT ${_outc} ${_outh} ++ COMMAND ${LEX_EXECUTABLE} $<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:--debug> -o${_outc} --header-file=${_outh} ${_in} ++ DEPENDS ${_in} ++ ) ++ ENDIF () + LIST(APPEND ${_source} ${_in}) + LIST(APPEND ${_generated} ${_outc}) + INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/meta-networking/recipes-support/wireshark/files/0004-lemon-Remove-line-directives.patch b/meta-networking/recipes-support/wireshark/files/0004-lemon-Remove-line-directives.patch new file mode 100644 index 0000000000..1a6fe8d39e --- /dev/null +++ b/meta-networking/recipes-support/wireshark/files/0004-lemon-Remove-line-directives.patch @@ -0,0 +1,35 @@ +From 94b951c0cccf67b66749cc87c473e63fa5207e83 Mon Sep 17 00:00:00 2001 +From: Oleksiy Obitotskyy <oobitots@cisco.com> +Date: Wed, 27 Jan 2021 06:47:13 -0800 +Subject: [PATCH] lemon: Remove #line directives + +In case of reproducible build remove #line +directives with extra option '-l'. + +Upstream-Status: Pending +Signed-off-by: Oleksiy Obitotskyy <oobitots@cisco.com> + +--- + cmake/modules/UseLemon.cmake | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/cmake/modules/UseLemon.cmake b/cmake/modules/UseLemon.cmake +index e419de1..fa4034e 100644 +--- a/cmake/modules/UseLemon.cmake ++++ b/cmake/modules/UseLemon.cmake +@@ -12,6 +12,7 @@ if(LEMON_EXECUTABLE) + ${_out}.h + ${_out}.out + COMMAND ${LEMON_EXECUTABLE} ++ -l + -T/usr/share/lemon/lempar.c + -d. + ${_in} +@@ -30,6 +31,7 @@ else() + ${_out}.h + ${_out}.out + COMMAND $<TARGET_FILE:lemon> ++ -l + -T${CMAKE_SOURCE_DIR}/tools/lemon/lempar.c + -d. + ${_in} diff --git a/meta-networking/recipes-support/wireshark/wireshark_2.2.11.bb b/meta-networking/recipes-support/wireshark/wireshark_2.2.11.bb deleted file mode 100644 index 5eb372e37e..0000000000 --- a/meta-networking/recipes-support/wireshark/wireshark_2.2.11.bb +++ /dev/null @@ -1,71 +0,0 @@ -DESCRIPTION = "wireshark - a popular network protocol analyzer" -HOMEPAGE = "http://www.wireshark.org" -SECTION = "net" -LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=6e271234ba1a13c6e512e76b94ac2f77" - -DEPENDS = "pcre expat glib-2.0 glib-2.0-native" - -SRC_URI = "https://2.na.dl.wireshark.org/src/all-versions/${BP}.tar.bz2" - -PE = "1" - -SRC_URI[md5sum] = "a79ba6cda83be2a91bde4110fe194788" -SRC_URI[sha256sum] = "a9f11621e85d7e1d72259157edd94825e72af3fd72e184b8474459f92ad5fc40" - -inherit autotools pkgconfig perlnative - -ARM_INSTRUCTION_SET = "arm" - -PACKAGECONFIG ?= "libpcap gnutls libnl libcap sbc" -PACKAGECONFIG += " ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk2 graphics", "", d)}" -#PACKAGECONFIG += " ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "gtk3", "", d)}" - -PACKAGECONFIG[libcap] = "--with-libcap=${STAGING_LIBDIR}, --with-libcap=no --enable-pcap-ng-default , libcap" -PACKAGECONFIG[libpcap] = "--with-pcap=${STAGING_LIBDIR} --with-pcap-remote, --with-pcap=no --enable-pcap-ng-default , libpcap" -PACKAGECONFIG[libsmi] = "--with-libsmi=yes, --with-libsmi=no, libsmi" -PACKAGECONFIG[libnl] = "--with-libnl=yes, --with-libnl=no, libnl" -PACKAGECONFIG[portaudio] = "--with-portaudio=yes, --with-portaudio=no, portaudio-v19" -PACKAGECONFIG[gtk2] = "--with-gtk=2, , gtk+" -PACKAGECONFIG[gtk3] = "--with-gtk=3, , gtk+3" -PACKAGECONFIG[graphics] = "--enable-wireshark, --with-gtk=no --disable-wireshark," -PACKAGECONFIG[gnutls] = "--with-gnutls=yes, --with-gnutls=no, gnutls" -PACKAGECONFIG[gcrypt] = "--with-gcrypt=yes, --with-gcrypt=no, libgcrypt" -PACKAGECONFIG[ssl] = "--with-ssl=yes, --with-ssl=no, openssl" -PACKAGECONFIG[krb5] = "--with-krb5=yes, --with-krb5=no, krb5" -PACKAGECONFIG[lua] = "--with-lua=yes, --with-lua=no, lua" -PACKAGECONFIG[zlib] = "--with-zlib=yes, --with-zlib=no, zlib" -PACKAGECONFIG[geoip] = "--with-geoip=yes, --with-geoip=no, geoip" -PACKAGECONFIG[plugins] = "--with-plugins=yes, --with-plugins=no" -PACKAGECONFIG[sbc] = "--with-sbc=yes, --with-sbc=no, sbc" - -PACKAGECONFIG[libssh] = "--with-libssh=${STAGING_LIBDIR}, --with-libssh=no, libssh2" - - -# these next two options require addional layers -PACKAGECONFIG[c-ares] = "--with-c-ares=yes, --with-c-ares=no, c-ares" - -EXTRA_OECONF += "--with-qt=no --enable-tshark --enable-rawshark" - -# Currently wireshark does not install header files -do_install_append () { - - install -d ${D}/${includedir}/${BPN} - install -d ${D}/${includedir}/${BPN}/epan - install -d ${D}/${includedir}/${BPN}/epan/crypt - install -d ${D}/${includedir}/${BPN}/epan/dfilter - install -d ${D}/${includedir}/${BPN}/epan/dissectors - install -d ${D}/${includedir}/${BPN}/epan/ftypes - install -d ${D}/${includedir}/${BPN}/epan/wmem - - install config.h ${D}/${includedir}/${BPN} - install ${S}/register.h ${D}/${includedir}/${BPN} - install -D ${S}/epan/*.h ${D}/${includedir}/${BPN}/epan - install -D ${S}/epan/crypt/*.h ${D}/${includedir}/${BPN}/epan/crypt - install -D ${S}/epan/dfilter/*.h ${D}/${includedir}/${BPN}/epan/dfilter - install -D ${S}/epan/dissectors/*.h ${D}/${includedir}/${BPN}/epan/dissectors - install -D ${S}/epan/ftypes/*.h ${D}/${includedir}/${BPN}/epan/ftypes - install -D ${S}/epan/wmem/*.h ${D}/${includedir}/${BPN}/epan/wmem -} - -FILES_${PN} += "${datadir}*" diff --git a/meta-networking/recipes-support/wireshark/wireshark_4.2.5.bb b/meta-networking/recipes-support/wireshark/wireshark_4.2.5.bb new file mode 100644 index 0000000000..7cbe3e6324 --- /dev/null +++ b/meta-networking/recipes-support/wireshark/wireshark_4.2.5.bb @@ -0,0 +1,99 @@ +DESCRIPTION = "wireshark - a popular network protocol analyzer" +HOMEPAGE = "http://www.wireshark.org" +SECTION = "net" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = "pcre2 expat glib-2.0 glib-2.0-native libgcrypt libgpg-error libxml2 bison-native c-ares speexdsp" + +DEPENDS:append:class-target = " wireshark-native chrpath-replacement-native " + +SRC_URI = "https://1.eu.dl.wireshark.org/src/wireshark-${PV}.tar.xz \ + file://0001-wireshark-src-improve-reproducibility.patch \ + file://0002-flex-Remove-line-directives.patch \ + file://0004-lemon-Remove-line-directives.patch \ + file://0001-UseLemon.cmake-do-not-use-lemon-data-from-the-host.patch \ + " + +UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src" + +SRC_URI[sha256sum] = "55e793ab87a9a73aac44336235c92cb76c52180c469b362ed3a54f26fbb1261f" + +PE = "1" + +inherit cmake pkgconfig python3native python3targetconfig perlnative upstream-version-is-even mime mime-xdg + +PACKAGECONFIG ?= "libpcap gnutls libnl libcap sbc" + +PACKAGECONFIG:class-native = "libpcap gnutls ssl libssh" + +PACKAGECONFIG[libcap] = "-DENABLE_CAP=ON,-DENABLE_CAP=OFF -DENABLE_PCAP_NG_DEFAULT=ON, libcap" +PACKAGECONFIG[libpcap] = "-DENABLE_PCAP=ON,-DENABLE_PCAP=OFF -DENABLE_PCAP_NG_DEFAULT=ON , libpcap" +PACKAGECONFIG[libsmi] = "-DENABLE_SMI=ON,-DENABLE_SMI=OFF,libsmi" +PACKAGECONFIG[libnl] = ",,libnl" +PACKAGECONFIG[portaudio] = "-DENABLE_PORTAUDIO=ON,-DENABLE_PORTAUDIO=OFF, portaudio-v19" +PACKAGECONFIG[gnutls] = "-DENABLE_GNUTLS=ON,-DENABLE_GNUTLS=OFF, gnutls" +PACKAGECONFIG[ssl] = ",,openssl" +PACKAGECONFIG[krb5] = "-DENABLE_KRB5=ON,-DENABLE_KRB5=OFF, krb5" +PACKAGECONFIG[lua] = "-DENABLE_LUA=ON,-DENABLE_LUA=OFF, lua" +PACKAGECONFIG[zlib] = "-DENABLE_ZLIB=ON,-DENABLE_ZLIB=OFF, zlib" +PACKAGECONFIG[geoip] = ",, geoip" +PACKAGECONFIG[plugins] = "-DENABLE_PLUGINS=ON,-DENABLE_PLUGINS=OFF" +PACKAGECONFIG[sbc] = "-DENABLE_SBC=ON,-DENABLE_SBC=OFF, sbc" +PACKAGECONFIG[libssh] = "-DENABLE_LIBSSH=ON,-DENABLE_LIBSSH=OFF, libssh2" +PACKAGECONFIG[lz4] = "-DENABLE_LZ4=ON,-DENABLE_LZ4=OFF, lz4" +PACKAGECONFIG[zstd] = "-DENABLE_STTD=ON,-DENABLE_ZSTD=OFF, zstd" +PACKAGECONFIG[nghttp2] = "-DENABLE_NGHTTP2=ON,-DENABLE_NGHTTP2=OFF, nghttp2" + +# these next two options require addional layers +PACKAGECONFIG[qt5] = "-DENABLE_QT5=ON -DBUILD_wireshark=ON, -DENABLE_QT5=OFF -DBUILD_wireshark=OFF, qttools-native qtmultimedia qtsvg" + +inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'cmake_qt5', '', d)} + +EXTRA_OECMAKE += "-DENABLE_NETLINK=ON \ + -DBUILD_mmdbresolve=OFF \ + -DBUILD_randpktdump=OFF \ + -DBUILD_androiddump=OFF \ + -DBUILD_dcerpcidl2wrs=OFF \ + -DM_INCLUDE_DIR=${includedir} \ + -DM_LIBRARY=${libdir} \ + " +CFLAGS:append = " -lm" + +do_compile:append:class-target() { + # Fix TMPDIR, these are in the comments section + sed -i -e "s:** source file.*::g" ${B}/wiretap/ascend_parser.c + sed -i -e "s:** source file.*::g" ${B}/wiretap/candump_parser.c + sed -i -e "s:** source file.*::g" ${B}/wiretap/busmaster_parser.c + sed -i -e "s:** source file.*::g" ${B}/epan/protobuf_lang_parser.c + sed -i -e "s:** source file.*::g" ${B}/epan/dtd_grammar.c + sed -i -e "s:** source file.*::g" ${B}/epan/dfilter/grammar.c +} + +do_install:append:class-native() { + install -d ${D}${bindir} + for f in lemon + do + install -m 0755 ${B}/run/$f ${D}${bindir} + done +} + +do_install:append:class-target() { + for f in `find ${D}${libdir} ${D}${bindir} -type f -executable` + do + chrpath --delete $f + done + + # We don't need the cmake files installed + rm -fr ${D}${usrlib}/${BPN}/cmake +} + +PACKAGE_BEFORE_PN += "tshark" + +FILES:tshark = "${bindir}/tshark ${mandir}/man1/tshark.*" + +FILES:${PN} += "${datadir}*" + +RDEPENDS:tshark = "wireshark" + +BBCLASSEXTEND = "native" diff --git a/meta-networking/recipes-support/wpan-tools/wpan-tools_0.9.bb b/meta-networking/recipes-support/wpan-tools/wpan-tools_0.9.bb new file mode 100644 index 0000000000..6b83cbd522 --- /dev/null +++ b/meta-networking/recipes-support/wpan-tools/wpan-tools_0.9.bb @@ -0,0 +1,16 @@ +SUMMARY = "Userspace tools for Linux IEEE 802.15.4 stack" +HOMEPAGE = "http://wpan.cakelab.org/releases/" +DESCRIPTION = "This is a set of utils to manage the Linux WPAN stack via \ +netlink interface. This requires recent kernel with nl802154 interface." + +LICENSE = "ISC" +LIC_FILES_CHKSUM = "file://COPYING;md5=4cfd939b1d7e6aba9fcefb7f6e2fd45d" + +DEPENDS = "libnl" + +SRC_URI = "git://github.com/linux-wpan/wpan-tools;branch=master;protocol=https" +SRCREV = "a316ca2caa746d60817400e5bf646c2820f09273" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig diff --git a/meta-networking/site/endian-big b/meta-networking/site/endian-big deleted file mode 100644 index 3a968e3267..0000000000 --- a/meta-networking/site/endian-big +++ /dev/null @@ -1,2 +0,0 @@ -# rp-pppoe -rpppoe_cv_pack_bitfields=${rpppoe_cv_pack_bitfields=normal} diff --git a/meta-networking/site/endian-little b/meta-networking/site/endian-little deleted file mode 100644 index 0bcd966ea8..0000000000 --- a/meta-networking/site/endian-little +++ /dev/null @@ -1,2 +0,0 @@ -# rp-pppoe -rpppoe_cv_pack_bitfields=${rpppoe_cv_pack_bitfields=rev} |