diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-07-31 09:59:59 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-07-31 09:59:59 +0200 |
| commit | b6d97ade0db0f30b7a2da49bcccc76ffe41acb80 (patch) | |
| tree | e72f1c4198c86e47af7e9c7a6afc88f5b32c6256 /extra/wireshark | |
| parent | 09dd4a97fccc4bcabe341c4e4490004385283e53 (diff) | |
| parent | 5b3474881a154216b47c6e154552ee5f9c68c509 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/cegui/PKGBUILD
community-testing/gambas3/PKGBUILD
community-testing/gambas3/gambas3-runtime.install
community-testing/gource/PKGBUILD
community-testing/openimageio/PKGBUILD
community-testing/performous/PKGBUILD
community-testing/spring/PKGBUILD
community/warsow/PKGBUILD
multilib/lib32-llvm/PKGBUILD
multilib/lib32-mesa/PKGBUILD
staging/hugin/PKGBUILD
testing/calligra/PKGBUILD
testing/hugin/PKGBUILD
testing/kdeplasma-applets-networkmanagement/PKGBUILD
testing/upower/PKGBUILD
Diffstat (limited to 'extra/wireshark')
| -rw-r--r-- | extra/wireshark/PKGBUILD | 14 | ||||
| -rw-r--r-- | extra/wireshark/wireshark.install | 12 |
2 files changed, 16 insertions, 10 deletions
diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD index ac0458c99..1835503cc 100644 --- a/extra/wireshark/PKGBUILD +++ b/extra/wireshark/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 162251 2012-06-24 12:43:16Z guillaume $ +# $Id: PKGBUILD 164263 2012-07-29 10:20:53Z 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.8.0 +pkgver=1.8.1 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL2') @@ -12,7 +12,7 @@ makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls' url="http://www.wireshark.org/" options=(!libtool) source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2) -md5sums=('3eca81253800a0089d0f957e75853b05') +md5sums=('629fe03f4a64eb8c7bd9308ee4e22e2e') build() { cd "${srcdir}/${pkgbase}-${pkgver}" @@ -61,7 +61,13 @@ package_wireshark-gtk() { install -Dm755 .libs/wireshark "${pkgdir}/usr/bin/wireshark" for d in 16 32 48; do - install -Dm644 image/hi${d}-app-wireshark.png "${pkgdir}/usr/share/icons/hicolor/${d}x${d}/apps/wireshark.png" + install -Dm644 image/hi${d}-app-wireshark.png \ + "${pkgdir}/usr/share/icons/hicolor/${d}x${d}/apps/wireshark.png" + done + + for d in 16 24 32 48 64 128 256 ; do + install -Dm644 image/WiresharkDoc-${d}.png \ + "${pkgdir}/usr/share/icons/hicolor/${d}x${d}/mimetypes/application-vnd.tcpdump.pcap.png" done install -Dm644 wireshark.desktop "${pkgdir}/usr/share/applications/wireshark.desktop" } diff --git a/extra/wireshark/wireshark.install b/extra/wireshark/wireshark.install index 6585ba272..69adcc4bc 100644 --- a/extra/wireshark/wireshark.install +++ b/extra/wireshark/wireshark.install @@ -1,18 +1,18 @@ post_install() { - getent group wireshark >/dev/null 2>&1 || usr/sbin/groupadd -g 150 wireshark &>/dev/null + /usr/bin/getent group wireshark >/dev/null 2>&1 || usr/sbin/groupadd -g 150 wireshark &>/dev/null - setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap + /usr/sbin/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() { - getent group wireshark >/dev/null 2>&1 || usr/sbin/groupadd -g 150 wireshark &>/dev/null + /usr/bin/getent group wireshark >/dev/null 2>&1 || usr/sbin/groupadd -g 150 wireshark &>/dev/null - setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap + /usr/sbin/setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap } post_remove() { - if getent group wireshark >/dev/null 2>&1; then - groupdel wireshark + if /usr/bin/getent group wireshark >/dev/null 2>&1; then + /usr/sbin/groupdel wireshark fi } |