From deba8115d2c2af26df42966b91ef04ff4dd79cde Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 14 May 2020 11:09:11 +0100 Subject: gentoo resync : 14.05.2020 --- net-misc/miniupnpd/Manifest | 4 +- net-misc/miniupnpd/miniupnpd-2.1.20191006.ebuild | 88 ------------------------ net-misc/miniupnpd/miniupnpd-2.1.20200510.ebuild | 79 +++++++++++++++++++++ 3 files changed, 81 insertions(+), 90 deletions(-) delete mode 100644 net-misc/miniupnpd/miniupnpd-2.1.20191006.ebuild create mode 100644 net-misc/miniupnpd/miniupnpd-2.1.20200510.ebuild (limited to 'net-misc/miniupnpd') diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest index 4d04f5d719f9..6b9306631718 100644 --- a/net-misc/miniupnpd/Manifest +++ b/net-misc/miniupnpd/Manifest @@ -1,7 +1,7 @@ AUX miniupnpd-conf.d-r2 430 BLAKE2B 4f38d9dcbe3843770cab82b5f26b6bc23067dc58c20cebfbd355364ff6fadb6a9f5787c1f8d22a950774e3b2ebf70670bec0391247c3205a7ab2d926e9598102 SHA512 d011770e3a5aa5c4f45c77009e168c4dd1c25b2abe4b1a93ac3a22c0a6d9903f3b83a87569ec456d79e9d6b3be3af9b3f9c2327f40cc59bead25a3abe29421d9 AUX miniupnpd-init.d-r2 1002 BLAKE2B f697e4cbf3ab08f4b589705ae1cc3ae28f94647103f7a30c8277c02375db6128a2c804c0514ad4cc32fd3d46becc38c0dcd9a7c0ef8befd1ef07ac051509bbfe SHA512 7b773987bdbad18d5c6ff8e2e15484b8f0c28ff3b3be0e832e7b568dc2a93d96eb27acfecb33251b48d92cea557f71b3c5e6c4a6a5e4ae428571d1810e5ce856 -DIST miniupnpd-2.1.20191006.tar.gz 243255 BLAKE2B 38654cfc0238cdd413600216b01465cbecda69589249df5b6500db7e0719053dae351ab8c61d763a7586924f68b6d634266a1020084f30261442ac62fbd17a5e SHA512 5de2dc5ffb6df7b06bcb6ab8d8fbb34aa5a229a8310938e980b4caf6b957ceab104c455cebb57d7083736fde2db9569fcdf98783a36c915d362f7ff2987e3599 DIST miniupnpd-2.1.20200329.tar.gz 243725 BLAKE2B a9ca048744bc8f397e10bcc5e27638285d0000700855952cce4c2ba7959b2c9099e18045bd5e9103c67da79c90d04a2e505e064bcb1bbca5574437d4625101a5 SHA512 3f6a1a6f08924505a6db5ca5b1dbf7c59f8b48647c59a600799b020146422497248367767e41df0715bd9774129f2d8f95c4a63493af2db849bbe006231e6edf -EBUILD miniupnpd-2.1.20191006.ebuild 1973 BLAKE2B 06623d2fd8d2b2e31c1c9515ffa34aa5f083662f78c3b4478ae7003768e4a272419a9654bdc4e201bb2871bb5c11dc16ca52144687786c2593c690afd40d2a7d SHA512 b231ba28a2dbbb676b76cc07706167d194f5d628f228d5585dd3dfd7effd1e79a2526d9f53912b3c32ee0e3ba1ce32f45d15d636afee3435ed6c59845c539cda +DIST miniupnpd-2.1.20200510.tar.gz 245426 BLAKE2B 17b5335bb4cfb55a517c1f0aeb1eabd7515c729480ee737a8ba525988e59f067e18d2de78393df2ff62cc15201a742d17a17d5632601c1d98ea2a943dcc4a393 SHA512 36a5d1844075a93e76f13aba8820b3747bcc8f562c8cbcc562f991ac154e91c951b5caaa9b7c7066cf80534066c3ee6e20a066012b830143f0a7352cb9f5d71b EBUILD miniupnpd-2.1.20200329.ebuild 1973 BLAKE2B 37124c901c4055cca0a10b90e135fb31a85bb90f40d330ec765d28c9742173c38f856ebbde4cdf9e9f40c759ec090b53732fe4814b4297a2e6ef8b907a454e43 SHA512 2cad4ddaa9ea78cc1c8425499a268164fe4f4d93d34c27c5d88693946262a4490a9ff8047984dda9d7088ca82ed2a95e63c04ca5ee971e4eb014341f733005ba +EBUILD miniupnpd-2.1.20200510.ebuild 1843 BLAKE2B 94c397a041d7d7b6bfbe31691e1b7bf41f8f653eea88ff9f463b02f3a325e9ffe834c430a9ee7b80b90884c05b2d07d65bf206096e7cf09fa7a73deaf2f9dcef SHA512 ef68c939cb847d712c7953c65e9913b9ede642c9f1aee5b6ea92975ae3193a376ff8562ecdc804d74774d81ff22b7136dc3048d6a5bb1fb3c738311433298c1a MISC metadata.xml 902 BLAKE2B ec10dab38256289a3445ad960eb869fe01ad009e21f77e61ffa4e45cac71120df285461cc3515de395918635b8f76a5448d761f9644172064e1eea79aa926947 SHA512 931799b28d6b7b1676d7ed0b94ce6760b550087785885635cb03c656c20e51c810a75dd8d675e17e5b8fdb87e7909f2a972ba11e168310eef4f58efd0a065135 diff --git a/net-misc/miniupnpd/miniupnpd-2.1.20191006.ebuild b/net-misc/miniupnpd/miniupnpd-2.1.20191006.ebuild deleted file mode 100644 index 2e0b60b3a3d1..000000000000 --- a/net-misc/miniupnpd/miniupnpd-2.1.20191006.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="MiniUPnP IGD Daemon" -HOMEPAGE="http://miniupnp.free.fr/" -SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="+leasefile igd2 ipv6 nftables pcp-peer portinuse strict" - -RDEPEND=" - dev-libs/gmp:0= - sys-apps/util-linux:= - dev-libs/openssl:0= - !nftables? ( - >=net-firewall/iptables-1.4.6:0=[ipv6?] - net-libs/libnfnetlink:= - net-libs/libmnl:= - ) - nftables? ( - net-firewall/nftables - net-libs/libnftnl:= - net-libs/libmnl:= - )" -DEPEND="${RDEPEND} - sys-apps/lsb-release" - -src_prepare() { - default - - # Prevent overriding CFLAGS. - sed -i -e '/^CFLAGS =/d' Makefile.linux_nft || die - - mv "Makefile.linux$(usex nftables _nft '')" Makefile || die - - # Prevent gzipping manpage. - sed -i -e '/gzip/d' Makefile || die -} - -src_configure() { - local -a opts - opts=( - --vendorcfg - $(usex igd2 '--igd2' '') - $(usex ipv6 '--ipv6' '') - $(usex leasefile '--leasefile' '') - $(usex portinuse '--portinuse' '') - $(usex pcp-peer '--pcp-peer' '') - $(usex strict '--strict' '') - ) - - CONFIG_OPTIONS="${opts[*]}" emake config.h -} - -src_compile() { - # By default, it builds a bunch of unittests that are missing wrapper - # scripts in the tarball - emake CC="$(tc-getCC)" STRIP=true miniupnpd -} - -src_install() { - emake PREFIX="${ED}" STRIP=true install - - local confd_seds=() - if use nftables; then - confd_seds+=( -e 's/^iptables_scripts=/#&/' ) - else - confd_seds+=( -e 's/^nftables_scripts=/#&/' ) - fi - if ! use ipv6 || use nftables; then - confd_seds+=( -e 's/^ip6tables_scripts=/#&/' ) - fi - - newinitd "${FILESDIR}"/${PN}-init.d-r2 ${PN} - newconfd - ${PN} < <(sed "${confd_seds[@]}" \ - "${FILESDIR}"/${PN}-conf.d-r2 || die) -} - -pkg_postinst() { - elog "Please correct the external interface in the top of the two" - elog "scripts in /etc/miniupnpd and edit the config file in there too" -} diff --git a/net-misc/miniupnpd/miniupnpd-2.1.20200510.ebuild b/net-misc/miniupnpd/miniupnpd-2.1.20200510.ebuild new file mode 100644 index 000000000000..b208d8cce8f8 --- /dev/null +++ b/net-misc/miniupnpd/miniupnpd-2.1.20200510.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +DESCRIPTION="MiniUPnP IGD Daemon" +HOMEPAGE="http://miniupnp.free.fr/" +SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="+leasefile igd2 ipv6 nftables pcp-peer portinuse strict" + +RDEPEND=" + dev-libs/gmp:0= + sys-apps/util-linux:= + dev-libs/openssl:0= + !nftables? ( + >=net-firewall/iptables-1.4.6:0=[ipv6?] + net-libs/libnfnetlink:= + net-libs/libmnl:= + ) + nftables? ( + net-firewall/nftables + net-libs/libnftnl:= + net-libs/libmnl:= + )" +DEPEND="${RDEPEND} + sys-apps/lsb-release" + +src_configure() { + local opts=( + --vendorcfg + $(usex igd2 '--igd2' '') + $(usex ipv6 '--ipv6' '') + $(usex leasefile '--leasefile' '') + $(usex portinuse '--portinuse' '') + $(usex pcp-peer '--pcp-peer' '') + $(usex strict '--strict' '') + --firewall=$(usex nftables nftables iptables) + ) + + # custom script + ./configure "${opts[@]}" || die + # prevent gzipping manpage + sed -i -e '/gzip/d' Makefile || die +} + +src_compile() { + # By default, it builds a bunch of unittests that are missing wrapper + # scripts in the tarball + emake CC="$(tc-getCC)" STRIP=true miniupnpd +} + +src_install() { + emake PREFIX="${ED}" STRIP=true install + + local confd_seds=() + if use nftables; then + confd_seds+=( -e 's/^iptables_scripts=/#&/' ) + else + confd_seds+=( -e 's/^nftables_scripts=/#&/' ) + fi + if ! use ipv6 || use nftables; then + confd_seds+=( -e 's/^ip6tables_scripts=/#&/' ) + fi + + newinitd "${FILESDIR}"/${PN}-init.d-r2 ${PN} + newconfd - ${PN} < <(sed "${confd_seds[@]}" \ + "${FILESDIR}"/${PN}-conf.d-r2 || die) +} + +pkg_postinst() { + elog "Please correct the external interface in the top of the two" + elog "scripts in /etc/miniupnpd and edit the config file in there too" +} -- cgit v1.2.3