From e59f1a8729dfb4928600fb6b9891cc34eae0523d Mon Sep 17 00:00:00 2001 From: Konstantin Pavlov Date: Tue, 5 May 2026 15:28:04 -0700 Subject: [PATCH 1/6] Bump NGINX Plus version to reflect new versioning scheme --- contrib/src/nginx/version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/src/nginx/version b/contrib/src/nginx/version index 5633bae3..9f9c5447 100644 --- a/contrib/src/nginx/version +++ b/contrib/src/nginx/version @@ -1,2 +1,2 @@ NGINX_VERSION := 1.31.0 -NGINX_PLUS_VERSION := 37 +NGINX_PLUS_VERSION := 37.0.0 From 71138b758532c8961b755936f548e8b32da077d7 Mon Sep 17 00:00:00 2001 From: Konstantin Pavlov Date: Tue, 5 May 2026 15:42:21 -0700 Subject: [PATCH 2/6] contrib: auth-spnego: remove mention of non-existant patch --- contrib/src/spnego-http-auth-nginx-module/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/contrib/src/spnego-http-auth-nginx-module/Makefile b/contrib/src/spnego-http-auth-nginx-module/Makefile index 8796b90d..53a01402 100644 --- a/contrib/src/spnego-http-auth-nginx-module/Makefile +++ b/contrib/src/spnego-http-auth-nginx-module/Makefile @@ -12,7 +12,6 @@ $(TARBALLS)/spnego-http-auth-nginx-module-$(SPNEGO_HTTP_AUTH_NGINX_MODULE_GITHAS spnego-http-auth-nginx-module: spnego-http-auth-nginx-module-$(SPNEGO_HTTP_AUTH_NGINX_MODULE_GITHASH).tar.gz .sum-spnego-http-auth-nginx-module $(UNPACK) - $(APPLY) $(SRC)/spnego-http-auth-nginx-module/extra-patch-ngx_http_auth_spnego_module.c $(MOVE) .spnego-http-auth-nginx-module: spnego-http-auth-nginx-module From 9b7ed0e81acb10df6b44d6633876c7219deb2c83 Mon Sep 17 00:00:00 2001 From: Konstantin Pavlov Date: Tue, 5 May 2026 15:47:09 -0700 Subject: [PATCH 3/6] alpine: synchronize with NGINX Plus packaging --- alpine/Makefile | 22 ++++++++++++++++++---- alpine/Makefile.module-ndk | 6 +----- alpine/alpine-plus/APKBUILD-plus-module.in | 6 ++++-- 3 files changed, 23 insertions(+), 11 deletions(-) diff --git a/alpine/Makefile b/alpine/Makefile index d81aea91..1236b23f 100644 --- a/alpine/Makefile +++ b/alpine/Makefile @@ -27,6 +27,15 @@ SRCDIR= nginx$(BASE_SUFFIX)-$(BASE_VERSION) MODULE_SRCDIR= $(SRCDIR) MODSRC_PREFIX= ../ +NGINX_PLUS_MAJOR_MINOR = $(word 1,$(subst ., ,$(NGINX_PLUS_VERSION))).$(word 2,$(subst ., ,$(NGINX_PLUS_VERSION))) + +RELSTRING= +ifeq ($(shell test $(PLUS_RELEASE) -gt 1; echo $$?),0) +RELSTRING=-p$(shell expr $(PLUS_RELEASE) - 1 ) +endif + +BUILD_SUFFIX ?= + ifeq ($(MODULE_TARGET), oss) APKBUILD_TEMPLATE= alpine/APKBUILD-module.in MODULE_SUMMARY_PREFIX=nginx @@ -35,7 +44,7 @@ else APKBUILD_TEMPLATE= alpine-$(MODULE_TARGET)/APKBUILD-$(MODULE_TARGET)-module.in MODULE_SUFFIX= -$(MODULE_TARGET) MODULE_SUMMARY_PREFIX=NGINX Plus -TARGET_VERSION=$(PLUS_VERSION) +TARGET_VERSION=$(NGINX_PLUS_MAJOR_MINOR) endif MODULE_TARGET_PREFIX=$(TARGET_VERSION). @@ -96,17 +105,20 @@ BASE_CONFIGURE_ARGS=\ ifneq ($(BASE_TARGET), oss) BASE_CONFIGURE_ARGS+=\ - --build=nginx-$(BASE_TARGET)-r$(PLUS_VERSION) \ - --mgmt-id-path=/var/lib/nginx/nginx.id \ + --build=nginx-$(BASE_TARGET)-r$(PLUS_VERSION)$(RELSTRING)$(BUILD_SUFFIX) \ + --state-path=/var/lib/nginx/state \ + --with-control-api \ --with-http_auth_jwt_module \ --with-http_f4f_module \ --with-http_hls_module \ + --with-http_oidc_module \ --with-http_proxy_protocol_vendor_module \ --with-http_session_log_module \ --with-mgmt \ --with-stream_mqtt_filter_module \ --with-stream_mqtt_preread_module \ - --with-stream_proxy_protocol_vendor_module + --with-stream_proxy_protocol_vendor_module \ + --system-ca-bundle=/etc/ssl/cert.pem endif include $(CONTRIB)/attestation.mak @@ -181,6 +193,7 @@ abuild-base: $(BASE_SRC) -e 's#%%BASE_RELEASE%%#$(BASE_RELEASE)#g' \ -e 's#%%PLUS_VERSION%%#$(PLUS_VERSION)#g' \ -e 's#%%PLUS_RELEASE%%#$(PLUS_RELEASE)#g' \ + -e 's#%%NGINX_PLUS_MAJOR_MINOR%%#$(NGINX_PLUS_MAJOR_MINOR)#g' \ -e "s#%%BASE_PATCHES%%#$$patches#g" \ -e 's#%%BASE_CONFIGURE_ARGS%%#$(BASE_CONFIGURE_ARGS)#g' \ > abuild-base/APKBUILD ; \ @@ -231,6 +244,7 @@ abuild-module-%: $(BASE_SRC) .deps-module-% -e "s#%%BASE_RELEASE%%#$(BASE_RELEASE)#g" \ -e 's#%%BASE_CONFIGURE_ARGS%%#$(BASE_CONFIGURE_ARGS)#g' \ -e "s#%%PLUS_VERSION%%#$(PLUS_VERSION)#g" \ + -e 's#%%NGINX_PLUS_MAJOR_MINOR%%#$(NGINX_PLUS_MAJOR_MINOR)#g' \ -e "s#%%MODULE_VERSION%%#$(MODULE_VERSION_$(call modname, $*))#g" \ -e "s#%%MODULE_RELEASE%%#$(MODULE_RELEASE_$(call modname, $*))#g" \ -e "s#%%MODULE_VERSION_PREFIX%%#$(MODULE_VERSION_PREFIX_$(call modname, $*))#g" \ diff --git a/alpine/Makefile.module-ndk b/alpine/Makefile.module-ndk index 3fe7d4bd..c303ea2b 100644 --- a/alpine/Makefile.module-ndk +++ b/alpine/Makefile.module-ndk @@ -20,11 +20,7 @@ prerequisites-for-module-ndk: MODULE_CC_OPT_ndk=-DNDK_SET_VAR -DNDK_UPSTREAM_LIST MODULE_CC_OPT_DEBUG_ndk=$(MODULE_CC_OPT_ndk) -ifeq ($(MODULE_TARGET), plus) -NDK_DEPENDENCY_TAG=nginx-plus-module-ndk nginx-plus-module-ndk-r$(PLUS_VERSION) -else -NDK_DEPENDENCY_TAG=nginx-module-ndk nginx-module-ndk-r$(BASE_VERSION) -endif +NDK_DEPENDENCY_TAG=nginx$(MODULE_SUFFIX)-module-ndk nginx$(MODULE_SUFFIX)-module-ndk-r$(TARGET_VERSION) define MODULE_POST_ndk cat < Date: Tue, 5 May 2026 15:52:23 -0700 Subject: [PATCH 4/6] debian: synchronize with NGINX Plus packaging --- debian/Makefile | 24 +++++++++++++++---- debian/Makefile.module-ndk | 2 +- .../debian-plus/nginx-plus-module.control.in | 6 ++--- 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/debian/Makefile b/debian/Makefile index e7eed9b5..ca71f6e7 100644 --- a/debian/Makefile +++ b/debian/Makefile @@ -24,10 +24,20 @@ BASE_SRC= nginx$(BASE_SUFFIX)-$(BASE_VERSION).tar.gz SRCDIR= nginx$(BASE_SUFFIX)-$(BASE_VERSION) BUILD_ENV_PATH= ${HOME}/debuild + +NGINX_PLUS_MAJOR_MINOR = $(word 1,$(subst ., ,$(NGINX_PLUS_VERSION))).$(word 2,$(subst ., ,$(NGINX_PLUS_VERSION))) + +RELSTRING= +ifeq ($(shell test $(PLUS_RELEASE) -gt 1; echo $$?),0) +RELSTRING=-p$(shell expr $(PLUS_RELEASE) - 1 ) +endif + +BUILD_SUFFIX ?= + ifeq ($(MODULE_TARGET), plus) MODULE_SUFFIX= -plus MODULE_SUMMARY_PREFIX=NGINX Plus -TARGET_VERSION=$(PLUS_VERSION) +TARGET_VERSION=$(NGINX_PLUS_MAJOR_MINOR) BASE_ORIG_NAME=nginx-plus_$(PLUS_VERSION).orig.tar.gz MODULE_PACKAGE_URL= https://www.nginx.com/ else @@ -98,17 +108,20 @@ BASE_CONFIGURE_ARGS=\ ifeq ($(BASE_TARGET), plus) BASE_CONFIGURE_ARGS+= \ - --build=nginx-plus-r$(PLUS_VERSION) \ - --mgmt-id-path=/var/lib/nginx/nginx.id \ + --build=nginx-plus-r$(PLUS_VERSION)$(RELSTRING)$(BUILD_SUFFIX) \ + --state-path=/var/lib/nginx/state \ + --with-control-api \ --with-http_auth_jwt_module \ --with-http_f4f_module \ --with-http_hls_module \ + --with-http_oidc_module \ --with-http_proxy_protocol_vendor_module \ --with-http_session_log_module \ --with-mgmt \ --with-stream_mqtt_filter_module \ --with-stream_mqtt_preread_module \ - --with-stream_proxy_protocol_vendor_module + --with-stream_proxy_protocol_vendor_module \ + --system-ca-bundle=/etc/ssl/certs/ca-certificates.crt endif include $(CONTRIB)/attestation.mak @@ -187,6 +200,7 @@ rules-base: $(BASE_SRC) nginx.deb-changelog -e "s#%%PACKAGE_VENDOR%%#$(PACKAGE_VENDOR)#g" \ -e 's#%%BASE_VERSION%%#$(BASE_VERSION)#g' \ -e 's#%%PLUS_VERSION%%#$(PLUS_VERSION)#g' \ + -e 's#%%NGINX_PLUS_MAJOR_MINOR%%#$(NGINX_PLUS_MAJOR_MINOR)#g' \ > debuild-base/$(SRCDIR)/debian/control ; \ if [ "$(BASE_TARGET)" = "plus" ]; then \ cp $(DOCS)/EULA-TRIAL \ @@ -300,6 +314,7 @@ rules-module-%: $(BASE_SRC) nginx-module-%.deb-changelog .deps-module-% -e "s#%%BASE_VERSION%%#$(BASE_VERSION)#g" \ -e "s#%%BASE_RELEASE%%#$(BASE_RELEASE)#g" \ -e "s#%%PLUS_VERSION%%#$(PLUS_VERSION)#g" \ + -e 's#%%NGINX_PLUS_MAJOR_MINOR%%#$(NGINX_PLUS_MAJOR_MINOR)#g' \ -e "s#%%VERSION_PREFIX%%#$(MODULE_VERSION_PREFIX_$(call modname, $*))#g" \ -e "s#%%MODULE_VERSION%%#$(MODULE_VERSION_$(call modname, $*))#g" \ -e "s#%%MODULE_RELEASE%%#$(MODULE_RELEASE_$(call modname, $*))#g" \ @@ -312,6 +327,7 @@ rules-module-%: $(BASE_SRC) nginx-module-%.deb-changelog .deps-module-% -e "s#%%BASE_VERSION%%#$(BASE_VERSION)#g" \ -e "s#%%BASE_RELEASE%%#$(BASE_RELEASE)#g" \ -e "s#%%PLUS_VERSION%%#$(PLUS_VERSION)#g" \ + -e 's#%%NGINX_PLUS_MAJOR_MINOR%%#$(NGINX_PLUS_MAJOR_MINOR)#g' \ -e "s#%%MODULE%%#$${module_asis}#g" \ -e "s#%%CODENAME%%#$(CODENAME)#g" \ -e "s#%%VERSION_PREFIX%%#$(MODULE_VERSION_PREFIX_$(call modname, $*))#g" \ diff --git a/debian/Makefile.module-ndk b/debian/Makefile.module-ndk index 16bbf964..10f361d0 100644 --- a/debian/Makefile.module-ndk +++ b/debian/Makefile.module-ndk @@ -19,7 +19,7 @@ MODULE_CC_OPT_ndk=-DNDK_SET_VAR -DNDK_UPSTREAM_LIST MODULE_CC_OPT_DEBUG_ndk=$(MODULE_CC_OPT_ndk) ifeq ($(MODULE_TARGET), plus) -NDK_DEPENDENCY_TAG= nginx-plus-module-ndk-r$(PLUS_VERSION) +NDK_DEPENDENCY_TAG= nginx-plus-module-ndk-r$(NGINX_PLUS_MAJOR_MINOR) else NDK_DEPENDENCY_TAG= nginx-module-ndk-r$(BASE_VERSION) endif diff --git a/debian/debian-plus/nginx-plus-module.control.in b/debian/debian-plus/nginx-plus-module.control.in index 0b24e821..abbe3d0f 100644 --- a/debian/debian-plus/nginx-plus-module.control.in +++ b/debian/debian-plus/nginx-plus-module.control.in @@ -16,8 +16,8 @@ Package: nginx-plus-module-%%MODULE%% Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, - nginx-plus-r%%PLUS_VERSION%%%%MODULE_DEPENDS%%%%ADD_CONTROL_TAGS%% -Provides: nginx-plus-module-%%MODULE%%-r%%PLUS_VERSION%% + nginx-plus-r%%NGINX_PLUS_MAJOR_MINOR%%%%MODULE_DEPENDS%%%%ADD_CONTROL_TAGS%% +Provides: nginx-plus-module-%%MODULE%%-r%%NGINX_PLUS_MAJOR_MINOR%% Description: %%SUMMARY%% %%SHORT_SUMMARY%% for NGINX Plus @@ -25,7 +25,7 @@ Package: nginx-plus-module-%%MODULE%%-dbg Architecture: any Section: debug Priority: optional -Depends: nginx-plus-r%%PLUS_VERSION%%, +Depends: nginx-plus-r%%NGINX_PLUS_MAJOR_MINOR%%, nginx-plus-module-%%MODULE%% (= %%VERSION_PREFIX%%%%MODULE_VERSION%%-%%MODULE_RELEASE%%~%%CODENAME%%), ${misc:Depends} Description: debug symbols for the nginx-plus-module-%%MODULE%% From 204c7a29489d483f05ff2ce0509058ff09b5f188 Mon Sep 17 00:00:00 2001 From: Konstantin Pavlov Date: Tue, 5 May 2026 16:00:27 -0700 Subject: [PATCH 5/6] rpm: synchronize with NGINX Plus packaging --- rpm/SPECS/Makefile | 29 +++++++++++++++++++++++++---- rpm/SPECS/Makefile.module-ndk | 4 ++-- rpm/SPECS/nginx-plus-module.spec.in | 5 +++-- 3 files changed, 30 insertions(+), 8 deletions(-) diff --git a/rpm/SPECS/Makefile b/rpm/SPECS/Makefile index 0937dbc1..0493a9cc 100644 --- a/rpm/SPECS/Makefile +++ b/rpm/SPECS/Makefile @@ -26,9 +26,18 @@ BUILD_ENV_PATH= ${HOME}/rpmbuild MODSRC_PREFIX= BUILD_DIR= %{bdir} +NGINX_PLUS_MAJOR_MINOR = $(word 1,$(subst ., ,$(NGINX_PLUS_VERSION))).$(word 2,$(subst ., ,$(NGINX_PLUS_VERSION))) + +RELSTRING= +ifeq ($(shell test $(PLUS_RELEASE) -gt 1; echo $$?),0) +RELSTRING=-p$(shell expr $(PLUS_RELEASE) - 1 ) +endif + +BUILD_SUFFIX ?= + ifeq ($(MODULE_TARGET), plus) MODULE_SUMMARY_PREFIX= NGINX Plus -TARGET_VERSION=$(PLUS_VERSION) +TARGET_VERSION=$(NGINX_PLUS_MAJOR_MINOR) MODULE_SUFFIX=-plus MODULE_PACKAGE_URL= https://www.nginx.com/ MODULE_PACKAGE_LICENSE= Proprietary (EULA included) @@ -100,17 +109,25 @@ fi; \ ifeq ($(BASE_TARGET), plus) BASE_CONFIGURE_ARGS+= \ - --build=nginx-plus-r$(PLUS_VERSION) \ - --mgmt-id-path=/var/lib/nginx/nginx.id \ + --build=nginx-plus-r$(PLUS_VERSION)$(RELSTRING)$(BUILD_SUFFIX) \ + --state-path=/var/lib/nginx/state \ + --with-control-api \ --with-http_auth_jwt_module \ --with-http_f4f_module \ --with-http_hls_module \ + --with-http_oidc_module \ --with-http_proxy_protocol_vendor_module \ --with-http_session_log_module \ --with-mgmt \ --with-stream_mqtt_filter_module \ --with-stream_mqtt_preread_module \ - --with-stream_proxy_protocol_vendor_module + --with-stream_proxy_protocol_vendor_module \ +$$( if [ 0%{?suse_version} -gt 0 ]; then \ + echo "--system-ca-bundle=/etc/ssl/ca-bundle.pem"; \ +else \ + echo "--system-ca-bundle=/etc/ssl/certs/ca-bundle.crt"; \ +fi;\ +) endif include $(CONTRIB)/attestation.mak @@ -180,6 +197,7 @@ endif -e 's#%%BASE_RELEASE%%#$(BASE_RELEASE)#g' \ -e 's#%%PLUS_VERSION%%#$(PLUS_VERSION)#g' \ -e 's#%%PLUS_RELEASE%%#$(PLUS_RELEASE)#g' \ + -e 's#%%NGINX_PLUS_MAJOR_MINOR%%#$(NGINX_PLUS_MAJOR_MINOR)#g' \ -e "s#%%BASE_PATCHES%%#$$patches#g" \ -e 's#%%BASE_CONFIGURE_ARGS%%#$(BASE_CONFIGURE_ARGS)#g' \ > nginx$(BASE_SUFFIX).spec ; \ @@ -188,6 +206,7 @@ endif -e 's#%%BASE_RELEASE%%#$(BASE_RELEASE)#g' \ -e 's#%%PLUS_VERSION%%#$(PLUS_VERSION)#g' \ -e 's#%%PLUS_RELEASE%%#$(PLUS_RELEASE)#g' \ + -e 's#%%NGINX_PLUS_MAJOR_MINOR%%#$(NGINX_PLUS_MAJOR_MINOR)#g' \ >> nginx$(BASE_SUFFIX).spec ; \ } @@ -279,6 +298,7 @@ nginx-module-%.spec: nginx-module-%.rpm-changelog -e "s#%%BASE_VERSION%%#$(BASE_VERSION)#g" \ -e "s#%%BASE_RELEASE%%#$(BASE_RELEASE)#g" \ -e "s#%%PLUS_VERSION%%#$(PLUS_VERSION)#g" \ + -e 's#%%NGINX_PLUS_MAJOR_MINOR%%#$(NGINX_PLUS_MAJOR_MINOR)#g' \ -e "s#%%VERSION_PREFIX%%#$(MODULE_VERSION_PREFIX_$(call modname, $*))#g" \ -e "s#%%VERSION%%#$(MODULE_VERSION_$(call modname, $*))#g" \ -e "s#%%RELEASE%%#$(MODULE_RELEASE_$(call modname, $*))#g" \ @@ -306,6 +326,7 @@ nginx-module-%.spec: nginx-module-%.rpm-changelog -e 's#%%BASE_VERSION%%#$(BASE_VERSION)#g' \ -e 's#%%BASE_RELEASE%%#$(BASE_RELEASE)#g' \ -e "s#%%PLUS_VERSION%%#$(PLUS_VERSION)#g" \ + -e 's#%%NGINX_PLUS_MAJOR_MINOR%%#$(NGINX_PLUS_MAJOR_MINOR)#g' \ -e "s#%%MODULE_VERSION%%#$(MODULE_VERSION_$(call modname, $*))#g" \ -e "s#%%MODULE_RELEASE%%#$(MODULE_RELEASE_$(call modname, $*))#g" \ >> $@.tmp && \ diff --git a/rpm/SPECS/Makefile.module-ndk b/rpm/SPECS/Makefile.module-ndk index b9a216c0..df058902 100644 --- a/rpm/SPECS/Makefile.module-ndk +++ b/rpm/SPECS/Makefile.module-ndk @@ -19,9 +19,9 @@ MODULE_CC_OPT_ndk=-DNDK_SET_VAR -DNDK_UPSTREAM_LIST MODULE_CC_OPT_DEBUG_ndk=$(MODULE_CC_OPT_ndk) ifeq ($(MODULE_TARGET), plus) -NDK_DEPENDENCY_TAG= nginx-plus-module-ndk-r$(PLUS_VERSION) +NDK_DEPENDENCY_TAG= nginx-plus-module-ndk-r$(NGINX_PLUS_MAJOR_MINOR) else -NDK_DEPENDENCY_TAG= nginx-module-ndk-r$(BASE_VERSION) +NDK_DEPENDENCY_TAG= nginx-module-ndk-r$(NGINX_PLUS_MAJOR_MINOR) endif define MODULE_POST_ndk diff --git a/rpm/SPECS/nginx-plus-module.spec.in b/rpm/SPECS/nginx-plus-module.spec.in index ebd68543..70bdd5b8 100644 --- a/rpm/SPECS/nginx-plus-module.spec.in +++ b/rpm/SPECS/nginx-plus-module.spec.in @@ -56,6 +56,7 @@ Epoch: %{epoch} %endif %define base_release %%BASE_RELEASE%%%{?dist}.ngx %define plus_version %%PLUS_VERSION%% +%define nginx_plus_major_minor %%NGINX_PLUS_MAJOR_MINOR%% %define bdir %{_builddir}/%{name}-%{base_version} @@ -82,8 +83,8 @@ License: %%MODULE_PACKAGE_LICENSE%% BuildRoot: %{_tmppath}/%{name}-%{base_version}-%{base_release}-root BuildRequires: zlib-devel BuildRequires: pcre2-devel -Requires: nginx-plus-r%{plus_version} -Provides: %{name}-r%{plus_version} +Requires: nginx-plus-r%{nginx_plus_major_minor} +Provides: %{name}-r%{nginx_plus_major_minor} %description NGINX Plus: %%SHORT_SUMMARY%%. From 3fd78137122dd37d469062623d1e0c13d291c564 Mon Sep 17 00:00:00 2001 From: Konstantin Pavlov Date: Tue, 5 May 2026 17:01:31 -0700 Subject: [PATCH 6/6] Fixed build_module.sh to accept new NGINX Plus versioning --- build_module.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/build_module.sh b/build_module.sh index 9a7597eb..b0811b1c 100755 --- a/build_module.sh +++ b/build_module.sh @@ -9,6 +9,7 @@ # Obtains pkg-oss tool, creates packaging files and copies in module source. # # CHANGELOG +# v0.20 [05-May-2026] Accept new versioning for NGINX Plus releases # v0.19 [03-Sep-2024] Moved to GitHub # v0.18 [29-Apr-2021] Added -V option to specify module version # v0.17 [11-Nov-2020] Fixed bashisms and made /bin/sh default interpreter @@ -63,7 +64,7 @@ if [ $# -eq 0 ]; then echo " -s | --skip-depends # Skip dependecies check/install" echo " -y | --non-interactive # Automatically install dependencies and overwrite files" echo " -f | --force-dynamic # Attempt to convert static configuration to dynamic module" - echo " -r # Build against the corresponding OSS version for this release" + echo " -r # Build against the corresponding OSS version for this release (NN[pN] or NN.N[.N])" echo " -v [NGINX OSS version number] # Build against this OSS version [current mainline] (default)" echo " -o # Create package(s) in this directory (default: $OUTPUT_DIR)" echo "" @@ -109,14 +110,15 @@ while [ $# -gt 1 ]; do ;; "-r") BUILD_PLATFORM=Plus - if [ `echo -n $2 | tr -d '[0-9p]' | wc -c` -gt 0 ]; then - echo "$ME: ERROR: NGINX Plus release must be in the format NN[pN] - quitting" + if [ `echo -n $2 | tr -d '[0-9p.]' | wc -c` -gt 0 ]; then + echo "$ME: ERROR: NGINX Plus release must be in the format NN[pN] or NN.N[.N] - quitting" exit 1 elif [ "`echo "10^$2" | tr '^' '\n' | sort -nr | head -1`" = "10" ]; then echo "$ME: ERROR: NGINX Plus release must be at least 11 to support dynamic modules - quitting" exit 1 fi - PLUS_REL=$2 + # Normalize NN.N.N to NN.N for git branch naming + PLUS_REL=`echo $2 | sed 's/^\([0-9]*\.[0-9]*\)\.[0-9]*$/\1/'` shift; shift ;; "-v")