haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 12:10:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

nginx: bump version

Browse Source
This commit is contained in:
Sergei Reznikov
2019-07-24 02:13:39 +03:00
parent af2ce5bbaf
commit b33911a641
3 changed files with 99 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
www-servers/nginx/nginx-1.7.4_hg.recipe → www-servers/nginx/nginx-1.17.2.recipe
View File

@@ -5,18 +5,19 @@ For a long time, it has been running on many heavily loaded Russian sites \
including Yandex, Mail.Ru, VK, and Rambler. According to Netcraft, nginx \
served or proxied 21.89% busiest sites in June 2015."
HOMEPAGE="http://nginx.org/"
COPYRIGHT="2002-2014 Igor Sysoev
2011-2014 Nginx, Inc."
COPYRIGHT="2002-2019 Igor Sysoev
2011-2019 Nginx, Inc."
# "it's complicated", cf. http://packages.gentoo.org/package/www-servers/nginx
LICENSE="BSD (2-clause)"
REVISION="1"
SOURCE_URI="hg+http://hg.nginx.org/nginx#f87afb46ccd2"
PATCHES="nginx-1.7.4_hg.diff"
SOURCE_URI="https://nginx.org/download/nginx-$portVersion.tar.gz"
CHECKSUM_SHA256="5e333687464e1d6dfb86fc22d653b99a6798dda40093b33186eeeec5a97e69ec"
PATCHES="nginx-$portVersion.patchset"
ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64"
GLOBAL_WRITABLE_FILES="
settings/nginx directory
settings/nginx directory keep-old
"
#FIXME: on ./auto/configure:
@@ -41,8 +42,8 @@ BUILD_REQUIRES="
BUILD_PREREQUIRES="
cmd:awk
cmd:find
cmd:gcc${secondaryArchSuffix}
cmd:ld${secondaryArchSuffix}
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:make
cmd:ranlib
cmd:sed
@@ -50,7 +51,7 @@ BUILD_PREREQUIRES="
BUILD()
{
./auto/configure --prefix=$prefix \
./configure --prefix=$prefix \
--sbin-path=$binDir/nginx \
--doc-prefix=$docDir \
--conf-path=$settingsDir/nginx/nginx.conf \

147
www-servers/nginx/patches/nginx-1.7.4_hg.diff → www-servers/nginx/patches/nginx-1.17.2.patchset
View File

@@ -1,21 +1,42 @@
diff -r f87afb46ccd2 auto/install
--- a/auto/install ven. août 01 20:04:14 2014 +0900
+++ 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"`'
From 0d0bb4ae9552f7a9a2c87a27e910b3ad1a4a92bc Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Wed, 24 Jul 2019 01:43:25 +0300
Subject: Haiku fixes
diff --git a/auto/cc/gcc b/auto/cc/gcc
index a5c5c18..ed07ec3 100644
--- a/auto/cc/gcc
+++ b/auto/cc/gcc
@@ -140,7 +140,7 @@ fi
# -W requires at least -O
CFLAGS="$CFLAGS ${NGX_GCC_OPT:--O} -W"
- test -d '\$(DESTDIR)$NGX_PREFIX/html' \
-CFLAGS="$CFLAGS -Wall -Wpointer-arith"
+CFLAGS="$CFLAGS -Wall -Wpointer-arith -Wno-unused-but-set-variable"
#CFLAGS="$CFLAGS -Wconversion"
#CFLAGS="$CFLAGS -Winline"
#CFLAGS="$CFLAGS -Wmissing-prototypes"
diff --git a/auto/install b/auto/install
index d884487..fb487d7 100644
--- a/auto/install
+++ b/auto/install
@@ -154,8 +154,8 @@ install: build $NGX_INSTALL_PERL_MODULES
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' \
+ 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 @@
diff --git a/auto/options b/auto/options
index 521c976..b695ba6 100644
--- a/auto/options
+++ b/auto/options
@@ -13,6 +13,7 @@ NGX_CONF_PATH=
NGX_ERROR_LOG_PATH=
NGX_PID_PATH=
NGX_LOCK_PATH=
@@ -23,38 +44,39 @@ diff -r f87afb46ccd2 auto/options
NGX_USER=
NGX_GROUP=
NGX_BUILD=
@@ -172,6 +173,7 @@
--prefix=*) NGX_PREFIX="$value" ;;
@@ -187,6 +188,7 @@ do
--sbin-path=*) NGX_SBIN_PATH="$value" ;;
--modules-path=*) NGX_MODULES_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
@@ -416,6 +418,7 @@ cat << END
--sbin-path=PATH set nginx binary pathname
--modules-path=PATH set modules path
--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 @@
@@ -598,6 +601,7 @@ NGX_SBIN_PATH=${NGX_SBIN_PATH:-sbin/nginx}
NGX_MODULES_PATH=${NGX_MODULES_PATH:-modules}
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 @@
CORE_SRCS="$UNIX_SRCS"
diff --git a/auto/os/conf b/auto/os/conf
index 7c6cb69..d770822 100644
--- a/auto/os/conf
+++ b/auto/os/conf
@@ -77,6 +77,24 @@ case "$NGX_PLATFORM" in
CC_AUX_FLAGS="$CC_AUX_FLAGS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64"
;;
+ Haiku:*)
+ Haiku*)
+ # Haiku
+ have=NGX_HAIKU . auto/have_headers
+ CORE_INCS="$UNIX_INCS"
@@ -75,7 +97,7 @@ diff -r f87afb46ccd2 auto/os/conf
*)
CORE_INCS="$UNIX_INCS"
CORE_DEPS="$UNIX_DEPS $POSIX_DEPS"
@@ -71,7 +89,7 @@
@@ -88,7 +106,7 @@ esac
case "$NGX_MACHINE" in
@@ -84,10 +106,11 @@ diff -r f87afb46ccd2 auto/os/conf
have=NGX_HAVE_NONALIGNED . auto/have
NGX_MACH_CACHE_LINE=32
;;
diff -r f87afb46ccd2 auto/sources
--- a/auto/sources ven. août 01 20:04:14 2014 +0900
+++ b/auto/sources sam. août 02 15:53:55 2014 +0200
@@ -217,6 +217,9 @@
diff --git a/auto/sources b/auto/sources
index 3dad111..eaecfbe 100644
--- a/auto/sources
+++ b/auto/sources
@@ -209,6 +209,9 @@ DARWIN_SRCS=src/os/unix/ngx_darwin_init.c
DARWIN_SENDFILE_SRCS=src/os/unix/ngx_darwin_sendfile_chain.c
@@ -97,21 +120,23 @@ diff -r f87afb46ccd2 auto/sources
WIN32_INCS="$CORE_INCS $EVENT_INCS src/os/win32"
WIN32_DEPS="$CORE_DEPS $EVENT_DEPS \
diff -r f87afb46ccd2 auto/summary
--- a/auto/summary ven. août 01 20:04:14 2014 +0900
+++ b/auto/summary sam. août 02 15:53:55 2014 +0200
@@ -83,6 +83,7 @@
nginx binary file: "$NGX_SBIN_PATH"
diff --git a/auto/summary b/auto/summary
index 9aa776e..c02bdf0 100644
--- a/auto/summary
+++ b/auto/summary
@@ -49,6 +49,7 @@ cat << END
nginx modules path: "$NGX_MODULES_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 @@
diff --git a/auto/unix b/auto/unix
index 43d3b25..5636f61 100644
--- a/auto/unix
+++ b/auto/unix
@@ -278,6 +278,18 @@ if [ $ngx_found = no ]; then
fi
@@ -130,9 +155,10 @@ diff -r f87afb46ccd2 auto/unix
ngx_feature="sched_yield()"
ngx_feature_name="NGX_HAVE_SCHED_YIELD"
ngx_feature_run=no
diff -r f87afb46ccd2 src/os/unix/ngx_errno.c
--- a/src/os/unix/ngx_errno.c ven. août 01 20:04:14 2014 +0900
+++ b/src/os/unix/ngx_errno.c sam. août 02 15:53:55 2014 +0200
diff --git a/src/os/unix/ngx_errno.c b/src/os/unix/ngx_errno.c
index e787b23..b3cc343 100644
--- a/src/os/unix/ngx_errno.c
+++ b/src/os/unix/ngx_errno.c
@@ -9,6 +9,7 @@
#include <ngx_core.h>
@@ -141,15 +167,17 @@ diff -r f87afb46ccd2 src/os/unix/ngx_errno.c
/*
* The strerror() messages are copied because:
*
@@ -85,3 +86,5 @@
@@ -85,3 +86,5 @@ failed:
return NGX_ERROR;
}
+
+#endif
diff -r f87afb46ccd2 src/os/unix/ngx_haiku_errno.c
--- /dev/null jeu. janv. 01 00:00:00 1970 +0000
+++ b/src/os/unix/ngx_haiku_errno.c sam. août 02 15:53:55 2014 +0200
diff --git a/src/os/unix/ngx_haiku_errno.c b/src/os/unix/ngx_haiku_errno.c
new file mode 100644
index 0000000..05d793c
--- /dev/null
+++ b/src/os/unix/ngx_haiku_errno.c
@@ -0,0 +1,158 @@
+
+/*
@@ -309,10 +337,11 @@ diff -r f87afb46ccd2 src/os/unix/ngx_haiku_errno.c
+
+ return NGX_ERROR;
+}
diff -r f87afb46ccd2 src/os/unix/ngx_process.c
--- a/src/os/unix/ngx_process.c ven. août 01 20:04:14 2014 +0900
+++ b/src/os/unix/ngx_process.c sam. août 02 15:53:55 2014 +0200
@@ -71,7 +71,9 @@
diff --git a/src/os/unix/ngx_process.c b/src/os/unix/ngx_process.c
index 1568023..e7037f7 100644
--- a/src/os/unix/ngx_process.c
+++ b/src/os/unix/ngx_process.c
@@ -71,7 +71,9 @@ ngx_signal_t signals[] = {
{ SIGINT, "SIGINT", "", ngx_signal_handler },
@@ -322,7 +351,7 @@ diff -r f87afb46ccd2 src/os/unix/ngx_process.c
{ SIGCHLD, "SIGCHLD", "", ngx_signal_handler },
@@ -143,19 +145,23 @@
@@ -143,19 +145,23 @@ ngx_spawn_process(ngx_cycle_t *cycle, ngx_spawn_proc_pt proc, void *data,
}
on = 1;
@@ -346,7 +375,7 @@ diff -r f87afb46ccd2 src/os/unix/ngx_process.c
if (fcntl(ngx_processes[s].channel[0], F_SETFD, FD_CLOEXEC) == -1) {
ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
@@ -385,9 +391,11 @@
@@ -394,9 +400,11 @@ ngx_signal_handler(int signo, siginfo_t *siginfo, void *ucontext)
ngx_sigalrm = 1;
break;
@@ -358,7 +387,7 @@ diff -r f87afb46ccd2 src/os/unix/ngx_process.c
case SIGCHLD:
ngx_reap = 1;
@@ -423,7 +431,9 @@
@@ -433,7 +441,9 @@ ngx_signal_handler(int signo, siginfo_t *siginfo, void *ucontext)
case ngx_signal_value(NGX_RECONFIGURE_SIGNAL):
case ngx_signal_value(NGX_CHANGEBIN_SIGNAL):
@@ -368,10 +397,11 @@ diff -r f87afb46ccd2 src/os/unix/ngx_process.c
action = ", ignoring";
break;
}
diff -r f87afb46ccd2 src/os/unix/ngx_process_cycle.c
--- 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 sam. août 02 15:53:55 2014 +0200
@@ -97,7 +97,9 @@
diff --git a/src/os/unix/ngx_process_cycle.c b/src/os/unix/ngx_process_cycle.c
index 5817a2c..3a9e65b 100644
--- a/src/os/unix/ngx_process_cycle.c
+++ b/src/os/unix/ngx_process_cycle.c
@@ -88,7 +88,9 @@ ngx_master_process_cycle(ngx_cycle_t *cycle)
sigemptyset(&set);
sigaddset(&set, SIGCHLD);
sigaddset(&set, SIGALRM);
@@ -381,7 +411,7 @@ diff -r f87afb46ccd2 src/os/unix/ngx_process_cycle.c
sigaddset(&set, SIGINT);
sigaddset(&set, ngx_signal_value(NGX_RECONFIGURE_SIGNAL));
sigaddset(&set, ngx_signal_value(NGX_REOPEN_SIGNAL));
@@ -862,12 +864,14 @@
@@ -796,12 +798,14 @@ ngx_worker_process_init(ngx_cycle_t *cycle, ngx_int_t worker)
ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
@@ -396,3 +426,6 @@ diff -r f87afb46ccd2 src/os/unix/ngx_process_cycle.c
if (ccf->rlimit_nofile != NGX_CONF_UNSET) {
rlmt.rlim_cur = (rlim_t) ccf->rlimit_nofile;
--
2.21.0

66
www-servers/nginx/patches/nginx-1.3.0-svn.diff
View File

@@ -1,66 +0,0 @@
Index: src/os/unix/ngx_errno.c
===================================================================
--- src/os/unix/ngx_errno.c (revision 4615)
+++ src/os/unix/ngx_errno.c (working copy)
@@ -9,6 +9,8 @@
#include <ngx_core.h>
+#if (NGX_SYS_NERR)
+
/*
* The strerror() messages are copied because:
*
@@ -85,3 +87,5 @@
return NGX_ERROR;
}
+
+#endif /* NGX_SYS_NERR */
Index: auto/os/conf
===================================================================
--- auto/os/conf (revision 4615)
+++ auto/os/conf (working copy)
@@ -59,6 +59,16 @@
CORE_SRCS="$UNIX_SRCS"
;;
+ Haiku:*)
+ # Haiku
+ have=NGX_HAIKU . auto/have_headers
+ CORE_INCS="$UNIX_INCS"
+ CORE_DEPS="$UNIX_DEPS $POSIX_DEPS"
+ CORE_SRCS="$UNIX_SRCS"
+ NGX_PREFIX="${NGX_PREFIX:-`finddir B_COMMON_DIRECTORY`}"
+ NGX_SBIN_PATH="${NGX_SBIN_PATH:-`finddir B_COMMON_BIN_DIRECTORY`/nginx}"
+ ;;
+
*)
CORE_INCS="$UNIX_INCS"
CORE_DEPS="$UNIX_DEPS $POSIX_DEPS"
@@ -70,7 +80,7 @@
case "$NGX_MACHINE" in
- i386 | i686 | i86pc)
+ i386 | i686 | i86pc | BePC)
have=NGX_HAVE_NONALIGNED . auto/have
NGX_MACH_CACHE_LINE=32
;;
Index: auto/unix
===================================================================
--- auto/unix (revision 4615)
+++ auto/unix (working copy)
@@ -555,9 +555,10 @@
fi
-if [ $ngx_found = no ]; then
+if [ $ngx_found = no -a "$NGX_SYSTEM" != "Haiku" ]; then
- # Solaris has no sys_nerr
+ # Solaris has no sys_nerr, so test for the maximum
+ # Haiku neither but has negative error codes, so skip this
ngx_feature='maximum errno'
ngx_feature_name=NGX_SYS_NERR
ngx_feature_run=value