[gentoo-commits] repo/gentoo:master commit in: net-misc/miniupnpd/, net-misc/miniupnpd/files/
commit: c1770fa205521b5abfbe16fb46a5ba3383218250
Author: Michał Górny gentoo org>
AuthorDate: Sun Aug 22 07:15:56 2021 +
Commit: Michał Górny gentoo org>
CommitDate: Sun Aug 22 08:01:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1770fa2
net-misc/miniupnpd: Bump to 2.2.3
Signed-off-by: Michał Górny gentoo.org>
net-misc/miniupnpd/Manifest| 2 +
.../files/miniupnpd-2.2.3-testgetifaddr.patch | 14 +++
net-misc/miniupnpd/miniupnpd-2.2.3.ebuild | 100 +
3 files changed, 116 insertions(+)
diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest
index cc070f82277..b26631d98c5 100644
--- a/net-misc/miniupnpd/Manifest
+++ b/net-misc/miniupnpd/Manifest
@@ -1,2 +1,4 @@
DIST miniupnpd-2.2.2.tar.gz 250649 BLAKE2B
d561916ced9b5c58371382fe0bec68cd0771d1dc3b2c7fa7e3701cb2579db69697fbdcd724bea2350abd46381eda1fd257dede6df99f99fa54e423db4ee52717
SHA512
3cc11ad901e93a9879fe07e35a20f8977df466bb402e0270e46d1dbd0b5dc3b5dc22303467d5022103952d7dd789ac590c17d0fa81fc7ec42676b66223d37ee4
DIST miniupnpd-2.2.2.tar.gz.sig 543 BLAKE2B
461a9149c66b0e314a767405024fc7bfb641a20ae36b908dc467c9211660d5cb0753fb3c99fa9d6df35d693a2f6790efb6a325f0005804572eaa78a02b23a482
SHA512
8ffc9901cd992cbd9d0fa4c5e510fe43f748ab4a7c4732cc8f2f685f19b71a3f087a63a39e1dbf081175ac65de34b5c05dc3ef636a805e550a0406119a5904ef
+DIST miniupnpd-2.2.3.tar.gz 254752 BLAKE2B
ebdb8d4ce7dc649ef0243d2d698b9f51cb2006055eb3abb70d9ccc839cb57c7113595ef1b9b5886f55bc458d8260edf95ae6e1964a5d5423f9b0b46e07e02775
SHA512
56b1e93e9576fa412202e1940fcd8b7af57584714c15017bbcec1aa4fa7bba7a6fa5d1136048100d7cce3222f31b38837de1eae344b533164314c858cdf08ef9
+DIST miniupnpd-2.2.3.tar.gz.sig 543 BLAKE2B
3ba2e69cfd7e0a27a746f45e5eb10e573e00c4fc20a7d62b94a2e0b7e4e9ad8779d53df72e31547b78dc6e34676204a4848652e81d1e479a68973e150f51f468
SHA512
9f766f3e94de1fbd458c7bda30cc87892198af7544aa9dc0fa4c6b6a1c9434e4bab6f8583eeccf3ae613da240ad599d750425c507e8138d483710459f31a0b21
diff --git a/net-misc/miniupnpd/files/miniupnpd-2.2.3-testgetifaddr.patch
b/net-misc/miniupnpd/files/miniupnpd-2.2.3-testgetifaddr.patch
new file mode 100644
index 000..73e4a87903e
--- /dev/null
+++ b/net-misc/miniupnpd/files/miniupnpd-2.2.3-testgetifaddr.patch
@@ -0,0 +1,14 @@
+diff --git a/miniupnpd/testgetifaddr.sh b/miniupnpd/testgetifaddr.sh
+index 7ad56d9..2a26a24 100755
+--- a/testgetifaddr.sh
b/testgetifaddr.sh
+@@ -12,7 +12,8 @@ case $OS in
+ *)
+ IP="`which ip`" || exit 1
+ EXTIF="`LC_ALL=C $IP -4 route | grep 'default' | sed -e
's/.*dev[[:space:]]*//' -e 's/[[:space:]].*//'`" || exit 1
+- EXTIP="`LC_ALL=C $IP -4 addr show $EXTIF | awk '/inet/ { print $2 }' |
cut -d "/" -f 1`"
++ EXTIF="`LC_ALL=C $IP -4 addr show $EXTIF | awk '/[0-9]+:/ { print $2;
exit 0 }' | cut -d ":" -f 1`"
++ EXTIP="`LC_ALL=C $IP -4 addr show $EXTIF | awk '/inet/ { print $2; exit
0 }' | cut -d "/" -f 1`"
+ ;;
+ esac
+
diff --git a/net-misc/miniupnpd/miniupnpd-2.2.3.ebuild
b/net-misc/miniupnpd/miniupnpd-2.2.3.ebuild
new file mode 100644
index 000..1042f0c2cb8
--- /dev/null
+++ b/net-misc/miniupnpd/miniupnpd-2.2.3.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit toolchain-funcs verify-sig
+
+MY_P=${P/_rc/-RC}
+DESCRIPTION="MiniUPnP IGD Daemon"
+HOMEPAGE="http://miniupnp.free.fr/";
+SRC_URI="http://miniupnp.free.fr/files/${MY_P}.tar.gz
+ verify-sig? ( http://miniupnp.free.fr/files/${MY_P}.tar.gz.sig )"
+S=${WORKDIR}/${MY_P}
+
+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}"
+BDEPEND="
+ sys-apps/lsb-release
+ verify-sig? ( app-crypt/openpgp-keys-miniupnp )"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/miniupnp.asc
+
+src_prepare() {
+ local PATCHES=(
+ "${FILESDIR}"/${P}-testgetifaddr.patch
+ )
+
+ default
+
+ # fails without a default route
+ sed -i -e 's:EXTIF=.*:EXTIF=lo:' testgetifaddr.sh || die
+}
+
+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 i
[gentoo-commits] repo/gentoo:master commit in: net-misc/miniupnpd/, net-misc/miniupnpd/files/
commit: c908d4d60eed7e6101d144d572d41d00e36618e2
Author: Michał Górny gentoo org>
AuthorDate: Sun Jul 28 06:29:22 2019 +
Commit: Michał Górny gentoo org>
CommitDate: Sun Jul 28 06:41:15 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c908d4d6
net-misc/miniupnpd: Drop old
Signed-off-by: Michał Górny gentoo.org>
net-misc/miniupnpd/Manifest| 2 -
net-misc/miniupnpd/files/miniupnpd-conf.d-r1 | 10 ---
net-misc/miniupnpd/files/miniupnpd-init.d-r1 | 33
net-misc/miniupnpd/miniupnpd-2.1.20190502.ebuild | 65
.../miniupnpd/miniupnpd-2.1.20190625-r1.ebuild | 88 --
net-misc/miniupnpd/miniupnpd-2.1.20190625.ebuild | 65
6 files changed, 263 deletions(-)
diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest
index c76f8b96c1b..49fd75fafde 100644
--- a/net-misc/miniupnpd/Manifest
+++ b/net-misc/miniupnpd/Manifest
@@ -1,3 +1 @@
-DIST miniupnpd-2.1.20190502.tar.gz 236052 BLAKE2B
9f2f81769d72fad2191969e0e80b4d2e70619d5674fe6b4ef9f4306e09ac4737577a2146bc04ec9960df092252abe3c9a57e32d5d893a763b85863d1c4892045
SHA512
6423cef89b5af62b6b6a120a3cd13a0e7755d609b33de8f1671f7f9160fb1b5e68b0ebd3f8b7b5758cf05a1c58b416cde253e37bc5ba0bb423c14b5fb44599f1
-DIST miniupnpd-2.1.20190625.tar.gz 240120 BLAKE2B
c6cf6b549a1c0c4a411d9487a3dae348d8a37767b9590d29ea763177d876ceb6f521bb7662452e2dff813354fc52f862bcc830079b3ff8af8185de6ee2771e8f
SHA512
3b9a14f24c7e753cc71b84622bfbbc0db4a5b5e0fd602ef1129b89b1c729e754c51f5c29b4bf8d1cc37a16f77b33f04cf3f3540afe1ac529105cb91f45fa92c8
DIST miniupnpd-2.1.20190630.tar.gz 240466 BLAKE2B
fe4d4e59a7dad32bef9ed9b4c58b52e378ec9b26ea2439e84284630a7ef7269c6cd53cabdc632ff274cae88aea2552a8808af2ea349138f8b8ed667baf9e87ee
SHA512
cd6006e5487652a258f7320e1e28fea7b0790528cc014071109a1abd0f6c249237cf8d0620987c14ee0ce1cca14f4bb4abd439b1d422e0e49a398cd485eaf970
diff --git a/net-misc/miniupnpd/files/miniupnpd-conf.d-r1
b/net-misc/miniupnpd/files/miniupnpd-conf.d-r1
deleted file mode 100644
index 1464bf04bd1..000
--- a/net-misc/miniupnpd/files/miniupnpd-conf.d-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-# /etc/conf.d/miniupnpd: Configuration for miniupnpd init script
-
-# extra arguments to be passed to the command
-#extra_args=""
-
-# the location of the configuration file
-#config_file="/etc/miniupnpd/miniupnpd.conf"
-
-# uncomment to not use included scripts to manipulate iptables
-#no_iptables_scripts=1
diff --git a/net-misc/miniupnpd/files/miniupnpd-init.d-r1
b/net-misc/miniupnpd/files/miniupnpd-init.d-r1
deleted file mode 100644
index 99406106a86..000
--- a/net-misc/miniupnpd/files/miniupnpd-init.d-r1
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-command="/usr/sbin/miniupnpd"
-: "${config_file:=/etc/miniupnpd/miniupnpd.conf}"
-command_args="-f ${config_file:-/etc/miniupnpd/miniupnpd.conf} ${extra_args}"
-: "${pidfile:=/var/run/miniupnpd.pid}"
-
-depend() {
- need net iptables
- use minissdpd
-}
-
-start_pre() {
- local retval=0
-
- if [[ -z ${no_iptables_scripts} ]]; then
- /etc/miniupnpd/iptables_init.sh || retval=${?}
- fi
-
- return ${retval}
-}
-
-stop_post() {
- local retval=0
-
- if [[ -z ${no_iptables_scripts} ]]; then
- /etc/miniupnpd/iptables_removeall.sh
- fi
-
- return ${retval}
-}
diff --git a/net-misc/miniupnpd/miniupnpd-2.1.20190502.ebuild
b/net-misc/miniupnpd/miniupnpd-2.1.20190502.ebuild
deleted file mode 100644
index 673b340fb09..000
--- a/net-misc/miniupnpd/miniupnpd-2.1.20190502.ebuild
+++ /dev/null
@@ -1,65 +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 pcp-peer portinuse strict"
-
-RDEPEND=">=net-firewall/iptables-1.4.6:0=[ipv6?]
- net-libs/libnfnetlink:=
- net-libs/libmnl:=
- dev-libs/gmp:0=
- sys-apps/util-linux:=
- dev-libs/openssl:0="
-DEPEND="${RDEPEND}
- sys-apps/lsb-release"
-
-src_prepare() {
- default
- mv Makefile.linux 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' '')
- )
-
- emake CONFIG_OPTIONS="$
[gentoo-commits] repo/gentoo:master commit in: net-misc/miniupnpd/, net-misc/miniupnpd/files/
commit: 47fd8517c3d1af028f7caf8ba09fc9147f57fe3d
Author: Michał Górny gentoo org>
AuthorDate: Sun Jun 30 07:18:17 2019 +
Commit: Michał Górny gentoo org>
CommitDate: Sun Jun 30 07:39:16 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47fd8517
net-misc/miniupnpd: Invert boolean for calling iptables
The negative logic is confusing, and it would get even more confusing
with the incoming ip6tables and nftables support.
Signed-off-by: Michał Górny gentoo.org>
net-misc/miniupnpd/files/miniupnpd-conf.d-r2| 10 ++
net-misc/miniupnpd/files/miniupnpd-init.d-r2| 4 ++--
net-misc/miniupnpd/miniupnpd-2.1.20190625-r1.ebuild | 2 +-
3 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/net-misc/miniupnpd/files/miniupnpd-conf.d-r2
b/net-misc/miniupnpd/files/miniupnpd-conf.d-r2
new file mode 100644
index 000..2ebd8c56b57
--- /dev/null
+++ b/net-misc/miniupnpd/files/miniupnpd-conf.d-r2
@@ -0,0 +1,10 @@
+# /etc/conf.d/miniupnpd: Configuration for miniupnpd init script
+
+# extra arguments to be passed to the command
+#extra_args=""
+
+# the location of the configuration file
+#config_file="/etc/miniupnpd/miniupnpd.conf"
+
+# enable manipulating iptables on start/stop
+iptables_scripts=1
diff --git a/net-misc/miniupnpd/files/miniupnpd-init.d-r2
b/net-misc/miniupnpd/files/miniupnpd-init.d-r2
index 2f9dc5fe6f3..8b9f0579f22 100644
--- a/net-misc/miniupnpd/files/miniupnpd-init.d-r2
+++ b/net-misc/miniupnpd/files/miniupnpd-init.d-r2
@@ -15,7 +15,7 @@ depend() {
start_pre() {
local retval=0
- if [ -z "${no_iptables_scripts}" ]; then
+ if [ -n "${iptables_scripts}" ]; then
/etc/miniupnpd/iptables_init.sh || retval=${?}
fi
@@ -25,7 +25,7 @@ start_pre() {
stop_post() {
local retval=0
- if [ -z "${no_iptables_scripts}" ]; then
+ if [ -n "${iptables_scripts}" ]; then
/etc/miniupnpd/iptables_removeall.sh
fi
diff --git a/net-misc/miniupnpd/miniupnpd-2.1.20190625-r1.ebuild
b/net-misc/miniupnpd/miniupnpd-2.1.20190625-r1.ebuild
index 0e787f99f32..30de1d75b8f 100644
--- a/net-misc/miniupnpd/miniupnpd-2.1.20190625-r1.ebuild
+++ b/net-misc/miniupnpd/miniupnpd-2.1.20190625-r1.ebuild
@@ -56,7 +56,7 @@ src_install() {
emake PREFIX="${ED}" STRIP=true install
newinitd "${FILESDIR}"/${PN}-init.d-r2 ${PN}
- newconfd "${FILESDIR}"/${PN}-conf.d-r1 ${PN}
+ newconfd "${FILESDIR}"/${PN}-conf.d-r2 ${PN}
}
pkg_postinst() {
[gentoo-commits] repo/gentoo:master commit in: net-misc/miniupnpd/, net-misc/miniupnpd/files/
commit: 139c59e8efd24827e28abe21b2053a591ca082f4
Author: Michał Górny gentoo org>
AuthorDate: Sun Jun 30 07:27:47 2019 +
Commit: Michał Górny gentoo org>
CommitDate: Sun Jun 30 07:39:17 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=139c59e8
net-misc/miniupnpd: Support running ip6tables setup scripts
Signed-off-by: Michał Górny gentoo.org>
net-misc/miniupnpd/files/miniupnpd-conf.d-r2| 3 +++
net-misc/miniupnpd/files/miniupnpd-init.d-r2| 8 +++-
net-misc/miniupnpd/miniupnpd-2.1.20190625-r1.ebuild | 6 +-
3 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/net-misc/miniupnpd/files/miniupnpd-conf.d-r2
b/net-misc/miniupnpd/files/miniupnpd-conf.d-r2
index 2ebd8c56b57..d0f5ce40cdc 100644
--- a/net-misc/miniupnpd/files/miniupnpd-conf.d-r2
+++ b/net-misc/miniupnpd/files/miniupnpd-conf.d-r2
@@ -8,3 +8,6 @@
# enable manipulating iptables on start/stop
iptables_scripts=1
+
+# enable manipulating ip6tables on start/stop
+ip6tables_scripts=1
diff --git a/net-misc/miniupnpd/files/miniupnpd-init.d-r2
b/net-misc/miniupnpd/files/miniupnpd-init.d-r2
index 8b9f0579f22..4671ba067c4 100644
--- a/net-misc/miniupnpd/files/miniupnpd-init.d-r2
+++ b/net-misc/miniupnpd/files/miniupnpd-init.d-r2
@@ -9,7 +9,7 @@ command_args="-f ${config_file:-/etc/miniupnpd/miniupnpd.conf}
${extra_args}"
depend() {
need net
- use iptables minissdpd
+ use iptables ip6tables minissdpd
}
start_pre() {
@@ -18,6 +18,9 @@ start_pre() {
if [ -n "${iptables_scripts}" ]; then
/etc/miniupnpd/iptables_init.sh || retval=${?}
fi
+ if [ -n "${ip6tables_scripts}" ]; then
+ /etc/miniupnpd/ip6tables_init.sh || retval=${?}
+ fi
return ${retval}
}
@@ -28,6 +31,9 @@ stop_post() {
if [ -n "${iptables_scripts}" ]; then
/etc/miniupnpd/iptables_removeall.sh
fi
+ if [ -n "${ip6tables_scripts}" ]; then
+ /etc/miniupnpd/ip6tables_removeall.sh
+ fi
return ${retval}
}
diff --git a/net-misc/miniupnpd/miniupnpd-2.1.20190625-r1.ebuild
b/net-misc/miniupnpd/miniupnpd-2.1.20190625-r1.ebuild
index 30de1d75b8f..3aaa9a02a94 100644
--- a/net-misc/miniupnpd/miniupnpd-2.1.20190625-r1.ebuild
+++ b/net-misc/miniupnpd/miniupnpd-2.1.20190625-r1.ebuild
@@ -55,8 +55,12 @@ src_compile() {
src_install() {
emake PREFIX="${ED}" STRIP=true install
+ local confd_seds=( -e ': noop' )
+ use ipv6 || confd_seds+=( -e 's/^ip6tables_scripts=/#&/' )
+
newinitd "${FILESDIR}"/${PN}-init.d-r2 ${PN}
- newconfd "${FILESDIR}"/${PN}-conf.d-r2 ${PN}
+ newconfd - ${PN} < <(sed "${confd_seds[@]}" \
+ "${FILESDIR}"/${PN}-conf.d-r2 || die)
}
pkg_postinst() {
[gentoo-commits] repo/gentoo:master commit in: net-misc/miniupnpd/, net-misc/miniupnpd/files/
commit: 128b74fe25d08b3f8d17e3ee793d87131eba9c37
Author: Patrick McLean gentoo org>
AuthorDate: Wed Apr 13 01:11:47 2016 +
Commit: Patrick McLean gentoo org>
CommitDate: Wed Apr 13 01:12:10 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=128b74fe
net-misc/miniupnpd: Version bump, expose several options through USE flags
This also reworks the init script to be more modern and allows skipping of the
iptables manipulation scripts.
Package-Manager: portage-2.2.28
net-misc/miniupnpd/Manifest| 1 +
.../files/miniupnpd-1.10_pre20160222-build.patch | 125 +
net-misc/miniupnpd/files/miniupnpd-conf.d-r1 | 10 ++
net-misc/miniupnpd/files/miniupnpd-init.d-r1 | 33 ++
net-misc/miniupnpd/metadata.xml| 7 ++
.../miniupnpd/miniupnpd-1.10_pre20160222.ebuild| 76 +
6 files changed, 252 insertions(+)
diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest
index 9915e8c..521d049 100644
--- a/net-misc/miniupnpd/Manifest
+++ b/net-misc/miniupnpd/Manifest
@@ -1 +1,2 @@
DIST miniupnpd-1.9.20150721.tar.gz 207562 SHA256
9340224e5023ecb5d1b7f45e4d69734dcfbadbe41a80d1f0182347e6b8104470 SHA512
ed060a19bfb8f285c10d0c86ca54b646d8cad6baf29266bb395fe75ec23de63986a51362281213e9a14cd14225cc19a33cf404a139a55c7b0f72ced78581c660
WHIRLPOOL
9050b20f6118c63fe9d1cce8c8710e47e9e491ff28a1df29bf4b7a1e4e57fa537b06ce8ed667c1bc138e63dc23ba95a793980a32586c84a4728aa5977d10c6d4
+DIST miniupnpd-1.9.20160222.tar.gz 217541 SHA256
e7d9d071876ac2ed41a04fe4436f8a8d4329c5c31d940e98cca26823c960 SHA512
ebc24a69fde793a537c46bc1e2107f94a17b0d8818aa23a4b6faeb2b735f35db840a6ccc49efbe62a3960ad1f346bbb183b6d06eb5ac42c98c2d56c02869fdda
WHIRLPOOL
12ef3a7861b2238cd806836a972438c2b60c9f2558aee2a36eb8f6dbea149dc289447697d55b11147c20cee9fde5f1bc7fbd13e86190b82a47d7d2242482774b
diff --git a/net-misc/miniupnpd/files/miniupnpd-1.10_pre20160222-build.patch
b/net-misc/miniupnpd/files/miniupnpd-1.10_pre20160222-build.patch
new file mode 100644
index 000..3323b1c
--- /dev/null
+++ b/net-misc/miniupnpd/files/miniupnpd-1.10_pre20160222-build.patch
@@ -0,0 +1,125 @@
+diff --git a/Makefile.linux b/Makefile.linux
+index ce6b994..e535c38 100644
+--- a/Makefile.linux
b/Makefile.linux
+@@ -36,6 +36,7 @@ INSTALL = install
+ STRIP ?= strip
+ PKG_CONFIG ?= pkg-config
+ CP = cp
++LDLIBS_IPV6 :=
+
+
+ INSTALLPREFIX ?= $(PREFIX)/usr
+@@ -55,90 +56,8 @@ NETFILTEROBJS = netfilter/iptcrdr.o netfilter/iptpinhole.o
netfilter/nfct_get.o
+
+ ALLOBJS = $(BASEOBJS) $(LNXOBJS) $(NETFILTEROBJS)
+
+-PCFILE_FOUND := $(shell $(PKG_CONFIG) --exists libiptc; echo $$?)
+-
+-ifeq (${PCFILE_FOUND},0)
+-
+-IPTABLESVERSION := $(shell $(PKG_CONFIG) --modversion libiptc)
+-IPTABLESVERSION1 := $(shell echo $(IPTABLESVERSION) | cut -d. -f1 )
+-IPTABLESVERSION2 := $(shell echo $(IPTABLESVERSION) | cut -d. -f2 )
+-IPTABLESVERSION3 := $(shell echo $(IPTABLESVERSION) | cut -d. -f3 )
+-# test if iptables version >= 1.4.3
+-TEST := $(shell [ \( \( $(IPTABLESVERSION1) -ge 1 \) -a \(
$(IPTABLESVERSION2) -ge 4 \) \) -a \( $(IPTABLESVERSION3) -ge 3 \) ] && echo 1 )
+-ifeq ($(TEST), 1)
++LDLIBS += -lip4tc $(LDLIBS_IPV6)
+ CPPFLAGS += -DIPTABLES_143
+-endif
+-
+-CFLAGS += $(shell $(PKG_CONFIG) --cflags libiptc)
+-LDLIBS += $(shell $(PKG_CONFIG) --static --libs-only-l libiptc)
+-LDFLAGS += $(shell $(PKG_CONFIG) --libs-only-L libiptc)
+-LDFLAGS += $(shell $(PKG_CONFIG) --libs-only-other libiptc)
+-else
+-
+-ifeq "$(wildcard /etc/gentoo-release )" ""
+-LDLIBS ?= -liptc
+-else # gentoo
+-# the following is better, at least on gentoo with iptables 1.4.6
+-# see http://miniupnp.tuxfamily.org/forum/viewtopic.php?p=1618
+-# and http://miniupnp.tuxfamily.org/forum/viewtopic.php?p=2183
+-LDLIBS ?= -lip4tc
+-CPPFLAGS := -DIPTABLES_143 $(CPPFLAGS)
+-endif
+-
+-ARCH ?= $(shell uname -m | grep -q "x86_64" && echo 64)
+-ifdef IPTABLESPATH
+-CPPFLAGS := $(CPPFLAGS) -I$(IPTABLESPATH)/include/
+-LDFLAGS := $(LDFLAFGS) -L$(IPTABLESPATH)/libiptc/
+-# get iptables version and set IPTABLES_143 macro if needed
+-ifeq ($(TARGET_OPENWRT),)
+-IPTABLESVERSION := $(shell grep "\#define VERSION" $(IPTABLESPATH)/config.h |
tr -d \" |cut -d" " -f3 )
+-IPTABLESVERSION1 := $(shell echo $(IPTABLESVERSION) | cut -d. -f1 )
+-IPTABLESVERSION2 := $(shell echo $(IPTABLESVERSION) | cut -d. -f2 )
+-IPTABLESVERSION3 := $(shell echo $(IPTABLESVERSION) | cut -d. -f3 )
+-# test if iptables version >= 1.4.3
+-TEST := $(shell [ \( \( $(IPTABLESVERSION1) -ge 1 \) -a \(
$(IPTABLESVERSION2) -ge 4 \) \) -a \( $(IPTABLESVERSION3) -ge 3 \) ] && echo 1 )
+-ifeq ($(TEST), 1)
+-CPPFLAGS := $(CPPFLAGS) -DIPTABLES_143
+-# the following sucks, but works
+-LDLIBS = $(IPTABLESPATH)/libiptc/.libs/libip4tc.o
+-#LDLIBS = $(IPTABLESPATH)/libiptc/.libs/libiptc.a
+-else # ifeq ($(TEST), 1)
+-LDLIBS = $(IPTABLESPATH)/libiptc/libiptc.a
+-endif # ifeq ($(TEST), 1)
+-else # ($(TARGET_OPENWRT),)
+-#
[gentoo-commits] repo/gentoo:master commit in: net-misc/miniupnpd/, net-misc/miniupnpd/files/
commit: b505f0a193503005d12b915f5c5d5588109979d4
Author: Bjarke Istrup Pedersen gentoo org>
AuthorDate: Mon Sep 14 10:46:04 2015 +
Commit: Bjarke Istrup Pedersen gentoo org>
CommitDate: Mon Sep 14 10:46:27 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b505f0a1
net-irc/miniupnpd: Bumping to 1.10_pre20150721
Package-Manager: portage-2.2.20.1
net-misc/miniupnpd/Manifest | 2 +-
net-misc/miniupnpd/files/miniupnpd-1.10-build.patch | 4 ++--
...pnpd-1.10_pre20141209.ebuild => miniupnpd-1.10_pre20150721.ebuild} | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest
index 331feec..9915e8c 100644
--- a/net-misc/miniupnpd/Manifest
+++ b/net-misc/miniupnpd/Manifest
@@ -1 +1 @@
-DIST miniupnpd-1.9.20141209.tar.gz 193183 SHA256
e2bc8040e912574af122cd295012b566b574032e39d76086c5ad1968bbc9aba3 SHA512
c2cd66a48401c735f6e36909c6d69cf55c13ff559bcd1324e971ec03e062591477499590019d122a483531d95df7255ec1cd552f6a512c581046f61118fbdbd2
WHIRLPOOL
7000b2aa67fbdcd869a2bfa1e2f7ac1430cf7cffd926cff37add5c5101c8b97d521ea23b2b0749885f73c6e97ff24cd8076b4eea5388de76f3df27d20b366f06
+DIST miniupnpd-1.9.20150721.tar.gz 207562 SHA256
9340224e5023ecb5d1b7f45e4d69734dcfbadbe41a80d1f0182347e6b8104470 SHA512
ed060a19bfb8f285c10d0c86ca54b646d8cad6baf29266bb395fe75ec23de63986a51362281213e9a14cd14225cc19a33cf404a139a55c7b0f72ced78581c660
WHIRLPOOL
9050b20f6118c63fe9d1cce8c8710e47e9e491ff28a1df29bf4b7a1e4e57fa537b06ce8ed667c1bc138e63dc23ba95a793980a32586c84a4728aa5977d10c6d4
diff --git a/net-misc/miniupnpd/files/miniupnpd-1.10-build.patch
b/net-misc/miniupnpd/files/miniupnpd-1.10-build.patch
index cd23507..8b0fefc 100644
--- a/net-misc/miniupnpd/files/miniupnpd-1.10-build.patch
+++ b/net-misc/miniupnpd/files/miniupnpd-1.10-build.patch
@@ -67,8 +67,8 @@
-endif # ifdef IPTABLESPATH
endif # ifdef PCFILE_FOUND
--LDLIBS += -lnfnetlink
-+LDLIBS += -lip4tc -lnfnetlink
+-#LDLIBS += -lnfnetlink
++LDLIBS += -lip4tc
+CPPFLAGS += -DIPTABLES_143
TEST := $(shell $(PKG_CONFIG) --atleast-version=1.0.2 libnetfilter_conntrack
&& $(PKG_CONFIG) --atleast-version=1.0.3 libmnl && echo 1)
diff --git a/net-misc/miniupnpd/miniupnpd-1.10_pre20141209.ebuild
b/net-misc/miniupnpd/miniupnpd-1.10_pre20150721.ebuild
similarity index 95%
rename from net-misc/miniupnpd/miniupnpd-1.10_pre20141209.ebuild
rename to net-misc/miniupnpd/miniupnpd-1.10_pre20150721.ebuild
index 97e3a7c..52ecfc1 100644
--- a/net-misc/miniupnpd/miniupnpd-1.10_pre20141209.ebuild
+++ b/net-misc/miniupnpd/miniupnpd-1.10_pre20150721.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -6,7 +6,7 @@ EAPI="5"
inherit eutils toolchain-funcs
-MY_PV=1.9.20141209
+MY_PV=1.9.20150721
MY_P="${PN}-${MY_PV}"
DESCRIPTION="MiniUPnP IGD Daemon"
