haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-05-05 14:38:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

nginx: update patch

Browse Source
This commit is contained in:
François Revol
2014-08-02 16:05:19 +02:00
parent b4d0b49f4f
commit 3f3180b16d
1 changed files with 87 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
www-servers/nginx/patches/nginx-1.7.4_hg.diff
View File

@@ -1,6 +1,55 @@
diff -r 4d092aa2f463 auto/os/conf diff -r f87afb46ccd2 auto/install
--- a/auto/os/conf lun. juil. 28 12:27:57 2014 -0700 --- a/auto/install ven. août 01 20:04:14 2014 +0900
+++ b/auto/os/conf mer. juil. 30 15:59:06 2014 +0200 +++ b/auto/install sam. août 02 15:53:55 2014 +0200
@@ -147,8 +147,8 @@
test -d '\$(DESTDIR)`dirname "$NGX_HTTP_LOG_PATH"`' || \
mkdir -p '\$(DESTDIR)`dirname "$NGX_HTTP_LOG_PATH"`'
- test -d '\$(DESTDIR)$NGX_PREFIX/html' \
- || cp -R $NGX_HTML '\$(DESTDIR)$NGX_PREFIX'
+ test -d '\$(DESTDIR)$NGX_DOC_PREFIX/html' \
+ || cp -R $NGX_HTML '\$(DESTDIR)$NGX_DOC_PREFIX'
END
diff -r f87afb46ccd2 auto/options
--- a/auto/options ven. août 01 20:04:14 2014 +0900
+++ b/auto/options sam. août 02 15:53:55 2014 +0200
@@ -12,6 +12,7 @@
NGX_ERROR_LOG_PATH=
NGX_PID_PATH=
NGX_LOCK_PATH=
+NGX_DOC_PREFIX=
NGX_USER=
NGX_GROUP=
NGX_BUILD=
@@ -172,6 +173,7 @@
--prefix=*) NGX_PREFIX="$value" ;;
--sbin-path=*) NGX_SBIN_PATH="$value" ;;
--conf-path=*) NGX_CONF_PATH="$value" ;;
+ --doc-prefix=*) NGX_DOC_PREFIX="$value" ;;
--error-log-path=*) NGX_ERROR_LOG_PATH="$value";;
--pid-path=*) NGX_PID_PATH="$value" ;;
--lock-path=*) NGX_LOCK_PATH="$value" ;;
@@ -336,6 +338,7 @@
--prefix=PATH set installation prefix
--sbin-path=PATH set nginx binary pathname
--conf-path=PATH set nginx.conf pathname
+ --doc-prefix=PATH set documentation
--error-log-path=PATH set error log pathname
--pid-path=PATH set nginx.pid pathname
--lock-path=PATH set nginx.lock pathname
@@ -498,6 +501,7 @@
NGX_CONF_PATH=${NGX_CONF_PATH:-conf/nginx.conf}
NGX_CONF_PREFIX=`dirname $NGX_CONF_PATH`
+NGX_DOC_PREFIX${NGX_DOC_PREFIX:-$NGX_PREFIX}
NGX_PID_PATH=${NGX_PID_PATH:-logs/nginx.pid}
NGX_LOCK_PATH=${NGX_LOCK_PATH:-logs/nginx.lock}
diff -r f87afb46ccd2 auto/os/conf
--- a/auto/os/conf ven. août 01 20:04:14 2014 +0900
+++ b/auto/os/conf sam. août 02 15:53:55 2014 +0200
@@ -60,6 +60,24 @@ @@ -60,6 +60,24 @@
CORE_SRCS="$UNIX_SRCS" CORE_SRCS="$UNIX_SRCS"
;; ;;
@@ -13,14 +62,14 @@ diff -r 4d092aa2f463 auto/os/conf
+ CORE_SRCS="$UNIX_SRCS $HAIKU_SRCS" + CORE_SRCS="$UNIX_SRCS $HAIKU_SRCS"
+ CORE_LIBS="$CORE_LIBS -lnetwork" + CORE_LIBS="$CORE_LIBS -lnetwork"
+ NGX_PREFIX="${NGX_PREFIX:-`finddir B_SYSTEM_NONPACKAGED_DIRECTORY`}" + NGX_PREFIX="${NGX_PREFIX:-`finddir B_SYSTEM_NONPACKAGED_DIRECTORY`}"
+ NGX_SBIN_PATH="${NGX_SBIN_PATH:-`finddir B_SYSTEM_NONPACKAGED_BIN_DIRECTORY`/nginx}" + NGX_SBIN_PATH="${NGX_SBIN_PATH:-$NGX_PREFIX/bin/nginx}"
+ # XXX: move those to auto/options? + # XXX: move those to auto/options?
+ NGX_CONF_PREFIX="`finddir B_SYSTEM_SETTINGS_DIRECTORY`" + #NGX_CONF_PREFIX="`finddir B_SYSTEM_SETTINGS_DIRECTORY`/nginx"
+ NGX_CONF_PATH="$NGX_CONF_PREFIX/nginx.conf" + #NGX_CONF_PATH="$NGX_CONF_PREFIX/nginx.conf"
+ NGX_PID_PATH="`finddir B_COMMON_VAR_DIRECTORY`/nginx.pid" + #NGX_PID_PATH="`finddir B_COMMON_VAR_DIRECTORY`/nginx.pid"
+ NGX_LOCK_PATH="`finddir B_COMMON_VAR_DIRECTORY`/nginx.lock" + #NGX_LOCK_PATH="`finddir B_COMMON_VAR_DIRECTORY`/nginx.lock"
+ NGX_ERROR_LOG_PATH="`finddir B_SYSTEM_LOG_DIRECTORY`/error.log" + #NGX_ERROR_LOG_PATH="`finddir B_SYSTEM_LOG_DIRECTORY`/error.log"
+ NGX_HTTP_LOG_PATH="`finddir B_SYSTEM_LOG_DIRECTORY`/access.log" + #NGX_HTTP_LOG_PATH="`finddir B_SYSTEM_LOG_DIRECTORY`/access.log"
+ ;; + ;;
+ +
*) *)
@@ -35,9 +84,9 @@ diff -r 4d092aa2f463 auto/os/conf
have=NGX_HAVE_NONALIGNED . auto/have have=NGX_HAVE_NONALIGNED . auto/have
NGX_MACH_CACHE_LINE=32 NGX_MACH_CACHE_LINE=32
;; ;;
diff -r 4d092aa2f463 auto/sources diff -r f87afb46ccd2 auto/sources
--- a/auto/sources lun. juil. 28 12:27:57 2014 -0700 --- a/auto/sources ven. août 01 20:04:14 2014 +0900
+++ b/auto/sources mer. juil. 30 15:59:06 2014 +0200 +++ b/auto/sources sam. août 02 15:53:55 2014 +0200
@@ -217,6 +217,9 @@ @@ -217,6 +217,9 @@
DARWIN_SENDFILE_SRCS=src/os/unix/ngx_darwin_sendfile_chain.c DARWIN_SENDFILE_SRCS=src/os/unix/ngx_darwin_sendfile_chain.c
@@ -48,9 +97,20 @@ diff -r 4d092aa2f463 auto/sources
WIN32_INCS="$CORE_INCS $EVENT_INCS src/os/win32" WIN32_INCS="$CORE_INCS $EVENT_INCS src/os/win32"
WIN32_DEPS="$CORE_DEPS $EVENT_DEPS \ WIN32_DEPS="$CORE_DEPS $EVENT_DEPS \
diff -r 4d092aa2f463 auto/unix diff -r f87afb46ccd2 auto/summary
--- a/auto/unix lun. juil. 28 12:27:57 2014 -0700 --- a/auto/summary ven. août 01 20:04:14 2014 +0900
+++ b/auto/unix mer. juil. 30 15:59:06 2014 +0200 +++ b/auto/summary sam. août 02 15:53:55 2014 +0200
@@ -83,6 +83,7 @@
nginx binary file: "$NGX_SBIN_PATH"
nginx configuration prefix: "$NGX_CONF_PREFIX"
nginx configuration file: "$NGX_CONF_PATH"
+ nginx documentation prefix: "$NGX_DOC_PREFIX"
nginx pid file: "$NGX_PID_PATH"
END
diff -r f87afb46ccd2 auto/unix
--- a/auto/unix ven. août 01 20:04:14 2014 +0900
+++ b/auto/unix sam. août 02 15:53:55 2014 +0200
@@ -276,6 +276,18 @@ @@ -276,6 +276,18 @@
fi fi
@@ -70,9 +130,9 @@ diff -r 4d092aa2f463 auto/unix
ngx_feature="sched_yield()" ngx_feature="sched_yield()"
ngx_feature_name="NGX_HAVE_SCHED_YIELD" ngx_feature_name="NGX_HAVE_SCHED_YIELD"
ngx_feature_run=no ngx_feature_run=no
diff -r 4d092aa2f463 src/os/unix/ngx_errno.c diff -r f87afb46ccd2 src/os/unix/ngx_errno.c
--- a/src/os/unix/ngx_errno.c lun. juil. 28 12:27:57 2014 -0700 --- a/src/os/unix/ngx_errno.c ven. août 01 20:04:14 2014 +0900
+++ b/src/os/unix/ngx_errno.c mer. juil. 30 15:59:06 2014 +0200 +++ b/src/os/unix/ngx_errno.c sam. août 02 15:53:55 2014 +0200
@@ -9,6 +9,7 @@ @@ -9,6 +9,7 @@
#include <ngx_core.h> #include <ngx_core.h>
@@ -87,9 +147,9 @@ diff -r 4d092aa2f463 src/os/unix/ngx_errno.c
} }
+ +
+#endif +#endif
diff -r 4d092aa2f463 src/os/unix/ngx_haiku_errno.c diff -r f87afb46ccd2 src/os/unix/ngx_haiku_errno.c
--- /dev/null jeu. janv. 01 00:00:00 1970 +0000 --- /dev/null jeu. janv. 01 00:00:00 1970 +0000
+++ b/src/os/unix/ngx_haiku_errno.c mer. juil. 30 15:59:06 2014 +0200 +++ b/src/os/unix/ngx_haiku_errno.c sam. août 02 15:53:55 2014 +0200
@@ -0,0 +1,158 @@ @@ -0,0 +1,158 @@
+ +
+/* +/*
@@ -249,9 +309,9 @@ diff -r 4d092aa2f463 src/os/unix/ngx_haiku_errno.c
+ +
+ return NGX_ERROR; + return NGX_ERROR;
+} +}
diff -r 4d092aa2f463 src/os/unix/ngx_process.c diff -r f87afb46ccd2 src/os/unix/ngx_process.c
--- a/src/os/unix/ngx_process.c lun. juil. 28 12:27:57 2014 -0700 --- a/src/os/unix/ngx_process.c ven. août 01 20:04:14 2014 +0900
+++ b/src/os/unix/ngx_process.c mer. juil. 30 15:59:06 2014 +0200 +++ b/src/os/unix/ngx_process.c sam. août 02 15:53:55 2014 +0200
@@ -71,7 +71,9 @@ @@ -71,7 +71,9 @@
{ SIGINT, "SIGINT", "", ngx_signal_handler }, { SIGINT, "SIGINT", "", ngx_signal_handler },
@@ -308,9 +368,9 @@ diff -r 4d092aa2f463 src/os/unix/ngx_process.c
action = ", ignoring"; action = ", ignoring";
break; break;
} }
diff -r 4d092aa2f463 src/os/unix/ngx_process_cycle.c diff -r f87afb46ccd2 src/os/unix/ngx_process_cycle.c
--- a/src/os/unix/ngx_process_cycle.c lun. juil. 28 12:27:57 2014 -0700 --- a/src/os/unix/ngx_process_cycle.c ven. août 01 20:04:14 2014 +0900
+++ b/src/os/unix/ngx_process_cycle.c mer. juil. 30 15:59:06 2014 +0200 +++ b/src/os/unix/ngx_process_cycle.c sam. août 02 15:53:55 2014 +0200
@@ -97,7 +97,9 @@ @@ -97,7 +97,9 @@
sigemptyset(&set); sigemptyset(&set);
sigaddset(&set, SIGCHLD); sigaddset(&set, SIGCHLD);