2 files changed, 11 insertions, 10 deletions
diff --git a/network/modsecurity-apache/modsecurity-apache.SlackBuild b/network/modsecurity-apache/modsecurity-apache.SlackBuild
index 5bd982887b..db08f7bac6 100644
--- a/network/modsecurity-apache/modsecurity-apache.SlackBuild
+++ b/network/modsecurity-apache/modsecurity-apache.SlackBuild
@@ -5,7 +5,8 @@
 # Written by pyllyukko
 
 PRGNAM=modsecurity-apache
-VERSION=${VERSION:-2.7.7}
+SRCNAM=modsecurity
+VERSION=${VERSION:-2.8.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -62,16 +63,16 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf ${PRGNAM}_${VERSION}
-tar xvf $CWD/${PRGNAM}_${VERSION}.tar.gz
-cd ${PRGNAM}_${VERSION}
-tar xvf $CWD/${CRS_VERSION}.tar.gz
+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
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
diff --git a/network/modsecurity-apache/modsecurity-apache.info b/network/modsecurity-apache/modsecurity-apache.info
index 38ca69d038..4ffabfd19e 100644
--- a/network/modsecurity-apache/modsecurity-apache.info
+++ b/network/modsecurity-apache/modsecurity-apache.info
@@ -1,9 +1,9 @@
 PRGNAM="modsecurity-apache"
-VERSION="2.7.7"
-HOMEPAGE="http://www.modsecurity.org"
-DOWNLOAD="https://www.modsecurity.org/tarball/2.7.7/modsecurity-apache_2.7.7.tar.gz \
+VERSION="2.8.0"
+HOMEPAGE="https://www.modsecurity.org/"
+DOWNLOAD="https://www.modsecurity.org/tarball/2.8.0/modsecurity-2.8.0.tar.gz \
           https://github.com/SpiderLabs/owasp-modsecurity-crs/archive/2.2.9.tar.gz"
-MD5SUM="5383c59ecc6990c870386627f67e7216 \
+MD5SUM="52035dcec07523cb6cc2149b2a180e20 \
         ba5b6d514f5586d33a54b26a5f64eb5c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""