From dab549e6d5b8915ddba158c4434c482ef8e3cae9 Mon Sep 17 00:00:00 2001
From: Tim Biermann <tbier@posteo.de>
Date: Wed, 28 Feb 2024 21:05:43 +0100
Subject: [PATCH] nginx: updated pcre dependency to pcre2 et al.

---
 nginx/.signature |  8 ++++----
 nginx/Pkgfile    | 10 ++++++----
 nginx/nginx.conf |  2 +-
 nginx/nginx.rc   |  2 +-
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/nginx/.signature b/nginx/.signature
index 79439efb8..b07a4c53e 100644
--- a/nginx/.signature
+++ b/nginx/.signature
@@ -1,7 +1,7 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3waEfiLnqgCO0oR9vzY+l7gyj3MpN8iqTx/7tKhco31I1YxixYu7PXMklsYVotZqPgXnO5LLYGgXWpDCJdv4UwE=
-SHA256 (Pkgfile) = 65bd20720de47c17290d021bf74f1638bcbc0fd58d4a808d24d4c4f53f474100
+RWSagIOpLGJF3yeoUS1Zcc3tpj1fssgZsneiC7JgIaRNkfW1fVED2aTWd5rotookZyqW574bikygHekKvEwod54u+JfqeiNP6wY=
+SHA256 (Pkgfile) = 2e41bd5e30aff9499ecac3bbf603dc30ad69dc38898d4f28bbd9f7fc03b70212
 SHA256 (.footprint) = 9263dad4ce3a2766b5f9bec00a3a58ac86445f370ba1bb3d5716e6b9dc74ddae
 SHA256 (nginx-1.25.4.tar.gz) = 760729901acbaa517996e681ee6ea259032985e37c2768beef80df3a877deed9
-SHA256 (nginx.conf) = 0f9b54e790951f1a09580bbf29ede26c4cc277e535d4df937fc659979a2fb35b
-SHA256 (nginx.rc) = bac096145be15bc5d87817e2d3440d930288aea06dfd6736e43289b4a352595b
+SHA256 (nginx.conf) = 703ff410335496a7fc8617845e62d4fedf3782ffa0434959b6b04a87fa49423d
+SHA256 (nginx.rc) = d6ead8d9dd31911cab4acc5b2be8c54e3f4f8633db8b7ad0775a61d92aa751ad
diff --git a/nginx/Pkgfile b/nginx/Pkgfile
index 704199dbc..22b803f05 100644
--- a/nginx/Pkgfile
+++ b/nginx/Pkgfile
@@ -1,11 +1,11 @@
 # Description: An HTTP and reverse proxy server (mainline version)
 # URL: http://nginx.org/
 # Maintainer: Matt Housh, jaeger at crux dot ninja
-# Depends on: libpcre zlib openssl
+# Depends on: libpcre2 zlib openssl
 
 name=nginx
 version=1.25.4
-release=1
+release=2
 source=(http://nginx.org/download/$name-$version.tar.gz \
     $name.conf $name.rc)
 
@@ -16,10 +16,12 @@ build() {
         --conf-path=/etc/$name/$name.conf \
         --error-log-path=/var/log/$name/error.log \
         --http-log-path=/var/log/$name/access.log \
-        --pid-path=/var/run/$name.pid \
+        --pid-path=/run/$name.pid \
         --lock-path=/var/lock/$name.pid \
         --with-http_ssl_module \
-        --with-pcre \
+        --with-http_v2_module \
+        --with-threads \
+        --with-http_gzip_static_module \
         --user=$name \
         --group=$name
     make
diff --git a/nginx/nginx.conf b/nginx/nginx.conf
index 7dba8c085..a028e5622 100644
--- a/nginx/nginx.conf
+++ b/nginx/nginx.conf
@@ -8,7 +8,7 @@ worker_processes auto;
 
 error_log /var/log/nginx/error.log;
 
-pid /var/run/nginx.pid;
+pid /run/nginx.pid;
 
 
 events {
diff --git a/nginx/nginx.rc b/nginx/nginx.rc
index e595088df..977c278b3 100755
--- a/nginx/nginx.rc
+++ b/nginx/nginx.rc
@@ -5,7 +5,7 @@
 
 SSD=/sbin/start-stop-daemon
 PROG=/usr/sbin/nginx
-PID=/var/run/nginx.pid
+PID=/run/nginx.pid
 
 case $1 in
     "start")