summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/wireshark/Makefile5
-rw-r--r--net/wireshark/distinfo11
-rw-r--r--net/wireshark/patches/patch-doc_asn2deb.pod24
-rw-r--r--net/wireshark/patches/patch-doc_idl2deb.pod17
-rw-r--r--net/wireshark/patches/patch-doc_reordercap.pod15
5 files changed, 22 insertions, 50 deletions
diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index a00ded62ae6..a040e83cbb2 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.105 2013/07/09 08:36:38 wiz Exp $
+# $NetBSD: Makefile,v 1.106 2013/07/29 21:12:06 tron Exp $
-DISTNAME= wireshark-1.10.0
-PKGREVISION= 1
+DISTNAME= wireshark-1.10.1
CATEGORIES= net
MASTER_SITES= http://www.wireshark.org/download/src/ \
${MASTER_SITE_SOURCEFORGE:=wireshark/}
diff --git a/net/wireshark/distinfo b/net/wireshark/distinfo
index aaf2f17ec52..6662ab19792 100644
--- a/net/wireshark/distinfo
+++ b/net/wireshark/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.67 2013/07/04 21:33:14 adam Exp $
+$NetBSD: distinfo,v 1.68 2013/07/29 21:12:06 tron Exp $
-SHA1 (wireshark-1.10.0.tar.bz2) = c78a5d5e589edc8ebc702eb00a284ccbca7721bc
-RMD160 (wireshark-1.10.0.tar.bz2) = 924e8d94275c1512b9624d009d69fefa8626b5b2
-Size (wireshark-1.10.0.tar.bz2) = 27101631 bytes
+SHA1 (wireshark-1.10.1.tar.bz2) = 7763c864c1e3a3b4e6b6947631392b35fefe4187
+RMD160 (wireshark-1.10.1.tar.bz2) = 669463f185fa8b9af4f18aaa1f7d426355ab5596
+Size (wireshark-1.10.1.tar.bz2) = 26815901 bytes
SHA1 (patch-AUTHORS) = 2d4265d9b8b4df7e3ab438684637058fdcb391fc
SHA1 (patch-aa) = 6d5eac302fbe506af25874d59758088e1759d72c
SHA1 (patch-ab) = 5ae79916603f04c2d362c764d39f0c99728e716c
@@ -11,5 +11,4 @@ SHA1 (patch-ba) = f2fa69d1254b94c7b6b28d5e056c211a019d1db9
SHA1 (patch-bb) = 9379f67c2f5d1c63aa0b2c597ef789336db78352
SHA1 (patch-bc) = 052ede4ba58502117fe7b355e22a906ff65b773e
SHA1 (patch-ca) = 08c4ae23739fbec238b02a2d0398b4a157f9c077
-SHA1 (patch-doc_asn2deb.pod) = c0c46abd562e925d887c87c93c6a1609dd1ff990
-SHA1 (patch-doc_idl2deb.pod) = 9d4c47d6867ea7fe8abda9c95a97a8f0731bcec8
+SHA1 (patch-doc_reordercap.pod) = b06e0084eb3e0b61e3164424a65a46338fb8c491
diff --git a/net/wireshark/patches/patch-doc_asn2deb.pod b/net/wireshark/patches/patch-doc_asn2deb.pod
deleted file mode 100644
index 31bf6649bcc..00000000000
--- a/net/wireshark/patches/patch-doc_asn2deb.pod
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-doc_asn2deb.pod,v 1.1 2013/07/04 21:33:14 adam Exp $
-
-Remove non-printable characters.
-
---- doc/asn2deb.pod.orig 2013-07-04 22:14:32.000000000 +0200
-+++ doc/asn2deb.pod 2013-07-04 22:22:33.000000000 +0200
-@@ -5,8 +5,8 @@
-
- =head1 SYNOPSIS
-
--B<asn2deb> [-a I<ASN.1 file>] [--asn=I<ASN.1 file>] [B<-d >I<opts>] [B<--dbopts=>I<opts>] [B<-e >I<address>]
--[B<--email=>I<address>] [B<-h>] [B<--help>] [B<-n >I<name>] [B<--name=>I<name>] [B<-p>] [B<--preserve>] [B<-v>] [B<--version>]
-+B<asn2deb> [-aI<ASN.1file>] [--asn=I<ASN.1file>] [B<-d>I<opts>] [B<--dbopts=>I<opts>] [B<-e>I<address>]
-+[B<--email=>I<address>] [B<-h>] [B<--help>] [B<-n>I<name>] [B<--name=>I<name>] [B<-p>] [B<--preserve>] [B<-v>] [B<--version>]
-
- =head1 DESCRIPTION
-
-@@ -72,4 +72,4 @@
-
- =head1 COPYRIGHT
-
--Copyright (C) 2003, 2005 W. Borger
-\ No newline at end of file
-+Copyright (C) 2003, 2005 W. Borger
diff --git a/net/wireshark/patches/patch-doc_idl2deb.pod b/net/wireshark/patches/patch-doc_idl2deb.pod
deleted file mode 100644
index 99e22fce54e..00000000000
--- a/net/wireshark/patches/patch-doc_idl2deb.pod
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-doc_idl2deb.pod,v 1.1 2013/07/04 21:33:14 adam Exp $
-
-Remove non-printable characters.
-
---- doc/idl2deb.pod.orig 2013-07-04 22:23:37.000000000 +0200
-+++ doc/idl2deb.pod 2013-07-04 22:24:00.000000000 +0200
-@@ -5,8 +5,8 @@
-
- =head1 SYNOPSIS
-
--B<idl2deb> [B<-d >I<opts>] [B<--dbopts=>I<opts>] [B<-e >I<address>] [B<--email=>I<address>] [-i I<idlfile>]
--[--idl=I<idlfile>] [B<-h>] [B<--help>] [B<-n >I<name>] [B<--name=>I<name>] [B<-p>] [B<--preserve>] [B<-v>] [B<--version>]
-+B<idl2deb> [B<-d>I<opts>] [B<--dbopts=>I<opts>] [B<-e>I<address>] [B<--email=>I<address>] [-iI<idlfile>]
-+[--idl=I<idlfile>] [B<-h>] [B<--help>] [B<-n>I<name>] [B<--name=>I<name>] [B<-p>] [B<--preserve>] [B<-v>] [B<--version>]
-
-
- =head1 DESCRIPTION
diff --git a/net/wireshark/patches/patch-doc_reordercap.pod b/net/wireshark/patches/patch-doc_reordercap.pod
new file mode 100644
index 00000000000..0f3ef1f0670
--- /dev/null
+++ b/net/wireshark/patches/patch-doc_reordercap.pod
@@ -0,0 +1,15 @@
+$NetBSD: patch-doc_reordercap.pod,v 1.1 2013/07/29 21:12:07 tron Exp $
+
+Fix build problem with Perl 5.18 and newer.
+
+--- doc/reordercap.pod.orig 2013-06-06 00:21:18.000000000 +0100
++++ doc/reordercap.pod 2013-07-29 21:26:50.000000000 +0100
+@@ -40,6 +40,8 @@
+ When the B<-n> option is used, B<reordercap> will not write out the output
+ file if it finds that the input file is already in order.
+
++=back
++
+ =head1 SEE ALSO
+
+ pcap(3), wireshark(1), tshark(1), dumpcap(1), editcap(1), mergecap(1),