Merge remote-tracking branch 'upstream/master' into sonarqube

2026-04-20 22:01:11 +02:00 · 2018-10-10 00:37:19 +02:00 · 2018-10-10 00:37:19 +02:00 · 6573dd9f05
commit 6573dd9f05
parent ecac58c4b0 df6d534025
108 changed files with 7354 additions and 1219 deletions
--- a/app-admin/testdisk/Manifest
+++ b/app-admin/testdisk/Manifest
@ -0,0 +1 @@
+DIST testdisk-7.1-WIP.tar.bz2 718086 BLAKE2B 08e985407677fe58502ffc35b9b7c07940031f30dba59f845a03c278c79faf4f6dd6fd896347b4a4a038e86834601f2092286f1bfc006357b7abc5544c6194c9 SHA512 c6eedf0c8eefdee723df90dac9e12addb19b3ccfaf811b91e449c7a06fad889359a801a74bfd2274f06c762c7103d844d5aeebb5ff703b31cfc686e57155fdf7
--- a/app-admin/testdisk/metadata.xml
+++ b/app-admin/testdisk/metadata.xml
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>robbat2@gentoo.org</email>
+		<name>Robin H. Johnson</name>
+	</maintainer>
+	<use>
+		<flag name="ntfs">Include the ability to read NTFS filesystems</flag>
+		<flag name="reiserfs">Include reiserfs reading ability</flag>
+		<flag name="ewf">Include ewf library</flag>
+	</use>
+</pkgmetadata>
--- a/app-admin/testdisk/testdisk-7.1.ebuild
+++ b/app-admin/testdisk/testdisk-7.1.ebuild
@ -0,0 +1,98 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic gnome2-utils
+
+DESCRIPTION="Checks and undeletes partitions + PhotoRec, signature based recovery tool"
+HOMEPAGE="https://www.cgsecurity.org/wiki/TestDisk"
+SRC_URI="https://www.cgsecurity.org/${P}-WIP.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~hppa ~ppc x86"
+IUSE="ewf jpeg ntfs qt5 reiserfs static zlib"
+
+REQUIRED_USE="static? ( !qt5 )"
+
+# WARNING: reiserfs support does NOT work with reiserfsprogs
+# you MUST use progsreiserfs-0.3.1_rc8 (the last version ever released).
+COMMON_DEPEND="
+	static? (
+		sys-apps/util-linux[static-libs]
+		sys-fs/e2fsprogs[static-libs]
+		sys-libs/ncurses:0[static-libs]
+		jpeg? ( virtual/jpeg:0[static-libs] )
+		ntfs? ( sys-fs/ntfs3g:=[static-libs] )
+		reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8[static-libs] )
+		zlib? ( sys-libs/zlib[static-libs] )
+		!arm? ( ewf? ( app-forensics/libewf:=[static-libs] ) )
+	)
+	!static? (
+		sys-apps/util-linux
+		sys-fs/e2fsprogs
+		sys-libs/ncurses:0=
+		jpeg? ( virtual/jpeg:0 )
+		ntfs? ( sys-fs/ntfs3g )
+		qt5? (
+			dev-qt/qtcore:5
+			dev-qt/qtgui:5
+			dev-qt/qtwidgets:5
+		)
+		reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 )
+		zlib? ( sys-libs/zlib )
+		!arm? ( ewf? ( app-forensics/libewf:= ) )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	qt5? ( dev-qt/linguist-tools:5 )
+"
+RDEPEND="!static? ( ${COMMON_DEPEND} )"
+
+DOCS=( )
+
+S="${WORKDIR}/${P}-WIP"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-sudo
+		--without-ntfs
+		$(use_with ewf)
+		$(use_with jpeg)
+		$(use_with ntfs ntfs3g)
+		$(use_enable qt5 qt)
+		$(use_with reiserfs)
+		$(use_with zlib)
+	)
+
+	# this static method is the same used by upstream for their 'static' make
+	# target, but better, as it doesn't break.
+	use static && append-ldflags -static
+
+	econf "${myeconfargs[@]}"
+
+	# perform safety checks for NTFS, REISERFS and JPEG
+	if use ntfs && ! egrep -q '^#define HAVE_LIBNTFS(3G)? 1$' "${S}"/config.h ; then
+		die "Failed to find either NTFS or NTFS-3G library."
+	fi
+	if use reiserfs && egrep -q 'undef HAVE_LIBREISERFS\>' "${S}"/config.h ; then
+		die "Failed to find reiserfs library."
+	fi
+	if use jpeg && egrep -q 'undef HAVE_LIBJPEG\>' "${S}"/config.h ; then
+		die "Failed to find jpeg library."
+	fi
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
--- a/app-exploits/packetstormexploits/Manifest
+++ b/app-exploits/packetstormexploits/Manifest
@ -4,6 +4,9 @@ DIST 1803-exploits.tgz 297369 BLAKE2B c68807e89d1ff3e9248ec3649d0789eb871486d774
 DIST 1804-exploits.tgz 322211 BLAKE2B eacee89afd681d1d499b4f030133be51d0f7802d9ac4bd651ceb5caa1bc62dccc1f9dd39d77eb9b48474b5d02f0cb1b1dea25c03b8982804e6bc05748855f0dc SHA512 c7b66a362ac46e59f60ef1d0308003d8ec7bbeeaa84ead09d85cba5f258bbe9d681c5ab1d1ffc06287dc84e43b56f5f1dd08c51e24d3d306db1b857fc9f57671
 DIST 1805-exploits.tgz 10447953 BLAKE2B 79ee3a74e8bd0a53b4f609e7316c968490e7a34b91b6733a477c404dfefb1a0a64822389f29d7f7e619c599fa4b98dcae0666fb896594ec41127d7ee5b1afbf8 SHA512 1fea9681fccdebcf62af5b96f3687ca43a709b67e56c9a98e2146be58295dc325198312cf491ff437aa9cd18299bdcbe7a8bbcb6c1c10fdca4636133ade6e809
 DIST 1806-exploits.tgz 9107234 BLAKE2B 3abf9904da611eeb42a7cf14145d3fcea7923727f13663c8ff8d390ef8cd0c12e53e632bf80f5517a9fb83b563691be7730dd123f75d585238c619871dfcae04 SHA512 cb1e1adab4915cd0ed155a746c755f2a0f89496e7dc2dd08ed6b6e012ce081b243264b9fe773c4fb151d7ea7d7bf71aff433d781e47063ea01f7482dbb3e2898
+DIST 1807-exploits.tgz 333580 BLAKE2B ed31cf7ed7b080149cb3cf36a624c19d48e6888afb026ab0927f1131bc3af81b402100b72778716f3ef59241144d80a195baf449cc843e2661c949c9e521c3f8 SHA512 b73a8fd4d58a3c3a333a4d7dac73b70b189eab23255b292e5647a764ed4ea02478ef23f3162e690e9dc946f92027e302e5ad48950a3b5d0f7b32ba2978496d3d
+DIST 1808-exploits.tgz 4701755 BLAKE2B 57b3689f0bd084cbd016727f46e065d1d762bcef351b17393c4c0d9eb8597defd0b40ab26e8ffec0c1be6545976d94f04abc7adcd2ad48d50704eb8f14ea2995 SHA512 12a7aca0844c717ccbb3de7809947ff9d802a0aa342e6354c6df51ef742ec43370898f842acf375ef8bbef3356614d52e01925a122dbf0fea47a66543616bff6
+DIST 1809-exploits.tgz 1208539 BLAKE2B 22a2f490fbe7c6b5a54e6b14305c0e2b12a5803a6b8c3b272761bbb7197679c19184967826d876fa96398d55061eb5d7b4aafccd37c805535cfec681a4a98ff1 SHA512 4d7b2048040de382d9bf5b0878e50d6f782d4b16aaa18e140286990176d026cefc13bc062b61111e094567837ba7e90d0d31c46eb51f409785157eb714a8fbfe
 DIST 1999-exploits.tgz 6507949 BLAKE2B f27b3001864141cb660a7adc888beb2008e4e46d1a053e0d3d76d5d4794d98a85e3bfb7102d12c91f379db4ecbb716b37be0ebdf5114f30a06152814b1773924 SHA512 b5274f6a0f3da2c48d7550cc3e033734172b98e13c42600a48b2c5a4b213fbc73a1ebf710ca8719b905c9783dcd620678815fff7d1d97f0832181bd9034e9d9f
 DIST 2000-exploits.tgz 6530082 BLAKE2B f0d0b2cf555dd24cd745d3faf44919dd278c2c5488010706c27a35f33b792fa75d9f4d6f6384b3d4e0740e0cafe2ae727a66b2b3ed46ae91f051534b94ecdd2d SHA512 1e1f1fa9e59e7929a4f5c77a8909a781249d21285f00ff33756c97f87f960f9f83db3965eedebc4b401ac6f1c9d7d5bb41bf45c6c45ac036a04319c3c2f463c2
 DIST 2001-exploits.tgz 4644368 BLAKE2B 3af7173fe9fe6b09c8e1f53a464acc20c7b689626e3bcd5412a178061233d2f4cefdc1a962cbdc3f8a8480981e9458dfa856820ebe5340f6110109aee136b918 SHA512 55494c39ad12b9242f8aff8ecf4f57dd81e5dc8f7e57eaf9721faacf9465b511d4da76038d2a6f5ccbfb36a9ce8f5f949a307fc8e0a765201bd7d611adce0de5
--- a/app-exploits/packetstormexploits/packetstormexploits-2018.09.ebuild
+++ b/app-exploits/packetstormexploits/packetstormexploits-2018.09.ebuild
--- a/app-forensics/samhain/Manifest
+++ b/app-forensics/samhain/Manifest
@ -1,3 +1,4 @@
-DIST samhain_signed-4.2.2.tar.gz 2148749 SHA256 0f3e64afb3f00064c9b136d34a72d580cd41248c5941eba0452f364a109003c7 SHA512 c57916020f45652ac63356d811ab597f7e47d6eaea4398aa882c3f90c7d333e6a9c28f2a80a5118af822d051e222914d8df87c6efb430923acab83d7d5fa406e WHIRLPOOL 4feb568dad112fae4d689c0171bd7de276680421cc8912242204076d17d48160bfbf8eed7d599433de4e939b72fdd604d1b5740466a320552153ff7ad7922a7f
-DIST samhain_signed-4.2.3.tar.gz 2137336 SHA256 d2bf44abdcfbd1048af39fcbecc21914f57cc7ad6da612886d86cbc6526aa46f SHA512 17cb37548068fb682a5e6b8d7bff5d7c5826f80ef80a116dafb371c79e34f9ab5d31ff88ef7a03453e2f4c4adf0f2f11595bcee8eca200239b04c3d9a75df71d WHIRLPOOL b18c004d8b95208f4910ea04b4f441f35b6071fda4b90e88ba0da8f70589a45baf63507765b5dc36648d282e77235d63d1ee982706235b9b788b4164fd7b2dad
-DIST samhain_signed-4.2.4.tar.gz 2138117 SHA256 0cd779b3666264e1f370f7ec37891f680b4caa04895fab8c5aa9a52e41ec885d SHA512 bd0f464bdeb13f680853c5e71e0836d6f3019363d40c0bc5be4392a835d98ced70b1f1fc8b78c87b890b9c491a24abe7bac759333b8049e5baf3e0bce9e34f5d WHIRLPOOL e382c8f07efe3d8346fc8642f484b393b6b7788fbb315afbfc75b14de8d5ed1091bcdd0744805c3a16ed1807db76dedd655f00b44585819134f2f4ef4a7f2383
+DIST samhain_signed-4.2.2.tar.gz 2148749 BLAKE2B a0cb8d6af8f36026366893b1cfb128c45797e4172fa71c169d37ba511977dd842a44c69a10420a03e714810b5f18a1b658d1cf56090cd9725701fef64ea06f01 SHA512 c57916020f45652ac63356d811ab597f7e47d6eaea4398aa882c3f90c7d333e6a9c28f2a80a5118af822d051e222914d8df87c6efb430923acab83d7d5fa406e
+DIST samhain_signed-4.2.3.tar.gz 2137336 BLAKE2B 7b998385117becc68aafff4c8603b22843ebd0a69984b829bcefb21b5e152195f13eddffaf240f5a8f2d2b88aaebff2208b0647f12ed90d1adf746aa50ea0db0 SHA512 17cb37548068fb682a5e6b8d7bff5d7c5826f80ef80a116dafb371c79e34f9ab5d31ff88ef7a03453e2f4c4adf0f2f11595bcee8eca200239b04c3d9a75df71d
+DIST samhain_signed-4.2.4.tar.gz 2138117 BLAKE2B 81e3505a654a3c0bb2d9c6cf6b754a15069b1ff0577b8d083082f799334a06cd765d554282a8a0399f005ed8469543ab674ce20132ec6c187dfed8166199ede2 SHA512 bd0f464bdeb13f680853c5e71e0836d6f3019363d40c0bc5be4392a835d98ced70b1f1fc8b78c87b890b9c491a24abe7bac759333b8049e5baf3e0bce9e34f5d
+DIST samhain_signed-4.3.1.tar.gz 2141139 BLAKE2B 958f5864e817e8b6d73b97876e9c5afcc122e382c13ff5f94db2ad6219553de6b1ab5f2d4cd48e31ebe3e32f471b63d67db54fd25683d29531d4ec8207bb03e0 SHA512 5f524db9586d1e8be69c8f7aa199c4b2edb699922cd957d5d02d66c749286c8131a07906ea59dad1871758b8dda9f7a7d8d1c3c09a91de854dfbaccede56833d
--- a/app-forensics/samhain/samhain-4.3.1.ebuild
+++ b/app-forensics/samhain/samhain-4.3.1.ebuild
@ -0,0 +1,212 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Advanced file integrity and intrusion detection tool."
+HOMEPAGE="http://la-samhna.de/samhain/"
+SRC_URI="http://la-samhna.de/archive/samhain_signed-${PV}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="crypt debug login-watch mounts-check mysql netclient netserver postgres static suidcheck userfiles xml"
+
+DEPEND="crypt? ( >=app-crypt/gnupg-1.2 )
+		mysql? ( dev-db/mysql )
+		postgres? ( dev-db/postgresql )
+		>=sys-apps/sed-4
+		app-arch/tar
+		app-arch/gzip"
+
+
+# Samhain stealth mode options
+#
+# If you would like to enable stealth mode, please set and uncomment the
+# following options or pass them as enviroment variables when emerging
+# the package (like INSTALL_NAME="asd" emerge samhain).
+# If you set the variables here, don't forget to redigest the ebuild by
+# issuing 'ebuild samhain-<thisversion>.ebuild digest', also remember that with
+# your next emerge sync, the changes to the ebuild will be lost!
+#
+# Read the Samhain manual for additional information.
+#
+# STEALTH should be set to either 'full' or 'micro' (mandatory)
+#STEALTH=""
+#
+# XOR_VALUE should be a whole number from 128 to 255 (mandatory)
+#XOR_VALUE=""
+#
+# INSTALL_NAME can be set to change the name of the Samhain binaries
+# to the name you specify (optional)
+#INSTALL_NAME=""
+
+if [[ "${STEALTH}" == "full" ]] ; then
+	RDEPEND="media-gfx/imagemagick"
+fi
+
+pkg_setup() {
+	if use static ; then
+		if use postgres ; then
+			ewarn "At the moment it isn't possible to build a static Samhain with"
+			ewarn "PostgreSQL support on Gentoo, the compilation"
+			ewarn "fails during the linking process."
+			echo
+			ewarn "This will be looked at and fixed in the future, in the meantime,"
+			ewarn "patches to fix this are always welcome and appreciated! ;)"
+			ewarn "(Open a bug on bugs.gentoo.org for them or send them to"
+			ewarn "the maintainer directly, thanks!)"
+			die "Please turn the 'postgres' USE flags off when building with 'static'"
+		fi
+	fi
+
+	if use mysql && use postgres ; then
+		ewarn "You cannot compile both database backends into Samhain at once,"
+		ewarn "you need to choose between MySQL or PostgreSQL and disable the"
+		ewarn "one you don't want to use."
+		die "Please choose between 'mysql' or 'postgres' USE flags"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	tar -xzf "samhain-${PV}.tar.gz"
+	cd "${S}"
+}
+
+src_prepare() {
+	sed -i -e 's/INSTALL_PROGRAM = @INSTALL@ -s/INSTALL_PROGRAM = @INSTALL@/' Makefile.in || die "Failed to patch Makefile"
+}
+
+src_configure() {
+	local myconf
+
+	if use crypt ; then
+		myconf="${myconf} --with-gpg=/usr/bin/gpg --with-checksum=no"
+
+		if [[ -n "${KEY_FPR}" ]] ; then
+			einfo "Setting built-in key fingerprint to ${KEY_FPR}"
+			FPR=`echo ${KEY_FPR} | sed "s/ //g"`
+			myconf="${myconf} --with-fp=${FPR}"
+		fi
+	fi
+
+	if [[ -n "${STEALTH}" ]] ; then
+		[[ -z "${XOR_VALUE}" ]] && die "Variable XOR_VALUE must be set for stealth mode"
+		echo
+		einfo "Enabling stealth mode '${STEALTH}', setting XOR_VALUE to ${XOR_VALUE}"
+
+		if [[ "${STEALTH}" == "full" ]] ; then
+			myconf="${myconf} --enable-stealth=${XOR_VALUE}"
+			sed -e "s:STEGIN=@stegin_prg@:STEGIN=:g" -i samhain-install.sh.in
+		elif [[ "${STEALTH}" == "micro" ]] ; then
+			myconf="${myconf} --enable-micro-stealth=${XOR_VALUE}"
+		else
+			die "STEALTH must be set to either 'full' or 'micro'"
+		fi
+
+		if [[ -n "${INSTALL_NAME}" ]] ; then
+			echo
+			einfo "Setting alternative samhain name to ${INSTALL_NAME}"
+			echo
+			myconf="${myconf} --enable-install-name=${INSTALL_NAME}"
+		fi
+	fi
+
+	use mysql && myconf="${myconf} --with-database=mysql --enable-xml-log"
+	use postgres && myconf="${myconf} --with-database=postgresql --enable-xml-log"
+#	use prelude && myconf="${myconf} --with-prelude --with-libprelude-prefix=/usr"
+	use xml && myconf="${myconf} --enable-xml-log"
+	use static && myconf="${myconf} --enable-static"
+	use debug && myconf="${myconf} --enable-debug"
+
+	use netclient && myconf="${myconf} --enable-network=client"
+	use netserver && myconf="${myconf} --enable-network=server"
+
+	use login-watch && myconf="${myconf} --enable-login-watch"
+	use mounts-check && myconf="${myconf} --enable-mounts-check"
+	use suidcheck && myconf="${myconf} --enable-suidcheck"
+	use userfiles && myconf="${myconf} --enable-userfiles"
+
+	myconf="${myconf} --localstatedir=/var --disable-asm"
+
+	econf ${myconf}
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	rm -Rf "${D}/var/log"
+	rm -Rf "${D}/var/run"
+	rm -Rf "${D}/var/state"
+
+	if [[ -n "${STEALTH}" ]] ; then
+		rm -Rf "${D}/usr/share"
+	else
+		dodoc docs/BUGS docs/MANUAL* docs/README* docs/*.txt
+		dohtml docs/*.html
+#		docinto scripts
+#		dodoc scripts/*
+		insinto /etc
+		insopts -m0600
+		newins samhainrc.linux samhainrc
+		newinitd init/samhain.startGentoo samhain
+		keepdir "/var/lib/samhain"
+	fi
+
+	if use netserver ; then
+		keepdir "/var/lib/yule"
+		chown daemon:daemon "${D}/var/lib/yule"
+		keepdir "/var/log/yule"
+		chown daemon:daemon "${D}/var/log/yule"
+	fi
+}
+
+pkg_postinst() {
+	if [[ -n "${STEALTH}" ]] ; then
+		elog
+		elog "Manual pages, documentation, and init script were NOT installed in order to"
+		elog "obscure Samhain's presence. You should also remove samhain's installation"
+		elog "traces from /var/cache/edb/world and /var/db/pkg."
+	fi
+
+	if [[ "${STEALTH}" == "full" ]] ; then
+		elog
+		elog "In stealth mode, the configuration file must be steganographically hidden"
+		elog "in a postscript image file. The sample config has been created this way by"
+		elog "the installation process. Use the samhain_stealth utility to modify or"
+		elog "create your own configuration file."
+	fi
+
+	if [[ -z "${KEY_FPR}" ]] ; then
+		elog
+		ewarn "GnuPG support has been enabled, but fingerprint verification will be"
+		ewarn "ignored. To enable fingerprint verification (strongly recommended),"
+		ewarn "you must re-emerge this package with the KEY_FPR variable set to"
+		ewarn "your default signing key fingerprint."
+		ewarn "Please read the Samhain manual for more details."
+		elog
+		elog "Enabling GnuPG support in Samhain requires that you sign your configuration"
+		elog "and database files. Please run the following commands as root:"
+		elog
+		elog "    gpg -a --clearsign --not-dash-escaped /etc/samhainrc"
+		elog "    mv /etc/samhainrc.asc /etc/samhainrc"
+		elog "    chmod 600 /etc/samhainrc"
+		elog
+		elog "Run the same commands on /var/lib/samhain/samhain_file after initialization."
+	fi
+
+	elog
+	elog "Be sure to check your settings in /etc/samhainrc. When ready, run:"
+	elog "    samhain -t init"
+	elog "to initialize Samhain."
+
+	elog
+	elog "Samhain stealth-mode options are also available. Please view the comments"
+	elog "in the Samhain ebuild for further configuration instructions."
+
+	elog
+	ewarn "Please be sure to read the Samhain manual to understand and correctly"
+	ewarn "configure the Samhain utility."
+	ewarn "HTML version available for viewing at http://la-samhna.de/samhain/manual/ ."
+}
--- a/app-misc/gplaycli/Manifest
+++ b/app-misc/gplaycli/Manifest
@ -1,3 +1,2 @@
-DIST gplaycli-3.21.tar.gz 4848493 BLAKE2B 555c5ab2018f89770a2f158b4581ad293f635adbd971d44b4a5552929353e3892293742d874fcc5b70698be9f5703f2d13d67e910f04045e09ced3a1143cebb7 SHA512 897b3d07a91f3b4ad5e4b5985f203874796c1205026be7485e79a0e32c57c81fd375c50d00277e60cc83660fb8644fee0ee9a179d2bcd04a91f1c67cc3fb02ee
-DIST gplaycli-3.22.tar.gz 4847622 BLAKE2B 3c2fd36f081aaa04a2ceee136d094a7b222daa404d7e6a593445f997fcf7e21207276f6dbca6fa2c1d68b549944101a45c3756070664a295e9fa0e3ee6c94b2c SHA512 7b65d214c3fe2c7684c0a793add1cf62c5a19ca2ccc8d446f67d57783321e6da50aa08a6de1caa87655b672cdfb41bbb39b12366ae249fe61bacc5bbb9eb2b8b
 DIST gplaycli-3.23.tar.gz 2990154 BLAKE2B 7ad0d3f50a24542ec5a361471b1248a7a19358de4d48f5081360fd967dc68e7d0b02b306b665548638258049187549dbe9813562113683ef309dae753864e3fa SHA512 b64c7faf44418136c2186b310670b63c814720f738ec70a2b031f33753e8fc398692495dcca2e2c5016778386ae02dee132ca71ab2a9d09dfb439965e9871989
+DIST gplaycli-3.24.tar.gz 2990637 BLAKE2B 67f90e2871cf9f57c49c694f8d7f8ca34e0f1f72fb98a0ad084f455da1954c4acaf771076d1ae251c082b73b6ba752759d14363b3eb7f1eaeec7d54efd383d8d SHA512 d7bb2c3c4db58e8d11b82f102031e806bb7ae2fb08b31c0be750735cce0287342f6bd219bf39b8a929418f6d0889857907d4acc81710443a39f2062da8d6cae8
--- a/app-misc/gplaycli/gplaycli-3.22-r1.ebuild
+++ b/app-misc/gplaycli/gplaycli-3.22-r1.ebuild
@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6} )
-inherit distutils-r1
-
-DESCRIPTION="Google Play Downloader via Command line"
-HOMEPAGE="https://github.com/matlink/gplaycli"
-SRC_URI="https://github.com/matlink/gplaycli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="pyaxmlparser"
-
-#https://github.com/matlink/gplaycli/issues/182
-change_deps() {
-	PATCHES=( "${FILESDIR}/pyaxmlparser.patch" )
-}
-
-RDEPEND="dev-python/protobuf-python[${PYTHON_USEDEP}]
-	>=dev-python/gpapi-0.4.2[${PYTHON_USEDEP}]
-	pyaxmlparser? ( dev-python/pyaxmlparser[${PYTHON_USEDEP}] )
-	!pyaxmlparser? ( dev-python/androguard[${PYTHON_USEDEP}] )
-	dev-python/clint[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	use pyaxmlparser && change_deps
-
-	# disarm pycrypto dep to allow || ( pycryptodome pycrypto )
-	sed -i -e "s|os.path.expanduser('~')+'/.config/|'/etc/|" setup.py || die
-	distutils-r1_python_prepare_all
-}
--- a/app-misc/gplaycli/gplaycli-3.22.ebuild
+++ b/app-misc/gplaycli/gplaycli-3.22.ebuild
@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6} )
-inherit distutils-r1
-
-DESCRIPTION="Google Play Downloader via Command line"
-HOMEPAGE="https://github.com/matlink/gplaycli"
-SRC_URI="https://github.com/matlink/gplaycli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/protobuf-python[${PYTHON_USEDEP}]
-	>=dev-python/gpapi-0.4.2[${PYTHON_USEDEP}]
-	dev-python/androguard[${PYTHON_USEDEP}]
-	dev-python/clint[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# disarm pycrypto dep to allow || ( pycryptodome pycrypto )
-	sed -i -e "s|os.path.expanduser('~')+'/.config/|'/etc/|" setup.py || die
-	distutils-r1_python_prepare_all
-}
--- a/app-misc/gplaycli/gplaycli-3.24.ebuild
+++ b/app-misc/gplaycli/gplaycli-3.24.ebuild
@ -3,7 +3,7 @@

 EAPI=6

-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 inherit distutils-r1

 DESCRIPTION="Google Play Downloader via Command line"
@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""

 RDEPEND="dev-python/protobuf-python[${PYTHON_USEDEP}]
-	>=dev-python/gpapi-0.4.2[${PYTHON_USEDEP}]
+	>=dev-python/gpapi-0.4.3[${PYTHON_USEDEP}]
 	dev-python/pyaxmlparser[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]"
--- a/app-officeext/languagetool/Manifest
+++ b/app-officeext/languagetool/Manifest
@ -1,3 +1,4 @@
 DIST LanguageTool-4.0.oxt 95885930 BLAKE2B 38371cdcf8b863ac55c664598fe57a651f304c32dd8ec1cafafd8b15aa2a8c1ddd05d6413318f34693dd42ef780db3d9ae47c70e3a96ff3e29f2e94480eb9f60 SHA512 31febada0ffbb1995b64d660bc6a9c9ee26db79294f2aa7d1295a06f4b8a75b1b824e6de899d9e8afa982c73f5721c0dde02058997831209327ec30c457ebb48
 DIST LanguageTool-4.1.oxt 97765942 BLAKE2B 572310ad8166abae63fc0dd6b6ecb1d6361dfe540e287c30b6ad4ae46afa0f99f4a0d5d92a9bc337066c7a0cc7c444b8f874c85fee7b9b406acde889ac5ff761 SHA512 825dfdc256f055900c8d3133ee957e3718c20e2582a82fd2f8882ef0e218012b7704d7af9689cce0ff1226818669021a46a1c80392b19d2b57c2479d3ed02016
 DIST LanguageTool-4.2.oxt 97572841 BLAKE2B 76d348ffab34d17c8a19cfdb1ed2441655e91ce59d548a82a42bd18d7383a50a94d5c9336c2368033c5cba95a2860ce6450516fb6a88239078519a21b8cd4760 SHA512 d72a656a40cf7cdebe8e5fc4d0d015dbc510418ff0c98fc6fb34aa0031c74553e594d3ad333168a108660426125d3ea2ee07a11d43b0b3d80a3be4f4d787e031
+DIST LanguageTool-4.3.oxt 120971773 BLAKE2B 586078d11a9d0c4dac189a9d41bb30980ad1e291feb456c4ca71bb1df9bf30f5722e4169be3d8dc37f03057a1d08cc612322fe2147e5799e44a994c85e068f25 SHA512 6b5bea3c864b9ddb082f4e56ee79f6f31a266bd4c28734caa7a802261d05b8e91e57a790c1c725a540f7fa5539b3beeb665de79c4f9b5241b0c135baa59645b0
--- a/app-officeext/languagetool/languagetool-4.3.ebuild
+++ b/app-officeext/languagetool/languagetool-4.3.ebuild
@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="LanguageTool-${PV}"
+
+OFFICE_REQ_USE="java"
+
+OFFICE_EXTENSIONS=(
+	"${MY_P}.oxt"
+)
+
+inherit office-ext-r1
+
+DESCRIPTION="Style and Grammar Checker for libreoffice"
+HOMEPAGE="https://www.languagetool.org/"
+SRC_URI="https://www.languagetool.org/download/${MY_P}.oxt"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.8"
--- a/dev-db/sqlmap/Manifest
+++ b/dev-db/sqlmap/Manifest
@ -1,2 +1 @@
-DIST sqlmap-1.2.8.tar.gz 7417434 BLAKE2B c75c514e68b8baf1970f6114282fd3c55ec5bcae77e20f88dde4879924f573d654b0e207a86ab6528cb6f553a9e77f0a38aafc9f4021dec665cbb49c283a5bed SHA512 3463d29bca00b9b79d2b6ee89d7ff6a5f4053047b41cadaa697b20d5922fdae3166dd17a36f347b755894de498260a4db0a1fe314dc37a94875c7f8868c9a6ac
-DIST sqlmap-1.2.9.tar.gz 7418857 BLAKE2B d7887f0dadc16443803bfaea1f0a82d34ecece51e2d870571c2aa7ee48d199261d195c01840973a899c9a0672d846f16c3b5371cc08281c6d033171c97c7b11e SHA512 0632b923f7fab2d40ef5b44cf960483759df7eab55a76f048b4841e71e769da6976248fd719fff87a8d044ac24081e72bbc2fdba777babd2dcb7eae26332a5ef
+DIST sqlmap-1.2.10.tar.gz 7421497 BLAKE2B 211fd7fbd9f70d0b6e5ac32434c5e9874831e3ec21667200ee53ad8d895c35128b8c66dead8ee91526ed6d1d7d464fea7b9bbd25f991228f80ae6a4c61cd210e SHA512 d3836ae6967568be127714b33b404a5a8d22f30e6165a88f53a5ede90334b424597ff5f5afff260da4001e90f89b02ec358a6ee3324a358b27baa9aa59c3121a
--- a/dev-db/sqlmap/sqlmap-1.2.10.ebuild
+++ b/dev-db/sqlmap/sqlmap-1.2.10.ebuild
--- a/dev-db/sqlmap/sqlmap-1.2.9.ebuild
+++ b/dev-db/sqlmap/sqlmap-1.2.9.ebuild
@ -1 +0,0 @@
-sqlmap-9999.ebuild
--- a/dev-go/go-uuid/Manifest
+++ b/dev-go/go-uuid/Manifest
@ -1 +0,0 @@
-DIST go-uuid-0.2.tar.gz 12729 BLAKE2B fa012a28fa7985db3d640ac5b238e517cafbb7a65223e16b359a88ffd0d7cf23868b528acc4b54b6bb24aa52e0768a4da54de9037fc033047648e9d3f5ceb274 SHA512 358f2d813583a376ecad5e19b7a53543cdb91942ad5b1f8688e4da303dac24bd95f37f9b14de401241bf6e15fb5011358d2bbb47c44d0bd5fcf9ab8a82cf4120
--- a/dev-go/uuid/Manifest
+++ b/dev-go/uuid/Manifest
@ -0,0 +1,2 @@
+DIST uuid-0.2.tar.gz 12729 BLAKE2B fa012a28fa7985db3d640ac5b238e517cafbb7a65223e16b359a88ffd0d7cf23868b528acc4b54b6bb24aa52e0768a4da54de9037fc033047648e9d3f5ceb274 SHA512 358f2d813583a376ecad5e19b7a53543cdb91942ad5b1f8688e4da303dac24bd95f37f9b14de401241bf6e15fb5011358d2bbb47c44d0bd5fcf9ab8a82cf4120
+DIST uuid-1.0.0.tar.gz 13129 BLAKE2B 6ecba48c5cca7568f513740446f36e32fa445033b3c91c4c75f4fca22703020934a6176d1b8f1459c92f2d88984a550107b797d8cb812f2664a0416cc3a1f8a4 SHA512 f91d11c8514a85201b152be33229d60146886611b7f8cd42a249b2a1d590489cdc6a9037f482342ad8a8386d3e5cf38ad2c2c10a046f03a1e38f463aafb73f95
--- a/dev-go/uuid/metadata.xml
+++ b/dev-go/uuid/metadata.xml
@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>blshkv@pentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">google/uuid</remote-id>
+  </upstream>
+</pkgmetadata>
--- a/dev-go/go-uuid/go-uuid-0.2.ebuild
+++ b/dev-go/go-uuid/go-uuid-0.2.ebuild
--- a/net-analyzer/gobuster/gobuster-2.0.1.ebuild
+++ b/net-analyzer/gobuster/gobuster-2.0.1.ebuild
@ -3,33 +3,26 @@

 EAPI=6

-EGO_PN=github.com/OJ/${PN}
-
-inherit golang-build
+EGO_PN=github.com/google/uuid

 if [[ ${PV} = *9999* ]]; then
 	inherit golang-vcs
 else
 	KEYWORDS="~amd64 ~x86 ~arm ~arm64"
-	EGIT_COMMIT="v${PV}"
+	EGIT_COMMIT="${PV}"
 	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	inherit golang-vcs-snapshot
 fi

-DESCRIPTION="A tool to brute-force URIs and DNS subdomains."
-HOMEPAGE="https://github.com/OJ/gobuster"
+inherit golang-build

-LICENSE="Apache-2.0"
+DESCRIPTION="A UUID package for Go."
+HOMEPAGE="https://github.com/google/uuid"
+
+LICENSE="BSD-3-Clause"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""

-RDEPEND=">=dev-lang/go-1.10
-		dev-go/go-crypto
-		dev-go/go-multierror
-		>=dev-go/go-uuid-0.2"
+RDEPEND=">=dev-lang/go-1.10"
 DEPEND="${RDEPEND}"
-
-src_install(){
-	dobin gobuster
-}
--- a/dev-libs/openssl-bad/Manifest
+++ b/dev-libs/openssl-bad/Manifest
@ -0,0 +1 @@
+DIST openssl-bad-1.0.2_p20180915.zip 7669825 BLAKE2B 55b99dc3b7d32506c5c06d7d4dc522e6a2c44bd9905b600c8b19a7a8df82ab41cb0bf81770d26fb1c1151c0cbb86f91ed981b25beec6cc3dd4fa9d117606bd5a SHA512 4b9dacb6239d219192be6b8f4f1e4b65bca574ebcd76586ecb43855b7b9848fdea2eabbcb07c713e1ace8c785f331905b9b6f9adfaf5e372c458d04ce22c13ee
--- a/dev-libs/openssl-bad/files/gentoo.config-1.0.2
+++ b/dev-libs/openssl-bad/files/gentoo.config-1.0.2
@ -0,0 +1,169 @@
+#!/usr/bin/env bash
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+#
+# Openssl doesn't play along nicely with cross-compiling
+# like autotools based projects, so let's teach it new tricks.
+#
+# Review the bundled 'config' script to see why kind of targets
+# we can pass to the 'Configure' script.
+
+
+# Testing routines
+if [[ $1 == "test" ]] ; then
+	for c in \
+		"arm-gentoo-linux-uclibc      |linux-generic32 -DL_ENDIAN" \
+		"armv5b-linux-gnu             |linux-armv4 -DB_ENDIAN" \
+		"x86_64-pc-linux-gnu          |linux-x86_64" \
+		"alpha-linux-gnu              |linux-alpha-gcc" \
+		"alphaev56-unknown-linux-gnu  |linux-alpha+bwx-gcc" \
+		"i686-pc-linux-gnu            |linux-elf" \
+		"whatever-gentoo-freebsdX.Y   |BSD-generic32" \
+		"i686-gentoo-freebsdX.Y       |BSD-x86-elf" \
+		"sparc64-alpha-freebsdX.Y     |BSD-sparc64" \
+		"ia64-gentoo-freebsd5.99234   |BSD-ia64" \
+		"x86_64-gentoo-freebsdX.Y     |BSD-x86_64" \
+		"hppa64-aldsF-linux-gnu5.3    |linux-generic32 -DB_ENDIAN" \
+		"powerpc-gentOO-linux-uclibc  |linux-ppc" \
+		"powerpc64-unk-linux-gnu      |linux-ppc64" \
+		"powerpc64le-linux-gnu        |linux-ppc64le" \
+		"x86_64-apple-darwinX         |darwin64-x86_64-cc" \
+		"powerpc64-apple-darwinX      |darwin64-ppc-cc" \
+		"i686-apple-darwinX           |darwin-i386-cc" \
+		"i386-apple-darwinX           |darwin-i386-cc" \
+		"powerpc-apple-darwinX        |darwin-ppc-cc" \
+		"i586-pc-winnt                |winnt-parity" \
+		"s390-ibm-linux-gnu           |linux-generic32 -DB_ENDIAN" \
+		"s390x-linux-gnu              |linux64-s390x" \
+	;do
+		CHOST=${c/|*}
+		ret_want=${c/*|}
+		ret_got=$(CHOST=${CHOST} "$0")
+
+		if [[ ${ret_want} == "${ret_got}" ]] ; then
+			echo "PASS: ${CHOST}"
+		else
+			echo "FAIL: ${CHOST}"
+			echo -e "\twanted: ${ret_want}"
+			echo -e "\twe got: ${ret_got}"
+		fi
+	done
+	exit 0
+fi
+[[ -z ${CHOST} && -n $1 ]] && CHOST=$1
+
+
+# Detect the operating system
+case ${CHOST} in
+	*-aix*)          system="aix";;
+	*-darwin*)       system="darwin";;
+	*-freebsd*)      system="BSD";;
+	*-hpux*)         system="hpux";;
+	*-linux*)        system="linux";;
+	*-solaris*)      system="solaris";;
+	*-winnt*)        system="winnt";;
+	x86_64-*-mingw*) system="mingw64";;
+	*mingw*)         system="mingw";;
+	*)               exit 0;;
+esac
+
+
+# Compiler munging
+compiler="gcc"
+if [[ ${CC} == "ccc" ]] ; then
+	compiler=${CC}
+fi
+
+
+# Detect target arch
+machine=""
+chost_machine=${CHOST%%-*}
+case ${system} in
+linux)
+	case ${chost_machine}:${ABI} in
+		aarch64*be*)  machine="aarch64 -DB_ENDIAN";;
+		aarch64*)     machine="aarch64 -DL_ENDIAN";;
+		alphaev56*|\
+		alphaev[678]*)machine=alpha+bwx-${compiler};;
+		alpha*)       machine=alpha-${compiler};;
+		armv[4-9]*b*) machine="armv4 -DB_ENDIAN";;
+		armv[4-9]*)   machine="armv4 -DL_ENDIAN";;
+		arm*b*)       machine="generic32 -DB_ENDIAN";;
+		arm*)         machine="generic32 -DL_ENDIAN";;
+		avr*)         machine="generic32 -DL_ENDIAN";;
+		bfin*)        machine="generic32 -DL_ENDIAN";;
+	#	hppa64*)      machine=parisc64;;
+		hppa*)        machine="generic32 -DB_ENDIAN";;
+		i[0-9]86*|\
+		x86_64*:x86)  machine=elf;;
+		ia64*)        machine=ia64;;
+		m68*)         machine="generic32 -DB_ENDIAN";;
+		mips*el*)     machine="generic32 -DL_ENDIAN";;
+		mips*)        machine="generic32 -DB_ENDIAN";;
+		powerpc64*le*)machine=ppc64le;;
+		powerpc64*)   machine=ppc64;;
+		powerpc*le*)  machine="generic32 -DL_ENDIAN";;
+		powerpc*)     machine=ppc;;
+	#	sh64*)        machine=elf;;
+		sh*b*)        machine="generic32 -DB_ENDIAN";;
+		sh*)          machine="generic32 -DL_ENDIAN";;
+		# TODO: Might want to do -mcpu probing like glibc to determine a
+		# better default for sparc-linux-gnu targets.  This logic will
+		# break v7 and older systems when they use it.
+		sparc*v7*)    machine="generic32 -DB_ENDIAN";;
+		sparc64*)     machine=sparcv9 system=linux64;;
+		sparc*v9*)    machine=sparcv9;;
+		sparc*v8*)    machine=sparcv8;;
+		sparc*)       machine=sparcv8;;
+		s390x*)       machine=s390x system=linux64;;
+		s390*)        machine="generic32 -DB_ENDIAN";;
+		x86_64*:x32)  machine=x32;;
+		x86_64*)      machine=x86_64;;
+	esac
+	;;
+BSD)
+	case ${chost_machine} in
+		alpha*)       machine=generic64;;
+		i[6-9]86*)    machine=x86-elf;;
+		ia64*)        machine=ia64;;
+		sparc64*)     machine=sparc64;;
+		x86_64*)      machine=x86_64;;
+		*)            machine=generic32;;
+	esac
+	;;
+aix)
+	machine=${compiler}
+	;;
+darwin)
+	case ${chost_machine} in
+		powerpc64)    machine=ppc-cc; system=${system}64;;
+		powerpc)      machine=ppc-cc;;
+		i?86*)        machine=i386-cc;;
+		x86_64)       machine=x86_64-cc; system=${system}64;;
+	esac
+	;;
+hpux)
+	case ${chost_machine} in
+		ia64)	machine=ia64-${compiler} ;;
+	esac
+	;;
+solaris)
+	case ${chost_machine} in
+		i386)         machine=x86-${compiler} ;;
+		x86_64*)      machine=x86_64-${compiler}; system=${system}64;;
+		sparcv9*)     machine=sparcv9-${compiler}; system=${system}64;;
+		sparc*)       machine=sparcv8-${compiler};;
+	esac
+	;;
+winnt)
+	machine=parity
+	;;
+mingw*)
+	# special case ... no xxx-yyy style name
+	echo ${system}
+	;;
+esac
+
+
+# If we have something, show it
+[[ -n ${machine} ]] && echo ${system}-${machine}
--- a/dev-libs/openssl-bad/files/openssl-1.0.0a-ldflags.patch
+++ b/dev-libs/openssl-bad/files/openssl-1.0.0a-ldflags.patch
@ -0,0 +1,29 @@
+http://bugs.gentoo.org/181438
+http://bugs.gentoo.org/327421
+https://rt.openssl.org/Ticket/Display.html?id=3331&user=guest&pass=guest
+
+make sure we respect LDFLAGS
+
+also make sure we don't add useless -rpath flags to the system libdir
+
+--- Makefile.org
+++ Makefile.org
+@@ -189,6 +189,7 @@
+ 		MAKEDEPEND='$$$${TOP}/util/domd $$$${TOP} -MD $(MAKEDEPPROG)' \
+ 		DEPFLAG='-DOPENSSL_NO_DEPRECATED $(DEPFLAG)'	\
+ 		MAKEDEPPROG='$(MAKEDEPPROG)'			\
+		LDFLAGS='${LDFLAGS}'				\
+ 		SHARED_LDFLAGS='$(SHARED_LDFLAGS)'		\
+ 		KRB5_INCLUDES='$(KRB5_INCLUDES)' LIBKRB5='$(LIBKRB5)'	\
+ 		ZLIB_INCLUDE='$(ZLIB_INCLUDE)' LIBZLIB='$(LIBZLIB)'	\
+--- Makefile.shared
+++ Makefile.shared
+@@ -153,7 +153,7 @@
+ 	NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
+ 	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
+ 
+-DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)"
+DO_GNU_APP=LDFLAGS="$(LDFLAGS) $(CFLAGS)"
+ 
+ #This is rather special.  It's a special target with which one can link
+ #applications without bothering with any features that have anything to
--- a/dev-libs/openssl-bad/files/openssl-1.0.1p-default-source.patch
+++ b/dev-libs/openssl-bad/files/openssl-1.0.1p-default-source.patch
@ -0,0 +1,30 @@
+https://bugs.gentoo.org/554338
+https://rt.openssl.org/Ticket/Display.html?id=3934&user=guest&pass=guest
+
+From 7c2e97f8bbae517496fdc11f475b4ae54b2534f5 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Fri, 10 Jul 2015 01:50:52 -0400
+Subject: [PATCH] test: use _DEFAULT_SOURCE with newer glibc versions
+
+The _BSD_SOURCE macro is replaced by the _DEFAULT_SOURCE macro.  Using
+just the former with newer versions leads to a build time warning, so
+make sure to use the new macro too.
+---
+ ssl/ssltest.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/ssl/ssltest.c b/ssl/ssltest.c
+index 26cf96c..b36f667 100644
+--- a/ssl/ssltest.c
+++ b/ssl/ssltest.c
+@@ -141,6 +141,7 @@
+  */
+ 
+ /* Or gethostname won't be declared properly on Linux and GNU platforms. */
+#define _DEFAULT_SOURCE 1
+ #define _BSD_SOURCE 1
+ 
+ #include <assert.h>
+-- 
+2.4.4
+
--- a/dev-libs/openssl-bad/files/openssl-1.0.2-ipv6.patch
+++ b/dev-libs/openssl-bad/files/openssl-1.0.2-ipv6.patch
@ -0,0 +1,611 @@
+http://rt.openssl.org/Ticket/Display.html?id=2051&user=guest&pass=guest
+
+--- openssl-1.0.2/apps/s_apps.h
+++ openssl-1.0.2/apps/s_apps.h
+@@ -154,7 +154,7 @@
+ int do_server(int port, int type, int *ret,
+               int (*cb) (char *hostname, int s, int stype,
+                          unsigned char *context), unsigned char *context,
+-              int naccept);
+              int naccept, int use_ipv4, int use_ipv6);
+ #ifdef HEADER_X509_H
+ int MS_CALLBACK verify_callback(int ok, X509_STORE_CTX *ctx);
+ #endif
+@@ -167,7 +167,8 @@
+ int ssl_print_curves(BIO *out, SSL *s, int noshared);
+ #endif
+ int ssl_print_tmp_key(BIO *out, SSL *s);
+-int init_client(int *sock, char *server, int port, int type);
+int init_client(int *sock, char *server, int port, int type,
+		int use_ipv4, int use_ipv6);
+ int should_retry(int i);
+ int extract_port(char *str, short *port_ptr);
+ int extract_host_port(char *str, char **host_ptr, unsigned char *ip,
+--- openssl-1.0.2/apps/s_client.c
+++ openssl-1.0.2/apps/s_client.c
+@@ -302,6 +302,10 @@
+ {
+     BIO_printf(bio_err, "usage: s_client args\n");
+     BIO_printf(bio_err, "\n");
+    BIO_printf(bio_err, " -4             - use IPv4 only\n");
+#if OPENSSL_USE_IPV6
+    BIO_printf(bio_err, " -6             - use IPv6 only\n");
+#endif
+     BIO_printf(bio_err, " -host host     - use -connect instead\n");
+     BIO_printf(bio_err, " -port port     - use -connect instead\n");
+     BIO_printf(bio_err,
+@@ -658,6 +662,7 @@
+     int sbuf_len, sbuf_off;
+     fd_set readfds, writefds;
+     short port = PORT;
+    int use_ipv4, use_ipv6;
+     int full_log = 1;
+     char *host = SSL_HOST_NAME;
+     char *cert_file = NULL, *key_file = NULL, *chain_file = NULL;
+@@ -709,7 +714,11 @@
+ #endif
+     char *sess_in = NULL;
+     char *sess_out = NULL;
+-    struct sockaddr peer;
+#if OPENSSL_USE_IPV6
+    struct sockaddr_storage peer;
+#else
+    struct sockaddr_in peer;
+#endif
+     int peerlen = sizeof(peer);
+     int fallback_scsv = 0;
+     int enable_timeouts = 0;
+@@ -737,6 +746,12 @@
+ 
+     meth = SSLv23_client_method();
+ 
+    use_ipv4 = 1;
+#if OPENSSL_USE_IPV6
+    use_ipv6 = 1;
+#else
+    use_ipv6 = 0;
+#endif
+     apps_startup();
+     c_Pause = 0;
+     c_quiet = 0;
+@@ -1096,6 +1111,16 @@
+             jpake_secret = *++argv;
+         }
+ #endif
+	else if (strcmp(*argv,"-4") == 0) {
+	    use_ipv4 = 1;
+	    use_ipv6 = 0;
+	}
+#if OPENSSL_USE_IPV6
+	else if (strcmp(*argv,"-6") == 0) {
+	    use_ipv4 = 0;
+	    use_ipv6 = 1;
+	}
+#endif
+ #ifndef OPENSSL_NO_SRTP
+         else if (strcmp(*argv, "-use_srtp") == 0) {
+             if (--argc < 1)
+@@ -1421,7 +1446,7 @@
+ 
+  re_start:
+ 
+-    if (init_client(&s, host, port, socket_type) == 0) {
+    if (init_client(&s, host, port, socket_type, use_ipv4, use_ipv6) == 0) {
+         BIO_printf(bio_err, "connect:errno=%d\n", get_last_socket_error());
+         SHUTDOWN(s);
+         goto end;
+@@ -1444,7 +1469,7 @@
+     if (socket_type == SOCK_DGRAM) {
+ 
+         sbio = BIO_new_dgram(s, BIO_NOCLOSE);
+-        if (getsockname(s, &peer, (void *)&peerlen) < 0) {
+        if (getsockname(s, (struct sockaddr *)&peer, (void *)&peerlen) < 0) {
+             BIO_printf(bio_err, "getsockname:errno=%d\n",
+                        get_last_socket_error());
+             SHUTDOWN(s);
+--- openssl-1.0.2/apps/s_server.c
+++ openssl-1.0.2/apps/s_server.c
+@@ -643,6 +643,10 @@
+     BIO_printf(bio_err,
+                " -alpn arg  - set the advertised protocols for the ALPN extension (comma-separated list)\n");
+ #endif
+    BIO_printf(bio_err, " -4            - use IPv4 only\n");
+#if OPENSSL_USE_IPV6
+    BIO_printf(bio_err, " -6            - use IPv6 only\n");
+#endif
+     BIO_printf(bio_err,
+                " -keymatexport label   - Export keying material using label\n");
+     BIO_printf(bio_err,
+@@ -1070,6 +1074,7 @@
+     int state = 0;
+     const SSL_METHOD *meth = NULL;
+     int socket_type = SOCK_STREAM;
+    int use_ipv4, use_ipv6;
+     ENGINE *e = NULL;
+     char *inrand = NULL;
+     int s_cert_format = FORMAT_PEM, s_key_format = FORMAT_PEM;
+@@ -1111,6 +1116,12 @@
+ 
+     meth = SSLv23_server_method();
+ 
+    use_ipv4 = 1;
+#if OPENSSL_USE_IPV6
+    use_ipv6 = 1;
+#else
+    use_ipv6 = 0;
+#endif
+     local_argc = argc;
+     local_argv = argv;
+ 
+@@ -1503,6 +1514,16 @@
+             jpake_secret = *(++argv);
+         }
+ #endif
+	else if (strcmp(*argv,"-4") == 0) {
+	    use_ipv4 = 1;
+	    use_ipv6 = 0;
+	}
+#if OPENSSL_USE_IPV6
+	else if (strcmp(*argv,"-6") == 0) {
+	    use_ipv4 = 0;
+	    use_ipv6 = 1;
+	}
+#endif
+ #ifndef OPENSSL_NO_SRTP
+         else if (strcmp(*argv, "-use_srtp") == 0) {
+             if (--argc < 1)
+@@ -2023,13 +2044,13 @@
+     (void)BIO_flush(bio_s_out);
+     if (rev)
+         do_server(port, socket_type, &accept_socket, rev_body, context,
+-                  naccept);
+                  naccept, use_ipv4, use_ipv6);
+     else if (www)
+         do_server(port, socket_type, &accept_socket, www_body, context,
+-                  naccept);
+                  naccept, use_ipv4, use_ipv6);
+     else
+         do_server(port, socket_type, &accept_socket, sv_body, context,
+-                  naccept);
+                  naccept, use_ipv4, use_ipv6);
+     print_stats(bio_s_out, ctx);
+     ret = 0;
+  end:
+--- openssl-1.0.2/apps/s_socket.c
+++ openssl-1.0.2/apps/s_socket.c
+@@ -101,16 +101,16 @@
+ #  include "netdb.h"
+ # endif
+ 
+-static struct hostent *GetHostByName(char *name);
+static struct hostent *GetHostByName(char *name, int domain);
+ # if defined(OPENSSL_SYS_WINDOWS) || (defined(OPENSSL_SYS_NETWARE) && !defined(NETWARE_BSDSOCK))
+ static void ssl_sock_cleanup(void);
+ # endif
+ static int ssl_sock_init(void);
+-static int init_client_ip(int *sock, unsigned char ip[4], int port, int type);
+-static int init_server(int *sock, int port, int type);
+-static int init_server_long(int *sock, int port, char *ip, int type);
+static int init_client_ip(int *sock, unsigned char *ip, int port, int type, int domain);
+static int init_server(int *sock, int port, int type, int use_ipv4, int use_ipv6);
+static int init_server_long(int *sock, int port, char *ip, int type, int use_ipv4, int use_ipv6);
+ static int do_accept(int acc_sock, int *sock, char **host);
+-static int host_ip(char *str, unsigned char ip[4]);
+static int host_ip(char *str, unsigned char *ip, int domain);
+ 
+ # ifdef OPENSSL_SYS_WIN16
+ #  define SOCKET_PROTOCOL 0     /* more microsoft stupidity */
+@@ -231,38 +231,68 @@
+     return (1);
+ }
+ 
+-int init_client(int *sock, char *host, int port, int type)
+int init_client(int *sock, char *host, int port, int type, int use_ipv4, int use_ipv6)
+ {
+# if OPENSSL_USE_IPV6
+    unsigned char ip[16];
+# else
+     unsigned char ip[4];
+# endif
+ 
+-    memset(ip, '\0', sizeof ip);
+-    if (!host_ip(host, &(ip[0])))
+-        return 0;
+-    return init_client_ip(sock, ip, port, type);
+-}
+-
+-static int init_client_ip(int *sock, unsigned char ip[4], int port, int type)
+-{
+-    unsigned long addr;
+    if (use_ipv4)
+	if (host_ip(host, ip, AF_INET))
+	    return(init_client_ip(sock, ip, port, type, AF_INET));
+# if OPENSSL_USE_IPV6
+    if (use_ipv6)
+	if (host_ip(host, ip, AF_INET6))
+	    return(init_client_ip(sock, ip, port, type, AF_INET6));
+# endif
+    return 0;
+}
+
+static int init_client_ip(int *sock, unsigned char ip[4], int port, int type, int domain)
+{
+# if OPENSSL_USE_IPV6
+    struct sockaddr_storage them;
+    struct sockaddr_in *them_in = (struct sockaddr_in *)&them;
+    struct sockaddr_in6 *them_in6 = (struct sockaddr_in6 *)&them;
+# else
+     struct sockaddr_in them;
+    struct sockaddr_in *them_in = &them;
+# endif
+    socklen_t addr_len;
+     int s, i;
+ 
+     if (!ssl_sock_init())
+         return (0);
+ 
+     memset((char *)&them, 0, sizeof(them));
+-    them.sin_family = AF_INET;
+-    them.sin_port = htons((unsigned short)port);
+-    addr = (unsigned long)
+-        ((unsigned long)ip[0] << 24L) |
+-        ((unsigned long)ip[1] << 16L) |
+-        ((unsigned long)ip[2] << 8L) | ((unsigned long)ip[3]);
+-    them.sin_addr.s_addr = htonl(addr);
+    if (domain == AF_INET) {
+	addr_len = (socklen_t)sizeof(struct sockaddr_in);
+	them_in->sin_family=AF_INET;
+	them_in->sin_port=htons((unsigned short)port);
+# ifndef BIT_FIELD_LIMITS
+	memcpy(&them_in->sin_addr.s_addr, ip, 4);
+# else
+	memcpy(&them_in->sin_addr, ip, 4);
+# endif
+    }
+    else
+# if OPENSSL_USE_IPV6
+    {
+	addr_len = (socklen_t)sizeof(struct sockaddr_in6);
+	them_in6->sin6_family=AF_INET6;
+	them_in6->sin6_port=htons((unsigned short)port);
+	memcpy(&(them_in6->sin6_addr), ip, sizeof(struct in6_addr));
+    }
+# else
+	return(0);
+# endif
+ 
+     if (type == SOCK_STREAM)
+-        s = socket(AF_INET, SOCK_STREAM, SOCKET_PROTOCOL);
+        s = socket(domain, SOCK_STREAM, SOCKET_PROTOCOL);
+     else                        /* ( type == SOCK_DGRAM) */
+-        s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
+        s = socket(domain, SOCK_DGRAM, IPPROTO_UDP);
+ 
+     if (s == INVALID_SOCKET) {
+         perror("socket");
+@@ -280,7 +310,7 @@
+     }
+ # endif
+ 
+-    if (connect(s, (struct sockaddr *)&them, sizeof(them)) == -1) {
+    if (connect(s, (struct sockaddr *)&them, addr_len) == -1) {
+         closesocket(s);
+         perror("connect");
+         return (0);
+@@ -292,14 +322,14 @@
+ int do_server(int port, int type, int *ret,
+               int (*cb) (char *hostname, int s, int stype,
+                          unsigned char *context), unsigned char *context,
+-              int naccept)
+              int naccept, int use_ipv4, int use_ipv6)
+ {
+     int sock;
+     char *name = NULL;
+     int accept_socket = 0;
+     int i;
+ 
+-    if (!init_server(&accept_socket, port, type))
+    if (!init_server(&accept_socket, port, type, use_ipv4, use_ipv6))
+         return (0);
+ 
+     if (ret != NULL) {
+@@ -328,32 +358,41 @@
+     }
+ }
+ 
+-static int init_server_long(int *sock, int port, char *ip, int type)
+static int init_server_long(int *sock, int port, char *ip, int type, int use_ipv4, int use_ipv6)
+ {
+     int ret = 0;
+    int domain;
+# if OPENSSL_USE_IPV6
+    struct sockaddr_storage server;
+    struct sockaddr_in *server_in = (struct sockaddr_in *)&server;
+    struct sockaddr_in6 *server_in6 = (struct sockaddr_in6 *)&server;
+# else
+     struct sockaddr_in server;
+    struct sockaddr_in *server_in = &server;
+# endif
+    socklen_t addr_len;
+     int s = -1;
+ 
+    if (!use_ipv4 && !use_ipv6)
+	goto err;
+# if OPENSSL_USE_IPV6
+    /* we are fine here */
+# else
+    if (use_ipv6)
+	goto err;
+# endif
+     if (!ssl_sock_init())
+         return (0);
+ 
+-    memset((char *)&server, 0, sizeof(server));
+-    server.sin_family = AF_INET;
+-    server.sin_port = htons((unsigned short)port);
+-    if (ip == NULL)
+-        server.sin_addr.s_addr = INADDR_ANY;
+-    else
+-/* Added for T3E, address-of fails on bit field (beckman@acl.lanl.gov) */
+-# ifndef BIT_FIELD_LIMITS
+-        memcpy(&server.sin_addr.s_addr, ip, 4);
+#if OPENSSL_USE_IPV6
+    domain = use_ipv6 ? AF_INET6 : AF_INET;
+ # else
+-        memcpy(&server.sin_addr, ip, 4);
+    domain = AF_INET;
+ # endif
+-
+     if (type == SOCK_STREAM)
+-        s = socket(AF_INET, SOCK_STREAM, SOCKET_PROTOCOL);
+-    else                        /* type == SOCK_DGRAM */
+-        s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
+	s=socket(domain, SOCK_STREAM, SOCKET_PROTOCOL);
+    else /* type == SOCK_DGRAM */
+	s=socket(domain, SOCK_DGRAM, IPPROTO_UDP);
+ 
+     if (s == INVALID_SOCKET)
+         goto err;
+@@ -363,7 +402,42 @@
+         setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (void *)&j, sizeof j);
+     }
+ # endif
+-    if (bind(s, (struct sockaddr *)&server, sizeof(server)) == -1) {
+# if OPENSSL_USE_IPV6
+    if ((use_ipv4 == 0) && (use_ipv6 == 1)) {
+	const int on = 1;
+
+	setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY,
+		    (const void *) &on, sizeof(int));
+    }
+# endif
+    if (domain == AF_INET) {
+	addr_len = (socklen_t)sizeof(struct sockaddr_in);
+	memset(server_in, 0, sizeof(struct sockaddr_in));
+	server_in->sin_family=AF_INET;
+	server_in->sin_port = htons((unsigned short)port);
+	if (ip == NULL)
+	    server_in->sin_addr.s_addr = htonl(INADDR_ANY);
+	else
+/* Added for T3E, address-of fails on bit field (beckman@acl.lanl.gov) */
+# ifndef BIT_FIELD_LIMITS
+	    memcpy(&server_in->sin_addr.s_addr, ip, 4);
+# else
+	    memcpy(&server_in->sin_addr, ip, 4);
+# endif
+    }
+# if OPENSSL_USE_IPV6
+    else {
+	addr_len = (socklen_t)sizeof(struct sockaddr_in6);
+	memset(server_in6, 0, sizeof(struct sockaddr_in6));
+	server_in6->sin6_family = AF_INET6;
+	server_in6->sin6_port = htons((unsigned short)port);
+	if (ip == NULL)
+	    server_in6->sin6_addr = in6addr_any;
+	else
+	    memcpy(&server_in6->sin6_addr, ip, sizeof(struct in6_addr));
+    }
+# endif
+    if (bind(s, (struct sockaddr *)&server, addr_len) == -1) {
+ # ifndef OPENSSL_SYS_WINDOWS
+         perror("bind");
+ # endif
+@@ -381,16 +455,23 @@
+     return (ret);
+ }
+ 
+-static int init_server(int *sock, int port, int type)
+static int init_server(int *sock, int port, int type, int use_ipv4, int use_ipv6)
+ {
+-    return (init_server_long(sock, port, NULL, type));
+    return (init_server_long(sock, port, NULL, type, use_ipv4, use_ipv6));
+ }
+ 
+ static int do_accept(int acc_sock, int *sock, char **host)
+ {
+     int ret;
+     struct hostent *h1, *h2;
+-    static struct sockaddr_in from;
+#if OPENSSL_USE_IPV6
+    struct sockaddr_storage from;
+    struct sockaddr_in *from_in = (struct sockaddr_in *)&from;
+    struct sockaddr_in6 *from_in6 = (struct sockaddr_in6 *)&from;
+#else
+    struct sockaddr_in from;
+    struct sockaddr_in *from_in = &from;
+#endif
+     int len;
+ /*      struct linger ling; */
+ 
+@@ -440,14 +521,25 @@
+ 
+     if (host == NULL)
+         goto end;
+# if OPENSSL_USE_IPV6
+    if (from.ss_family == AF_INET)
+# else
+    if (from.sin_family == AF_INET)
+# endif
+ # ifndef BIT_FIELD_LIMITS
+-    /* I should use WSAAsyncGetHostByName() under windows */
+-    h1 = gethostbyaddr((char *)&from.sin_addr.s_addr,
+-                       sizeof(from.sin_addr.s_addr), AF_INET);
+	/* I should use WSAAsyncGetHostByName() under windows */
+	h1 = gethostbyaddr((char *)&from_in->sin_addr.s_addr,
+                	    sizeof(from_in->sin_addr.s_addr), AF_INET);
+ # else
+-    h1 = gethostbyaddr((char *)&from.sin_addr,
+-                       sizeof(struct in_addr), AF_INET);
+	h1 = gethostbyaddr((char *)&from_in->sin_addr,
+            		    sizeof(struct in_addr), AF_INET);
+# endif
+# if OPENSSL_USE_IPV6
+    else
+	h1 = gethostbyaddr((char *)&from_in6->sin6_addr,
+			    sizeof(struct in6_addr), AF_INET6);
+ # endif
+	    
+     if (h1 == NULL) {
+         BIO_printf(bio_err, "bad gethostbyaddr\n");
+         *host = NULL;
+@@ -460,14 +552,22 @@
+         }
+         BUF_strlcpy(*host, h1->h_name, strlen(h1->h_name) + 1);
+ 
+-        h2 = GetHostByName(*host);
+# if OPENSSL_USE_IPV6
+	h2=GetHostByName(*host, from.ss_family);
+# else
+	h2=GetHostByName(*host, from.sin_family);
+# endif
+         if (h2 == NULL) {
+             BIO_printf(bio_err, "gethostbyname failure\n");
+             closesocket(ret);
+             return (0);
+         }
+-        if (h2->h_addrtype != AF_INET) {
+-            BIO_printf(bio_err, "gethostbyname addr is not AF_INET\n");
+# if OPENSSL_USE_IPV6
+	if (h2->h_addrtype != from.ss_family) {
+# else
+	if (h2->h_addrtype != from.sin_family) {
+# endif
+            BIO_printf(bio_err, "gethostbyname addr is not correct\n");
+             closesocket(ret);
+             return (0);
+         }
+@@ -483,14 +583,14 @@
+     char *h, *p;
+ 
+     h = str;
+-    p = strchr(str, ':');
+    p = strrchr(str, ':');
+     if (p == NULL) {
+         BIO_printf(bio_err, "no port defined\n");
+         return (0);
+     }
+     *(p++) = '\0';
+ 
+-    if ((ip != NULL) && !host_ip(str, ip))
+    if ((ip != NULL) && !host_ip(str, ip, AF_INET))
+         goto err;
+     if (host_ptr != NULL)
+         *host_ptr = h;
+@@ -502,44 +602,51 @@
+     return (0);
+ }
+ 
+-static int host_ip(char *str, unsigned char ip[4])
+static int host_ip(char *str, unsigned char *ip, int domain)
+ {
+     unsigned int in[4];
+    unsigned long l;
+     int i;
+ 
+-    if (sscanf(str, "%u.%u.%u.%u", &(in[0]), &(in[1]), &(in[2]), &(in[3])) ==
+-        4) {
+    if ((domain == AF_INET) && (sscanf(str, "%u.%u.%u.%u", &(in[0]), &(in[1]), &(in[2]), &(in[3])) == 4)) {
+         for (i = 0; i < 4; i++)
+             if (in[i] > 255) {
+                 BIO_printf(bio_err, "invalid IP address\n");
+                 goto err;
+             }
+-        ip[0] = in[0];
+-        ip[1] = in[1];
+-        ip[2] = in[2];
+-        ip[3] = in[3];
+-    } else {                    /* do a gethostbyname */
+	l=htonl((in[0]<<24L)|(in[1]<<16L)|(in[2]<<8L)|in[3]);
+	memcpy(ip, &l, 4);
+	return 1;
+    }
+# if OPENSSL_USE_IPV6
+    else if ((domain == AF_INET6) && (inet_pton(AF_INET6, str, ip) == 1))
+	return 1;
+# endif
+    else {                    /* do a gethostbyname */
+         struct hostent *he;
+ 
+         if (!ssl_sock_init())
+             return (0);
+ 
+-        he = GetHostByName(str);
+        he = GetHostByName(str, domain);
+         if (he == NULL) {
+             BIO_printf(bio_err, "gethostbyname failure\n");
+             goto err;
+         }
+         /* cast to short because of win16 winsock definition */
+-        if ((short)he->h_addrtype != AF_INET) {
+-            BIO_printf(bio_err, "gethostbyname addr is not AF_INET\n");
+        if ((short)he->h_addrtype != domain) {
+            BIO_printf(bio_err, "gethostbyname addr is not correct\n");
+             return (0);
+         }
+-        ip[0] = he->h_addr_list[0][0];
+-        ip[1] = he->h_addr_list[0][1];
+-        ip[2] = he->h_addr_list[0][2];
+-        ip[3] = he->h_addr_list[0][3];
+	if (domain == AF_INET)
+	    memset(ip, 0, 4);
+# if OPENSSL_USE_IPV6
+	else
+	    memset(ip, 0, 16);
+# endif
+	memcpy(ip, he->h_addr_list[0], he->h_length);
+	return 1;
+     }
+-    return (1);
+  err:
+     return (0);
+ }
+@@ -573,7 +680,7 @@
+ static unsigned long ghbn_hits = 0L;
+ static unsigned long ghbn_miss = 0L;
+ 
+-static struct hostent *GetHostByName(char *name)
+static struct hostent *GetHostByName(char *name, int domain)
+ {
+     struct hostent *ret;
+     int i, lowi = 0;
+@@ -585,13 +692,18 @@
+             lowi = i;
+         }
+         if (ghbn_cache[i].order > 0) {
+-            if (strncmp(name, ghbn_cache[i].name, 128) == 0)
+            if ((strncmp(name, ghbn_cache[i].name, 128) == 0) && (ghbn_cache[i].ent.h_addrtype == domain))
+                 break;
+         }
+     }
+     if (i == GHBN_NUM) {        /* no hit */
+         ghbn_miss++;
+-        ret = gethostbyname(name);
+        if (domain == AF_INET)
+    	    ret = gethostbyname(name);
+# if OPENSSL_USE_IPV6
+	else
+	    ret = gethostbyname2(name, AF_INET6);
+# endif
+         if (ret == NULL)
+             return (NULL);
+         /* else add to cache */
--- a/dev-libs/openssl-bad/files/openssl-1.0.2a-parallel-install-dirs.patch
+++ b/dev-libs/openssl-bad/files/openssl-1.0.2a-parallel-install-dirs.patch
@ -0,0 +1,64 @@
+https://rt.openssl.org/Ticket/Display.html?id=3736&user=guest&pass=guest
+
+From aba899f2eca21e11e5e9797bf8258e7265dea9f5 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sun, 8 Mar 2015 01:32:01 -0500
+Subject: [PATCH] fix parallel install with dir creation
+
+The mkdir-p.pl does not handle parallel creation of directories.
+This comes up when the install_sw and install_docs rules run and
+both call mkdir-p.pl on sibling directory trees.
+
+Instead, lets create a single install_dirs rule that makes all of
+the dirs we need, and have these two install steps depend on that.
+---
+ Makefile.org | 17 +++++++++--------
+ 1 file changed, 9 insertions(+), 8 deletions(-)
+
+diff --git a/Makefile.org b/Makefile.org
+index a6d9471..78e6143 100644
+--- a/Makefile.org
+++ b/Makefile.org
+@@ -536,9 +536,9 @@
+ dist_pem_h:
+ 	(cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
+ 
+-install: all install_docs install_sw
+install: install_docs install_sw
+ 
+-install_sw:
+install_dirs:
+ 	@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
+ 		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \
+ 		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines \
+@@ -547,6 +547,13 @@
+ 		$(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
+ 		$(INSTALL_PREFIX)$(OPENSSLDIR)/certs \
+ 		$(INSTALL_PREFIX)$(OPENSSLDIR)/private
+	@$(PERL) $(TOP)/util/mkdir-p.pl \
+		$(INSTALL_PREFIX)$(MANDIR)/man1 \
+		$(INSTALL_PREFIX)$(MANDIR)/man3 \
+		$(INSTALL_PREFIX)$(MANDIR)/man5 \
+		$(INSTALL_PREFIX)$(MANDIR)/man7
+
+install_sw: install_dirs
+ 	@set -e; headerlist="$(EXHEADER)"; for i in $$headerlist;\
+ 	do \
+ 	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
+@@ -636,12 +643,7 @@
+ 		done; \
+ 	done
+ 
+-install_docs:
+-	@$(PERL) $(TOP)/util/mkdir-p.pl \
+-		$(INSTALL_PREFIX)$(MANDIR)/man1 \
+-		$(INSTALL_PREFIX)$(MANDIR)/man3 \
+-		$(INSTALL_PREFIX)$(MANDIR)/man5 \
+-		$(INSTALL_PREFIX)$(MANDIR)/man7
+install_docs: install_dirs
+ 	@pod2man="`cd ./util; ./pod2mantest $(PERL)`"; \
+ 	here="`pwd`"; \
+ 	filecase=; \
+-- 
+2.3.4
+
--- a/dev-libs/openssl-bad/files/openssl-1.0.2a-parallel-obj-headers.patch
+++ b/dev-libs/openssl-bad/files/openssl-1.0.2a-parallel-obj-headers.patch
@ -0,0 +1,37 @@
+https://rt.openssl.org/Ticket/Display.html?id=3737&user=guest&pass=guest
+
+From ce279d4361e07e9af9ceca8a6e326e661758ad53 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sun, 8 Mar 2015 01:34:48 -0500
+Subject: [PATCH] fix parallel generation of obj headers
+
+The current code has dummy sleep/touch commands to try and work
+around the parallel issue, but that is obviously racy.  Instead
+lets force one of the files to depend on the other so we know
+they'll never run in parallel.
+---
+ crypto/objects/Makefile | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/crypto/objects/Makefile b/crypto/objects/Makefile
+index ad2db1e..7d32504 100644
+--- a/crypto/objects/Makefile
+++ b/crypto/objects/Makefile
+@@ -44,11 +44,11 @@
+ # objects.pl both reads and writes obj_mac.num
+ obj_mac.h: objects.pl objects.txt obj_mac.num
+ 	$(PERL) objects.pl objects.txt obj_mac.num obj_mac.h
+-	@sleep 1; touch obj_mac.h; sleep 1
+ 
+-obj_xref.h: objxref.pl obj_xref.txt obj_mac.num
+# This doesn't really need obj_mac.h, but since that rule reads & writes
+# obj_mac.num, we can't run in parallel with it.
+obj_xref.h: objxref.pl obj_xref.txt obj_mac.num obj_mac.h
+ 	$(PERL) objxref.pl obj_mac.num obj_xref.txt > obj_xref.h
+-	@sleep 1; touch obj_xref.h; sleep 1
+ 
+ files:
+ 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
+-- 
+2.3.4
+
--- a/dev-libs/openssl-bad/files/openssl-1.0.2a-parallel-symlinking.patch
+++ b/dev-libs/openssl-bad/files/openssl-1.0.2a-parallel-symlinking.patch
@ -0,0 +1,63 @@
+https://rt.openssl.org/Ticket/Display.html?id=3780&user=guest&pass=guest
+
+From cc81af135bda47eaa6956a0329cbbc55bf993ac1 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Fri, 3 Apr 2015 01:16:23 -0400
+Subject: [PATCH] fix race when symlink shareds libs
+
+When the crypto/ssl targets attempt to build their shared libs, they run:
+	cd ..; make libcrypto.so.1.0.0
+The top level Makefile in turn runs the build-shared target for that lib.
+
+The build-shared target depends on both do_$(SHLIB_TARGET) & link-shared.
+When building in parallel, make is allowed to run both of these.  They
+both run Makefile.shared for their respective targets:
+do_$(SHLIB_TARGET) ->
+	link_a.linux-shared ->
+	link_a.gnu ->
+	...; $(LINK_SO_A) ->
+	$(LINK_SO) ->
+	$(SYMLINK_SO)
+link-shared ->
+	symlink.linux-shared ->
+	symlink.gnu ->
+	...; $(SYMLINK_SO)
+
+The shell code for SYMLINK_SO attempts to do a [ -e lib ] check, but fails
+basic TOCTOU semantics.  Depending on the load, that means two processes
+will run the sequence:
+	rm -f libcrypto.so
+	ln -s libcrypto.so.1.0.0 libcrypto.so
+
+Which obviously fails:
+	ln: failed to create symbolic link 'libcrypto.so': File exists
+
+Since we know do_$(SHLIB_TARGET) will create the symlink for us, don't
+bother depending on link-shared at all in the top level Makefile when
+building things.
+
+Reported-by: Martin von Gagern <Martin.vGagern@gmx.net>
+URL: https://bugs.gentoo.org/545028
+---
+ Makefile.org | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile.org b/Makefile.org
+index 890bfe4..576c60e 100644
+--- a/Makefile.org
+++ b/Makefile.org
+@@ -350,7 +350,10 @@ link-shared:
+ 		libs="$$libs -l$$i"; \
+ 	done
+ 
+-build-shared: do_$(SHLIB_TARGET) link-shared
+# The link target in Makefile.shared will create the symlink for us, so no need
+# to call link-shared directly.  Doing so will cause races with two processes
+# trying to symlink the lib.
+build-shared: do_$(SHLIB_TARGET)
+ 
+ do_$(SHLIB_TARGET):
+ 	@ set -e; libs='-L. $(SHLIBDEPS)'; for i in $(SHLIBDIRS); do \
+-- 
+2.3.4
+
--- a/dev-libs/openssl-bad/files/openssl-1.0.2a-x32-asm.patch
+++ b/dev-libs/openssl-bad/files/openssl-1.0.2a-x32-asm.patch
@ -0,0 +1,43 @@
+https://rt.openssl.org/Ticket/Display.html?id=3759&user=guest&pass=guest
+
+From 6257d59b3a68d2feb9d64317a1c556dc3813ee61 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sat, 21 Mar 2015 06:01:25 -0400
+Subject: [PATCH] crypto: use bigint in x86-64 perl
+
+When building on x32 systems where the default type is 32bit, make sure
+we can transparently represent 64bit integers.  Otherwise we end up with
+build errors like:
+/usr/bin/perl asm/ghash-x86_64.pl elf > ghash-x86_64.s
+Integer overflow in hexadecimal number at asm/../../perlasm/x86_64-xlate.pl line 201, <> line 890.
+...
+ghash-x86_64.s: Assembler messages:
+ghash-x86_64.s:890: Error: junk '.15473355479995e+19' after expression
+
+We don't enable this globally as there are some cases where we'd get
+32bit values interpreted as unsigned when we need them as signed.
+
+Reported-by: Bertrand Jacquin <bertrand@jacquin.bzh>
+URL: https://bugs.gentoo.org/542618
+---
+ crypto/perlasm/x86_64-xlate.pl | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/crypto/perlasm/x86_64-xlate.pl b/crypto/perlasm/x86_64-xlate.pl
+index aae8288..0bf9774 100755
+--- a/crypto/perlasm/x86_64-xlate.pl
+++ b/crypto/perlasm/x86_64-xlate.pl
+@@ -195,6 +195,10 @@ my %globals;
+     sub out {
+     	my $self = shift;
+ 
+	# When building on x32 ABIs, the expanded hex value might be too
+	# big to fit into 32bits.  Enable transparent 64bit support here
+	# so we can safely print it out.
+	use bigint;
+ 	if ($gas) {
+ 	    # Solaris /usr/ccs/bin/as can't handle multiplications
+ 	    # in $self->{value}
+-- 
+2.3.3
+
--- a/dev-libs/openssl-bad/files/openssl-1.0.2i-parallel-build.patch
+++ b/dev-libs/openssl-bad/files/openssl-1.0.2i-parallel-build.patch
@ -0,0 +1,326 @@
+--- openssl-1.0.2i/crypto/Makefile
+++ openssl-1.0.2i/crypto/Makefile
+@@ -85,11 +85,11 @@
+ 	@if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
+ 
+ subdirs:
+-	@target=all; $(RECURSIVE_MAKE)
+	+@target=all; $(RECURSIVE_MAKE)
+ 
+ files:
+ 	$(PERL) $(TOP)/util/files.pl "CPUID_OBJ=$(CPUID_OBJ)" Makefile >> $(TOP)/MINFO
+-	@target=files; $(RECURSIVE_MAKE)
+	+@target=files; $(RECURSIVE_MAKE)
+ 
+ links:
+ 	@$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER)
+@@ -100,7 +100,7 @@
+ # lib: $(LIB): are splitted to avoid end-less loop
+ lib:	$(LIB)
+ 	@touch lib
+-$(LIB):	$(LIBOBJ)
+$(LIB):	$(LIBOBJ) | subdirs
+ 	$(AR) $(LIB) $(LIBOBJ)
+ 	test -z "$(FIPSLIBDIR)" || $(AR) $(LIB) $(FIPSLIBDIR)fipscanister.o
+ 	$(RANLIB) $(LIB) || echo Never mind.
+@@ -111,7 +111,7 @@
+ 	fi
+ 
+ libs:
+-	@target=lib; $(RECURSIVE_MAKE)
+	+@target=lib; $(RECURSIVE_MAKE)
+ 
+ install:
+ 	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
+@@ -120,7 +120,7 @@
+ 	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
+ 	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
+ 	done;
+-	@target=install; $(RECURSIVE_MAKE)
+	+@target=install; $(RECURSIVE_MAKE)
+ 
+ lint:
+ 	@target=lint; $(RECURSIVE_MAKE)
+--- openssl-1.0.2i/engines/Makefile
+++ openssl-1.0.2i/engines/Makefile
+@@ -72,7 +72,7 @@
+ 
+ all:	lib subdirs
+ 
+-lib:	$(LIBOBJ)
+lib:	$(LIBOBJ) | subdirs
+ 	@if [ -n "$(SHARED_LIBS)" ]; then \
+ 		set -e; \
+ 		for l in $(LIBNAMES); do \
+@@ -89,7 +89,7 @@
+ 
+ subdirs:
+ 	echo $(EDIRS)
+-	@target=all; $(RECURSIVE_MAKE)
+	+@target=all; $(RECURSIVE_MAKE)
+ 
+ files:
+ 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
+@@ -128,7 +128,7 @@
+ 			  mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \
+ 		done; \
+ 	fi
+-	@target=install; $(RECURSIVE_MAKE)
+	+@target=install; $(RECURSIVE_MAKE)
+ 
+ tags:
+ 	ctags $(SRC)
+--- openssl-1.0.2i/Makefile.org
+++ openssl-1.0.2i/Makefile.org
+@@ -281,17 +281,17 @@
+ build_libssl: build_ssl libssl.pc
+ 
+ build_crypto:
+-	@dir=crypto; target=all; $(BUILD_ONE_CMD)
+	+@dir=crypto; target=all; $(BUILD_ONE_CMD)
+ build_ssl: build_crypto
+-	@dir=ssl; target=all; $(BUILD_ONE_CMD)
+	+@dir=ssl; target=all; $(BUILD_ONE_CMD)
+ build_engines: build_crypto
+-	@dir=engines; target=all; $(BUILD_ONE_CMD)
+	+@dir=engines; target=all; $(BUILD_ONE_CMD)
+ build_apps: build_libs
+-	@dir=apps; target=all; $(BUILD_ONE_CMD)
+	+@dir=apps; target=all; $(BUILD_ONE_CMD)
+ build_tests: build_libs
+-	@dir=test; target=all; $(BUILD_ONE_CMD)
+	+@dir=test; target=all; $(BUILD_ONE_CMD)
+ build_tools: build_libs
+-	@dir=tools; target=all; $(BUILD_ONE_CMD)
+	+@dir=tools; target=all; $(BUILD_ONE_CMD)
+ 
+ all_testapps: build_libs build_testapps
+ build_testapps:
+@@ -547,7 +547,7 @@
+ 	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
+ 	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
+ 	done;
+-	@set -e; target=install; $(RECURSIVE_BUILD_CMD)
+	+@set -e; target=install; $(RECURSIVE_BUILD_CMD)
+ 	@set -e; liblist="$(LIBS)"; for i in $$liblist ;\
+ 	do \
+ 		if [ -f "$$i" ]; then \
+--- openssl-1.0.2i/Makefile.shared
+++ openssl-1.0.2i/Makefile.shared
+@@ -105,6 +105,7 @@
+     SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \
+     LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \
+     LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
+    [ -e $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX ] && exit 0; \
+     LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
+     $${SHAREDCMD} $${SHAREDFLAGS} \
+ 	-o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
+@@ -122,6 +123,7 @@
+ 			done; \
+ 		fi; \
+ 		if [ -n "$$SHLIB_SOVER" ]; then \
+			[ -e "$$SHLIB$$SHLIB_SUFFIX" ] || \
+ 			( $(SET_X); rm -f $$SHLIB$$SHLIB_SUFFIX; \
+ 			  ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \
+ 		fi; \
+--- openssl-1.0.2i/test/Makefile
+++ openssl-1.0.2i/test/Makefile
+@@ -144,7 +144,7 @@
+ tags:
+ 	ctags $(SRC)
+ 
+-tests:	exe apps $(TESTS)
+tests:	exe $(TESTS)
+ 
+ apps:
+ 	@(cd ..; $(MAKE) DIRS=apps all)
+@@ -435,136 +435,136 @@
+ 		link_app.$${shlib_target}
+ 
+ $(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO)
+-	@target=$(RSATEST); $(BUILD_CMD)
+	+@target=$(RSATEST); $(BUILD_CMD)
+ 
+ $(BNTEST)$(EXE_EXT): $(BNTEST).o $(DLIBCRYPTO)
+-	@target=$(BNTEST); $(BUILD_CMD)
+	+@target=$(BNTEST); $(BUILD_CMD)
+ 
+ $(ECTEST)$(EXE_EXT): $(ECTEST).o $(DLIBCRYPTO)
+-	@target=$(ECTEST); $(BUILD_CMD)
+	+@target=$(ECTEST); $(BUILD_CMD)
+ 
+ $(EXPTEST)$(EXE_EXT): $(EXPTEST).o $(DLIBCRYPTO)
+-	@target=$(EXPTEST); $(BUILD_CMD)
+	+@target=$(EXPTEST); $(BUILD_CMD)
+ 
+ $(IDEATEST)$(EXE_EXT): $(IDEATEST).o $(DLIBCRYPTO)
+-	@target=$(IDEATEST); $(BUILD_CMD)
+	+@target=$(IDEATEST); $(BUILD_CMD)
+ 
+ $(MD2TEST)$(EXE_EXT): $(MD2TEST).o $(DLIBCRYPTO)
+-	@target=$(MD2TEST); $(BUILD_CMD)
+	+@target=$(MD2TEST); $(BUILD_CMD)
+ 
+ $(SHATEST)$(EXE_EXT): $(SHATEST).o $(DLIBCRYPTO)
+-	@target=$(SHATEST); $(BUILD_CMD)
+	+@target=$(SHATEST); $(BUILD_CMD)
+ 
+ $(SHA1TEST)$(EXE_EXT): $(SHA1TEST).o $(DLIBCRYPTO)
+-	@target=$(SHA1TEST); $(BUILD_CMD)
+	+@target=$(SHA1TEST); $(BUILD_CMD)
+ 
+ $(SHA256TEST)$(EXE_EXT): $(SHA256TEST).o $(DLIBCRYPTO)
+-	@target=$(SHA256TEST); $(BUILD_CMD)
+	+@target=$(SHA256TEST); $(BUILD_CMD)
+ 
+ $(SHA512TEST)$(EXE_EXT): $(SHA512TEST).o $(DLIBCRYPTO)
+-	@target=$(SHA512TEST); $(BUILD_CMD)
+	+@target=$(SHA512TEST); $(BUILD_CMD)
+ 
+ $(RMDTEST)$(EXE_EXT): $(RMDTEST).o $(DLIBCRYPTO)
+-	@target=$(RMDTEST); $(BUILD_CMD)
+	+@target=$(RMDTEST); $(BUILD_CMD)
+ 
+ $(MDC2TEST)$(EXE_EXT): $(MDC2TEST).o $(DLIBCRYPTO)
+-	@target=$(MDC2TEST); $(BUILD_CMD)
+	+@target=$(MDC2TEST); $(BUILD_CMD)
+ 
+ $(MD4TEST)$(EXE_EXT): $(MD4TEST).o $(DLIBCRYPTO)
+-	@target=$(MD4TEST); $(BUILD_CMD)
+	+@target=$(MD4TEST); $(BUILD_CMD)
+ 
+ $(MD5TEST)$(EXE_EXT): $(MD5TEST).o $(DLIBCRYPTO)
+-	@target=$(MD5TEST); $(BUILD_CMD)
+	+@target=$(MD5TEST); $(BUILD_CMD)
+ 
+ $(HMACTEST)$(EXE_EXT): $(HMACTEST).o $(DLIBCRYPTO)
+-	@target=$(HMACTEST); $(BUILD_CMD)
+	+@target=$(HMACTEST); $(BUILD_CMD)
+ 
+ $(WPTEST)$(EXE_EXT): $(WPTEST).o $(DLIBCRYPTO)
+-	@target=$(WPTEST); $(BUILD_CMD)
+	+@target=$(WPTEST); $(BUILD_CMD)
+ 
+ $(RC2TEST)$(EXE_EXT): $(RC2TEST).o $(DLIBCRYPTO)
+-	@target=$(RC2TEST); $(BUILD_CMD)
+	+@target=$(RC2TEST); $(BUILD_CMD)
+ 
+ $(BFTEST)$(EXE_EXT): $(BFTEST).o $(DLIBCRYPTO)
+-	@target=$(BFTEST); $(BUILD_CMD)
+	+@target=$(BFTEST); $(BUILD_CMD)
+ 
+ $(CASTTEST)$(EXE_EXT): $(CASTTEST).o $(DLIBCRYPTO)
+-	@target=$(CASTTEST); $(BUILD_CMD)
+	+@target=$(CASTTEST); $(BUILD_CMD)
+ 
+ $(RC4TEST)$(EXE_EXT): $(RC4TEST).o $(DLIBCRYPTO)
+-	@target=$(RC4TEST); $(BUILD_CMD)
+	+@target=$(RC4TEST); $(BUILD_CMD)
+ 
+ $(RC5TEST)$(EXE_EXT): $(RC5TEST).o $(DLIBCRYPTO)
+-	@target=$(RC5TEST); $(BUILD_CMD)
+	+@target=$(RC5TEST); $(BUILD_CMD)
+ 
+ $(DESTEST)$(EXE_EXT): $(DESTEST).o $(DLIBCRYPTO)
+-	@target=$(DESTEST); $(BUILD_CMD)
+	+@target=$(DESTEST); $(BUILD_CMD)
+ 
+ $(RANDTEST)$(EXE_EXT): $(RANDTEST).o $(DLIBCRYPTO)
+-	@target=$(RANDTEST); $(BUILD_CMD)
+	+@target=$(RANDTEST); $(BUILD_CMD)
+ 
+ $(DHTEST)$(EXE_EXT): $(DHTEST).o $(DLIBCRYPTO)
+-	@target=$(DHTEST); $(BUILD_CMD)
+	+@target=$(DHTEST); $(BUILD_CMD)
+ 
+ $(DSATEST)$(EXE_EXT): $(DSATEST).o $(DLIBCRYPTO)
+-	@target=$(DSATEST); $(BUILD_CMD)
+	+@target=$(DSATEST); $(BUILD_CMD)
+ 
+ $(METHTEST)$(EXE_EXT): $(METHTEST).o $(DLIBCRYPTO)
+-	@target=$(METHTEST); $(BUILD_CMD)
+	+@target=$(METHTEST); $(BUILD_CMD)
+ 
+ $(SSLTEST)$(EXE_EXT): $(SSLTEST).o $(DLIBSSL) $(DLIBCRYPTO)
+-	@target=$(SSLTEST); $(FIPS_BUILD_CMD)
+	+@target=$(SSLTEST); $(FIPS_BUILD_CMD)
+ 
+ $(ENGINETEST)$(EXE_EXT): $(ENGINETEST).o $(DLIBCRYPTO)
+-	@target=$(ENGINETEST); $(BUILD_CMD)
+	+@target=$(ENGINETEST); $(BUILD_CMD)
+ 
+ $(EVPTEST)$(EXE_EXT): $(EVPTEST).o $(DLIBCRYPTO)
+-	@target=$(EVPTEST); $(BUILD_CMD)
+	+@target=$(EVPTEST); $(BUILD_CMD)
+ 
+ $(EVPEXTRATEST)$(EXE_EXT): $(EVPEXTRATEST).o $(DLIBCRYPTO)
+-	@target=$(EVPEXTRATEST); $(BUILD_CMD)
+	+@target=$(EVPEXTRATEST); $(BUILD_CMD)
+ 
+ $(ECDSATEST)$(EXE_EXT): $(ECDSATEST).o $(DLIBCRYPTO)
+-	@target=$(ECDSATEST); $(BUILD_CMD)
+	+@target=$(ECDSATEST); $(BUILD_CMD)
+ 
+ $(ECDHTEST)$(EXE_EXT): $(ECDHTEST).o $(DLIBCRYPTO)
+-	@target=$(ECDHTEST); $(BUILD_CMD)
+	+@target=$(ECDHTEST); $(BUILD_CMD)
+ 
+ $(IGETEST)$(EXE_EXT): $(IGETEST).o $(DLIBCRYPTO)
+-	@target=$(IGETEST); $(BUILD_CMD)
+	+@target=$(IGETEST); $(BUILD_CMD)
+ 
+ $(JPAKETEST)$(EXE_EXT): $(JPAKETEST).o $(DLIBCRYPTO)
+-	@target=$(JPAKETEST); $(BUILD_CMD)
+	+@target=$(JPAKETEST); $(BUILD_CMD)
+ 
+ $(ASN1TEST)$(EXE_EXT): $(ASN1TEST).o $(DLIBCRYPTO)
+-	@target=$(ASN1TEST); $(BUILD_CMD)
+	+@target=$(ASN1TEST); $(BUILD_CMD)
+ 
+ $(SRPTEST)$(EXE_EXT): $(SRPTEST).o $(DLIBCRYPTO)
+-	@target=$(SRPTEST); $(BUILD_CMD)
+	+@target=$(SRPTEST); $(BUILD_CMD)
+ 
+ $(V3NAMETEST)$(EXE_EXT): $(V3NAMETEST).o $(DLIBCRYPTO)
+-	@target=$(V3NAMETEST); $(BUILD_CMD)
+	+@target=$(V3NAMETEST); $(BUILD_CMD)
+ 
+ $(HEARTBEATTEST)$(EXE_EXT): $(HEARTBEATTEST).o $(DLIBCRYPTO)
+-	@target=$(HEARTBEATTEST); $(BUILD_CMD_STATIC)
+	+@target=$(HEARTBEATTEST); $(BUILD_CMD_STATIC)
+ 
+ $(CONSTTIMETEST)$(EXE_EXT): $(CONSTTIMETEST).o
+-	@target=$(CONSTTIMETEST) $(BUILD_CMD)
+	+@target=$(CONSTTIMETEST) $(BUILD_CMD)
+ 
+ $(VERIFYEXTRATEST)$(EXE_EXT): $(VERIFYEXTRATEST).o
+-	@target=$(VERIFYEXTRATEST) $(BUILD_CMD)
+	+@target=$(VERIFYEXTRATEST) $(BUILD_CMD)
+ 
+ $(CLIENTHELLOTEST)$(EXE_EXT): $(CLIENTHELLOTEST).o
+-	@target=$(CLIENTHELLOTEST) $(BUILD_CMD)
+	+@target=$(CLIENTHELLOTEST) $(BUILD_CMD)
+ 
+ $(BADDTLSTEST)$(EXE_EXT): $(BADDTLSTEST).o
+-	@target=$(BADDTLSTEST) $(BUILD_CMD)
+	+@target=$(BADDTLSTEST) $(BUILD_CMD)
+ 
+ $(SSLV2CONFTEST)$(EXE_EXT): $(SSLV2CONFTEST).o
+-	@target=$(SSLV2CONFTEST) $(BUILD_CMD)
+	+@target=$(SSLV2CONFTEST) $(BUILD_CMD)
+ 
+ $(DTLSTEST)$(EXE_EXT): $(DTLSTEST).o ssltestlib.o $(DLIBSSL) $(DLIBCRYPTO)
+-	@target=$(DTLSTEST); exobj=ssltestlib.o; $(BUILD_CMD)
+	+@target=$(DTLSTEST); exobj=ssltestlib.o; $(BUILD_CMD)
+ 
+ #$(AESTEST).o: $(AESTEST).c
+ #	$(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c
+@@ -577,7 +577,7 @@
+ #	fi
+ 
+ dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO)
+-	@target=dummytest; $(BUILD_CMD)
+	+@target=dummytest; $(BUILD_CMD)
+ 
+ # DO NOT DELETE THIS LINE -- make depend depends on it.
+ 
--- a/dev-libs/openssl-bad/metadata.xml
+++ b/dev-libs/openssl-bad/metadata.xml
@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
+<use>
+ <flag name="asm">Support assembly hand optimized crypto functions (i.e. faster run time)</flag>
+ <flag name="bindist">Disable EC algorithms (as they seem to be patented) -- note: changes the ABI</flag>
+ <flag name="rfc3779">Enable support for RFC 3779 (X.509 Extensions for IP Addresses and AS Identifiers)</flag>
+ <flag name="sslv2">Support for the old/insecure SSLv2 protocol -- note: not required for TLS/https</flag>
+ <flag name="sslv3">Support for the old/insecure SSLv3 protocol -- note: not required for TLS/https</flag>
+ <flag name="tls-heartbeat">Enable the Heartbeat Extension in TLS and DTLS</flag>
+</use>
+<upstream>
+ <remote-id type="cpe">cpe:/a:openssl:openssl</remote-id>
+</upstream>
+<slots>
+ <slot name="0">For building against. This is the only slot
+  that provides headers and command line tools.</slot>
+ <slot name="0.9.8">For binary compatibility, provides libcrypto.so.0.9.8
+  and libssl.so.0.9.8 only.</slot>
+ <subslots>Reflect ABI of libcrypto.so and libssl.so.</subslots>
+</slots>
+</pkgmetadata>
--- a/dev-libs/openssl-bad/openssl-bad-1.0.2_p20180915.ebuild
+++ b/dev-libs/openssl-bad/openssl-bad-1.0.2_p20180915.ebuild
@ -0,0 +1,219 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal
+# git-r3
+
+DESCRIPTION="Snapshot for testssl.sh >2.8 from PM's fork, ready to compile"
+HOMEPAGE="https://github.com/drwetter/openssl-1.0.2.bad"
+#EGIT_REPO_URI="https://github.com/drwetter/openssl.git"
+#https://github.com/drwetter/openssl-1.0.2.bad.git
+#EGIT_BRANCH="1.0.2-chacha"
+#EGIT_COMMIT="07c3c3b51a290337bf56605c6604c00d4a174a15"
+
+MY_COMMIT="07c3c3b51a290337bf56605c6604c00d4a174a15"
+SRC_URI="https://github.com/drwetter/openssl-1.0.2.bad/archive/${MY_COMMIT}.zip -> ${P}.zip"
+
+LICENSE="openssl"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 +sslv2 +sslv3 +static-libs test +tls-heartbeat vanilla zlib"
+RESTRICT="!bindist? ( bindist )"
+
+RDEPEND=">=app-misc/c_rehash-1.7-r1
+	gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
+	kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	>=dev-lang/perl-5
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		sys-devel/bc
+	)"
+PDEPEND="app-misc/ca-certificates"
+
+S="${WORKDIR}/openssl-1.0.2.bad-${MY_COMMIT}"
+
+MULTILIB_WRAPPED_HEADERS=(
+	usr/include/openssl/opensslconf.h
+)
+
+src_prepare() {
+	# keep this in sync with app-misc/c_rehash
+	SSL_CNF_DIR="/etc/ssl"
+
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile
+
+	if ! use vanilla ; then
+		epatch "${FILESDIR}"/openssl-1.0.0a-ldflags.patch #327421
+#		epatch "${FILESDIR}"/openssl-1.0.2i-parallel-build.patch
+		epatch "${FILESDIR}"/openssl-1.0.2a-parallel-obj-headers.patch
+		epatch "${FILESDIR}"/openssl-1.0.2a-parallel-install-dirs.patch
+		epatch "${FILESDIR}"/openssl-1.0.2a-parallel-symlinking.patch #545028
+#		epatch "${FILESDIR}"/openssl-1.0.2-ipv6.patch
+		epatch "${FILESDIR}"/openssl-1.0.2a-x32-asm.patch #542618
+		epatch "${FILESDIR}"/openssl-1.0.1p-default-source.patch #554338
+	fi
+
+	eapply_user
+
+	# disable fips in the build
+	# make sure the man pages are suffixed #302165
+	# don't bother building man pages if they're disabled
+	sed -i \
+		-e '/DIRS/s: fips : :g' \
+		-e '/^MANSUFFIX/s:=.*:=ssl:' \
+		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
+		-e $(has noman FEATURES \
+			&& echo '/^install:/s:install_docs::' \
+			|| echo '/^MANDIR=/s:=.*:='${EPREFIX%/}'/usr/share/man:') \
+		Makefile.org \
+		|| die
+	# show the actual commands in the log
+	sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
+
+	# since we're forcing $(CC) as makedep anyway, just fix
+	# the conditional as always-on
+	# helps clang (#417795), and versioned gcc (#499818)
+	# this breaks build with 1.0.2p, not sure if it is needed anymore
+	#sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || die
+
+	# quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (#417795 again)
+	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
+
+	# allow openssl to be cross-compiled
+	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
+	chmod a+rx gentoo.config || die
+
+	append-flags -fno-strict-aliasing
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
+
+	sed -i '1s,^:$,#!'${EPREFIX%/}'/usr/bin/perl,' Configure #141906
+	# The config script does stupid stuff to prompt the user.  Kill it.
+	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
+	./config --test-sanity || die "I AM NOT SANE"
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	unset APPS #197996
+	unset SCRIPTS #312551
+	unset CROSS_COMPILE #311473
+
+	tc-export CC AR RANLIB RC
+
+	# Clean out patent-or-otherwise-encumbered code
+	# Camellia: Royalty Free            https://en.wikipedia.org/wiki/Camellia_(cipher)
+	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
+	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
+	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
+	# RC5:      Expired                 https://en.wikipedia.org/wiki/RC5
+
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+	echoit() { echo "$@" ; "$@" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	# See if our toolchain supports __uint128_t.  If so, it's 64bit
+	# friendly and can use the nicely optimized code paths. #460790
+	local ec_nistp_64_gcc_128
+	# Disable it for now though #469976
+	#if ! use bindist ; then
+	#	echo "__uint128_t i;" > "${T}"/128.c
+	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
+	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
+	#	fi
+	#fi
+
+	# https://github.com/openssl/openssl/issues/2286
+#	if use ia64 ; then
+#		replace-flags -g3 -g2
+#		replace-flags -ggdb3 -ggdb2
+#	fi
+
+	local sslout=$(./gentoo.config)
+	einfo "Use configuration ${sslout:-(openssl knows best)}"
+	local config="Configure"
+	[[ -z ${sslout} ]] && config="config"
+
+	STDOPTIONS="--prefix=/usr/ --openssldir=/etc/ssl -DOPENSSL_USE_BUILD_DATE enable-zlib \
+	enable-ssl2 enable-ssl3 enable-ssl-trace enable-rc5 enable-rc2 \
+	enable-gost enable-cms enable-md2 enable-mdc2 enable-ec enable-ec2m enable-ecdh enable-ecdsa \
+	enable-seed enable-camellia enable-idea enable-rfc3779 experimental-jpake"
+
+	# Fedora hobbled-EC needs 'no-ec2m', 'no-srp'
+	echoit \
+	./${config} \
+		${sslout} \
+		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
+		enable-camellia \
+		enable-ec \
+		$(use_ssl !bindist ec2m) \
+		$(use_ssl !bindist srp) \
+		${ec_nistp_64_gcc_128} \
+		enable-idea \
+		enable-mdc2 \
+		enable-rc5 \
+		enable-tlsext \
+		enable-cast \
+		enable-ripemd \
+		$(use_ssl asm) \
+		$(use_ssl gmp gmp -lgmp) \
+		$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
+		$(use_ssl rfc3779) \
+		$(use_ssl sctp) \
+		$(use_ssl sslv2 ssl2) \
+		$(use_ssl sslv3 ssl3) \
+		$(use_ssl tls-heartbeat heartbeats) \
+		$(use_ssl zlib) \
+		--prefix="${EPREFIX%/}"/usr \
+		--openssldir="${EPREFIX%/}"${SSL_CNF_DIR} \
+		--libdir=$(get_libdir) \
+		-static threads $STDOPTIONS  \
+		|| die
+
+	# Clean out hardcoded flags that openssl uses
+	local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
+		-e 's:^CFLAG=::' \
+		-e 's:-fomit-frame-pointer ::g' \
+		-e 's:-O[0-9] ::g' \
+		-e 's:-march=[-a-z0-9]* ::g' \
+		-e 's:-mcpu=[-a-z0-9]* ::g' \
+		-e 's:-m[a-z0-9]* ::g' \
+	)
+	sed -i \
+		-e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \
+		-e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \
+		Makefile || die
+
+	einfo "config is completed ==========="
+	emake -j1 depend
+}
+
+multilib_src_compile() {
+	# depend is needed to use $confopts; it also doesn't matter
+	# that it's -j1 as the code itself serializes subdirs
+	emake -j1 V=1 depend
+	emake all
+	# rehash is needed to prep the certs/ dir; do this
+	# separately to avoid parallel build issues.
+	#emake rehash
+}
+
+multilib_src_test() {
+	emake -j1 test
+}
+
+multilib_src_install() {
+	newbin apps/openssl openssl-bad
+}
+
--- a/dev-python/gpapi/Manifest
+++ b/dev-python/gpapi/Manifest
@ -1,3 +1,3 @@
-DIST gpapi-0.3.2.tar.gz 81344 BLAKE2B f9c36f3777f9cb7b54a6585e90b9a4c536735f98fe3b2b5c7826db5d6dc34f964e6e841f1c18dcf43ebd9b87030ed5c9f7bab4a557f68b1f8707a9feb42ecfce SHA512 431bb08926913a676cb60b7dbf0d3ea44e9337e6da6c2e89116386f5dbd7f77166c646d04ad49a83c4e4707a31834251c37f1b28a2238195b86aaf0d59902fc8
 DIST gpapi-0.4.1.tar.gz 81302 BLAKE2B 06b2e4162ea77f61975f691a7e90629e7ec73b386b2532ba806f55b0b6eb599d1c7f9951adfd69d89c4c7d30193166eaea41402c583ada5107babc5159519f98 SHA512 5319478f9466a8d55d8d86a6814f18a06f14db109b9ac010e84af0405208a2047ecd3b4c490bcf0aeeedd376ec8b83e4225fc4dca264229e22bfdc043f74f1bf
 DIST gpapi-0.4.2.tar.gz 81865 BLAKE2B 48b6776fb88428ee79f07617c9927fd7771448611e1dad8e330b977ecfedbfd17d5ed29ab64cf64295689317ae906e7f86610c6441156a9b3fbd00ccc0a88c51 SHA512 809b7af601c8081a52f78b46dc87e03634c4c3d26749fbbc19cfcde0602c67bd97a20a52fe04f2a57e1a01f7db7a2d76afd4f6b7adf500b036de739d59ad5d82
+DIST gpapi-0.4.3.tar.gz 87367 BLAKE2B 0564de83a0d075a73f907fa720c8e53b96e4f632dce1cbc76433ed856a29b6f4dfc39990b3011301f6712498eb69a117d72448882c303e321f5ec2343f2ce907 SHA512 b629ba84b407b3e1e6cbcdafcafdee065c6318bdae1ff28780eb10e3bcdce1707f76dd4134402e3822e302004366bc022fc3dc617ef241fe23d56a49c0aeb157
--- a/dev-python/gpapi/gpapi-0.3.2-r1.ebuild
+++ b/dev-python/gpapi/gpapi-0.3.2-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -18,12 +18,6 @@ IUSE=""
 RDEPEND="dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/clint[${PYTHON_USEDEP}]
 	>=dev-python/protobuf-python-3.5.1[${PYTHON_USEDEP}]
-	|| ( dev-python/pycryptodome[${PYTHON_USEDEP}] dev-python/pycrypto[${PYTHON_USEDEP}] )"
+	dev-python/pycryptodome[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# disarm pycryptodome dep to allow || ( pycryptodome pycrypto )
-	sed -i -e "s|'pycryptodome',||" setup.py || die
-	distutils-r1_python_prepare_all
-}
--- a/dev-python/nassl/Manifest
+++ b/dev-python/nassl/Manifest
@ -3,8 +3,10 @@ DIST nassl-1.0.3.tar.gz 7295365 BLAKE2B f176b554563ab4aacc3c1c6c9b4e55951aa6bb19
 DIST nassl-1.1.0.tar.gz 8742631 BLAKE2B 773bcbee7464d9cda4cbcd228ab747fd3c460180e8a3b243313faf8ff2941e082e2590abe8a97eade08c92abfe12895dc9b2d0de04c067c92341776be7e78ed1 SHA512 cf2a9a6dc34e3b2a2b8b268e54bf902a454328f873e064d4a6c783c7e3e93e3083b5e15eb1819a50d591003b8dc0c9698d197b49790bb3e407f18eb6863a9ac2
 DIST nassl-1.1.3.tar.gz 1995462 BLAKE2B 706969ba9ef9e171c42d35e1a6fb81b4b0114763cd95aabc8f941758314d4233fa272fd3facf43a2604e82489be01d9bbfd4a1d76e7437fd9bec68bb8c8512e8 SHA512 4c31c2c626f7aa36b9e39a9b1772f94addf818b4d63aaa5fa7f4d3188fa72af7beec653ea3628c1ce42d062c09b67fe90ad2667bb08468cb4b1e4b2c85929f5c
 DIST nassl-2.1.0.tar.gz 207482 BLAKE2B fb7b8602c5537110ca888dc77ef1037458c5b3b6dccf2104aae82893ee1d27030a9488f60251c623902e4dfa6c92cd5123a8becafab01f87470d19cdfe681d10 SHA512 aa3cc1d7201c25b530180f2c74a3f204c55f68e1392ff38599494bdc38d073c4b2dea01a9193853c1310064965ef9c55e6a08ce5b49f43ecdc0282b876f8aa46
+DIST nassl-2.1.1.tar.gz 207146 BLAKE2B 25a94488129cb85ec1067890ca83638955f08e2755e23fece8a0de60453a06b96b198e86d772b5685c744a042f1e4cf17f3c1871f413377420f28c464eae54dc SHA512 77c5487f43e7128fce3c1143f61977497014cb770276b792aececd212844cc3f7adac1a640fea48d409033e6328435f9936d2a9df69804b1be1088297e324ba5
 DIST openssl-1.0.2e.tar.gz 5256555 BLAKE2B ef501f5e86857b1bb0ff0a28468bdff07010bc76801d15851adf7ca28e174d552f580b04a02d068a9e4f0d3da51abdf8ddeb9f37dd31e1445720bb9ed73c6bc1 SHA512 b73f114a117ccab284cf5891dac050e3016d28e0b1fc71639442cdb42accef676115af90a12deff4bcc1f599cc0cbdeb38142cbf4570bd7d03634786ad32c95f
 DIST openssl-1f5878b8e25a785dde330bf485e6ed5a6ae09a1a.zip 18391488 BLAKE2B 999c74b137207b6a5c2696625c0c20477cf875a0ab4f840f47fb024846afd911dd7d2ff0601235b330ea3708218e4e787af91b6b7c9ac74f5c0bb58c61e655c3 SHA512 1fb593167358b0eaddf09d82f4ba6e1e0836813d13296b41b47d7f7fe71a7fe8326639ac91050cba69c77b6f268b83a98beea272ff2da0aaf0d092a8539f2978
 DIST openssl-OpenSSL_1_0_2e.zip 7242974 BLAKE2B c3e2a67d60067416627d0b61e4ee465488f329e1e9730ffe9980cc075caf583021ed3439d4fc1a504e039504f4b828b144a6673155171cb088ccc80fb8b8f222 SHA512 96ec9e8eff65387238ca523b7e5b3d330098a446af86ec1772e24eda99e63ef28364b5fa32e89f4dad2a38f07da9dd2a53f93eacf8040f94e93f03297f4a0508
 DIST openssl-OpenSSL_1_1_1-pre9.zip 19726750 BLAKE2B 63ddf944d4e58b4d1b7efb971f67de3b5daacb09a553082e5f21cceb908db99168c4d42471c0583bba1348037ddb6e103d12cbbaa7d685b8fda71e0991062b56 SHA512 fa05d51adadff802aceeff6f348f913eab631b630ef69f3da6dffaf76be6e01323911ae241b1a3f88519917f017acdb033425bbf1864168cb0c58dd3b46a0c44
+DIST openssl-OpenSSL_1_1_1.zip 17160238 BLAKE2B 9ff0510c112e9054a683896ec493e5fb76a88d281a28c0ef577ec722f8ba05129e00e62ca82e72d750785c2bd2ebf0365d977b417f6cecf9d3de12e75631f2d6 SHA512 9db4bf391739f4e835bcfda10533d49a7231508faf25d88d880dfadc98ffd3b503d58879368ff17bed33d7775c1f0eb6991aa71d6888f50c5ad65b2d221be18e
 DIST zlib-1.2.11.tar.gz 607698 BLAKE2B 6bfc4bca5dcadba8a0d4121a2b3ed0bfe440c261003521862c8e6381f1a6f0a72d3fc037351d30afd7ef321e8e8d2ec817c046ac749f2ca0c97fbdc2f7e840b7 SHA512 73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae
--- a/dev-python/nassl/files/ceeeda49b280648d76b0928e97cbcb1e398cb392.patch
+++ b/dev-python/nassl/files/ceeeda49b280648d76b0928e97cbcb1e398cb392.patch
@ -0,0 +1,73 @@
+From ceeeda49b280648d76b0928e97cbcb1e398cb392 Mon Sep 17 00:00:00 2001
+From: Alban Diquet <nabla.c0d3@gmail.com>
+Date: Sat, 22 Sep 2018 21:14:51 -0700
+Subject: [PATCH] Add a --do-not-clean build command; fixes #42
+
+---
+ build_tasks.py | 31 ++++++++++++++++++-------------
+ 1 file changed, 18 insertions(+), 13 deletions(-)
+
+diff --git a/build_tasks.py b/build_tasks.py
+index 2bc0836..91bcf9b 100644
+--- a/build_tasks.py
+++ b/build_tasks.py
+@@ -342,34 +342,36 @@ def include_path(self) -> Path:
+         return self.src_path
+ 
+ 
+-
+ @task
+-def build_zlib(ctx):
+def build_zlib(ctx, do_not_clean=False):
+     print('ZLIB: Starting...')
+     zlib_cfg = ZlibBuildConfig(CURRENT_PLATFORM)
+-    zlib_cfg.clean()
+-    zlib_cfg.fetch_source()
+    if do_not_clean:
+        zlib_cfg.clean()
+        zlib_cfg.fetch_source()
+     zlib_cfg.build(ctx)
+     print('ZLIB: All done')
+ 
+ 
+ @task
+-def build_legacy_openssl(ctx):
+def build_legacy_openssl(ctx, do_not_clean=False):
+     print('OPENSSL LEGACY: Starting...')
+     ssl_legacy_cfg = LegacyOpenSslBuildConfig(CURRENT_PLATFORM)
+-    ssl_legacy_cfg.clean()
+-    ssl_legacy_cfg.fetch_source()
+    if do_not_clean:
+        ssl_legacy_cfg.clean()
+        ssl_legacy_cfg.fetch_source()
+     zlib_cfg = ZlibBuildConfig(CURRENT_PLATFORM)
+     ssl_legacy_cfg.build(ctx, zlib_lib_path=zlib_cfg.libz_path, zlib_include_path=zlib_cfg.include_path)
+     print('OPENSSL LEGACY: All done')
+ 
+ 
+ @task
+-def build_modern_openssl(ctx):
+def build_modern_openssl(ctx, do_not_clean=False):
+     print('OPENSSL MODERN: Starting...')
+     ssl_modern_cfg = ModernOpenSslBuildConfig(CURRENT_PLATFORM)
+-    ssl_modern_cfg.clean()
+-    ssl_modern_cfg.fetch_source()
+    if do_not_clean:
+        ssl_modern_cfg.clean()
+        ssl_modern_cfg.fetch_source()
+     zlib_cfg = ZlibBuildConfig(CURRENT_PLATFORM)
+     ssl_modern_cfg.build(ctx, zlib_lib_path=zlib_cfg.libz_path, zlib_include_path=zlib_cfg.include_path)
+     print('OPENSSL MODERN: All done')
+@@ -391,6 +393,9 @@ def build_nassl(ctx):
+     ctx.run(f'python setup.py build_ext -i {extra_args}')
+ 
+ 
+-@task(pre=[build_zlib, build_legacy_openssl, build_modern_openssl, build_nassl])
+-def build_all(ctx):
+-    pass
+@task
+def build_all(ctx, do_not_clean=False):
+    build_zlib(ctx, do_not_clean)
+    build_legacy_openssl(ctx, do_not_clean)
+    build_modern_openssl(ctx, do_not_clean)
+    build_nassl(ctx)
--- a/dev-python/nassl/nassl-2.1.0-r1.ebuild
+++ b/dev-python/nassl/nassl-2.1.0-r1.ebuild
@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6} )
+inherit eutils distutils-r1 flag-o-matic
+
+#something to investigate in https://github.com/nabla-c0d3/sslyze/issues/101
+#can system packages be used?
+MY_OPENSSL_MODERN="OpenSSL_1_1_1-pre9"
+MY_OPENSSL_LEGACY="OpenSSL_1_0_2e"
+MY_ZLIB="zlib-1.2.11"
+
+DESCRIPTION="Experimental Python wrapper for OpenSSL"
+HOMEPAGE="https://github.com/nabla-c0d3/nassl"
+SRC_URI="https://github.com/nabla-c0d3/nassl/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/openssl/openssl/archive/${MY_OPENSSL_LEGACY}.zip -> openssl-${MY_OPENSSL_LEGACY}.zip
+	https://github.com/openssl/openssl/archive/${MY_OPENSSL_MODERN}.zip -> openssl-${MY_OPENSSL_MODERN}.zip
+	http://zlib.net/${MY_ZLIB}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="virtual/python-typing[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	dev-python/invoke[${PYTHON_USEDEP}]"
+#test? pytest
+#mypy
+#flake8
+
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+src_prepare(){
+	epatch "${FILESDIR}/ceeeda49b280648d76b0928e97cbcb1e398cb392.patch"
+	mkdir deps
+	ln -s "${WORKDIR}/openssl-${MY_OPENSSL_LEGACY}" "${S}/deps"
+	ln -s "${WORKDIR}/openssl-${MY_OPENSSL_MODERN}" "${S}/deps"
+	ln -s "${WORKDIR}/${MY_ZLIB}" "${S}/deps"
+
+	#https://github.com/nabla-c0d3/nassl/issues/42
+	python3 /usr/bin/invoke build.zlib --do-not-clean
+	python3 /usr/bin/invoke build.legacy-openssl --do-not-clean
+	python3 /usr/bin/invoke build.modern-openssl --do-not-clean
+
+	eapply_user
+}
--- a/dev-python/nassl/nassl-2.1.1.ebuild
+++ b/dev-python/nassl/nassl-2.1.1.ebuild
@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6} )
+inherit eutils distutils-r1 flag-o-matic
+
+#something to investigate in https://github.com/nabla-c0d3/sslyze/issues/101
+#can system packages be used?
+MY_OPENSSL_MODERN="OpenSSL_1_1_1"
+MY_OPENSSL_LEGACY="OpenSSL_1_0_2e"
+MY_ZLIB="zlib-1.2.11"
+
+DESCRIPTION="Experimental Python wrapper for OpenSSL"
+HOMEPAGE="https://github.com/nabla-c0d3/nassl"
+SRC_URI="https://github.com/nabla-c0d3/nassl/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/openssl/openssl/archive/${MY_OPENSSL_LEGACY}.zip -> openssl-${MY_OPENSSL_LEGACY}.zip
+	https://github.com/openssl/openssl/archive/${MY_OPENSSL_MODERN}.zip -> openssl-${MY_OPENSSL_MODERN}.zip
+	http://zlib.net/${MY_ZLIB}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="virtual/python-typing[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	dev-python/invoke[${PYTHON_USEDEP}]"
+#test? pytest
+#mypy
+#flake8
+
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+src_prepare(){
+	mkdir deps
+	ln -s "${WORKDIR}/openssl-${MY_OPENSSL_LEGACY}" "${S}/deps"
+	ln -s "${WORKDIR}/openssl-${MY_OPENSSL_MODERN}" "${S}/deps"
+	ln -s "${WORKDIR}/${MY_ZLIB}" "${S}/deps"
+
+	#https://github.com/nabla-c0d3/nassl/issues/42
+	python3 /usr/bin/invoke build.zlib --do-not-clean
+	python3 /usr/bin/invoke build.legacy-openssl --do-not-clean
+	python3 /usr/bin/invoke build.modern-openssl --do-not-clean
+
+	eapply_user
+}
--- a/dev-ruby/cms_scanner/Manifest
+++ b/dev-ruby/cms_scanner/Manifest
@ -0,0 +1 @@
+DIST cms_scanner-0.0.40.1.gem 30208 BLAKE2B 7d03f5e94193f2678e9d46377483d4c0cd568dcc7e16fc61a0afe3025b04e85d30b2894edb107227403381b9c6654a5e5c3f386104b2ecad00c691cc767402ed SHA512 5cb7332119878c9d860553dedffe50cb009eb3637fd9fb43190172ac8ff60933ad106ddc1383e2457845774bc900485fd197c45c0654662e2666b4b721dbb7f9
--- a/dev-ruby/cms_scanner/cms_scanner-0.0.40.1.ebuild
+++ b/dev-ruby/cms_scanner/cms_scanner-0.0.40.1.ebuild
@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24"
+#RUBY_FAKEGEM_GEMSPEC="cms_scanner.gemspec"
+RUBY_FAKEGEM_EXTRAINSTALL="app"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Framework to provide an easy way to implement CMS Scanners"
+HOMEPAGE="https://github.com/wpscanteam/CMSScanner"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+ruby_add_rdepend "dev-ruby/activesupport:5.2
+	>=dev-ruby/addressable-2.5.0
+	>=dev-ruby/nokogiri-1.8.0
+	=dev-ruby/opt_parse_validator-0.0.16*
+	>=dev-ruby/public_suffix-3.0.0
+	>=dev-ruby/ruby-progressbar-1.10.0
+	dev-ruby/typhoeus:1
+	=dev-ruby/xmlrpc-0.3*
+	>=dev-ruby/yajl-ruby-1.4.1"
--- a/dev-ruby/opt_parse_validator/Manifest
+++ b/dev-ruby/opt_parse_validator/Manifest
@ -0,0 +1,2 @@
+DIST opt_parse_validator-0.0.16.2.gem 14336 BLAKE2B 606edf2c5cf1d6873f70010c58824721294b077b7a95e778f25a57fe732f5ee75222e8a44d6b43274b2ace14095f1a9034c51410462db6354f57e246276d61b1 SHA512 7ebce88bf39a9495a97826f5ee9f69a18b58d1d1ad70ae9f67aa8f23ba56ed2a4b97690d1fcc3366050771df35937fc703eae19d3e1ee57b9a50a061b58335db
+DIST opt_parse_validator-0.0.16.3.gem 11776 BLAKE2B 638bcbfffb1e74d72110dd91984dc593f72ac83371954b0b48f1378ad0a3e9ca32122ab4a1a8474072393aa05631a280d28b3a75faa88bb3b0bc72d6c2a7aa0b SHA512 064f33066a4bd0cddc7591e4475ed37fa951c0d4416ce27bc71920586f4a8a5b2d763f834bcbfa206a98ddacd383b926eb28a761ba79c2a1e5a7fa54adca9799
--- a/dev-ruby/opt_parse_validator/opt_parse_validator-0.0.16.2.ebuild
+++ b/dev-ruby/opt_parse_validator/opt_parse_validator-0.0.16.2.ebuild
@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24"
+
+inherit ruby-fakegem
+
+DESCRIPTION="OptionParser lib in ruby"
+HOMEPAGE="https://rubygems.org/gems/opt_parse_validator"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+
+ruby_add_rdepend ">=dev-ruby/activesupport-5.2.1:*
+	>=dev-ruby/addressable-2.5.0"
--- a/dev-ruby/opt_parse_validator/opt_parse_validator-0.0.16.3.ebuild
+++ b/dev-ruby/opt_parse_validator/opt_parse_validator-0.0.16.3.ebuild
@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24"
+
+inherit ruby-fakegem
+
+DESCRIPTION="OptionParser lib in ruby"
+HOMEPAGE="https://rubygems.org/gems/opt_parse_validator"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+
+ruby_add_rdepend ">=dev-ruby/activesupport-5.2.1:*
+	>=dev-ruby/addressable-2.5.0"
--- a/net-analyzer/amass/Manifest
+++ b/net-analyzer/amass/Manifest
@ -2,6 +2,7 @@ DIST amass-1.5.0.tar.gz 3472692 BLAKE2B e955ed4e529b46913d9791b6233569df9554bd4b
 DIST amass-1.5.2.tar.gz 3495059 BLAKE2B 52448fe0129ad63968c996d621e2e062fc34c2c5f87108d28a9c6a00c41f90ead179cea6e3a57b80d637ad5fd94d80c1cc40322efa2900e22243c7638c6de877 SHA512 3804b41886a971545b36070572a0915a10b17b46a001e83fa557a407b734ee3c93eb29c2059dbb521c221900cd7beb1b61a8511df25e2a571212acd5db1b0d46
 DIST amass-2.3.0.tar.gz 5142341 BLAKE2B ebc7ee95e2b2a1cb537cd555c248a85704031fc8a89654fa3b11c20670cc148ac1991d8620383c96a4925c95708a911a64bad56206b87abccb2377695962fad7 SHA512 e4e65b8947d91dc724b59a93c21f45aed4e77701ff563fbee8813831af37e661d996fd6254552f4510ffd0347971edf09adf6dbb7064586cbd81c79942ca2a40
 DIST amass-2.6.0.tar.gz 5163495 BLAKE2B 96b350104a5b462e1ae5d5f4781194297bcbb0ca23a44e9f1b361656f5f118ae051677c8fc51c4bddda419a6103a7e1d5e93164513dbd9db600f22cd194529a4 SHA512 a0f9b1d658a4e804de09628c377a8ad583da019985f1cba6522a8a8313734f77dfb813ae73bb850706dd4cdf669678a32a00c17320e0cb748b58f81ca03f678d
+DIST amass-2.7.0.tar.gz 6518610 BLAKE2B 2af254c4148d863b7330b550840383653098df97600c777e72c893dd790555643850f3ca2fdad20baaa35e4f9c24eb820ddc9deb61ca54bf7bce2c0682be3f72 SHA512 3b016a8681fba0eb1d0b68ba98710f3d42e070495947ef7e54ee9a4f4d198f4a22181496b3ac1925419e59d65e675802b7ee2384d739002cc074095c4d410f22
 DIST github.com-PuerkitoBio-gocrawl-3c6275ae0143e4fa9ee522c2d4008d983a2fefaf.tar.gz 37239 BLAKE2B cee02f1799b56e51d22e17563a2c3e10cf64d019440ebb407336dc5f37750d7e258fa242fcc25771733fc6b7f3cd73ceb1b0bd12e09f4aafe682af91da37b588 SHA512 62f5db5f06ccbe33248547e1183be5ce6c20cf6c75ac3f5ebaf92454f99991be04fd69729f9f503610ca511ff606b8dd78794dea542397858c13d3ba17aac008
 DIST github.com-PuerkitoBio-goquery-61aa1975b1f7856927c526b0e0cd8c8b3a3030d0.tar.gz 100075 BLAKE2B 6df0c48651e64c573df817abc934111f6fa907308683e682b7501009a7f2ab3d10df68f6b21ba5af2e41375b4b580678b36cc8c4a5e608165be390def55514fc SHA512 fa540ad5384c3c5777ea51ec58edf4559660238a9122c4684f9fb1c055bca481010596725f3f254d2aea9da5a2db38755295d235a99781b0ad8a860e603cc590
 DIST github.com-PuerkitoBio-purell-975f53781597ed779763b7b65566e74c4004d8de.tar.gz 11700 BLAKE2B 7c02c83d66e1e853ace6d40b88475dfc47ddaef4bfca6381cd957e96646e8e6df0436f524755ea76c4caf5d33a2efd5cc76a8992098c87952ef667cb0189cda0 SHA512 d363a780b7d927c0686daebc53ba8120b7cfad9d79a621a870f70b73d932d5b7529e434f9ad83d2a5466ae1eb52d3f207e2b65e4a3fd5833948bfe4c6a83763c
--- a/net-analyzer/amass/amass-2.6.0.ebuild
+++ b/net-analyzer/amass/amass-2.6.0.ebuild
@ -68,7 +68,6 @@ DEPEND=">=dev-lang/go-1.10
 "
 RDEPEND="${DEPEND}"

-
 src_compile() {
 	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \
 	go install -v -work -x ${EGO_BUILD_FLAGS} ./...
--- a/net-analyzer/amass/amass-2.7.0.ebuild
+++ b/net-analyzer/amass/amass-2.7.0.ebuild
@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_VENDOR=(
+	"github.com/asaskevich/EventBus d46933a94f05c6657d7b923fcf5ac563ee37ec79"
+	"github.com/johnnadratowski/golang-neo4j-bolt-driver 1108d6e66ccf2c8e68ab26b5f64e6c0a2ad00899"
+	"github.com/irfansharif/cfilter d07d951ff29d52840ca5e798a17e80db4de8c820"
+
+	"github.com/miekg/dns b0dc93d2760ef438612a252a9e448d054d28b625"
+	"github.com/fatih/color 2d684516a8861da43017284349b7e303e809ac21"
+
+	"golang.org/x/sync 1d60e4601c6fd243af51cc01ddf169918a5407ca github.com/golang/sync"
+	"github.com/sensepost/maltegolocal 6d52c19f6de471736b63485a39cfe08d4a4ce253"
+)
+
+EGO_PN=github.com/OWASP/Amass
+
+inherit golang-vcs-snapshot
+
+EGIT_COMMIT="${PV}"
+ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz ${EGO_VENDOR_URI}"
+SRC_URI="${ARCHIVE_URI} ${EGO_VENDOR_URI}"
+
+DESCRIPTION="Subdomain OSINT Enumeration"
+HOMEPAGE="https://github.com/caffix/amass"
+LICENSE="GPL-3"
+SLOT=0
+IUSE=""
+KEYWORDS="~amd64 ~arm ~arm64"
+
+#extraced from go.mod
+DEPEND=">=dev-lang/go-1.10
+	dev-go/fetchbot
+	dev-go/goquery
+	dev-go/cascadia
+	dev-go/robotstxt-go
+	dev-go/go-crypto
+	dev-go/go-net
+	dev-go/go-sys
+	dev-go/go-text
+	dev-go/go-tools
+"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \
+	go install -v -work -x ${EGO_BUILD_FLAGS} ./...
+}
+
+src_install(){
+	dobin bin/amass
+}
--- a/net-analyzer/bettercap/Manifest
+++ b/net-analyzer/bettercap/Manifest
@ -1,34 +1,25 @@
 DIST bettercap-1.6.2.tar.gz 781103 BLAKE2B 08dd1a94c2967f023ed98e9b62e82d01dea8a57eff8ad0dd2588d7e6b1f12e257e195459c2c0274baeb41fbeb04c9fd0af238d3b96dca273296087f3b34d9447 SHA512 b1398cb74ae8c04ede38ef3e01ab538693e86c85316327525b2cd30df5c8c4b389bf616c2a1096836dd69209aa7fea500a08ebfae5445c64d9b5b5e1bacdf485
-DIST bettercap-2.6.tar.gz 2067076 BLAKE2B 98e625598640d91b1f8e5d8abe4f12f5d16e985d9f09b341d0a1b2cf6ddb50e3fa3cd51772ecc1c2f57541f4595e2a5d351534b49290dc3fd69f18e8b6db84a6 SHA512 cf58c457fd342a33497ffedcc0a9a4b0b337ca3a9fdaaf81530142835c78376a9a3c01a5326f3d7933d3b0b4b8d128c0b2c8d8397c907d78cd250e8fb9ffaacf
-DIST bettercap-2.7.tar.gz 2072828 BLAKE2B b27da4ffedabbca47fd1c64f624c8aa8f06a30d1d610e22d572c0c0b9160309508f3533fa12e91910fe480fbb376c11f14d4b50e90ede4334fdb81c8b4ab4bad SHA512 9ac9ff08d9d24fa339fcf981d70945daf51b743a05f0f30d9153bfd756bdd9cdc1ebed221d6898740dfa57fb46d1b4d22d22cf942ea9737dbc2f5fafbb04713e
-DIST bettercap-2.8.tar.gz 2075511 BLAKE2B 01d2159f2aa2133b315c99edeb9bf41c11383837a6cab29ec7472724aca7c895008a5cd3846e7106d07ef32910bd6d4fd92a82ad80ae0b0a33e55fd6500d96de SHA512 f23f42d06e938d615d3d7033cdabdeeb571c606dd24ae8a412262b34871980d7e0bb3a13d9836668f7667a9d7fac1cfb27e0bb8b5bcf94854e9353991f748325
+DIST bettercap-2.10.tar.gz 2786115 BLAKE2B 36b32b3a5071c6238c3f3e66730bea4f945b78f94af14aac7949a0b5e7c30f48133a53dbcb4dcdc2ddb5eef0420cfbce01caf12d4193e7947472bc536d9696a9 SHA512 ff431277e6478509ee9424affc924044835942fd3ba7cfb85967b48d91b69829b2a0db5008898794fd3f20e1968ae896048d75bdc70d52cc46dde1df6d3997d2
 DIST bettercap-2.9.tar.gz 2556132 BLAKE2B cb62a62d780924e56974d2d04cd680ee8b68320087dce52d5e316b059ac7a3c72c246feb9c77ba3618e9dad34acb36708b873c3c01f24a785edbd9ca6261336e SHA512 941364206df97647ab543cdd6adea2162ff15c16af908421c32b91585ae60f2cec7e3b54bfe3f150bfcc48ff2c1f17b0525be519078f8713fda960328b370a6d
 DIST github.com-adrianmo-go-nmea-22095aa1b48050243d3eb9a001ca80eb91a0c6fa.tar.gz 14236 BLAKE2B 98716c9209b105da7062a91d89cd80bb530708d3c2422f9fbc246b594edfebc117ebb89417e60dbeb702a7c463e636fb347104e4b2392c90079f7cbbccad3b06 SHA512 c85e8680641a48a75705e602e8724a766073dfc9153d5a5f796d77ed839dbc921c2b62cb6b50b27d0068a0e4a38c36c9d89943c05766352f18e3de24a1acfaf2
-DIST github.com-bettercap-gatt-6475b946a0bff32e906c25d861f2b1c6d2056baa.tar.gz 67057 BLAKE2B 2e780572589d84c20076707583fb756ab48db27170ee28e86583adefe71be26c7cb63f55d37f8d32e6705b196df17aed82eec81ee39ac00bd0010839df84819c SHA512 91fd2db5a9e7324d5e651650963a58f7a72c198d6c787221ebe3b7fad3d2be0023a366db976eba198fe7be8a000781b688f6eedf2c8ebea81f7c747039ef9a5c
 DIST github.com-bettercap-gatt-66e7446993acb3de936b3f487e5933522ed16923.tar.gz 67087 BLAKE2B 28cd9ce3fa9bb1cda7d91d0bd0b263e03dd93997638a39395ead0656a44c965eba60fe8fe828fef374a576e9c99e353dd6cd0b184b7fafbf61821a0440a887dd SHA512 b54cc90904dda8d88fdaa8f2618e62da2d7c24c8e280875decc052d17a07e29fa282238f729956619762cf142b426228ebc75076ca6f5b3e9151d55b0bad08f8
 DIST github.com-bettercap-readline-62c6fe6193755f722b8b8788aa7357be55a50ff1.tar.gz 34295 BLAKE2B e15c5103aa39a1a0f77bef9050288938543d57c87dc564f52a68341e391ea57fbe63f36db8cfd249aa21fa4df4f2e7b1d754ca46419205e478126a5f5f9d6f22 SHA512 88bf088b908d4d75f6450445665ec0d0cd2fd73c0ed05fa993dc590844975aa00bec8154d2d5e9f6644ba5049c92f3e5db5394d47037bb107d22575bb2ee90d2
 DIST github.com-chifflier-nfqueue-go-61ca646babef3bd4dea1deb610bfb0005c0a1298.tar.gz 12577 BLAKE2B 1edeb5c5707b3b036ddacc6e5e53c0cd4c116e4415fe0cec7acae3806a9ee2f23560ff9eaf82e6f86c788824bfb2c2769442f89fc5543864ce65692f5a6fb238 SHA512 4c1fec4a20332bb6a9f2ffa588941a7f08a716388934e052ce611309f476ebe7aba3acbdaa4dd7821343ebec35f1b5268ede1d9618abb0b5b17f838b7fc11903
 DIST github.com-dustin-go-humanize-02af3965c54e8cacf948b97fef38925c4120652c.tar.gz 17226 BLAKE2B d7906961a4a10c60475f287a987732b74cf30430aaa9ebedac9868476411a5c117e4e3d77bad62c5470e9f8d168edd6b28bf44377c65e0f50e955865ad63414c SHA512 78793b927f7a051799685c1cb431b7dda244b608f90a8817ca778cb14fa029d0e050dd9cf67126baab98d0147289451d02bf781c76367cbc3edca525e6e6fe49
-DIST github.com-dustin-go-humanize-bb3d318650d48840a39aa21a027c6630e198e626.tar.gz 16387 BLAKE2B 97bd0dfbf673a54d1a068f6c33218c7037b191b709e820816f2774ac8cbddab15eeda3186162e4fdd41916db069e2628a8007b77377382110863e23fb2da797d SHA512 e500d21e739682d4dd0c3d52eaa77fd239606dd5c22005a7ca3c30ecbcd0bc545d2473e8942d04f292f47777d67d4381754121f72cf6547610b96938e6ddbb79
 DIST github.com-elazarl-goproxy-a96fa3a318260eab29abaf32f7128c9eb07fb073.tar.gz 99467 BLAKE2B 8ef1eb8fec0d0277daa81b241151a4a06cc8a85620b85fd91c11005141798e8704bdea202638440f9a6a2a5d3f308a523ef244c7e0361e537c5652c15ef0ed08 SHA512 3696bff442c4c73c955003aecf6a2f18dac8cc2ceab7bb3c0d47816770369493b2a6e27af117ad717a755ca3a33ebe084fd04a85702c219dfeb8063036a6fe7a
 DIST github.com-go-sourcemap-sourcemap-6e83acea0053641eff084973fee085f0c193c61a.tar.gz 5360 BLAKE2B f4101b07a6d405a5b01adb0029b52b7f6cae1122df201909a1201885a2e7f5439cd6f634325e205dd3eb5c4cba1e159b8c4021233d396a1c5664bc0db513f472 SHA512 84d4aa5ed44aede33bd17186e34e06eb3e878c6ca5143e26d4ee4d73f19746858575d20628c440c58d9d77b55efd34460db7106056a3b8eb6d4adab24f0ae243
 DIST github.com-gobwas-glob-f00a7392b43971b2fdb562418faab1f18da2067a.tar.gz 26195 BLAKE2B ca358fc108a5aac819cfe6ddfafefaef7dfb6b3cd190b42bd95e4f0079906d5389c50e9229a0c2e49cd6d548621082bc783c501de4728c68844c4d28941778de SHA512 ae689950f6aacb46876db6cd32d0237710a983bb27f9f01f82c90978a662296505656fa5d78797e6fc2266b61d3583140e831ca886a7794b99d57806742d2a1b
-DIST github.com-golang-sys-abf9c25f54453410d0c6668e519582a9e1115027.tar.gz 723336 BLAKE2B 934c65d18613640957c6ecfbfcad2697d5c287c867f3b024f1ff55d0b82ee0beb1fadba0da7d4a51919cfb75b33f0c7f9108b0bbfcf66ae9bc7b675a975352ce SHA512 789e030fcd1b9ae5e7687be54b0e54270ca8b24121c73a867d93a0c54b7ab078d06d617f61a7d6a52ac7fedb7a6af90b185ae69be5bd596f7b4d5f686605dbf0
 DIST github.com-golang-sys-d0faeb539838e250bd0a9db4182d48d4a1915181.tar.gz 854019 BLAKE2B 4d7eeb2ef0817541016f8e7944071780b66dc5b27461a23a0673e2dba6845e3c7eb087b803fb3f16b077aff1128beb1f715c4dc5a9beca5ad814210d2a7a6de3 SHA512 2d1787da557bfbfc32b495c23b040f40b556ac8e050544a474b3baca85f33ebf3422ac8ef2f706dba8d121eeddaf456c87a50e580f6b3437aaa09614e7d8aa26
 DIST github.com-google-go-github-e48060a28fac52d0f1cb758bc8b87c07bac4a87d.tar.gz 195878 BLAKE2B 46e186bc1a3096dd043780a35a989959b2cbcabd063bd4bd671fb3b4536ecff731037c57479228badb438fb53bb0c21e8fbb1db881f1438be9bd2398a75c9455 SHA512 da15b3ff93cc1b26439b9e7acf3ae5a12e7d23c0d6e11c691c4013133d37b41d35275f8040a74fcd4f90a9ad93c0b95b48687de43e94831b699df60fbf0c5159
 DIST github.com-google-go-querystring-53e6ce116135b80d037921a7fdd5138cf32d7a8a.tar.gz 7489 BLAKE2B 93ae5c6fc79a511852fa71da41cc9a53d4c93f9e7da43b4b105481f6d77efcbbf30379e7a90ba8e4330553956fa435e3d2e93d8865e7dfda293bbebe9b0ddfa1 SHA512 18830dbf6e14eb7757f7bdee1405e278b6c966fc7632be3decf34ea947705d66f8c0def8060371aa1e3c90cee7ca4324e67d9926627243f987281db52ffa2bca
-DIST github.com-gorilla-context-08b5f424b9271eedf6f9f0ce86cb9396ed337a42.tar.gz 4578 BLAKE2B 21223f052ee73eb2e6b3c20f705f7470f6d1d528f8cf99ca9b62cbce84b8a97aa951f0dc768ef7e5234b8e1e11d08c8b2ac6a12350722742ef1164988bd8ccfc SHA512 12bc7a9c828c450e1b2734273d7791dacb50ba0056922b63e73f96878a2b6ceeb8718caf71421c099d38991954030601b72b30d930e222af161eb3d39bd94ea2
 DIST github.com-gorilla-context-1ea25387ff6f684839d82767c1733ff4d4d15d0a.tar.gz 4373 BLAKE2B a7c01518ee3017d2f9c58c3a5034d78f7fe68cc65598bb8b72c3c80a3dea10da21549814987f7ffde6cb65e7ba82c8cc80f034c9081a8eb10eec68c861619f27 SHA512 a9c7cfece4cb1361ce2f3e917f027d0e95f58aff036616260080d81fb69981fc7aa4db90b0212c771260e5f29c9b9ca9003f8ca891ed77ea291eba9e8c3a74f5
 DIST github.com-inconshreveable-go-vhost-06d84117953b22058c096b49a429ebd4f3d3d97b.tar.gz 10185 BLAKE2B 13a7d4c2c27553e7a283ef2307f39444489456aa9edf63f49ba213caed821c0a51055c161c71e3af19c4af13347cc5ce35e97ce1bb084410e00d8de998fc3750 SHA512 cdc06fee4895931ae23931140137e3cb7a4b1db1e49b0dfc18d9090d0f825e4148f65fe7e404cbf9cc3cd2fc5060cd0af80b3f3f609542f690622d4f321592d9
 DIST github.com-jpillora-go-tld-a31ae10e978ab5f352c5dad2cfbd60546dcea75f.tar.gz 32846 BLAKE2B 18f62f09416370ad232c6dd30fa9175bfe1dc51d95591b3514ecc6257cf2b86670401830b01bbab1d9431294b576bab152e9044f836444e4d68e87cf878e1598 SHA512 4fd6e9d6943a5a8678c9a2a6ac34561587dc516165967d99a55fc73fc4fe02313dc078e043e984658d53c2e14ad47e3bbd24f048ed3014b8fe5c26b3f643245c
 DIST github.com-malfunkt-iprange-3a31f5ed42d2d8a1fc46f1be91fd693bdef2dd52.tar.gz 8478 BLAKE2B d075c89b862557f90f2e0b4393234278bc6bf0b76240e54edfaa6ec40d0d2945b9ac955048f62a8aed66ca8a5377779d559fcfd1fc2c3de88e09238cca6dbfba SHA512 1249cf65f808ad5c3aa8f6f521d97b510ef460c5d0a19ac7e5a75b7011927b7808bc7a43c701488de6944f06554c8637217f5795db0b585bd7abb68a13355266
 DIST github.com-mattn-go-colorable-167de6bfdfba052fa6b2d3664c8f5272e23c9072.tar.gz 7598 BLAKE2B 21a5b6e25859f38416a185646e3d63cb7fc2d175f816ba71b924a80a939fdd47af5be8eec35146703822e1eaa91a3a2f41123eba475f678cd0206b597b879189 SHA512 47f401a01ecc8d08504bb8da3164b95c814ff567d9d44dcdd8aed7dcc2768e4aae0b65504f15931a20c3ec6bd9873383e2b1150660a7ae5016dc1d389305a0f9
-DIST github.com-mattn-go-colorable-5411d3eea5978e6cdc258b30de592b60df6aba96.tar.gz 6670 BLAKE2B 97161231d163ac1e196ef4038a77952e9258e256baaede2abd32d5ddaf2d9f06dd31764d59ee72c36953a9f423bd1338e0251145f1c6f55f02086a273f92b28b SHA512 a9f0dbb97686e819f1982406ae3a990c855116e60b18809ca926f040d426ca984613ce01461832369a96bcc61fb09e7e63a28d543feeccfe4935d848e8fcf543
 DIST github.com-mdlayher-dhcp6-e26af0688e455a82b14ebdbecf43f87ead3c4624.tar.gz 43701 BLAKE2B 6372a224396605c7dc4bed21b1cab91c5b55ceaf5f0df66a98033a49c88a66931de855a0b11802a378791d76b3632539783c97391455a276e565b84e8e48c5ec SHA512 44e8fadc7150e466449e5cdd928bcadb51474f6d2e03c36d409e82ce3af631d39c43200aba1c712fae3141702c5ec407103a61db6881cbde8986996cbc2561bb
 DIST github.com-mgutz-ansi-9520e82c474b0a04dd04f8a40959027271bab992.tar.gz 4874 BLAKE2B 45ab35bdc8beb866430d3be71bf870a537cd757912dc57a00f412cf41be49ff4a35a721b70e0043739d07a770cecef408e0bbe2e6866ebaf80d246a67fcb4cd7 SHA512 893f9823f06edaeb35dbb1a19d908bd08a7d8df6527addf3d7197efeb0c2a83d85405043efd910027d472ed25cf869f4999ece4241cb546e9f648843bdd006cd
 DIST github.com-mgutz-logxi-aebf8a7d67ab4625e0fd4a665766fef9a709161b.tar.gz 305693 BLAKE2B 73a43a3657495cbb9348ff5c512929d1e8c2adcc2908734f51ddb99312951143efe579f88f0f4bbb96942592c2661e20edf3820169671766f4364ed5b85e4da6 SHA512 f4208cbfbb7fd770e58acd4f151b13fcdf7a4fd1e1bd995884a73f497eaab0907fe07926fb366000cc44283e7ec26e89a4654db8e46a66a27e4d6bf85ef0d30d
-DIST github.com-pkg-errors-30136e27e2ac8d167177e8a583aa4c3fea5be833.tar.gz 10912 BLAKE2B 189f7fc6a465a4841f242f8222681f0a80bc251151407d14abd585c65f84204c0ce80c7f0bfd6ea5b03c8790021b7436bc180d3571440ef98a85dbffd5cfd60d SHA512 c38f35def5c4ddba089250f2fde423c53d1f0b33dbba4495bacf2fe772b1216672305ada0b353882a296e4b7fc49c72e99633ed7465b03c31854f762e2890277
 DIST github.com-pkg-errors-645ef00459ed84a119197bfb8d8205042c6df63d.tar.gz 11345 BLAKE2B 9f25872e040b5e0602e658fa728e93a300c00ed1064966370e1b676eea6a94d6bca491b2f6c33a9f2c4d1c522a3ceee540aede2dc638eed238de8485500821e9 SHA512 fa82643f622150b44b198451c1e41e042fd7ceefad9d68e32238d48c9a29c6fb14780fca9d9a7dec660365062d4089c638196960fac056b685e7543410774228
 DIST github.com-robertkrimen-otto-03d472dc43abece8691e609a23d295ab732abba6.tar.gz 250961 BLAKE2B e5319780f70a5802ad23d545e7954be8fc6c5470912b84f4e43fe6748c62618ac31e4ab2d25b6b4b995a069e08c46822130ca7f5fd25aba4e6cfe6b691458957 SHA512 1fb4b556c8b5fc6f5490ad1167766bd78f6c99f08b922c28d9742922a477c48601d8d25a01da9c0ef21af0a39a88b227a542cda107de32a45bb36dfd2c8210f2
-DIST github.com-robertkrimen-otto-6c383dd335ef8dcccef05e651ce1eccfe4d0f011.tar.gz 249726 BLAKE2B 31a24401eaeffc3bca1b18fadcf3dd528a8924467982af5303aba66074aa945051a8876486ed6a13210253e5e1e8f530f1e53e8d968a1aef00a00ceb552aec00 SHA512 94283e7f8ff014ac1ee7390ce84d7f358a9d4a1f945fa1dfccd8630728e18b8275f23de0fdf88929dad6ac97494b65204e781c79055af3fcd69d34459cfe7414
 DIST github.com-tarm-serial-eaafced92e9619f03c72527efeab21e326f3bc36.tar.gz 8082 BLAKE2B 5782dcf9f2fd2fcd0e38d8c853369599b81d862c4340c9addb12aa0f86916172d0d3a6026669a0019de4873933fb25ee27df06cc6d52e7a6a0bc608c0d0aa1ad SHA512 e9f099837f7e1b3e3b26c63fec840b23daa466a445ee42756877da1ce904e4dfb9a98342d4dfce1fa71162ff37b66bc663f336e778bfdfc2447ef93d52266c73
--- a/net-analyzer/bettercap/bettercap-2.10.ebuild
+++ b/net-analyzer/bettercap/bettercap-2.10.ebuild
@ -4,7 +4,6 @@
 EAPI=6

 EGO_VENDOR=(
-	"github.com/adrianmo/go-nmea 22095aa1b48050243d3eb9a001ca80eb91a0c6fa"
 	"github.com/bettercap/gatt 66e7446993acb3de936b3f487e5933522ed16923"
 	"github.com/bettercap/readline 62c6fe6193755f722b8b8788aa7357be55a50ff1"
 	"github.com/chifflier/nfqueue-go 61ca646babef3bd4dea1deb610bfb0005c0a1298"
@ -12,28 +11,15 @@ EGO_VENDOR=(
 	"github.com/elazarl/goproxy a96fa3a318260eab29abaf32f7128c9eb07fb073"
 	"github.com/gobwas/glob f00a7392b43971b2fdb562418faab1f18da2067a"
 	"github.com/google/go-github e48060a28fac52d0f1cb758bc8b87c07bac4a87d"
-	"github.com/google/go-querystring 53e6ce116135b80d037921a7fdd5138cf32d7a8a"
-	"github.com/gorilla/context 1ea25387ff6f684839d82767c1733ff4d4d15d0a"
 	"github.com/inconshreveable/go-vhost 06d84117953b22058c096b49a429ebd4f3d3d97b"
 	"github.com/jpillora/go-tld a31ae10e978ab5f352c5dad2cfbd60546dcea75f"
 	"github.com/malfunkt/iprange 3a31f5ed42d2d8a1fc46f1be91fd693bdef2dd52"
-	"github.com/mattn/go-colorable 167de6bfdfba052fa6b2d3664c8f5272e23c9072"
 	"github.com/mdlayher/dhcp6 e26af0688e455a82b14ebdbecf43f87ead3c4624"
-	"github.com/mgutz/ansi 9520e82c474b0a04dd04f8a40959027271bab992"
-	"github.com/mgutz/logxi aebf8a7d67ab4625e0fd4a665766fef9a709161b"
-	"github.com/pkg/errors 645ef00459ed84a119197bfb8d8205042c6df63d"
 	"github.com/robertkrimen/otto 03d472dc43abece8691e609a23d295ab732abba6"
 	"github.com/tarm/serial eaafced92e9619f03c72527efeab21e326f3bc36"
-	"golang.org/x/sys d0faeb539838e250bd0a9db4182d48d4a1915181 github.com/golang/sys"
-	"gopkg.in/sourcemap.v1 6e83acea0053641eff084973fee085f0c193c61a github.com/go-sourcemap/sourcemap"
+	"github.com/adrianmo/go-nmea 22095aa1b48050243d3eb9a001ca80eb91a0c6fa"
 )

-#see DEPEND
-#	"github.com/google/gopacket 11c65f1ca9081dfea43b4f9643f5c155583b73ba"
-#	"github.com/mattn/go-isatty 0360b2af4f38e8d38c7fce2a9f4e702702d73a39"
-#	"github.com/gorilla/mux 53c1911da2b537f792e7cafcb446b05ffe33b996"
-#	"github.com/gorilla/websocket ea4d1f681babbce9545c9c5f3d5194a789c89f5b"
-
 EGO_PN=github.com/bettercap/bettercap

 inherit golang-build golang-vcs-snapshot
--- a/net-analyzer/bettercap/bettercap-2.6.ebuild
+++ b/net-analyzer/bettercap/bettercap-2.6.ebuild
@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_VENDOR=(
-	"github.com/adrianmo/go-nmea 22095aa1b48050243d3eb9a001ca80eb91a0c6fa"
-	"github.com/bettercap/gatt 6475b946a0bff32e906c25d861f2b1c6d2056baa"
-	"github.com/bettercap/readline 62c6fe6193755f722b8b8788aa7357be55a50ff1"
-	"github.com/chifflier/nfqueue-go 61ca646babef3bd4dea1deb610bfb0005c0a1298"
-	"github.com/dustin/go-humanize bb3d318650d48840a39aa21a027c6630e198e626"
-	"github.com/elazarl/goproxy a96fa3a318260eab29abaf32f7128c9eb07fb073"
-	"github.com/google/go-github e48060a28fac52d0f1cb758bc8b87c07bac4a87d"
-	"github.com/google/go-querystring 53e6ce116135b80d037921a7fdd5138cf32d7a8a"
-	"github.com/gorilla/context 08b5f424b9271eedf6f9f0ce86cb9396ed337a42"
-	"github.com/inconshreveable/go-vhost 06d84117953b22058c096b49a429ebd4f3d3d97b"
-	"github.com/jpillora/go-tld a31ae10e978ab5f352c5dad2cfbd60546dcea75f"
-	"github.com/malfunkt/iprange 3a31f5ed42d2d8a1fc46f1be91fd693bdef2dd52"
-	"github.com/mattn/go-colorable 5411d3eea5978e6cdc258b30de592b60df6aba96"
-	"github.com/mdlayher/dhcp6 e26af0688e455a82b14ebdbecf43f87ead3c4624"
-	"github.com/mgutz/ansi 9520e82c474b0a04dd04f8a40959027271bab992"
-	"github.com/mgutz/logxi aebf8a7d67ab4625e0fd4a665766fef9a709161b"
-	"github.com/pkg/errors 30136e27e2ac8d167177e8a583aa4c3fea5be833"
-	"github.com/robertkrimen/otto 6c383dd335ef8dcccef05e651ce1eccfe4d0f011"
-	"github.com/tarm/serial eaafced92e9619f03c72527efeab21e326f3bc36"
-	"golang.org/x/sys abf9c25f54453410d0c6668e519582a9e1115027 github.com/golang/sys"
-	"gopkg.in/sourcemap.v1 6e83acea0053641eff084973fee085f0c193c61a github.com/go-sourcemap/sourcemap"
-)
-
-#	"github.com/mattn/go-isatty 0360b2af4f38e8d38c7fce2a9f4e702702d73a39"
-#	"github.com/google/gopacket 11c65f1ca9081dfea43b4f9643f5c155583b73ba"
-#	"github.com/gorilla/mux 53c1911da2b537f792e7cafcb446b05ffe33b996"
-#	"github.com/gorilla/websocket ea4d1f681babbce9545c9c5f3d5194a789c89f5b"
-
-EGO_PN=github.com/bettercap/bettercap
-
-inherit golang-build golang-vcs-snapshot
-
-EGIT_COMMIT="v${PV}"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz ${EGO_VENDOR_URI}"
-SRC_URI="${ARCHIVE_URI} ${EGO_VENDOR_URI}"
-
-DESCRIPTION="A complete, modular, portable and easily extensible MITM framework"
-HOMEPAGE="https://github.com/bettercap/bettercap/"
-LICENSE="GPL-3"
-SLOT=0
-IUSE=""
-KEYWORDS="~amd64 ~arm ~arm64"
-
-#FIXME: add stable versions: iprage go-colorable
-DEPEND="dev-go/go-isatty
-	dev-go/gopacket
-	dev-go/mux
-	dev-go/websocket
-	"
-
-RDEPEND="net-libs/libpcap
-	net-libs/libnetfilter_queue"
-
-src_install(){
-	dosbin bettercap
-}
--- a/net-analyzer/bettercap/bettercap-2.8.ebuild
+++ b/net-analyzer/bettercap/bettercap-2.8.ebuild
@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_VENDOR=(
-	"github.com/adrianmo/go-nmea 22095aa1b48050243d3eb9a001ca80eb91a0c6fa"
-	"github.com/bettercap/gatt 66e7446993acb3de936b3f487e5933522ed16923"
-	"github.com/bettercap/readline 62c6fe6193755f722b8b8788aa7357be55a50ff1"
-	"github.com/chifflier/nfqueue-go 61ca646babef3bd4dea1deb610bfb0005c0a1298"
-	"github.com/dustin/go-humanize 02af3965c54e8cacf948b97fef38925c4120652c"
-	"github.com/elazarl/goproxy a96fa3a318260eab29abaf32f7128c9eb07fb073"
-	"github.com/gobwas/glob f00a7392b43971b2fdb562418faab1f18da2067a"
-	"github.com/google/go-github e48060a28fac52d0f1cb758bc8b87c07bac4a87d"
-	"github.com/google/go-querystring 53e6ce116135b80d037921a7fdd5138cf32d7a8a"
-	"github.com/gorilla/context 1ea25387ff6f684839d82767c1733ff4d4d15d0a"
-	"github.com/inconshreveable/go-vhost 06d84117953b22058c096b49a429ebd4f3d3d97b"
-	"github.com/jpillora/go-tld a31ae10e978ab5f352c5dad2cfbd60546dcea75f"
-	"github.com/malfunkt/iprange 3a31f5ed42d2d8a1fc46f1be91fd693bdef2dd52"
-	"github.com/mattn/go-colorable 167de6bfdfba052fa6b2d3664c8f5272e23c9072"
-	"github.com/mdlayher/dhcp6 e26af0688e455a82b14ebdbecf43f87ead3c4624"
-	"github.com/mgutz/ansi 9520e82c474b0a04dd04f8a40959027271bab992"
-	"github.com/mgutz/logxi aebf8a7d67ab4625e0fd4a665766fef9a709161b"
-	"github.com/pkg/errors 645ef00459ed84a119197bfb8d8205042c6df63d"
-	"github.com/robertkrimen/otto 03d472dc43abece8691e609a23d295ab732abba6"
-	"github.com/tarm/serial eaafced92e9619f03c72527efeab21e326f3bc36"
-	"golang.org/x/sys d0faeb539838e250bd0a9db4182d48d4a1915181 github.com/golang/sys"
-	"gopkg.in/sourcemap.v1 6e83acea0053641eff084973fee085f0c193c61a github.com/go-sourcemap/sourcemap"
-)
-
-#see DEPEND
-#	"github.com/google/gopacket 11c65f1ca9081dfea43b4f9643f5c155583b73ba"
-#	"github.com/mattn/go-isatty 0360b2af4f38e8d38c7fce2a9f4e702702d73a39"
-#	"github.com/gorilla/mux 53c1911da2b537f792e7cafcb446b05ffe33b996"
-#	"github.com/gorilla/websocket ea4d1f681babbce9545c9c5f3d5194a789c89f5b"
-
-EGO_PN=github.com/bettercap/bettercap
-
-inherit golang-build golang-vcs-snapshot
-
-EGIT_COMMIT="v${PV}"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz ${EGO_VENDOR_URI}"
-SRC_URI="${ARCHIVE_URI} ${EGO_VENDOR_URI}"
-
-DESCRIPTION="A complete, modular, portable and easily extensible MITM framework"
-HOMEPAGE="https://github.com/bettercap/bettercap/"
-LICENSE="GPL-3"
-SLOT=0
-IUSE=""
-KEYWORDS="~amd64 ~arm ~arm64"
-
-#FIXME: add stable versions, see Gopkg.lock, "version"
-DEPEND="dev-go/go-isatty
-	dev-go/gopacket
-	dev-go/mux
-	dev-go/websocket
-	"
-
-RDEPEND="net-libs/libpcap
-	net-libs/libnetfilter_queue"
-
-src_install(){
-	dosbin bettercap
-}
--- a/net-analyzer/commix/Manifest
+++ b/net-analyzer/commix/Manifest
@ -1 +1,2 @@
 DIST commix-2.5.tar.gz 215830 BLAKE2B a4e8c46d35f6b4d99f5e6de179cca6d6e7550887243e5a1998742c9a9e409eb13ed5988300dca5f54418fb84d2592d3eea29903dd345cd9d728ec6ee16ffff7f SHA512 8c226493e8d5b08cbc4c7ecdf55239acae43389fb2de4fae7419d1542cc286afc4702494df4a9451d9b546380fe7c8bbd55210cd09509ced153514a75d8e632d
+DIST commix-2.6.tar.gz 218928 BLAKE2B 96ad3e9f96ec203c8368ef2a3a90d65a9d9ae9790350dc12e4e84d2a2f19f27b2cca1eaf3a90594c45ea9402856f344a6cd45d6f302e3cb4b687d69c6737a033 SHA512 35eae285224da1e2ec82e0f248f78a9b8df48c77c3022d9cf920c54aacfac6229e5b1286f947a167e160b4f192b4aef65dee35ed92e254c5f0b31860a509172b
--- a/net-analyzer/commix/commix-2.6.ebuild
+++ b/net-analyzer/commix/commix-2.6.ebuild
@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+EGO_PN=github.com/commixproject/${PN}
+
+inherit python-single-r1 multilib
+
+MY_PV="${PV}-20180921"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/commixproject/commix.git"
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+	EGIT_COMMIT="v${MY_PV}"
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="Automated All-in-One OS command injection and exploitation tool"
+HOMEPAGE="https://github.com/commixproject/commix"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/"${PN}"-"${MY_PV}"
+
+src_prepare() {
+	python_fix_shebang .
+	default
+}
+
+src_install(){
+	insinto /usr/$(get_libdir)/${PN}
+	doins -r *
+
+	fperms +x /usr/$(get_libdir)/${PN}/${PN}.py
+	dosym $(get_libdir)/${PN}/${PN}.py ${PN}
+
+	python_optimize "${D}"usr/$(get_libdir)/${PN}
+}
--- a/net-analyzer/gobuster/Manifest
+++ b/net-analyzer/gobuster/Manifest
@ -1,2 +1 @@
-DIST gobuster-2.0.0.tar.gz 18048 BLAKE2B 653d68c4c1f3d27dd750a57dc5badccae8be5e298f88de11d061a584122610fae0d9587ffcc00cf605116554c557ea063a912db75040823720549faffff9c4ec SHA512 5626a91b3a8a2592951eee6cdc9f858b403163c71c51e674de150df2024b745d06359edfa7fd176b801d8292930d09fb394e4234b74fc9aba3ba112601ae6fe6
 DIST gobuster-2.0.1.tar.gz 18776 BLAKE2B d2c1eb148fa541c638ab58ace2f0614dfadec0a9f5fb78ff2ca4447b280c3aa0010d50d86ef21caccec0cdd1195e7b6d65c60c80f2d107dea37426514bf71f15 SHA512 c154f93db317566dab43363f34b6b03b75bd81810a1749c708d96a3015e4a5af965aa6e6c00bdb6285e77163eebbddbecd2c1c8680991af0e1d4f4ccfb14a47a
--- a/net-analyzer/gobuster/gobuster-2.0.1-r1.ebuild
+++ b/net-analyzer/gobuster/gobuster-2.0.1-r1.ebuild
@ -27,7 +27,7 @@ IUSE=""
 RDEPEND=">=dev-lang/go-1.10
 		dev-go/go-crypto
 		dev-go/go-multierror
-		>=dev-go/go-uuid-0.2"
+		>=dev-go/uuid-0.2"
 DEPEND="${RDEPEND}"

 src_install(){
--- a/net-analyzer/smbmap/Manifest
+++ b/net-analyzer/smbmap/Manifest
@ -0,0 +1 @@
+DIST smbmap-20180508.tar.gz 25888 BLAKE2B 601528b28264b1462e29cb185a66685c59ed0cf1258e4e50242f23dee8e5768518341f9bf6028d3ff41a66ff3db485562f26062c40682c1bd5673e7810a1baf8 SHA512 65baca537d1cc94e78a964bb2be36c1ba8c669446ed4c92d7cc4bd0e93370100570db5c302145bf5bd0733d327d66d49e5cb2176ea036a4b520eabc4f9b6dac8
--- a/net-analyzer/smbmap/smbmap-20180508.ebuild
+++ b/net-analyzer/smbmap/smbmap-20180508.ebuild
@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+EGO_PN=github.com/ShawnDEvans/${PN}
+
+inherit python-single-r1
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/madengr/ham2mon.git"
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+	EGIT_COMMIT="b55fc051afa477943c017c5f0afe86e9e2f241ad"
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="SMBMap is a handy SMB enumeration tool."
+HOMEPAGE="https://github.com/ShawnDEvans/smbmap"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+
+src_prepare() {
+	# Dirty hack to actually add a shebang to the file, so that we can then fix
+	# it using python_fix_shebang. Without a shebang, python_fix_shebang won't
+	# even work
+	sed -i '1 s|^.*$|#!/usr/bin/env python|' "${PN}.py"
+	python_fix_shebang "${PN}.py"
+	eapply_user
+}
+
+src_install() {
+	newbin "${PN}.py" "${PN}"
+}
--- a/net-analyzer/sslyze/Manifest
+++ b/net-analyzer/sslyze/Manifest
@ -1,2 +1,3 @@
 DIST sslyze-1.4.3.tar.gz 2609633 BLAKE2B 25519f5aa2a64d8ff2bee967255b639a1ca40651c9b70bf561a334a832c3274448b225bd03346ed7446827f39f6a7cde671e6cf5cec02d3095eb6edbb3fde317 SHA512 e57cbfbf15d7d4138e29ef0c33c04bf034853bbe80c5bf34ebe1631deb22b29b4ce593f6f1ab73a5a154feb87b4c566f35e66de79a3cf03e44721aaf728fa519
 DIST sslyze-2.0.0.tar.gz 9664964 BLAKE2B 2e6e938abc8936d4d189544fca8306383538741dc56ad2c887fa1bd1607831b0c8c9bc2b6fd812cf6e3ee3cbdf053863e507df0a3d0479320356e544990d7b2d SHA512 faa7903e5886e8d262147861917283af36a5932963f1a214cb161fee7178bf03f07785e587ac9011b556f1138a46f75bc5658be6b0ce3b35e0d455af94213eb6
+DIST sslyze-2.0.1.tar.gz 9669587 BLAKE2B 821a2883259dfb73ed09d3a57aba8b60736c34867897d668575250221ebe88ac180c3dd20122b02887a18d4d46053e1fa277207ee35ace9a5795e4a105a4eae1 SHA512 5dc2e8c407735c02f5644a6126764e67d923ecd066fb0e95c4cc53832f6f40588e89d39b1e64ad1d028f432547de4bab795c7edc46c7e5bcc26eb6594578b119
--- a/net-analyzer/sslyze/sslyze-2.0.1.ebuild
+++ b/net-analyzer/sslyze/sslyze-2.0.1.ebuild
@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6} )
+inherit distutils-r1
+
+DESCRIPTION="Fast and full-featured SSL scanner"
+HOMEPAGE="https://github.com/nabla-c0d3/sslyze"
+SRC_URI="https://github.com/nabla-c0d3/sslyze/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="=dev-python/nassl-2.1*[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.3[${PYTHON_USEDEP}]
+	>=dev-python/tls_parser-1.2.0[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	virtual/python-typing[${PYTHON_USEDEP}]"
+
+src_prepare(){
+	rm -r tests
+	eapply_user
+}
--- a/net-analyzer/testssl/Manifest
+++ b/net-analyzer/testssl/Manifest
@ -0,0 +1,2 @@
+DIST testssl-2.9.5.7.tar.gz 8955971 BLAKE2B 6ca3bc60445c9448c3dc24ee7262e57bc03a2c686bbeebcc1cc850edfa652538c1ba5365189c27e78f0cb977e68d2ea1a9f940d47cd0a53402d1fa9a31a33483 SHA512 35ab900b84db8a0a210cb9ce8bb794ff7e8cddd5c85a151083bc76eba834dce37597b29b6235fcf2ce37b004dd295b1756e01374a4943e1e2ed0d2a8cf8761f6
+DIST testssl-3.0_rc1.tar.gz 9011839 BLAKE2B 8bb7bb344aca438dcef0554a812891c0bb0cd8519dbbffcd506b6e4b06ad19b6f75495341222f5fb4e26e8ded63f033cc31fcedd127879180e7a9fbfa6e3efa4 SHA512 4f7c0dc97039a9b4d140c834e0845ac947b607f8c2021816a4aba909f757f2d6c6d485be70bcb8656463784ef6e310a35af22d3f6b0cfcbff9f255934cd91442
--- a/net-analyzer/testssl/metadata.xml
+++ b/net-analyzer/testssl/metadata.xml
@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>kensington@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">drwetter/testssl.sh</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/net-analyzer/testssl/testssl-2.9.5.7.ebuild
+++ b/net-analyzer/testssl/testssl-2.9.5.7.ebuild
@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN}.sh"
+MY_PV="${PV/.7/-7}"
+
+DESCRIPTION="Tool to check TLS/SSL cipher support"
+HOMEPAGE="https://testssl.sh/"
+SRC_URI="https://github.com/drwetter/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+	app-shells/bash[net]
+	dev-libs/openssl-bad
+	net-dns/bind-tools
+	sys-apps/util-linux
+	sys-libs/ncurses:0
+	sys-process/procps
+"
+
+S=${WORKDIR}/${MY_PN}-${MY_PV}
+
+QA_PREBUILT="opt/${PN}/*"
+
+src_prepare() {
+	default
+	sed -i ${PN}.sh \
+		-e 's|TESTSSL_INSTALL_DIR="${TESTSSL_INSTALL_DIR:-""}"|TESTSSL_INSTALL_DIR="/"|' \
+		-e 's|$TESTSSL_INSTALL_DIR/etc/|&testssl/|g' || die
+
+	sed -i ${PN}.sh \
+		-e 's|OPENSSL="$1/openssl"|OPENSSL="$1/openssl-bad"|' || die
+}
+
+src_install() {
+	dodoc CHANGELOG.stable-releases.txt CREDITS.md Readme.md
+	dodoc openssl-rfc.mappping.html
+
+	dobin ${PN}.sh
+
+	insinto /etc/${PN}
+	doins etc/*
+}
--- a/net-analyzer/testssl/testssl-3.0_rc1.ebuild
+++ b/net-analyzer/testssl/testssl-3.0_rc1.ebuild
@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN}.sh"
+MY_PV="${PV/_rc/rc}"
+
+DESCRIPTION="Tool to check TLS/SSL cipher support"
+HOMEPAGE="https://testssl.sh/"
+#SRC_URI="https://github.com/drwetter/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://codeload.github.com/drwetter/testssl.sh/tar.gz/${MY_PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	app-shells/bash[net]
+	dev-libs/openssl-bad
+	net-dns/bind-tools
+	sys-apps/util-linux
+	sys-libs/ncurses:0
+	sys-process/procps
+"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+src_prepare() {
+	default
+	sed -i ${PN}.sh \
+		-e 's|TESTSSL_INSTALL_DIR="${TESTSSL_INSTALL_DIR:-""}"|TESTSSL_INSTALL_DIR="/"|' \
+		-e 's|$TESTSSL_INSTALL_DIR/etc/|&testssl/|g' || die
+
+	sed -i ${PN}.sh \
+		-e 's|OPENSSL="$1/openssl"|OPENSSL="$1/openssl-bad"|' || die
+}
+
+src_install() {
+	dodoc CHANGELOG.stable-releases.txt CREDITS.md Readme.md
+	dodoc openssl-rfc.mappping.html
+
+	dobin ${PN}.sh
+
+	insinto /etc/${PN}
+	doins etc/*
+}
--- a/net-analyzer/wpscan/Manifest
+++ b/net-analyzer/wpscan/Manifest
@ -1,3 +1,2 @@
-DIST wpscan-2.9.2.tar.gz 1563377 BLAKE2B 3de1dc702c0cac406465eef2d749ccb3c5b4fcb37bd5266f58bcaf1310ed545c825fed94a5b485b5c020de91f70a2b45e7bf3e31fefa39b65032030d2a2aa53e SHA512 cc8ff69b4b4b7ad26a32b9627d44d9d8e647310763cf768d91eb400d86fcbbb98f7a5cd695f9f7b2df9e85d5b3c49f2336a8bcf9a14e2458ffe06e3d2be145d6
-DIST wpscan-2.9.3.tar.gz 1734782 BLAKE2B a51835279afd48d938a395d31ae72e49034725060c4b5eab2fe9ae78bb1d24d39a30d25ee47ab3b7a46c280ef0b859462aab675386261f507b9f455192a37927 SHA512 95f18f78cc6ba94c0085700fa3c26a6e66441e0978ef7b492deb3b42e96d9b91c17bd07ef2d48e2c7a1428ebc280eba608a41032452c6c42791fc3c91012e490
-DIST wpscan-2.9.4.tar.gz 1940596 BLAKE2B dd8fd491af14b2bf7c3da77fc7cd45712605f77967dba4589f33bb5b93e04acd10e0c7a6a85bab50002f6d65209834a4f73181ca30146bf2e6286715eb7184f1 SHA512 1ca5fd2e8bc5a7a368576351bce465039a7fdcea33d4abe86a168dbd2725922ae40362264a2f71e0839435e5085a9ebe74415bd3d40c316e3b4d654122a87e67
+DIST wpscan-3.3.0.tar.gz 5781183 BLAKE2B f8ec77e961ad089dafd911a6ba2b6a15f421d7a1a63fd790dd4d5b9781ecfdd7de678022ee2d0b117f69c0f6dc05c3d9731fa8bd029b7888c421e5d3795fdb07 SHA512 17123bd697d97ec93325fd6524ddb2a4e5e76a96375e8e06be93f8b6a3d6935114bc3fdfd6a6b17ec32228678780e1c24bedbf147bf71812d1a885dc50eccac2
+DIST wpscan-3.3.1.tar.gz 5781065 BLAKE2B 4f12e6ced7fdee1f42f676ff5d6009f30bf2ec3fbd5dd2eb33d7cb7d6ad606084fbc2292331f561a3a3fc903873fa646b70753339c4192259dbe416995a0158a SHA512 1b0dc3cf8d3459c2ae6a189f0ec45fe8ca80cc22cdd55c6f2122d474259c373aeb1577d3d8f3a24b31f51160b5a3f73c36c6e9c64d272e066c1b106047bff7a2
--- a/net-analyzer/wpscan/files/wpscan
+++ b/net-analyzer/wpscan/files/wpscan
@ -1,3 +0,0 @@
-#!/bin/sh
-
-ruby /usr/lib/wpscan/wpscan.rb $@
--- a/net-analyzer/wpscan/files/wpscan-2.5.1_regular_user.patch
+++ b/net-analyzer/wpscan/files/wpscan-2.5.1_regular_user.patch
@ -1,38 +0,0 @@
--- lib/common/common_helper.rb.orig	2014-10-07 14:58:38.187837867 +0800
-+++ lib/common/common_helper.rb	2014-10-07 15:04:20.817834016 +0800
-@@ -2,9 +2,9 @@
- 
- LIB_DIR              = File.expand_path(File.join(File.dirname(__FILE__), '..'))
- ROOT_DIR             = File.expand_path(File.join(LIB_DIR, '..')) # expand_path is used to get "wpscan/" instead of "wpscan/lib/../"
-DATA_DIR             = File.join(ROOT_DIR, 'data')
-CONF_DIR             = File.join(ROOT_DIR, 'conf')
-CACHE_DIR            = File.join(ROOT_DIR, 'cache')
-+DATA_DIR             = File.expand_path('~/.wpscan/data')
-+CONF_DIR             = File.expand_path('~/.wpscan/conf')
-+CACHE_DIR            = File.expand_path('~/.wpscan/cache')
- WPSCAN_LIB_DIR       = File.join(LIB_DIR, 'wpscan')
- WPSTOOLS_LIB_DIR     = File.join(LIB_DIR, 'wpstools')
- UPDATER_LIB_DIR      = File.join(LIB_DIR, 'updater')
-@@ -12,7 +12,7 @@
- MODELS_LIB_DIR       = File.join(COMMON_LIB_DIR, 'models')
- COLLECTIONS_LIB_DIR  = File.join(COMMON_LIB_DIR, 'collections')
- 
-LOG_FILE             = File.join(ROOT_DIR, 'log.txt')
-+LOG_FILE             = File.expand_path('~/.wpscan/log.txt')
- 
- # Plugins directories
- COMMON_PLUGINS_DIR   = File.join(COMMON_LIB_DIR, 'plugins')
--- wpscan.rb.orig	2014-10-07 14:58:02.000000000 +0800
-+++ wpscan.rb	2014-10-07 15:31:58.977815380 +0800
-@@ -5,6 +5,11 @@
- require File.dirname(__FILE__) + '/lib/wpscan/wpscan_helper'
- 
- def main
-+
-+  unless File.directory?(DATA_DIR)
-+    FileUtils.mkdir_p(DATA_DIR)
-+  end
-+
-   # delete old logfile, check if it is a symlink first.
-   File.delete(LOG_FILE) if File.exist?(LOG_FILE) and !File.symlink?(LOG_FILE)
- 
--- a/net-analyzer/wpscan/files/wpscan-2.9.3_regular_user.patch
+++ b/net-analyzer/wpscan/files/wpscan-2.9.3_regular_user.patch
@ -1,37 +0,0 @@
--- lib/common/common_helper.rb.orig	2017-07-19 21:24:32.000000000 +0800
-+++ lib/common/common_helper.rb	2017-07-21 05:34:32.895006934 +0800
-@@ -2,16 +2,16 @@
- 
- LIB_DIR              = File.expand_path(File.join(__dir__, '..'))
- ROOT_DIR             = File.expand_path(File.join(LIB_DIR, '..')) # expand_path is used to get "wpscan/" instead of "wpscan/lib/../"
-DATA_DIR             = File.join(ROOT_DIR, 'data')
-CONF_DIR             = File.join(ROOT_DIR, 'conf')
-CACHE_DIR            = File.join(ROOT_DIR, 'cache')
-+DATA_DIR             = File.expand_path('~/.wpscan/data')
-+CONF_DIR             = File.expand_path('~/.wpscan/conf')
-+CACHE_DIR            = File.expand_path('~/.wpscan/cache')
- WPSCAN_LIB_DIR       = File.join(LIB_DIR, 'wpscan')
- UPDATER_LIB_DIR      = File.join(LIB_DIR, 'updater')
- COMMON_LIB_DIR       = File.join(LIB_DIR, 'common')
- MODELS_LIB_DIR       = File.join(COMMON_LIB_DIR, 'models')
- COLLECTIONS_LIB_DIR  = File.join(COMMON_LIB_DIR, 'collections')
- 
-DEFAULT_LOG_FILE     = File.join(ROOT_DIR, 'log.txt')
-+DEFAULT_LOG_FILE     = File.expand_path('~/.wpscan/log.txt')
- 
- # Plugins directories
- COMMON_PLUGINS_DIR   = File.join(COMMON_LIB_DIR, 'plugins')
--- wpscan.rb.orig	2017-07-19 21:24:32.000000000 +0800
-+++ wpscan.rb	2017-07-21 05:36:38.692010812 +0800
-@@ -9,6 +9,11 @@
- 
- def main
-   begin
-+
-+    unless File.directory?(DATA_DIR)
-+      FileUtils.mkdir_p(DATA_DIR)
-+    end
-+
-     wpscan_options = WpscanOptions.load_from_arguments
- 
-     $log = wpscan_options.log
--- a/net-analyzer/wpscan/files/wpstools
+++ b/net-analyzer/wpscan/files/wpstools
@ -1,3 +0,0 @@
-#!/bin/sh
-
-ruby /usr/lib/wpscan/wpstools.rb $@
--- a/net-analyzer/wpscan/wpscan-2.9.2-r3.ebuild
+++ b/net-analyzer/wpscan/wpscan-2.9.2-r3.ebuild
@ -1,71 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-USE_RUBY="ruby21 ruby22 ruby23"
-
-inherit eutils ruby-ng
-
-DESCRIPTION="Wordpress security scanner"
-HOMEPAGE="http://wpscan.org/"
-SRC_URI="https://github.com/wpscanteam/wpscan/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="test"
-
-RUBY_DEPS="dev-ruby/rubygems
-	dev-ruby/typhoeus:1
-	>=dev-ruby/nokogiri-1.6.7.2
-	>dev-ruby/yajl-ruby-1.2.0
-	dev-ruby/addressable
-	>=dev-ruby/terminal-table-1.6.0
-	>=dev-ruby/ruby-progressbar-1.6.0
-	>=dev-ruby/webmock-1.7.2:0
-	dev-ruby/bundler
-"
-
-ruby_add_bdepend "${RUBY_DEPS}"
-ruby_add_rdepend "${RUBY_DEPS}"
-
-#	test? (
-#		>=dev-ruby/webmock-1.9.3
-#		dev-ruby/simplecov
-#		dev-ruby/rspec
-#	)"
-
-each_ruby_prepare() {
-	MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
-	MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
-}
-
-#src_prepare() {
-all_ruby_prepare() {
-	#https://github.com/wpscanteam/wpscan/issues/706
-	epatch "${FILESDIR}/${PN}"-2.5.1_regular_user.patch
-	rm -r README.md
-#	sed -i "/require 'bundler\/setup'/d" lib/environment.rb
-
-	if ! use test; then
-		sed -i -e "/^group :test do/,/^end$/d" Gemfile || die
-	fi
-
-	unpack ./data.zip
-	rm ./data.zip
-	rm -r ./dev
-
-	default
-}
-
-#src_install() {
-all_ruby_install() {
-	dodoc CHANGELOG.md CREDITS
-	rm CHANGELOG.md CREDITS
-	insinto /usr/$(get_libdir)/${PN}
-	doins -r *
-	dobin "${FILESDIR}"/wpscan
-	dobin "${FILESDIR}"/wpstools
-}
--- a/net-analyzer/wpscan/wpscan-2.9.3.ebuild
+++ b/net-analyzer/wpscan/wpscan-2.9.3.ebuild
@ -1,71 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24"
-
-inherit eutils ruby-ng
-
-DESCRIPTION="Wordpress security scanner"
-HOMEPAGE="http://wpscan.org/"
-SRC_URI="https://github.com/wpscanteam/wpscan/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="test"
-
-RUBY_DEPS="dev-ruby/rubygems
-	dev-ruby/typhoeus:1
-	>=dev-ruby/nokogiri-1.7.0.1
-	>=dev-ruby/addressable-2.5.0
-	>=dev-ruby/yajl-ruby-1.3.0
-	>=dev-ruby/terminal-table-1.6.0
-	>=dev-ruby/ruby-progressbar-1.8.1
-	dev-ruby/bundler
-"
-
-ruby_add_bdepend "${RUBY_DEPS}"
-ruby_add_rdepend "${RUBY_DEPS}"
-
-#	test? (
-#		>=dev-ruby/webmock-1.9.3
-#		dev-ruby/simplecov
-#		dev-ruby/rspec
-#	)"
-
-each_ruby_prepare() {
-	rm Gemfile.lock
-	MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
-	MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
-}
-
-#src_prepare() {
-all_ruby_prepare() {
-	#https://github.com/wpscanteam/wpscan/issues/706
-	epatch "${FILESDIR}/${PN}"-2.9.3_regular_user.patch
-
-	rm -r README.md
-
-	if ! use test; then
-		sed -i -e "/^group :test do/,/^end$/d" Gemfile || die
-	fi
-
-	unpack ./data.zip
-	rm ./data.zip
-	rm -r ./dev
-
-	default
-}
-
-#src_install() {
-all_ruby_install() {
-	dodoc CHANGELOG.md CREDITS
-	rm CHANGELOG.md CREDITS
-	insinto /usr/$(get_libdir)/${PN}
-	doins -r *
-	dobin "${FILESDIR}"/wpscan
-	dobin "${FILESDIR}"/wpstools
-}
--- a/net-analyzer/wpscan/wpscan-2.9.4.ebuild
+++ b/net-analyzer/wpscan/wpscan-2.9.4.ebuild
@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24"
-
-inherit eutils ruby-ng
-
-DESCRIPTION="Wordpress security scanner"
-HOMEPAGE="http://wpscan.org/"
-SRC_URI="https://github.com/wpscanteam/wpscan/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RUBY_DEPS="
-	>=dev-ruby/addressable-2.5.0
-	>=dev-ruby/nokogiri-1.7.0.1
-	>=dev-ruby/ruby-progressbar-1.8.1
-	>=dev-ruby/rubyzip-1.2.1
-	>=dev-ruby/terminal-table-1.6.0
-	dev-ruby/typhoeus:1
-	>=dev-ruby/yajl-ruby-1.3.0
-	dev-ruby/rubygems
-	dev-ruby/bundler
-"
-
-ruby_add_bdepend "${RUBY_DEPS}"
-ruby_add_rdepend "${RUBY_DEPS}"
-
-#	test? (
-#		>=dev-ruby/webmock-1.9.3
-#		dev-ruby/simplecov
-#		dev-ruby/rspec
-#	)"
-
-each_ruby_prepare() {
-	rm Gemfile.lock
-	MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
-	MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
-}
-
-#src_prepare() {
-all_ruby_prepare() {
-	#https://github.com/wpscanteam/wpscan/issues/706
-#	epatch "${FILESDIR}/${PN}"-2.9.3_regular_user.patch
-
-	rm -r README.md
-
-	if ! use test; then
-		sed -i -e "/^group :test do/,/^end$/d" Gemfile || die
-	fi
-
-	unpack ./data.zip
-	rm ./data.zip
-	rm -r ./dev
-
-	default
-}
-
-#src_install() {
-all_ruby_install() {
-	dodoc CHANGELOG.md
-	rm CHANGELOG.md
-	insinto /usr/$(get_libdir)/${PN}
-	doins -r *
-	dobin "${FILESDIR}"/wpscan
-	dobin "${FILESDIR}"/wpstools
-}
--- a/net-analyzer/wpscan/wpscan-3.3.0-r1.ebuild
+++ b/net-analyzer/wpscan/wpscan-3.3.0-r1.ebuild
@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24"
+RUBY_FAKEGEM_EXTRAINSTALL="app bin spec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Wordpress security scanner"
+HOMEPAGE="http://wpscan.org/"
+SRC_URI="https://github.com/wpscanteam/wpscan/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+ruby_add_rdepend "dev-ruby/cms_scanner
+	>=dev-ruby/addressable-2.5.0
+	dev-ruby/activesupport:5.2
+	>=dev-ruby/yajl-ruby-1.3.0
+"
--- a/net-analyzer/wpscan/wpscan-3.3.1.ebuild
+++ b/net-analyzer/wpscan/wpscan-3.3.1.ebuild
@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24"
+RUBY_FAKEGEM_EXTRAINSTALL="app bin spec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Wordpress security scanner"
+HOMEPAGE="http://wpscan.org/"
+SRC_URI="https://github.com/wpscanteam/wpscan/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+ruby_add_rdepend "dev-ruby/cms_scanner
+	>=dev-ruby/addressable-2.5.0
+	dev-ruby/activesupport:5.2
+	>=dev-ruby/yajl-ruby-1.3.0
+"
+
+each_ruby_prepare() {
+	sed -i -e '/s.add_development_dependency/d' wpscan.gemspec
+
+	MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
+	MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
+}
--- a/net-wireless/cowpatty/Manifest
+++ b/net-wireless/cowpatty/Manifest
@ -1,2 +1 @@
-DIST cowpatty-4.3.tgz 103720 BLAKE2B d44baf080a821a21b99245af0e863b0a0d8118131082f1460c9c06d53861850690a022235269613294de75e802e77d9e3cd77136041c122180e51f366b52d037 SHA512 221757c79f6bd31e51c19b4de3687f5ed22d44483591ab0cbfcfc37b91e76e9aa7bdd380fc89154350f420f812580d8fb92796b1e6ce4afe5d1171aa0bc28c9b
-DIST cowpatty-4.6.tgz 104979 BLAKE2B af0b0e9046edc1c48380d2a341994603d07109a4f1c37a1f88fe36cb2f0cb506cc1ad277656cd877e5b6b11315ebadee0e35c69fcf7ca39a7a3b2573e0b100b7 SHA512 87c55f3f43c0342cbcc46227a1e4cfe3f23e215adc68e376991b85344b00b56e7b57e3cf0f1e3d18378cd830a247b2e36644b41b5c0f00a2a382b410f4ab35af
+DIST cowpatty-4.8.tar.gz 97449 BLAKE2B 39117923a7b70be1165e1befc998525a9fe1ce2e6cfd7df97146d18d90a4cf2f6087e89b316bc8072ff1a0dd25d4eea9abf747a2daea96038d18ab5da601b32c SHA512 a0a6ef859e0d1a5d753377b8eac50ef46ded7c1ddae50795bdc1170a5c8b572a3ae397ac9bcb9341863a69f0d2dc3e24d9727873baa10c3ee730d8dc6a8d0683
--- a/net-wireless/cowpatty/cowpatty-4.3-r2.ebuild
+++ b/net-wireless/cowpatty/cowpatty-4.3-r2.ebuild
@ -1,28 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils
-
-DESCRIPTION="WLAN tools for bruteforcing 802.11 WPA/WPA2 keys"
-HOMEPAGE="http://www.willhackforsushi.com/Cowpatty.html"
-SRC_URI="http://www.willhackforsushi.com/code/${PN}/${PV}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-DEPEND="dev-libs/openssl
-	net-libs/libpcap"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	epatch "${FILESDIR}"/cowpatty-4.3-fixup2.patch
-	epatch "${FILESDIR}"/cowpatty-4.3-hashfix.patch
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	dobin cowpatty genpmk  || die "dobin failed"
-	dodoc AUTHORS CHANGELOG FAQ INSTALL README TODO dict *.dump
-}
--- a/net-wireless/cowpatty/cowpatty-4.8-r1.ebuild
+++ b/net-wireless/cowpatty/cowpatty-4.8-r1.ebuild
@ -1,25 +1,33 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+
+EAPI=6

 inherit eutils

 DESCRIPTION="WLAN tools for bruteforcing 802.11 WPA/WPA2 keys"
 HOMEPAGE="http://www.willhackforsushi.com/?page_id=50"
-SRC_URI="http://www.willhackforsushi.com/code/${PN}/${PV}/${P}.tgz"
+SRC_URI="https://github.com/joswr1ght/cowpatty/archive/${PV}.tar.gz -> ${P}.tar.gz"

-LICENSE="GPL-2"
+LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""

-DEPEND="dev-libs/openssl
+DEPEND="dev-libs/openssl:*
 	net-libs/libpcap"
 RDEPEND="${DEPEND}"

+src_prepare() {
+	sed -i 's|clang|gcc|' Makefile || die
+	sed -i "s#-O2#${CFLAGS} ${LDFLAGS}#" Makefile || die
+	sed -i 's#-pipe -Wall##' Makefile || die
+	eapply_user
+}
+
 src_compile() {
-	epatch "${FILESDIR}"/cowpatty-4.6-fixup14.patch
-	emake -j1 || die "emake failed"
+	#makefile cannot handle higher than -j10
+	emake -j1
 }

 src_install() {
--- a/net-wireless/hostapd/ChangeLog
+++ b/net-wireless/hostapd/ChangeLog
@ -1,579 +0,0 @@
-# ChangeLog for net-wireless/hostapd
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/ChangeLog,v 1.110 2011/04/21 13:53:15 tomka Exp $
-
-  21 Apr 2011; Thomas Kahle <tomka@gentoo.org> hostapd-0.7.3.ebuild:
-  x86 stable per bug 360997
-
-  29 Mar 2011; Christoph Mende <angelos@gentoo.org> hostapd-0.7.3.ebuild:
-  Stable on amd64 wrt bug #360997
-
-*hostapd-0.7.3 (08 Sep 2010)
-
-  08 Sep 2010; Bjarke Istrup Pedersen <gurligebis@gentoo.org>
-  -hostapd-0.6.8.ebuild, -hostapd-0.6.10.ebuild, -hostapd-0.7.2.ebuild,
-  +hostapd-0.7.3.ebuild:
-  Bumping to 0.7.3 and removing old versions.
-  This version is the first in the 0.7 stable series from upstream.
-
-*hostapd-0.7.2 (23 May 2010)
-
-  23 May 2010; Bjarke Istrup Pedersen <gurligebis@gentoo.org>
-  -hostapd-0.7.1.ebuild, +hostapd-0.7.2.ebuild:
-  Bumping to 0.7.2, fixing bug #319923
-
-*hostapd-0.7.1 (24 Jan 2010)
-
-  24 Jan 2010; Bjarke Istrup Pedersen <gurligebis@gentoo.org>
-  -hostapd-0.7.0.ebuild, -files/hostapd-0.7.0-fix_linking.patch,
-  +hostapd-0.7.1.ebuild:
-  Bumping to 0.7.1 , fixing bugs #301540 and #301542
-
-*hostapd-0.7.0 (16 Jan 2010)
-
-  16 Jan 2010; Bjarke Istrup Pedersen <gurligebis@gentoo.org>
-  +hostapd-0.7.0.ebuild, +files/hostapd-0.7.0-fix_linking.patch,
-  metadata.xml:
-  Bumping to 0.7.0
-
-*hostapd-0.6.10 (14 Jan 2010)
-
-  14 Jan 2010; Bjarke Istrup Pedersen <gurligebis@gentoo.org>
-  hostapd-0.6.8.ebuild, -files/hostapd-0.6.8-conf.d,
-  -files/hostapd-0.6.8-init.d, hostapd-0.6.9.ebuild,
-  -files/hostapd-0.6.9-conf.d, -files/hostapd-0.6.9-init.d,
-  +hostapd-0.6.10.ebuild, +files/hostapd-conf.d, +files/hostapd-init.d:
-  Bumping to 0.6.10 and removing redundant init.d and conf.d files
-
-  11 Sep 2009; Diego E. Pettenò <flameeyes@gentoo.org>
-  hostapd-0.6.8.ebuild, hostapd-0.6.9.ebuild:
-  Fix RDEPEND assignment that nilled the runtime dependencies.
-
-  24 May 2009; Markus Meier <maekke@gentoo.org> hostapd-0.6.9.ebuild:
-  amd64/x86 stable, bug #270148
-
-  21 May 2009; Brent Baude <ranger@gentoo.org> hostapd-0.6.9.ebuild:
-  stable ppc, bug 270148
-
-  17 May 2009; Bjarke Istrup Pedersen <gurligebis@gentoo.org>
-  files/hostapd-0.6.8-init.d, files/hostapd-0.6.9-init.d:
-  Fixing init script, so it is POSIX compliant, fixing bug #269063
-
-  16 Apr 2009; Bjarke Istrup Pedersen <gurligebis@gentoo.org>
-  hostapd-0.6.9.ebuild:
-  Porting ebuild to EAPI 2
-
-  05 Apr 2009; Bjarke Istrup Pedersen <gurligebis@gentoo.org>
-  -files/hostapd-0.5.10-conf.d, -files/hostapd-0.5.10-init.d,
-  -hostapd-0.5.10.ebuild:
-  Removing 0.5.10, since it has been superseeded by 0.6.8
-
-  04 Apr 2009; Markus Meier <maekke@gentoo.org> hostapd-0.6.8.ebuild:
-  amd64/x86 stable, bug #263673
-
-  24 Mar 2009; Joseph Jezak <josejx@gentoo.org> hostapd-0.6.8.ebuild:
-  Marked ppc stable for bug #263673.
-
-*hostapd-0.6.9 (25 Mar 2009)
-
-  25 Mar 2009; Bjarke Istrup Pedersen <gurligebis@gentoo.org>
-  -files/hostapd-0.6.7-conf.d, -files/hostapd-0.6.7-init.d,
-  +files/hostapd-0.6.9-conf.d, +files/hostapd-0.6.9-init.d,
-  -hostapd-0.6.7.ebuild, +hostapd-0.6.9.ebuild:
-  Bumping to 0.6.9 and removing 0.6.7
-
-  27 Feb 2009; Bjarke Istrup Pedersen <gurligebis@gentoo.org>
-  hostapd-0.6.7.ebuild, hostapd-0.6.8.ebuild:
-  Added info regarding madwifi and wme_enabled
-
-  27 Feb 2009; Bjarke Istrup Pedersen <gurligebis@gentoo.org>
-  hostapd-0.6.7.ebuild, hostapd-0.6.8.ebuild:
-  Adding support for 802.11n and removing stable flags from 0.6.7, since it
-  is still from the development branch.
-
-  25 Feb 2009; Markus Meier <maekke@gentoo.org> hostapd-0.6.7.ebuild:
-  amd64/x86 stable, bug #259285
-
-*hostapd-0.6.8 (16 Feb 2009)
-
-  16 Feb 2009; Bjarke Istrup Pedersen <gurligebis@gentoo.org>
-  +files/hostapd-0.6.8-conf.d, +files/hostapd-0.6.8-init.d,
-  +hostapd-0.6.8.ebuild:
-  Bumping to 0.6.8
-
-*hostapd-0.6.7 (06 Jan 2009)
-
-  06 Jan 2009; Bjarke Istrup Pedersen <gurligebis@gentoo.org>
-  -files/hostapd-0.6.6-conf.d, -files/hostapd-0.6.6-init.d,
-  +files/hostapd-0.6.7-conf.d, +files/hostapd-0.6.7-init.d, metadata.xml,
-  -hostapd-0.6.6.ebuild, +hostapd-0.6.7.ebuild:
-  Bumping to 0.6.7 and adding WPS support to the ebuild
-
-  29 Dec 2008; Bjarke Istrup Pedersen <gurligebis@gentoo.org>
-  hostapd-0.6.6.ebuild:
-  Fixing typo in version check reported by Jackie
-
-*hostapd-0.6.6 (14 Dec 2008)
-
-  14 Dec 2008; Bjarke Istrup Pedersen <gurligebis@gentoo.org>
-  -files/hostapd-0.6.5-conf.d, -files/hostapd-0.6.5-init.d,
-  +files/hostapd-0.6.6-conf.d, +files/hostapd-0.6.6-init.d,
-  -hostapd-0.6.5.ebuild, +hostapd-0.6.6.ebuild:
-  Bumping to 0.6.6
-
-*hostapd-0.6.5 (14 Dec 2008)
-
-  14 Dec 2008; Bjarke Istrup Pedersen <gurligebis@gentoo.org>
-  -files/hostapd-0.6.4-conf.d, -files/hostapd-0.6.4-init.d,
-  +files/hostapd-0.6.5-conf.d, +files/hostapd-0.6.5-init.d,
-  -hostapd-0.6.4.ebuild, +hostapd-0.6.5.ebuild:
-  Bumping to 0.6.5 and removing broken nl80211 check
-
-  23 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
-  add GLEP 56 USE flag desc from use.local.desc
-
-  20 Aug 2008; Bjarke Istrup Pedersen <gurligebis@gentoo.org>
-  -files/hostapd-0.4.9-conf.d, -files/hostapd-0.4.9-init.d,
-  -hostapd-0.4.9.ebuild:
-  Removing 0.4.9, since it has been out of development for a long time, and
-  0.5.10 finally is stable
-
-  20 Aug 2008; Markus Meier <maekke@gentoo.org> hostapd-0.5.10.ebuild:
-  amd64/x86 stable, bug #234503
-
-  12 Aug 2008; Brent Baude <ranger@gentoo.org> hostapd-0.5.10.ebuild:
-  stable ppc, bug 234503
-
-*hostapd-0.6.4 (11 Aug 2008)
-
-  11 Aug 2008; Bjarke Istrup Pedersen <gurligebis@gentoo.org>
-  -files/hostapd-0.6.3-conf.d, -files/004-nl80211-rename-STAT-to-INFO.patch,
-  -files/hostapd-0.6.3-init.d, +files/hostapd-0.6.4-conf.d,
-  +files/hostapd-0.6.4-init.d, metadata.xml, -hostapd-0.6.3-r1.ebuild,
-  +hostapd-0.6.4.ebuild:
-  Bumping to version 0.6.4 and adding use flag info to metadata.xml
-
-  11 Jul 2008; Bjarke Istrup Pedersen <gurligebis@gentoo.org>
-  hostapd-0.6.3-r1.ebuild:
-  Added note about kernel missing patch with download link
-
-*hostapd-0.6.3-r1 (05 Jun 2008)
-
-  05 Jun 2008; Bjarke Istrup Pedersen <gurligebis@gentoo.org>
-  +files/004-nl80211-rename-STAT-to-INFO.patch, -hostapd-0.6.3.ebuild,
-  +hostapd-0.6.3-r1.ebuild:
-  Bumping to 0.6.3-r1, finally adding support for nl80211.
-
-  03 Jun 2008; Michael Sterrett <mr_bones_@gentoo.org> hostapd-0.4.9.ebuild,
-  hostapd-0.5.10.ebuild, hostapd-0.6.3.ebuild:
-  remove reference to old, removed net-wireless/madwifi-ng
-
-*hostapd-0.5.10 (15 May 2008)
-
-  15 May 2008; Bjarke Istrup Pedersen <gurligebis@gentoo.org>
-  -files/hostapd-0.5.8-conf.d, -files/hostapd-0.5.8-init.d,
-  +files/hostapd-0.5.10-conf.d, +files/hostapd-0.5.10-init.d,
-  -hostapd-0.5.8.ebuild, +hostapd-0.5.10.ebuild:
-  Bumping to version 0.5.10
-
-*hostapd-0.6.3 (11 Mar 2008)
-
-  11 Mar 2008; Bjarke Istrup Pedersen <gurligebis@gentoo.org>
-  -files/hostapd-0.6.1-conf.d, -files/hostapd-0.6.1-init.d,
-  +files/hostapd-0.6.3-conf.d, +files/hostapd-0.6.3-init.d,
-  -hostapd-0.6.1.ebuild, +hostapd-0.6.3.ebuild:
-  Bumping to version 0.6.3
-
-*hostapd-0.6.1 (10 Dec 2007)
-
-  10 Dec 2007; Bjarke Istrup Pedersen <gurligebis@gentoo.org>
-  -files/hostapd-0.6.0-conf.d, -files/hostapd-0.6.0-init.d,
-  +files/hostapd-0.6.1-conf.d, +files/hostapd-0.6.1-init.d,
-  -hostapd-0.6.0.ebuild, +hostapd-0.6.1.ebuild:
-  Bumping to version 0.6.1
-
-  10 Sep 2007; Bjarke Istrup Pedersen <gurligebis@gentoo.org>
-  hostapd-0.6.0.ebuild:
-  Removed support for mac80211 since it is broken for now
-
-  19 Jun 2007; Stefan Schweizer <genstef@gentoo.org> hostapd-0.4.9.ebuild,
-  hostapd-0.5.8.ebuild, hostapd-0.6.0.ebuild:
-  New madwifi-ng-tools depends thanks to Gordon Malm
-  <bugs-gentoo-org-01@bumpin.org> in bug 179348
-
-*hostapd-0.5.8 (06 Jun 2007)
-
-  06 Jun 2007; Bjarke Istrup Pedersen <gurligebis@gentoo.org>
-  -files/hostapd-0.5.7-conf.d, -files/hostapd-0.5.7-init.d,
-  +files/hostapd-0.5.8-conf.d, +files/hostapd-0.5.8-init.d,
-  -hostapd-0.5.7.ebuild, +hostapd-0.5.8.ebuild:
-  Bumping to version 0.5.8 and removing 0.5.7
-
-*hostapd-0.6.0 (06 Jun 2007)
-
-  06 Jun 2007; Bjarke Istrup Pedersen <gurligebis@gentoo.org>
-  -files/hostapd-0.4.7-conf.d, -files/hostapd-0.4.7-init.d,
-  -files/hostapd-0.4.8-conf.d, -files/hostapd-0.4.8-init.d,
-  -files/hostapd-0.5.2-conf.d, -files/hostapd-0.5.2-init.d,
-  -files/hostapd-0.5.2-ssl.patch, -files/hostapd-0.5.3-conf.d,
-  -files/hostapd-0.5.3-init.d, -files/hostapd-0.5.3-os_get_random.patch,
-  -files/hostapd-0.5.4-conf.d, -files/hostapd-0.5.4-init.d,
-  +files/hostapd-0.6.0-conf.d, +files/hostapd-0.6.0-init.d, metadata.xml,
-  +hostapd-0.6.0.ebuild:
-  Bumping to version 0.6.0, removed stalled files and added myself as maintainer
-
-  11 Mar 2007; Petteri Räty <betelgeuse@gentoo.org> metadata.xml:
-  Fix metadata.xml white space.
-
-  11 Mar 2007; Petteri Räty <betelgeuse@gentoo.org> hostapd-0.4.9.ebuild,
-  hostapd-0.5.7.ebuild:
-  Fix ROOT usage wrt bug #168039.
-
-*hostapd-0.5.7 (10 Feb 2007)
-
-  10 Feb 2007; Christian Heim <phreak@gentoo.org>
-  +files/hostapd-0.5.7-conf.d, +files/hostapd-0.5.7-init.d,
-  +hostapd-0.5.7.ebuild:
-  Version bump, thanks to Conrad Kostecki <ConiKost at gmx.de> in #150769.
-
-  10 Sep 2006; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
-  Remove brix from metadata.xml.
-
-  03 Sep 2006; Michael Hanselmann <hansmi@gentoo.org> hostapd-0.4.9.ebuild:
-  Stable on ppc.
-
-  26 Jun 2006; Henrik Brix Andersen <brix@gentoo.org> hostapd-0.4.9.ebuild:
-  Stable on x86.
-
-*hostapd-0.5.4 (21 Jun 2006)
-
-  21 Jun 2006; Henrik Brix Andersen <brix@gentoo.org>
-  +files/hostapd-0.5.4-conf.d, +files/hostapd-0.5.4-init.d,
-  +hostapd-0.5.4.ebuild:
-  New developer snapshot.
-
-*hostapd-0.4.9 (27 May 2006)
-
-  27 May 2006; Henrik Brix Andersen <brix@gentoo.org>
-  +files/hostapd-0.4.9-conf.d, +files/hostapd-0.4.9-init.d,
-  +hostapd-0.4.9.ebuild:
-  Version bump.
-
-*hostapd-0.5.3 (29 Apr 2006)
-
-  29 Apr 2006; Henrik Brix Andersen <brix@gentoo.org>
-  +files/hostapd-0.5.3-conf.d, +files/hostapd-0.5.3-init.d,
-  +files/hostapd-0.5.3-os_get_random.patch, +hostapd-0.5.3.ebuild:
-  New development snapshot.
-
-  14 Apr 2006; Henrik Brix Andersen <brix@gentoo.org> hostapd-0.4.8.ebuild,
-  hostapd-0.5.2.ebuild:
-  Updated madwifi dependencies.
-
-  26 Mar 2006; Henrik Brix Andersen <brix@gentoo.org>
-  -files/hostapd-0.5.0-conf.d, -files/hostapd-0.5.0-init.d,
-  -files/hostapd-0.5.1-conf.d, -files/hostapd-0.5.1-init.d,
-  +files/hostapd-0.5.2-ssl.patch, -hostapd-0.4.7-r1.ebuild,
-  -hostapd-0.5.0.ebuild, -hostapd-0.5.0-r1.ebuild, -hostapd-0.5.1.ebuild,
-  hostapd-0.5.2.ebuild:
-  Fix compilation with USE=-ssl, thanks to langthang in bug #127598. Pruned
-  old ebuilds.
-
-*hostapd-0.5.2 (20 Mar 2006)
-
-  20 Mar 2006; Henrik Brix Andersen <brix@gentoo.org>
-  +files/hostapd-0.5.2-conf.d, +files/hostapd-0.5.2-init.d,
-  +hostapd-0.5.2.ebuild:
-  New development snapshot.
-
-  15 Mar 2006; Henrik Brix Andersen <brix@gentoo.org> hostapd-0.4.8.ebuild:
-  Stable on x86.
-
-  27 Feb 2006; Henrik Brix Andersen <brix@gentoo.org> hostapd-0.4.8.ebuild,
-  hostapd-0.5.0.ebuild, hostapd-0.5.0-r1.ebuild, hostapd-0.5.1.ebuild:
-  Fix madwifi compilation with ROOT != "/".
-
-  19 Feb 2006; Michael Hanselmann <hansmi@gentoo.org>
-  hostapd-0.4.7-r2.ebuild:
-  Stable on ppc.
-
-  16 Feb 2006; Henrik Brix Andersen <brix@gentoo.org> hostapd-0.5.0.ebuild,
-  hostapd-0.5.0-r1.ebuild, hostapd-0.5.1.ebuild:
-  Fix building with USE=-ssl. Thanks to langthang in bug #122987.
-
-*hostapd-0.4.8 (14 Feb 2006)
-
-  14 Feb 2006; Henrik Brix Andersen <brix@gentoo.org>
-  +files/hostapd-0.4.8-conf.d, +files/hostapd-0.4.8-init.d,
-  +hostapd-0.4.8.ebuild:
-  New stable release from upstream. Backported madwifi support from 0.5.x
-  ebuilds.
-
-  13 Feb 2006; Henrik Brix Andersen <brix@gentoo.org>
-  hostapd-0.4.7-r2.ebuild:
-  Stable on x86.
-
-  03 Feb 2006; Henrik Brix Andersen <brix@gentoo.org>
-  -files/hostapd-0.3.9-conf.d, -files/hostapd-0.3.9-init.d,
-  -files/hostapd-0.4.5-conf.d, -files/hostapd-0.4.5-init.d,
-  -files/hostapd-0.4.5-prism54.patch, -files/hostapd-0.4.6-conf.d,
-  -files/hostapd-0.4.6-init.d, -files/hostapd.init.d, -hostapd-0.4.5.ebuild,
-  -hostapd-0.4.6.ebuild, -hostapd-0.4.7.ebuild:
-  Pruned old ebuilds.
-
-*hostapd-0.5.1 (30 Jan 2006)
-
-  30 Jan 2006; Henrik Brix Andersen <brix@gentoo.org>
-  +files/hostapd-0.5.1-conf.d, +files/hostapd-0.5.1-init.d,
-  +hostapd-0.5.1.ebuild:
-  New development snapshot.
-
-*hostapd-0.5.0-r1 (09 Jan 2006)
-*hostapd-0.4.7-r2 (09 Jan 2006)
-
-  09 Jan 2006; Henrik Brix Andersen <brix@gentoo.org>
-  files/hostapd-0.4.7-init.d, files/hostapd-0.5.0-init.d,
-  +hostapd-0.4.7-r2.ebuild, +hostapd-0.5.0-r1.ebuild:
-  Fix init scripts to work with baselayout-1.12.0_rcX.
-
-  02 Jan 2006; Michael Hanselmann <hansmi@gentoo.org>
-  hostapd-0.4.7-r1.ebuild:
-  Stable on ppc.
-
-  30 Dec 2005; Henrik Brix Andersen <brix@gentoo.org>
-  hostapd-0.4.7-r1.ebuild:
-  Stable on x86.
-
-*hostapd-0.4.7-r1 (30 Dec 2005)
-
-  30 Dec 2005; Henrik Brix Andersen <brix@gentoo.org>
-  +hostapd-0.4.7-r1.ebuild:
-  Added version without madwifi support in preparation for marking it stable
-  on x86.
-
-  24 Dec 2005; Michael Hanselmann <hansmi@gentoo.org>
-  hostapd-0.3.9-r1.ebuild:
-  Stable on ppc.
-
-*hostapd-0.5.0 (20 Dec 2005)
-
-  20 Dec 2005; Henrik Brix Andersen <brix@gentoo.org>
-  +files/hostapd-0.5.0-conf.d, +files/hostapd-0.5.0-init.d,
-  +hostapd-0.5.0.ebuild:
-  New development snapshot.
-
-*hostapd-0.4.7 (21 Nov 2005)
-
-  21 Nov 2005; Henrik Brix Andersen <brix@gentoo.org>
-  +files/hostapd-0.4.7-conf.d, +files/hostapd-0.4.7-init.d,
-  +hostapd-0.4.7.ebuild:
-  First release of new stable branch.
-
-*hostapd-0.4.6 (29 Oct 2005)
-
-  29 Oct 2005; Henrik Brix Andersen <brix@gentoo.org>
-  +files/hostapd-0.4.6-conf.d, +files/hostapd-0.4.6-init.d,
-  +hostapd-0.4.6.ebuild:
-  New development release.
-
-  22 Oct 2005; Henrik Brix Andersen <brix@gentoo.org>
-  -files/hostapd-0.4.3-conf.d, -files/hostapd-0.4.3-init.d,
-  -files/hostapd-0.4.4-conf.d, -files/hostapd-0.4.4-init.d,
-  -hostapd-0.4.3.ebuild, -hostapd-0.4.4.ebuild, -hostapd-0.4.4-r1.ebuild:
-  Pruned old versions.
-
-*hostapd-0.4.5 (17 Oct 2005)
-
-  17 Oct 2005; Henrik Brix Andersen <brix@gentoo.org>
-  +files/hostapd-0.4.5-conf.d, +files/hostapd-0.4.5-init.d,
-  +files/hostapd-0.4.5-prism54.patch, +hostapd-0.4.5.ebuild:
-  New development snapshot, bug #108319.
-
-  17 Sep 2005; Simon Stelling <blubb@gentoo.org> hostapd-0.4.4-r1.ebuild:
-  added ~amd64 keyword
-
-*hostapd-0.4.4-r1 (22 Aug 2005)
-
-  22 Aug 2005; Henrik Brix Andersen <brix@gentoo.org>
-  files/hostapd-0.4.4-init.d, +hostapd-0.4.4-r1.ebuild:
-  Install more example configuration files, use SIGHUP for reloading
-  configuration in init script.
-
-*hostapd-0.4.4 (22 Aug 2005)
-
-  22 Aug 2005; Henrik Brix Andersen <brix@gentoo.org>
-  +files/hostapd-0.4.4-conf.d, +files/hostapd-0.4.4-init.d,
-  +hostapd-0.4.4.ebuild:
-  New development snapshot. Compile against headers installed by
-  net-wireless/madwifi-driver instead of local snapshot.
-
-  16 Aug 2005; Henrik Brix Andersen <brix@gentoo.org> ChangeLog:
-  Stable on x86.
-
-  13 Jul 2005; <brix@gentoo.org> -files/hostapd-0.4.0-conf.d,
-  -files/hostapd-0.4.0-init.d, -files/hostapd-0.4.1-conf.d,
-  -files/hostapd-0.4.1-init.d, -files/hostapd-0.4.2-conf.d,
-  -files/hostapd-0.4.2-init.d, -hostapd-0.2.5.ebuild, -hostapd-0.2.6.ebuild,
-  -hostapd-0.3.9.ebuild, -hostapd-0.4.0-r1.ebuild, -hostapd-0.4.1.ebuild,
-  -hostapd-0.4.2.ebuild:
-  Pruned old ebuilds.
-
-  08 Jul 2005; <brix@gentoo.org> hostapd-0.3.9.ebuild,
-  hostapd-0.3.9-r1.ebuild, hostapd-0.4.0-r1.ebuild, hostapd-0.4.1.ebuild,
-  hostapd-0.4.2.ebuild, hostapd-0.4.3.ebuild:
-  Fixed DEPEND/RDEPEND issue.
-
-*hostapd-0.4.3 (27 Jun 2005)
-
-  27 Jun 2005; <brix@gentoo.org> +files/hostapd-0.4.3-conf.d,
-  +files/hostapd-0.4.3-init.d, +hostapd-0.4.3.ebuild:
-  New development snapshot.
-
-  27 Jun 2005; David Holm <dholm@gentoo.org> hostapd-0.3.7.ebuild:
-  Stable on ppc.
-
-*hostapd-0.3.9-r1 (13 Jun 2005)
-
-  13 Jun 2005; <brix@gentoo.org> +files/hostapd-0.3.9-conf.d,
-  +files/hostapd-0.3.9-init.d, +hostapd-0.3.9-r1.ebuild:
-  Backported 0.4.x ebuild fixes to 0.3.9.
-
-*hostapd-0.4.2 (13 Jun 2005)
-
-  13 Jun 2005; <brix@gentoo.org> +files/hostapd-0.4.2-conf.d,
-  +files/hostapd-0.4.2-init.d, +hostapd-0.4.2.ebuild:
-  New development release.
-
-*hostapd-0.3.9 (11 Jun 2005)
-
-  11 Jun 2005; <brix@gentoo.org> +hostapd-0.3.9.ebuild:
-  New stable release.
-
-*hostapd-0.4.1 (23 May 2005)
-
-  23 May 2005; <brix@gentoo.org> +files/hostapd-0.4.1-conf.d,
-  +files/hostapd-0.4.1-init.d, +hostapd-0.4.1.ebuild:
-  New development release.
-
-  11 May 2005; <brix@gentoo.org> -hostapd-0.4.0.ebuild:
-  Removed old ebuild
-
-*hostapd-0.4.0-r1 (29 Apr 2005)
-
-  29 Apr 2005; <brix@gentoo.org> +files/hostapd-0.4.0-conf.d,
-  +files/hostapd-0.4.0-init.d, +hostapd-0.4.0-r1.ebuild:
-  Install hostapd_cli and man pages, restructured init script.
-
-*hostapd-0.4.0 (27 Apr 2005)
-
-  27 Apr 2005; <brix@gentoo.org> +hostapd-0.4.0.ebuild:
-  New development snapshot.
-
-  16 Apr 2005; <brix@gentoo.org> hostapd-0.3.7.ebuild:
-  Stable on x86.
-
-  13 Feb 2005; Henrik Brix Andersen <brix@gentoo.org> -hostapd-0.3.5.ebuild,
-  -hostapd-0.3.7_pre.ebuild:
-  Pruned old versions.
-
-*hostapd-0.3.7 (13 Feb 2005)
-
-  13 Feb 2005; Henrik Brix Andersen <brix@gentoo.org> +hostapd-0.3.7.ebuild:
-  New stable version from upstream.
-
-*hostapd-0.3.7_pre (07 Feb 2005)
-
-  07 Feb 2005; Henrik Brix Andersen <brix@gentoo.org>
-  +hostapd-0.3.7_pre.ebuild:
-  Added pre-release of 0.3.7 which is supposed to go stable soon, please test.
-
-  25 Jan 2005; Henrik Brix Andersen <brix@gentoo.org> -hostapd-0.2.4.ebuild,
-  -hostapd-0.3.0.ebuild, -hostapd-0.3.1.ebuild, -hostapd-0.3.2.ebuild,
-  -hostapd-0.3.3.ebuild, -hostapd-0.3.4.ebuild:
-  Pruned old versions.
-
-*hostapd-0.3.5 (24 Jan 2005)
-
-  24 Jan 2005; Henrik Brix Andersen <brix@gentoo.org> +hostapd-0.3.5.ebuild:
-  New development snapshot.
-
-  18 Jan 2005; Henrik Brix Andersen <brix@gentoo.org> hostapd-0.2.4.ebuild,
-  hostapd-0.2.5.ebuild, hostapd-0.2.6.ebuild, hostapd-0.3.0.ebuild,
-  hostapd-0.3.1.ebuild, hostapd-0.3.2.ebuild, hostapd-0.3.3.ebuild,
-  hostapd-0.3.4.ebuild:
-  Removed hostap-driver dependency, fixes bug #78094.
-
-  14 Jan 2005; Henrik Brix Andersen <brix@gentoo.org> hostapd-0.2.6.ebuild:
-  Stable on x86.
-
-*hostapd-0.3.4 (10 Jan 2005)
-
-  10 Jan 2005; Henrik Brix Andersen <brix@gentoo.org> +hostapd-0.3.4.ebuild:
-  New development version, bumped included madwifi-driver.
-
-*hostapd-0.3.3 (03 Jan 2005)
-
-  03 Jan 2005; Henrik Brix Andersen <brix@gentoo.org> +hostapd-0.3.3.ebuild:
-  New development snapshot.
-
-*hostapd-0.2.6 (26 Dec 2004)
-
-  26 Dec 2004; Henrik Brix Andersen <brix@gentoo.org> +hostapd-0.2.6.ebuild:
-  Version bump.
-
-*hostapd-0.3.2 (20 Dec 2004)
-
-  20 Dec 2004; Henrik Brix Andersen <brix@gentoo.org> +hostapd-0.3.2.ebuild:
-  Added new development snapshot.
-
-*hostapd-0.3.1 (13 Dec 2004)
-
-  13 Dec 2004; Henrik Brix Andersen <brix@gentoo.org> +hostapd-0.3.1.ebuild:
-  Version bump (development snapshot)
-
-*hostapd-0.3.0 (12 Dec 2004)
-
-  12 Dec 2004; Henrik Brix Andersen <brix@gentoo.org> +hostapd-0.3.0.ebuild:
-  Version bump. Please note that version 0.3.0 is a development snapshot.
-
-  12 Dec 2004; Daniel Black <dragonheart@gentoo.org> hostapd-0.2.5.ebuild:
-  ppc stable as per bug #74117. Changed DEPEND on kernel modules to a RDEPEND.
-
-  10 Dec 2004; Henrik Brix Andersen <brix@gentoo.org> -hostapd-0.1.0.ebuild,
-  -hostapd-0.1.3.ebuild:
-  Pruned ancient versions.
-
-  27 Nov 2004; Wolfram Schlich <wschlich@gentoo.org> hostapd-0.2.5.ebuild:
-  mark stable on x86
-
-  01 Nov 2004; Henrik Brix Andersen <brix@gentoo.org> hostapd-0.1.0.ebuild,
-  hostapd-0.1.3.ebuild, hostapd-0.2.4.ebuild, hostapd-0.2.5.ebuild:
-  Use tc-getCC() from toolchain-funcs.eclass, fixes bug #69282.
-
-*hostapd-0.2.5 (25 Oct 2004)
-
-  25 Oct 2004; Henrik Brix Andersen <brix@gentoo.org> +hostapd-0.2.5.ebuild:
-  Version bump. Cleaned up ebuild.
-
-*hostapd-0.2.4 (14 Sep 2004)
-
-  14 Sep 2004; Henrik Brix Andersen <brix@gentoo.org> +hostapd-0.2.4.ebuild:
-  Bump. Ebuild by latexer@gentoo.org.
-
-*hostapd-0.1.3 (09 Feb 2004)
-
-  09 Feb 2004; Wolfram Schlich <wschlich@gentoo.org> hostapd-0.1.3.ebuild:
-  Version bump
-
-  16 Dec 2003; Wolfram Schlich <wschlich@gentoo.org> hostapd-0.1.0.ebuild:
-  mark stable on x86
-
-  11 Nov 2003; Peter Johanson <latexer@gentoo.org> metadata.xml:
-  Added to the new "mobile" herd.
-
-*hostapd-0.1.0 (21 Oct 2003)
-
-  21 Oct 2003; Wolfram Schlich <wschlich@gentoo.org> hostapd-0.1.0.ebuild,
-  metadata.xml:
-  Initial import
-
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@ -1 +1,2 @@
 DIST hostapd-2.6.tar.gz 1822341 BLAKE2B c0075ffcdb11237e11410d87329a7a71aae5e00481022e02faf03771d45a61410ff906ebffdeea03fdeab751ce85e5a5e191173883ee9f1c284e6bc00342a011 SHA512 e60baaa092786250b8de9935f5417c7626f5d749210cce9f83d776b65c19fc92a8141f41923389f05c16295d482a15ae8d8b744f4667425040c99e3c2f5b1bda
+DIST net-wireless_hostapd_2.6-r6_extras.tar.xz 11156 BLAKE2B 62205070d4dd081d4149616f1abb4f84105c77433464dc9fea41a3fa9f58cc09af99b4e6618657777e77759d33e38c8a5647537c0098e772f032a368b82be709 SHA512 c21155e16ef931e431cca54c0f83567915b511d7abe42a5b4a4475d40eda3616eb017f0a669fd7326bc4f410f9a8e174fb8e0619cb32631ab1ca22e6fad2c612
--- a/net-wireless/hostapd/files/hostapd-2.6-libressl-compatibility.patch
+++ b/net-wireless/hostapd/files/hostapd-2.6-libressl-compatibility.patch
@ -0,0 +1,106 @@
+diff --git a/src/crypto/crypto_openssl.c b/src/crypto/crypto_openssl.c
+index 19e0e2be8..6585c0245 100644
+--- a/src/crypto/crypto_openssl.c
+++ b/src/crypto/crypto_openssl.c
+@@ -33,7 +33,9 @@
+ #include "aes_wrap.h"
+ #include "crypto.h"
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
+	(defined(LIBRESSL_VERSION_NUMBER) && \
+	 LIBRESSL_VERSION_NUMBER < 0x20700000L)
+ /* Compatibility wrappers for older versions. */
+ 
+ static HMAC_CTX * HMAC_CTX_new(void)
+@@ -79,7 +81,9 @@ static void EVP_MD_CTX_free(EVP_MD_CTX *ctx)
+ 
+ static BIGNUM * get_group5_prime(void)
+ {
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && \
+	!(defined(LIBRESSL_VERSION_NUMBER) && \
+	LIBRESSL_VERSION_NUMBER < 0x20700000L)
+ 	return BN_get_rfc3526_prime_1536(NULL);
+ #elif !defined(OPENSSL_IS_BORINGSSL)
+ 	return get_rfc3526_prime_1536(NULL);
+@@ -611,7 +615,9 @@ void crypto_cipher_deinit(struct crypto_cipher *ctx)
+ 
+ void * dh5_init(struct wpabuf **priv, struct wpabuf **publ)
+ {
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
+	(defined(LIBRESSL_VERSION_NUMBER) && \
+	LIBRESSL_VERSION_NUMBER < 0x20700000L)
+ 	DH *dh;
+ 	struct wpabuf *pubkey = NULL, *privkey = NULL;
+ 	size_t publen, privlen;
+@@ -712,7 +718,9 @@ err:
+ 
+ void * dh5_init_fixed(const struct wpabuf *priv, const struct wpabuf *publ)
+ {
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
+	(defined(LIBRESSL_VERSION_NUMBER) && \
+	LIBRESSL_VERSION_NUMBER < 0x20700000L)
+ 	DH *dh;
+ 
+ 	dh = DH_new();
+diff --git a/src/crypto/tls_openssl.c b/src/crypto/tls_openssl.c
+index 23ac64b48..91acc579d 100644
+--- a/src/crypto/tls_openssl.c
+++ b/src/crypto/tls_openssl.c
+@@ -59,7 +59,8 @@ typedef int stack_index_t;
+ #endif /* SSL_set_tlsext_status_type */
+ 
+ #if (OPENSSL_VERSION_NUMBER < 0x10100000L || \
+-     defined(LIBRESSL_VERSION_NUMBER)) &&    \
+	(defined(LIBRESSL_VERSION_NUMBER) && \
+	LIBRESSL_VERSION_NUMBER < 0x20700000L)) && \
+     !defined(BORINGSSL_API_VERSION)
+ /*
+  * SSL_get_client_random() and SSL_get_server_random() were added in OpenSSL
+@@ -919,7 +920,9 @@ void * tls_init(const struct tls_config *conf)
+ 		}
+ #endif /* OPENSSL_FIPS */
+ #endif /* CONFIG_FIPS */
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
+        (defined(LIBRESSL_VERSION_NUMBER) && \
+        LIBRESSL_VERSION_NUMBER < 0x20700000L)
+ 		SSL_load_error_strings();
+ 		SSL_library_init();
+ #ifndef OPENSSL_NO_SHA256
+@@ -1043,7 +1046,9 @@ void tls_deinit(void *ssl_ctx)
+ 
+ 	tls_openssl_ref_count--;
+ 	if (tls_openssl_ref_count == 0) {
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
+	(defined(LIBRESSL_VERSION_NUMBER) && \
+	LIBRESSL_VERSION_NUMBER < 0x20700000L)
+ #ifndef OPENSSL_NO_ENGINE
+ 		ENGINE_cleanup();
+ #endif /* OPENSSL_NO_ENGINE */
+@@ -3105,7 +3110,9 @@ int tls_connection_get_random(void *ssl_ctx, struct tls_connection *conn,
+ #ifdef OPENSSL_NEED_EAP_FAST_PRF
+ static int openssl_get_keyblock_size(SSL *ssl)
+ {
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
+        (defined(LIBRESSL_VERSION_NUMBER) && \
+        LIBRESSL_VERSION_NUMBER < 0x20700000L)
+ 	const EVP_CIPHER *c;
+ 	const EVP_MD *h;
+ 	int md_size;
+@@ -4159,7 +4166,9 @@ static int tls_sess_sec_cb(SSL *s, void *secret, int *secret_len,
+ 	struct tls_connection *conn = arg;
+ 	int ret;
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
+        (defined(LIBRESSL_VERSION_NUMBER) && \
+        LIBRESSL_VERSION_NUMBER < 0x20700000L)
+ 	if (conn == NULL || conn->session_ticket_cb == NULL)
+ 		return 0;
+ 
--- a/net-wireless/hostapd/files/hostapd-2.6-wpe-r3.patch
+++ b/net-wireless/hostapd/files/hostapd-2.6-wpe-r3.patch
--- a/net-wireless/hostapd/hostapd-2.6-r6.ebuild
+++ b/net-wireless/hostapd/hostapd-2.6-r6.ebuild
@ -0,0 +1,280 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs eutils systemd savedconfig
+
+DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
+HOMEPAGE="https://github.com/aircrack-ng/aircrack-ng/tree/master/patches/wpe/hostapd-wpe"
+EXTRAS_VER="2.6-r6"
+EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras"
+SRC_URI="http://w1.fi/releases/${P}.tar.gz
+	https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
+IUSE="internal-tls ipv6 karma_cli libressl logwatch netlink sqlite +wpe +wps +crda"
+
+REQUIRED_USE="^^ ( wpe karma_cli )"
+
+DEPEND="
+	libressl? ( dev-libs/libressl:0= )
+	!libressl? (
+		internal-tls? ( dev-libs/libtommath )
+		!internal-tls? ( dev-libs/openssl:0=[-bindist] )
+	)
+	kernel_linux? (
+		dev-libs/libnl:3
+		crda? ( net-wireless/crda )
+	)
+	netlink? ( net-libs/libnfnetlink )
+	sqlite? ( >=dev-db/sqlite-3 )
+	wpe? ( dev-libs/uthash )"
+
+RDEPEND="${DEPEND}"
+
+S="${S}/${PN}"
+
+pkg_pretend() {
+	if use internal-tls; then
+		if use libressl; then
+			elog "libressl flag takes precedence over internal-tls"
+		else
+			ewarn "internal-tls implementation is experimental and provides fewer features"
+		fi
+	fi
+}
+
+src_prepare() {
+	# Allow users to apply patches to src/drivers for example,
+	# i.e. anything outside ${S}/${PN}
+	pushd ../ >/dev/null || die
+
+	# Add LibreSSL compatibility patch bug (#567262)
+	eapply "${WORKDIR}/${EXTRAS_NAME}/${P}-libressl-compatibility.patch"
+
+	# https://w1.fi/security/2017-1/wpa-packet-number-reuse-with-replayed-messages.txt
+	eapply "${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch"
+	eapply "${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch"
+	eapply "${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch"
+	eapply "${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch"
+	eapply "${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch"
+	eapply "${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch"
+	eapply "${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch"
+
+	eapply "${WORKDIR}/${EXTRAS_NAME}/nl80211-Fix-NL80211_ATTR_SMPS_MODE-encoding.patch"
+
+	#https://github.com/aircrack-ng/aircrack-ng/tree/master/patches/wpe/hostapd-wpe
+	use wpe && cd .. && epatch "${FILESDIR}/${P}-wpe-r3.patch"
+
+	#mana (cli) patch from https://gist.github.com/singe/05799e3e3184947a6803d6cd1538a71a
+	use karma_cli && cd .. && epatch "${FILESDIR}/${P}-wpe_mana.patch"
+
+	default
+	popd >/dev/null || die
+
+	sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
+		"${S}/hostapd.conf" || die
+
+}
+
+src_configure() {
+	local CONFIG="${S}/.config"
+
+	restore_config "${CONFIG}"
+	if [[ -f "${CONFIG}" ]]; then
+		default_src_configure
+		return 0
+	fi
+
+	# toolchain setup
+	echo "CC = $(tc-getCC)" > ${CONFIG}
+
+	# EAP authentication methods
+	echo "CONFIG_EAP=y" >> ${CONFIG}
+	echo "CONFIG_ERP=y" >> ${CONFIG}
+	echo "CONFIG_EAP_MD5=y" >> ${CONFIG}
+
+	if use wpe; then
+		echo "CONFIG_TAXONOMY=y" >> ${CONFIG}
+	fi
+
+	if use internal-tls && ! use libressl; then
+		echo "CONFIG_TLS=internal" >> ${CONFIG}
+	else
+		# SSL authentication methods
+		echo "CONFIG_EAP_FAST=y" >> ${CONFIG}
+		echo "CONFIG_EAP_TLS=y" >> ${CONFIG}
+		echo "CONFIG_EAP_TTLS=y" >> ${CONFIG}
+		echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG}
+		echo "CONFIG_EAP_PEAP=y" >> ${CONFIG}
+		echo "CONFIG_TLSV11=y" >> ${CONFIG}
+		echo "CONFIG_TLSV12=y" >> ${CONFIG}
+		echo "CONFIG_EAP_PWD=y" >> ${CONFIG}
+	fi
+
+	if use wps; then
+		# Enable Wi-Fi Protected Setup
+		echo "CONFIG_WPS=y" >> ${CONFIG}
+		echo "CONFIG_WPS2=y" >> ${CONFIG}
+		echo "CONFIG_WPS_UPNP=y" >> ${CONFIG}
+		echo "CONFIG_WPS_NFC=y" >> ${CONFIG}
+		einfo "Enabling Wi-Fi Protected Setup support"
+	fi
+
+	echo "CONFIG_EAP_IKEV2=y" >> ${CONFIG}
+	echo "CONFIG_EAP_TNC=y" >> ${CONFIG}
+	echo "CONFIG_EAP_GTC=y" >> ${CONFIG}
+	echo "CONFIG_EAP_SIM=y" >> ${CONFIG}
+	echo "CONFIG_EAP_AKA=y" >> ${CONFIG}
+	echo "CONFIG_EAP_AKA_PRIME=y" >> ${CONFIG}
+	echo "CONFIG_EAP_EKE=y" >> ${CONFIG}
+	echo "CONFIG_EAP_PAX=y" >> ${CONFIG}
+	echo "CONFIG_EAP_PSK=y" >> ${CONFIG}
+	echo "CONFIG_EAP_SAKE=y" >> ${CONFIG}
+	echo "CONFIG_EAP_GPSK=y" >> ${CONFIG}
+	echo "CONFIG_EAP_GPSK_SHA256=y" >> ${CONFIG}
+
+	einfo "Enabling drivers: "
+
+	# drivers
+	echo "CONFIG_DRIVER_HOSTAP=y" >> ${CONFIG}
+	einfo "  HostAP driver enabled"
+	echo "CONFIG_DRIVER_WIRED=y" >> ${CONFIG}
+	einfo "  Wired driver enabled"
+	echo "CONFIG_DRIVER_NONE=y" >> ${CONFIG}
+	einfo "  None driver enabled"
+
+	einfo "  nl80211 driver enabled"
+	echo "CONFIG_DRIVER_NL80211=y" >> ${CONFIG}
+
+	# epoll
+	echo "CONFIG_ELOOP_EPOLL=y" >> ${CONFIG}
+
+	# misc
+	echo "CONFIG_DEBUG_FILE=y" >> ${CONFIG}
+	echo "CONFIG_PKCS12=y" >> ${CONFIG}
+	echo "CONFIG_RADIUS_SERVER=y" >> ${CONFIG}
+	echo "CONFIG_IAPP=y" >> ${CONFIG}
+	echo "CONFIG_IEEE80211R=y" >> ${CONFIG}
+	echo "CONFIG_IEEE80211W=y" >> ${CONFIG}
+	echo "CONFIG_IEEE80211N=y" >> ${CONFIG}
+	echo "CONFIG_IEEE80211AC=y" >> ${CONFIG}
+	echo "CONFIG_PEERKEY=y" >> ${CONFIG}
+	echo "CONFIG_RSN_PREAUTH=y" >> ${CONFIG}
+	echo "CONFIG_INTERWORKING=y" >> ${CONFIG}
+	echo "CONFIG_FULL_DYNAMIC_VLAN=y" >> ${CONFIG}
+	echo "CONFIG_HS20=y" >> ${CONFIG}
+	echo "CONFIG_WNM=y" >> ${CONFIG}
+	echo "CONFIG_FST=y" >> ${CONFIG}
+	echo "CONFIG_FST_TEST=y" >> ${CONFIG}
+	echo "CONFIG_ACS=y" >> ${CONFIG}
+
+	if use netlink; then
+		# Netlink support
+		echo "CONFIG_VLAN_NETLINK=y" >> ${CONFIG}
+	fi
+
+	if use ipv6; then
+		# IPv6 support
+		echo "CONFIG_IPV6=y" >> ${CONFIG}
+	fi
+
+	if use sqlite; then
+		# Sqlite support
+		echo "CONFIG_SQLITE=y" >> ${CONFIG}
+	fi
+
+	# If we are using libnl 2.0 and above, enable support for it
+	# Removed for now, since the 3.2 version is broken, and we don't
+	# support it.
+	if has_version ">=dev-libs/libnl-3.2"; then
+		echo "CONFIG_LIBNL32=y" >> .config
+	fi
+
+	# TODO: Add support for BSD drivers
+
+	default_src_configure
+}
+
+src_compile() {
+	emake V=1
+
+	if use libressl || ! use internal-tls; then
+		emake V=1 nt_password_hash
+		emake V=1 hlr_auc_gw
+	fi
+}
+
+src_install() {
+	insinto /etc/${PN}
+	doins ${PN}.{conf,accept,deny,eap_user,radius_clients,sim_db,wpa_psk}
+	doins "${FILESDIR}"/hostapd-int.conf "${FILESDIR}"/hostapd-ext.conf "${FILESDIR}/${P}"-wpe.conf
+
+	fperms -R 600 /etc/${PN}
+
+	if use wpe; then
+		dosbin ${PN}-wpe
+		dobin ${PN}-wpe_cli
+		dosym ./${PN}-wpe /usr/sbin/${PN}
+		DESTDIR="${ED}" emake wpe
+	else
+		dosbin ${PN}
+		dobin ${PN}_cli
+	fi
+
+	if use libressl || ! use internal-tls; then
+		dobin nt_password_hash hlr_auc_gw
+	fi
+
+	newinitd "${WORKDIR}/${EXTRAS_NAME}"/${PN}-init.d ${PN}
+	newconfd "${WORKDIR}/${EXTRAS_NAME}"/${PN}-conf.d ${PN}
+	systemd_dounit "${WORKDIR}/${EXTRAS_NAME}"/${PN}.service
+
+	doman ${PN}{.8,_cli.1}
+
+	dodoc ChangeLog README
+	use wps && dodoc README-WPS
+
+	docinto examples
+	dodoc wired.conf
+
+	if use logwatch; then
+		insinto /etc/log.d/conf/services/
+		doins logwatch/${PN}.conf
+
+		exeinto /etc/log.d/scripts/services/
+		doexe logwatch/${PN}
+	fi
+
+	save_config .config
+}
+
+pkg_postinst() {
+	einfo
+	einfo "If you are running openRC you need to follow this instructions:"
+	einfo "In order to use ${PN} you need to set up your wireless card"
+	einfo "for master mode in /etc/conf.d/net and then start"
+	einfo "/etc/init.d/${PN}."
+	einfo
+	einfo "Example configuration:"
+	einfo
+	einfo "config_wlan0=( \"192.168.1.1/24\" )"
+	einfo "channel_wlan0=\"6\""
+	einfo "essid_wlan0=\"test\""
+	einfo "mode_wlan0=\"master\""
+	einfo
+	#if [ -e "${KV_DIR}"/net/mac80211 ]; then
+	#	einfo "This package now compiles against the headers installed by"
+	#	einfo "the kernel source for the mac80211 driver. You should "
+	#	einfo "re-emerge ${PN} after upgrading your kernel source."
+	#fi
+
+	if use wps; then
+		einfo "You have enabled Wi-Fi Protected Setup support, please"
+		einfo "read the README-WPS file in /usr/share/doc/${P}"
+		einfo "for info on how to use WPS"
+	fi
+}
--- a/net-wireless/hostapd/metadata.xml
+++ b/net-wireless/hostapd/metadata.xml
@ -1,21 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>mobile</herd>
-	<maintainer>
-		<email>gurligebis@gentoo.org</email>
-		<name>Bjarke Istrup Pedersen</name>
-	</maintainer>
 	<longdescription>
 		User space daemon for the hostap-driver.
 		Extended IEEE 802.11 management, IEEE 802.1X Authenticator,
 		RADIUS Authentication client, RADIUS Accounting client
 	</longdescription>
 	<use>
-		<flag name='debug'>Enables debugging</flag>
-		<flag name='logwatch'>Install support files for
-			<pkg>sys-app/logwatch</pkg></flag>
-		<flag name='madwifi'>Add support for madwifi (Atheros chipset)</flag>
-		<flag name='wps'>Add support for Wi-Fi Protected Setup</flag>
+		<flag name="crda">Add CRDA support</flag>
+		<flag name="internal-tls">Use internal TLSv1 implementation instead of depending on OpenSSL, LibreSSL or GnuTLS</flag>
+		<flag name="logwatch">Install support files for 
+			<pkg>sys-apps/logwatch</pkg></flag>
+		<flag name="netlink">Adding support for using netlink to create VLANs</flag>
+		<flag name="sqlite">Adding sqlite support</flag>
+		<flag name="wps">Add support for Wi-Fi Protected Setup</flag>
 	</use>
+	<maintainer type="person">
+		<email>andrey_utkin@gentoo.org</email>
+		<name>Andrey Utkin</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>zerochaos@gentoo.org</email>
+		<name>Rick Farina</name>
+	</maintainer>
 </pkgmetadata>
--- a/net-wireless/pyrit/Manifest
+++ b/net-wireless/pyrit/Manifest
@ -0,0 +1 @@
+DIST pyrit-0.5.0_p20180801.tar.gz 2595201 BLAKE2B 76bb22a762274c5e78d0e5e74b7c64af3c9712a07000f9df0cfad39379cfcc4a2a3094d0a82829ab09c3982ccee9ac84c441c4dc4dcc34ca92c5634ee526377b SHA512 dd38da865e0fd4e6f2aab6137c8f95d386ef97809460408245f06e987b5cf8b617c78447493e583ef8f8045ff9a04aec023f79fba746ca933a3c31c02ef361b4
--- a/net-wireless/pyrit/metadata.xml
+++ b/net-wireless/pyrit/metadata.xml
@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>oleg@kaa.org.ua</email>
+		<name>Oleg Kravchenko</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>maksbotan@gentoo.org</email>
+		<name>Maxim Koltsov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="cuda">Enable CUDA support via <pkg>net-wireless/cpyrit-cuda</pkg></flag>
+		<flag name="opencl">Enable OpenCL support via <pkg>net-wireless/cpyrit-opencl</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="github">JPaulMora/Pyrit</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/net-wireless/pyrit/pyrit-0.5.0_p20180801.ebuild
+++ b/net-wireless/pyrit/pyrit-0.5.0_p20180801.ebuild
@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+
+MY_PN="${PN^}"
+MY_PV="2d46f819cfa396de0137ad68c3a565e5e8bc81a8"
+DESCRIPTION="GPU-accelerated attack against WPA-PSK authentication"
+HOMEPAGE="https://github.com/JPaulMora/Pyrit"
+SRC_URI="https://github.com/JPaulMora/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cuda opencl test"
+
+DEPEND="dev-libs/openssl
+	net-libs/libpcap
+	test? ( >=net-analyzer/scapy-2[${PYTHON_USEDEP}] )"
+RDEPEND=">=net-analyzer/scapy-2
+	opencl? ( net-wireless/cpyrit-opencl )
+	cuda? ( net-wireless/cpyrit-cuda )"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_test() {
+	cd test
+	"${PYTHON}" test_pyrit.py
+}
--- a/net-wireless/urh/Manifest
+++ b/net-wireless/urh/Manifest
@ -2,3 +2,4 @@ DIST urh-2.0.2.tar.gz 17290871 BLAKE2B 4fc697c73f417898f6b5d6c98aa569ccc161ba2f3
 DIST urh-2.2.2.tar.gz 5433838 BLAKE2B 8561b7bdcbe1f78d7c4e7d37cb15ce27fec6b0b1adb4b081b641cbc6a0f3a5dd452341a88543ebabd89f72558f29bafd840ce2dac31f93b2c4efe827df50a2bb SHA512 6e84c6a8712b3bc3eb320840fe50cd55439ad06c81262ecc5407e529810038f114e81f3229dfc588603f88d795365737bf85816b5df3ad63e814fff93bcd85d6
 DIST urh-2.2.3.tar.gz 5435476 BLAKE2B 0b784a51f20f6e75eb1d5d5ff7f24e4aeb7cea1de753f8323ed267d0dcb6a8fb703c21cf4625962cd5e8b2aa4c0ae93a4407582424e58a027b9c9b1405736596 SHA512 1851c79a3eed7ef23a2e0fbbbab308d001f7900c563e8c003c961fbe474e796f96a10a5cafbede833ccef9184bc1d2994cc5e87df3ed97614842edaab373522d
 DIST urh-2.2.4.tar.gz 5435605 BLAKE2B fbc4a13d50f7eb996364e92edc4c862c050cc591d3bf1ce1a1fa7bc3ef044ed5a628d463ad9c8706133b6602495c1e9b8db1bca0a3e3da8660533e0083eeaa97 SHA512 082cb70aa2594d92c8334dd0676bbe05f087a9f5d79ae526330fcac3c782467135b3eb987de8571b7ae9a53b2d32c1ccba4dbb0515b52a73b3c0358790792e33
+DIST urh-2.3.0.tar.gz 5450834 BLAKE2B e82475edb53dbf9dc12294354e3bd4d0ca5e67d1713fc79409807387d76a6abba7a51dc97aae407beb8e7ceaba43528b327742b2e828cbf006cf7cd1d0c1c760 SHA512 eaa1c8cafa3724d50d308137352b472ab33e9321e6cb67695455e8acf5d6cd297f0e779cd623fee181084f5bcb3a538f4c832f3089fb52e696db9e68ac499098
--- a/net-wireless/urh/urh-2.3.0.ebuild
+++ b/net-wireless/urh/urh-2.3.0.ebuild
@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6} )
+inherit distutils-r1 eutils
+
+DESCRIPTION="Universal Radio Hacker: investigate wireless protocols like a boss"
+HOMEPAGE="https://github.com/jopohl/urh"
+SRC_URI="https://github.com/jopohl/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="hackrf rtlsdr uhd"
+
+DEPEND="${PYTHON_DEPS}
+		net-wireless/gnuradio[zeromq]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pyzmq[${PYTHON_USEDEP}]
+		dev-python/cython[${PYTHON_USEDEP}]
+		hackrf? ( net-libs/libhackrf:= )
+		rtlsdr? ( net-wireless/rtl-sdr:= )
+		uhd?    ( net-wireless/uhd:= )"
+RDEPEND="${DEPEND}
+		dev-python/PyQt5[${PYTHON_USEDEP},testlib]
+		net-wireless/gr-osmosdr"
+
+python_configure_all() {
+	mydistutilsargs=(
+			$(use_with hackrf)
+			$(use_with rtlsdr)
+			$(use_with uhd usrp)
+			--without-airspy
+			--without-limesdr
+			)
+}
--- a/pentoo/pentoo-misc/pentoo-misc-2018.2-r6.ebuild
+++ b/pentoo/pentoo-misc/pentoo-misc-2018.2-r6.ebuild
@ -11,11 +11,13 @@ LICENSE="GPL-3"
 IUSE="+accessibility +atm gtk java +office X pentoo-full"

 PDEPEND="
+	app-arch/p7zip
 	net-dns/bind-tools
 	net-misc/curl
 	net-misc/openssh
 	net-misc/stunnel
 	net-misc/telnet-bsd
+	app-misc/wipe
 	net-misc/whois

 	accessibility? ( app-accessibility/espeakup
@ -38,9 +40,7 @@ PDEPEND="
 			net-irc/hexchat
 			|| ( mail-client/thunderbird-bin mail-client/thunderbird )
 		)
-		app-arch/p7zip
 		app-misc/mc
-		app-misc/wipe
 		!arm? ( sys-boot/unetbootin )
 		atm? ( net-dialup/linux-atm )
 		app-editors/hexedit
--- a/profiles/pentoo/base/package.accept_keywords/dev-go
+++ b/profiles/pentoo/base/package.accept_keywords/dev-go
@ -9,7 +9,7 @@ dev-go/websocket
 dev-go/mux

 # required by net-analyzer/gobuster
-~dev-go/go-uuid-20180103
+~dev-go/uuid-0.2
 ~dev-go/go-multierror-20180717

 =dev-go/cascadia-1.0*
--- a/profiles/pentoo/base/package.accept_keywords/dev-python
+++ b/profiles/pentoo/base/package.accept_keywords/dev-python
@ -212,7 +212,7 @@ dev-python/pyDes
 ~dev-python/args-0.1.0
 ~dev-python/pyaxmlparser-0.3.7

-=dev-python/gpapi-0.4.2
+~dev-python/gpapi-0.4.3

 #Tiredful-API
 ~dev-python/django-filter-0.15.3
--- a/profiles/pentoo/base/package.accept_keywords/dev-ruby
+++ b/profiles/pentoo/base/package.accept_keywords/dev-ruby
@ -32,6 +32,14 @@ dev-ruby/actionview:4.2
 #~dev-ruby/arel-8.0.0
 #~dev-ruby/websocket-driver-0.6.5

+#rails 5.2
+#dev-ruby/rails:5.2
+#dev-ruby/activerecord:5.2
+#dev-ruby/actioncable:5.2
+#dev-ruby/activejob:5.2
+#dev-ruby/actionmailer:5.2
+dev-ruby/activesupport:5.2
+
 #ruby23
 ~dev-ruby/daemons-1.2.6
 ~dev-ruby/did_you_mean-1.0.2
@ -117,7 +125,6 @@ dev-ruby/rkelly-remix
 dev-ruby/arel:6.0
 dev-ruby/filesize
 dev-ruby/metasm
-dev-ruby/net-ssh
 =dev-ruby/bundler-1.14*
 =dev-ruby/bundler-1.15*
 dev-ruby/rb-readline-r7
@ -147,7 +154,6 @@ dev-ruby/metasploit-model
 dev-ruby/metasploit_data_models
 dev-ruby/meterpreter_bins
 dev-ruby/method_source
-dev-ruby/net-ssh
 dev-ruby/openssl-ccm:1.2.1
 ~dev-ruby/sawyer-0.8.1
 dev-ruby/patch_finder
@ -217,8 +223,11 @@ dev-ruby/pdf-reader:2
 ~dev-ruby/terminal-table-1.6.0
 =dev-ruby/ethon-0.11*
 ~dev-ruby/yard-0.8.3
-=dev-ruby/yajl-ruby-1.3*
-=dev-ruby/ruby-progressbar-1.9*
+
+=dev-ruby/yajl-ruby-1.4*
+=dev-ruby/ruby-progressbar-1.10*
+=dev-ruby/cms_scanner-0.0.40*
+=dev-ruby/opt_parse_validator-0.0.16*

 #beef
 =www-apps/beef-0.4.4.5
@ -267,7 +276,7 @@ dev-ruby/uglifier:3
 ~dev-ruby/sourcify-0.5.0
 ~dev-ruby/tins-1.10.2
 ~dev-ruby/term-ansicolor-1.6.0
-~dev-ruby/rack-protection-2.0.3
+~dev-ruby/rack-protection-2.0.4
 ~dev-ruby/espeak-ruby-1.0.4
 =dev-ruby/therubyracer-0.12*
 =dev-ruby/ref-2.0*
--- a/profiles/pentoo/base/package.accept_keywords/misc
+++ b/profiles/pentoo/base/package.accept_keywords/misc
@ -31,4 +31,4 @@ dev-embedded/libftdi:0
 www-apps/Tiredful-API

 #Grammarly alternative
-~app-officeext/languagetool-4.0
+~app-officeext/languagetool-4.3
--- a/profiles/pentoo/base/package.accept_keywords/net-analyzer
+++ b/profiles/pentoo/base/package.accept_keywords/net-analyzer
@ -5,7 +5,8 @@ net-analyzer/ostinato
 ~net-analyzer/owtf-2.4

 ~net-analyzer/w3af-1.6.54
-=net-analyzer/wpscan-2.9*
+#=net-analyzer/wpscan-2.9*
+=net-analyzer/wpscan-3.3*

 =net-analyzer/set-6*
 net-analyzer/dnsenum
@ -110,7 +111,7 @@ net-analyzer/snort
 net-analyzer/zmap

 net-analyzer/sublist3r
-net-analyzer/amass
+=net-analyzer/amass-2.6*

 ~net-analyzer/dirhunt-0.5.1
 ~net-analyzer/xbruteforcer-20180611
@ -118,3 +119,4 @@ net-analyzer/amass
 ~net-analyzer/ham2mon-20170603
 ~net-analyzer/cipherscan-20180519
 ~net-analyzer/gobuster-2.0.1
+~net-analyzer/smbmap-20180508
--- a/profiles/pentoo/base/package.accept_keywords/net-wireless
+++ b/profiles/pentoo/base/package.accept_keywords/net-wireless
@ -19,7 +19,7 @@ net-wireless/qspectrumanalyzer

 net-wireless/inspectrum
 net-wireless/n4p
-~net-wireless/hostapd-2.6
+=net-wireless/hostapd-2.6-r6

 =net-wireless/urh-2.2*

--- a/profiles/pentoo/base/package.accept_keywords/www-client
+++ b/profiles/pentoo/base/package.accept_keywords/www-client
@ -1,15 +1,2 @@
 www-client/google-chrome
 www-plugins/google-talkplugin
-
-=www-client/firefox-bin-60*
-=www-client/firefox-60*
-=www-client/firefox-bin-60*
-=www-client/firefox-60*
-
-=media-libs/libpng-1.6*
-=dev-util/cargo-0.26*
-=dev-util/cargo-0.27*
-=dev-libs/nss-3.37*
-=virtual/rust-1.25*
-=dev-lang/rust-1.25*
-~dev-libs/nspr-4.19
--- a/profiles/pentoo/base/package.mask
+++ b/profiles/pentoo/base/package.mask
@ -35,7 +35,7 @@ dev-lang/ruby:2.2
 >dev-ruby/activejob-5.0
 >dev-ruby/activemodel-5.0
 >dev-ruby/activerecord-5.0
->dev-ruby/activesupport-5.0
+#>dev-ruby/activesupport-5.0
 >dev-ruby/rails-5.0
 >dev-ruby/railties-5.0
 #dev-ruby/rack:2.0
--- a/profiles/pentoo/base/profile.bashrc
+++ b/profiles/pentoo/base/profile.bashrc
@ -15,3 +15,4 @@ if [[ $CATEGORY/$PN == net-wireless/aircrack-ng ]]; then
 fi
 if [[ $CATEGORY/$PN == app-crypt/hashcat ]]; then export CFLAGS=${CFLAGS/-Os/-O3}; fi
 if [[ $CATEGORY/$PN == app-crypt/johntheripper ]]; then export CFLAGS=${CFLAGS/-Os/-O3}; fi
+if [[ $CATEGORY/$PN == net-wireless/cowpatty ]]; then export CFLAGS=${CFLAGS/-Os/-O3}; fi
--- a/profiles/pentoo/zero-system/make.defaults
+++ b/profiles/pentoo/zero-system/make.defaults
@ -10,6 +10,7 @@ FEATURES="sign"

 #REPOMAN_DEFAULT_OPTS="--digest=y"
 ECHANGELOG_USER="Rick Farina <zerochaos@gentoo.org>"
+DCO_SIGNED_OFF_BY="Rick Farina <zerochaos@gentoo.org>"

 #CFLAGS="${CFLAGS} -Werror=format-security"
 #CXXFLAGS="${CFLAGS}"
--- a/profiles/pentoo/zero-system/package.accept_keywords/app-shells
+++ b/profiles/pentoo/zero-system/package.accept_keywords/app-shells
@ -1,2 +1,2 @@
 <app-shells/mksh-9999 **
-
+~app-shells/gentoo-zsh-completions-20180228
--- a/scripts/pentoo-updater.sh
+++ b/scripts/pentoo-updater.sh
@ -276,8 +276,17 @@ fi
 smart-live-rebuild 2>&1 || safe_exit
 revdep-rebuild -i -- --rebuild-exclude dev-java/swt --exclude dev-java/swt --buildpkg=y || safe_exit
 emerge --deep --update --newuse -kb --changed-use --newrepo @world || safe_exit
+
 #we need to do the clean BEFORE we drop the extra flags otherwise all the packages we just built are removed
-emerge --depclean || safe_exit
+currkern="$(uname -r)"
+if [ "${currkern/pentoo/}" != "${currkern}" ]; then
+  emerge --depclean --exclude "sys-kernel/pentoo-sources:${currkern/-pentoo/}" || safe_exit
+elif [ "${currkern/gentoo/}" != "${currkern}" ]; then
+  emerge --depclean --exclude "sys-kernel/gentoo-sources:${currkern/-gentoo/}" || safe_exit
+else
+  emerge --depclean || safe_exit
+fi
+
 if portageq list_preserved_libs /; then
  emerge @preserved-rebuild --buildpkg=y || safe_exit
 fi
--- a/Show more
+++ b/Show more
				`@ -0,0 +1 @@`
				`DIST testdisk-7.1-WIP.tar.bz2 718086 BLAKE2B 08e985407677fe58502ffc35b9b7c07940031f30dba59f845a03c278c79faf4f6dd6fd896347b4a4a038e86834601f2092286f1bfc006357b7abc5544c6194c9 SHA512 c6eedf0c8eefdee723df90dac9e12addb19b3ccfaf811b91e449c7a06fad889359a801a74bfd2274f06c762c7103d844d5aeebb5ff703b31cfc686e57155fdf7`
				`@ -1 +0,0 @@`
				`DIST go-uuid-0.2.tar.gz 12729 BLAKE2B fa012a28fa7985db3d640ac5b238e517cafbb7a65223e16b359a88ffd0d7cf23868b528acc4b54b6bb24aa52e0768a4da54de9037fc033047648e9d3f5ceb274 SHA512 358f2d813583a376ecad5e19b7a53543cdb91942ad5b1f8688e4da303dac24bd95f37f9b14de401241bf6e15fb5011358d2bbb47c44d0bd5fcf9ab8a82cf4120`
				`@ -0,0 +1 @@`
				`DIST openssl-bad-1.0.2_p20180915.zip 7669825 BLAKE2B 55b99dc3b7d32506c5c06d7d4dc522e6a2c44bd9905b600c8b19a7a8df82ab41cb0bf81770d26fb1c1151c0cbb86f91ed981b25beec6cc3dd4fa9d117606bd5a SHA512 4b9dacb6239d219192be6b8f4f1e4b65bca574ebcd76586ecb43855b7b9848fdea2eabbcb07c713e1ace8c785f331905b9b6f9adfaf5e372c458d04ce22c13ee`
				`@ -0,0 +1 @@`
				`DIST cms_scanner-0.0.40.1.gem 30208 BLAKE2B 7d03f5e94193f2678e9d46377483d4c0cd568dcc7e16fc61a0afe3025b04e85d30b2894edb107227403381b9c6654a5e5c3f386104b2ecad00c691cc767402ed SHA512 5cb7332119878c9d860553dedffe50cb009eb3637fd9fb43190172ac8ff60933ad106ddc1383e2457845774bc900485fd197c45c0654662e2666b4b721dbb7f9`
				`@ -0,0 +1 @@`
				`DIST smbmap-20180508.tar.gz 25888 BLAKE2B 601528b28264b1462e29cb185a66685c59ed0cf1258e4e50242f23dee8e5768518341f9bf6028d3ff41a66ff3db485562f26062c40682c1bd5673e7810a1baf8 SHA512 65baca537d1cc94e78a964bb2be36c1ba8c669446ed4c92d7cc4bd0e93370100570db5c302145bf5bd0733d327d66d49e5cb2176ea036a4b520eabc4f9b6dac8`
				`@ -0,0 +1 @@`
				`DIST pyrit-0.5.0_p20180801.tar.gz 2595201 BLAKE2B 76bb22a762274c5e78d0e5e74b7c64af3c9712a07000f9df0cfad39379cfcc4a2a3094d0a82829ab09c3982ccee9ac84c441c4dc4dcc34ca92c5634ee526377b SHA512 dd38da865e0fd4e6f2aab6137c8f95d386ef97809460408245f06e987b5cf8b617c78447493e583ef8f8045ff9a04aec023f79fba746ca933a3c31c02ef361b4`