Source Mage code commit list

[Ismael Luceno <scm AT sourcemage.org>]

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

 http/nginx/DEPENDS        |    4 ++--
 http/nginx/DETAILS        |    5 +++--
 http/nginx/HISTORY        |    6 ++++++
 http/nginx/PREPARE        |    8 ++++----
 http/nginx/PRE_BUILD      |    4 ----
 http/nginx/libressl.patch |   15 ---------------
 6 files changed, 15 insertions(+), 27 deletions(-)

New commits:
commit 6219f26f3763993e6e2f407af62d690afc4f6a78
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    nginx 1.24.0 (stable) / 1.25.1 (mainline)
    
    LibreSSL patch removed; no longer needed.

commit a9b532be8b8c81dbaf7e128f884735558c48c0e9
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    nginx: Disable http_rewrite module when building without pcre
    
    The configure script bails out otherwise.

commit d45652a869c6d0b5866c38750f2b2e3ccd08ffe7
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    nginx: Add Watch line

diff --git a/http/nginx/DEPENDS b/http/nginx/DEPENDS
index 3fa3d6b..2c400bf 100755
--- a/http/nginx/DEPENDS
+++ b/http/nginx/DEPENDS
@@ -4,8 +4,8 @@ depends SSL "--with-http_ssl_module" &&
 
 optional_depends pcre \
                  "--with-pcre" \
-                 "--without-pcre" \
-                 "for PCRE library usage" &&
+                 "--without-pcre --without-http_rewrite_module" \
+                 "for PCRE library usage (e.g. http_rewrite module)" &&
 
 optional_depends perl \
                  "--with-http_perl_module" "" \
diff --git a/http/nginx/DETAILS b/http/nginx/DETAILS
index f60831a..1b2d622 100755
--- a/http/nginx/DETAILS
+++ b/http/nginx/DETAILS
@@ -1,3 +1,4 @@
+# Watch: https://nginx.org/download/
            SPELL=nginx
 
 if [[ -z $NGINX_RELEASE ]]; then
@@ -5,9 +6,9 @@ if [[ -z $NGINX_RELEASE ]]; then
 fi
 
 if [[ "${NGINX_RELEASE}" == "stable" ]]; then
-         VERSION=1.16.1
+         VERSION=1.24.0
 else
-         VERSION=1.17.5
+         VERSION=1.25.1
 fi
   SECURITY_PATCH=10
           SOURCE=$SPELL-$VERSION.tar.gz
diff --git a/http/nginx/HISTORY b/http/nginx/HISTORY
index a2f850f..adfb668 100644
--- a/http/nginx/HISTORY
+++ b/http/nginx/HISTORY
@@ -1,3 +1,9 @@
+2023-07-20 Ismael Luceno <ismael AT sourcemage.org>
+       * DEPENDS: disable rewrite_module when building without pcre
+       * libressl.patch: removed, no longer needed
+       * DETAILS: updated stable to 1.24.0
+         updated mainline to 1.25.1
+
 2019-10-22 Pavel Vinogradov <public AT sourcemage.org>
        * DETAILS: devel version 1.17.5
 
diff --git a/http/nginx/PREPARE b/http/nginx/PREPARE
index c86d13d..d4b9ab1 100755
--- a/http/nginx/PREPARE
+++ b/http/nginx/PREPARE
@@ -1,13 +1,13 @@
 . "$GRIMOIRE/config_query_multi.function" &&
 
 # backporting legacy branch selection
-if [[ $NGINX_RELEASE == legacy ]] || [[ $NGINX_RELEASE == old ]]; then
-  NGINX_RELEASE="stable"
-fi &&
+case "$NGINX_RELEASE" in
+  (legacy|old) NGINX_RELEASE=stable ;;
+esac &&
 
 config_query_list NGINX_RELEASE "Select which release to build:" \
                                 stable \
-                                devel &&
+                                mainline &&
 
 config_query_multi NGINX_MODULES "What additional modules to build?" \
                                  none \
diff --git a/http/nginx/PRE_BUILD b/http/nginx/PRE_BUILD
index 9603f22..d0a8736 100755
--- a/http/nginx/PRE_BUILD
+++ b/http/nginx/PRE_BUILD
@@ -7,10 +7,6 @@ if [[ "$(get_spell_provider ${SPELL} SYSTEM-LOGGER)" != "" 
]]; then
   patch -p1 < "$SPELL_DIRECTORY/syslog-1.5.6.patch"
 fi &&
 
-if [[ $(get_spell_provider $SPELL SSL) == "libressl" ]]; then
-  patch -p0 < "$SPELL_DIRECTORY/libressl.patch"
-fi &&
-
 if list_find "$NGINX_MODULES" "push"; then
   unpack_file 3
 fi &&
diff --git a/http/nginx/libressl.patch b/http/nginx/libressl.patch
deleted file mode 100644
index eb52993..0000000
--- a/http/nginx/libressl.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-# New version of the file generated with:
-# perl -i.orig -0p -e 's|(^#include <ngx_event.h>).*(typedef 
struct)|$1\n#include <openssl\/rand\.h>\n\nint RAND_bytes\(unsigned char 
\*buf, int num\);\nint RAND_pseudo_bytes\(unsigned char \*buf, int 
num\);\n\n$2|ms' src/event/ngx_event_openssl.c;
---- src/event/ngx_event_openssl.c.orig 2014-09-16 16:23:19.000000000 +0400
-+++ src/event/ngx_event_openssl.c      2015-04-06 12:16:58.744021793 +0300
-@@ -8,7 +8,10 @@
- #include <ngx_config.h>
- #include <ngx_core.h>
- #include <ngx_event.h>
-+#include <openssl/rand.h>
- 
-+int RAND_bytes(unsigned char *buf, int num);
-+int RAND_pseudo_bytes(unsigned char *buf, int num);
- 
- typedef struct {
-     ngx_uint_t  engine;   /* unsigned  engine:1; */