From f8917cc2eeae833d036388418a265535867f9f9e Mon Sep 17 00:00:00 2001
From: brad <brad@openbsd.org>
Date: Thu, 5 Aug 1999 23:43:51 +0000
Subject: [PATCH] upgrade to ethereal 0.7.1

---
 net/ethereal/Makefile         |  4 ++--
 net/ethereal/files/md5        |  6 +++---
 net/ethereal/patches/patch-aa | 22 +++++++++++-----------
 net/ethereal/patches/patch-ab | 14 +++++++-------
 4 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/net/ethereal/Makefile b/net/ethereal/Makefile
index 17d6c194fd3..0fe4b4c746f 100644
--- a/net/ethereal/Makefile
+++ b/net/ethereal/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.8 1999/05/25 23:10:50 brad Exp $
+# $OpenBSD: Makefile,v 1.9 1999/08/05 23:43:51 brad Exp $
 
-DISTNAME=	ethereal-0.6.2
+DISTNAME=	ethereal-0.7.1
 CATEGORIES=	net x11
 MASTER_SITES=	http://ethereal.zing.org/distribution/ \
 		http://ethereal.boehm.org/distribution/ \
diff --git a/net/ethereal/files/md5 b/net/ethereal/files/md5
index 0fb1800453f..fd75b990251 100644
--- a/net/ethereal/files/md5
+++ b/net/ethereal/files/md5
@@ -1,3 +1,3 @@
-MD5 (ethereal-0.6.2.tar.gz) = e887f29d5b71a52ab70e048d0d36dd4b
-RMD160 (ethereal-0.6.2.tar.gz) = b0f2bf7d6416d7d7d565b295227b9587c679f53a
-SHA1 (ethereal-0.6.2.tar.gz) = 51e2faf1e69f22ca0c188c05aa690458844ce263
+MD5 (ethereal-0.7.1.tar.gz) = d7de06d2c922bdf1a240777e97ceab79
+RMD160 (ethereal-0.7.1.tar.gz) = ff3b179790bc45c4c3554439145cca4761d21de2
+SHA1 (ethereal-0.7.1.tar.gz) = 5111b477d4d1451fc0a7b88f54de32cfc4875418
diff --git a/net/ethereal/patches/patch-aa b/net/ethereal/patches/patch-aa
index 6cfc5f929e2..bad2df137f7 100644
--- a/net/ethereal/patches/patch-aa
+++ b/net/ethereal/patches/patch-aa
@@ -1,11 +1,11 @@
---- packet.c.orig	Wed May 19 19:05:21 1999
-+++ packet.c	Tue May 25 14:53:13 1999
-@@ -625,7 +625,7 @@
- 		case DLT_PPP :
- 			dissect_ppp(pd, fd, tree);
- 			break;
--		case DLT_RAW :
-+		case DLT_LOOP :
- 			dissect_raw(pd, fd, tree);
- 			break;
- 	}
+--- capture.c.orig	Thu Aug  5 12:15:47 1999
++++ capture.c	Thu Aug  5 19:40:35 1999
+@@ -671,6 +671,8 @@
+     case DLT_PPP :
+       capture_ppp(pd, phdr->caplen, &ld->counts);
+       break;
++    case DLT_ENC :
++    case DLT_LOOP :
+     case DLT_RAW :
+       capture_raw(pd, phdr->caplen, &ld->counts);
+       break;
diff --git a/net/ethereal/patches/patch-ab b/net/ethereal/patches/patch-ab
index bd8cd9604ef..0f929f1c428 100644
--- a/net/ethereal/patches/patch-ab
+++ b/net/ethereal/patches/patch-ab
@@ -1,9 +1,9 @@
---- ethereal.c.orig	Wed May 19 19:05:11 1999
-+++ ethereal.c	Tue May 25 14:53:13 1999
-@@ -194,8 +194,21 @@
-     /* reload so it goes in effect. Also we set data_out_file which 
-        tells the tcp code to output the data */
-     close_cap_file( &cf, info_bar, file_ctx);
+--- ethereal.c.orig	Thu Aug  5 19:06:46 1999
++++ ethereal.c	Thu Aug  5 19:08:23 1999
+@@ -230,8 +230,21 @@
+ 	    gtk_entry_set_text(GTK_ENTRY(filter_te), cf.dfilter);
+     /* Run the display filter so it goes in effect. Also we set
+        data_out_file which tells the tcp code to output the data */
 +#if defined(__OpenBSD__)
 +    {
 +      int tmp_fd;
@@ -11,7 +11,7 @@
 +      snprintf( "%sXXXXXXXXXX", sizeof filename1, P_tmpdir );
 +      tmp_fd = mkstemp( filename1 );
 +      if ( tmp_fd == -1 ) {
-+	err( 1, "can't create temp file %s", filename1 );
++       err( 1, "can't create temp file %s", filename1 );
 +      }
 +      data_out_file = fdopen( tmp_fd, "a" );
 +    }