gentoo resync : 18.12.2017

9 files changed, 83 insertions, 154 deletions

diff --git a/net-analyzer/thc-ipv6/Manifest b/net-analyzer/thc-ipv6/Manifest
index a22fc7343293..266bcc8cda60 100644
--- a/net-analyzer/thc-ipv6/Manifest
+++ b/net-analyzer/thc-ipv6/Manifest
@@ -1,12 +1,8 @@
-AUX thc-ipv6-2.1-Makefile.patch 1233 BLAKE2B b9b9b19476e030b0ad87ca6a85715e7cf64fb67203aa3f67f7d354728c875b2c43890be877fb424a0b4507dd458106a4bfb72053d9aceabbd94534a6adb76a95 SHA512 14880d1982e935eba874c87fb7bab7859246d4ba1539e3cbfc06fe5850c3076f99d4bdd59cd968e7d5c1386062c4a081f3a0a11d61e9f66ea90177e78c22e307
 AUX thc-ipv6-3.0-Makefile.patch 465 BLAKE2B 42194c35ace6760ed17c454bbf4ae01a70618297efed865d93ec645514ef34734668fde6df1139727ca317769bc2e221af88b8084811529c3372aab6db908c0b SHA512 2a0a0d21ad3147a772df5a52ea425edbf2681256240e3570976268b5d9cf19f315a014b304932161219813c65dff95a2644070383121595ec3f2adabbb116093
-DIST thc-ipv6-2.3.tar.gz 176918 BLAKE2B fc3c06324b25b8b2ff70a569955d584e0a4c2691b92b21691a2c9098e5c1bf2e3354c101fe48b2174fd803e3f051af32b5c3293745cbe2ee83f23a84c5379c19 SHA512 d4eff19a0a87ca828d7cf06e9ef9c1e542c0a527949681d08730445e40e90608aaebf778b8ab1cd8d3adeb44fb8cac79607e27704baddf703355a0058ebce4a8
-DIST thc-ipv6-2.5.tar.gz 262015 BLAKE2B 91dac7cfa86c3afb59fc34c2fad648a1ef2402b0fdb1cf80aa94bfc6affd90533c7d96b72e0c9f7551f125b0f8cdeda87232fbc3fa408346c64f099ca31adea1 SHA512 7fc2dda9d83d25c61b3dc8576679e06866fd1144ca39d5e0b43bbd3c4da2583ec37ca901a43a817bdeec19226d3e252624d684f31bc7e94e08bdd811d5fb5466
-DIST thc-ipv6-2.7.tar.gz 661592 BLAKE2B 64b5b8779f25c111bb132e30242da8563dde687f4a88f902d8d72239efc5982613a148a38bfb3adc1a770bdbac20554832c5c3b95a57e5a9512629a225a97257 SHA512 0863ff36109e048a45ec220b98f0e2cf62b7214edcab4afa27a89fc5c0e41469f7e5733efeb56ed0d00cffcf57ceed3d7d32d813e8081d39f1a21e2646e0a0f3
+AUX thc-ipv6-3.2-stdint.patch 208 BLAKE2B 639a1ceec32ab48b886d721b7ea197dd39efe4ab5f62f8f1fffe04e68560336269e9b3b021c90ef635948bfbbbc0c60e0cb2c56e60e7bca3dfdc7c0d823dfdd9 SHA512 635438ba4a64eb63d51130643afd73e87e83313532f351e1f124cd0f34d719a67d77e592595707e65c8fd5b69a00cf04942688668e5a9c921807934ca602fd8e
 DIST thc-ipv6-3.0.tar.gz 667859 BLAKE2B 6fa4f697bf316c3b9730b58e35c3d8ac6910c0e063751037a0900aa459c128c5de9a07e4912025dd6eebb92061a7cc48a6e2e2a0b5d7d53b339e4d5416e4fdf7 SHA512 969ebbf4da4514cb83e3abcff637f7ba301c4f072f1f983b3cd3cfd3b0643b55af6eacca3c76e39e11ea9ef6e465be03dfa7ce1d6c988cabbd42cdd95d1e2552
-EBUILD thc-ipv6-2.3.ebuild 776 BLAKE2B 3a418e01562d970b7bf7326230fa7662867c02d04d9ad8190540732f7da762497c11c7915ab8dab7522d40b71ce9beacc62f665c01ff226cd2cb0657836b0349 SHA512 9f5c13cc7553c95652e6171ea32924a073af5949a616179c1571e35d9f6224728ab39df431a8ea7e9140babcfc94cc00a4025109debc501897cb03d5e47d3911
-EBUILD thc-ipv6-2.5.ebuild 777 BLAKE2B a620af86d8e84e37afac0ece467a2c60afdeb1d054a699ab9e92b33197eb1843ae95a63a0a3a53163f55c12b01df096cd1bb720ecfeb0f9428d7d2c4333708bb SHA512 67af189268fe5e6fbb99cd6dc31d54706890ecba5ee8ba33dd5010a1fe7fd152c7fd9315725b2f0ac713ad683bac846cfb36f46ed98331b4f5e40156928cc3f5
-EBUILD thc-ipv6-2.7.ebuild 777 BLAKE2B a620af86d8e84e37afac0ece467a2c60afdeb1d054a699ab9e92b33197eb1843ae95a63a0a3a53163f55c12b01df096cd1bb720ecfeb0f9428d7d2c4333708bb SHA512 67af189268fe5e6fbb99cd6dc31d54706890ecba5ee8ba33dd5010a1fe7fd152c7fd9315725b2f0ac713ad683bac846cfb36f46ed98331b4f5e40156928cc3f5
-EBUILD thc-ipv6-3.0.ebuild 1130 BLAKE2B 3f8d3b7abb54405d3b9755c300d27f1ad098109bf264d1480fbeb2b6188b88179dda12cbfb9e44e361a3acc4347765a5abec8c925b85d44c04d41850952039d2 SHA512 ef2f809e3348f222fe2f01d81202f26a4d119209256ab6d27148c98f04bd896740b54397ff64d60b4af7eee36d20a906ceef831d14a0d567e951cf9f2e78fe1a
-EBUILD thc-ipv6-9999.ebuild 1130 BLAKE2B 3f8d3b7abb54405d3b9755c300d27f1ad098109bf264d1480fbeb2b6188b88179dda12cbfb9e44e361a3acc4347765a5abec8c925b85d44c04d41850952039d2 SHA512 ef2f809e3348f222fe2f01d81202f26a4d119209256ab6d27148c98f04bd896740b54397ff64d60b4af7eee36d20a906ceef831d14a0d567e951cf9f2e78fe1a
+DIST thc-ipv6-3.2.tar.gz 1595453 BLAKE2B f1bb1cdc31f4cf4d067b39997ca3cc2d6d8c15e7a8c585c7c494f03e229fccbcd65677e382a65f0e650d79278f5ede89173db1cdf313ade7c48dff1566856afa SHA512 648db4618ebb83572e2e318cdbb284fe96a86adf335f7dd9b26fd010c76d12e9137ed7367207c66c93c1961c868d3917d706db9f597289ac47ea3f9b83c03441
+EBUILD thc-ipv6-3.0.ebuild 1172 BLAKE2B 24e8c7bc51f3abefdd752003f9bc32da61a83e2af7863afd2ee711a4a52ead7f27ecdf7855ccfa5d9803b763bd233d54bc2f5786f75cfd0ba2dfbd5b88c4f648 SHA512 f8d0288bbfc765ff2f838bb7a402e4c7d15384bc23b34d4a43bb20071b6e2f6f8410e8803d3006ae978235002ee536c6e1551e808d9e31cbce94c85e8970c616
+EBUILD thc-ipv6-3.2.ebuild 1167 BLAKE2B ccc13cadfe360838172cb55255226715c2b8698822e1db045ce32dc001e610224a8a7516d17ad3e562586c3d71dbbcd66acf842b8ee5c181c9d8d86bc0fccace SHA512 01c36f2a68a61c1172e2d346a0f684bec784dc6dd580e4d6fcbbb584819ba073e03d92a472b3fde9fee30498dbf552e002295680c01c92cf2070a19b174f9ce0
+EBUILD thc-ipv6-9999.ebuild 1167 BLAKE2B ccc13cadfe360838172cb55255226715c2b8698822e1db045ce32dc001e610224a8a7516d17ad3e562586c3d71dbbcd66acf842b8ee5c181c9d8d86bc0fccace SHA512 01c36f2a68a61c1172e2d346a0f684bec784dc6dd580e4d6fcbbb584819ba073e03d92a472b3fde9fee30498dbf552e002295680c01c92cf2070a19b174f9ce0
 MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
diff --git a/net-analyzer/thc-ipv6/files/thc-ipv6-2.1-Makefile.patch b/net-analyzer/thc-ipv6/files/thc-ipv6-2.1-Makefile.patch
deleted file mode 100644
index d7b42147ae1e..000000000000
--- a/net-analyzer/thc-ipv6/files/thc-ipv6-2.1-Makefile.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- thc-ipv6-2.1/Makefile
-+++ thc-ipv6-2.1/Makefile
-@@ -4,7 +4,7 @@
- 
- CC=gcc
- #CFLAGS=-g
--CFLAGS=-O2
-+CFLAGS?=-O2
- CFLAGS+=$(if $(HAVE_SSL),-D_HAVE_SSL,)
- LDFLAGS+=-lpcap $(if $(HAVE_SSL),-lssl -lcrypto,)
- PROGRAMS=parasite6 dos-new-ip6 detect-new-ip6 fake_router6 fake_advertise6 fake_solicitate6 fake_mld6 fake_mld26 fake_mldrouter6 flood_mldrouter6 fake_mipv6 redir6 smurf6 alive6 toobig6 rsmurf6 implementation6 implementation6d sendpees6 sendpeesmp6 randicmp6 fuzz_ip6 flood_mld6 flood_mld26 flood_router6 flood_advertise6 flood_solicitate6 trace6 exploit6 denial6 fake_dhcps6 flood_dhcpc6 fake_dns6d fragmentation6 kill_router6 fake_dnsupdate6 ndpexhaust6 detect_sniffer6 dump_router6 fake_router26 flood_router26 passive_discovery6 dnsrevenum6 inverse_lookup6 node_query6 address6 covert_send6 covert_send6d inject_alive6 firewall6 ndpexhaust26 fake_pim6
-@@ -17,10 +17,10 @@
- all:	$(LIBS) $(PROGRAMS) dnssecwalk dnsdict6 thcping6
- 
- dnssecwalk:	dnssecwalk.c
--	$(CC) $(CFLAGS) -o $@ $^
-+	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
- 
- dnsdict6:	dnsdict6.c
--	$(CC) $(CFLAGS) -o $@ $^ -lpthread -lresolv
-+	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) -lpthread -lresolv
- 
- thcping6:	thcping6.c $(LIBS)
- 	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) -lrt
diff --git a/net-analyzer/thc-ipv6/files/thc-ipv6-3.2-stdint.patch b/net-analyzer/thc-ipv6/files/thc-ipv6-3.2-stdint.patch
new file mode 100644
index 000000000000..7873563b2377
--- /dev/null
+++ b/net-analyzer/thc-ipv6/files/thc-ipv6-3.2-stdint.patch
@@ -0,0 +1,10 @@
+--- thc-ipv6-3.2/dnsrevenum6.c
++++ thc-ipv6-3.2/dnsrevenum6.c
+@@ -17,6 +17,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <stdint.h>
+ #include <string.h>
+ #include <strings.h>
+ #include <string.h>
diff --git a/net-analyzer/thc-ipv6/thc-ipv6-2.3.ebuild b/net-analyzer/thc-ipv6/thc-ipv6-2.3.ebuild
deleted file mode 100644
index 0cf3cf3241d1..000000000000
--- a/net-analyzer/thc-ipv6/thc-ipv6-2.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="complete tool set to attack the inherent protocol weaknesses of IPV6 and ICMP6"
-HOMEPAGE="http://freeworld.thc.org/thc-ipv6/"
-SRC_URI="http://freeworld.thc.org/releases/${P}.tar.gz"
-
-LICENSE="GPL-3 openssl"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ssl"
-
-DEPEND="net-libs/libpcap
-	ssl? ( dev-libs/openssl )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.1-Makefile.patch
-	if ! use ssl ; then
-		sed -e '/^HAVE_SSL/s:^:#:' \
-			-i Makefile
-	fi
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" STRIP="true" install
-	dodoc CHANGES HOWTO-INJECT README
-}
diff --git a/net-analyzer/thc-ipv6/thc-ipv6-2.5.ebuild b/net-analyzer/thc-ipv6/thc-ipv6-2.5.ebuild
deleted file mode 100644
index 4b3cd8777b52..000000000000
--- a/net-analyzer/thc-ipv6/thc-ipv6-2.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="complete tool set to attack the inherent protocol weaknesses of IPV6 and ICMP6"
-HOMEPAGE="http://freeworld.thc.org/thc-ipv6/"
-SRC_URI="http://freeworld.thc.org/releases/${P}.tar.gz"
-
-LICENSE="AGPL-3 openssl"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ssl"
-
-DEPEND="net-libs/libpcap
-	ssl? ( dev-libs/openssl )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.1-Makefile.patch
-	if ! use ssl ; then
-		sed -e '/^HAVE_SSL/s:^:#:' \
-			-i Makefile
-	fi
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" STRIP="true" install
-	dodoc CHANGES HOWTO-INJECT README
-}
diff --git a/net-analyzer/thc-ipv6/thc-ipv6-2.7.ebuild b/net-analyzer/thc-ipv6/thc-ipv6-2.7.ebuild
deleted file mode 100644
index 4b3cd8777b52..000000000000
--- a/net-analyzer/thc-ipv6/thc-ipv6-2.7.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="complete tool set to attack the inherent protocol weaknesses of IPV6 and ICMP6"
-HOMEPAGE="http://freeworld.thc.org/thc-ipv6/"
-SRC_URI="http://freeworld.thc.org/releases/${P}.tar.gz"
-
-LICENSE="AGPL-3 openssl"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ssl"
-
-DEPEND="net-libs/libpcap
-	ssl? ( dev-libs/openssl )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.1-Makefile.patch
-	if ! use ssl ; then
-		sed -e '/^HAVE_SSL/s:^:#:' \
-			-i Makefile
-	fi
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" STRIP="true" install
-	dodoc CHANGES HOWTO-INJECT README
-}
diff --git a/net-analyzer/thc-ipv6/thc-ipv6-3.0.ebuild b/net-analyzer/thc-ipv6/thc-ipv6-3.0.ebuild
index 5151e3d3ceca..d4aee56ff488 100644
--- a/net-analyzer/thc-ipv6/thc-ipv6-3.0.ebuild
+++ b/net-analyzer/thc-ipv6/thc-ipv6-3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,6 +24,9 @@ DEPEND="net-libs/libpcap
 	ssl? ( dev-libs/openssl:* )"
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${PN}-3.2-stdint.patch"
+	"${FILESDIR}"/${PN}-3.0-Makefile.patch )
+
 src_unpack() {
 	if [[ ${PV} != *9999 ]]; then
 		default_src_unpack
@@ -33,15 +36,13 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.0-Makefile.patch
-	sed -i \
-		-e '/^CFLAGS=/s,CFLAGS=,CFLAGS?=,' \
-		Makefile
+	sed -e '/^CFLAGS=/s,CFLAGS=,CFLAGS?=,' \
+		-i Makefile || die
 	if ! use ssl ; then
 		sed -e '/^HAVE_SSL/s:^:#:' \
 			-i Makefile
 	fi
-	eapply_user
+	default
 }
 
 src_compile() {
diff --git a/net-analyzer/thc-ipv6/thc-ipv6-3.2.ebuild b/net-analyzer/thc-ipv6/thc-ipv6-3.2.ebuild
new file mode 100644
index 000000000000..a0934cf80b9a
--- /dev/null
+++ b/net-analyzer/thc-ipv6/thc-ipv6-3.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+[[ ${PV} == *9999 ]] && SCM="git-r3"
+EGIT_REPO_URI="https://github.com/vanhauser-thc/thc-ipv6.git"
+EGIT_BRANCH=master
+
+inherit eutils toolchain-funcs ${SCM}
+
+DESCRIPTION="complete tool set to attack the inherent protocol weaknesses of IPV6 and ICMP6"
+HOMEPAGE="https://www.thc.org/thc-ipv6/"
+LICENSE="AGPL-3 openssl"
+SLOT="0"
+IUSE="ssl"
+
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="https://github.com/vanhauser-thc/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DEPEND="net-libs/libpcap
+	net-libs/libnetfilter_queue
+	ssl? ( dev-libs/openssl:* )"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-3.2-stdint.patch" )
+
+src_unpack() {
+	if [[ ${PV} != *9999 ]]; then
+		default_src_unpack
+	else
+		git-r3_src_unpack
+	fi
+}
+
+src_prepare() {
+	sed -e '/^CFLAGS=/s,CFLAGS=,CFLAGS?=,' \
+		-i Makefile || die
+	if ! use ssl ; then
+		sed -e '/^HAVE_SSL/s:^:#:' \
+			-i Makefile
+	fi
+	default
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="/usr" STRIP="true" install
+	dodoc CHANGES HOWTO-INJECT README
+}
diff --git a/net-analyzer/thc-ipv6/thc-ipv6-9999.ebuild b/net-analyzer/thc-ipv6/thc-ipv6-9999.ebuild
index 5151e3d3ceca..a0934cf80b9a 100644
--- a/net-analyzer/thc-ipv6/thc-ipv6-9999.ebuild
+++ b/net-analyzer/thc-ipv6/thc-ipv6-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SLOT="0"
 IUSE="ssl"
 
 if [[ ${PV} != *9999 ]]; then
-	SRC_URI="http://www.thc.org/releases/${P}.tar.gz"
+	SRC_URI="https://github.com/vanhauser-thc/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -24,6 +24,8 @@ DEPEND="net-libs/libpcap
 	ssl? ( dev-libs/openssl:* )"
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${PN}-3.2-stdint.patch" )
+
 src_unpack() {
 	if [[ ${PV} != *9999 ]]; then
 		default_src_unpack
@@ -33,15 +35,13 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.0-Makefile.patch
-	sed -i \
-		-e '/^CFLAGS=/s,CFLAGS=,CFLAGS?=,' \
-		Makefile
+	sed -e '/^CFLAGS=/s,CFLAGS=,CFLAGS?=,' \
+		-i Makefile || die
 	if ! use ssl ; then
 		sed -e '/^HAVE_SSL/s:^:#:' \
 			-i Makefile
 	fi
-	eapply_user
+	default
 }
 
 src_compile() {