From 3a2687bb714226ab13111cac2149afc660fa70e7 Mon Sep 17 00:00:00 2001
From: Konstantin Pavlov <thresh@nginx.com>
Date: Tue, 17 Oct 2023 16:22:44 -0700
Subject: [PATCH] Packages: added Ubuntu 23.10 "mantic" support.

---
 docs/changes.xml                              | 29 +++++++-
 pkg/deb/Makefile                              | 17 +++++
 pkg/deb/Makefile.jsc21                        | 71 +++++++++++++++++++
 pkg/deb/Makefile.python312                    | 46 ++++++++++++
 .../debian.module/unit.example-jsc21-config   | 15 ++++
 .../unit.example-python3.12-config            | 16 +++++
 6 files changed, 193 insertions(+), 1 deletion(-)
 create mode 100644 pkg/deb/Makefile.jsc21
 create mode 100644 pkg/deb/Makefile.python312
 create mode 100644 pkg/deb/debian.module/unit.example-jsc21-config
 create mode 100644 pkg/deb/debian.module/unit.example-python3.12-config

diff --git a/docs/changes.xml b/docs/changes.xml
index 50867856..428da0ba 100644
--- a/docs/changes.xml
+++ b/docs/changes.xml
@@ -5,16 +5,43 @@
 <change_log title="unit">
 
 
+<changes apply="unit-jsc21" ver="1.32.0" rev="1"
+         date="2023-10-17" time="16:00:00 -0700"
+         packager="Nginx Packaging &lt;nginx-packaging@f5.com&gt;">
+
+<change>
+<para>
+Initial release of Java 21 module for NGINX Unit.
+</para>
+</change>
+
+</changes>
+
+
+<changes apply="unit-python3.12" ver="1.32.0" rev="1"
+         date="2023-10-17" time="16:00:00 -0700"
+         packager="Nginx Packaging &lt;nginx-packaging@f5.com&gt;">
+
+<change>
+<para>
+Initial release of Python 3.12 module for NGINX Unit.
+</para>
+</change>
+
+</changes>
+
+
 <changes apply="unit-php
                 unit-python unit-python2.7
                 unit-python3.4 unit-python3.5 unit-python3.6 unit-python3.7
                 unit-python3.8 unit-python3.9 unit-python3.10 unit-python3.11
+                unit-python3.12
                 unit-go
                 unit-perl
                 unit-ruby
                 unit-jsc-common unit-jsc8 unit-jsc10 unit-jsc11 unit-jsc13
                 unit-jsc14 unit-jsc15 unit-jsc16 unit-jsc17 unit-jsc18
-                unit-jsc19 unit-jsc20
+                unit-jsc19 unit-jsc20 unit-jsc21
                 unit-wasm"
          ver="1.32.0" rev="1"
          date="" time=""
diff --git a/pkg/deb/Makefile b/pkg/deb/Makefile
index ce16068d..8bfe6c19 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/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"
+		}
+	}
+}