network/modsecurity-apache: Updated for version 2.9.1.

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

3 files changed, 13 insertions, 11 deletions

diff --git a/network/modsecurity-apache/README b/network/modsecurity-apache/README
index 15d7b1d166..6838c9efdd 100644
--- a/network/modsecurity-apache/README
+++ b/network/modsecurity-apache/README
@@ -21,9 +21,9 @@ This SlackBuild will also verify the PGP signature of the package if the
 following conditions are met:
 
 - You have GnuPG installed
-- You have the appropriate public PGP key (0x6980F8B0)
-  in your trustedkeys.gpg keyring (and 0x9624FCD2 for CRS)
+- You have the appropriate public PGP key (0xE6DFB08CE8B11277)
+  in your trustedkeys.gpg keyring
 - You have downloaded the sig file from
-  http://www.modsecurity.org/download/modsecurity-apache_${VERSION}.tar.gz.asc
+  https://www.modsecurity.org/tarball/${VERSION}/modsecurity-${VERSION}.tar.gz.asc
 
 lua is an optional dependency.
diff --git a/network/modsecurity-apache/modsecurity-apache.SlackBuild b/network/modsecurity-apache/modsecurity-apache.SlackBuild
index db08f7bac6..1c7f8d002a 100644
--- a/network/modsecurity-apache/modsecurity-apache.SlackBuild
+++ b/network/modsecurity-apache/modsecurity-apache.SlackBuild
@@ -6,7 +6,7 @@
 
 PRGNAM=modsecurity-apache
 SRCNAM=modsecurity
-VERSION=${VERSION:-2.8.0}
+VERSION=${VERSION:-2.9.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -46,15 +46,15 @@ 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 0x6980F8B0 &>/dev/null
+  /usr/bin/gpg --keyring trustedkeys.gpg --no-default-keyring --list-keys 0xE6DFB08CE8B11277 &>/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}/${PRGNAM}_${VERSION}.tar.gz.asc" ]
+       -f "${CWD}/${SRCNAM}-${VERSION}.tar.gz.asc" ]
   then
-    /usr/bin/gpgv "${CWD}/${PRGNAM}_${VERSION}.tar.gz.asc"
+    /usr/bin/gpgv "${CWD}/${SRCNAM}-${VERSION}.tar.gz.asc" "${CWD}/${SRCNAM}-${VERSION}.tar.gz"
   fi
 fi
 
@@ -66,7 +66,7 @@ cd $TMP
 rm -rf ${SRCNAM}-${VERSION}
 tar xvf $CWD/${SRCNAM}-${VERSION}.tar.gz
 cd ${SRCNAM}-${VERSION}
-tar xvf $CWD/owasp-modsecurity-crs-${CRS_VERSION}.tar.gz || tar xvf $CWD/${CRS_VERSION}.tar.gz
+tar xvf $CWD/${CRS_VERSION}.tar.gz
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/network/modsecurity-apache/modsecurity-apache.info b/network/modsecurity-apache/modsecurity-apache.info
index 4ffabfd19e..f903bcb834 100644
--- a/network/modsecurity-apache/modsecurity-apache.info
+++ b/network/modsecurity-apache/modsecurity-apache.info
@@ -1,9 +1,11 @@
 PRGNAM="modsecurity-apache"
-VERSION="2.8.0"
+VERSION="2.9.1"
 HOMEPAGE="https://www.modsecurity.org/"
-DOWNLOAD="https://www.modsecurity.org/tarball/2.8.0/modsecurity-2.8.0.tar.gz \
+DOWNLOAD="https://www.modsecurity.org/tarball/2.9.1/modsecurity-2.9.1.tar.gz \
+          https://www.modsecurity.org/tarball/2.9.1/modsecurity-2.9.1.tar.gz.asc \
           https://github.com/SpiderLabs/owasp-modsecurity-crs/archive/2.2.9.tar.gz"
-MD5SUM="52035dcec07523cb6cc2149b2a180e20 \
+MD5SUM="0fa92b852abc857a20b9e24f83f814cf \
+        fc0ba69ff9a321ff30e94d31c22e5640 \
         ba5b6d514f5586d33a54b26a5f64eb5c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""