network/siege: Updated for version 4.1.1

Signed-off-by: Heinz Wiesinger <pprkut@slackbuilds.org>

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

3 files changed, 51 insertions, 17 deletions

diff --git a/network/siege/siege-verbosity.patch b/network/siege/siege-verbosity.patch
new file mode 100644
index 0000000000000..fec188f1b2315
--- /dev/null
+++ b/network/siege/siege-verbosity.patch
@@ -0,0 +1,28 @@
+From b7900fbc0e929f2f340a44ed2881018a29a9a86f Mon Sep 17 00:00:00 2001
+From: Josue Abarca <jmaslibre@gmail.com>
+Date: Sun, 9 Aug 2020 15:48:15 -0600
+Subject: [PATCH] Allow the command line verbose option to override the
+ configuration file
+
+Since the default configuration file has json_output set to true and
+the json_output monopolizes stdout, superceding verbose, this change
+allows the user to activate the verbose mode using the command line
+parameter even when json_output is set to true in the configuration
+file.
+---
+ src/main.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/main.c b/src/main.c
+index 4bad685..2541cee 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -256,6 +256,8 @@ parse_cmdline(int argc, char *argv[])
+         break;
+       case 'v':
+         my.verbose = TRUE;
++        my.json_output = FALSE;
++        my.quiet   = FALSE;
+         break;
+       case 'r':
+         if(strmatch(optarg, "once")){
diff --git a/network/siege/siege.SlackBuild b/network/siege/siege.SlackBuild
index ac7b121661996..ae8491b6d6703 100644
--- a/network/siege/siege.SlackBuild
+++ b/network/siege/siege.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Siege
 
-# Copyright 2011-2018 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2011-2021  Heinz Wiesinger, Amsterdam, The Netherlands
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -11,23 +11,23 @@
 # 1. Redistributions of this script must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 #
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 # Originally written by Menno Duursma <druiloor@zonnet.nl>
 
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=siege
-VERSION=${VERSION:-4.0.4}
+VERSION=${VERSION:-4.1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -52,8 +52,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -81,6 +81,12 @@ 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 {} \;
 
+# Allow the command line verbose option to override the configuration file
+# https://github.com/JoeDog/siege/pull/182
+patch -p1 -i $CWD/siege-verbosity.patch
+
+utils/bootstrap
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/network/siege/siege.info b/network/siege/siege.info
index 52ddf9a50fd78..f0c4bee6fcbb1 100644
--- a/network/siege/siege.info
+++ b/network/siege/siege.info
@@ -1,8 +1,8 @@
 PRGNAM="siege"
-VERSION="4.0.4"
+VERSION="4.1.1"
 HOMEPAGE="http://www.joedog.org/index/siege-home"
-DOWNLOAD="http://download.joedog.org/siege/siege-4.0.4.tar.gz"
-MD5SUM="aed6db62c4bf199f86218bd7b2fda14f"
+DOWNLOAD="https://github.com/JoeDog/siege/archive/v4.1.1/siege-4.1.1.tar.gz"
+MD5SUM="375a584bc1c1085613854c45e6b3ae99"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""