Add upstream patch.

Package-Manager: portage-2.2.0_alpha46/cvs/Linux x86_64

4 files changed, 127 insertions, 5 deletions

diff --git a/net-analyzer/hydra/ChangeLog b/net-analyzer/hydra/ChangeLog
index b58c3dc7717b..1340793eb27e 100644
--- a/net-analyzer/hydra/ChangeLog
+++ b/net-analyzer/hydra/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/hydra
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hydra/ChangeLog,v 1.58 2011/07/20 15:01:01 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hydra/ChangeLog,v 1.59 2011/07/20 15:34:37 jer Exp $
+
+*hydra-6.5-r1 (20 Jul 2011)
+
+  20 Jul 2011; Jeroen Roovers <jer@gentoo.org> +hydra-6.5-r1.ebuild,
+  +files/hydra-6.5-fix.diff:
+  Add upstream patch.
 
 *hydra-6.5 (20 Jul 2011)
 
diff --git a/net-analyzer/hydra/Manifest b/net-analyzer/hydra/Manifest
index e9cdb0cbf56d..6a20ff31f8fc 100644
--- a/net-analyzer/hydra/Manifest
+++ b/net-analyzer/hydra/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX hydra-6.5-fix.diff 1720 RMD160 08b44de4aa73567aef95232913399f38befd30a4 SHA1 fd545e0247ec72272d92958bc55ce14911a6bd5a SHA256 b367b69e0163b9a4d2b30942e1ca06cdd9567432d59a5d0c9af1e7e420e66a60
 DIST hydra-5.9-src.tar.gz 423995 RMD160 81327b41e9962bbb871e485b6fb5e1c9803f9bc6 SHA1 386dfda5b2494d1f87ab9ee881ae603dbc710e4c SHA256 66023f94460abe76e76c1c6b187d44e82bafafb4c517314261bbd34429f913a7
 DIST hydra-6.0-src.tar.gz 435284 RMD160 94bd6c55c8d6e5f7195629cceec6422045c5e186 SHA1 bb0c4431eb23e6c273e58603be9638ad6b2c4ea5 SHA256 c0d473c29d57fe44c5dd301b3161fdf853b3bbac57c099acf47cffb4d2707e64
 DIST hydra-6.1-src.tar.gz 432515 RMD160 06f4f98aec813ccee13445d6a843f6be1f51806a SHA1 0e6a727c87246700d93f505a5728bf3d643cdd66 SHA256 85fbcf53bc7d8ae99a8bd31dd09810abd9cf9397679a94aea52cd1b1c8e06ac0
@@ -12,13 +13,14 @@ EBUILD hydra-6.0.ebuild 1788 RMD160 413cfebac745656df73a4eed589b20811595fd41 SHA
 EBUILD hydra-6.1.ebuild 1788 RMD160 f93efa9314dc52ec21666d7cc86f8e92d0949dcf SHA1 be07552260d825fb6318dcb6bbdbc0486dff5023 SHA256 0b31c6edf57625b0bf5580484a6fc30d17e5e3734fb779f0eb18d4422a5e50ff
 EBUILD hydra-6.2.ebuild 1788 RMD160 6a0479cf81085e2623f13c5380cbdb7d0d58592e SHA1 191e71efaad7660b9792b51d04e83275618b6ea1 SHA256 be284b1dfa3bb6d3881c4c7005876fd8385a7abad786a62fc5e8954dbf350f7e
 EBUILD hydra-6.3.ebuild 1788 RMD160 531ff1acf2db8efbd3031cbe32f2682572ba804a SHA1 fe4a2cffe583a2799d63c917164a4099d78f4cad SHA256 b7341ce6ce159c8ec5076bf591336826aab73b3430607b37713330761e5b0946
+EBUILD hydra-6.5-r1.ebuild 1769 RMD160 8d72f01378342e1c1bfed72b44d20b9b7355dc89 SHA1 1f342404481fcd72b9bca9d43c7961fcf414733e SHA256 9c7dfbf0c5308add072ebcd9d4dbe5f38bb7dfee2c8053c24f4b4ff00492bf2b
 EBUILD hydra-6.5.ebuild 1805 RMD160 e203fb60c1a4b555f930a4dbb2b0ea3341ecd77d SHA1 52484250f09a59241035fc25c6b0d6780064ac78 SHA256 19c8eb5cda741b9fe63b529ddfab7ae738adcb278c94177838f145b6f63fdc30
-MISC ChangeLog 7771 RMD160 bf72511ecd2168edad56b15c7814cad4ed51c676 SHA1 b7251d3fc293e1cd869830207056f550a97f55b6 SHA256 4df1cc888bf3d34a397100001614271959e650aaf02b7a1fe9c35f4cc5533ee9
+MISC ChangeLog 7921 RMD160 5495720583d4e0d4265e208a5212cf0ce57e3285 SHA1 f73d69fdc382f810e8e2cb8eb7fb10d9b4dcacfd SHA256 b23eb6c54710e1d46f7ef2cf7512e521dd98b0a0f0d9747de4c8de4525a29702
 MISC metadata.xml 227 RMD160 2a8754b01b0efe35e1f147451db54318da704ec1 SHA1 905f8d225c7defc78c835ebf7f44a83bed62fce3 SHA256 549534fb196ce43008704171f81429d1df086465e990f62d1685b69a7583d27c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4m7bYACgkQVWmRsqeSphMB7QCeLN/XALFBnL1NEi0g73OUym6i
-T6MAniTBcqXAvXYABTW/ic18IP4jBWVu
-=3sMS
+iEYEARECAAYFAk4m9ZMACgkQVWmRsqeSphNa8wCcCOJy1H1T20IsvO18/iaNPdNa
+QEoAnjVgXFgDxQ+H2HScnVs0L8qt8lKg
+=wjRc
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/hydra/files/hydra-6.5-fix.diff b/net-analyzer/hydra/files/hydra-6.5-fix.diff
new file mode 100644
index 000000000000..5e887ebb5103
--- /dev/null
+++ b/net-analyzer/hydra/files/hydra-6.5-fix.diff
@@ -0,0 +1,30 @@
+http://www.thc.org/thc-hydra/hydra-6.5-fix.diff
+
+--- hydra-http-form.c	2011-07-15 12:17:01.707621600 +0200
++++ hydra-http-form.c	2011-07-15 16:59:21.044146200 +0200
+@@ -323,13 +323,13 @@
+ 
+       if (strcmp(type, "POST") == 0) {
+         sprintf(buffer,
+-                "POST %.600s HTTP/1.0\r\nHost: %s\r\nUser-Agent: Mozilla/4.0 (Hydra)\r\nContent-Type: application/x-www-form-urlencoded\r\nContent-Length: %d\r\n%s%s\r\n%s",
++                "POST %.600s HTTP/1.0\r\nHost: %s\r\nUser-Agent: Mozilla/5.0 (Hydra)\r\nContent-Type: application/x-www-form-urlencoded\r\nContent-Length: %d\r\n%s%s\r\n%s",
+                 url, webtarget, (int) strlen(upd3variables), header, userheader, upd3variables);
+         if (hydra_send(s, buffer, strlen(buffer), 0) < 0) {
+           return 1;
+         }
+       } else {
+-        sprintf(buffer, "GET http://%.600s?%s HTTP/1.0\r\nHost: %s\r\nUser-Agent: Mozilla/4.0 (Hydra)\r\n%s%s\r\n", url, upd3variables, webtarget, header, userheader);
++        sprintf(buffer, "GET %.600s?%s HTTP/1.0\r\nHost: %s\r\nUser-Agent: Mozilla/5.0 (Hydra)\r\n%s%s\r\n", url, upd3variables, webtarget, header, userheader);
+         if (hydra_send(s, buffer, strlen(buffer), 0) < 0) {
+           return 1;
+         }
+--- hydra.c	2011-07-15 12:17:01.737623300 +0200
++++ hydra.c	2011-07-15 16:52:39.029152300 +0200
+@@ -1757,7 +1757,6 @@
+       url = strtok(bufferurl, ":");
+       variables = strtok(NULL, ":");
+       cond = strtok(NULL, ":");
+-      optional1 = strtok(NULL, ":");
+       if (strstr(variables, "^USER^") == NULL && strstr(variables, "^PASS^") == NULL) {
+ 	fprintf(stderr, "ERROR: the variables argument needs at least the strings ^USER^ or ^PASS^: %s\n", variables);
+         exit(-1);
diff --git a/net-analyzer/hydra/hydra-6.5-r1.ebuild b/net-analyzer/hydra/hydra-6.5-r1.ebuild
new file mode 100644
index 000000000000..3aee4afb0801
--- /dev/null
+++ b/net-analyzer/hydra/hydra-6.5-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hydra/hydra-6.5-r1.ebuild,v 1.1 2011/07/20 15:34:37 jer Exp $
+
+EAPI="4"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Advanced parallized login hacker"
+HOMEPAGE="http://www.thc.org/thc-hydra/"
+SRC_URI="http://freeworld.thc.org/releases/${P}-src.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="gtk ssl"
+
+DEPEND="
+	dev-libs/openssl
+	gtk? ( x11-libs/gtk+:2 )
+	ssl? ( >=net-libs/libssh-0.4.0 )
+"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${P}-src
+
+src_prepare() {
+	# None of the settings in Makefile.unix are useful to us
+	: > Makefile.unix
+
+	epatch "${FILESDIR}"/${PN}-6.5-fix.diff
+
+	sed -i \
+		-e 's:-O2:$(CPPFLAGS) $(CFLAGS):g' \
+		-e 's:|| echo.*$::' \
+		-e '/\t-$(CC)/s:-::' \
+		-e '/ -o /s:$(OPTS) $(LIBS):$(OPTS) $(LDFLAGS):g' \
+		Makefile.am || die "sed failed"
+}
+
+src_configure() {
+	# Note: despite the naming convention, the top level script is not an
+	# autoconf-based script.
+	./configure \
+		--prefix=/usr \
+		$(use gtk && echo --disable-xhydra) \
+			|| die "configure failed"
+
+	sed -i \
+		-e '/^XDEFINES=/s:=.*:=:' \
+		-e '/^XLIBS=/s:=.*:=-lcrypto:' \
+		-e '/^XLIBPATHS/s:=.*:=:' \
+		-e '/^XIPATHS=/s:=.*:=:' \
+		Makefile || die "pruning vars"
+
+	if use ssl ; then
+		sed -i \
+			-e '/^XDEFINES=/s:=:=-DLIBOPENSSLNEW -DLIBSSH:' \
+			-e '/^XLIBS=/s:$: -lssl -lssh:' \
+			Makefile || die "adding ssl"
+	fi
+
+	if use gtk ; then
+		cd hydra-gtk && \
+		econf || die "econf failed"
+	fi
+}
+
+src_compile() {
+	tc-export CC
+	emake
+	if use gtk ; then
+		cd hydra-gtk && \
+		emake
+	fi
+}
+
+src_install() {
+	dobin hydra pw-inspector
+	if use gtk ; then
+		dobin hydra-gtk/src/xhydra
+	fi
+	dodoc CHANGES README TODO
+}