summaryrefslogtreecommitdiff
path: root/extra/wireshark
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2013-02-03 01:12:14 -0800
committerroot <root@rshg054.dnsready.net>2013-02-03 01:12:14 -0800
commite363875b14479aa4c6ff12f3e4e7ed920df4e45f (patch)
treeee217a27b050e82f4fa885a9671f09861fcf97d9 /extra/wireshark
parent2f5224819ae83de6e9d8de008d5f2dc24769cb0d (diff)
Sun Feb 3 01:12:00 PST 2013
Diffstat (limited to 'extra/wireshark')
-rw-r--r--extra/wireshark/01_patch-automake-1.13.diff11
-rw-r--r--extra/wireshark/02_enable-version.diff11
-rw-r--r--extra/wireshark/PKGBUILD17
3 files changed, 32 insertions, 7 deletions
diff --git a/extra/wireshark/01_patch-automake-1.13.diff b/extra/wireshark/01_patch-automake-1.13.diff
new file mode 100644
index 000000000..cf03fa060
--- /dev/null
+++ b/extra/wireshark/01_patch-automake-1.13.diff
@@ -0,0 +1,11 @@
+--- 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/02_enable-version.diff b/extra/wireshark/02_enable-version.diff
new file mode 100644
index 000000000..db2f3726e
--- /dev/null
+++ b/extra/wireshark/02_enable-version.diff
@@ -0,0 +1,11 @@
+--- configure.in.init 2013-02-02 22:11:42.863854681 +0100
++++ configure.in 2013-02-02 22:13:40.888683191 +0100
+@@ -185,7 +185,7 @@
+ [use GnuTLS library @<:@default=yes@:>@]),
+ with_gnutls="$withval", with_gnutls="yes")
+ if test "x$with_gnutls" = "xyes"; then
+- PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 1.2.0 gnutls < 3],
++ PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 1.2.0],
+ [
+ echo "GnuTLS found, enabling SSL decryption"
+ AC_DEFINE(HAVE_LIBGNUTLS, 1, [Define to use GnuTLS library])
diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD
index ba5dec5b7..61748e62a 100644
--- a/extra/wireshark/PKGBUILD
+++ b/extra/wireshark/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 173181 2012-12-12 00:32:12Z eric $
+# $Id: PKGBUILD 176946 2013-02-02 21:34:52Z 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.4
-pkgrel=2
+pkgver=1.8.5
+pkgrel=1
arch=('i686' 'x86_64')
license=('GPL2')
makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls'
@@ -12,14 +12,17 @@ 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
- enable_version.patch)
-sha256sums=('cae9ec0cb9fa0b732a76c0f72f8c15d763f8cdc2e389cda2da6c48c24559faac'
- '0cf13fb0a53909dd737e44f3c3f62b824527d7c96eaffb69d9a8bf4772d54cbd')
+ 01_patch-automake-1.13.diff
+ 02_enable-version.diff)
+sha256sums=('d4e4798216974a3c45e74b03644ee33b64481d2fe5c788c002266e5f141ee372'
+ '388a9cf4c924c32a0f7ee8ffeaae060cdbf0c712bcc0032d5dfaa5717b217b80'
+ 'dd71a9fc3443b5e586d9e50c31208d031f20d7b96cf72d9e4e0f02f2f175d00b')
build() {
cd "${srcdir}/${pkgbase}-${pkgver}"
- patch -p0 < ${srcdir}/enable_version.patch
+ patch -p0 < ${srcdir}/01_patch-automake-1.13.diff
+ patch -p0 < ${srcdir}/02_enable-version.diff
./autogen.sh
./configure \