From 782f056051ae41f214b099ef2fbf4466a5d110b0 Mon Sep 17 00:00:00 2001 From: Christian Marangi Date: Thu, 3 Oct 2024 17:06:32 +0200 Subject: [PATCH] nginx: disable additional entry in feature test Disable additional entry in feature test probably added in new version of Nginx and never notice. Also declare "no" instead of empty value for cc test. While at it also refresh the patch. Signed-off-by: Christian Marangi --- net/nginx/patches/nginx/101-feature_test_fix.patch | 11 ++++++++++- .../nginx/300-fix-deprecated-openssl-3_0.patch | 1 - 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/net/nginx/patches/nginx/101-feature_test_fix.patch b/net/nginx/patches/nginx/101-feature_test_fix.patch index e4d9a71831..bdef84b3bb 100644 --- a/net/nginx/patches/nginx/101-feature_test_fix.patch +++ b/net/nginx/patches/nginx/101-feature_test_fix.patch @@ -5,7 +5,7 @@ ngx_feature="C compiler" ngx_feature_name= - ngx_feature_run=yes -+ ngx_feature_run= ++ ngx_feature_run=no ngx_feature_incs= ngx_feature_path= ngx_feature_libs= @@ -72,6 +72,15 @@ ngx_feature="prctl(PR_SET_DUMPABLE)" ngx_feature_name="NGX_HAVE_PR_SET_DUMPABLE" -ngx_feature_run=yes ++ngx_feature_run=no + ngx_feature_incs="#include " + ngx_feature_path= + ngx_feature_libs= +@@ -186,7 +186,7 @@ ngx_feature_test="if (prctl(PR_SET_DUMPA + + ngx_feature="prctl(PR_SET_KEEPCAPS)" + ngx_feature_name="NGX_HAVE_PR_SET_KEEPCAPS" +-ngx_feature_run=yes +ngx_feature_run=no ngx_feature_incs="#include " ngx_feature_path= diff --git a/net/nginx/patches/nginx/300-fix-deprecated-openssl-3_0.patch b/net/nginx/patches/nginx/300-fix-deprecated-openssl-3_0.patch index 6055df490a..4294ed6879 100644 --- a/net/nginx/patches/nginx/300-fix-deprecated-openssl-3_0.patch +++ b/net/nginx/patches/nginx/300-fix-deprecated-openssl-3_0.patch @@ -9,4 +9,3 @@ && EVP_CipherUpdate(ctx, NULL, &len, NULL, in->len) != 1) { ngx_ssl_error(NGX_LOG_INFO, log, 0, "EVP_CipherUpdate() failed"); - -- 2.30.2