From 5307179a0e6bfdf65c91e8a264a74f5f89912573 Mon Sep 17 00:00:00 2001 From: brad Date: Wed, 1 Sep 1999 17:57:00 +0000 Subject: [PATCH] upgrade to ethereal 0.7.3 --- net/ethereal/Makefile | 4 ++-- net/ethereal/files/md5 | 6 +++--- net/ethereal/patches/patch-aa | 11 ----------- net/ethereal/patches/patch-ab | 24 ------------------------ net/ethereal/patches/patch-ac | 11 ----------- 5 files changed, 5 insertions(+), 51 deletions(-) delete mode 100644 net/ethereal/patches/patch-aa delete mode 100644 net/ethereal/patches/patch-ab delete mode 100644 net/ethereal/patches/patch-ac diff --git a/net/ethereal/Makefile b/net/ethereal/Makefile index 90780864477..f31488c0ade 100644 --- a/net/ethereal/Makefile +++ b/net/ethereal/Makefile @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile,v 1.10 1999/08/13 02:12:28 brad Exp $ +# $OpenBSD: Makefile,v 1.11 1999/09/01 17:57:00 brad Exp $ -DISTNAME= ethereal-0.7.2 +DISTNAME= ethereal-0.7.3 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 50db6da18db..7d8246cdce9 100644 --- a/net/ethereal/files/md5 +++ b/net/ethereal/files/md5 @@ -1,3 +1,3 @@ -MD5 (ethereal-0.7.2.tar.gz) = 7bfb1a2734a184d49cf3571b27172a74 -RMD160 (ethereal-0.7.2.tar.gz) = b246a69656db2091bbdc0dc88ae9b2ae3eb30911 -SHA1 (ethereal-0.7.2.tar.gz) = ee1e219d70d636e42fcb3419004541d301c16adc +MD5 (ethereal-0.7.3.tar.gz) = 3c3a3071628e2cc8e0446c6d9f8ae6f1 +RMD160 (ethereal-0.7.3.tar.gz) = 70c5665d5fe6c832d77995a19a7fd1550ec537d4 +SHA1 (ethereal-0.7.3.tar.gz) = 0f0b56d24077c290ae8ace9edf4b4702b2dfe7ab diff --git a/net/ethereal/patches/patch-aa b/net/ethereal/patches/patch-aa deleted file mode 100644 index 0eb3d1492c2..00000000000 --- a/net/ethereal/patches/patch-aa +++ /dev/null @@ -1,11 +0,0 @@ ---- capture.c.orig Tue Aug 10 16:13:21 1999 -+++ capture.c Thu Aug 12 20:41:55 1999 -@@ -669,6 +669,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 deleted file mode 100644 index 47b5fb432b5..00000000000 --- a/net/ethereal/patches/patch-ab +++ /dev/null @@ -1,24 +0,0 @@ ---- ethereal.c.orig Tue Aug 10 16:05:38 1999 -+++ ethereal.c Thu Aug 12 21:15:23 1999 -@@ -234,8 +234,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; -+ -+ snprintf( "%sXXXXXXXXXX", sizeof filename1, P_tmpdir ); -+ tmp_fd = mkstemp( filename1 ); -+ if ( tmp_fd == -1 ) { -+ err( 1, "can't create temp file %s", filename1 ); -+ } -+ data_out_file = fdopen( tmp_fd, "a" ); -+ } -+#else - strcpy( filename1, tmpnam(NULL) ); - data_out_file = fopen( filename1, "a" ); -+#endif - if( data_out_file == NULL ) { - fprintf( stderr, "Could not open tmp file %s\n", filename1 ); - } diff --git a/net/ethereal/patches/patch-ac b/net/ethereal/patches/patch-ac deleted file mode 100644 index 119ddd03156..00000000000 --- a/net/ethereal/patches/patch-ac +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig Thu Aug 12 12:52:11 1999 -+++ Makefile.in Thu Aug 12 12:52:51 1999 -@@ -667,7 +667,7 @@ - make ../ethereal.1 ) - - dfilter-scanner.c : dfilter-scanner.l -- $(LEX) -Pdfilter_ -t dfilter-scanner.l > dfilter-scanner.c -+ $(LEX) -Pdfilter_ -t $(srcdir)/dfilter-scanner.l > dfilter-scanner.c - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded.