Remove short <longdescription>, match DESCRIPTION to upstream blurb. Add some missing includes, declare a prototype for ssl3_check_mac().

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)

5 files changed, 54 insertions, 6 deletions

diff --git a/net-analyzer/ssldump/ChangeLog b/net-analyzer/ssldump/ChangeLog
index 18336eaf76a4..e24ee9e300f3 100644
--- a/net-analyzer/ssldump/ChangeLog
+++ b/net-analyzer/ssldump/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/ssldump
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ssldump/ChangeLog,v 1.32 2014/06/26 11:24:57 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ssldump/ChangeLog,v 1.33 2014/07/17 15:54:58 jer Exp $
+
+  17 Jul 2014; Jeroen Roovers <jer@gentoo.org> ssldump-0.9-r2.ebuild,
+  +files/ssldump-0.9-declaration.patch, +files/ssldump-0.9-includes.patch,
+  metadata.xml:
+  Remove short <longdescription>, match DESCRIPTION to upstream blurb. Add some
+  missing includes, declare a prototype for ssl3_check_mac().
 
   26 Jun 2014; Jeroen Roovers <jer@gentoo.org> ssldump-0.9-r2.ebuild,
   files/ssldump-0.9-configure-dylib.patch:
diff --git a/net-analyzer/ssldump/files/ssldump-0.9-declaration.patch b/net-analyzer/ssldump/files/ssldump-0.9-declaration.patch
new file mode 100644
index 000000000000..836b52c84ab2
--- /dev/null
+++ b/net-analyzer/ssldump/files/ssldump-0.9-declaration.patch
@@ -0,0 +1,11 @@
+--- a/ssl/ssl_rec.h
++++ b/ssl/ssl_rec.h
+@@ -54,6 +54,8 @@
+   SSL_CipherSuite *cs,UCHAR *mk,UCHAR *sk,UCHAR *iv));
+ int ssl_decode_rec_data PROTO_LIST((ssl_obj *ssl,ssl_rec_decoder *d,
+   int ct,int version,UCHAR *in,int inl,UCHAR *out,int *outl));
++int ssl3_check_mac(ssl_rec_decoder *d, int ct, int ver, UCHAR *data,
++  UINT4 datalen, UCHAR *mac);
+ 
+ #endif
+ 
diff --git a/net-analyzer/ssldump/files/ssldump-0.9-includes.patch b/net-analyzer/ssldump/files/ssldump-0.9-includes.patch
new file mode 100644
index 000000000000..4e357e8b1922
--- /dev/null
+++ b/net-analyzer/ssldump/files/ssldump-0.9-includes.patch
@@ -0,0 +1,30 @@
+--- a/common/lib/r_assoc.c
++++ b/common/lib/r_assoc.c
+@@ -57,6 +57,7 @@
+ static char *RCSSTRING="$Id: ssldump-0.9-includes.patch,v 1.1 2014/07/17 15:54:58 jer Exp $";
+ 
+ #include <r_common.h>
++#include <string.h> /* memcpy() memcmp() */
+ #include "r_assoc.h"
+ 
+ typedef struct r_assoc_el_ {
+--- a/common/lib/r_bitfield.c
++++ b/common/lib/r_bitfield.c
+@@ -11,6 +11,7 @@
+ static char *RCSSTRING="$Id: ssldump-0.9-includes.patch,v 1.1 2014/07/17 15:54:58 jer Exp $";
+ 
+ #include <r_common.h>
++#include <string.h> /* memcpy() memset() */
+ #include "r_bitfield.h"
+ 
+ int r_bitfield_create(setp,size)
+--- a/common/lib/r_data.c
++++ b/common/lib/r_data.c
+@@ -47,6 +47,7 @@
+ static char *RCSSTRING="$Id: ssldump-0.9-includes.patch,v 1.1 2014/07/17 15:54:58 jer Exp $";
+ 
+ #include <r_common.h>
++#include <string.h> /* memcmp() memcpy() memset() */
+ #include <r_data.h>
+ 
+ int r_data_create(dp,d,l)
diff --git a/net-analyzer/ssldump/metadata.xml b/net-analyzer/ssldump/metadata.xml
index 7e6df486c3fe..03aa50bab7e3 100644
--- a/net-analyzer/ssldump/metadata.xml
+++ b/net-analyzer/ssldump/metadata.xml
@@ -2,5 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>netmon</herd>
-<longdescription>A Tool for network monitoring and data acquisition</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/ssldump/ssldump-0.9-r2.ebuild b/net-analyzer/ssldump/ssldump-0.9-r2.ebuild
index 95f431809cb5..68d295fe6c74 100644
--- a/net-analyzer/ssldump/ssldump-0.9-r2.ebuild
+++ b/net-analyzer/ssldump/ssldump-0.9-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ssldump/ssldump-0.9-r2.ebuild,v 1.7 2014/06/26 11:24:57 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ssldump/ssldump-0.9-r2.ebuild,v 1.8 2014/07/17 15:54:58 jer Exp $
 
 EAPI=5
 
@@ -10,9 +10,9 @@ inherit autotools-utils eutils toolchain-funcs
 
 MY_P="${PN}-0.9b3"
 
-DESCRIPTION="A Tool for network monitoring and data acquisition"
+DESCRIPTION="An SSLv3/TLS network protocol analyzer"
 HOMEPAGE="http://www.rtfm.com/ssldump/"
-SRC_URI="http://www.rtfm.com/ssldump/${MY_P}.tar.gz"
+SRC_URI="${HOMEPAGE}${MY_P}.tar.gz"
 
 LICENSE="openssl"
 SLOT="0"
@@ -31,7 +31,9 @@ src_prepare() {
 		"${FILESDIR}"/${P}-configure-dylib.patch \
 		"${FILESDIR}"/${P}-openssl-0.9.8.compile-fix.patch \
 		"${FILESDIR}"/${P}-DLT_LINUX_SLL.patch \
-		"${FILESDIR}"/${P}-prefix-fix.patch #414359
+		"${FILESDIR}"/${P}-prefix-fix.patch \
+		"${FILESDIR}"/${P}-declaration.patch \
+		"${FILESDIR}"/${P}-includes.patch
 
 	autotools-utils_src_prepare
 }