From 5a4ae66242ebb84d14fd64c4916eb570549cac39 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 1 Nov 2019 08:04:52 -0700 Subject: miniupnpd: Update to 2.1.20191006 Forward port the patches Signed-off-by: Khem Raj --- .../0001-Add-OpenEmbedded-cross-compile-case.patch | 12 +++--- .../miniupnpd/miniupnpd_2.1.20190630.bb | 48 ---------------------- .../miniupnpd/miniupnpd_2.1.20191006.bb | 48 ++++++++++++++++++++++ 3 files changed, 53 insertions(+), 55 deletions(-) delete mode 100644 meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20190630.bb create mode 100644 meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20191006.bb (limited to 'meta-networking/recipes-connectivity/miniupnpd') 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 index cd4291d91b..e33d8eac1d 100644 --- 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 @@ -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-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20190630.bb b/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20190630.bb deleted file mode 100644 index 6b8fdca4c3..0000000000 --- a/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-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20191006.bb b/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20191006.bb new file mode 100644 index 0000000000..595e211ea5 --- /dev/null +++ b/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20191006.bb @@ -0,0 +1,48 @@ +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 +} + +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 1.2.3-korg