extra/nginx to 1.24.0-3

extra/nginx/.SRCINFO

@@ -0,0 +1,55 @@
+pkgbase = nginx
+	pkgver = 1.24.0
+	pkgrel = 3
+	url = https://nginx.org
+	arch = x86_64
+	license = custom
+	checkdepends = perl
+	checkdepends = perl-gd
+	checkdepends = perl-io-socket-ssl
+	checkdepends = perl-fcgi
+	checkdepends = perl-cache-memcached
+	checkdepends = memcached
+	checkdepends = ffmpeg
+	makedepends = mercurial
+	makedepends = pcre2
+	makedepends = zlib
+	makedepends = openssl
+	makedepends = geoip
+	makedepends = mailcap
+	makedepends = libxcrypt
+	backup = etc/nginx/fastcgi.conf
+	backup = etc/nginx/fastcgi_params
+	backup = etc/nginx/koi-win
+	backup = etc/nginx/koi-utf
+	backup = etc/nginx/nginx.conf
+	backup = etc/nginx/scgi_params
+	backup = etc/nginx/uwsgi_params
+	backup = etc/nginx/win-utf
+	backup = etc/logrotate.d/nginx
+	source = https://nginx.org/download/nginx-1.24.0.tar.gz
+	source = https://nginx.org/download/nginx-1.24.0.tar.gz.asc
+	source = hg+https://hg.nginx.org/nginx-tests#revision=24482e311749
+	source = nginx.service
+	source = logrotate
+	source = HTTP2_per-iteration-stream-handling-limit.patch::https://hg.nginx.org/nginx/raw-rev/cdda286c0f1b
+	validpgpkeys = B0F4253373F8F6F510D42178520A9993A1C052F8
+	validpgpkeys = 13C82A63B603576156E30A4EA0EA981B66B0D967
+	sha512sums = 1114e37de5664a8109c99cfb2faa1f42ff8ac63c932bcf3780d645e5ed32c0b2ac446f80305b4465994c8f9430604968e176ae464fd80f632d1cb2c8f6007ff3
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = ca7d8666177d31b6c4924e9ab44ddf3d5b596b51da04d38da002830b03bd176d49354bbdd2a496617d57f44111ad59833296af87d03ffe3fca6b99327a7b4c3c
+	sha512sums = 2f4dfcfa711b8bcbc5918ba635f5e430ef7132e66276261ade62bb1cba016967432c8dce7f84352cb8b07dc7c6b18f09177aa3eb92c8e358b2a106c8ca142fe9
+	sha512sums = 18b69643648119dfab45101bb9404be667aeb9d550aa3bc9706e63e7da1c2806106e9a6bbfb2d10bd57ef56b9b5b0b524059353ec30a51469b44641cb7dbd8a6
+
+pkgname = nginx
+	pkgdesc = Lightweight HTTP server and IMAP/POP3 proxy server
+	depends = pcre2
+	depends = zlib
+	depends = openssl
+	depends = geoip
+	depends = mailcap
+	depends = libxcrypt
+
+pkgname = nginx-src
+	pkgdesc = Source code of nginx 1.24.0, useful for building modules

extra/nginx/PKGBUILD

@@ -14,7 +14,7 @@ pkgbase=nginx
 pkgname=(nginx nginx-src)
 # update tests revision too
 pkgver=1.24.0
-pkgrel=2
+pkgrel=3
 arch=(x86_64)
 url='https://nginx.org'
 license=(custom)
@@ -30,11 +30,12 @@ backup=(etc/nginx/fastcgi.conf
         etc/nginx/uwsgi_params
         etc/nginx/win-utf
         etc/logrotate.d/nginx)
-install=nginx.install
 source=($url/download/nginx-$pkgver.tar.gz{,.asc}
         hg+https://hg.nginx.org/nginx-tests#revision=24482e311749
         nginx.service
-        logrotate)
+        logrotate
+        # https://hg.nginx.org/nginx/rev/cdda286c0f1b CVE-2023-44487
+        HTTP2_per-iteration-stream-handling-limit.patch::https://hg.nginx.org/nginx/raw-rev/cdda286c0f1b)
 # https://nginx.org/en/pgp_keys.html
 validpgpkeys=('B0F4253373F8F6F510D42178520A9993A1C052F8' # Maxim Dounin <mdounin@mdounin.ru>
               '13C82A63B603576156E30A4EA0EA981B66B0D967') # Konstantin Pavlov <thresh@nginx.com>
@@ -42,7 +43,8 @@ sha512sums=('1114e37de5664a8109c99cfb2faa1f42ff8ac63c932bcf3780d645e5ed32c0b2ac4
             'SKIP'
             'SKIP'
             'ca7d8666177d31b6c4924e9ab44ddf3d5b596b51da04d38da002830b03bd176d49354bbdd2a496617d57f44111ad59833296af87d03ffe3fca6b99327a7b4c3c'
-            '2f4dfcfa711b8bcbc5918ba635f5e430ef7132e66276261ade62bb1cba016967432c8dce7f84352cb8b07dc7c6b18f09177aa3eb92c8e358b2a106c8ca142fe9')
+            '2f4dfcfa711b8bcbc5918ba635f5e430ef7132e66276261ade62bb1cba016967432c8dce7f84352cb8b07dc7c6b18f09177aa3eb92c8e358b2a106c8ca142fe9'
+            '18b69643648119dfab45101bb9404be667aeb9d550aa3bc9706e63e7da1c2806106e9a6bbfb2d10bd57ef56b9b5b0b524059353ec30a51469b44641cb7dbd8a6')
 
 _common_flags=(
   --with-compat
@@ -81,6 +83,8 @@ _stable_flags=(
 
 prepare() {
   cp -r $pkgbase-$pkgver{,-src}
+  cd $pkgbase-$pkgver
+  patch -Np1 -i "$srcdir/HTTP2_per-iteration-stream-handling-limit.patch"
 }
 
 build() {

extra/nginx/nginx.install

@@ -1,27 +0,0 @@
-post_upgrade() {
-  if (( $(vercmp $2 1.2.7-4) <= 0 )); then
-    chmod 750 var/log/nginx
-    chown http:log var/log/nginx
-  fi
-
-  if (( $(vercmp $2 1.2.1-2) <= 0 )); then
-    echo ':: Since 1.2.1-2 several changes has been made in package:'
-    echo '     - *.conf files have been moved to /etc/nginx'
-    echo '     - /etc/conf.d/nginx has been removed'
-    echo '       Main configuration file is set to /etc/nginx/nginx.conf'
-    echo '     - access.log and error.log can be found in /var/log/nginx by default'
-    echo '     - bundled *.html files have been moved to /usr/share/nginx/html'
-    echo '     - /etc/nginx/{html,logs} symbolic links and *.default files have been removed'
-  fi
-
-  if (( $(vercmp $2 1.10.2-3) < 0)); then
-    chown root:root var/log/nginx
-  fi
-
-  if (( $(vercmp $2 1.10.3-2) < 0 )); then
-    chmod 755 var/log/nginx
-    echo ':: Security notice:'
-    echo '     - When additional log directories are used in /var/log/nginx make sure they'
-    echo '       are owned by root:root and have 755 set as permission to mitigate CVE-2016-1247'
-  fi
-}