Clean up patches.

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

6 files changed, 21 insertions, 13 deletions

diff --git a/net-analyzer/ssldump/ChangeLog b/net-analyzer/ssldump/ChangeLog
index 505959fe5c91..6b62697ca085 100644
--- a/net-analyzer/ssldump/ChangeLog
+++ b/net-analyzer/ssldump/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/ssldump
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ssldump/ChangeLog,v 1.29 2013/04/06 06:00:55 pinkbyte Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ssldump/ChangeLog,v 1.30 2014/06/23 20:06:36 jer Exp $
+
+  23 Jun 2014; Jeroen Roovers <jer@gentoo.org>
+  files/ssldump-0.9-DLT_LINUX_SLL.patch,
+  files/ssldump-0.9-configure-dylib.patch,
+  files/ssldump-0.9-libpcap-header.patch,
+  files/ssldump-0.9-openssl-0.9.8.compile-fix.patch,
+  files/ssldump-0.9-prefix-fix.patch:
+  Clean up patches.
 
   06 Apr 2013; Sergey Popov <pinkbyte@gentoo.org> -ssldump-0.9-r1.ebuild:
   Drop old revision
diff --git a/net-analyzer/ssldump/files/ssldump-0.9-DLT_LINUX_SLL.patch b/net-analyzer/ssldump/files/ssldump-0.9-DLT_LINUX_SLL.patch
index 3c30c6197ca8..9a58c6369929 100644
--- a/net-analyzer/ssldump/files/ssldump-0.9-DLT_LINUX_SLL.patch
+++ b/net-analyzer/ssldump/files/ssldump-0.9-DLT_LINUX_SLL.patch
@@ -1,5 +1,5 @@
---- base/pcap-snoop.c	2007-11-06 14:22:53.000000000 +0100
-+++ base/pcap-snoop_new.c	2007-11-06 14:24:05.000000000 +0100
+--- a/base/pcap-snoop.c
++++ b/base/pcap-snoop.c
 @@ -157,6 +157,10 @@
            return;
          
diff --git a/net-analyzer/ssldump/files/ssldump-0.9-configure-dylib.patch b/net-analyzer/ssldump/files/ssldump-0.9-configure-dylib.patch
index 13128551dfe9..0c5e2eec4a01 100644
--- a/net-analyzer/ssldump/files/ssldump-0.9-configure-dylib.patch
+++ b/net-analyzer/ssldump/files/ssldump-0.9-configure-dylib.patch
@@ -1,5 +1,5 @@
---- configure
-+++ configure
+--- a/configure
++++ b/configure
 @@ -1103,7 +1103,7 @@
  echo "configure:1104: checking for PCAP library" >&5
  ac_found_pcap_lib_dir="no"
diff --git a/net-analyzer/ssldump/files/ssldump-0.9-libpcap-header.patch b/net-analyzer/ssldump/files/ssldump-0.9-libpcap-header.patch
index 95f9fda31dc0..a9a724658ccf 100644
--- a/net-analyzer/ssldump/files/ssldump-0.9-libpcap-header.patch
+++ b/net-analyzer/ssldump/files/ssldump-0.9-libpcap-header.patch
@@ -1,5 +1,5 @@
---- base/pcap-snoop.c	2002-09-09 21:02:58.000000000 +0000
-+++ base/pcap-snoop.c	2004-02-06 14:59:37.278455352 +0000
+--- a/base/pcap-snoop.c
++++ b/base/pcap-snoop.c
 @@ -49,7 +49,6 @@
  
  #include <pcap.h>
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
index 56b118746d5a..2ce16d54f168 100644
--- 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
@@ -1,6 +1,5 @@
-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
+--- a/ssl/ssldecode.c
++++ b/ssl/ssldecode.c
 @@ -51,6 +51,7 @@
  #include <openssl/ssl.h>
  #include <openssl/hmac.h>
diff --git a/net-analyzer/ssldump/files/ssldump-0.9-prefix-fix.patch b/net-analyzer/ssldump/files/ssldump-0.9-prefix-fix.patch
index 4d665da7e045..74d7ddcd6f68 100644
--- a/net-analyzer/ssldump/files/ssldump-0.9-prefix-fix.patch
+++ b/net-analyzer/ssldump/files/ssldump-0.9-prefix-fix.patch
@@ -1,6 +1,7 @@
 eliminates unused variable ROOT, which disturbs ld from Prefix. Bug #414335
---- Makefile.in	2001-11-27 07:38:13.000000000 +0900
-+++ Makefile.in.new	2012-05-02 16:13:10.000000000 +0900
+
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -46,13 +46,12 @@ BINDIR=@sbindir@
  MANDIR=@mandir@
  RM=rm -f