Fix bug #146573

Package-Manager: portage-2.1.1-r1

4 files changed, 35 insertions, 20 deletions

diff --git a/net-analyzer/dsniff/ChangeLog b/net-analyzer/dsniff/ChangeLog
index 0f7ddb6d3225..41d46c0ffffb 100644
--- a/net-analyzer/dsniff/ChangeLog
+++ b/net-analyzer/dsniff/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/dsniff
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/dsniff/ChangeLog,v 1.39 2006/10/31 21:28:37 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/dsniff/ChangeLog,v 1.40 2006/12/01 23:06:45 cedk Exp $
+
+  01 Dec 2006; Cedric Krier <cedk@gentoo.org> +files/2.3-openssl.patch,
+  dsniff-2.3-r10.ebuild:
+  Fix bug #146573
 
   31 Oct 2006; Markus Ullmann <jokey@gentoo.org> dsniff-2.3-r7.ebuild,
   dsniff-2.3-r10.ebuild, dsniff-2.4_beta1-r3.ebuild:
diff --git a/net-analyzer/dsniff/Manifest b/net-analyzer/dsniff/Manifest
index a487ba26b0a3..e9e57420c01d 100644
--- a/net-analyzer/dsniff/Manifest
+++ b/net-analyzer/dsniff/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 2.3-libnet-1.0.patch 6110 RMD160 955785d1f3a92615afbe4aeda200cf54fa2df42f SHA1 b9fd7f79256e529bd9504068794f49ac038babab SHA256 7e0a1236d7c57826c3c71cd78246dfdb10e8633217aac0b1784dff2889482136
 MD5 9206faea6a9be25f7d1aa0ac0a2ff6e3 files/2.3-libnet-1.0.patch 6110
 RMD160 955785d1f3a92615afbe4aeda200cf54fa2df42f files/2.3-libnet-1.0.patch 6110
@@ -9,6 +6,10 @@ AUX 2.3-makefile.patch 1531 RMD160 babd313c726824db4e475dc3b350e28f266f183b SHA1
 MD5 f41ad0aeacc05042ec27551b257845d3 files/2.3-makefile.patch 1531
 RMD160 babd313c726824db4e475dc3b350e28f266f183b files/2.3-makefile.patch 1531
 SHA256 eeb39dafa708b85d309d96e48fa27f526e906f725e240142b7ad12fabac2616a files/2.3-makefile.patch 1531
+AUX 2.3-openssl.patch 350 RMD160 fb2f099829e35935490c2928895042967c71f421 SHA1 01f6aa170340a375d259c5cd2882bc86e8dc073d SHA256 697adc7c00f7c810c884a12ff3455a18b4c0cf2db343908852a6a351015201a6
+MD5 58592cf7733bca2ce5d7772abd49228a files/2.3-openssl.patch 350
+RMD160 fb2f099829e35935490c2928895042967c71f421 files/2.3-openssl.patch 350
+SHA256 697adc7c00f7c810c884a12ff3455a18b4c0cf2db343908852a6a351015201a6 files/2.3-openssl.patch 350
 AUX dsniff-httppostfix.patch 675 RMD160 562c527409fe633e07d9a9ce60298ed9caf14f78 SHA1 48428b11ba8471433aa3e2dd2037dc5c11d05903 SHA256 320dab87c7c7f9ce86acf8830041da39aa367ba4149fa4eeffac93041d459293
 MD5 449ef7ee0534e261c2ce91d9b754b290 files/dsniff-httppostfix.patch 675
 RMD160 562c527409fe633e07d9a9ce60298ed9caf14f78 files/dsniff-httppostfix.patch 675
@@ -16,10 +17,10 @@ SHA256 320dab87c7c7f9ce86acf8830041da39aa367ba4149fa4eeffac93041d459293 files/ds
 DIST dsniff-2.3.tar.gz 126797 RMD160 89dad0259e90acef30a7aa5f3471de3aaeb06147 SHA1 671a1df823ab0657fc95e79112924a57281e9c3b SHA256 82e492455486e655c315f027d393dbeb49ad930804acccdc51b30d57e1294ff5
 DIST dsniff-2.4_beta1-debian-r1.patch.bz2 18280 RMD160 dd4ef3e4c9274e22a9f168b6d406260d4c306427 SHA1 46ace66ae502db4ae1de48822dce2faeed8f8257 SHA256 3974390e0970bbbb6ddddebf735a7de74abf110d20a867494a2ecd2298c19c39
 DIST dsniff-2.4b1.tar.gz 131666 RMD160 4d5dee193f0d252d22cfe2417f067460db9638b1 SHA1 25cfea26e9bbe016451180758a49d4d5bc9317d3 SHA256 a9803a7a02ddfe5fb9704ce86f0ffc48453c321e88db85810db411ba0841152a
-EBUILD dsniff-2.3-r10.ebuild 1908 RMD160 bb085a5cbe79790df9895a8885059348a864b060 SHA1 e47f27088def22040d8d3f49f1a4745f105822ae SHA256 6ca47b7230ae6562f2b11d4687c31d50a1dee5f82975fe41511f694d5014417b
-MD5 0b377a922abda4fe0defddf1cbee3a35 dsniff-2.3-r10.ebuild 1908
-RMD160 bb085a5cbe79790df9895a8885059348a864b060 dsniff-2.3-r10.ebuild 1908
-SHA256 6ca47b7230ae6562f2b11d4687c31d50a1dee5f82975fe41511f694d5014417b dsniff-2.3-r10.ebuild 1908
+EBUILD dsniff-2.3-r10.ebuild 2019 RMD160 0d2c5e5b695f65b619c7e81c64d675ff372ec7a9 SHA1 bfe4d691c4530ef8dff083c0f10f8377b56196c5 SHA256 a324c204d11aa81dfb8b5767f473fb58274fc67de252c1d1c47bad3f03033d61
+MD5 5660a956b54cd3fe237503e5c2ce9dd0 dsniff-2.3-r10.ebuild 2019
+RMD160 0d2c5e5b695f65b619c7e81c64d675ff372ec7a9 dsniff-2.3-r10.ebuild 2019
+SHA256 a324c204d11aa81dfb8b5767f473fb58274fc67de252c1d1c47bad3f03033d61 dsniff-2.3-r10.ebuild 2019
 EBUILD dsniff-2.3-r7.ebuild 1609 RMD160 d0aa370e9f4253ba260f621fb47a23af987d1dcb SHA1 6ae66a253a9337bb76f9b86d5513a0791a4d73bb SHA256 95784cf504cf02b728c5e7d19ac30a1ff387ba77bfd8b7b4c206a191e092d8c5
 MD5 c6775269533cbec52699818eb5b18735 dsniff-2.3-r7.ebuild 1609
 RMD160 d0aa370e9f4253ba260f621fb47a23af987d1dcb dsniff-2.3-r7.ebuild 1609
@@ -28,10 +29,10 @@ EBUILD dsniff-2.4_beta1-r3.ebuild 1842 RMD160 523aaa30c307486df464eeb82ca927a426
 MD5 f33900cd6373d84ba8de9daa2b33716b dsniff-2.4_beta1-r3.ebuild 1842
 RMD160 523aaa30c307486df464eeb82ca927a4262282b7 dsniff-2.4_beta1-r3.ebuild 1842
 SHA256 55e6fe1792d74ccfd9039d474fa3933dc45b38170cdfb8732c581e8030eeabd4 dsniff-2.4_beta1-r3.ebuild 1842
-MISC ChangeLog 5786 RMD160 87d4c970858da741724069f0f46c3ae1cb89b23b SHA1 21d0c45bc212040edc0f2278a447e7291b587a89 SHA256 f1019159d3ebd542914a17e72e4c7d904f8d78d613d8e47dbd58347f263c201c
-MD5 85ac41872b1459997c59e8c523d33ca1 ChangeLog 5786
-RMD160 87d4c970858da741724069f0f46c3ae1cb89b23b ChangeLog 5786
-SHA256 f1019159d3ebd542914a17e72e4c7d904f8d78d613d8e47dbd58347f263c201c ChangeLog 5786
+MISC ChangeLog 5901 RMD160 7048ef0a7f7d65c9f624d826d6d040cdc93d209e SHA1 921c8d35dd9cc3994b9a15490031f481ef1954c5 SHA256 96075f34ad980c6f0b139c1d7d4567a7596edf1d2eb01fec2d903b931422d982
+MD5 e8af74a7bcfe55566dea07845dd10755 ChangeLog 5901
+RMD160 7048ef0a7f7d65c9f624d826d6d040cdc93d209e ChangeLog 5901
+SHA256 96075f34ad980c6f0b139c1d7d4567a7596edf1d2eb01fec2d903b931422d982 ChangeLog 5901
 MISC metadata.xml 719 RMD160 25237084345cb83a625ebbaf43371aefc14ee49c SHA1 d8da8f1944703f293eec18770a30fa89a8079e9d SHA256 a30d2d3541d263d4260a1306aa810f8ef1ba4f45769fc0cd6bb715cc253d34ad
 MD5 bb880c49bdffe94226562c9f6b06e0e7 metadata.xml 719
 RMD160 25237084345cb83a625ebbaf43371aefc14ee49c metadata.xml 719
@@ -45,10 +46,3 @@ SHA256 873e56e84042ef6b43ff2549d741f7aed70ef5adfe81324808fcc6291d5205c4 files/di
 MD5 b109ec1eccaa5b60e6b7188576f0485e files/digest-dsniff-2.4_beta1-r3 524
 RMD160 1cbdedadad5dceefade75ede34ce6d6a191aee73 files/digest-dsniff-2.4_beta1-r3 524
 SHA256 0bc47b0e626badae875b48e1bba190d77345a67c47877d69166429a7ef73b80b files/digest-dsniff-2.4_beta1-r3 524
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFR85Fz974XjDVpbkRAmNFAJ46HzWS/xyDLWUU2Ug+1vxyq78wcACg3MnQ
-QGg554Kpun2RQcymai+vhIE=
-=zydB
------END PGP SIGNATURE-----
diff --git a/net-analyzer/dsniff/dsniff-2.3-r10.ebuild b/net-analyzer/dsniff/dsniff-2.3-r10.ebuild
index 81575587cfc7..d867ca6e4071 100644
--- a/net-analyzer/dsniff/dsniff-2.3-r10.ebuild
+++ b/net-analyzer/dsniff/dsniff-2.3-r10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/dsniff/dsniff-2.3-r10.ebuild,v 1.4 2006/10/31 21:28:37 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/dsniff/dsniff-2.3-r10.ebuild,v 1.5 2006/12/01 23:06:45 cedk Exp $
 
 inherit eutils flag-o-matic
 
@@ -51,6 +51,11 @@ src_unpack() {
 
 	# bug 125084
 	epatch ${FILESDIR}/${PN}-httppostfix.patch
+
+	# bug #146573
+	if has_version '>=dev-libs/openssl-0.9.8'; then
+		epatch "${FILESDIR}"/${PV}-openssl.patch
+	fi
 }
 
 src_compile() {
diff --git a/net-analyzer/dsniff/files/2.3-openssl.patch b/net-analyzer/dsniff/files/2.3-openssl.patch
new file mode 100644
index 000000000000..b7df13d8acd5
--- /dev/null
+++ b/net-analyzer/dsniff/files/2.3-openssl.patch
@@ -0,0 +1,12 @@
+diff -ru dsniff-2.3~/sshcrypto.c dsniff-2.3/sshcrypto.c
+--- dsniff-2.3~/sshcrypto.c	2006-12-01 23:44:43.000000000 +0100
++++ dsniff-2.3/sshcrypto.c	2006-12-01 23:46:52.000000000 +0100
+@@ -14,6 +14,8 @@
+ 
+ #include <sys/types.h>
+ #include <openssl/ssl.h>
++#include <openssl/blowfish.h>
++#include <openssl/des.h>
+ 
+ #include <err.h>
+ #include <stdio.h>