From 4018696ee3ca4a5746a8ea89de654907f8625768 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 4 Mar 2016 22:46:49 +0100 Subject: nginx: update to latest, add patches from buildroot --- package/nginx/Makefile | 6 +- package/nginx/patches/patch-auto_cc_conf | 16 ++- package/nginx/patches/patch-auto_feature | 112 +++++++++++++++++++++ package/nginx/patches/patch-auto_install | 8 +- .../nginx/patches/patch-auto_lib_libatomic_conf | 10 ++ package/nginx/patches/patch-auto_os_darwin | 26 +++++ package/nginx/patches/patch-auto_os_linux | 14 +-- package/nginx/patches/patch-auto_types_sizeof | 6 +- package/nginx/patches/patch-auto_unix | 44 ++++++-- 9 files changed, 216 insertions(+), 26 deletions(-) create mode 100644 package/nginx/patches/patch-auto_feature create mode 100644 package/nginx/patches/patch-auto_lib_libatomic_conf create mode 100644 package/nginx/patches/patch-auto_os_darwin (limited to 'package/nginx') diff --git a/package/nginx/Makefile b/package/nginx/Makefile index bc4c08a47..c0393c2c8 100644 --- a/package/nginx/Makefile +++ b/package/nginx/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= nginx -PKG_VERSION:= 1.8.0 +PKG_VERSION:= 1.9.12 PKG_RELEASE:= 1 -PKG_HASH:= 23cca1239990c818d8f6da118320c4979aadf5386deda691b1b7c2c96b9df3d5 +PKG_HASH:= 1af2eb956910ed4b11aaf525a81bc37e135907e7127948f9179f5410337da042 PKG_DESCR:= powerful http reverse proxy and webserver PKG_SECTION:= net/http PKG_BUILDDEP:= pcre zlib @@ -32,6 +32,8 @@ $(eval $(call PKG_template,NGINX,nginx,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPEN CONFIG_STYLE:= minimal TARGET_CFLAGS+= -fPIC +CONFIGURE_ENV+= ngx_force_gcc_have_atomic=yes \ + ngx_force_have_libatomic=no CONFIGURE_ARGS:= --prefix=/srv/www \ --sbin-path=/usr/sbin \ --crossbuild=Linux::$(ADK_TARGET_ARCH) \ diff --git a/package/nginx/patches/patch-auto_cc_conf b/package/nginx/patches/patch-auto_cc_conf index e92ace494..99550ab48 100644 --- a/package/nginx/patches/patch-auto_cc_conf +++ b/package/nginx/patches/patch-auto_cc_conf @@ -1,6 +1,14 @@ ---- nginx-1.7.9.orig/auto/cc/conf 2014-12-23 09:28:38.000000000 -0600 -+++ nginx-1.7.9/auto/cc/conf 2014-12-25 00:19:14.557499365 -0600 -@@ -178,7 +178,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then +--- nginx-1.9.12.orig/auto/cc/conf 2016-02-24 15:53:23.000000000 +0100 ++++ nginx-1.9.12/auto/cc/conf 2016-03-04 19:56:52.000000000 +0100 +@@ -181,6 +181,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then + ngx_feature="gcc builtin atomic operations" + ngx_feature_name=NGX_HAVE_GCC_ATOMIC + ngx_feature_run=yes ++ ngx_feature_run_force_result="$ngx_force_gcc_have_atomic" + ngx_feature_incs= + ngx_feature_path= + ngx_feature_libs= +@@ -200,7 +201,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then else ngx_feature="C99 variadic macros" ngx_feature_name="NGX_HAVE_C99_VARIADIC_MACROS" @@ -9,7 +17,7 @@ ngx_feature_incs="#include #define var(dummy, ...) sprintf(__VA_ARGS__)" ngx_feature_path= -@@ -192,7 +192,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then +@@ -214,7 +215,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then ngx_feature="gcc variadic macros" ngx_feature_name="NGX_HAVE_GCC_VARIADIC_MACROS" diff --git a/package/nginx/patches/patch-auto_feature b/package/nginx/patches/patch-auto_feature new file mode 100644 index 000000000..c0e52cd51 --- /dev/null +++ b/package/nginx/patches/patch-auto_feature @@ -0,0 +1,112 @@ +--- nginx-1.9.12.orig/auto/feature 2016-02-24 15:53:23.000000000 +0100 ++++ nginx-1.9.12/auto/feature 2016-03-04 19:56:44.000000000 +0100 +@@ -52,50 +52,88 @@ if [ -x $NGX_AUTOTEST ]; then + 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 test -n "$ngx_feature_run_force_result" ; then ++ echo " not tested (maybe cross-compiling)" ++ if test -n "$ngx_feature_name" ; then ++ if test "$ngx_feature_run_force_result" = "yes" ; then ++ have=$ngx_have_feature . auto/have ++ fi ++ fi + ngx_found=yes ++ else + +- if test -n "$ngx_feature_name"; then +- have=$ngx_have_feature . auto/have ++ # /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" ++ ngx_found=yes ++ ++ if test -n "$ngx_feature_name"; then ++ have=$ngx_have_feature . auto/have ++ fi ++ ++ else ++ echo " found but is not working" + fi + +- else +- echo " found but is not working" + fi + ;; + + 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 test -n "$ngx_feature_run_force_result" ; then ++ echo " not tested (maybe cross-compiling)" ++ cat << END >> $NGX_AUTO_CONFIG_H ++ ++#ifndef $ngx_feature_name ++#define $ngx_feature_name $ngx_feature_run_force_result ++#endif ++ ++END + ngx_found=yes ++ else + +- cat << END >> $NGX_AUTO_CONFIG_H ++ # /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" ++ ngx_found=yes ++ ++ cat << END >> $NGX_AUTO_CONFIG_H + + #ifndef $ngx_feature_name + #define $ngx_feature_name `$NGX_AUTOTEST` + #endif + + END +- else +- echo " found but is not working" ++ else ++ echo " found but is not working" ++ fi ++ + fi + ;; + + bug) +- # /bin/sh is used to intercept "Killed" or "Abort trap" messages +- if /bin/sh -c $NGX_AUTOTEST >> $NGX_AUTOCONF_ERR 2>&1; then +- echo " not found" +- +- else +- echo " found" ++ if test -n "$ngx_feature_run_force_result" ; then ++ echo " not tested (maybe cross-compiling)" ++ if test -n "$ngx_feature_name"; then ++ if test "$ngx_feature_run_force_result" = "yes" ; then ++ have=$ngx_have_feature . auto/have ++ fi ++ fi + ngx_found=yes ++ else + +- if test -n "$ngx_feature_name"; then +- have=$ngx_have_feature . auto/have ++ # /bin/sh is used to intercept "Killed" or "Abort trap" messages ++ if /bin/sh -c $NGX_AUTOTEST >> $NGX_AUTOCONF_ERR 2>&1; then ++ echo " not found" ++ ++ else ++ echo " found" ++ ngx_found=yes ++ ++ if test -n "$ngx_feature_name"; then ++ have=$ngx_have_feature . auto/have ++ fi + fi ++ + fi + ;; + diff --git a/package/nginx/patches/patch-auto_install b/package/nginx/patches/patch-auto_install index e3d86d817..6c7701de3 100644 --- a/package/nginx/patches/patch-auto_install +++ b/package/nginx/patches/patch-auto_install @@ -1,7 +1,7 @@ ---- nginx-1.2.2.orig/auto/install 2012-01-18 16:07:43.000000000 +0100 -+++ nginx-1.2.2/auto/install 2012-07-16 16:45:40.000000000 +0200 -@@ -100,12 +100,9 @@ install: $NGX_OBJS${ngx_dirsep}nginx${ng - $NGX_INSTALL_PERL_MODULES +--- nginx-1.9.12.orig/auto/install 2016-02-24 15:53:23.000000000 +0100 ++++ nginx-1.9.12/auto/install 2016-03-04 19:55:33.000000000 +0100 +@@ -107,12 +107,9 @@ $NGX_OBJS/nginx.8: $NGX_MAN $NGX_AUTO_CO + install: build $NGX_INSTALL_PERL_MODULES test -d '\$(DESTDIR)$NGX_PREFIX' || mkdir -p '\$(DESTDIR)$NGX_PREFIX' - test -d '\$(DESTDIR)`dirname "$NGX_SBIN_PATH"`' \ diff --git a/package/nginx/patches/patch-auto_lib_libatomic_conf b/package/nginx/patches/patch-auto_lib_libatomic_conf new file mode 100644 index 000000000..46c01bd07 --- /dev/null +++ b/package/nginx/patches/patch-auto_lib_libatomic_conf @@ -0,0 +1,10 @@ +--- nginx-1.9.12.orig/auto/lib/libatomic/conf 2016-02-24 15:53:23.000000000 +0100 ++++ nginx-1.9.12/auto/lib/libatomic/conf 2016-03-04 19:56:52.000000000 +0100 +@@ -15,6 +15,7 @@ else + ngx_feature="atomic_ops library" + ngx_feature_name=NGX_HAVE_LIBATOMIC + ngx_feature_run=yes ++ ngx_feature_run_force_result="$ngx_force_have_libatomic" + ngx_feature_incs="#define AO_REQUIRE_CAS + #include " + ngx_feature_path= diff --git a/package/nginx/patches/patch-auto_os_darwin b/package/nginx/patches/patch-auto_os_darwin new file mode 100644 index 000000000..456c4a7d3 --- /dev/null +++ b/package/nginx/patches/patch-auto_os_darwin @@ -0,0 +1,26 @@ +--- nginx-1.9.12.orig/auto/os/darwin 2016-02-24 15:53:23.000000000 +0100 ++++ nginx-1.9.12/auto/os/darwin 2016-03-04 19:56:52.000000000 +0100 +@@ -30,6 +30,7 @@ NGX_KQUEUE_CHECKED=YES + ngx_feature="kqueue's EVFILT_TIMER" + ngx_feature_name="NGX_HAVE_TIMER_EVENT" + ngx_feature_run=yes ++ngx_feature_run_force_result="$ngx_force_have_timer_event" + ngx_feature_incs="#include + #include " + ngx_feature_path= +@@ -60,6 +61,7 @@ ngx_feature_test="int kq; + ngx_feature="Darwin 64-bit kqueue millisecond timeout bug" + ngx_feature_name=NGX_DARWIN_KEVENT_BUG + ngx_feature_run=bug ++ngx_feature_run_force_result="$ngx_force_kevent_bug" + ngx_feature_incs="#include + #include " + ngx_feature_path= +@@ -90,6 +92,7 @@ CC_AUX_FLAGS="$CC_AUX_FLAGS" + ngx_feature="sendfile()" + ngx_feature_name="NGX_HAVE_SENDFILE" + ngx_feature_run=yes ++ngx_feature_run_force_result="$ngx_force_have_sendfile" + ngx_feature_incs="#include + #include + #include diff --git a/package/nginx/patches/patch-auto_os_linux b/package/nginx/patches/patch-auto_os_linux index 070345162..20ecc70f0 100644 --- a/package/nginx/patches/patch-auto_os_linux +++ b/package/nginx/patches/patch-auto_os_linux @@ -1,6 +1,6 @@ ---- nginx-1.7.9.orig/auto/os/linux 2014-12-23 09:28:38.000000000 -0600 -+++ nginx-1.7.9/auto/os/linux 2014-12-25 00:19:14.581499365 -0600 -@@ -48,7 +48,7 @@ fi +--- nginx-1.9.12.orig/auto/os/linux 2016-02-24 15:53:23.000000000 +0100 ++++ nginx-1.9.12/auto/os/linux 2016-03-04 19:55:33.000000000 +0100 +@@ -36,7 +36,7 @@ fi ngx_feature="epoll" ngx_feature_name="NGX_HAVE_EPOLL" @@ -9,7 +9,7 @@ ngx_feature_incs="#include " ngx_feature_path= ngx_feature_libs= -@@ -105,7 +105,7 @@ ngx_feature_test="int fd; struct stat sb +@@ -93,7 +93,7 @@ ngx_feature_test="int fd; struct stat sb CC_AUX_FLAGS="$cc_aux_flags -D_GNU_SOURCE" ngx_feature="sendfile()" ngx_feature_name="NGX_HAVE_SENDFILE" @@ -18,7 +18,7 @@ ngx_feature_incs="#include #include " ngx_feature_path= -@@ -126,7 +126,7 @@ fi +@@ -114,7 +114,7 @@ fi CC_AUX_FLAGS="$cc_aux_flags -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64" ngx_feature="sendfile64()" ngx_feature_name="NGX_HAVE_SENDFILE64" @@ -27,7 +27,7 @@ ngx_feature_incs="#include #include " ngx_feature_path= -@@ -144,7 +144,7 @@ ngx_include="sys/prctl.h"; . auto/includ +@@ -132,7 +132,7 @@ ngx_include="sys/prctl.h"; . auto/includ ngx_feature="prctl(PR_SET_DUMPABLE)" ngx_feature_name="NGX_HAVE_PR_SET_DUMPABLE" @@ -36,7 +36,7 @@ ngx_feature_incs="#include " ngx_feature_path= ngx_feature_libs= -@@ -165,20 +165,6 @@ ngx_feature_test="cpu_set_t mask; +@@ -153,20 +153,6 @@ ngx_feature_test="cpu_set_t mask; sched_setaffinity(0, sizeof(cpu_set_t), &mask)" . auto/feature diff --git a/package/nginx/patches/patch-auto_types_sizeof b/package/nginx/patches/patch-auto_types_sizeof index 3cd1c0978..838cbd10c 100644 --- a/package/nginx/patches/patch-auto_types_sizeof +++ b/package/nginx/patches/patch-auto_types_sizeof @@ -1,5 +1,5 @@ ---- nginx-1.7.9.orig/auto/types/sizeof 2014-12-23 09:28:38.000000000 -0600 -+++ nginx-1.7.9/auto/types/sizeof 2014-12-25 00:19:43.665499238 -0600 +--- nginx-1.9.12.orig/auto/types/sizeof 2016-02-24 15:53:23.000000000 +0100 ++++ nginx-1.9.12/auto/types/sizeof 2016-03-04 19:55:33.000000000 +0100 @@ -14,7 +14,7 @@ END ngx_size= @@ -65,4 +65,4 @@ - case $ngx_size in 4) - if [ "$ngx_type"="long" ]; then + ngx_max_value=2147483647 diff --git a/package/nginx/patches/patch-auto_unix b/package/nginx/patches/patch-auto_unix index 6cee1a460..bd63345f9 100644 --- a/package/nginx/patches/patch-auto_unix +++ b/package/nginx/patches/patch-auto_unix @@ -1,6 +1,38 @@ ---- nginx-1.7.9.orig/auto/unix 2014-12-23 09:28:38.000000000 -0600 -+++ nginx-1.7.9/auto/unix 2014-12-25 00:19:14.593499364 -0600 -@@ -651,7 +651,7 @@ ngx_feature_test="void *p; p = memalign( +--- nginx-1.9.12.orig/auto/unix 2016-02-24 15:53:23.000000000 +0100 ++++ nginx-1.9.12/auto/unix 2016-03-04 19:56:52.000000000 +0100 +@@ -99,6 +99,7 @@ if test -z "$NGX_KQUEUE_CHECKED"; then + ngx_feature="kqueue's EVFILT_TIMER" + ngx_feature_name="NGX_HAVE_TIMER_EVENT" + ngx_feature_run=yes ++ ngx_feature_run_force_result="$ngx_force_have_timer_event" + ngx_feature_incs="#include + #include " + ngx_feature_path= +@@ -609,6 +610,7 @@ ngx_feature_test="char buf[1]; struct io + ngx_feature="sys_nerr" + ngx_feature_name="NGX_SYS_NERR" + ngx_feature_run=value ++ngx_feature_run_force_result="$ngx_force_sys_nerr" + ngx_feature_incs='#include + #include ' + ngx_feature_path= +@@ -623,6 +625,7 @@ if [ $ngx_found = no ]; then + ngx_feature="_sys_nerr" + ngx_feature_name="NGX_SYS_NERR" + ngx_feature_run=value ++ ngx_feature_run_force_result="$ngx_force_sys_nerr" + ngx_feature_incs='#include + #include ' + ngx_feature_path= +@@ -638,6 +641,7 @@ if [ $ngx_found = no ]; then + ngx_feature='maximum errno' + ngx_feature_name=NGX_SYS_NERR + ngx_feature_run=value ++ ngx_feature_run_force_result="$ngx_force_sys_nerr" + ngx_feature_incs='#include + #include + #include ' +@@ -695,7 +699,7 @@ ngx_feature_test="void *p; p = memalign( ngx_feature="mmap(MAP_ANON|MAP_SHARED)" ngx_feature_name="NGX_HAVE_MAP_ANON" @@ -9,7 +41,7 @@ ngx_feature_incs="#include " ngx_feature_path= ngx_feature_libs= -@@ -664,7 +664,7 @@ ngx_feature_test="void *p; +@@ -708,7 +712,7 @@ ngx_feature_test="void *p; ngx_feature='mmap("/dev/zero", MAP_SHARED)' ngx_feature_name="NGX_HAVE_MAP_DEVZERO" @@ -18,7 +50,7 @@ ngx_feature_incs="#include #include #include " -@@ -679,7 +679,7 @@ ngx_feature_test='void *p; int fd; +@@ -723,7 +727,7 @@ ngx_feature_test='void *p; int fd; ngx_feature="System V shared memory" ngx_feature_name="NGX_HAVE_SYSVSHM" @@ -27,7 +59,7 @@ ngx_feature_incs="#include #include " ngx_feature_path= -@@ -693,7 +693,7 @@ ngx_feature_test="int id; +@@ -737,7 +741,7 @@ ngx_feature_test="int id; ngx_feature="POSIX semaphores" ngx_feature_name="NGX_HAVE_POSIX_SEM" -- cgit v1.2.3