network/modsecurity-apache: Updated for version 2.6.8.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>

4 files changed, 16 insertions, 28 deletions

diff --git a/network/modsecurity-apache/README b/network/modsecurity-apache/README
index d3d2338b7c..6734518ee4 100644
--- a/network/modsecurity-apache/README
+++ b/network/modsecurity-apache/README
@@ -15,12 +15,13 @@ Include /etc/httpd/extra/modsecurity-recommended.conf
 Also refer to the file /etc/httpd/crs/INSTALL for information on how to get the
 Core Rule Set (CRS) up and running.
 
-This SlackBuild will also verify the PGP signature of the packages if the
+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 downloaded the sig files from
+- You have downloaded the sig file from
   http://www.modsecurity.org/download/modsecurity-apache_${VERSION}.tar.gz.asc
-  http://downloads.sourceforge.net/project/mod-security/modsecurity-crs/0-CURRENT/modsecurity-crs_2.2.4.tar.gz.asc
+
+lua is an optional dependency.
diff --git a/network/modsecurity-apache/doinst.sh b/network/modsecurity-apache/doinst.sh
index be6e4845ed..225e435466 100644
--- a/network/modsecurity-apache/doinst.sh
+++ b/network/modsecurity-apache/doinst.sh
@@ -12,5 +12,5 @@ config() {
 }
 
 config etc/httpd/extra/modsecurity-recommended.conf.new
-config etc/httpd/crs/modsecurity_crs_10_config.conf.new
+config etc/httpd/crs/modsecurity_crs_10_setup.conf.new
 
diff --git a/network/modsecurity-apache/modsecurity-apache.SlackBuild b/network/modsecurity-apache/modsecurity-apache.SlackBuild
index 807071a71e..245d557174 100644
--- a/network/modsecurity-apache/modsecurity-apache.SlackBuild
+++ b/network/modsecurity-apache/modsecurity-apache.SlackBuild
@@ -5,11 +5,11 @@
 # Written by pyllyukko
 
 PRGNAM=modsecurity-apache
-VERSION=${VERSION:-2.6.5}
+VERSION=${VERSION:-2.6.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-CRS_VERSION="2.2.4"
+CRS_VERSION="2.2.6"
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -55,17 +55,6 @@ then
   then
     /usr/bin/gpgv "${CWD}/${PRGNAM}_${VERSION}.tar.gz.asc"
   fi
-
-  # Verify the Core Rule Set package.
-  set +e
-  /usr/bin/gpg --keyring trustedkeys.gpg --no-default-keyring --list-keys 0x9624FCD2 &>/dev/null
-  GPG_RET=${?}
-  set -e
-  if [ ${GPG_RET} -eq 0 -a \
-       -f "${CWD}/modsecurity-crs_${CRS_VERSION}.tar.gz.asc" ]
-  then
-    /usr/bin/gpgv "${CWD}/modsecurity-crs_${CRS_VERSION}.tar.gz.asc"
-  fi
 fi
 
 set -e
@@ -120,8 +109,8 @@ cat modsecurity.conf-recommended > $PKG/etc/httpd/extra/modsecurity-recommended.
 # The Core Rule Set
 mkdir -p ${PKG}/etc/httpd/crs
 cp -Rv modsecurity-crs_${CRS_VERSION}/* ${PKG}/etc/httpd/crs
-cat modsecurity-crs_${CRS_VERSION}/modsecurity_crs_10_config.conf.example > \
-  ${PKG}/etc/httpd/crs/modsecurity_crs_10_config.conf.new
+cat modsecurity-crs_${CRS_VERSION}/modsecurity_crs_10_setup.conf.example > \
+  ${PKG}/etc/httpd/crs/modsecurity_crs_10_setup.conf.new
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/network/modsecurity-apache/modsecurity-apache.info b/network/modsecurity-apache/modsecurity-apache.info
index d62db12bb1..f50c6b09fa 100644
--- a/network/modsecurity-apache/modsecurity-apache.info
+++ b/network/modsecurity-apache/modsecurity-apache.info
@@ -1,14 +1,12 @@
 PRGNAM="modsecurity-apache"
-VERSION="2.6.5"
+VERSION="2.6.8"
 HOMEPAGE="http://www.modsecurity.org"
-DOWNLOAD="http://www.modsecurity.org/download/modsecurity-apache_2.6.5.tar.gz \
-          http://www.modsecurity.org/download/modsecurity-apache_2.6.5.tar.gz.asc \
-          http://downloads.sourceforge.net/project/mod-security/modsecurity-crs/0-CURRENT/modsecurity-crs_2.2.4.tar.gz \
-          http://downloads.sourceforge.net/project/mod-security/modsecurity-crs/0-CURRENT/modsecurity-crs_2.2.4.tar.gz.asc"
-MD5SUM="2e1c6456f0dacae7206021d0ae8674e1 \
-        38e82e92f9f6215dbbcfe06bdcc15490 \
-        160321534ba4859ccdb04ae1648fb51d \
-        4a9211dba233730186e2a10ee39230c2"
+DOWNLOAD="http://www.modsecurity.org/download/modsecurity-apache_2.6.8.tar.gz \
+          http://www.modsecurity.org/download/modsecurity-apache_2.6.8.tar.gz.asc \
+          http://ponce.cc/slackware/sources/repo/modsecurity-crs_2.2.6.tar.gz"
+MD5SUM="430449ab9ee906c464aa70b79f9c2230 \
+        7b9f9a2b462d6d5e5786ce4f74da3820 \
+        c5f2c552c7718897d6a93d3de2a442f1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""