nginx: update to 1.30.2

Large version jump from 1.26.3 to 1.30.2
(upstream stable).
changelogs at https://nginx.org/en/CHANGES-1.30,
https://nginx.org/en/CHANGES-1.28 .include security fixs.

Signed-off-by: Seo Suchan <redacted>

diff --git a/net/nginx/Makefile b/net/nginx/Makefile
index 57bd3fcfdc46581d2ac4de2d8d6c70d0437cd63b..3cec6d950c11f7023a3649b22d045247d64874aa 100644 (file)
--- a/net/nginx/Makefile
+++ b/net/nginx/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nginx
-PKG_VERSION:=1.26.3
-PKG_RELEASE:=4
+PKG_VERSION:=1.30.2
+PKG_RELEASE:=1
 
 PKG_SOURCE:=nginx-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://nginx.org/download/
-PKG_HASH:=69ee2b237744036e61d24b836668aad3040dda461fe6f570f1787eab570c75aa
+PKG_HASH:=7df3090907fca3cc0e456d6dc00ceb230da74ea88026ceff0affc29dbbd9ac4c
 
 PKG_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de> \
                                Christian Marangi <ansuelsmth@gmail.com>

diff --git a/net/nginx/patches/nginx/101-feature_test_fix.patch b/net/nginx/patches/nginx/101-feature_test_fix.patch
index bdef84b3bbc83520c37caac8d83bdad7cf5194b6..7f57aeb915fd8a21ea7cb91e94a32ededa9749e8 100644 (file)
--- a/net/nginx/patches/nginx/101-feature_test_fix.patch
+++ b/net/nginx/patches/nginx/101-feature_test_fix.patch
@@ -87,7 +87,7 @@
  ngx_feature_libs=
 --- a/auto/unix
 +++ b/auto/unix
-@@ -853,7 +853,7 @@ ngx_feature_test="void *p; p = memalign(
+@@ -835,7 +835,7 @@ ngx_feature_test="void *p; p = memalign(
  
  ngx_feature="mmap(MAP_ANON|MAP_SHARED)"
  ngx_feature_name="NGX_HAVE_MAP_ANON"
@@ -96,7 +96,7 @@
  ngx_feature_incs="#include <sys/mman.h>"
  ngx_feature_path=
  ngx_feature_libs=
-@@ -866,7 +866,7 @@ ngx_feature_test="void *p;
+@@ -848,7 +848,7 @@ ngx_feature_test="void *p;
  
  ngx_feature='mmap("/dev/zero", MAP_SHARED)'
  ngx_feature_name="NGX_HAVE_MAP_DEVZERO"
@@ -105,7 +105,7 @@
  ngx_feature_incs="#include <sys/mman.h>
                    #include <sys/stat.h>
                    #include <fcntl.h>"
-@@ -881,7 +881,7 @@ ngx_feature_test='void *p; int  fd;
+@@ -863,7 +863,7 @@ ngx_feature_test='void *p; int  fd;
  
  ngx_feature="System V shared memory"
  ngx_feature_name="NGX_HAVE_SYSVSHM"
@@ -114,7 +114,7 @@
  ngx_feature_incs="#include <sys/ipc.h>
                    #include <sys/shm.h>"
  ngx_feature_path=
-@@ -895,7 +895,7 @@ ngx_feature_test="int  id;
+@@ -877,7 +877,7 @@ ngx_feature_test="int  id;
  
  ngx_feature="POSIX semaphores"
  ngx_feature_name="NGX_HAVE_POSIX_SEM"

diff --git a/net/nginx/patches/nginx/105-optional-libexslt.patch b/net/nginx/patches/nginx/105-optional-libexslt.patch
index 6c590fb7b89876233aed197130a741772020296c..a252a52eb89386c0b62667a70d165c623460b6ed 100644 (file)
--- a/net/nginx/patches/nginx/105-optional-libexslt.patch
+++ b/net/nginx/patches/nginx/105-optional-libexslt.patch
@@ -1,6 +1,6 @@
 --- a/auto/options
 +++ b/auto/options
-@@ -165,6 +165,7 @@ USE_PERL=NO
+@@ -166,6 +166,7 @@ USE_PERL=NO
  NGX_PERL=perl
  
  USE_LIBXSLT=NO
@@ -8,7 +8,7 @@
  USE_LIBGD=NO
  USE_GEOIP=NO
  
-@@ -370,6 +371,7 @@ use the \"--with-mail_ssl_module\" optio
+@@ -372,6 +373,7 @@ use the \"--with-mail_ssl_module\" optio
          --with-pcre-opt=*)               PCRE_OPT="$value"          ;;
          --with-pcre-jit)                 PCRE_JIT=YES               ;;
          --without-pcre2)                 PCRE2=DISABLED             ;;

diff --git a/net/nginx/patches/nginx/201-ignore-invalid-options.patch b/net/nginx/patches/nginx/201-ignore-invalid-options.patch
index 37de67dd21ddfadd82f05aec0c5b836888c0ecea..a2e4ddfb6e8d1a974b522808825018e4e8c901f3 100644 (file)
--- a/net/nginx/patches/nginx/201-ignore-invalid-options.patch
+++ b/net/nginx/patches/nginx/201-ignore-invalid-options.patch
@@ -1,6 +1,6 @@
 --- a/auto/options
 +++ b/auto/options
-@@ -415,8 +415,7 @@ $0: warning: the \"--with-sha1-asm\" opt
+@@ -417,8 +417,7 @@ $0: warning: the \"--with-sha1-asm\" opt
          --test-build-solaris-sendfilev)  NGX_TEST_BUILD_SOLARIS_SENDFILEV=YES ;;
  
          *)

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 4294ed6879716251afa0d1a9c5c8c5c3282f2d12..3a8df51cb085026cd6ff0ca1b16213419324aa04 100644 (file)
--- a/net/nginx/patches/nginx/300-fix-deprecated-openssl-3_0.patch
+++ b/net/nginx/patches/nginx/300-fix-deprecated-openssl-3_0.patch
@@ -1,6 +1,6 @@
 --- a/src/event/quic/ngx_event_quic_protection.c
 +++ b/src/event/quic/ngx_event_quic_protection.c
-@@ -510,7 +510,7 @@ ngx_quic_crypto_common(ngx_quic_secret_t
+@@ -520,7 +520,7 @@ ngx_quic_crypto_common(ngx_quic_secret_t
          }
      }