diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-12-25 00:59:02 -0600 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-12-25 01:00:47 -0600 |
| commit | 32466fbcf251f7cfdca59efce7c84f77e14f3591 (patch) | |
| tree | 5a678051ee2762087239eb5b10c0e4fd65f99c36 /package/nginx/Makefile | |
| parent | 7747a97c7542b708e6c82867b0a84aeec828a704 (diff) | |
update to latest upstream
Diffstat (limited to 'package/nginx/Makefile')
| -rw-r--r-- | package/nginx/Makefile | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/package/nginx/Makefile b/package/nginx/Makefile index 53fe3d4f8..b16130ed1 100644 --- a/package/nginx/Makefile +++ b/package/nginx/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= nginx -PKG_VERSION:= 1.7.8 -PKG_RELEASE:= 2 -PKG_MD5SUM:= fd5ab813fc1853cd8efe580ead577c3e +PKG_VERSION:= 1.7.9 +PKG_RELEASE:= 1 +PKG_MD5SUM:= a4debbe0ce0dd12b9c8f520bc3b66355 PKG_DESCR:= powerful http reverse proxy and webserver PKG_SECTION:= net/http PKG_BUILDDEP:= pcre zlib @@ -16,8 +16,11 @@ PKG_SITES:= http://nginx.org/download/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz -PKG_CHOICES_NGINX:= WITHOUT_SSL WITH_OPENSSL +PKG_CHOICES_NGINX:= WITHOUT_SSL WITH_LIBRESSL WITH_OPENSSL PKGCD_WITHOUT_SSL:= use no ssl +PKGCD_WITH_LIBRESSL:= use libressl for crypto +PKGCB_WITH_LIBRESSL:= libressl +PKGCS_WITH_LIBRESSL:= libressl ca-certificates PKGCD_WITH_OPENSSL:= use openssl for crypto PKGCB_WITH_OPENSSL:= openssl PKGCS_WITH_OPENSSL:= libopenssl ca-certificates @@ -43,11 +46,16 @@ CONFIGURE_ARGS:= --prefix=/srv/www \ --http-log-path=/var/log/nginx-access.log \ --http-client-body-temp-path=/var/lib/nginx/body \ --http-proxy-temp-path=/var/lib/nginx/proxy \ - --http-fastcgi-temp-path=/var/lib/nginx/fastcgi + --http-fastcgi-temp-path=/var/lib/nginx/fastcgi \ + --http-scgi-temp-path=/var/lib/nginx/uwsgi \ + --http-uwsgi-temp-path=/var/lib/nginx/uwsgi ifeq ($(ADK_PACKAGE_NGINX_WITH_OPENSSL),y) CONFIGURE_ARGS+= --with-http_ssl_module endif +ifeq ($(ADK_PACKAGE_NGINX_WITH_LIBRESSL),y) +CONFIGURE_ARGS+= --with-http_ssl_module +endif ALL_TARGET:= XAKE_FLAGS+= GCC_HONOUR_COPTS=s |