diff options
| author | root <root@rshg054.dnsready.net> | 2013-05-21 00:28:39 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-05-21 00:28:39 -0700 |
| commit | e3f225daecfd5cfea4af1a4e8ac4b6c46c7ec363 (patch) | |
| tree | b3e36d93c34b5b08544b1698462c06fdb99560b8 /extra/wireshark | |
| parent | 383955a81810f344e11b1472bd4c5069fa77020c (diff) | |
Tue May 21 00:28:39 PDT 2013
Diffstat (limited to 'extra/wireshark')
| -rw-r--r-- | extra/wireshark/01_patch-automake-1.13.diff | 11 | ||||
| -rw-r--r-- | extra/wireshark/PKGBUILD | 12 | ||||
| -rw-r--r-- | extra/wireshark/wireshark.install | 6 |
3 files changed, 7 insertions, 22 deletions
diff --git a/extra/wireshark/01_patch-automake-1.13.diff b/extra/wireshark/01_patch-automake-1.13.diff deleted file mode 100644 index cf03fa060..000000000 --- a/extra/wireshark/01_patch-automake-1.13.diff +++ /dev/null @@ -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 diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD index 23a305116..6692971ec 100644 --- a/extra/wireshark/PKGBUILD +++ b/extra/wireshark/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 182116 2013-04-07 20:47:05Z guillaume $ +# $Id: PKGBUILD 186024 2013-05-20 14:35:40Z 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.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 @@ 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 - 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 diff --git a/extra/wireshark/wireshark.install b/extra/wireshark/wireshark.install index 69adcc4bc..001bd0c58 100644 --- a/extra/wireshark/wireshark.install +++ b/extra/wireshark/wireshark.install @@ -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() { |