diff options
Diffstat (limited to 'network')
| -rw-r--r-- | network/nginx/README | 15 | ||||
| -rw-r--r-- | network/nginx/nginx.SlackBuild | 21 | ||||
| -rw-r--r-- | network/nginx/nginx.info | 6 |
3 files changed, 34 insertions, 8 deletions
diff --git a/network/nginx/README b/network/nginx/README index f101fa857e..9e615363b8 100644 --- a/network/nginx/README +++ b/network/nginx/README @@ -10,6 +10,17 @@ 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. Geoip support is now available as an option using the GeopIP package. If you wish -to enable GeoIP the pass USE_GEOIP variable to the slackbuild: +to enable GeoIP the pass GEOIP variable to the slackbuild: - USE_GEOIP=yes ./nginx.SlackBuild + GEOIP=yes ./nginx.SlackBuild + +libatomic support is now available as an option using the libatomic_ops package. If +you wish to enable libatomic then pass LIBATOMIC variable to the slackbuild: + + LIBATOMIC=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. + + ADDMODULE="/tmp/passenger-release-5.0.13/ext/nginx" ./nginx.SlackBuild diff --git a/network/nginx/nginx.SlackBuild b/network/nginx/nginx.SlackBuild index 8d9946451d..de05bf525b 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.6.3} +VERSION=${VERSION:-1.8.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -79,12 +79,23 @@ sed -i \ -e '/root[ ]*html/s|html;|/var/www/&|' \ -e '$s|.*| include /etc/nginx/conf.d/\*.conf;\n&|' conf/$PRGNAM.conf -if [ "${USE_GEOIP:-no}" == "yes" ]; then +# Enable GeoIP support. +if [ "${GEOIP:-no}" == "yes" ]; then GEOIP_MOD="--with-http_geoip_module" else GEOIP_MOD="" fi +# Endable libatomic_ops support. +if [ "${LIBATOMIC:-no}" == "yes" ]; then + LIBATOMIC_MOD="--with-libatomic" +else + LIBATOMIC_MOD="" +fi + +# Add extra modules not included in nginx. +ADDMODULE=${ADDMODULE:-} + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -104,12 +115,14 @@ CXXFLAGS="$SLKCFLAGS" \ --http-scgi-temp-path=/var/lib/nginx/scgi \ --with-file-aio \ --with-ipv6 \ + --with-rtsig_module \ --with-select_module \ --with-poll_module \ --with-http_ssl_module \ --with-http_realip_module \ --with-http_addition_module \ --with-http_xslt_module \ + --with-http_image_filter_module \ --with-http_sub_module \ --with-http_dav_module \ --with-http_flv_module \ @@ -125,7 +138,9 @@ CXXFLAGS="$SLKCFLAGS" \ --with-mail \ --with-mail_ssl_module \ --with-http_spdy_module \ - $GEOIP_MOD + $GEOIP_MOD \ + $LIBATOMIC_MOD \ + --add-module="$ADDMODULE" make make install \ diff --git a/network/nginx/nginx.info b/network/nginx/nginx.info index 8e8dda99dd..b981b76735 100644 --- a/network/nginx/nginx.info +++ b/network/nginx/nginx.info @@ -1,8 +1,8 @@ PRGNAM="nginx" -VERSION="1.6.3" +VERSION="1.8.0" HOMEPAGE="http://nginx.org/" -DOWNLOAD="http://nginx.org/download/nginx-1.6.3.tar.gz" -MD5SUM="ea813aee2c344c2f5b66cdb24a472738" +DOWNLOAD="http://nginx.org/download/nginx-1.8.0.tar.gz" +MD5SUM="3ca4a37931e9fa301964b8ce889da8cb" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" |