aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--network/nginx/nginx.SlackBuild16
-rw-r--r--network/nginx/nginx.info6
2 files changed, 7 insertions, 15 deletions
diff --git a/network/nginx/nginx.SlackBuild b/network/nginx/nginx.SlackBuild
index cd460968e803..c9cfa73a9258 100644
--- a/network/nginx/nginx.SlackBuild
+++ b/network/nginx/nginx.SlackBuild
@@ -28,7 +28,7 @@
# Special thanks to Thomas Morper for some configuration adjustments tips
PRGNAM=nginx
-VERSION=${VERSION:-1.4.7}
+VERSION=${VERSION:-1.6.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -122,11 +122,9 @@ CXXFLAGS="$SLKCFLAGS" \
--with-http_degradation_module \
--with-http_stub_status_module \
--with-http_perl_module \
+ --with-http_auth_request_module \
--with-mail \
--with-mail_ssl_module \
- --without-mail_pop3_module \
- --without-mail_imap_module \
- --without-mail_smtp_module \
$SPDY_MOD \
$GEOIP_MOD
@@ -141,20 +139,14 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \
mkdir -p $PKG/usr/man/man8
install -m 0644 objs/$PRGNAM.8 $PKG/usr/man/man8
-
find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-find $PKG -name perllocal.pod \
- -o -name ".packlist" \
- -o -name "*.bs" | \
- xargs rm -f 2> /dev/null
+find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true
find $PKG -perm 444 -exec chmod 0644 {} \;
find $PKG -perm 555 -exec chmod 0755 {} \;
# Move html directory
-mkdir $PKG/var/www
+mkdir -p $PKG/var/www
mv $PKG/usr/html $PKG/var/www
# Add an init script
diff --git a/network/nginx/nginx.info b/network/nginx/nginx.info
index bee48924f5ee..169eb0ab9ce7 100644
--- a/network/nginx/nginx.info
+++ b/network/nginx/nginx.info
@@ -1,8 +1,8 @@
PRGNAM="nginx"
-VERSION="1.4.7"
+VERSION="1.6.0"
HOMEPAGE="http://nginx.org/"
-DOWNLOAD="http://nginx.org/download/nginx-1.4.7.tar.gz"
-MD5SUM="aee151d298dcbfeb88b3f7dd3e7a4d17"
+DOWNLOAD="http://nginx.org/download/nginx-1.6.0.tar.gz"
+MD5SUM="8efa354f1c3c2ccf434a50d3fbe82340"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""