From 99d09efc5328cf5b64fc123a73df7c18d2b52a54 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 6 Jun 2013 06:58:02 +0000
Subject: main/wireshark: upgrade to 1.10.0

---
 main/wireshark/APKBUILD           | 20 ++++++++++++--------
 main/wireshark/pod-encoding.patch | 37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 8 deletions(-)
 create mode 100644 main/wireshark/pod-encoding.patch

(limited to 'main/wireshark')

diff --git a/main/wireshark/APKBUILD b/main/wireshark/APKBUILD
index 381e0b09b..413fc82eb 100644
--- a/main/wireshark/APKBUILD
+++ b/main/wireshark/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Jeremy Thomerson <jeremy@thomersonfamily.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=wireshark
-pkgver=1.8.7
+pkgver=1.10.0
 pkgrel=0
 pkgdesc="network protocol analyzer - GTK version"
 url="http://www.wireshark.org"
@@ -9,20 +9,22 @@ arch="all"
 license="GPLv2"
 depends="bash"
 makedepends="bison flex perl glib glib-dev pkgconfig libpcap-dev libcap-dev
-	gtk+-dev c-ares-dev pcre-dev gnutls-dev libgcrypt-dev openssl-dev"
+	gtk+-dev c-ares-dev pcre-dev gnutls-dev libgcrypt-dev openssl-dev
+	libnl3-dev"
 install=""
 subpackages="$pkgname-dev $pkgname-doc $pkgname-common tshark"
 source="http://www.wireshark.org/download/src/${pkgname}-${pkgver}.tar.bz2
+	pod-encoding.patch
 	wireshark.desktop
 	wireshark.png"
 
 prepare() {
 	cd "$srcdir"/$pkgname-$pkgver
-	for i in "$source"; do
+	for i in $source; do
 		case "$i" in
 		*.patch)
 			msg "Applying $i"
-			patch -p1 -i "$i" || return 1
+			patch -p1 -i "$srcdir"/$i || return 1
 			;;
 		esac
 	done
@@ -38,7 +40,6 @@ build() {
 		--with-ssl \
 		--with-gnutls \
 		--disable-text2pcap \
-		--disable-idl2wrs \
 		--disable-dftest \
 		--disable-randpkt
 	make
@@ -77,12 +78,15 @@ tshark() {
 	mv "$pkgdir"/usr/bin/tshark "$subpkgdir"/usr/bin/tshark
 }
 
-md5sums="f4198728a20aa40752906031e08544f8  wireshark-1.8.7.tar.bz2
+md5sums="72e51cd33fd33c7044a41c2ab51ad7af  wireshark-1.10.0.tar.bz2
+3a930aa92315b446361f878cbf2ba182  pod-encoding.patch
 504ede44c02b2a52f6cbd3bffdf93b8d  wireshark.desktop
 e771800a8c977fe223583a453bc27397  wireshark.png"
-sha256sums="5c7e429c1e410289b49d65a2e635e00c0becdcb56fe703a1d3e7b5e275fca842  wireshark-1.8.7.tar.bz2
+sha256sums="1f4b377ba6284a51797bcc437aa2918bfaeb5d30908cd6194bd09f7054c65add  wireshark-1.10.0.tar.bz2
+d16311f43a82da209438fa3e20b4975dc58de7c09af65d8a512fe5370f3e867e  pod-encoding.patch
 10c8b5bdd1d161454c93df166f39b2bae72efe6021beb61d84dd65dc329260fe  wireshark.desktop
 a9f6d78dd64a87acd1b600222156b9fc26e7ccbbc43fc77c1da138908bdb2d3c  wireshark.png"
-sha512sums="4a0606257d541c6045cdab19f2280d409e737af6ca39f7633b7df13f5d128f16bbe2c53d84f8d79feaf0cd790bc94114495b99d2bbb938e6d5ebe0d398fea66a  wireshark-1.8.7.tar.bz2
+sha512sums="1d1b37e50fc35da96de142d21bc02e171f8412ce7b6017ca1b1a1e48daa3da05a06612d68ae1317fb338a0fdc82999a3c56b02250e1ca09ac25a9dacac1c7c86  wireshark-1.10.0.tar.bz2
+029f8d437a17bfe363579383532aed46c9625047af548b08fd0d51eb08c1677065c2168239b44dad1d3f2c428f8ec31e46c7c62edd43e6c59fc98bd99e8b4aa1  pod-encoding.patch
 6e1eab7793a97377017be9126b7d25bd9c10d2b0e06be1e83e66ac2ea64dce5c4f8f7783d483921867241d298eb0ac82ff3f9910e90c2065125bff9a3856f52e  wireshark.desktop
 b421575dbc3d496a8c3d5485929c161c06d3403bff2fef4f1db07b1db729ca173c6e89cb648d127c02800359975d5e0880c344dc58fa9d24dde570a862bdd7d4  wireshark.png"
diff --git a/main/wireshark/pod-encoding.patch b/main/wireshark/pod-encoding.patch
new file mode 100644
index 000000000..094c1dd00
--- /dev/null
+++ b/main/wireshark/pod-encoding.patch
@@ -0,0 +1,37 @@
+diff --git a/doc/asn2deb.pod b/doc/asn2deb.pod
+index 0baa50e..529b0a3 100644
+--- a/doc/asn2deb.pod
++++ b/doc/asn2deb.pod
+@@ -1,4 +1,4 @@
+-
++=encoding utf8
+ =head1 NAME
+ 
+ asn2deb - Create a Debian package for BER monitoring from ASN.1
+@@ -72,4 +72,4 @@ 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/doc/idl2deb.pod b/doc/idl2deb.pod
+index 9a43c7f..d9a703e 100644
+--- a/doc/idl2deb.pod
++++ b/doc/idl2deb.pod
+@@ -1,4 +1,4 @@
+-
++=encoding utf8
+ =head1 NAME
+ 
+ idl2deb - Create a Debian package for CORBA monitoring from IDL
+diff --git a/doc/wireshark.pod.template b/doc/wireshark.pod.template
+index 363d999..2760cfa 100644
+--- a/doc/wireshark.pod.template
++++ b/doc/wireshark.pod.template
+@@ -1,4 +1,4 @@
+-
++=encoding utf8
+ =head1 NAME
+ 
+ wireshark - Interactively dump and analyze network traffic
-- 
cgit v1.2.3