9 files changed, 186 insertions, 18 deletions
diff --git a/pkg/deb/Makefile b/pkg/deb/Makefile
index 580cb655..09544892 100644
--- a/pkg/deb/Makefile
+++ b/pkg/deb/Makefile
@@ -19,6 +19,21 @@ BUILD_DEPENDS = $(BUILD_DEPENDS_unit)
 
 MODULES=
 
+# Ubuntu 23.04
+ifeq ($(CODENAME),lunar)
+include Makefile.php
+include Makefile.python311
+include Makefile.go
+include Makefile.perl
+include Makefile.ruby
+include Makefile.jsc-common
+include Makefile.jsc11
+include Makefile.jsc17
+include Makefile.jsc18
+include Makefile.jsc19
+include Makefile.jsc20
+endif
+
 # Ubuntu 22.10
 ifeq ($(CODENAME),kinetic)
 include Makefile.php
@@ -117,11 +132,11 @@ endif
 
 CONFIGURE_ARGS_COMMON=\
 	--prefix=/usr \
-	--state=/var/lib/unit \
+	--statedir=/var/lib/unit \
 	--control="unix:/var/run/control.unit.sock" \
 	--pid=/var/run/unit.pid \
 	--log=/var/log/unit.log \
-	--tmp=/var/tmp \
+	--tmpdir=/var/tmp \
 	--user=unit \
 	--group=unit \
 	--tests \
@@ -199,7 +214,8 @@ endif
 debuild/unit_$(VERSION).orig.tar.gz: | debuild/$(SRCDIR)/debian
 	cd ../.. && tar -czf pkg/deb/debuild/$(SRCDIR).tar.gz \
 		--transform "s#^#$(SRCDIR)/#" \
-		LICENSE NOTICE CHANGES README.md CONTRIBUTING.md configure auto src test version go pkg/contrib docs/man/unitd.8.in
+		LICENSE NOTICE CHANGES README.md CONTRIBUTING.md configure auto src \
+		test tools version go pkg/contrib docs/man/man8/unitd.8.in
 	mv debuild/$(SRCDIR).tar.gz debuild/unit_$(VERSION).orig.tar.gz
 	cd debuild && tar zxf unit_$(VERSION).orig.tar.gz
 
@@ -288,8 +304,8 @@ test: unit modules
 	for so in `find debuild-*/unit-$(VERSION)/debian/build-unit/ -type f \( -name "*.so" -o -name "*.jar" \)`; do \
 		soname=`basename $${so}` ; \
 		test "$${soname}" = "java.unit.so" && continue ; \
-		test -h debuild/unit-$(VERSION)/debian/build-unit/build/$${soname} || \
-		ln -fs `pwd`/$${so} debuild/unit-$(VERSION)/debian/build-unit/build/$${soname} ; \
+		test -h debuild/unit-$(VERSION)/debian/build-unit/build/lib/$${soname} || \
+		ln -fs `pwd`/$${so} debuild/unit-$(VERSION)/debian/build-unit/build/lib/$${soname} ; \
 	done ; \
 	( cd debuild/unit-$(VERSION)/debian/build-unit && env python3 -m pytest --user=nobody $(PYTEST_ARGS) ) ; \
 	}
@@ -299,8 +315,8 @@ test-debug: unit modules
 	for so in `find debuild-*/unit-$(VERSION)/debian/build-unit-debug/ -type f \( -name "*.so" -o -name "*.jar" \)`; do \
 		soname=`basename $${so}` ; \
 		test "$${soname}" = "java.unit.so" && continue ; \
-		test -h debuild/unit-$(VERSION)/debian/build-unit-debug/build/$${soname} || \
-		ln -fs `pwd`/$${so} debuild/unit-$(VERSION)/debian/build-unit-debug/build/$${soname} ; \
+		test -h debuild/unit-$(VERSION)/debian/build-unit-debug/build/lib/$${soname} || \
+		ln -fs `pwd`/$${so} debuild/unit-$(VERSION)/debian/build-unit-debug/build/lib/$${soname} ; \
 	done ; \
 	( cd debuild/unit-$(VERSION)/debian/build-unit-debug && env python3 -m pytest --user=nobody $(PYTEST_ARGS) ) ; \
 	}
diff --git a/pkg/deb/Makefile.jsc20 b/pkg/deb/Makefile.jsc20
new file mode 100644
index 00000000..5b7c6d9f
--- /dev/null
+++ b/pkg/deb/Makefile.jsc20
@@ -0,0 +1,71 @@
+MODULES+=		jsc20
+MODULE_SUFFIX_jsc20=	jsc20
+
+MODULE_SUMMARY_jsc20=	Java 20 module for NGINX Unit
+
+MODULE_VERSION_jsc20=	$(VERSION)
+MODULE_RELEASE_jsc20=	1
+
+MODULE_CONFARGS_jsc20=	java --module=java20 --home=/usr/lib/jvm/java-20-openjdk-$$\(DEB_HOST_ARCH\) --jars=/usr/share/unit-jsc-common/
+MODULE_MAKEARGS_jsc20=	java20
+MODULE_INSTARGS_jsc20=	java20-install
+
+MODULE_SOURCES_jsc20=	unit.example-jsc-app \
+			unit.example-jsc20-config
+
+BUILD_DEPENDS_jsc20=	openjdk-20-jdk-headless openjdk-20-jre-headless
+BUILD_DEPENDS+=		$(BUILD_DEPENDS_jsc20)
+
+MODULE_BUILD_DEPENDS_jsc20=,openjdk-20-jdk-headless
+MODULE_DEPENDS_jsc20=,openjdk-20-jre-headless,unit-jsc-common (= $(MODULE_VERSION_jsc_common)-$(MODULE_RELEASE_jsc_common)~$(CODENAME))
+
+define MODULE_PREINSTALL_jsc20
+	mkdir -p debian/unit-jsc20/usr/share/doc/unit-jsc20/examples/jsc-app
+	install -m 644 -p debian/unit.example-jsc-app debian/unit-jsc20/usr/share/doc/unit-jsc20/examples/jsc-app/index.jsp
+	install -m 644 -p debian/unit.example-jsc20-config debian/unit-jsc20/usr/share/doc/unit-jsc20/examples/unit.config
+	install -m 644 -p src/java/README.JSR-340 debian/unit-jsc20/usr/share/doc/unit-jsc20/
+endef
+export MODULE_PREINSTALL_jsc20
+
+define MODULE_POSTINSTALL_jsc20
+	cd $$\(BUILDDIR_unit\) \&\& \
+        DESTDIR=$$\(INSTALLDIR\) make java-shared-uninstall
+endef
+export MODULE_POSTINSTALL_jsc20
+
+define MODULE_POST_jsc20
+cat <<BANNER
+----------------------------------------------------------------------
+
+The $(MODULE_SUMMARY_jsc20) has been installed.
+
+To check out the sample app, run these commands:
+
+ sudo service unit restart
+ cd /usr/share/doc/unit-$(MODULE_SUFFIX_jsc20)/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_jsc20
diff --git a/pkg/deb/Makefile.python311 b/pkg/deb/Makefile.python311
new file mode 100644
index 00000000..67fd3289
--- /dev/null
+++ b/pkg/deb/Makefile.python311
@@ -0,0 +1,46 @@
+MODULES+=			python311
+MODULE_SUFFIX_python311=		python3.11
+
+MODULE_SUMMARY_python311=	Python 3.11 module for NGINX Unit
+
+MODULE_VERSION_python311=	$(VERSION)
+MODULE_RELEASE_python311=	1
+
+MODULE_CONFARGS_python311=	python --config=python3.11-config
+MODULE_MAKEARGS_python311=	python3.11
+MODULE_INSTARGS_python311=	python3.11-install
+
+MODULE_SOURCES_python311=	unit.example-python-app \
+				unit.example-python3.11-config
+
+BUILD_DEPENDS_python311=	python3.11-dev
+BUILD_DEPENDS+=		$(BUILD_DEPENDS_python311)
+
+MODULE_BUILD_DEPENDS_python311=,python3.11-dev
+
+define MODULE_PREINSTALL_python311
+	mkdir -p debian/unit-python3.11/usr/share/doc/unit-python3.11/examples/python-app
+	install -m 644 -p debian/unit.example-python-app debian/unit-python3.11/usr/share/doc/unit-python3.11/examples/python-app/wsgi.py
+	install -m 644 -p debian/unit.example-python3.11-config debian/unit-python3.11/usr/share/doc/unit-python3.11/examples/unit.config
+endef
+export MODULE_PREINSTALL_python311
+
+define MODULE_POST_python311
+cat <<BANNER
+----------------------------------------------------------------------
+
+The $(MODULE_SUMMARY_python311) has been installed.
+
+To check out the sample app, run these commands:
+
+ sudo service unit restart
+ cd /usr/share/doc/unit-$(MODULE_SUFFIX_python311)/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_python311
diff --git a/pkg/deb/debian.module/rules-noarch.in b/pkg/deb/debian.module/rules-noarch.in
index 0f05aaba..e56e06bc 100644
--- a/pkg/deb/debian.module/rules-noarch.in
+++ b/pkg/deb/debian.module/rules-noarch.in
@@ -35,7 +35,7 @@ configure.unit: config.env.unit
 	cd $(BUILDDIR_unit) && \
 	CFLAGS= ./configure \
 		%%CONFIGURE_ARGS%% \
-		--modules=/usr/lib/unit/modules \
+		--modulesdir=/usr/lib/unit/modules \
 		--cc-opt="$(CFLAGS)" && \
 	./configure %%MODULE_CONFARGS%%
 	touch $@
@@ -44,7 +44,7 @@ configure.unit_debug: config.env.unit_debug
 	cd $(BUILDDIR_unit_debug) && \
 	CFLAGS= ./configure \
 		%%CONFIGURE_ARGS%% \
-		--modules=/usr/lib/unit/debug-modules \
+		--modulesdir=/usr/lib/unit/debug-modules \
 		--cc-opt="$(CFLAGS)" \
 		--debug && \
 	./configure %%MODULE_CONFARGS%%
diff --git a/pkg/deb/debian.module/rules.in b/pkg/deb/debian.module/rules.in
index f1217553..861a9c00 100755
--- a/pkg/deb/debian.module/rules.in
+++ b/pkg/deb/debian.module/rules.in
@@ -35,7 +35,7 @@ configure.unit: config.env.unit
 	cd $(BUILDDIR_unit) && \
 	CFLAGS= ./configure \
 		%%CONFIGURE_ARGS%% \
-		--modules=/usr/lib/unit/modules \
+		--modulesdir=/usr/lib/unit/modules \
 		--cc-opt="$(CFLAGS)" && \
 	./configure %%MODULE_CONFARGS%%
 	touch $@
@@ -44,7 +44,7 @@ configure.unit_debug: config.env.unit_debug
 	cd $(BUILDDIR_unit_debug) && \
 	CFLAGS= ./configure \
 		%%CONFIGURE_ARGS%% \
-		--modules=/usr/lib/unit/debug-modules \
+		--modulesdir=/usr/lib/unit/debug-modules \
 		--cc-opt="$(CFLAGS)" \
 		--debug && \
 	./configure %%MODULE_CONFARGS%%
diff --git a/pkg/deb/debian.module/unit.example-jsc20-config b/pkg/deb/debian.module/unit.example-jsc20-config
new file mode 100644
index 00000000..57865a45
--- /dev/null
+++ b/pkg/deb/debian.module/unit.example-jsc20-config
@@ -0,0 +1,15 @@
+{
+	"applications": {
+		"example_java20": {
+			"processes": 1,
+			"type": "java 20",
+			"webapp": "/usr/share/doc/unit-jsc20/examples/jsc-app"
+		}
+	},
+
+	"listeners": {
+		"*:8800": {
+			"pass": "applications/example_java20"
+		}
+	}
+}
diff --git a/pkg/deb/debian.module/unit.example-python3.11-config b/pkg/deb/debian.module/unit.example-python3.11-config
new file mode 100644
index 00000000..39b31b57
--- /dev/null
+++ b/pkg/deb/debian.module/unit.example-python3.11-config
@@ -0,0 +1,16 @@
+{
+	"applications": {
+		"example_python": {
+			"type": "python 3.11",
+			"processes": 2,
+			"path": "/usr/share/doc/unit-python3.11/examples/python-app",
+			"module": "wsgi"
+		}
+	},
+
+	"listeners": {
+		"*:8400": {
+			"pass": "applications/example_python"
+		}
+	}
+}
diff --git a/pkg/deb/debian/dirs b/pkg/deb/debian/dirs
index 4a6618c8..2568bac1 100644
--- a/pkg/deb/debian/dirs
+++ b/pkg/deb/debian/dirs
@@ -1,3 +1,4 @@
+usr/bin
 usr/sbin
 usr/lib/unit
 var/lib/unit
diff --git a/pkg/deb/debian/rules.in b/pkg/deb/debian/rules.in
index 23812926..0d7cf830 100644
--- a/pkg/deb/debian/rules.in
+++ b/pkg/deb/debian/rules.in
@@ -32,6 +32,7 @@ config.env.%: njs
 	cp -Pa $(CURDIR)/configure $(BUILDDIR_$*)/
 	cp -Pa $(CURDIR)/src $(BUILDDIR_$*)/
 	cp -Pa $(CURDIR)/test $(BUILDDIR_$*)/
+	cp -Pa $(CURDIR)/tools $(BUILDDIR_$*)/
 	cp -Pa $(CURDIR)/version $(BUILDDIR_$*)/
 	cp -Pa $(CURDIR)/CHANGES $(BUILDDIR_$*)/
 	cp -Pa $(CURDIR)/LICENSE $(BUILDDIR_$*)/
@@ -39,8 +40,8 @@ config.env.%: njs
 	cp -Pa $(CURDIR)/README.md $(BUILDDIR_$*)/
 	cp -Pa $(CURDIR)/CONTRIBUTING.md $(BUILDDIR_$*)/
 	cp -Pa $(CURDIR)/go $(BUILDDIR_$*)/
-	mkdir -p $(BUILDDIR_$*)/docs/man
-	cp -Pa $(CURDIR)/docs/man/unitd.8.in $(BUILDDIR_$*)/docs/man/
+	mkdir -p $(BUILDDIR_$*)/docs/man/man8
+	cp -Pa $(CURDIR)/docs/man/man8/unitd.8.in $(BUILDDIR_$*)/docs/man/man8/
 	touch $@
 
 configure.unit: config.env.unit
@@ -48,7 +49,7 @@ configure.unit: config.env.unit
 	PKG_CONFIG_PATH=$(CURDIR)/pkg/contrib/njs/build \
 	CFLAGS= ./configure \
 		%%CONFIGURE_ARGS%% \
-		--modules=/usr/lib/unit/modules \
+		--modulesdir=/usr/lib/unit/modules \
 		--libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
 		--cc-opt="$(CFLAGS)" \
 		--ld-opt="$(LDFLAGS)"
@@ -59,7 +60,7 @@ configure.unit_debug: config.env.unit_debug
 	PKG_CONFIG_PATH=$(CURDIR)/pkg/contrib/njs/build \
 	CFLAGS= ./configure \
 		%%CONFIGURE_ARGS%% \
-		--modules=/usr/lib/unit/debug-modules \
+		--modulesdir=/usr/lib/unit/debug-modules \
 		--libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
 		--cc-opt="$(CFLAGS)" \
 		--ld-opt="$(LDFLAGS)" \
@@ -69,7 +70,7 @@ configure.unit_debug: config.env.unit_debug
 build-arch.%: configure.%
 	dh_testdir
 	$(MAKE) -C $(BUILDDIR_$*)
-	$(MAKE) -C $(BUILDDIR_$*) build/libunit.a
+	$(MAKE) -C $(BUILDDIR_$*) build/lib/libunit.a
 ifeq ($(DOTESTS), 1)
 	$(MAKE) -C $(BUILDDIR_$*) tests
 endif
@@ -112,8 +113,10 @@ install: build do.tests
 	dh_installlogrotate
 	cd $(BUILDDIR_unit) && DESTDIR=$(INSTALLDIR) make install
 	cd $(BUILDDIR_unit) && DESTDIR=$(INSTALLDIR_dev) make libunit-install
-	install -m 755 $(BUILDDIR_unit_debug)/build/unitd $(INSTALLDIR)/usr/sbin/unitd-debug
-	install -m 644 $(BUILDDIR_unit_debug)/build/libunit.a $(INSTALLDIR_dev)/usr/lib/$(DEB_HOST_MULTIARCH)/libunit-debug.a
+	install -m 755 $(BUILDDIR_unit)/tools/unitc $(INSTALLDIR)/usr/bin/unitc
+	install -m 755 $(BUILDDIR_unit)/tools/setup-unit $(INSTALLDIR)/usr/bin/setup-unit
+	install -m 755 $(BUILDDIR_unit_debug)/build/sbin/unitd $(INSTALLDIR)/usr/sbin/unitd-debug
+	install -m 644 $(BUILDDIR_unit_debug)/build/lib/libunit.a $(INSTALLDIR_dev)/usr/lib/$(DEB_HOST_MULTIARCH)/libunit-debug.a
 	mkdir -p $(INSTALLDIR)/usr/share/doc/unit/examples
 	install -m 644 debian/unit.example.config $(INSTALLDIR)/usr/share/doc/unit/examples/example.config
 	install -m 644 CHANGES $(INSTALLDIR)/usr/share/doc/unit/changelog