summaryrefslogtreecommitdiff
path: root/network
diff options
context:
space:
mode:
authorLarry Hajali <larryhaja@gmail.com>2017-07-12 20:17:58 -0700
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2017-07-15 07:33:50 +0700
commitbcc59e77518293786548c120af64c9d7533efcea (patch)
tree03b375e965966d88401a60d3b586d83db2f1309a /network
parentf9ca2cdc9b696a8742a3a9de44a2fd80f64c00bb (diff)
downloadslackbuilds-bcc59e77518293786548c120af64c9d7533efcea.tar.gz
network/nginx: Updated for version 1.12.1
Signed-off-by: Larry Hajali <larryhaja[at]gmail[dot]com>
Diffstat (limited to 'network')
-rw-r--r--network/nginx/README7
-rw-r--r--network/nginx/nginx.SlackBuild22
-rw-r--r--network/nginx/nginx.info6
3 files changed, 27 insertions, 8 deletions
diff --git a/network/nginx/README b/network/nginx/README
index b67e58fc11..74a77e254d 100644
--- a/network/nginx/README
+++ b/network/nginx/README
@@ -14,6 +14,11 @@ to enable GeoIP the pass GEOIP variable to the slackbuild:
GEOIP=yes ./nginx.SlackBuild
+Support for gperftools is available as an option using the gperftools package.
+If you wish to enable gperftools pass the GPERF variable to the slackbuild:
+
+ GPERF=yes ./nginx.SlackBuild
+
Extra modules not included with stock nginx can be added by passing them as a
variable to the slackbuild as a space separated list of full paths to modules.
List of extra 3rd party modules available at http://wiki.nginx.org/3rdPartyModules.
@@ -25,3 +30,5 @@ that dynamic modules are a new feature in nginx and issues may arise until furth
testing is done.
DYNAMIC=yes ./nginx.SlackBuild
+
+Optional dependency: libwebp (requires gd to be recompiled)
diff --git a/network/nginx/nginx.SlackBuild b/network/nginx/nginx.SlackBuild
index d652ddaaf6..654318b418 100644
--- a/network/nginx/nginx.SlackBuild
+++ b/network/nginx/nginx.SlackBuild
@@ -28,8 +28,8 @@
# Special thanks to Thomas Morper for some configuration adjustments tips
PRGNAM=nginx
-VERSION=${VERSION:-1.10.3}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.12.1}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -93,7 +93,8 @@ fi
# Enable GeoIP support.
if [ "${GEOIP:-no}" == "yes" ]; then
- GEOIP_MOD="--with-http_geoip_module${DYNAMIC_MODULE}"
+ GEOIP_MOD="--with-http_geoip_module${DYNAMIC_MODULE}
+ --with-stream_geoip_module${DYNAMIC_MODULE}"
else
GEOIP_MOD=""
fi
@@ -107,6 +108,13 @@ else
ADD_MODULE="--add-module=$ADDMODULE"
fi
+# Enable gperftools support.
+if [ "${GPERF:-no}" == "yes" ]; then
+ GPERF_MOD="--with-google_perftools_module"
+else
+ GPERF_MOD=""
+fi
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
@@ -125,7 +133,6 @@ CXXFLAGS="$SLKCFLAGS" \
--http-uwsgi-temp-path=/var/lib/nginx/uwsgi \
--http-scgi-temp-path=/var/lib/nginx/scgi \
--with-file-aio \
- --with-ipv6 \
--with-select_module \
--with-poll_module \
--with-http_ssl_module \
@@ -140,21 +147,26 @@ CXXFLAGS="$SLKCFLAGS" \
--with-http_mp4_module \
--with-http_gunzip_module \
--with-http_gzip_static_module \
+ --with-http_auth_request_module \
--with-http_random_index_module \
--with-http_secure_link_module \
--with-http_degradation_module \
--with-http_slice_module \
--with-http_stub_status_module \
--with-http_perl_module${DYNAMIC_MODULE} \
- --with-http_auth_request_module \
--with-mail${DYNAMIC_MODULE} \
--with-mail_ssl_module \
--with-stream${DYNAMIC_MODULE} \
--with-stream_ssl_module \
+ --with-stream_realip_module \
+ --with-stream_ssl_preread_module \
+ --with-cpp_test_module \
+ --with-compat \
--with-pcre \
--with-pcre-jit \
--with-libatomic \
$GEOIP_MOD \
+ $GPERF_MOD \
$ADD_MODULE
make
diff --git a/network/nginx/nginx.info b/network/nginx/nginx.info
index 40ae2124b0..39269d4e1a 100644
--- a/network/nginx/nginx.info
+++ b/network/nginx/nginx.info
@@ -1,8 +1,8 @@
PRGNAM="nginx"
-VERSION="1.10.3"
+VERSION="1.12.1"
HOMEPAGE="http://nginx.org/"
-DOWNLOAD="http://nginx.org/download/nginx-1.10.3.tar.gz"
-MD5SUM="204a20cb4f0b0c9db746c630d89ff4ea"
+DOWNLOAD="http://nginx.org/download/nginx-1.12.1.tar.gz"
+MD5SUM="a307e74aca95403e5ee00f153807ce58"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""