minissdpd: upgraded package to upstream
Upgraded net-misc/minissdpd to version 1.5.20200928 on amd64
BUG=b:199027618
TEST=Build and test on the DUT.
Change-Id: I289ab40020405805a09a7951fce5cc4ff1d5c523
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/overlays/portage-stable/+/3144775
Reviewed-by: Raju Konduru <rkonduru@google.com>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Yu-hsuan Lin <amylin@google.com>
Tested-by: Wei-shih Lin <weidonglin@google.com>
Commit-Queue: Wei-shih Lin <weidonglin@google.com>
diff --git a/metadata/md5-cache/net-misc/minissdpd-1.5.20160119 b/metadata/md5-cache/net-misc/minissdpd-1.5.20160119
deleted file mode 100644
index eb44d95..0000000
--- a/metadata/md5-cache/net-misc/minissdpd-1.5.20160119
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=MiniSSDP Daemon
-EAPI=5
-HOMEPAGE=http://miniupnp.free.fr/
-KEYWORDS=*
-LICENSE=BSD
-RDEPEND=|| ( net-misc/miniupnpd net-libs/miniupnpc )
-SLOT=0
-SRC_URI=http://miniupnp.free.fr/files/minissdpd-1.5.20160119.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f783d68a26b62d6b19e070e6bcada5e6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7c797e16e2775ac6ee53b05059579eb5
diff --git a/metadata/md5-cache/net-misc/minissdpd-1.5.20200928 b/metadata/md5-cache/net-misc/minissdpd-1.5.20200928
new file mode 100644
index 0000000..773e0c3
--- /dev/null
+++ b/metadata/md5-cache/net-misc/minissdpd-1.5.20200928
@@ -0,0 +1,14 @@
+BDEPEND=verify-sig? ( app-crypt/openpgp-keys-miniupnp ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install unpack
+DEPEND=net-libs/libnfnetlink
+DESCRIPTION=MiniSSDP Daemon
+EAPI=7
+HOMEPAGE=http://miniupnp.free.fr/
+IUSE=verify-sig
+KEYWORDS=*
+LICENSE=BSD
+RDEPEND=net-libs/libnfnetlink || ( net-misc/miniupnpd net-libs/miniupnpc )
+SLOT=0
+SRC_URI=http://miniupnp.free.fr/files/minissdpd-1.5.20200928.tar.gz verify-sig? ( http://miniupnp.free.fr/files/minissdpd-1.5.20200928.tar.gz.sig )
+_eclasses_=multilib 2477ebe553d3e4d2c606191fe6c33602 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb verify-sig 40b4f4f782cf67118f594ce604cc4c0a
+_md5_=b412adec75bec0ad06db97512e9a8619
diff --git a/net-misc/minissdpd/Manifest b/net-misc/minissdpd/Manifest
index 25be1d3..bbe7ffc 100644
--- a/net-misc/minissdpd/Manifest
+++ b/net-misc/minissdpd/Manifest
@@ -1 +1,3 @@
-DIST minissdpd-1.5.20160119.tar.gz 34711 SHA256 22a346530db3f119ce23bf90d92e950cc151287a12ece51078497b2ab113107c SHA512 ece65dd47ed5062d76fc46fb0c04254cc14620e141b68865e6760b60aecca403a22e070944d3d69cd07b3e093c0aff04f7344a24a7c9b0d8420f23a2434e3bcc WHIRLPOOL 9f430c72c1a36def77337006c14e954ee145a3447a447f685b2f6a918b95afa40d810b6b9de89e903dd07050bd96183a1b91e7f6ae35bc5f8fc7d96a0dcd3f63
+DIST minissdpd-1.5.20190824.tar.gz 37300 BLAKE2B 3a04f6af0af8ce5d26e4860ceafe2c52f1ee562f179094fbcba3485c85ae75b7374fd7fa8f89ec6d9ce2a10bb94120618de40e0191fc7ecdd1e813a2b9c5d6af SHA512 79a14482b69a88b778e484a3b3e98964c420ff7576ac818ba60fd5e07f5b31754cdef3ee00d9189ba0a33f0268f11acd1f7c4222d8d0958920d1f568ec7755e2
+DIST minissdpd-1.5.20200928.tar.gz 37860 BLAKE2B fc80660ed84198d08d5879e276a0b5ab49c66344c8841f223990f704b6ebf70c8411da1d84ec51a9f69285a6b5a804ebe6b197555f5684d55cd0bf3abe250704 SHA512 e44142dcec4d0d4029a9d93748a8b3edec5482e2313d290956d3829b04e3637f6ba81292f27effad8829b29bb59f7fc43666338a8423d683ca6daa5807ea6362
+DIST minissdpd-1.5.20200928.tar.gz.sig 543 BLAKE2B 5fdedfe4b042924667c329aa964e006cc9a5aad1e2d4f11d46c6689e7d88b4614c383bfb666ca9a7c90b37256a4e38dcc85e479687688578dd198893fcf5d3cf SHA512 15477061b009991a05323a66582bd7ba9c9aa3a1a7c84eca93b27adf1b11ede81063d9de4695fcf3567f3c367a730afe4cee0fa95cccdecd316d08021956cf6b
diff --git a/net-misc/minissdpd/files/minissdpd-1.2-remove-initd.patch b/net-misc/minissdpd/files/minissdpd-1.2-remove-initd.patch
deleted file mode 100644
index 9a5f596..0000000
--- a/net-misc/minissdpd/files/minissdpd-1.2-remove-initd.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur minissdpd-1.1.20120121.orig//Makefile minissdpd-1.1.20120121/Makefile
---- minissdpd-1.1.20120121.orig//Makefile 2012-01-02 05:46:24.000000000 -0500
-+++ minissdpd-1.1.20120121/Makefile 2012-01-22 07:01:54.000000000 -0500
-@@ -42,10 +42,6 @@
- $(INSTALL) minissdpd $(SBININSTALLDIR)
- $(INSTALL) -d $(MANINSTALLDIR)/man1
- $(INSTALL) minissdpd.1 $(MANINSTALLDIR)/man1/minissdpd.1
--ifneq ($(OS), Darwin)
-- $(INSTALL) -d $(PREFIX)/etc/init.d
-- $(INSTALL) minissdpd.init.d.script $(PREFIX)/etc/init.d/minissdpd
--endif
-
- minissdpd: $(MINISSDPDOBJS)
- $(CC) $(CFLAGS) -o $@ $(MINISSDPDOBJS)
diff --git a/net-misc/minissdpd/files/minissdpd-1.2-respect-CC.patch b/net-misc/minissdpd/files/minissdpd-1.2-respect-CC.patch
deleted file mode 100644
index 99d8c94..0000000
--- a/net-misc/minissdpd/files/minissdpd-1.2-respect-CC.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur minissdpd-1.2.orig//Makefile minissdpd-1.2/Makefile
---- minissdpd-1.2.orig//Makefile 2012-05-02 06:26:50.000000000 -0400
-+++ minissdpd-1.2/Makefile 2012-05-25 10:02:32.000000000 -0400
-@@ -18,7 +18,7 @@
- CFLAGS += -fno-strict-aliasing -fno-common
- CFLAGS += -D_GNU_SOURCE
- CFLAGS += -ansi
--CC = gcc
-+CC ?= gcc
- RM = rm -f
- INSTALL = install
- OS = $(shell uname -s)
diff --git a/net-misc/minissdpd/files/minissdpd-1.5-remove-initd.patch b/net-misc/minissdpd/files/minissdpd-1.5-remove-initd.patch
new file mode 100644
index 0000000..8393932
--- /dev/null
+++ b/net-misc/minissdpd/files/minissdpd-1.5-remove-initd.patch
@@ -0,0 +1,14 @@
+diff --git a/Makefile b/Makefile
+index 2380e79..98f2bd0 100644
+--- a/Makefile
++++ b/Makefile
+@@ -68,10 +68,6 @@ install: minissdpd
+ $(INSTALL) minissdpd $(SBININSTALLDIR)
+ $(INSTALL) -d $(MANINSTALLDIR)/man1
+ $(INSTALL) minissdpd.1 $(MANINSTALLDIR)/man1/minissdpd.1
+-ifeq (, $(findstring darwin, $(OS)))
+- $(INSTALL) -d $(PREFIX)/etc/init.d
+- $(INSTALL) minissdpd.init.d.script $(PREFIX)/etc/init.d/minissdpd
+-endif
+
+ check: validateminissdpd validatecodelength
diff --git a/net-misc/minissdpd/files/minissdpd.initd-r1 b/net-misc/minissdpd/files/minissdpd.initd-r1
deleted file mode 100644
index d09ed2c..0000000
--- a/net-misc/minissdpd/files/minissdpd.initd-r1
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/sbin/runscript
-
-MINISSDPD="/usr/sbin/minissdpd"
-PIDFILE="/var/run/minissdpd.pid"
-
-ROUTE="/bin/route"
-IFCONFIG="/bin/ifconfig"
-
-depend() {
- need net
- before miniupnpd
-}
-
-checkconfig() {
- if [ "x$MINISSDPD_IFACE" != "x" ]; then
- interfaces=$($IFCONFIG | grep "Link encap" | awk '{ print $1 }')
- for interface in $MINISSDPD_IFACE; do
- hit=0
- for available in $interfaces; do
- if [ "$interface" = "$available" ]; then
- hit=1
- fi
- done
- if [ $hit = 0 ]; then
- ewarn "Interface $interface not available"
- return 1
- fi
- done
- fi
- return 0
-}
-
-start() {
- ebegin "Starting minissdpd"
- checkconfig || return 1
-
- if [ "x$MINISSDPD_IFACE" = "x" ]; then
- # We assume that the default interface has an IP address
- interface=$($ROUTE | grep default | awk -- '{ print $8 }')
- IP="$($IFCONFIG $interface | grep 'inet' | sed 's/^.*inet \([0-9.]\+\).\+/\1/')"
- ARGS="-i $IP "
- else
- ARGS=""
- for interface in $MINISSDPD_IFACE; do
- # An interface may not have an IP address, so don't listen if it doesn't
- IP="$($IFCONFIG $interface | grep 'inet' | sed 's/^.*inet \([0-9.]\+\).\+/\1/')"
- if [ "x$IP" != "x" ]; then
- ARGS+="-i $IP "
- fi
- done
- fi
-
- start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $MINISSDPD -- $ARGS
- eend $?
-}
-
-stop() {
- ebegin "Stopping minissdpd"
- start-stop-daemon --stop --pidfile "${PIDFILE}"
- eend $?
-}
diff --git a/net-misc/minissdpd/files/minissdpd.initd-r2 b/net-misc/minissdpd/files/minissdpd.initd-r2
index 97f5f40..c8da587 100644
--- a/net-misc/minissdpd/files/minissdpd.initd-r2
+++ b/net-misc/minissdpd/files/minissdpd.initd-r2
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
MINISSDPD="/usr/sbin/minissdpd"
PIDFILE="/var/run/minissdpd.pid"
diff --git a/net-misc/minissdpd/metadata.xml b/net-misc/minissdpd/metadata.xml
index 1e75873..41a639e 100644
--- a/net-misc/minissdpd/metadata.xml
+++ b/net-misc/minissdpd/metadata.xml
@@ -1,8 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>blueness@gentoo.org</email>
<name>Anthony G. Basile</name>
</maintainer>
+ <maintainer type="person">
+ <email>mgorny@gentoo.org</email>
+ <name>Michał Górny</name>
+ </maintainer>
</pkgmetadata>
diff --git a/net-misc/minissdpd/minissdpd-1.5.20160119.ebuild b/net-misc/minissdpd/minissdpd-1.5.20160119.ebuild
deleted file mode 100644
index 087dfcd..0000000
--- a/net-misc/minissdpd/minissdpd-1.5.20160119.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-inherit eutils toolchain-funcs
-
-DESCRIPTION="MiniSSDP Daemon"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
-HOMEPAGE="http://miniupnp.free.fr/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="*"
-IUSE=""
-
-DEPEND=""
-RDEPEND="|| ( net-misc/miniupnpd net-libs/miniupnpc )"
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-1.2-remove-initd.patch"
-}
-
-src_compile() {
- emake CC="$(tc-getCC)"
-}
-
-src_install () {
- einstall PREFIX="${D}"
- newinitd "${FILESDIR}/${PN}.initd-r2" ${PN}
- newconfd "${FILESDIR}/${PN}.confd" ${PN}
- dodoc Changelog.txt README
- doman minissdpd.1
-}
diff --git a/net-misc/minissdpd/minissdpd-1.5.20200928.ebuild b/net-misc/minissdpd/minissdpd-1.5.20200928.ebuild
new file mode 100644
index 0000000..0d19ce2
--- /dev/null
+++ b/net-misc/minissdpd/minissdpd-1.5.20200928.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+inherit toolchain-funcs verify-sig
+
+DESCRIPTION="MiniSSDP Daemon"
+HOMEPAGE="http://miniupnp.free.fr/"
+SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz
+ verify-sig? ( http://miniupnp.free.fr/files/${P}.tar.gz.sig )"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="*"
+
+DEPEND="net-libs/libnfnetlink"
+RDEPEND="${DEPEND}
+ || ( net-misc/miniupnpd net-libs/miniupnpc )"
+BDEPEND="
+ verify-sig? ( app-crypt/openpgp-keys-miniupnp )"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/miniupnp.asc
+
+src_prepare() {
+ eapply "${FILESDIR}"/${PN}-1.5-remove-initd.patch
+ eapply_user
+}
+
+src_configure() {
+ sed -i -e '/#define HAVE_IP_MREQN/{s:/[*]::;s:[*]/::;}' config.h || die
+ sed -i -e '/#define NO_BACKGROUND_NO_PIDFILE/{s:/[*]::;s:[*]/::;}' config.h || die
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)"
+}
+
+src_install() {
+ emake PREFIX="${ED}" install
+ # note: we overwrite upstream's init.d
+ newinitd "${FILESDIR}/${PN}.initd-r2" ${PN}
+ newconfd "${FILESDIR}/${PN}.confd" ${PN}
+ dodoc Changelog.txt README
+ doman minissdpd.1
+}
