nginx: update stable version to 1.10.0
PATCH 1/2 nginx: update stable version to 1.10.0
The 1.8 version is now considered legacy and the stable versions 1.10.X Updated the license checksum to reflect copyright date update to 2016
Signed-off-by Derek Straka <[email protected]>
--- .../recipes-httpd/nginx/files/nginx-cross.patch | 31 +++++++++------------- meta-webserver/recipes-httpd/nginx/nginx_1.10.0.bb | 6 +++++ meta-webserver/recipes-httpd/nginx/nginx_1.8.1.bb | 6 ----- 3 files changed, 18 insertions(+), 25 deletions(-) create mode 100644 meta-webserver/recipes-httpd/nginx/nginx_1.10.0.bb delete mode 100644 meta-webserver/recipes-httpd/nginx/nginx_1.8.1.bb
meta-webserver/recipes-httpd/nginx/files/nginx-cross.patch +12 -19
@@ -6,7 +6,7 @@ Upstream-Status: Pending diff -uraN nginx-1.0.11.orig/auto/feature nginx-1.0.11/auto/feature --- nginx-1.0.11.orig/auto/feature 2011-05-11 06:50:19.000000000 -0500 +++ nginx-1.0.11/auto/feature 2011-12-27 13:56:42.323370040 -0600 -@@ -48,12 +48,20 @@ +@@ -49,12 +49,20 @@ if [ -x $NGX_AUTOTEST ]; then
@@ -29,7 +29,7 @@ diff -uraN nginx-1.0.11.orig/auto/feature nginx-1.0.11/auto/feature ngx_found=yes if test -n "$ngx_feature_name"; then -@@ -67,17 +75,27 @@ +@@ -68,17 +75,27 @@ value) # /bin/sh is used to intercept "Killed" or "Abort trap" messages
@@ -61,7 +61,7 @@ diff -uraN nginx-1.0.11.orig/auto/feature nginx-1.0.11/auto/feature else echo " found but is not working" fi -@@ -85,7 +103,7 @@ +@@ -86,7 +105,7 @@ bug) # /bin/sh is used to intercept "Killed" or "Abort trap" messages
@@ -73,8 +73,8 @@ diff -uraN nginx-1.0.11.orig/auto/feature nginx-1.0.11/auto/feature diff -uraN nginx-1.0.11.orig/auto/options nginx-1.0.11/auto/options --- nginx-1.0.11.orig/auto/options 2011-12-14 07:34:16.000000000 -0600 +++ nginx-1.0.11/auto/options 2011-12-27 13:56:42.323370040 -0600 -@@ -289,6 +289,18 @@ - --test-build-rtsig) NGX_TEST_BUILD_RTSIG=YES ;; +@@ -353,6 +353,18 @@ + --test-build-epoll) NGX_TEST_BUILD_EPOLL=YES ;; --test-build-solaris-sendfilev) NGX_TEST_BUILD_SOLARIS_SENDFILEV=YES ;; + # cross compile support
@@ -92,7 +92,7 @@ diff -uraN nginx-1.0.11.orig/auto/options nginx-1.0.11/auto/options *) echo "$0: error: invalid option \"$option\"" exit 1 -@@ -434,6 +446,17 @@ +@@ -533,6 +445,17 @@ --with-debug enable debug logging
@@ -110,7 +110,7 @@ diff -uraN nginx-1.0.11.orig/auto/options nginx-1.0.11/auto/options END exit 1 -@@ -455,6 +478,8 @@ +@@ -554,6 +577,8 @@ if [ ".$NGX_PLATFORM" = ".win32" ]; then NGX_WINE=$WINE
@@ -137,14 +137,14 @@ diff -uraN nginx-1.0.11.orig/auto/types/sizeof nginx-1.0.11/auto/types/sizeof #include <sys/types.h> #include <sys/time.h> -@@ -33,20 +36,20 @@ +@@ -33,15 +36,16 @@ END -ngx_test="$CC $CC_TEST_FLAGS $CC_AUX_FLAGS \ - -o $NGX_AUTOTEST $NGX_AUTOTEST.c $NGX_LD_OPT $ngx_feature_libs" + ngx_test="$CC $CC_TEST_FLAGS $CC_AUX_FLAGS \ -+ -o $NGX_AUTOTEST $NGX_AUTOTEST.c $NGX_LD_OPT $ngx_feature_libs" ++ -o $NGX_AUTOTEST $NGX_AUTOTEST.c $NGX_LD_OPT $ngx_feature_libs" -eval "$ngx_test >> $NGX_AUTOCONF_ERR 2>&1" + eval "$ngx_test >> $NGX_AUTOCONF_ERR 2>&1"
@@ -153,20 +153,13 @@ diff -uraN nginx-1.0.11.orig/auto/types/sizeof nginx-1.0.11/auto/types/sizeof -if [ -x $NGX_AUTOTEST ]; then - ngx_size=`$NGX_AUTOTEST` - echo " $ngx_size bytes" --fi + if [ -x $NGX_AUTOTEST ]; then -+ ngx_size=`$NGX_AUTOTEST` -+ echo " $ngx_size bytes" ++ ngx_size=`$NGX_AUTOTEST` ++ echo " $ngx_size bytes" + fi + fi --rm -rf $NGX_AUTOTEST* -- -+ rm -rf $NGX_AUTOTEST* -+fi - - case $ngx_size in - 4) diff -uraN nginx-1.0.11.orig/auto/unix nginx-1.0.11/auto/unix --- nginx-1.0.11.orig/auto/unix 2011-12-14 07:34:16.000000000 -0600 +++ nginx-1.0.11/auto/unix 2011-12-27 13:56:42.327370060 -0600
meta-webserver/recipes-httpd/nginx/nginx_1.10.0.bb new file +6 -0
@@ -0,0 +1,6 @@ +require nginx.inc + +LIC_FILES_CHKSUM = "file://LICENSE;md5=0bb58ed0dfd4f5dbece3b52aba79f023" + +SRC_URI[md5sum] = "c184c873d2798c5ba92be95ed1209c02" +SRC_URI[sha256sum] = "8ed647c3dd65bc4ced03b0e0f6bf9e633eff6b01bac772bcf97077d58bc2be4d"
meta-webserver/recipes-httpd/nginx/nginx_1.8.1.bb deleted +0 -6
@@ -1,6 +0,0 @@ -require nginx.inc - -LIC_FILES_CHKSUM = "file://LICENSE;md5=3845852aedfa8d6d7765f55d06cc3ebd" - -SRC_URI[md5sum] = "2e91695074dbdfbf1bcec0ada9fda462" -SRC_URI[sha256sum] = "8f4b3c630966c044ec72715754334d1fdf741caa1d5795fb4646c27d09f797b7"
Signature · 1 line
1.9.1
PATCH 2/2 nginx: update to version 1.9.15
Remove a now redundant nginx-cross patch with stable moving to 1.10.X Remove a duplicate DISABLE_STATIC
Signed-off-by Derek Straka <[email protected]>
--- .../nginx/nginx-1.9.14/nginx-cross.patch | 211 --------------------- meta-webserver/recipes-httpd/nginx/nginx_1.9.14.bb | 12 -- meta-webserver/recipes-httpd/nginx/nginx_1.9.15.bb | 10 + 3 files changed, 10 insertions(+), 223 deletions(-) delete mode 100644 meta-webserver/recipes-httpd/nginx/nginx-1.9.14/nginx-cross.patch delete mode 100644 meta-webserver/recipes-httpd/nginx/nginx_1.9.14.bb create mode 100644 meta-webserver/recipes-httpd/nginx/nginx_1.9.15.bb
meta-webserver/recipes-httpd/nginx/nginx-1.9.14/nginx-cross.patch deleted +0 -211
@@ -1,211 +0,0 @@ -We do not have capability to run binaries when cross compiling - -Upstream-Status: Pending - - -diff -uraN nginx-1.0.11.orig/auto/feature nginx-1.0.11/auto/feature ---- nginx-1.0.11.orig/auto/feature 2011-05-11 06:50:19.000000000 -0500 -+++ nginx-1.0.11/auto/feature 2011-12-27 13:56:42.323370040 -0600 -@@ -49,12 +49,20 @@ - - if [ -x $NGX_AUTOTEST ]; then - -+ if [ ".$NGX_CROSS_COMPILE" = ".yes" ]; then -+ NGX_AUTOTEST_EXEC="true" -+ NGX_FOUND_MSG=" (not tested, cross compiling)" -+ else -+ NGX_AUTOTEST_EXEC="$NGX_AUTOTEST" -+ NGX_FOUND_MSG="" -+ fi -+ - case "$ngx_feature_run" in - - yes) - # /bin/sh is used to intercept "Killed" or "Abort trap" messages -- if /bin/sh -c $NGX_AUTOTEST >> $NGX_AUTOCONF_ERR 2>&1; then -- echo " found" -+ if /bin/sh -c $NGX_AUTOTEST_EXEC >> $NGX_AUTOCONF_ERR 2>&1; then -+ echo " found$NGX_FOUND_MSG" - ngx_found=yes - - if test -n "$ngx_feature_name"; then -@@ -68,17 +75,27 @@ - - value) - # /bin/sh is used to intercept "Killed" or "Abort trap" messages -- if /bin/sh -c $NGX_AUTOTEST >> $NGX_AUTOCONF_ERR 2>&1; then -- echo " found" -+ if /bin/sh -c $NGX_AUTOTEST_EXEC >> $NGX_AUTOCONF_ERR 2>&1; then -+ echo " found$NGX_FOUND_MSG" - ngx_found=yes - -- cat << END >> $NGX_AUTO_CONFIG_H -+ if [ ".$NGX_CROSS_COMPILE" = ".yes" ]; then -+ cat << END >> $NGX_AUTO_CONFIG_H - - #ifndef $ngx_feature_name --#define $ngx_feature_name `$NGX_AUTOTEST` -+#define $ngx_feature_name $(eval "echo \$NGX_WITH_${ngx_feature_name}") - #endif - - END -+ else -+ cat << END >> $NGX_AUTO_CONFIG_H -+ -+#ifndef $ngx_feature_name -+#define $ngx_feature_name `$NGX_AUTOTEST_EXEC` -+#endif -+ -+END -+ fi - else - echo " found but is not working" - fi -@@ -86,7 +105,7 @@ - - bug) - # /bin/sh is used to intercept "Killed" or "Abort trap" messages -- if /bin/sh -c $NGX_AUTOTEST >> $NGX_AUTOCONF_ERR 2>&1; then -+ if /bin/sh -c $NGX_AUTOTEST_EXEC >> $NGX_AUTOCONF_ERR 2>&1; then - echo " not found" - - else -diff -uraN nginx-1.0.11.orig/auto/options nginx-1.0.11/auto/options ---- nginx-1.0.11.orig/auto/options 2011-12-14 07:34:16.000000000 -0600 -+++ nginx-1.0.11/auto/options 2011-12-27 13:56:42.323370040 -0600 -@@ -353,6 +353,18 @@ - --test-build-epoll) NGX_TEST_BUILD_EPOLL=YES ;; - --test-build-solaris-sendfilev) NGX_TEST_BUILD_SOLARIS_SENDFILEV=YES ;; - -+ # cross compile support -+ --with-int=*) NGX_WITH_INT="$value" ;; -+ --with-long=*) NGX_WITH_LONG="$value" ;; -+ --with-long-long=*) NGX_WITH_LONG_LONG="$value" ;; -+ --with-ptr-size=*) NGX_WITH_PTR_SIZE="$value" ;; -+ --with-sig-atomic-t=*) NGX_WITH_SIG_ATOMIC_T="$value" ;; -+ --with-size-t=*) NGX_WITH_SIZE_T="$value" ;; -+ --with-off-t=*) NGX_WITH_OFF_T="$value" ;; -+ --with-time-t=*) NGX_WITH_TIME_T="$value" ;; -+ --with-sys-nerr=*) NGX_WITH_NGX_SYS_NERR="$value" ;; -+ --with-endian=*) NGX_WITH_ENDIAN="$value" ;; -+ - *) - echo "$0: error: invalid option \"$option\"" - exit 1 -@@ -533,6 +445,17 @@ - - --with-debug enable debug logging - -+ --with-int=VALUE force int size -+ --with-long=VALUE force long size -+ --with-long-long=VALUE force long long size -+ --with-ptr-size=VALUE force pointer size -+ --with-sig-atomic-t=VALUE force sig_atomic_t size -+ --with-size-t=VALUE force size_t size -+ --with-off-t=VALUE force off_t size -+ --with-time-t=VALUE force time_t size -+ --with-sys-nerr=VALUE force sys_nerr value -+ --with-endian=VALUE force system endianess -+ - END - - exit 1 -@@ -554,6 +577,8 @@ - - if [ ".$NGX_PLATFORM" = ".win32" ]; then - NGX_WINE=$WINE -+elif [ ! -z "$NGX_PLATFORM" ]; then -+ NGX_CROSS_COMPILE="yes" - fi - - -diff -uraN nginx-1.0.11.orig/auto/types/sizeof nginx-1.0.11/auto/types/sizeof ---- nginx-1.0.11.orig/auto/types/sizeof 2006-06-28 11:00:26.000000000 -0500 -+++ nginx-1.0.11/auto/types/sizeof 2011-12-27 13:56:42.323370040 -0600 -@@ -12,9 +12,12 @@ - - END - --ngx_size= -+ngx_size=$(eval "echo \$NGX_WITH_${ngx_param}") - --cat << END > $NGX_AUTOTEST.c -+if [ ".$ngx_size" != "." ]; then -+ echo " $ngx_size bytes" -+else -+ cat << END > $NGX_AUTOTEST.c - - #include <sys/types.h> - #include <sys/time.h> -@@ -33,15 +36,16 @@ - END - - --ngx_test="$CC $CC_TEST_FLAGS $CC_AUX_FLAGS \ -- -o $NGX_AUTOTEST $NGX_AUTOTEST.c $NGX_LD_OPT $ngx_feature_libs" -+ ngx_test="$CC $CC_TEST_FLAGS $CC_AUX_FLAGS \ -+ -o $NGX_AUTOTEST $NGX_AUTOTEST.c $NGX_LD_OPT $ngx_feature_libs" - --eval "$ngx_test >> $NGX_AUTOCONF_ERR 2>&1" -+ eval "$ngx_test >> $NGX_AUTOCONF_ERR 2>&1" - - --if [ -x $NGX_AUTOTEST ]; then -- ngx_size=`$NGX_AUTOTEST` -- echo " $ngx_size bytes" -+ if [ -x $NGX_AUTOTEST ]; then -+ ngx_size=`$NGX_AUTOTEST` -+ echo " $ngx_size bytes" -+ fi - fi - - -diff -uraN nginx-1.0.11.orig/auto/unix nginx-1.0.11/auto/unix ---- nginx-1.0.11.orig/auto/unix 2011-12-14 07:34:16.000000000 -0600 -+++ nginx-1.0.11/auto/unix 2011-12-27 13:56:42.327370060 -0600 -@@ -393,13 +393,13 @@ - - # C types - --ngx_type="int"; . auto/types/sizeof -+ngx_type="int"; ngx_param="INT"; . auto/types/sizeof - --ngx_type="long"; . auto/types/sizeof -+ngx_type="long"; ngx_param="LONG"; . auto/types/sizeof - --ngx_type="long long"; . auto/types/sizeof -+ngx_type="long long"; ngx_param="LONG_LONG"; . auto/types/sizeof - --ngx_type="void *"; . auto/types/sizeof; ngx_ptr_size=$ngx_size -+ngx_type="void *"; ngx_param="PTR_SIZE"; . auto/types/sizeof; ngx_ptr_size=$ngx_size - ngx_param=NGX_PTR_SIZE; ngx_value=$ngx_size; . auto/types/value - - -@@ -416,7 +416,7 @@ - - ngx_type="uint64_t"; ngx_types="u_int64_t"; . auto/types/typedef - --ngx_type="sig_atomic_t"; ngx_types="int"; . auto/types/typedef -+ngx_type="sig_atomic_t"; ngx_param="SIG_ATOMIC_T"; ngx_types="int"; . auto/types/typedef - . auto/types/sizeof - ngx_param=NGX_SIG_ATOMIC_T_SIZE; ngx_value=$ngx_size; . auto/types/value - -@@ -432,15 +432,15 @@ - - . auto/endianess - --ngx_type="size_t"; . auto/types/sizeof -+ngx_type="size_t"; ngx_param="SIZE_T"; . auto/types/sizeof - ngx_param=NGX_MAX_SIZE_T_VALUE; ngx_value=$ngx_max_value; . auto/types/value - ngx_param=NGX_SIZE_T_LEN; ngx_value=$ngx_max_len; . auto/types/value - --ngx_type="off_t"; . auto/types/sizeof -+ngx_type="off_t"; ngx_param="OFF_T"; . auto/types/sizeof - ngx_param=NGX_MAX_OFF_T_VALUE; ngx_value=$ngx_max_value; . auto/types/value - ngx_param=NGX_OFF_T_LEN; ngx_value=$ngx_max_len; . auto/types/value - --ngx_type="time_t"; . auto/types/sizeof -+ngx_type="time_t"; ngx_param="TIME_T"; . auto/types/sizeof - ngx_param=NGX_TIME_T_SIZE; ngx_value=$ngx_size; . auto/types/value - ngx_param=NGX_TIME_T_LEN; ngx_value=$ngx_max_len; . auto/types/value -
meta-webserver/recipes-httpd/nginx/nginx_1.9.14.bb deleted +0 -12
@@ -1,12 +0,0 @@ -require nginx.inc - -# 1.9.x is the current mainline branches containing all new features -# 1.8.x branch is the current stable branch, the recommended default -DEFAULT_PREFERENCE = "-1" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=0bb58ed0dfd4f5dbece3b52aba79f023" - -SRC_URI[md5sum] = "a25818039f34b5d54b017d44c76321c4" -SRC_URI[sha256sum] = "2b4893076d28e6b4384bba8c4fdebfca6de6f8f68ec48a1ca94b9b855ff457d2" - -DISABLE_STATIC = ""
meta-webserver/recipes-httpd/nginx/nginx_1.9.15.bb new file +10 -0
@@ -0,0 +1,10 @@ +require nginx.inc + +# 1.10.x branch is the current stable branch, the recommended default +# 1.9.x is the current mainline branches containing all new features +DEFAULT_PREFERENCE = "-1" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=0bb58ed0dfd4f5dbece3b52aba79f023" + +SRC_URI[md5sum] = "13cd38e9da3789035750dd45882c4a26" +SRC_URI[sha256sum] = "cc89b277cc03f403c0b746d60aa5943cdecf59ae48278f8cb7e2df0cbdb6dac3"
Signature · 1 line
1.9.1