summaryrefslogtreecommitdiff
path: root/network
diff options
context:
space:
mode:
authorDavid Spencer <idlemoor@slackbuilds.org>2016-08-07 11:38:33 +0100
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2016-08-07 18:55:39 +0700
commit441588492a949021fddbd55a0fe44f19415ac522 (patch)
tree839bc6aff729a75f6b020d14a6a447caa5078bc4 /network
parente0a05c0c233b6dc9b42a5d194b1e7e726bb344e4 (diff)
downloadslackbuilds-441588492a949021fddbd55a0fe44f19415ac522.tar.gz
network/modsecurity-apache: Fix tarball handling.
Also, remove directory /usr/lib if empty (i.e. x86_64). Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
Diffstat (limited to 'network')
-rw-r--r--network/modsecurity-apache/modsecurity-apache.SlackBuild3
-rw-r--r--network/modsecurity-apache/modsecurity-apache.info2
2 files changed, 3 insertions, 2 deletions
diff --git a/network/modsecurity-apache/modsecurity-apache.SlackBuild b/network/modsecurity-apache/modsecurity-apache.SlackBuild
index 1c7f8d002a..79b670df32 100644
--- a/network/modsecurity-apache/modsecurity-apache.SlackBuild
+++ b/network/modsecurity-apache/modsecurity-apache.SlackBuild
@@ -66,7 +66,7 @@ cd $TMP
rm -rf ${SRCNAM}-${VERSION}
tar xvf $CWD/${SRCNAM}-${VERSION}.tar.gz
cd ${SRCNAM}-${VERSION}
-tar xvf $CWD/${CRS_VERSION}.tar.gz
+tar xvf $CWD/owasp-modsecurity-crs-${CRS_VERSION}.tar.gz
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -85,6 +85,7 @@ make install-strip DESTDIR=$PKG
# It leaves two copies of the library, we'll only need one
rm $PKG/usr/lib/*.so
+rmdir --ignore-fail-on-non-empty $PKG/usr/lib
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a CHANGES LICENSE NOTICE README.TXT README_WINDOWS.TXT authors.txt \
diff --git a/network/modsecurity-apache/modsecurity-apache.info b/network/modsecurity-apache/modsecurity-apache.info
index f903bcb834..bbbcd5c1b1 100644
--- a/network/modsecurity-apache/modsecurity-apache.info
+++ b/network/modsecurity-apache/modsecurity-apache.info
@@ -3,7 +3,7 @@ VERSION="2.9.1"
HOMEPAGE="https://www.modsecurity.org/"
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"
+ https://github.com/SpiderLabs/owasp-modsecurity-crs/archive/2.2.9/owasp-modsecurity-crs-2.2.9.tar.gz"
MD5SUM="0fa92b852abc857a20b9e24f83f814cf \
fc0ba69ff9a321ff30e94d31c22e5640 \
ba5b6d514f5586d33a54b26a5f64eb5c"