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

[Guillaume Alaux]

    Date: Saturday, February 2, 2013 @ 22:33:29
  Author: guillaume
Revision: 176945

Upstream release - added patch for automake 1.13

Added:
  wireshark/trunk/01_patch-automake-1.13.diff
  wireshark/trunk/02_enable-version.diff
    (from rev 176944, wireshark/trunk/enable_version.patch)
Modified:
  wireshark/trunk/PKGBUILD
Deleted:
  wireshark/trunk/enable_version.patch

-----------------------------+
 01_patch-automake-1.13.diff |   11 +++++++++++
 02_enable-version.diff      |   11 +++++++++++
 PKGBUILD                    |   15 +++++++++------
 enable_version.patch        |   12 ------------
 4 files changed, 31 insertions(+), 18 deletions(-)

Added: 01_patch-automake-1.13.diff
===================================================================
--- 01_patch-automake-1.13.diff	                        (rev 0)
+++ 01_patch-automake-1.13.diff	2013-02-02 21:33:29 UTC (rev 176945)
@@ -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

Copied: wireshark/trunk/02_enable-version.diff (from rev 176944, wireshark/trunk/enable_version.patch)
===================================================================
--- 02_enable-version.diff	                        (rev 0)
+++ 02_enable-version.diff	2013-02-02 21:33:29 UTC (rev 176945)
@@ -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])

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-02-02 20:10:36 UTC (rev 176944)
+++ PKGBUILD	2013-02-02 21:33:29 UTC (rev 176945)
@@ -3,8 +3,8 @@
 # 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 @@
 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 \

Deleted: enable_version.patch
===================================================================
--- enable_version.patch	2013-02-02 20:10:36 UTC (rev 176944)
+++ enable_version.patch	2013-02-02 21:33:29 UTC (rev 176945)
@@ -1,12 +0,0 @@
---- configure.in.init	2012-05-24 20:08:15.040038922 +0000
-+++ configure.in	2012-05-24 20:08:27.869944008 +0000
-@@ -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])
-