MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-06-24 05:44:17 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add NGINX patches

Browse Source
This commit is contained in:
Wildan M 2025-09-27 02:35:46 +07:00
parent adefb4b361
commit a74c40e1a3
2 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
recipes/net/nginx/recipe.toml
View File

@ -1,4 +1,4 @@
#TODO Compiling, got some C issues on init
#TODO FastCGI not working
[source]
tar = "https://nginx.org/download/nginx-1.28.0.tar.gz"
patches = [

37
recipes/net/nginx/redox.patch
View File

@ -1,7 +1,7 @@
diff --color -ruwN source/auto/feature source-new/auto/feature
diff -ruwN source/auto/feature source-new/auto/feature
--- source/auto/feature 2025-04-23 18:48:54.000000000 +0700
+++ source-new/auto/feature 2025-09-16 02:23:35.565899342 +0700
@@ -53,7 +57,7 @@
+++ source-new/auto/feature 2025-09-16 02:44:58.617532926 +0700
@@ -53,7 +53,7 @@
yes)
# /bin/sh is used to intercept "Killed" or "Abort trap" messages
@ -10,7 +10,7 @@ diff --color -ruwN source/auto/feature source-new/auto/feature
echo " found"
ngx_found=yes
@@ -61,9 +65,9 @@
@@ -61,9 +61,9 @@
have=$ngx_have_feature . auto/have
fi
@ -23,9 +23,9 @@ diff --color -ruwN source/auto/feature source-new/auto/feature
;;
value)
diff --color -ruwN source/auto/types/sizeof source-new/auto/types/sizeof
diff -ruwN source/auto/types/sizeof source-new/auto/types/sizeof
--- source/auto/types/sizeof 2025-04-23 18:48:54.000000000 +0700
+++ source-new/auto/types/sizeof 2025-09-16 02:38:57.979145501 +0700
+++ source-new/auto/types/sizeof 2025-09-16 02:44:58.618532943 +0700
@@ -33,7 +33,7 @@
END
@ -35,9 +35,9 @@ diff --color -ruwN source/auto/types/sizeof source-new/auto/types/sizeof
-o $NGX_AUTOTEST $NGX_AUTOTEST.c $NGX_LD_OPT $ngx_feature_libs"
eval "$ngx_test >> $NGX_AUTOCONF_ERR 2>&1"
diff --color -ruwN source/auto/types/typedef source-new/auto/types/typedef
diff -ruwN source/auto/types/typedef source-new/auto/types/typedef
--- source/auto/types/typedef 2025-04-23 18:48:54.000000000 +0700
+++ source-new/auto/types/typedef 2025-09-16 02:38:54.927091443 +0700
+++ source-new/auto/types/typedef 2025-09-16 02:44:58.618532943 +0700
@@ -34,7 +34,7 @@
END
@ -47,9 +47,9 @@ diff --color -ruwN source/auto/types/typedef source-new/auto/types/typedef
-o $NGX_AUTOTEST $NGX_AUTOTEST.c $NGX_LD_OPT $ngx_feature_libs"
eval "$ngx_test >> $NGX_AUTOCONF_ERR 2>&1"
diff --color -ruwN source/src/os/unix/ngx_process.c source-new/src/os/unix/ngx_process.c
diff -ruwN source/src/os/unix/ngx_process.c source-new/src/os/unix/ngx_process.c
--- source/src/os/unix/ngx_process.c 2025-04-23 18:48:54.000000000 +0700
+++ source-new/src/os/unix/ngx_process.c 2025-09-16 02:40:44.363029726 +0700
+++ source-new/src/os/unix/ngx_process.c 2025-09-16 02:44:58.618532943 +0700
@@ -143,6 +143,7 @@
}
@ -66,3 +66,20 @@ diff --color -ruwN source/src/os/unix/ngx_process.c source-new/src/os/unix/ngx_p
if (fcntl(ngx_processes[s].channel[0], F_SETFD, FD_CLOEXEC) == -1) {
ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
diff -ruwN source/src/os/unix/ngx_process_cycle.c source-new/src/os/unix/ngx_process_cycle.c
--- source/src/os/unix/ngx_process_cycle.c 2025-04-23 18:48:54.000000000 +0700
+++ source-new/src/os/unix/ngx_process_cycle.c 2025-09-27 02:17:21.509383985 +0700
@@ -804,11 +804,13 @@
exit(2);
}
+ /*
if (initgroups(ccf->username, ccf->group) == -1) {
ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno,
"initgroups(%s, %d) failed",
ccf->username, ccf->group);
}
+ */
#if (NGX_HAVE_PR_SET_KEEPCAPS && NGX_HAVE_CAPABILITIES)
if (ccf->transparent && ccf->user) {