summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net-analyzer/ssldump/files')
-rw-r--r--net-analyzer/ssldump/files/ssldump-0.9-DLT_LINUX_SLL.patch13
-rw-r--r--net-analyzer/ssldump/files/ssldump-0.9-configure-dylib.patch28
-rw-r--r--net-analyzer/ssldump/files/ssldump-0.9-declaration.patch11
-rw-r--r--net-analyzer/ssldump/files/ssldump-0.9-includes.patch30
-rw-r--r--net-analyzer/ssldump/files/ssldump-0.9-libpcap-header.patch10
-rw-r--r--net-analyzer/ssldump/files/ssldump-0.9-openssl-0.9.8.compile-fix.patch18
-rw-r--r--net-analyzer/ssldump/files/ssldump-0.9-prefix-fix.patch22
7 files changed, 0 insertions, 132 deletions
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
deleted file mode 100644
index 9a58c6369929..000000000000
--- a/net-analyzer/ssldump/files/ssldump-0.9-DLT_LINUX_SLL.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/base/pcap-snoop.c
-+++ b/base/pcap-snoop.c
-@@ -157,6 +157,10 @@
- return;
-
- break;
-+ case DLT_LINUX_SLL:
-+ data+=16;
-+ len-=16;
-+ break;
- }
- network_process_packet(n,&hdr->ts,data,len);
- }
diff --git a/net-analyzer/ssldump/files/ssldump-0.9-configure-dylib.patch b/net-analyzer/ssldump/files/ssldump-0.9-configure-dylib.patch
deleted file mode 100644
index 941350e8c789..000000000000
--- a/net-analyzer/ssldump/files/ssldump-0.9-configure-dylib.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -102,14 +102,13 @@
- AC_MSG_CHECKING(for PCAP library)
- ac_found_pcap_lib_dir="no"
- for dir in $ac_pcap_lib_dir; do
-- if test -f $dir/libpcap.a; then
-+ if test -f $dir/libpcap.so -o -f $dir/libpcap.dylib; then
- dnl Ok, we think we've found them, but check that they
-- dnl actually ontain the right functions
-+ dnl actually contain the right functions
- save_LIBS=$LIBS
-- save_LDFLAGS=$LDFLAGS
- LIBS="-lpcap $LIBS"
- if test "$dir" != "/usr/lib"; then
-- LDFLAGS="-L$dir $LDFLAGS"
-+ LIBS="-L$dir $LIBS"
- fi
- AC_TRY_LINK_FUNC(pcap_open_live,ac_linked_libpcap="true",
- ac_linked_libpcap="false");
-@@ -118,7 +117,6 @@
- break
- fi
- LIBS=$save_LIBS
-- LDFLAGS=$save_LDFLAGS
- fi
- done
-
diff --git a/net-analyzer/ssldump/files/ssldump-0.9-declaration.patch b/net-analyzer/ssldump/files/ssldump-0.9-declaration.patch
deleted file mode 100644
index 836b52c84ab2..000000000000
--- a/net-analyzer/ssldump/files/ssldump-0.9-declaration.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 8ca06dcef449..000000000000
--- a/net-analyzer/ssldump/files/ssldump-0.9-includes.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/common/lib/r_assoc.c
-+++ b/common/lib/r_assoc.c
-@@ -57,6 +57,7 @@
- static char *RCSSTRING="$Id$";
-
- #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$";
-
- #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$";
-
- #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/files/ssldump-0.9-libpcap-header.patch b/net-analyzer/ssldump/files/ssldump-0.9-libpcap-header.patch
deleted file mode 100644
index a9a724658ccf..000000000000
--- a/net-analyzer/ssldump/files/ssldump-0.9-libpcap-header.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/base/pcap-snoop.c
-+++ b/base/pcap-snoop.c
-@@ -49,7 +49,6 @@
-
- #include <pcap.h>
- #include <unistd.h>
--#include <net/bpf.h>
- #ifndef _WIN32
- #include <sys/param.h>
- #endif
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
deleted file mode 100644
index 2ce16d54f168..000000000000
--- a/net-analyzer/ssldump/files/ssldump-0.9-openssl-0.9.8.compile-fix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/ssl/ssldecode.c
-+++ b/ssl/ssldecode.c
-@@ -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/files/ssldump-0.9-prefix-fix.patch b/net-analyzer/ssldump/files/ssldump-0.9-prefix-fix.patch
deleted file mode 100644
index 74d7ddcd6f68..000000000000
--- a/net-analyzer/ssldump/files/ssldump-0.9-prefix-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-eliminates unused variable ROOT, which disturbs ld from Prefix. Bug #414335
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -46,13 +46,12 @@ BINDIR=@sbindir@
- MANDIR=@mandir@
- RM=rm -f
-
--ROOT=./
--ANALYZE_SRCDIR=$(ROOT)base/
-+ANALYZE_SRCDIR=base/
- COMMONDIR=common/
- COMMON_LIB_SRCDIR=$(COMMONDIR)lib/
--ANALYZE_NULL_SRCDIR=$(ROOT)null/
--ANALYZE_SSL_SRCDIR=$(ROOT)ssl/
--ANALYZE_RECORD_SRCDIR=$(ROOT)@RECORD_MOD@/
-+ANALYZE_NULL_SRCDIR=null/
-+ANALYZE_SSL_SRCDIR=ssl/
-+ANALYZE_RECORD_SRCDIR=@RECORD_MOD@/
- include rules.mk
-
- include $(COMMON_LIB_SRCDIR)/targets.mk