nginx: disable additional entry in feature test
authorChristian Marangi <ansuelsmth@gmail.com>
Thu, 3 Oct 2024 15:06:32 +0000 (17:06 +0200)
committerChristian Marangi <ansuelsmth@gmail.com>
Mon, 21 Oct 2024 15:32:11 +0000 (17:32 +0200)
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 <ansuelsmth@gmail.com>
net/nginx/patches/nginx/101-feature_test_fix.patch
net/nginx/patches/nginx/300-fix-deprecated-openssl-3_0.patch

index e4d9a718316a98a3b17e8607906c4525610c00f7..bdef84b3bbc83520c37caac8d83bdad7cf5194b6 100644 (file)
@@ -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=
  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 <sys/prctl.h>"
+ 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 <sys/prctl.h>"
  ngx_feature_path=
index 6055df490a66c540db032c5027fd6379d548413c..4294ed6879716251afa0d1a9c5c8c5c3282f2d12 100644 (file)
@@ -9,4 +9,3 @@
          && EVP_CipherUpdate(ctx, NULL, &len, NULL, in->len) != 1)
      {
          ngx_ssl_error(NGX_LOG_INFO, log, 0, "EVP_CipherUpdate() failed");
-