network/driftnet: Updated for version 1.2.0.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

5 files changed, 27 insertions, 70 deletions

diff --git a/network/driftnet/0001-Add-support-for-giflib-5.patch b/network/driftnet/0001-Add-support-for-giflib-5.patch
deleted file mode 100644
index 7851b4e7b4098..0000000000000
--- a/network/driftnet/0001-Add-support-for-giflib-5.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Fixes this issue not yet released:
-https://github.com/deiv/driftnet/issues/9
-
-From d4b1f2522b39d70889084fa6b0968d3a68a206fb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?David=20Su=C3=A1rez?= <david.sephirot@gmail.com>
-Date: Tue, 26 Jan 2016 20:20:20 +0100
-Subject: [PATCH] Add support for "giflib 5"
-
-Thanks to Mathias Klose.
----
- src/display/gif.c | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/src/display/gif.c b/src/display/gif.c
-index ebe1db5..a86c78d 100644
---- a/src/display/gif.c
-+++ b/src/display/gif.c
-@@ -47,7 +47,11 @@ int gif_load_hdr(img I) {
-  * Abort loading a GIF file after the header is done.
-  */
- int gif_abort_load(img I) {
-+#if defined GIFLIB_MAJOR && GIFLIB_MAJOR >= 5
-+    DGifCloseFile((GifFileType*)I->us, NULL);
-+#else
-     DGifCloseFile((GifFileType*)I->us);
-+#endif
-     return 1;
- }
- 
-@@ -125,7 +129,11 @@ int gif_load_img(img I) {
-     ret = 1;
- fail:
- 
--    DGifCloseFile(g);
-+#if defined GIFLIB_MAJOR && GIFLIB_MAJOR >= 5
-+    DGifCloseFile(g, NULL);
-+#else
-+    DGifCloseFile(g, NULL);
-+#endif
- 
-     return ret;
- }
--- 
-2.9.0
-
diff --git a/network/driftnet/README b/network/driftnet/README
index 29b72babe41a2..03ebbda90321b 100644
--- a/network/driftnet/README
+++ b/network/driftnet/README
@@ -1,8 +1,9 @@
-Driftnet is a program that allows you to view images that pass over any 
-network you are connected to.  The author of the software notes that this is
-a horrible invasion of privacy and that you should never use this software. 
-He also notes that it could be useful for sysadmins enforcing company 
-computer policy.
+Driftnet is a program designed to capture JPEG and GIF images by sniffing
+network traffic and display them in an X window.  Optionally, you may also
+capture MPEG audio streams and play them.  According to the author, "It is
+a horrific invasion of privacy and shouldn't be used by anyone anywhere."
 
-This is an updated version available from GitHub, which includes several 
+Original project:  http://www.ex-parrot.com/~chris/driftnet/
+
+This is an updated version available from GitHub, which includes several
 patches for use on newer systems.
diff --git a/network/driftnet/driftnet.SlackBuild b/network/driftnet/driftnet.SlackBuild
index cca9c4c244b76..d9999b0e3b7ea 100644
--- a/network/driftnet/driftnet.SlackBuild
+++ b/network/driftnet/driftnet.SlackBuild
@@ -2,7 +2,7 @@
 # Slackbuild build script for driftnet
 
 # Copyright 2010, JK Wood <joshuakwood@gmail.com>
-# Copyright 2017, Brenton Earl <brent@exitstatuosne.com>
+# Copyright 2017-2018 Brenton Earl <brent@exitstatuosne.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=driftnet
-VERSION=${VERSION:-1.1.5}
-SRCNAM=${SRCNAM:-driftnet-upstream}
+VERSION=${VERSION:-1.2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -60,9 +59,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $SRCNAM
-tar xvf $CWD/$SRCNAM.tar.gz
-cd $SRCNAM
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -70,8 +69,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# patch for giflib 5.1.x
-patch -p1 < $CWD/0001-Add-support-for-giflib-5.patch
+autoreconf -fi
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -80,7 +78,8 @@ CXXFLAGS="$SLKCFLAGS" \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --mandir=/usr/man \
-  --build=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux \
+  --disable-http-display
 
 make
 make install DESTDIR=$PKG
@@ -89,9 +88,11 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING INSTALL CREDITS README Changelog TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING INSTALL CREDITS README.md Changelog TODO $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+rm -rf $PKG/usr/share/
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/network/driftnet/driftnet.info b/network/driftnet/driftnet.info
index 8b6aa316f5b5b..0a4f69fa15c00 100644
--- a/network/driftnet/driftnet.info
+++ b/network/driftnet/driftnet.info
@@ -1,8 +1,8 @@
 PRGNAM="driftnet"
-VERSION="1.1.5"
+VERSION="1.2.0"
 HOMEPAGE="https://github.com/deiv/driftnet"
-DOWNLOAD="https://github.com/deiv/driftnet/archive/upstream/v1.1.5/driftnet-upstream.tar.gz"
-MD5SUM="1759bac067aa26de1a7f79e887fd59ff"
+DOWNLOAD="https://github.com/deiv/driftnet/archive/v1.2.0/driftnet-1.2.0.tar.gz"
+MD5SUM="86fda7573a2c17ba02059e63e0f097b8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/driftnet/slack-desc b/network/driftnet/slack-desc
index ba856345a221f..89ffe8edb3ffb 100644
--- a/network/driftnet/slack-desc
+++ b/network/driftnet/slack-desc
@@ -8,12 +8,12 @@
         |-----handy-ruler------------------------------------------------------|
 driftnet: driftnet (network image sniffer)
 driftnet:
-driftnet: Driftnet is a program designed to capture JPEG and GIF images and
-driftnet: display them in an X window.  Optionally, you may also capture mpeg
-driftnet: audio streams and play them.  According to the author, "It is an
-driftnet: horrific invasion of privacy and shouldn't be used by anyone
-driftnet: anywhere."
-driftnet:
+driftnet: Driftnet is a program designed to capture JPEG and GIF images by
+driftnet: sniffing network traffic and display them in an X window.
+driftnet: Optionally, you may also capture MPEG audio streams and play them.
+driftnet: According to the author, "It is a horrific invasion of privacy and
+driftnet: shouldn't be used by anyone anywhere."
 driftnet:
+driftnet: Home Page: https://github.com/deiv/driftnet
 driftnet:
 driftnet: