deepcrayon
/
buildroot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

package/nginx: bump version to 1.10.0 

The ngx_http_spdy_module has been superseded by the ngx_http_v2_module
so BR2_PACKAGE_NGINX_HTTP_SPDY_MODULE has changed to
BR2_PACKAGE_NGINX_HTTP_V2_MODULE

Signed-off-by: Martin Bark <martin@barkynet.com>
[Thomas: rewrap Config.in.legacy help text.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016.08.x
Martin Bark 2016-05-03 10:36:54 +01:00 committed by Thomas Petazzoni
parent 8513761493
commit 4dfc2cb5fe
5 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Config.in.legacy
View File

@ -145,6 +145,16 @@ endif
###############################################################################
comment "Legacy options removed in 2016.05"
config BR2_PACKAGE_NGINX_HTTP_SPDY_MODULE
bool "nginx http spdy module removed"
select BR2_LEGACY
select BR2_PACKAGE_NGINX_HTTP_V2_MODULE
help
The ngx_http_spdy_module has been superseded by the
ngx_http_v2_module since nginx v1.9.5. The
ngx_http_v2_module modules has been automatically selected
in your configuration.
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RTP
bool "gst1-plugins-bad rtp plugin moved to good"
select BR2_LEGACY

11
package/nginx/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch
View File

@ -13,6 +13,8 @@ Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Refresh for 1.8.0.
Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
[martin@barkynet.com: Updated for 1.10.0]
Signed-off-by: Martin Bark <martin@barkynet.com>
---
auto/types/sizeof | 42 ++++++++++++++++++++++++++++--------------
1 file changed, 28 insertions(+), 14 deletions(-)
@ -30,7 +32,7 @@ index a5f66bb..c6f31ec 100644
#include <sys/types.h>
#include <sys/time.h>
@@ -25,29 +25,43 @@ $NGX_INCLUDE_UNISTD_H
@@ -25,22 +25,40 @@ $NGX_INCLUDE_UNISTD_H
$NGX_INCLUDE_INTTYPES_H
$NGX_INCLUDE_AUTO_CONFIG_H
@ -80,13 +82,6 @@ index a5f66bb..c6f31ec 100644
echo " $ngx_size bytes"
fi
-
-rm -rf $NGX_AUTOTEST*
-
-
case $ngx_size in
4)
ngx_max_value=2147483647
--
1.9.1

4
package/nginx/Config.in
View File

@ -36,8 +36,8 @@ config BR2_PACKAGE_NGINX_HTTP_SSL_MODULE
help
Enable ngx_http_ssl_module
config BR2_PACKAGE_NGINX_HTTP_SPDY_MODULE
bool "ngx_http_spdy_module"
config BR2_PACKAGE_NGINX_HTTP_V2_MODULE
bool "ngx_http_v2_module"
select BR2_PACKAGE_ZLIB
help
Enable ngx_http_spdy_module

2
package/nginx/nginx.hash
View File

@ -1,2 +1,2 @@
# Locally calculated after checking pgp signature
sha256 8f4b3c630966c044ec72715754334d1fdf741caa1d5795fb4646c27d09f797b7 nginx-1.8.1.tar.gz
sha256 8ed647c3dd65bc4ced03b0e0f6bf9e633eff6b01bac772bcf97077d58bc2be4d nginx-1.10.0.tar.gz

6
package/nginx/nginx.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
NGINX_VERSION = 1.8.1
NGINX_VERSION = 1.10.0
NGINX_SITE = http://nginx.org/download
NGINX_LICENSE = BSD-2c
NGINX_LICENSE_FILES = LICENSE
@ -104,9 +104,9 @@ else
NGINX_CONF_OPTS += --without-http-cache
endif
ifeq ($(BR2_PACKAGE_NGINX_HTTP_SPDY_MODULE),y)
ifeq ($(BR2_PACKAGE_NGINX_HTTP_V2_MODULE),y)
NGINX_DEPENDENCIES += zlib
NGINX_CONF_OPTS += --with-http_spdy_module
NGINX_CONF_OPTS += --with-http_v2_module
endif
ifeq ($(BR2_PACKAGE_NGINX_HTTP_SSL_MODULE),y)