From 868407c65d79e82e83c37f7c32bef9a2e2bc4cd5 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Mon, 4 Nov 2019 13:24:47 -0500 Subject: meta-openembedded: subtree update:c986cbed93..e0daf6f8e0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adrian Bunk (19): lldpd: Upgrade 1.0.3 -> 1.0.4 usrsctp: Upgrade to a more recent git snapshot cim-schema: Remove duplicate file dovecot: Upgrade 2.2.36.3 -> 2.2.36.4 flashrom: Upgrade 1.0 -> 1.1 doxygen: Upgrade 1.8.15 -> 1.8.16 nodejs: Upgrade 10.16.3 -> 10.17.0 php: Upgrade 7.3.9 -> 7.3.11 libdivecomputer: Upgrade to 0.6.0 libnss-nisplus: Upgrade to the latest upstream git pegtl: Upgrade 2.1.4 -> 2.8.1 openwsman: Upgrade 2.6.9 -> 2.6.11 cgdb: Upgrade 0.6.8 -> 0.7.1 packagegroup-meta-networking: Exclude nonbuilding recipes with musl xf86-input-tslib: Upgrade 0.0.6 -> 0.0.7 libmicrohttpd: Upgrade 0.9.66 -> 0.9.67 poco: Upgrade 1.9.0 -> 1.9.4 libgphoto2: Remove obsolete HAL files mdns: Mark as incompatible with musl Andreas Müller (5): unicode-ucd: initial add 12.1.0 unicode-ucd: Set correct SUMMARY and HOMEPAGE colord: initial add 1.4.4 colord-gtk: initial add 0.2.0 ibus: initial add 1.5.21 André Draszik (3): nodejs: allow use of system c-ares (and make default) libuv: update to 1.33.1 nodejs: allow use of system libuv (and make default) Carlos Rafael Giani (1): opencv: Enable pkg-config .pc file generation Khem Raj (5): miniupnpd: Update to 2.1.20191006 miniupnpd: Build config.h before full build poco: Fix build on risc-v python-docutils: Upgrade to 0.15.2 iwd: Use python3 variant of docutils during build Luca Boccassi (1): dbus-broker: build with libaudit if selinux is enabled Martin Siegumfeldt (1): libiio: add python3 packageconfig Paul Eggleton (1): python3-pillow: update to 6.2.1 Slater, Joseph (2): syslog-ng: add volatile directory init for systemd syslog-ng: change conf files to version 3.19 Trevor Gamblin (4): python-priority: add recipe python-h2: add recipe python-hyperframe: add recipe python-hpack: add recipe Yi Zhao (1): freeradius: set CLEANBROKEN Zang Ruochen (22): poppler: upgrade 0.80.0 -> 0.82.0 gmime: upgrade 3.2.3 -> 3.2.4 autofs: upgrade 5.1.5 -> 5.1.6 python-simplejson: enable native and nativesdk python-dnspython: upgrade 1.15.0 -> 1.16.0 python-engineio: upgrade 3.9.3 -> 3.10.0 python-evdev: upgrade 0.7.0 -> 1.2.0 python-future: upgrade 0.16.0 -> 0.18.2 python-intervals: upgrade 1.5.4 -> 1.10.0 python-isort: upgrade 4.3.4 -> 4.3.21 python-javaobj-py3: upgrade 0.2.4 -> 0.3.0 python-lazy-object-proxy: upgrade 1.3.1 -> 1.4.3 python-parse: upgrade 1.8.4 -> 1.12.1 python-pathlib2: upgrade 2.3.4 -> 2.3.5 python-periphery: upgrade 1.1.1 -> 2.0.0 python-pint: upgrade 0.8.1 -> 0.9 python-progress: upgrade 1.4 -> 1.5 python-prompt-toolkit: upgrade 2.0.4 -> 2.0.10 python-pybind11: upgrade 2.2.3 -> 2.4.3 python-pycryptodome: upgrade 3.4.11 -> 3.9.0 python-pyexpect: upgrade 1.0.17 -> 1.0.19 python-pyfirmata: upgrade 1.0.3 -> 1.1.0 Zheng Ruoqin (23): pure-ftpd: upgrade 1.0.47 -> 1.0.49 grpc: upgrade 1.24.1 -> 1.24.3 corosync: upgrade 2.4.4 -> 2.4.5 dhcpcd: upgrade 8.0.2 -> 8.1.1 iscsi-initiator-utils: upgrade 2.0.877 -> 2.0.878 znc: upgrade 1.7.4 -> 1.7.5 babeld: upgrade 1.8.4 -> 1.9.1 htpdate: upgrade 1.2.1 -> 1.2.2 nbd: upgrade 3.19 -> 3.20 unbound: upgrade 1.9.2 -> 1.9.4 wireshark: upgrade 3.0.3 -> 3.0.6 mtr: upgrade 0.92 -> 0.93 libowfat: upgrade 0.31 -> 0.32 iozone3: upgrade 484 -> 487 libhugetlbfs: upgrade 2.21 -> 2.22 phoronix-test-suite: upgrade 8.8.1 -> 9.0.1 lmsensors: upgrade 3.5.0 -> 3.6.0 paho-mqtt-c: upgrade 1.3.0 -> 1.3.1 rtorrent: upgrade 0.9.7 -> 0.9.8 zabbix: upgrade 4.2.6 -> 4.2.7 iwd: upgrade 0.20 -> 0.23 libtorrent: upgrade 0.13.7 -> 0.13.8 ledmon: upgrade to 0.93 Change-Id: I66f0f395da9087e46899cf882e36d9cc50718c62 Signed-off-by: Brad Bishop --- .../0001-Add-OpenEmbedded-cross-compile-case.patch | 12 +++--- .../miniupnpd/miniupnpd_2.1.20190630.bb | 48 --------------------- .../miniupnpd/miniupnpd_2.1.20191006.bb | 49 ++++++++++++++++++++++ 3 files changed, 54 insertions(+), 55 deletions(-) delete mode 100644 meta-openembedded/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20190630.bb create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20191006.bb (limited to 'meta-openembedded/meta-networking/recipes-connectivity/miniupnpd') diff --git a/meta-openembedded/meta-networking/recipes-connectivity/miniupnpd/files/0001-Add-OpenEmbedded-cross-compile-case.patch b/meta-openembedded/meta-networking/recipes-connectivity/miniupnpd/files/0001-Add-OpenEmbedded-cross-compile-case.patch index cd4291d91..e33d8eac1 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/miniupnpd/files/0001-Add-OpenEmbedded-cross-compile-case.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/miniupnpd/files/0001-Add-OpenEmbedded-cross-compile-case.patch @@ -3,17 +3,15 @@ From: Khem Raj Date: Sat, 22 Dec 2018 18:47:45 -0800 Subject: [PATCH] Add OpenEmbedded cross compile case -Upstream-Status: Pending +Upstream-Status: Submitted [https://github.com/miniupnp/miniupnp/pull/410] Signed-off-by: Khem Raj --- genconfig.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) -diff --git a/genconfig.sh b/genconfig.sh -index dc42462..59922e9 100755 --- a/genconfig.sh +++ b/genconfig.sh -@@ -98,6 +98,12 @@ if [ -f ../shared/tomato_version ]; then +@@ -103,6 +103,12 @@ if [ -f ../shared/tomato_version ]; then OS_VERSION="Tomato $TOMATO_VER" fi @@ -26,14 +24,14 @@ index dc42462..59922e9 100755 ${RM} ${CONFIGFILE} echo "/* MiniUPnP Project" >> ${CONFIGFILE} -@@ -318,6 +324,11 @@ case $OS_NAME in +@@ -346,6 +352,11 @@ case $OS_NAME in echo "#define USE_IFACEWATCHER 1" >> ${CONFIGFILE} - FW=netfilter + FW=iptables ;; + OpenEmbedded) + OS_URL=http://www.openembedded.org/ + echo "#define USE_IFACEWATCHER 1" >> ${CONFIGFILE} -+ FW=netfilter ++ FW=iptables + ;; AstLinux) OS_URL=http://www.astlinux.org/ diff --git a/meta-openembedded/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20190630.bb b/meta-openembedded/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20190630.bb deleted file mode 100644 index 6b8fdca4c..000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20190630.bb +++ /dev/null @@ -1,48 +0,0 @@ -SUMMARY = "Lightweight UPnP IGD daemon" -DESCRIPTION = "The miniUPnP daemon is an UPnP IGD (internet gateway device) \ -which provide NAT traversal services to any UPnP enabled client on \ -the network." - -SECTION = "networking" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=a1ed15843ce66639bcf9f109cf247870" - -inherit autotools gettext pkgconfig systemd - -DEPENDS += "iptables net-tools util-linux libmnl libnetfilter-conntrack" - -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] = "394e676f555d8047be69730d9c4d23a5" -SRC_URI[sha256sum] = "29f49fe6868597d041ee29f511fa7b65781b9e4e85ef2569a2381c2079e1743e" - -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 -} - -do_install() { - install -d ${D}/${sbindir} - install ${S}/miniupnpd ${D}/${sbindir} - install -d ${D}/${sysconfdir}/${BPN} - 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/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 ${WORKDIR}/miniupnpd.service ${D}${systemd_unitdir}/system/ -} - -SYSTEMD_SERVICE_${PN} = "miniupnpd.service" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20191006.bb b/meta-openembedded/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20191006.bb new file mode 100644 index 000000000..81bfe66a9 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20191006.bb @@ -0,0 +1,49 @@ +SUMMARY = "Lightweight UPnP IGD daemon" +DESCRIPTION = "The miniUPnP daemon is an UPnP IGD (internet gateway device) \ +which provide NAT traversal services to any UPnP enabled client on \ +the network." + +SECTION = "networking" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a1ed15843ce66639bcf9f109cf247870" + +inherit autotools gettext pkgconfig systemd + +DEPENDS += "iptables net-tools util-linux libmnl libnetfilter-conntrack" + +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 +} + +do_install() { + install -d ${D}/${sbindir} + install ${S}/miniupnpd ${D}/${sbindir} + install -d ${D}/${sysconfdir}/${BPN} + 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/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 ${WORKDIR}/miniupnpd.service ${D}${systemd_unitdir}/system/ +} + +SYSTEMD_SERVICE_${PN} = "miniupnpd.service" -- cgit v1.2.3