From 2b72f22606329cd274e87a774945c084a5372f4b Mon Sep 17 00:00:00 2001
From: RAC-oi <160294171+RAC-oi@users.noreply.github.com>
Date: Mon, 11 Mar 2024 09:25:04 +0100
Subject: [PATCH] web/server/nginx: switch to openssl-3.1
---
components/web/nginx/Makefile | 72 ++++++++++++++++++------------------
components/web/nginx/pkg5 | 2
2 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/components/web/nginx/Makefile b/components/web/nginx/Makefile
index 923faf9..ad6e2df 100644
--- a/components/web/nginx/Makefile
+++ b/components/web/nginx/Makefile
@@ -13,63 +13,63 @@
#
BUILD_BITS= 64
-# Alas nginx ignores the openssl settings
-OPENSSL_VERSION= 3.1
-USE_PARALLEL_BUILD= yes
include ../../../make-rules/shared-macros.mk
-COMPONENT_NAME= nginx
-COMPONENT_VERSION= 1.25.4
-COMPONENT_SUMMARY= Nginx Webserver
-COMPONENT_PROJECT_URL= https://nginx.net/
-COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
-COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
-COMPONENT_ARCHIVE_HASH= sha256:760729901acbaa517996e681ee6ea259032985e37c2768beef80df3a877deed9
-COMPONENT_ARCHIVE_URL= https://nginx.org/download/$(COMPONENT_ARCHIVE)
-COMPONENT_SIG_URL= $(COMPONENT_ARCHIVE_URL).asc
+COMPONENT_NAME= nginx
+COMPONENT_VERSION= 1.25.4
+COMPONENT_SUMMARY= Nginx Webserver
+COMPONENT_PROJECT_URL= https://nginx.org/
+COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE_HASH= sha256:760729901acbaa517996e681ee6ea259032985e37c2768beef80df3a877deed9
+COMPONENT_ARCHIVE_URL= https://nginx.org/download/$(COMPONENT_ARCHIVE)
+COMPONENT_SIG_URL= $(COMPONENT_ARCHIVE_URL).asc
COMPONENT_FMRI= web/server/nginx
-COMPONENT_CLASSIFICATION= Web Services/Application and Web Servers
-COMPONENT_LICENSE= BSD
+COMPONENT_CLASSIFICATION= Web Services/Application and Web Servers
+COMPONENT_LICENSE= BSD
COMPONENT_LICENSE_FILE= LICENSE
+COMPONENT_REVISION= 1
NGX_FANCYINDEX_VERSION= 0.5.2
TEST_TARGET= $(NO_TESTS)
include $(WS_MAKE_RULES)/common.mk
-CONFIGURE_OPTIONS = --prefix=/etc/nginx
-CONFIGURE_OPTIONS += --sbin-path=/usr/sbin/nginx
-CONFIGURE_OPTIONS += --with-ld-opt=$(LD_BITS)
-CONFIGURE_OPTIONS += --with-cc="$(CC) $(CC_BITS)"
-#CONFIGURE_OPTIONS += --with-openssl=$(OPENSSL_LIBDIR)
-CONFIGURE_OPTIONS += --conf-path=/etc/nginx/nginx.conf
-CONFIGURE_OPTIONS += --http-log-path=/var/nginx/logs/access_log
-CONFIGURE_OPTIONS += --error-log-path=/var/nginx/logs/error_log
-CONFIGURE_OPTIONS += --pid-path=/var/run/nginx
-CONFIGURE_OPTIONS += --lock-path=/var/run/nginx
-CONFIGURE_OPTIONS += --user=webservd
-CONFIGURE_OPTIONS += --group=webservd
+CPPFLAGS += -I$(OPENSSL_INCDIR)
+LDFLAGS += -L$(OPENSSL_LIBDIR)
-CONFIGURE_OPTIONS += --with-http_ssl_module
+CONFIGURE_OPTIONS = --prefix=$(ETCDIR)/nginx
+CONFIGURE_OPTIONS += --add-module=$(@D)/ngx-fancyindex
+CONFIGURE_OPTIONS += --conf-path=$(ETCDIR)/nginx/nginx.conf
+CONFIGURE_OPTIONS += --error-log-path=$(VARDIR)/nginx/logs/error_log
+CONFIGURE_OPTIONS += --group=webservd
+CONFIGURE_OPTIONS += --http-log-path=$(VARDIR)/nginx/logs/access_log
+CONFIGURE_OPTIONS += --lock-path=$(VARDIR)/run/nginx
+CONFIGURE_OPTIONS += --pid-path=$(VARDIR)/run/nginx
+CONFIGURE_OPTIONS += --sbin-path=$(USRDIR)/sbin/nginx
+CONFIGURE_OPTIONS += --user=webservd
+CONFIGURE_OPTIONS += --with-cc-opt="-I$(OPENSSL_INCDIR)"
+CONFIGURE_OPTIONS += --with-cc="$(CC) $(CC_BITS)"
CONFIGURE_OPTIONS += --with-http_addition_module
-CONFIGURE_OPTIONS += --with-http_sub_module
CONFIGURE_OPTIONS += --with-http_dav_module
CONFIGURE_OPTIONS += --with-http_flv_module
-CONFIGURE_OPTIONS += --with-http_mp4_module
-CONFIGURE_OPTIONS += --with-http_gzip_static_module
-CONFIGURE_OPTIONS += --with-http_gunzip_module
CONFIGURE_OPTIONS += --with-http_geoip_module
+CONFIGURE_OPTIONS += --with-http_gunzip_module
+CONFIGURE_OPTIONS += --with-http_gzip_static_module
+CONFIGURE_OPTIONS += --with-http_mp4_module
CONFIGURE_OPTIONS += --with-http_realip_module
CONFIGURE_OPTIONS += --with-http_secure_link_module
-CONFIGURE_OPTIONS += --with-http_v2_module
+CONFIGURE_OPTIONS += --with-http_ssl_module
CONFIGURE_OPTIONS += --with-http_stub_status_module
+CONFIGURE_OPTIONS += --with-http_sub_module
+CONFIGURE_OPTIONS += --with-http_v2_module
CONFIGURE_OPTIONS += --with-http_xslt_module
-CONFIGURE_OPTIONS += --with-stream
-CONFIGURE_OPTIONS += --with-stream_ssl_module
+CONFIGURE_OPTIONS += --with-ld-opt="$(LD_BITS) -L$(OPENSSL_LIBDIR)"
CONFIGURE_OPTIONS += --with-mail
CONFIGURE_OPTIONS += --with-mail_ssl_module
+CONFIGURE_OPTIONS += --with-stream
+CONFIGURE_OPTIONS += --with-stream_ssl_module
CONFIGURE_OPTIONS += --with-threads
-CONFIGURE_OPTIONS += --add-module=$(@D)/ngx-fancyindex
COMPONENT_PRE_CONFIGURE_ACTION = ($(CLONEY) $(SOURCE_DIR) $(@D) && \
git clone https://github.com/aperezdc/ngx-fancyindex.git $(@D)/ngx-fancyindex && \
@@ -85,7 +85,7 @@
REQUIRED_PACKAGES += library/libxml2
REQUIRED_PACKAGES += library/libxslt
REQUIRED_PACKAGES += library/pcre2
-REQUIRED_PACKAGES += library/security/openssl
+REQUIRED_PACKAGES += library/security/openssl-31
REQUIRED_PACKAGES += library/zlib
REQUIRED_PACKAGES += shell/ksh93
REQUIRED_PACKAGES += system/library
diff --git a/components/web/nginx/pkg5 b/components/web/nginx/pkg5
index 130b790..6d37bc1 100644
--- a/components/web/nginx/pkg5
+++ b/components/web/nginx/pkg5
@@ -5,7 +5,7 @@
"library/libxml2",
"library/libxslt",
"library/pcre2",
- "library/security/openssl",
+ "library/security/openssl-31",
"library/zlib",
"shell/ksh93",
"system/library"
--
Gitblit v1.9.3