Version bump (bug #497764 by Anton Bolshakov). Fix building against sys-libs/ncurses[tinfo].

Package-Manager: portage-2.2.8/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

3 files changed, 109 insertions, 16 deletions

diff --git a/net-analyzer/hydra/ChangeLog b/net-analyzer/hydra/ChangeLog
index 7d26a165ee31..6c05540998fd 100644
--- a/net-analyzer/hydra/ChangeLog
+++ b/net-analyzer/hydra/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/hydra
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hydra/ChangeLog,v 1.81 2013/11/20 01:18:04 zx2c4 Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hydra/ChangeLog,v 1.82 2014/01/11 12:22:54 jer Exp $
+
+*hydra-7.6 (11 Jan 2014)
+
+  11 Jan 2014; Jeroen Roovers <jer@gentoo.org> +hydra-7.6.ebuild:
+  Version bump (bug #497764 by Anton Bolshakov). Fix building against
+  sys-libs/ncurses[tinfo].
 
   20 Nov 2013; Jason A. Donenfeld <zx2c4@gentoo.org> hydra-7.5.ebuild:
   Don't link to svn and mysql if it's not enabled in the use flags. This is
diff --git a/net-analyzer/hydra/Manifest b/net-analyzer/hydra/Manifest
index edb410e82744..b2d1cd434b00 100644
--- a/net-analyzer/hydra/Manifest
+++ b/net-analyzer/hydra/Manifest
@@ -3,24 +3,16 @@ Hash: SHA256
 
 DIST hydra-7.4.2.tar.gz 666187 SHA256 bdf670f8d197e1e7e03fb1bca9156ac34cd961496f1a4c3a3b7d79706d4d19df SHA512 78ed0cdce5ca10eabce82f69d2a123219464f07aed2edb42441f71acfb9f1a4f3568436d95721ba253a83496b56b90739c03f112de00beea9de45711b8d09e33 WHIRLPOOL 5b9b441a64bd588840e0c5f0143dc3c28271d3fbedf415c9c5951e34816709ba7df42431242de8f56d99437625cf6136f0433d7a089e7bfa1864d6027c6e99d9
 DIST hydra-7.5.tar.gz 681784 SHA256 7293e7c32198219688e5bf5308f7e8eab37ad78d49701c9860a6b22aecda0ab6 SHA512 b15ca32da6f1cd675d7149e9ef32fbb7b3d01e1fa2d648a1ed12bb6ae38d131f1123d84ff125d5f98677f62cddc97597d98d9cee662fcd305342c6f3fd2e10f8 WHIRLPOOL b245eeb9e4380fd4fb740ec85cd006f81169b3e964f0eb6d723742bfb3307446286603239ae285599b5291f5f7588b2f1e8ca623107d27f1b6f81d99510774eb
+DIST hydra-7.6.tar.gz 557045 SHA256 a479bebabcb81c4a08a25f41c88688055bbb800ecfa93e25dd809ad1ff58debd SHA512 42c0da5f3a39cc4ea8a52bd8ff06230621cac5eb9ea2cbfcaaccaae8faeedea865f75d3c2547e9377f4e225ae1d29c5ce937a0153e699353745507ed77cb64c6 WHIRLPOOL 0041288656abb7785212fad4ab404a64b9cb8e08f629c478a75818a77988dc2b9251b3d93e8d9b75523bdbb7c4270a371ff22e396cc5a60360a28991d88d32c6
 EBUILD hydra-7.4.2.ebuild 2184 SHA256 32a8d938628dfca5f0bb4be49fc802c546b9ffda1d5971ff1ea46c3829e40d91 SHA512 4c199b8977837c6914194a66b529bc9ba8fa10aabbde13a15d6a690c33df6fa5bd77c6588f059b22ba03d42eca31a03825900ea88f41840a1d3a4e08d0be0eaa WHIRLPOOL 2ea889afd65ebb9d6b4795f746aab60b9a3856aa1c85e8748ca1099f50bafbfcc061a22bc3356a95258014a2e4979df64813072e5241d30eacd4ca256bdca5a2
 EBUILD hydra-7.5.ebuild 2540 SHA256 c61c8418ed846956f0e5ea7141f1dd51c821c216d4459189f82a95a96483c34a SHA512 898f064c633d23528ff7e11e58625582de6e5b02110df55e51ec1d84c33f92a82fc436bce7181053226e8ea7f7e28ad082cf7030ffdd6db9b0e4bd16eadd80ed WHIRLPOOL ad8cfb0c0cd34eaad62b2b7c05a77633a8b0d727b9db1df226b21dbaeeb3b7d6c03075e586381267cf04ca536d952251e6fefad0af64f604bb14f3c5571a607b
-MISC ChangeLog 10717 SHA256 6dfe8eb759e5330e6e6ff05bcae236229999703db25f2417e32ed22e1eba57fb SHA512 cc68366715fba9c2482ba5c5fe40a710c76350100a8d2948544b31c99015c12c9befd08bc28f1188ed7a1898d7ea412d06d46a6da8984e3dc2026956c489ec04 WHIRLPOOL 46423c6b2439bda9045709122519637b843d382470ed56253c23eafc771f846702fdbbc350c5495c57f4a9cc4fdb57790b7925442d4de1bbb3c39ca25272ea0d
+EBUILD hydra-7.6.ebuild 2188 SHA256 4c71e74792f9544ca37fb5e8a104017d8213bd3e6cdca3c8042aa5eaa10d3760 SHA512 b7dc546e392cb0e34d34f5a86713eb8a90efce23096cc12093b26d3be9a835ef79cc9bfc511e183c6b16eaf0aacf5ad3f0e33672a14be2c3ee9f8ed1b97a86ba WHIRLPOOL d1d224deebbe0401e63137f2eb977864b3ab5daccbdd43ce484fe54b000586d41f1b0f39828bf3fc7c0e6474672e65ae935cd08f3da6d70416291f35530d64f2
+MISC ChangeLog 10905 SHA256 4c8aea143ab5d2848d4671eb7669addd2780c9fc314013601dc42628cea6d60d SHA512 ea52b2c90669b19d067e6e7a8fa91adee2bba57a9d7dfebbc5c13ba7ece4943b638dae7ea7310524297b66a6dbb1584c76e688e5fc5106397256a0764b8ecfe9 WHIRLPOOL 6e1db5ef14fbaceb6c0ad470a46e7ed78d3a7dede681af63ee8d92e4a0140aef477d7039422ce4b4aa485542fca5162c8f44c7b972464eebb93e7e2760468cb9
 MISC metadata.xml 325 SHA256 51ac19ac1cb61a0ee06bdbb7016d57609518824e153e51bd160ff1a4a74a4f26 SHA512 a23291b48b10877e604f3fc24beb77613f315c4c136909dc457d7ad027d6a917ac9fa64812416c397d54f4fa2a0ef9ea417ff2df1a8a5ea3f312af4dbed4ed63 WHIRLPOOL 5271ebeac40e1622a0f2c64993e5e81ea0f3fa709a02d5050896f43efaefce0041de31b7aec82f78e150630a637d371851e19f6a9abfdc020c44c3e6e0044075
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSjA3UAAoJEEn8cBKl3gOuPxAP/3nHrZTCVir2AMM5H88jYaGS
-l3hxk4ewOvTiN5cyryeSDVTucWkbrG1BhlAhBrMbjAvgATaQYC00Os7B0fttdY75
-Wzxrjine5lWnYLR3GWjcc4v7rTGB1sUOIkU2Q9mZTrEA6QyoQjPE5Ug8DG8m/87S
-c59Igt2v9LDgrVyOIjmM8XNQ9+iMJ2yQUwyO62MPkUPrgQ0LJZm6zVy8NjB3skPM
-7vPiauUy1b+KMY1B+MJtx8wWjLErh3aPE4H+Dyaa7EpNNxa7+7J4mmKB4F3rSC6n
-1loENJhTukJJ0enpEEc5/3qbRtHlUuy2VnJta4elnspsu2iYF/BDpg/EDZyPNQwB
-UNEnLwGXqrVHJGtn8YIxICOp6hCXYlC0M2RE3V30Kw+DzqPC5ZLvrIObohMdSdEt
-4udcOlmfP7aSKmuB86u2+z0wCRRp0DbaDx3Eow+j2law5myxdUZaAXsrPMmDhYL2
-U+JWflUYtrFTvEXMNONBfEcEgHh4ZReRbsqFMm+hE6N2xlpMKx5WNrgT1hZ2pR1M
-9hDBuabeWlzjuYsd+UsnKEoX/aiV616SJI0gYCuptDcHtndFpIw7e3+0AB1U6SmN
-2Q8QjSzb97Ir/XF7QXEIvQg7oRP3gYI+OxoRFflv8vNDvoSp4qdYUq6WulCT0baT
-/yqsJziEXl6ghy7pasHF
-=CU+t
+iEYEAREIAAYFAlLRN58ACgkQVWmRsqeSphNVCwCfXQhg8P+ElGBnK/wspsMhUSrI
+nXwAnj7bSLD8I1KZDl5e8OJ9dPQYWiEu
+=GogZ
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/hydra/hydra-7.6.ebuild b/net-analyzer/hydra/hydra-7.6.ebuild
new file mode 100644
index 000000000000..7164765b6856
--- /dev/null
+++ b/net-analyzer/hydra/hydra-7.6.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hydra/hydra-7.6.ebuild,v 1.1 2014/01/11 12:22:54 jer Exp $
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Advanced parallized login hacker"
+HOMEPAGE="http://www.thc.org/thc-hydra/"
+SRC_URI="http://freeworld.thc.org/releases/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="firebird gtk idn mysql ncp oracle pcre postgres ssl subversion"
+
+RDEPEND="
+	dev-libs/openssl
+	sys-libs/ncurses
+	firebird? ( dev-db/firebird )
+	gtk? (
+		dev-libs/atk
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:2
+	)
+	idn? ( net-dns/libidn )
+	mysql? ( virtual/mysql )
+	ncp? ( net-fs/ncpfs )
+	oracle? ( dev-db/oracle-instantclient-basic )
+	pcre? ( dev-libs/libpcre )
+	postgres? ( dev-db/postgresql-base )
+	ssl? ( >=net-libs/libssh-0.4.0 )
+	subversion? ( dev-vcs/subversion )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# None of the settings in Makefile.unix are useful to us
+	: > Makefile.unix
+
+	sed -i \
+		-e 's:|| echo.*$::' \
+		-e '/\t-$(CC)/s:-::' \
+		-e '/^OPTS/{s|=|+=|;s| -O3||}' \
+		-e '/ -o /s:$(OPTS):& $(LDFLAGS):g' \
+		Makefile.am || die
+}
+
+src_configure() {
+	export OPTS="${CFLAGS}"
+
+	if ! use subversion; then
+		sed -i 's/-lsvn_client-1 -lapr-1 -laprutil-1 -lsvn_subr-1//;s/-DLIBSVN//' configure || die
+	fi
+
+	if ! use mysql; then
+		sed -i 's/-lmysqlclient//;s/-DLIBMYSQLCLIENT//' configure || die
+	fi
+
+	# Linking against libtinfo might be enough here but pkg-config --libs tinfo
+	# would require a USE=tinfo flag and recent linkers should drop libcurses
+	# as needed
+	sed -i \
+		-e 's|-lcurses|'"$( $(tc-getPKG_CONFIG) --libs ncurses)"'|g' \
+		configure || die
+
+	# Note: despite the naming convention, the top level script is not an
+	# autoconf-based script.
+	./configure \
+		--prefix=/usr \
+		--nostrip \
+		$(use gtk && echo --disable-xhydra) \
+			|| die
+
+	if use gtk ; then
+		cd hydra-gtk && \
+		econf
+	fi
+}
+
+src_compile() {
+	tc-export CC
+	emake
+	use gtk && emake -C hydra-gtk
+}
+
+src_install() {
+	dobin hydra pw-inspector
+	use gtk && dobin hydra-gtk/src/xhydra
+	dodoc CHANGES README
+}