Compilation failure with openssl-0.9.8 reported by Nils Ohlmeier (bug #147455) fixed.

Package-Manager: portage-2.1.1

4 files changed, 46 insertions, 11 deletions

diff --git a/net-analyzer/ssldump/ChangeLog b/net-analyzer/ssldump/ChangeLog
index aae2d8e27661..c68180bf24fc 100644
--- a/net-analyzer/ssldump/ChangeLog
+++ b/net-analyzer/ssldump/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/ssldump
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ssldump/ChangeLog,v 1.13 2006/02/15 23:57:50 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ssldump/ChangeLog,v 1.14 2006/09/24 07:40:00 pva Exp $
+
+  24 Sep 2006; Peter Volkov <pva@gentoo.org>
+  +files/ssldump-0.9-openssl-0.9.8.compile-fix.patch, ssldump-0.9.ebuild:
+  Compilation failure with openssl-0.9.8 reported by Nils Ohlmeier (bug
+  #147455) fixed.
 
   15 Feb 2006; Markus Ullmann <jokey@gentoo.org> ssldump-0.9.ebuild:
   Removing virtual/libpcap wrt bug #117898
diff --git a/net-analyzer/ssldump/Manifest b/net-analyzer/ssldump/Manifest
index 4a4eb613b34b..7483d6b13de6 100644
--- a/net-analyzer/ssldump/Manifest
+++ b/net-analyzer/ssldump/Manifest
@@ -1,18 +1,28 @@
-MD5 13672d63c9695511a73937638383df40 ChangeLog 1479
-RMD160 9dff25fb09638ea903bf36aeeef8488e0b3fe9b8 ChangeLog 1479
-SHA256 01368b8f9975b857b6c3bc446fd897e7c5cb92b1ea504ce52ede7f071ad38c0b ChangeLog 1479
-MD5 a75fa220f35e6e8903b46f1542739ebd files/digest-ssldump-0.9 241
-RMD160 be540cd2ca8367b468178486fcb129c11a3cc349 files/digest-ssldump-0.9 241
-SHA256 d311a0bf33b21114602c5b64de355569a4e720a2a021339d4984a3496aa39768 files/digest-ssldump-0.9 241
+AUX ssldump-0.9-configure-dylib.patch 327 RMD160 c657a76dd4286256d65a7e3e649a3e422ec8d02b SHA1 700406b077539d33218094e497afaab15f8425e7 SHA256 3655ee69e445a299eac5286983cb2b8ccbe2bf69d6bc30a220b688c4c55d8ee8
 MD5 bb215f55cde7dbd9f41aff5da278cc6a files/ssldump-0.9-configure-dylib.patch 327
 RMD160 c657a76dd4286256d65a7e3e649a3e422ec8d02b files/ssldump-0.9-configure-dylib.patch 327
 SHA256 3655ee69e445a299eac5286983cb2b8ccbe2bf69d6bc30a220b688c4c55d8ee8 files/ssldump-0.9-configure-dylib.patch 327
+AUX ssldump-0.9-libpcap-header.patch 246 RMD160 0c38f12cd0fa23a10d3e4fc6a8d548a5ec352d05 SHA1 9440310b0f3435781f365c0394e11f3aa1e1c396 SHA256 942d1b1620ed49463d2b9359ae16d0083325408e40bb360c328dcce4ee50f1fd
 MD5 fb8f0f38b6d7247b85572b321c691ccd files/ssldump-0.9-libpcap-header.patch 246
 RMD160 0c38f12cd0fa23a10d3e4fc6a8d548a5ec352d05 files/ssldump-0.9-libpcap-header.patch 246
 SHA256 942d1b1620ed49463d2b9359ae16d0083325408e40bb360c328dcce4ee50f1fd files/ssldump-0.9-libpcap-header.patch 246
+AUX ssldump-0.9-openssl-0.9.8.compile-fix.patch 626 RMD160 88f375d073b951108c1cdf16e71ff4dde263d83e SHA1 330c45882729eea8628647d5ad603dcb8c95b672 SHA256 c0fa3dc3cea2872178e883d939c92d084a02458edfebeb4f2aaed0d32160ab63
+MD5 63ff6a5cf6308afa6e2fb8335a98a18b files/ssldump-0.9-openssl-0.9.8.compile-fix.patch 626
+RMD160 88f375d073b951108c1cdf16e71ff4dde263d83e files/ssldump-0.9-openssl-0.9.8.compile-fix.patch 626
+SHA256 c0fa3dc3cea2872178e883d939c92d084a02458edfebeb4f2aaed0d32160ab63 files/ssldump-0.9-openssl-0.9.8.compile-fix.patch 626
+DIST ssldump-0.9b3.tar.gz 137435 RMD160 941cf8f2ef8459ec4f9ce65772e134505d46566f SHA1 a633a9a811a138eac5ed440d583473b644135ef5 SHA256 6422c16718d27c270bbcfcc1272c4f9bd3c0799c351f1d6dd54fdc162afdab1e
+EBUILD ssldump-0.9.ebuild 998 RMD160 bc0af3fdae9b5fa77758c8c709316a5367f3085b SHA1 8cc9423f46e2d69ba1fc1a23a31b06233f9c57c8 SHA256 d8f7bf89bea3ee45d61af6432aad40f4f66ebf070e4b0b16a209d52273fba48d
+MD5 44fc2db6516f437df2a38448c4ce6b84 ssldump-0.9.ebuild 998
+RMD160 bc0af3fdae9b5fa77758c8c709316a5367f3085b ssldump-0.9.ebuild 998
+SHA256 d8f7bf89bea3ee45d61af6432aad40f4f66ebf070e4b0b16a209d52273fba48d ssldump-0.9.ebuild 998
+MISC ChangeLog 1687 RMD160 051e4360955d66e1ecea7cc2d3882317cc8e9c35 SHA1 d7ec92655a56c961c00ec73c3bb5c88b669f09ed SHA256 fd4c7d1ed9308482f48519b18b6bd59ba3e4712adc55298599723754c7620811
+MD5 0506e2f8693c31a9146741f497a04af2 ChangeLog 1687
+RMD160 051e4360955d66e1ecea7cc2d3882317cc8e9c35 ChangeLog 1687
+SHA256 fd4c7d1ed9308482f48519b18b6bd59ba3e4712adc55298599723754c7620811 ChangeLog 1687
+MISC metadata.xml 245 RMD160 f1d049e617f898a986a683fe58eed04a95c743e6 SHA1 c65b7f2884eb28392358f234fd40d313a5112f18 SHA256 ad9d4f8a55c8a1eaadcfa8d2fff0ac3a302530ab91a80972c1e0b30666a719f6
 MD5 38fc0f377891f16feb5aee3de500e7d0 metadata.xml 245
 RMD160 f1d049e617f898a986a683fe58eed04a95c743e6 metadata.xml 245
 SHA256 ad9d4f8a55c8a1eaadcfa8d2fff0ac3a302530ab91a80972c1e0b30666a719f6 metadata.xml 245
-MD5 1446b835559f07a26713185a4b7f9921 ssldump-0.9.ebuild 941
-RMD160 2a58fc7958fce2693a43612f705a4c0a44035ee7 ssldump-0.9.ebuild 941
-SHA256 3e501be02f1b66c1bbe733f8685e5707957abb81e93579709932068270f275c9 ssldump-0.9.ebuild 941
+MD5 a75fa220f35e6e8903b46f1542739ebd files/digest-ssldump-0.9 241
+RMD160 be540cd2ca8367b468178486fcb129c11a3cc349 files/digest-ssldump-0.9 241
+SHA256 d311a0bf33b21114602c5b64de355569a4e720a2a021339d4984a3496aa39768 files/digest-ssldump-0.9 241
diff --git a/net-analyzer/ssldump/files/ssldump-0.9-openssl-0.9.8.compile-fix.patch b/net-analyzer/ssldump/files/ssldump-0.9-openssl-0.9.8.compile-fix.patch
new file mode 100644
index 000000000000..56b118746d5a
--- /dev/null
+++ b/net-analyzer/ssldump/files/ssldump-0.9-openssl-0.9.8.compile-fix.patch
@@ -0,0 +1,19 @@
+diff -Naur ssldump-0.9b3.orig/ssl/ssldecode.c ssldump-0.9b3/ssl/ssldecode.c
+--- ssldump-0.9b3.orig/ssl/ssldecode.c	2002-08-17 05:33:17.000000000 +0400
++++ ssldump-0.9b3/ssl/ssldecode.c	2006-09-24 11:30:58.000000000 +0400
+@@ -51,6 +51,7 @@
+ #include <openssl/ssl.h>
+ #include <openssl/hmac.h>
+ #include <openssl/evp.h>
++#include <openssl/md5.h>
+ #include <openssl/x509v3.h>
+ #endif
+ #include "ssldecode.h"
+@@ -131,6 +132,7 @@
+     ssl_decode_ctx *d=0;
+     int r,_status;
+     
++    SSL_library_init();
+     SSLeay_add_all_algorithms();
+     if(!(d=(ssl_decode_ctx *)malloc(sizeof(ssl_decode_ctx))))
+       ABORT(R_NO_MEMORY);
diff --git a/net-analyzer/ssldump/ssldump-0.9.ebuild b/net-analyzer/ssldump/ssldump-0.9.ebuild
index 5b24a27cc7cf..d8aa6b457c39 100644
--- a/net-analyzer/ssldump/ssldump-0.9.ebuild
+++ b/net-analyzer/ssldump/ssldump-0.9.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/ssldump/ssldump-0.9.ebuild,v 1.13 2006/02/15 23:57:50 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ssldump/ssldump-0.9.ebuild,v 1.14 2006/09/24 07:40:00 pva Exp $
 
 inherit gnuconfig eutils
 
@@ -24,6 +24,7 @@ src_unpack() {
 
 	epatch "${FILESDIR}/${P}"-libpcap-header.patch
 	epatch "${FILESDIR}/${P}"-configure-dylib.patch
+	epatch "${FILESDIR}/${P}"-openssl-0.9.8.compile-fix.patch
 }
 
 src_compile() {