4 files changed, 92 insertions, 3 deletions
diff --git a/net-analyzer/hydra/ChangeLog b/net-analyzer/hydra/ChangeLog
index f4e6277ae54e..5b12ff25d7f6 100644
--- a/net-analyzer/hydra/ChangeLog
+++ b/net-analyzer/hydra/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/hydra
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hydra/ChangeLog,v 1.26 2008/01/18 18:31:47 armin76 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hydra/ChangeLog,v 1.27 2009/05/24 23:18:32 pva Exp $
+
+*hydra-5.4-r1 (24 May 2009)
+
+  24 May 2009; Peter Volkov <pva@gentoo.org> +hydra-5.4-r1.ebuild,
+  +files/hydra-5.4-_FORTIFY_SOURCE.patch:
+  Fixed http-form module crashes when run, bug #209116, thank deanx for
+  report. Fixed build problem with _FORTIFY_SOURCE, bug #263146, thank
+  Jonathan-Christofer Demay for the patch.
 
   18 Jan 2008; Raúl Porcel <armin76@gentoo.org> -hydra-4.4.ebuild,
   -hydra-5.3.ebuild:
diff --git a/net-analyzer/hydra/Manifest b/net-analyzer/hydra/Manifest
index c62f14a59799..42fd3c070666 100644
--- a/net-analyzer/hydra/Manifest
+++ b/net-analyzer/hydra/Manifest
@@ -1,4 +1,6 @@
+AUX hydra-5.4-_FORTIFY_SOURCE.patch 562 RMD160 76ffa0d0c22c653600b6a6ec3066b0c1d85dc641 SHA1 7842f1d8c59e9eb556eaec070e1cf880cf9e2a82 SHA256 e0b45b7c69cf6d39feb98270efbba6a25c73c91036ae4f22b50566e355a7f99d
 DIST hydra-5.4-src.tar.gz 208272 RMD160 e3b4b98250394945dc5a8bfe234302de793db014 SHA1 2134092c7b64132c080b6b1ba155124b885767db SHA256 cd2e7e5ea479d50982b08334b1f4477a6620e6b45bc79ab55ddd07b128c64611
+EBUILD hydra-5.4-r1.ebuild 1540 RMD160 d2a864afcfe0d19b0bf776e31c6d55621061c36a SHA1 c055f271f6ee497f59395905e34105c976f83dee SHA256 7466d7340cd59f45a90f2252102b87f1f8073470a668bd4f4457e4b3696afe7b
 EBUILD hydra-5.4.ebuild 1458 RMD160 36f52c8a27797d1b7f7f0d43c122147b2c7c6990 SHA1 2dc8faff545d7083e37d8e4eba4682cf361a06ce SHA256 a6ac60d257c044cb69befb17c8e07c129536b2bc031be4fb2eb289de76004ee3
-MISC ChangeLog 3377 RMD160 87753735bd64fa2b64aaa1775224512ef3f288d2 SHA1 d7d4e199169d01ddab7ce37697988bf1e1a5d5a4 SHA256 08d68dba0fbb947d728a85232579e56a43cdb49850c274c2f6c89ea03fd64ed7
+MISC ChangeLog 3698 RMD160 7f0a299aaac5b7652e8c861514e4e406be60b499 SHA1 15b656cdc4fe9d1489fc36f927c98ab51926b47f SHA256 70739e5fde0044a6accdf67d73b91404bada2b27c4f60f61dd4d5da7607c5a53
 MISC metadata.xml 227 RMD160 2a8754b01b0efe35e1f147451db54318da704ec1 SHA1 905f8d225c7defc78c835ebf7f44a83bed62fce3 SHA256 549534fb196ce43008704171f81429d1df086465e990f62d1685b69a7583d27c
diff --git a/net-analyzer/hydra/files/hydra-5.4-_FORTIFY_SOURCE.patch b/net-analyzer/hydra/files/hydra-5.4-_FORTIFY_SOURCE.patch
new file mode 100644
index 000000000000..dc9b0ec6e9cb
--- /dev/null
+++ b/net-analyzer/hydra/files/hydra-5.4-_FORTIFY_SOURCE.patch
@@ -0,0 +1,12 @@
+diff -Naur hydra-5.4-src-orig/hydra-gtk/src/callbacks.c hydra-5.4-src-patch/hydra-gtk/src/callbacks.c
+--- hydra-5.4-src-orig/hydra-gtk/src/callbacks.c	2005-09-22 15:19:27.000000000 +0000
++++ hydra-5.4-src-patch/hydra-gtk/src/callbacks.c	2009-03-20 17:59:40.000000000 +0000
+@@ -663,7 +663,7 @@
+ 		
+ 		text = gtk_text_buffer_get_text(outputbuf, &start, &end, TRUE);
+ 
+-		fd = open(filename, O_CREAT | O_TRUNC | O_WRONLY);
++		fd = open(filename, O_CREAT | O_TRUNC | O_WRONLY, S_IRUSR | S_IWUSR);
+ 		if ( fd > 0 ) {
+ 			write(fd, text, strlen(text));
+ 			close(fd);
diff --git a/net-analyzer/hydra/hydra-5.4-r1.ebuild b/net-analyzer/hydra/hydra-5.4-r1.ebuild
new file mode 100644
index 000000000000..6283a2368b90
--- /dev/null
+++ b/net-analyzer/hydra/hydra-5.4-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hydra/hydra-5.4-r1.ebuild,v 1.1 2009/05/24 23:18:32 pva Exp $
+
+inherit eutils
+
+DESCRIPTION="Advanced parallized login hacker"
+HOMEPAGE="http://www.thc.org/thc-hydra/"
+SRC_URI="http://www.thc.org/releases/${P}-src.tar.gz"
+
+LICENSE="HYDRA GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="gtk ssl"
+
+DEPEND="gtk? ( >=x11-libs/gtk+-1.2 )
+	ssl? (
+		dev-libs/openssl
+		=net-libs/libssh-0.11
+	)"
+
+S=${WORKDIR}/${P}-src
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i "s:-O2:${CFLAGS}:" Makefile.am || die "sed failed"
+	epatch "${FILESDIR}/${P}-_FORTIFY_SOURCE.patch"
+	epatch "${FILESDIR}/${P}-free-without-malloc.patch"
+}
+
+src_compile() {
+	if use gtk ; then
+		./configure --prefix=/usr || die "configure failed"
+	else
+		./configure --prefix=/usr --disable-xhydra || die "configure failed"
+	fi
+
+	sed -i \
+		-e '/^XDEFINES=/s:=.*:=:' \
+		-e '/^XLIBS=/s:=.*:=:' \
+		-e '/^XLIBPATHS/s:=.*:=:' \
+		-e '/^XIPATHS=/s:=.*:=:' \
+		Makefile || die "pruning vars"
+
+	if use ssl ; then
+		sed -i \
+			-e '/^XDEFINES=/s:=:=-DLIBOPENSSL -DLIBSSH:' \
+			-e '/^XLIBS=/s:=:=-lcrypto -lssl -lssh:' \
+			Makefile || die "adding ssl"
+	fi
+	emake || die "make failed"
+
+	if use gtk ; then
+		cd hydra-gtk
+		econf
+		emake || die "emake hydra-gtk failed"
+	fi
+}
+
+src_install() {
+	dobin hydra pw-inspector || die "dobin failed"
+	if use gtk ; then
+		dobin hydra-gtk/src/xhydra || die "gtk"
+	fi
+	dodoc CHANGES README TODO
+}