Merge tag '1.32.0' into branches/packaging1.32.0-1

Unit 1.32.0 release.

9 files changed, 204 insertions, 21 deletions

diff --git a/pkg/deb/Makefile b/pkg/deb/Makefile
index f82441c6..e48de155 100644
--- a/pkg/deb/Makefile
+++ b/pkg/deb/Makefile
@@ -19,6 +19,23 @@ BUILD_DEPENDS = $(BUILD_DEPENDS_unit)
 
 MODULES=
 
+# Ubuntu 23.10
+ifeq ($(CODENAME),mantic)
+include Makefile.php
+include Makefile.python311
+include Makefile.python312
+include Makefile.go
+include Makefile.perl
+include Makefile.ruby
+include Makefile.jsc-common
+include Makefile.jsc11
+include Makefile.jsc17
+include Makefile.jsc19
+include Makefile.jsc20
+include Makefile.jsc21
+include Makefile.wasm
+endif
+
 # Ubuntu 23.04
 ifeq ($(CODENAME),lunar)
 include Makefile.php
diff --git a/pkg/deb/Makefile.jsc21 b/pkg/deb/Makefile.jsc21
new file mode 100644
index 00000000..82e7f9a2
--- /dev/null
+++ b/pkg/deb/Makefile.jsc21
@@ -0,0 +1,71 @@
+MODULES+=		jsc21
+MODULE_SUFFIX_jsc21=	jsc21
+
+MODULE_SUMMARY_jsc21=	Java 21 module for NGINX Unit
+
+MODULE_VERSION_jsc21=	$(VERSION)
+MODULE_RELEASE_jsc21=	1
+
+MODULE_CONFARGS_jsc21=	java --module=java21 --home=/usr/lib/jvm/java-21-openjdk-$$\(DEB_HOST_ARCH\) --jars=/usr/share/unit-jsc-common/
+MODULE_MAKEARGS_jsc21=	java21
+MODULE_INSTARGS_jsc21=	java21-install
+
+MODULE_SOURCES_jsc21=	unit.example-jsc-app \
+			unit.example-jsc21-config
+
+BUILD_DEPENDS_jsc21=	openjdk-21-jdk-headless openjdk-21-jre-headless
+BUILD_DEPENDS+=		$(BUILD_DEPENDS_jsc21)
+
+MODULE_BUILD_DEPENDS_jsc21=,openjdk-21-jdk-headless
+MODULE_DEPENDS_jsc21=,openjdk-21-jre-headless,unit-jsc-common (= $(MODULE_VERSION_jsc_common)-$(MODULE_RELEASE_jsc_common)~$(CODENAME))
+
+define MODULE_PREINSTALL_jsc21
+	mkdir -p debian/unit-jsc21/usr/share/doc/unit-jsc21/examples/jsc-app
+	install -m 644 -p debian/unit.example-jsc-app debian/unit-jsc21/usr/share/doc/unit-jsc21/examples/jsc-app/index.jsp
+	install -m 644 -p debian/unit.example-jsc21-config debian/unit-jsc21/usr/share/doc/unit-jsc21/examples/unit.config
+	install -m 644 -p src/java/README.JSR-340 debian/unit-jsc21/usr/share/doc/unit-jsc21/
+endef
+export MODULE_PREINSTALL_jsc21
+
+define MODULE_POSTINSTALL_jsc21
+	cd $$\(BUILDDIR_unit\) \&\& \
+        DESTDIR=$$\(INSTALLDIR\) make java-shared-uninstall
+endef
+export MODULE_POSTINSTALL_jsc21
+
+define MODULE_POST_jsc21
+cat <<BANNER
+----------------------------------------------------------------------
+
+The $(MODULE_SUMMARY_jsc21) has been installed.
+
+To check out the sample app, run these commands:
+
+ sudo service unit restart
+ cd /usr/share/doc/unit-$(MODULE_SUFFIX_jsc21)/examples
+ sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock http://localhost/config
+ curl http://localhost:8800/
+
+Online documentation is available at https://unit.nginx.org
+
+NOTICE:
+
+This version of Unit code is made available in support of the open source
+development process.  This is an intermediate build made available for
+testing purposes only.  This Unit code is untested and presumed incompatible
+with the JSR 340 Java Servlet 3.1 specification.  You should not deploy or
+write to this code.  You should instead deploy and write production
+applications on pre-built binaries that have been tested and certified
+to meet the JSR-340 compatibility requirements such as certified binaries
+published for the JSR-340 reference implementation available at
+https://javaee.github.io/glassfish/.
+
+Redistribution of any Intermediate Build must retain this notice.
+
+Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+Other names may be trademarks of their respective owners.
+
+----------------------------------------------------------------------
+BANNER
+endef
+export MODULE_POST_jsc21
diff --git a/pkg/deb/Makefile.python312 b/pkg/deb/Makefile.python312
new file mode 100644
index 00000000..9ece7877
--- /dev/null
+++ b/pkg/deb/Makefile.python312
@@ -0,0 +1,46 @@
+MODULES+=			python312
+MODULE_SUFFIX_python312=		python3.12
+
+MODULE_SUMMARY_python312=	Python 3.12 module for NGINX Unit
+
+MODULE_VERSION_python312=	$(VERSION)
+MODULE_RELEASE_python312=	1
+
+MODULE_CONFARGS_python312=	python --config=python3.12-config
+MODULE_MAKEARGS_python312=	python3.12
+MODULE_INSTARGS_python312=	python3.12-install
+
+MODULE_SOURCES_python312=	unit.example-python-app \
+				unit.example-python3.12-config
+
+BUILD_DEPENDS_python312=	python3.12-dev
+BUILD_DEPENDS+=		$(BUILD_DEPENDS_python312)
+
+MODULE_BUILD_DEPENDS_python312=,python3.12-dev
+
+define MODULE_PREINSTALL_python312
+	mkdir -p debian/unit-python3.12/usr/share/doc/unit-python3.12/examples/python-app
+	install -m 644 -p debian/unit.example-python-app debian/unit-python3.12/usr/share/doc/unit-python3.12/examples/python-app/wsgi.py
+	install -m 644 -p debian/unit.example-python3.12-config debian/unit-python3.12/usr/share/doc/unit-python3.12/examples/unit.config
+endef
+export MODULE_PREINSTALL_python312
+
+define MODULE_POST_python312
+cat <<BANNER
+----------------------------------------------------------------------
+
+The $(MODULE_SUMMARY_python312) has been installed.
+
+To check out the sample app, run these commands:
+
+ sudo service unit restart
+ cd /usr/share/doc/unit-$(MODULE_SUFFIX_python312)/examples
+ sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock http://localhost/config
+ curl http://localhost:8400/
+
+Online documentation is available at https://unit.nginx.org
+
+----------------------------------------------------------------------
+BANNER
+endef
+export MODULE_POST_python312
diff --git a/pkg/deb/Makefile.wasm b/pkg/deb/Makefile.wasm
index da028f19..8f3fdc67 100644
--- a/pkg/deb/Makefile.wasm
+++ b/pkg/deb/Makefile.wasm
@@ -6,9 +6,9 @@ MODULE_SUMMARY_wasm=	WASM module for NGINX Unit
 MODULE_VERSION_wasm=	$(VERSION)
 MODULE_RELEASE_wasm=	1
 
-MODULE_CONFARGS_wasm=	wasm --include-path=\$$(CURDIR)/pkg/contrib/wasmtime/crates/c-api/include --lib-path=\$$(CURDIR)/pkg/contrib/wasmtime/target/release
-MODULE_MAKEARGS_wasm=	wasm
-MODULE_INSTARGS_wasm=	wasm-install
+MODULE_CONFARGS_wasm=	wasm --include-path=\$$(CURDIR)/pkg/contrib/wasmtime/crates/c-api/include --lib-path=\$$(CURDIR)/pkg/contrib/wasmtime/target/release \&\& ./configure wasm-wasi-component
+MODULE_MAKEARGS_wasm=	wasm wasm-wasi-component CFLAGS=\"\$$(shell grep ^CFLAGS \$$(BUILDDIR_\$$*)/build/Makefile | cut -d' ' -f 3-) -Wno-missing-prototypes\"
+MODULE_INSTARGS_wasm=	wasm-install wasm-wasi-component-install
 
 MODULE_SOURCES_wasm=
 
diff --git a/pkg/deb/debian.module/copyright.unit-jsc11 b/pkg/deb/debian.module/copyright.unit-jsc11
index e11b64d3..6e512e86 100644
--- a/pkg/deb/debian.module/copyright.unit-jsc11
+++ b/pkg/deb/debian.module/copyright.unit-jsc11
@@ -1,13 +1,19 @@
 
    NGINX Unit.
 
-   Copyright 2017-2023 NGINX, Inc.
-   Copyright 2017-2023 Andrei Zeliankou
-   Copyright 2018-2023 Konstantin Pavlov
-   Copyright 2021-2023 Zhidao Hong
+   Copyright 2017-2024 NGINX, Inc.
+   Copyright 2017-2024 Andrei Zeliankou
+   Copyright 2018-2024 Konstantin Pavlov
+   Copyright 2021-2024 Zhidao Hong
+   Copyright 2022-2024 Andrew Clayton
+   Copyright 2022-2024 Liam Crilly
+   Copyright 2023-2024 Dan Callahan
+   Copyright 2023-2024 Danielle De Leo
+   Copyright 2023-2024 Dylan Arbour
+   Copyright 2023-2024 Gabor Javorszky
+   Copyright 2023-2024 Igor Ippolitov
+   Copyright 2023-2024 Taryn Musgrave
    Copyright 2021-2023 Alejandro Colomar
-   Copyright 2022-2023 Andrew Clayton
-   Copyright 2022-2023 Liam Crilly
    Copyright 2017-2022 Valentin V. Bartenev
    Copyright 2017-2022 Max Romanov
    Copyright 2021-2022 Oisín Canty
diff --git a/pkg/deb/debian.module/copyright.unit-jsc8 b/pkg/deb/debian.module/copyright.unit-jsc8
index 1d267021..60da2dfa 100644
--- a/pkg/deb/debian.module/copyright.unit-jsc8
+++ b/pkg/deb/debian.module/copyright.unit-jsc8
@@ -1,13 +1,19 @@
 
    NGINX Unit.
 
-   Copyright 2017-2023 NGINX, Inc.
-   Copyright 2017-2023 Andrei Zeliankou
-   Copyright 2018-2023 Konstantin Pavlov
-   Copyright 2021-2023 Zhidao Hong
+   Copyright 2017-2024 NGINX, Inc.
+   Copyright 2017-2024 Andrei Zeliankou
+   Copyright 2018-2024 Konstantin Pavlov
+   Copyright 2021-2024 Zhidao Hong
+   Copyright 2022-2024 Andrew Clayton
+   Copyright 2022-2024 Liam Crilly
+   Copyright 2023-2024 Dan Callahan
+   Copyright 2023-2024 Danielle De Leo
+   Copyright 2023-2024 Dylan Arbour
+   Copyright 2023-2024 Gabor Javorszky
+   Copyright 2023-2024 Igor Ippolitov
+   Copyright 2023-2024 Taryn Musgrave
    Copyright 2021-2023 Alejandro Colomar
-   Copyright 2022-2023 Andrew Clayton
-   Copyright 2022-2023 Liam Crilly
    Copyright 2017-2022 Valentin V. Bartenev
    Copyright 2017-2022 Max Romanov
    Copyright 2021-2022 Oisín Canty
diff --git a/pkg/deb/debian.module/unit.example-jsc21-config b/pkg/deb/debian.module/unit.example-jsc21-config
new file mode 100644
index 00000000..a20cff8f
--- /dev/null
+++ b/pkg/deb/debian.module/unit.example-jsc21-config
@@ -0,0 +1,15 @@
+{
+	"applications": {
+		"example_java21": {
+			"processes": 1,
+			"type": "java 21",
+			"webapp": "/usr/share/doc/unit-jsc21/examples/jsc-app"
+		}
+	},
+
+	"listeners": {
+		"*:8800": {
+			"pass": "applications/example_java21"
+		}
+	}
+}
diff --git a/pkg/deb/debian.module/unit.example-python3.12-config b/pkg/deb/debian.module/unit.example-python3.12-config
new file mode 100644
index 00000000..37b65f1f
--- /dev/null
+++ b/pkg/deb/debian.module/unit.example-python3.12-config
@@ -0,0 +1,16 @@
+{
+	"applications": {
+		"example_python": {
+			"type": "python 3.12",
+			"processes": 2,
+			"path": "/usr/share/doc/unit-python3.12/examples/python-app",
+			"module": "wsgi"
+		}
+	},
+
+	"listeners": {
+		"*:8400": {
+			"pass": "applications/example_python"
+		}
+	}
+}
diff --git a/pkg/deb/debian/copyright b/pkg/deb/debian/copyright
index 692ae2e0..dbc37146 100644
--- a/pkg/deb/debian/copyright
+++ b/pkg/deb/debian/copyright
@@ -1,13 +1,19 @@
 
    NGINX Unit.
 
-   Copyright 2017-2023 NGINX, Inc.
-   Copyright 2017-2023 Andrei Zeliankou
-   Copyright 2018-2023 Konstantin Pavlov
-   Copyright 2021-2023 Zhidao Hong
+   Copyright 2017-2024 NGINX, Inc.
+   Copyright 2017-2024 Andrei Zeliankou
+   Copyright 2018-2024 Konstantin Pavlov
+   Copyright 2021-2024 Zhidao Hong
+   Copyright 2022-2024 Andrew Clayton
+   Copyright 2022-2024 Liam Crilly
+   Copyright 2023-2024 Dan Callahan
+   Copyright 2023-2024 Danielle De Leo
+   Copyright 2023-2024 Dylan Arbour
+   Copyright 2023-2024 Gabor Javorszky
+   Copyright 2023-2024 Igor Ippolitov
+   Copyright 2023-2024 Taryn Musgrave
    Copyright 2021-2023 Alejandro Colomar
-   Copyright 2022-2023 Andrew Clayton
-   Copyright 2022-2023 Liam Crilly
    Copyright 2017-2022 Valentin V. Bartenev
    Copyright 2017-2022 Max Romanov
    Copyright 2021-2022 Oisín Canty