[arch-commits] Commit in wireshark/trunk (PKGBUILD wireshark.install)

[Ionut Biru]

    Date: Sunday, August 1, 2010 @ 10:36:46
  Author: ibiru
Revision: 86407

upgpkg: wireshark 1.2.10-1 update to 1.2.10

Modified:
  wireshark/trunk/PKGBUILD
  wireshark/trunk/wireshark.install

-------------------+
 PKGBUILD          |   24 ++++++++++++------------
 wireshark.install |   16 +++++++---------
 2 files changed, 19 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-08-01 10:54:44 UTC (rev 86406)
+++ PKGBUILD	2010-08-01 14:36:46 UTC (rev 86407)
@@ -2,7 +2,7 @@
 # Maintainer: Hugo Doria <hugo at archlinux.org>
 
 pkgname=wireshark
-pkgver=1.2.9
+pkgver=1.2.10
 pkgrel=1
 pkgdesc="A free network protocol analyzer for Unix/Linux and Windows"
 arch=('i686' 'x86_64')
@@ -13,25 +13,25 @@
 install=wireshark.install
 options=(!libtool)
 source=(http://www.wireshark.org/download/src/${pkgname}-${pkgver}.tar.gz wireshark.desktop wireshark.png wireshark-1.1.2--as-needed.patch)
+md5sums=('bddf081d9169402f8093bf4155f10e98'
+         '504ede44c02b2a52f6cbd3bffdf93b8d'
+         'e771800a8c977fe223583a453bc27397'
+         'cc87d7eb31f256df751b3371b1c426e9')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   export CFLAGS="-fno-unit-at-a-time ${CFLAGS}"
 
-  patch -Np1 -i $srcdir/wireshark-1.1.2--as-needed.patch || return 1
-  autoreconf -f -i || return 1
+  patch -Np1 -i $srcdir/wireshark-1.1.2--as-needed.patch
+  autoreconf -f -i
 
-  ./configure --prefix=/usr --with-ssl || return 1
-  make all || return 1
-  make DESTDIR=${pkgdir} install || return 1
+  ./configure --prefix=/usr --with-ssl
+  make all
+  make DESTDIR=${pkgdir} install
 
   install -Dm644 ${srcdir}/wireshark.png ${pkgdir}/usr/share/icons/wireshark.png
   install -Dm644 ${srcdir}/wireshark.desktop ${pkgdir}/usr/share/applications/wireshark.desktop
   #wireshark uid group is 150
-  chgrp 150 "${pkgdir}/usr/bin/dumpcap" || return 1
-  chmod 754 "${pkgdir}/usr/bin/dumpcap" || return 1
+  chgrp 150 "${pkgdir}/usr/bin/dumpcap"
+  chmod 754 "${pkgdir}/usr/bin/dumpcap"
 }
-md5sums=('582fe8d14a6e7c66851e5148a2f6e5d8'
-         '504ede44c02b2a52f6cbd3bffdf93b8d'
-         'e771800a8c977fe223583a453bc27397'
-         'cc87d7eb31f256df751b3371b1c426e9')

Modified: wireshark.install
===================================================================
--- wireshark.install	2010-08-01 10:54:44 UTC (rev 86406)
+++ wireshark.install	2010-08-01 14:36:46 UTC (rev 86407)
@@ -1,17 +1,15 @@
 post_install() {
-	getent group wireshark >/dev/null 2>&1 || groupadd -g 150 wireshark &>/dev/null
-	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"
+    getent group wireshark >/dev/null 2>&1 || groupadd -g 150 wireshark &>/dev/null
+    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() {
-	post_install $1
-
+    post_install $1
 }
 
 post_remove() {
-	if getent group wireshark >/dev/null 2>&1; then
-		groupdel wireshark
-	fi
+    if getent group wireshark >/dev/null 2>&1; then
+        groupdel wireshark
+    fi
 }