Merged with the default branch.1.24.0-1

11 files changed, 259 insertions, 4 deletions

diff --git a/pkg/deb/Makefile b/pkg/deb/Makefile
index 8c33fc53..c343eb53 100644
--- a/pkg/deb/Makefile
+++ b/pkg/deb/Makefile
@@ -8,6 +8,8 @@ DEFAULT_RELEASE := 1
 VERSION ?= $(DEFAULT_VERSION)
 RELEASE ?= $(DEFAULT_RELEASE)
 
+PACKAGE_VENDOR = NGINX Packaging <nginx-packaging@f5.com>
+
 SRCDIR=	unit-$(VERSION)
 
 CODENAME = $(shell lsb_release -cs)
@@ -17,6 +19,21 @@ BUILD_DEPENDS = $(BUILD_DEPENDS_unit)
 
 MODULES=
 
+# Ubuntu 21.04
+ifeq ($(CODENAME),hirsute)
+include Makefile.php
+include Makefile.python27
+include Makefile.python39
+include Makefile.go
+include Makefile.perl
+include Makefile.ruby
+include Makefile.jsc-common
+include Makefile.jsc11
+include Makefile.jsc15
+include Makefile.jsc16
+include Makefile.jsc17
+endif
+
 # Ubuntu 20.10
 ifeq ($(CODENAME),groovy)
 include Makefile.php
@@ -205,6 +222,9 @@ debuild/$(SRCDIR)/debian:
 	echo '9' > debuild/$(SRCDIR)/debian/compat ; \
 	mkdir -p debuild/$(SRCDIR)/debian/source ; \
 	echo '3.0 (quilt)' > debuild/$(SRCDIR)/debian/source/format ; \
+	cat debian/control.in | sed \
+		-e "s#%%PACKAGE_VENDOR%%#$(PACKAGE_VENDOR)#g" \
+	> debuild/$(SRCDIR)/debian/control ; \
         cat debian/rules.in | sed \
                 -e "s#%%CONFIGURE_ARGS%%#$(CONFIGURE_ARGS)#g" \
         > debuild/$(SRCDIR)/debian/rules ; \
@@ -280,6 +300,7 @@ endif
                 -e "s#%%UNIT_RELEASE%%#$(RELEASE)#g" \
                 -e "s#%%VERSION%%#$(MODULE_VERSION_$*)#g" \
                 -e "s#%%RELEASE%%#$(MODULE_RELEASE_$*)#g" \
+                -e "s#%%PACKAGE_VENDOR%%#$(PACKAGE_VENDOR)#g" \
                 -e "s#%%MODULE_BUILD_DEPENDS%%#$(MODULE_BUILD_DEPENDS_$*)#g" \
                 -e "s#%%MODULE_DEPENDS%%#$(MODULE_DEPENDS_$*)#g" \
         > $@/$(SRCDIR)/debian/control ; \
diff --git a/pkg/deb/Makefile.jsc-common b/pkg/deb/Makefile.jsc-common
index f7a6010b..1c4a77b5 100644
--- a/pkg/deb/Makefile.jsc-common
+++ b/pkg/deb/Makefile.jsc-common
@@ -6,7 +6,7 @@ MODULE_SUMMARY_jsc_common=	Java shared packages for NGINX Unit
 MODULE_VERSION_jsc_common=	$(VERSION)
 MODULE_RELEASE_jsc_common=	1
 
-ifneq (,$(findstring $(CODENAME),groovy focal eoan disco buster))
+ifneq (,$(findstring $(CODENAME),hirsute groovy focal eoan disco buster))
 JAVA_MINVERSION=	11
 else
 JAVA_MINVERSION=	8
diff --git a/pkg/deb/Makefile.jsc16 b/pkg/deb/Makefile.jsc16
new file mode 100644
index 00000000..f45e1299
--- /dev/null
+++ b/pkg/deb/Makefile.jsc16
@@ -0,0 +1,71 @@
+MODULES+=		jsc16
+MODULE_SUFFIX_jsc16=	jsc16
+
+MODULE_SUMMARY_jsc16=	Java 16 module for NGINX Unit
+
+MODULE_VERSION_jsc16=	$(VERSION)
+MODULE_RELEASE_jsc16=	1
+
+MODULE_CONFARGS_jsc16=	java --module=java16 --home=/usr/lib/jvm/java-16-openjdk-$$\(DEB_HOST_ARCH\) --jars=/usr/share/unit-jsc-common/
+MODULE_MAKEARGS_jsc16=	java16
+MODULE_INSTARGS_jsc16=	java16-install
+
+MODULE_SOURCES_jsc16=	unit.example-jsc-app \
+			unit.example-jsc16-config
+
+BUILD_DEPENDS_jsc16=	openjdk-16-jdk-headless openjdk-16-jre-headless
+BUILD_DEPENDS+=		$(BUILD_DEPENDS_jsc16)
+
+MODULE_BUILD_DEPENDS_jsc16=,openjdk-16-jdk-headless
+MODULE_DEPENDS_jsc16=,openjdk-16-jre-headless,unit-jsc-common (= $(MODULE_VERSION_jsc_common)-$(MODULE_RELEASE_jsc_common)~$(CODENAME))
+
+define MODULE_PREINSTALL_jsc16
+	mkdir -p debian/unit-jsc16/usr/share/doc/unit-jsc16/examples/jsc-app
+	install -m 644 -p debian/unit.example-jsc-app debian/unit-jsc16/usr/share/doc/unit-jsc16/examples/jsc-app/index.jsp
+	install -m 644 -p debian/unit.example-jsc16-config debian/unit-jsc16/usr/share/doc/unit-jsc16/examples/unit.config
+	install -m 644 -p src/java/README.JSR-340 debian/unit-jsc16/usr/share/doc/unit-jsc16/
+endef
+export MODULE_PREINSTALL_jsc16
+
+define MODULE_POSTINSTALL_jsc16
+	cd $$\(BUILDDIR_unit\) \&\& \
+        DESTDIR=$$\(INSTALLDIR\) make java-shared-uninstall
+endef
+export MODULE_POSTINSTALL_jsc16
+
+define MODULE_POST_jsc16
+cat <<BANNER
+----------------------------------------------------------------------
+
+The $(MODULE_SUMMARY_jsc16) has been installed.
+
+To check out the sample app, run these commands:
+
+ sudo service unit restart
+ cd /usr/share/doc/unit-$(MODULE_SUFFIX_jsc16)/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_jsc16
diff --git a/pkg/deb/Makefile.jsc17 b/pkg/deb/Makefile.jsc17
new file mode 100644
index 00000000..16f840da
--- /dev/null
+++ b/pkg/deb/Makefile.jsc17
@@ -0,0 +1,71 @@
+MODULES+=		jsc17
+MODULE_SUFFIX_jsc17=	jsc17
+
+MODULE_SUMMARY_jsc17=	Java 17 module for NGINX Unit
+
+MODULE_VERSION_jsc17=	$(VERSION)
+MODULE_RELEASE_jsc17=	1
+
+MODULE_CONFARGS_jsc17=	java --module=java17 --home=/usr/lib/jvm/java-17-openjdk-$$\(DEB_HOST_ARCH\) --jars=/usr/share/unit-jsc-common/
+MODULE_MAKEARGS_jsc17=	java17
+MODULE_INSTARGS_jsc17=	java17-install
+
+MODULE_SOURCES_jsc17=	unit.example-jsc-app \
+			unit.example-jsc17-config
+
+BUILD_DEPENDS_jsc17=	openjdk-17-jdk-headless openjdk-17-jre-headless
+BUILD_DEPENDS+=		$(BUILD_DEPENDS_jsc17)
+
+MODULE_BUILD_DEPENDS_jsc17=,openjdk-17-jdk-headless
+MODULE_DEPENDS_jsc17=,openjdk-17-jre-headless,unit-jsc-common (= $(MODULE_VERSION_jsc_common)-$(MODULE_RELEASE_jsc_common)~$(CODENAME))
+
+define MODULE_PREINSTALL_jsc17
+	mkdir -p debian/unit-jsc17/usr/share/doc/unit-jsc17/examples/jsc-app
+	install -m 644 -p debian/unit.example-jsc-app debian/unit-jsc17/usr/share/doc/unit-jsc17/examples/jsc-app/index.jsp
+	install -m 644 -p debian/unit.example-jsc17-config debian/unit-jsc17/usr/share/doc/unit-jsc17/examples/unit.config
+	install -m 644 -p src/java/README.JSR-340 debian/unit-jsc17/usr/share/doc/unit-jsc17/
+endef
+export MODULE_PREINSTALL_jsc17
+
+define MODULE_POSTINSTALL_jsc17
+	cd $$\(BUILDDIR_unit\) \&\& \
+        DESTDIR=$$\(INSTALLDIR\) make java-shared-uninstall
+endef
+export MODULE_POSTINSTALL_jsc17
+
+define MODULE_POST_jsc17
+cat <<BANNER
+----------------------------------------------------------------------
+
+The $(MODULE_SUMMARY_jsc17) has been installed.
+
+To check out the sample app, run these commands:
+
+ sudo service unit restart
+ cd /usr/share/doc/unit-$(MODULE_SUFFIX_jsc17)/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_jsc17
diff --git a/pkg/deb/Makefile.python39 b/pkg/deb/Makefile.python39
new file mode 100644
index 00000000..11ce65f0
--- /dev/null
+++ b/pkg/deb/Makefile.python39
@@ -0,0 +1,46 @@
+MODULES+=			python39
+MODULE_SUFFIX_python39=		python3.9
+
+MODULE_SUMMARY_python39=	Python 3.9 module for NGINX Unit
+
+MODULE_VERSION_python39=	$(VERSION)
+MODULE_RELEASE_python39=	1
+
+MODULE_CONFARGS_python39=	python --config=python3.9-config
+MODULE_MAKEARGS_python39=	python3.9
+MODULE_INSTARGS_python39=	python3.9-install
+
+MODULE_SOURCES_python39=	unit.example-python-app \
+				unit.example-python3.9-config
+
+BUILD_DEPENDS_python39=	python3.9-dev
+BUILD_DEPENDS+=		$(BUILD_DEPENDS_python39)
+
+MODULE_BUILD_DEPENDS_python39=,python3.9-dev
+
+define MODULE_PREINSTALL_python39
+	mkdir -p debian/unit-python3.9/usr/share/doc/unit-python3.9/examples/python-app
+	install -m 644 -p debian/unit.example-python-app debian/unit-python3.9/usr/share/doc/unit-python3.9/examples/python-app/wsgi.py
+	install -m 644 -p debian/unit.example-python3.9-config debian/unit-python3.9/usr/share/doc/unit-python3.9/examples/unit.config
+endef
+export MODULE_PREINSTALL_python39
+
+define MODULE_POST_python39
+cat <<BANNER
+----------------------------------------------------------------------
+
+The $(MODULE_SUMMARY_python39) has been installed.
+
+To check out the sample app, run these commands:
+
+ sudo service unit restart
+ cd /usr/share/doc/unit-$(MODULE_SUFFIX_python39)/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_python39
diff --git a/pkg/deb/debian.module/control-noarch.in b/pkg/deb/debian.module/control-noarch.in
index e22bb49a..d9d9e5e1 100644
--- a/pkg/deb/debian.module/control-noarch.in
+++ b/pkg/deb/debian.module/control-noarch.in
@@ -1,7 +1,7 @@
 Source: %%NAME%%
 Section: admin
 Priority: extra
-Maintainer: Andrei Belov <defan@nginx.com>
+Maintainer: %%PACKAGE_VENDOR%%
 Build-Depends: debhelper (>= 9),
                linux-libc-dev%%MODULE_BUILD_DEPENDS%%
 Standards-Version: 3.9.5
diff --git a/pkg/deb/debian.module/control.in b/pkg/deb/debian.module/control.in
index 7e28f5e9..9a6fa797 100644
--- a/pkg/deb/debian.module/control.in
+++ b/pkg/deb/debian.module/control.in
@@ -1,7 +1,7 @@
 Source: %%NAME%%
 Section: admin
 Priority: extra
-Maintainer: Andrei Belov <defan@nginx.com>
+Maintainer: %%PACKAGE_VENDOR%%
 Build-Depends: debhelper (>= 9),
                linux-libc-dev,
                libssl-dev,
diff --git a/pkg/deb/debian.module/unit.example-jsc16-config b/pkg/deb/debian.module/unit.example-jsc16-config
new file mode 100644
index 00000000..0b10a44d
--- /dev/null
+++ b/pkg/deb/debian.module/unit.example-jsc16-config
@@ -0,0 +1,15 @@
+{
+	"applications": {
+		"example_java16": {
+			"processes": 1,
+			"type": "java 16",
+			"webapp": "/usr/share/doc/unit-jsc16/examples/jsc-app"
+		}
+	},
+
+	"listeners": {
+		"*:8800": {
+			"pass": "applications/example_java16"
+		}
+	}
+}
diff --git a/pkg/deb/debian.module/unit.example-jsc17-config b/pkg/deb/debian.module/unit.example-jsc17-config
new file mode 100644
index 00000000..28b13e4d
--- /dev/null
+++ b/pkg/deb/debian.module/unit.example-jsc17-config
@@ -0,0 +1,15 @@
+{
+	"applications": {
+		"example_java17": {
+			"processes": 1,
+			"type": "java 17",
+			"webapp": "/usr/share/doc/unit-jsc17/examples/jsc-app"
+		}
+	},
+
+	"listeners": {
+		"*:8800": {
+			"pass": "applications/example_java17"
+		}
+	}
+}
diff --git a/pkg/deb/debian.module/unit.example-python3.9-config b/pkg/deb/debian.module/unit.example-python3.9-config
new file mode 100644
index 00000000..fdb7e9db
--- /dev/null
+++ b/pkg/deb/debian.module/unit.example-python3.9-config
@@ -0,0 +1,16 @@
+{
+	"applications": {
+		"example_python": {
+			"type": "python 3.9",
+			"processes": 2,
+			"path": "/usr/share/doc/unit-python3.9/examples/python-app",
+			"module": "wsgi"
+		}
+	},
+
+	"listeners": {
+		"*:8400": {
+			"pass": "applications/example_python"
+		}
+	}
+}
diff --git a/pkg/deb/debian/control b/pkg/deb/debian/control.in
index a8e8cdc4..4d59520e 100644
--- a/pkg/deb/debian/control
+++ b/pkg/deb/debian/control.in
@@ -1,7 +1,7 @@
 Source: unit
 Section: admin
 Priority: extra
-Maintainer: Andrei Belov <defan@nginx.com>
+Maintainer: %%PACKAGE_VENDOR%%
 Build-Depends: debhelper (>= 9),
                linux-libc-dev,
                libssl-dev,