Sun Jul 28 01:12:23 PDT 2013

5 files changed, 18 insertions, 193 deletions

diff --git a/extra/wireshark/01_fix_encoding_asn2deb_pod.patch b/extra/wireshark/01_fix_encoding_asn2deb_pod.patch
deleted file mode 100644
index 0b8b91363..000000000
--- a/extra/wireshark/01_fix_encoding_asn2deb_pod.patch
+++ /dev/null
@@ -1,77 +0,0 @@
---- doc/asn2deb.pod.orig	2013-06-06 21:30:28.314150100 +0200
-+++ doc/asn2deb.pod	2013-06-06 21:31:59.448850746 +0200
-@@ -5,8 +5,21 @@
- 
- =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>
-+S<[ B<-a> E<lt>ASN.1 fileE<gt> ]>
-+S<[ B<--asn>=E<lt>ASN.1 fileE<gt> ]>
-+S<[ B<-d> E<lt>optsE<gt> ]>
-+S<[ B<--dbopts>=E<lt>optsE<gt> ]>
-+S<[ B<-e> E<lt>addressE<gt> ]>
-+S<[ B<--email>=E<lt>addressE<gt> ]>
-+S<[ B<-h> ]>
-+S<[ B<--help> ]>
-+S<[ B<-n> E<lt>nameE<gt> ]>
-+S<[ B<--name>=E<lt>nameE<gt> ]>
-+S<[ B<-p> ]>
-+S<[ B<--preserve> ]>
-+S< [B<-v> ]>
-+S<[ B<--version> ]>
- 
- =head1 DESCRIPTION
- 
-@@ -19,31 +32,31 @@
- 
- =over 4
- 
--=item B<-a >I<ASN.1 file> B<--asn=>I<ASN.1 file>
-+=item -a E<lt>ASN.1 fileE<gt> --asn=E<lt>ASN.1 fileE<gt>
- 
- ASN.1 file to use (mandatory).
- 
--=item B<-d >I<opts> B<--dbopts=>I<opts>
-+=item -d E<lt>optsE<gt> --dbopts=E<lt>optsE<gt>
- 
- options for dpkg-buildpackage.
- 
--=item B<-e >I<address> B<--email=>I<address>
-+=item -e E<lt>addressE<gt> --email=E<lt>addressE<gt>
- 
- use e-mail address.
- 
--=item B<-h> B<--help>
-+=item -h --help
- 
- print help and exit.
- 
--=item B<-n >I<name> B<--name=>I<name>
-+=item -n E<lt>nameE<gt> --name=E<lt>nameE<gt>
- 
- use user name.
- 
--=item B<-p> B<--preserve>
-+=item -p --preserve
- 
- do not overwrite files.
- 
--=item B<-v> B<--version>
-+=item -v --version
- 
- print version and exit.
- 
-@@ -68,8 +81,8 @@
- 
- =head1 AUTHOR
- 
--B<W. Borgert> Author. 
-+B<W. Borgert> Author.
- 
- =head1 COPYRIGHT
- 
--Copyright (C) 2003, 2005 W. Borger
-\ No newline at end of file
-+Copyright (C) 2003, 2005 W. Borger
diff --git a/extra/wireshark/01_fix_pod_file.patch b/extra/wireshark/01_fix_pod_file.patch
new file mode 100644
index 000000000..f75f4c0bf
--- /dev/null
+++ b/extra/wireshark/01_fix_pod_file.patch
@@ -0,0 +1,11 @@
+--- trunk/doc/reordercap.pod	2013/05/20 05:45:32	49435
++++ trunk/doc/reordercap.pod	2013/05/20 14:56:18	49436
+@@ -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),
diff --git a/extra/wireshark/02_fix_encoding_idl2deb_pod.patch b/extra/wireshark/02_fix_encoding_idl2deb_pod.patch
deleted file mode 100644
index bc4000b8f..000000000
--- a/extra/wireshark/02_fix_encoding_idl2deb_pod.patch
+++ /dev/null
@@ -1,77 +0,0 @@
---- doc/idl2deb.pod.orig	2013-06-06 21:31:06.674726010 +0200
-+++ doc/idl2deb.pod	2013-06-06 21:35:38.522125866 +0200
-@@ -5,9 +5,21 @@
- 
- =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>
-+S< [ B<-d> E<lt>optsE<gt> ]>
-+S< [ B<--dbopts>=E<lt>optsE<gt> ]>
-+S< [ B<-e> E<lt>addressE<gt> ]>
-+S< [ B<--email>=E<lt>addressE<gt> ]>
-+S< [ B<-h> ]>
-+S< [ B<--help> ]>
-+S< [ B<-i> E<lt>idlfileE<gt> ]>
-+S< [ B<--idl>=E<lt>idlfileE<gt> ]>
-+S< [ B<-n> E<lt>nameE<gt> ]>
-+S< [ B<--name>=E<lt>nameE<gt> ]>
-+S< [ B<-p> ]>
-+S< [ B<--preserve> ]>
-+S< [ B<-v> ]>
-+S< [ B<--version> ]>
- 
- =head1 DESCRIPTION
- 
-@@ -19,31 +31,31 @@
- 
- =over 4
- 
--=item B<-d>I<opts> B<--dbopts=>I<opts>
-+=item -d E<lt>optsE<gt> --dbopts=E<lt>optsE<gt>
- 
- options for dpkg-buildpackage.
- 
--=item B<-e >I<address> B<--email=>I<address>
-+=item -e E<lt>addressE<gt> --email=E<lt>addressE<gt>
- 
- use e-mail address.
- 
--=item B<-i >I<idlfile> B<--idl=>I<idlfile>
-+=item -h --help
- 
--IDL file to use (mandatory)
-+print help and exit.
- 
--=item B<-h> B<--help>
-+=item -i E<lt>idlfileE<gt> --idl=E<lt>idlfileE<gt>
- 
--print help and exit.
-+IDL file to use (mandatory)
- 
--=item B<-n >I<name> B<--name=>I<name>
-+=item -n E<lt>nameE<gt> --name=E<lt>nameE<gt>
- 
- use user name.
- 
--=item B<-p> B<--preserve>
-+=item -p --preserve
- 
- do not overwrite files.
- 
--=item B<-v> B<--version>
-+=item -v --version
- 
- print version and exit.
- 
-@@ -67,7 +79,7 @@
- 
- =head1 AUTHOR
- 
--B<W. Borgert> Author. 
-+B<W. Borgert> Author.
- 
- =head1 COPYRIGHT
- 
diff --git a/extra/wireshark/03_force_utf8_for_pod2man.patch b/extra/wireshark/03_force_utf8_for_pod2man.patch
deleted file mode 100644
index ace641100..000000000
--- a/extra/wireshark/03_force_utf8_for_pod2man.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- doc/Makefile.am	(revision 49837)
-+++ doc/Makefile.am	(working copy)
-@@ -123,6 +123,7 @@ 
- 	$(AM_V_POD2MAN)$(POD2MAN)                       \
- 	--center="The Wireshark Network Analyzer"       \
- 	--release=$(VERSION)                            \
-+	--utf8                                          \
- 	$< > $@
- 
- .pod.html: ../config.h $(top_srcdir)/docbook/ws.css
---- doc/wireshark.pod.template	(revision 49837)
-+++ doc/wireshark.pod.template	(working copy)
-@@ -1,4 +1,9 @@ 
-+=begin man
-+
-+=encoding utf8
-+
-+=end man
-
- =head1 NAME
- 
- wireshark - Interactively dump and analyze network traffic
diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD
index 27273c87c..d8136a396 100644
--- a/extra/wireshark/PKGBUILD
+++ b/extra/wireshark/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 189196 2013-06-29 09:29:34Z guillaume $
+# $Id: PKGBUILD 191608 2013-07-27 17:57:23Z guillaume $
 # Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
 # Contributor: Florian Pritz <bluewind at jabber dot ccc dot de>
 pkgname=('wireshark-cli' 'wireshark-gtk')
 pkgbase=wireshark
-pkgver=1.10.0
-pkgrel=3
+pkgver=1.10.1
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL2')
 makedepends=('bison' 'flex' 'gtk3' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls'
@@ -12,24 +12,14 @@ makedepends=('bison' 'flex' 'gtk3' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls'
 url='http://www.wireshark.org/'
 options=(!libtool)
 source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2
-        01_fix_encoding_asn2deb_pod.patch
-        02_fix_encoding_idl2deb_pod.patch
-        03_force_utf8_for_pod2man.patch)
-sha256sums=('1f4b377ba6284a51797bcc437aa2918bfaeb5d30908cd6194bd09f7054c65add'
-            '0dfe86b1e4bbf4090035fc1fcd36c2790d418a5749e23a2a7e7285699a6c147d'
-            'a46f6e87477fcbf8289bfde5e525e6c0b4c3268bd1a2e189e3120bd3ad4f7c27'
-            '902f72132b9e0dd95f89ca0bcb216ef9c866ac11c842866781d239b6b7873daf')
+        01_fix_pod_file.patch)
+sha256sums=('06499544f053cc1f73529278ede0ac210d709cada8267e81d908bd346cc0c5bc'
+            '18470353d3658814b4925c7fcf07e647e1e400856cdf356555ddf105d12bdd41')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
 
-  # https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8774
-  for p in 01_fix_encoding_asn2deb_pod.patch \
-           02_fix_encoding_idl2deb_pod.patch \
-           03_force_utf8_for_pod2man.patch;
-  do
-    patch -p0 <${srcdir}/${p}
-  done
+  patch -p1 <${srcdir}/01_fix_pod_file.patch
 
   ./autogen.sh
   ./configure \