From ec17cef10707f343ec0e3e7dcda1c38eaab46502 Mon Sep 17 00:00:00 2001
From: spz <spz>
Date: Fri, 10 Apr 2009 21:16:49 +0000
Subject: Pullup ticket 2731 - requested by tron Security fix

Revisions pulled up:
- pkgsrc/net/wireshark/Makefile		1.30
- pkgsrc/net/wireshark/distinfo		1.20

   Module Name:    pkgsrc
   Committed By:   tron
   Date:           Fri Apr 10 07:21:29 UTC 2009

   Modified Files:
           pkgsrc/net/wireshark: Makefile distinfo

   Log Message:
   Update "wireshark" package to version 1.0.7. Changes since version 1.0.6:
   - Security-related bugs in the Profinet, LDAP, and CPHAP dissectors and
     the Tektronix K12 file format have been fixed.
   - Many other bugs have been fixed.

   To generate a diff of this commit:
   cvs rdiff -u -r1.29 -r1.30 pkgsrc/net/wireshark/Makefile
   cvs rdiff -u -r1.19 -r1.20 pkgsrc/net/wireshark/distinfo
---
 net/wireshark/Makefile | 6 ++++--
 net/wireshark/distinfo | 8 ++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'net')

diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index 195d122013c..f7d2fac5d00 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.29 2009/02/13 09:41:11 tron Exp $
+# $NetBSD: Makefile,v 1.29.2.1 2009/04/10 21:16:49 spz Exp $
 
-DISTNAME=		wireshark-1.0.6
+DISTNAME=		wireshark-1.0.7
 CATEGORIES=		net
 MASTER_SITES=		http://www.wireshark.org/download/src/ \
 			${MASTER_SITE_SOURCEFORGE:=wireshark/}
@@ -14,6 +14,8 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 CONFLICTS+=		ethereal-[0-9]*
 
+LICENSE=		gnu-gpl-v2
+
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		gmake perl pkg-config
 
diff --git a/net/wireshark/distinfo b/net/wireshark/distinfo
index 95264d9602b..4a93812d01b 100644
--- a/net/wireshark/distinfo
+++ b/net/wireshark/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.19 2009/02/13 09:41:11 tron Exp $
+$NetBSD: distinfo,v 1.19.2.1 2009/04/10 21:16:49 spz Exp $
 
-SHA1 (wireshark-1.0.6.tar.bz2) = 1aa726e32905a2815d01a9f33df84a873b11c7ef
-RMD160 (wireshark-1.0.6.tar.bz2) = 5037c3c5f38c914233f064efb3dbe409896b3e0b
-Size (wireshark-1.0.6.tar.bz2) = 13161721 bytes
+SHA1 (wireshark-1.0.7.tar.bz2) = ac7253ed010ffe8075de21fde362bb162b59f279
+RMD160 (wireshark-1.0.7.tar.bz2) = cd52704cde4afe57cccb09733c7f0ddfef2363e9
+Size (wireshark-1.0.7.tar.bz2) = 13289668 bytes
 SHA1 (patch-aa) = c155f38e66a553b14778dc73344b46f8614eb9b0
 SHA1 (patch-ab) = 5ae79916603f04c2d362c764d39f0c99728e716c
 SHA1 (patch-ac) = 4e985520ea4b118aea6fc001f256b5de96de7840
-- 
cgit v1.2.3