From ccd9a44887bb561c6f09742a765c00d95a74caaa Mon Sep 17 00:00:00 2001
From: Damien Goutte-Gattat <dgouttegattat@incenp.org>
Date: Tue, 17 Dec 2019 22:28:40 +0000
Subject: [PATCH] xap/wireshark:  Upgraded to wireshark-3.0.7.

---
 xap/wireshark/doinst.sh                     |  7 +++
 xap/wireshark/wireshark-2.0.4.tar.bz2.sha1  |  1 -
 xap/wireshark/wireshark-3.0.7.tar.xz.sha256 |  1 +
 xap/wireshark/wireshark.SlackBuild          | 53 +++++++++------------
 4 files changed, 31 insertions(+), 31 deletions(-)
 delete mode 100644 xap/wireshark/wireshark-2.0.4.tar.bz2.sha1
 create mode 100644 xap/wireshark/wireshark-3.0.7.tar.xz.sha256

diff --git a/xap/wireshark/doinst.sh b/xap/wireshark/doinst.sh
index 0f4e351f..b81f7228 100644
--- a/xap/wireshark/doinst.sh
+++ b/xap/wireshark/doinst.sh
@@ -3,3 +3,10 @@
 if [ -x /usr/bin/update-desktop-database ]; then
     /usr/bin/update-desktop-database ./usr/share/applications >/dev/null 2>&1
 fi
+
+# Restrict use of dumpcap to members of the netdev group
+chgrp netdev usr/bin/dumpcap
+chmod 750 usr/bin/dumpcap
+
+# Give dumpcat network privileges
+setcap cap_net_raw,cap_net_admin+eip usr/bin/dumpcap
diff --git a/xap/wireshark/wireshark-2.0.4.tar.bz2.sha1 b/xap/wireshark/wireshark-2.0.4.tar.bz2.sha1
deleted file mode 100644
index 5ed09a84..00000000
--- a/xap/wireshark/wireshark-2.0.4.tar.bz2.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9d76a28ba4f7566bef1aefbb2868e1ddcb93e999  wireshark-2.0.4.tar.bz2
diff --git a/xap/wireshark/wireshark-3.0.7.tar.xz.sha256 b/xap/wireshark/wireshark-3.0.7.tar.xz.sha256
new file mode 100644
index 00000000..9bce690c
--- /dev/null
+++ b/xap/wireshark/wireshark-3.0.7.tar.xz.sha256
@@ -0,0 +1 @@
+3b2b279017753398b8d5deb440db5f98a205eea35f9417e5fa2893947e7992f2  wireshark-3.0.7.tar.xz
diff --git a/xap/wireshark/wireshark.SlackBuild b/xap/wireshark/wireshark.SlackBuild
index 9105c61e..075f305f 100755
--- a/xap/wireshark/wireshark.SlackBuild
+++ b/xap/wireshark/wireshark.SlackBuild
@@ -23,12 +23,14 @@
 # Contact: Damien Goutte-Gattat <dgouttegattat@incenp.org>
 #
 # Latest wireshark sourcecode is available at: <https://www.wireshark.org/>.
+#
+# Depends: l/qt5
 
 # Source package infos
 NAMESRC=${NAMESRC:-wireshark}
-VERSION=${VERSION:-2.0.4}
-ARCHIVE=${ARCHIVE:-$NAMESRC-$VERSION.tar.bz2}
-WGET=${WGET:-https://www.wireshark.org/download/all-versions/$ARCHIVE}
+VERSION=${VERSION:-3.0.7}
+ARCHIVE=${ARCHIVE:-$NAMESRC-$VERSION.tar.xz}
+WGET=${WGET:-https://1.eu.dl.wireshark.org/src/$ARCHIVE}
 
 # Build infos
 NAMEPKG=${NAMEPKG:-wireshark}
@@ -75,7 +77,7 @@ if [ ! -r $ARCHIVE ]; then
     wget -c -O $ARCHIVE.part "$WGET"
     mv $ARCHIVE.part $ARCHIVE
 fi
-sha1sum -c $ARCHIVE.sha1
+sha256sum -c $ARCHIVE.sha256
 NAME=$(tar ft $ARCHIVE | head -n 1 | cut -d / -f 1)
 
 # Compile
@@ -83,46 +85,37 @@ cd $TMP
 echo "Building $ARCHIVE..."
 tar xf $CWD/$ARCHIVE
 cd $NAME
+mkdir build && cd build
 CFLAGS=$CPUOPT \
 CXXFLAGS=$CPUOPT \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib$LIBDIRSUFFIX \
-  --sysconfdir=/etc \
-  --mandir=/usr/man \
-  --disable-usr-local \
-  --without-lua \
-  --enable-setuid-install
+cmake \
+  -DCMAKE_BUILD_TYPE=Release \
+  -DCMAKE_INSTALL_PREFIX=/usr \
+  -DCMAKE_INSTALL_LIBDIR=/usr/lib$LIBDIRSUFFIX \
+  -DCMAKE_INSTALL_MANDIR=/usr/man \
+  -DCMAKE_INSTALL_DOCDIR=/usr/doc/$NAME \
+  -DDUMPCAP_INSTALL_OPTION=normal \
+  ..
 make -j $JOBS
-make install-strip DESTDIR=$PKG
+make install/strip DESTDIR=$PKG
+cd ..
 
 # Compress man pages
 find $PKG/usr/man  -type f -exec gzip -9 {} \;
 
 # Install the documentation
-mkdir -p $PKG/usr/doc/$NAME
-install -m 644 AUTHORS COPYING ChangeLog NEWS README README.linux \
+install -m 644 AUTHORS{,.src} COPYING ChangeLog NEWS README.md README.linux \
   doc/README.* $PKG/usr/doc/$NAME
 
-# Build manuals
-( cd docbook
-  # HTML manuals
-  make wsug_html_chunked wsdg_html_chunked
-  cp -r wsug_html_chunked $PKG/usr/doc/$NAME/user-guide
-  cp -r wsdg_html_chunked $PKG/usr/doc/$NAME/developer-guide
-
-  # PDF manuals, if FOP is available
-  if type -p fop ; then
-    make user-guide-a4.pdf developer-guide-a4.pdf
-    install -m 644 user-guide-a4.pdf $PKG/usr/doc/$NAME/user-guide.pdf
-    install -m 644 developer-guide-a4.pdf $PKG/usr/doc/$NAME/developer-guide.pdf
-  fi
-)
-
 # Copy slack-desc and doinst.sh files
 install -D -m 644 $CWD/slack-desc $PKG/install/slack-desc
 install    -m 755 $CWD/doinst.sh  $PKG/install/doinst.sh
 
+# Add dependency infos
+cat <<EOF > $PKG/install/slack-required
+qt5
+EOF
+
 # Package the tree
 cd $PKG
 mkdir -p $OUT