diff options
| author |   Jens Rehsack <rehsack@gmail.com> | 2015-10-14 20:51:38 +0200 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2015-10-23 12:53:23 +0200 |
| commit | c56ad520295692ba883f3d079ba835b252b2e144 (patch) | |
| tree | cb4a66bfd7b9e37a868f7eb3e5ece15e4f654a4c /meta-webserver | |
| parent | 67e0959f332937e70c9766caab6104e13ddd0619 (diff) | |
| download | meta-openembedded-contrib-c56ad520295692ba883f3d079ba835b252b2e144.tar.gz | |
nginx: update to 1.9.5
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-webserver')
| -rw-r--r-- | meta-webserver/recipes-httpd/nginx/files/nginx-cross.patch | 17 | ||||
| -rw-r--r-- | meta-webserver/recipes-httpd/nginx/nginx_1.9.5.bb (renamed from meta-webserver/recipes-httpd/nginx/nginx_1.4.4.bb) | 6 |
2 files changed, 12 insertions, 11 deletions
diff --git a/meta-webserver/recipes-httpd/nginx/files/nginx-cross.patch b/meta-webserver/recipes-httpd/nginx/files/nginx-cross.patch index 5f899a1d84..46792ba067 100644 --- a/meta-webserver/recipes-httpd/nginx/files/nginx-cross.patch +++ b/meta-webserver/recipes-httpd/nginx/files/nginx-cross.patch @@ -122,7 +122,7 @@ diff -uraN nginx-1.0.11.orig/auto/options nginx-1.0.11/auto/options 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 -@@ -11,9 +11,12 @@ +@@ -12,9 +12,12 @@ END @@ -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> -@@ -31,19 +34,20 @@ +@@ -33,20 +36,20 @@ 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" @@ -155,17 +155,18 @@ diff -uraN nginx-1.0.11.orig/auto/types/sizeof nginx-1.0.11/auto/types/sizeof - 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 --rm -f $NGX_AUTOTEST -+ rm -f $NGX_AUTOTEST +-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 diff --git a/meta-webserver/recipes-httpd/nginx/nginx_1.4.4.bb b/meta-webserver/recipes-httpd/nginx/nginx_1.9.5.bb index 27e4749d6d..a251523bc8 100644 --- a/meta-webserver/recipes-httpd/nginx/nginx_1.4.4.bb +++ b/meta-webserver/recipes-httpd/nginx/nginx_1.9.5.bb @@ -6,7 +6,7 @@ concurrency, performance and low memory usage." HOMEPAGE = "http://nginx.org/" LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=917bfdf005ffb6fd025550414ff05a9f" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3845852aedfa8d6d7765f55d06cc3ebd" SECTION = "net" DEPENDS = "libpcre gzip openssl" @@ -19,8 +19,8 @@ SRC_URI = " \ file://nginx-volatile.conf \ file://nginx.service \ " -SRC_URI[md5sum] = "5dfaba1cbeae9087f3949860a02caa9f" -SRC_URI[sha256sum] = "7c989a58e5408c9593da0bebcd0e4ffc3d892d1316ba5042ddb0be5b0b4102b9" +SRC_URI[md5sum] = "2562320f1535e3e31d165e337ae94f21" +SRC_URI[sha256sum] = "48e2787a6b245277e37cb7c5a31b1549a0bbacf288aa4731baacf9eaacdb481b" inherit update-rc.d useradd |