diff --git a/net/nginx/Makefile b/net/nginx/Makefile index e93326e52..667bacb5d 100644 --- a/net/nginx/Makefile +++ b/net/nginx/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2009-2012 OpenWrt.org +# Copyright (C) 2012-2015 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nginx PKG_VERSION:=1.4.7 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://nginx.org/download/ diff --git a/net/nginx/patches/100-musl-no-sysctl.patch b/net/nginx/patches/100-musl-no-sysctl.patch new file mode 100644 index 000000000..4e35bf6ba --- /dev/null +++ b/net/nginx/patches/100-musl-no-sysctl.patch @@ -0,0 +1,35 @@ +Index: nginx-1.4.7/src/os/unix/ngx_linux_config.h +=================================================================== +--- nginx-1.4.7.orig/src/os/unix/ngx_linux_config.h ++++ nginx-1.4.7/src/os/unix/ngx_linux_config.h +@@ -51,7 +51,6 @@ + #include /* memalign() */ + #include /* IOV_MAX */ + #include +-#include + #include + #include /* uname() */ + +--- nginx-1.2.7/src/os/unix/ngx_user.c ++++ nginx-1.2.7-patched/src/os/unix/ngx_user.c +@@ -31,8 +31,6 @@ + struct crypt_data cd; + + cd.initialized = 0; +- /* work around the glibc bug */ +- cd.current_salt[0] = ~salt[0]; + + value = crypt_r((char *) key, (char *) salt, &cd); + +diff --git a/auto/lib/openssl/conf b/auto/lib/openssl/conf +index 528ee17..73ef359 100644 +--- a/auto/lib/openssl/conf ++++ b/auto/lib/openssl/conf +@@ -47,7 +47,7 @@ else + ngx_feature_run=no + ngx_feature_incs="#include " + ngx_feature_path= +- ngx_feature_libs="-lssl -lcrypto" ++ ngx_feature_libs="-lssl -lcrypto -lz" + ngx_feature_test="SSL_library_init()" + . auto/feature