head	1.3;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.3
	OPENPKG_E1_MP:1.3
	OPENPKG_E1_MP_2_STABLE:1.2.2.3
	OPENPKG_E1_FP:1.2.2.3
	OPENPKG_2_STABLE_MP:1.3
	OPENPKG_2_STABLE_20061018:1.2.2.2
	OPENPKG_2_STABLE:1.2.0.2
	OPENPKG_CW_FP:1.1;
locks; strict;
comment	@# @;


1.3
date	2006.10.24.13.11.14;	author rse;	state Exp;
branches;
next	1.2;
commitid	tqh1rLwVtQMTcWRr;

1.2
date	2006.10.13.05.41.57;	author rse;	state Exp;
branches
	1.2.2.1;
next	1.1;
commitid	qEK87zCfwlVG4uQr;

1.1
date	2004.12.28.09.42.43;	author rse;	state Exp;
branches;
next	;

1.2.2.1
date	2006.10.13.05.41.57;	author rse;	state dead;
branches;
next	1.2.2.2;
commitid	iZxwRSmmWscPXUQr;

1.2.2.2
date	2006.10.16.14.56.48;	author rse;	state Exp;
branches;
next	1.2.2.3;
commitid	iZxwRSmmWscPXUQr;

1.2.2.3
date	2006.10.24.13.11.52;	author rse;	state Exp;
branches;
next	;
commitid	cmkS9ZOGzSx7dWRr;


desc
@@


1.3
log
@fix building under Solaris
@
text
@Index: base/pcap-snoop.c
--- base/pcap-snoop.c.orig	2002-09-09 23:02:58 +0200
+++ base/pcap-snoop.c	2006-10-24 15:10:20 +0200
@@@@ -49,7 +49,7 @@@@
 
 #include <pcap.h>
 #include <unistd.h>
-#include <net/bpf.h>
+#include <pcap-bpf.h>
 #ifndef _WIN32
 #include <sys/param.h>
 #endif
@@@@ -148,7 +148,7 @@@@
 
         /* if vlans, push past VLAN header (4 bytes) */
         if(type==ETHERTYPE_8021Q) {
-          type=ntohs(*(u_int16_t *)(data + 2));
+          type=ntohs(*(uint16_t *)(data + 2));
 
           data+=4;
           len+=4;
Index: ssl/ssldecode.c
--- ssl/ssldecode.c.orig	2002-08-17 03:33:17 +0200
+++ ssl/ssldecode.c	2006-10-24 15:10:20 +0200
@@@@ -52,6 +52,7 @@@@
 #include <openssl/hmac.h>
 #include <openssl/evp.h>
 #include <openssl/x509v3.h>
+#include <openssl/md5.h>
 #endif
 #include "ssldecode.h"
 #include "ssl_rec.h"
@


1.2
log
@fix building, bless for PLUS, cosmetics
@
text
@d3 1
a3 1
+++ base/pcap-snoop.c	2006-10-12 22:05:05 +0200
d13 9
d24 1
a24 1
+++ ssl/ssldecode.c	2006-10-13 07:39:29 +0200
@


1.2.2.1
log
@file ssldump.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:56:48 +0000
@
text
@d1 23
@


1.2.2.2
log
@Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class)
@
text
@a0 23
Index: base/pcap-snoop.c
--- base/pcap-snoop.c.orig	2002-09-09 23:02:58 +0200
+++ base/pcap-snoop.c	2006-10-12 22:05:05 +0200
@@@@ -49,7 +49,7 @@@@
 
 #include <pcap.h>
 #include <unistd.h>
-#include <net/bpf.h>
+#include <pcap-bpf.h>
 #ifndef _WIN32
 #include <sys/param.h>
 #endif
Index: ssl/ssldecode.c
--- ssl/ssldecode.c.orig	2002-08-17 03:33:17 +0200
+++ ssl/ssldecode.c	2006-10-13 07:39:29 +0200
@@@@ -52,6 +52,7 @@@@
 #include <openssl/hmac.h>
 #include <openssl/evp.h>
 #include <openssl/x509v3.h>
+#include <openssl/md5.h>
 #endif
 #include "ssldecode.h"
 #include "ssl_rec.h"
@


1.2.2.3
log
@MFC: fix building under Solaris
@
text
@d3 1
a3 1
+++ base/pcap-snoop.c	2006-10-24 15:10:20 +0200
a12 9
@@@@ -148,7 +148,7 @@@@
 
         /* if vlans, push past VLAN header (4 bytes) */
         if(type==ETHERTYPE_8021Q) {
-          type=ntohs(*(u_int16_t *)(data + 2));
+          type=ntohs(*(uint16_t *)(data + 2));
 
           data+=4;
           len+=4;
d15 1
a15 1
+++ ssl/ssldecode.c	2006-10-24 15:10:20 +0200
@


1.1
log
@new package: ssldump 0.9b3 (SSL/TLS network protocol analyzer)
@
text
@d3 1
a3 1
+++ base/pcap-snoop.c	2004-12-28 10:40:01 +0100
d13 11
@