2 files changed, 23 insertions, 34 deletions
diff --git a/network/modsecurity-apache/modsecurity-apache.SlackBuild b/network/modsecurity-apache/modsecurity-apache.SlackBuild
index 6901cf8379..90bdcc47e7 100644
--- a/network/modsecurity-apache/modsecurity-apache.SlackBuild
+++ b/network/modsecurity-apache/modsecurity-apache.SlackBuild
@@ -1,32 +1,42 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ModSecurity
 
 # Written by pyllyukko
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=modsecurity-apache
 SRCNAM=modsecurity
-VERSION=${VERSION:-2.9.3}
+VERSION=${VERSION:-2.9.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
-CRS_VERSION="3.1.0"
+CRS_VERSION="3.2.0"
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 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"
@@ -39,25 +49,6 @@ else
   LIBDIRSUFFIX=""
 fi
 
-# The package can be verified with Breno Silva Pinto's PGP key (0x6980F8B0)
-# If we have GPG installed, we try to verify the signature.
-if [ -x "/usr/bin/gpg" -a -x "/usr/bin/gpgv" ]
-then
-  set +e
-  # This will check if we have the correct key in our keyring.
-  # For the trustedkeys.gpg, see "man 1 gpgv".
-  /usr/bin/gpg --keyring trustedkeys.gpg --no-default-keyring --list-keys 0xE4BCD2EA82E67A45 &>/dev/null
-  GPG_RET=${?}
-  # 2 means we don't have his key, 0 means we do.
-  set -e
-  # If we have the key and the signature file, we verify the package with GPG
-  if [ ${GPG_RET} -eq 0 -a \
-       -f "${CWD}/${SRCNAM}-${VERSION}.tar.gz.asc" ]
-  then
-    /usr/bin/gpgv "${CWD}/${SRCNAM}-${VERSION}.tar.gz.asc" "${CWD}/${SRCNAM}-${VERSION}.tar.gz"
-  fi
-fi
-
 set -e
 
 rm -rf $PKG
@@ -108,4 +99,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.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/modsecurity-apache/modsecurity-apache.info b/network/modsecurity-apache/modsecurity-apache.info
index 5500d5738f..a70b04bcf8 100644
--- a/network/modsecurity-apache/modsecurity-apache.info
+++ b/network/modsecurity-apache/modsecurity-apache.info
@@ -1,12 +1,10 @@
 PRGNAM="modsecurity-apache"
-VERSION="2.9.3"
+VERSION="2.9.7"
 HOMEPAGE="https://www.modsecurity.org/"
-DOWNLOAD="https://www.modsecurity.org/tarball/2.9.3/modsecurity-2.9.3.tar.gz \
-          https://github.com/SpiderLabs/ModSecurity/releases/download/v2.9.3/modsecurity-2.9.3.tar.gz.asc \
-          https://github.com/SpiderLabs/owasp-modsecurity-crs/archive/v3.1.0/owasp-modsecurity-crs-3.1.0.tar.gz"
-MD5SUM="215a96d679a5b0fadcf13b5d09b35422 \
-        b1005b1ad337951c876d729264a13f0d \
-        4e0a0fbaf077b50364c934083c4cb905"
+DOWNLOAD="https://github.com/SpiderLabs/ModSecurity/releases/download/v2.9.7/modsecurity-2.9.7.tar.gz \
+          https://github.com/SpiderLabs/owasp-modsecurity-crs/archive/v3.2.0/owasp-modsecurity-crs-3.2.0.tar.gz"
+MD5SUM="f2ccb0d6b3ba59a5677accb5569abbbd \
+        9dd31ff7e74bd797d2013b93c02df304"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""