From 869d3d74a97048f81cf53b8a1f941f61117f6937 Mon Sep 17 00:00:00 2001
From: Michiel van Wessem <michiel@slackbuilds.org>
Date: Thu, 13 May 2010 00:38:44 +0200
Subject: network/wireshark: Updated for version 1.2.6

---
 network/wireshark/wireshark.SlackBuild | 19 +++++++++++++++----
 network/wireshark/wireshark.info       | 10 ++++++----
 2 files changed, 21 insertions(+), 8 deletions(-)

(limited to 'network/wireshark')

diff --git a/network/wireshark/wireshark.SlackBuild b/network/wireshark/wireshark.SlackBuild
index 8bd0aa0578..07cc4c9ea2 100644
--- a/network/wireshark/wireshark.SlackBuild
+++ b/network/wireshark/wireshark.SlackBuild
@@ -26,7 +26,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=wireshark
-VERSION=${VERSION:-1.2.0}
+VERSION=${VERSION:-1.2.6}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -56,7 +56,17 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
-chmod -R u+w,go+r-w,a-s .
+find . \
+  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+  -exec chmod 755 {} \; -o \
+  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+  -exec chmod 644 {} \;
+
+# Ammend hardcoded paths to /usr/lib/ which will give a problem when compiling on
+# systems with 32bit compat libs install. Thanks to Heinz Wiesinger.
+sed -i "s|/lib)|/lib$LIBDIRSUFFIX)|g" configure.in
+
+autoreconf -vif
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -67,10 +77,11 @@ CXXFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --with-ssl=/usr/lib \
+  --with-ssl=/usr/lib${LIBDIRSUFFIX} \
   --enable-threads \
   --disable-static \
   --disable-debug \
+  --disable-usr-local \
   --build=$ARCH-slackware-linux
 
 make
@@ -108,4 +119,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/wireshark/wireshark.info b/network/wireshark/wireshark.info
index 687b80ed6d..84c10b2253 100644
--- a/network/wireshark/wireshark.info
+++ b/network/wireshark/wireshark.info
@@ -1,8 +1,10 @@
 PRGNAM="wireshark"
-VERSION="1.2.0"
+VERSION="1.2.6"
 HOMEPAGE="http://www.wireshark.org/"
-DOWNLOAD="http://www.wireshark.org/download/src/wireshark-1.2.0.tar.bz2"
-MD5SUM="d3f799e0ae7953cd3426d9e0b6e2708d"
+DOWNLOAD="http://www.wireshark.org/download/src/wireshark-1.2.6.tar.bz2"
+MD5SUM="f3e0917ed393366bbf96c53b58cb0931"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Michiel van Wessem"
 EMAIL="michiel@slackbuilds.org"
-APPROVED="rworkman"
+APPROVED="dsomero"
-- 
cgit v1.2.3