network/nginx: Updated for version 1.4.1.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>

3 files changed, 24 insertions, 11 deletions

diff --git a/network/nginx/README b/network/nginx/README
index 2110d3884409..59bfa8093bf3 100644
--- a/network/nginx/README
+++ b/network/nginx/README
@@ -4,7 +4,12 @@ as well as an IMAP/POP3 proxy server.
 By default, nginx will use the "nobody" user and group accounts. You may
 specify alternate values on the command line if desired; for example:
 
-	NGINXUSER=backup NGINXGROUP=backup ./nginx.SlackBuild
+    NGINXUSER=backup NGINXGROUP=backup ./nginx.SlackBuild
 
 Regardless of which user and group you decide to use, you will need to make
 sure they exist on both the build system and the target system.
+
+Beginning with version 1.4, the SPDY protocol is supported, however it is not 
+build by default. If you wish to enable it you need to change USE_SPDY variable:
+    
+    USE_SPDY=yes ./nginx.SlackBuild
diff --git a/network/nginx/nginx.SlackBuild b/network/nginx/nginx.SlackBuild
index 7486b5bc3005..f8edee033ef0 100644
--- a/network/nginx/nginx.SlackBuild
+++ b/network/nginx/nginx.SlackBuild
@@ -4,7 +4,7 @@
 
 # Copyright 2008 Cherife Li <cherife-#-dotimes.com>
 # Copyright 2011 Diogo Leal <diogo@diogoleal.com>
-# Copyright 2012 Francisco Ambrozio <developer@franciscoambrozio.com>
+# Copyright 2012-13 Francisco Ambrozio <sbo@franciscoambrozio.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,8 +24,10 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# Special thanks to Thomas Morper for some configuration adjustments tips
+
 PRGNAM=nginx
-VERSION=${VERSION:-1.2.6}
+VERSION=${VERSION:-1.4.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -42,6 +44,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+USE_SPDY=${USE_SPDY:-no}
+
 eval $(perl '-V:installvendorlib')
 
 if [ "$ARCH" = "i486" ]; then
@@ -73,6 +77,12 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+if [ "$USE_SPDY" == "yes" ]; then
+    SPDY_MOD=" --with-http_spdy_module "
+else
+    SPDY_MOD=""
+fi
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -85,7 +95,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --group=${NGINXGROUP:=nogroup} \
   --error-log-path=/var/log/nginx/error.log \
   --http-log-path=/var/log/nginx/access.log \
-  --with-rtsig_module \
+  --with-ipv6 \
   --with-select_module \
   --with-poll_module \
   --with-http_ssl_module \
@@ -100,10 +110,8 @@ CXXFLAGS="$SLKCFLAGS" \
   --with-http_secure_link_module \
   --with-http_stub_status_module \
   --with-http_perl_module \
+  $SPDY_MOD \
   --with-perl_modules_path=$installvendorlib \
-  --http-client-body-temp-path=/var/tmp/nginx_client_body_temp \
-  --http-proxy-temp-path=/var/tmp/nginx_proxy_temp \
-  --http-fastcgi-temp-path=/dev/shm \
   --without-mail_pop3_module \
   --without-mail_imap_module \
   --without-mail_smtp_module
diff --git a/network/nginx/nginx.info b/network/nginx/nginx.info
index 1302d15055df..48779eb6c04a 100644
--- a/network/nginx/nginx.info
+++ b/network/nginx/nginx.info
@@ -1,10 +1,10 @@
 PRGNAM="nginx"
-VERSION="1.2.6"
+VERSION="1.4.1"
 HOMEPAGE="http://nginx.org/"
-DOWNLOAD="http://nginx.org/download/nginx-1.2.6.tar.gz"
-MD5SUM="1350d26eb9b66364d9143fb3c4366ab6"
+DOWNLOAD="http://nginx.org/download/nginx-1.4.1.tar.gz"
+MD5SUM="fea7dfab995545ce27fe4c49dc21a972"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="%README%"
 MAINTAINER="Francisco Ambrozio"
-EMAIL="developer@franciscoambrozio.com"
+EMAIL="sbo@franciscoambrozio.com"