[arch-commits] Commit in wireshark/trunk (3 files)

[Guillaume Alaux]

    Date: Monday, May 20, 2013 @ 16:35:02
  Author: guillaume
Revision: 186023

Upstream release

Modified:
  wireshark/trunk/PKGBUILD
  wireshark/trunk/wireshark.install
Deleted:
  wireshark/trunk/01_patch-automake-1.13.diff

-----------------------------+
 01_patch-automake-1.13.diff |   11 -----------
 PKGBUILD                    |   10 +++-------
 wireshark.install           |    6 +++---
 3 files changed, 6 insertions(+), 21 deletions(-)

Deleted: 01_patch-automake-1.13.diff
===================================================================
--- 01_patch-automake-1.13.diff	2013-05-20 14:06:29 UTC (rev 186022)
+++ 01_patch-automake-1.13.diff	2013-05-20 14:35:02 UTC (rev 186023)
@@ -1,11 +0,0 @@
---- configure.in.init	2013-02-02 22:11:27.140322526 +0100
-+++ configure.in	2013-02-02 22:11:42.863854681 +0100
-@@ -1960,7 +1960,7 @@
- sinclude(asn1/Custom.m4) dnl
- ifdef(_CUSTOM_ASN1_AC_OUTPUT_,, define(_CUSTOM_ASN1_AC_OUTPUT_, )) dnl
- 
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- AC_OUTPUT(
-   Makefile
-   doxygen.cfg

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-20 14:06:29 UTC (rev 186022)
+++ PKGBUILD	2013-05-20 14:35:02 UTC (rev 186023)
@@ -3,8 +3,8 @@
 # Contributor: Florian Pritz <bluewind at jabber dot ccc dot de>
 pkgname=('wireshark-cli' 'wireshark-gtk')
 pkgbase=wireshark
-pkgver=1.8.6
-pkgrel=2
+pkgver=1.8.7
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL2')
 makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls'
@@ -12,17 +12,13 @@
 url='http://www.wireshark.org/'
 options=(!libtool)
 source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2
-        01_patch-automake-1.13.diff
         02_enable-version.diff)
-sha256sums=('2722ed3e926c26648faec31a81b7881d829df85762c21794b9dd9e4f227331ea'
-            '388a9cf4c924c32a0f7ee8ffeaae060cdbf0c712bcc0032d5dfaa5717b217b80'
+sha256sums=('5c7e429c1e410289b49d65a2e635e00c0becdcb56fe703a1d3e7b5e275fca842'
             'dd71a9fc3443b5e586d9e50c31208d031f20d7b96cf72d9e4e0f02f2f175d00b')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
 
-# https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8202
-  patch -p0 < ${srcdir}/01_patch-automake-1.13.diff
   patch -p0 < ${srcdir}/02_enable-version.diff
 
   ./autogen.sh

Modified: wireshark.install
===================================================================
--- wireshark.install	2013-05-20 14:06:29 UTC (rev 186022)
+++ wireshark.install	2013-05-20 14:35:02 UTC (rev 186023)
@@ -1,14 +1,14 @@
 post_install() {
     /usr/bin/getent group wireshark >/dev/null 2>&1 ||  usr/sbin/groupadd -g 150 wireshark &>/dev/null
 
-    /usr/sbin/setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap
+    /usr/bin/setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap
     echo "NOTE: To run wireshark as normal user you have to add yourself into wireshark group"
 }
 
 post_upgrade() {
     /usr/bin/getent group wireshark >/dev/null 2>&1 ||  usr/sbin/groupadd -g 150 wireshark &>/dev/null
-    
-    /usr/sbin/setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap
+
+    /usr/bin/setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap
 }
 
 post_remove() {