From 96a2cd62c888c166d991200c8f5f99636dad746e Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Tue, 6 Feb 2018 14:17:09 +0100 Subject: miniupnpd: update to 2.0.20180203 and add systemd service license checksum changed due to increase in copyright year Signed-off-by: Pascal Bach Signed-off-by: Armin Kuster --- .../miniupnpd/files/miniupnpd.service | 14 +++++++ .../miniupnpd/miniupnpd_2.0.20180203.bb | 43 ++++++++++++++++++++++ .../miniupnpd/miniupnpd_2.0.bb | 37 ------------------- 3 files changed, 57 insertions(+), 37 deletions(-) create mode 100644 meta-networking/recipes-connectivity/miniupnpd/files/miniupnpd.service create mode 100644 meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.0.20180203.bb delete mode 100644 meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.0.bb 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.20180203.bb b/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.0.20180203.bb new file mode 100644 index 0000000000..04b5cd589c --- /dev/null +++ b/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.0.20180203.bb @@ -0,0 +1,43 @@ +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=91ac00c6b9f5c106e89291e196fe0234" + +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 \ + file://miniupnpd.service" + +SRC_URI[md5sum] = "b4c7c938915edeee6ca4c65dd021f212" +SRC_URI[sha256sum] = "860c15f2f8340fd69546b01cffe4c7fcff3e63a7bdfe5a2af6b2346f0e074bb6" + +IPV6 = "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '--ipv6', '', d)}" + +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.0.bb b/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.0.bb deleted file mode 100644 index c6f36e1375..0000000000 --- a/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.0.bb +++ /dev/null @@ -1,37 +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=aa71c78c373ccfe0ff207af0cd966d91" - -inherit autotools gettext pkgconfig - -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" - -IPV6 = "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '--ipv6', '', d)}" - -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 -} -- cgit 1.2.3-korg