15 files changed, 43 insertions, 492 deletions
diff --git a/pkg/deb/Makefile b/pkg/deb/Makefile
index e48de155..0e6ca191 100644
--- a/pkg/deb/Makefile
+++ b/pkg/deb/Makefile
@@ -14,15 +14,14 @@ SRCDIR=	unit-$(VERSION)
 
 CODENAME = $(shell lsb_release -cs)
 
-BUILD_DEPENDS_unit = build-essential debhelper devscripts fakeroot libxml2-utils lintian lsb-release xsltproc libssl-dev
+BUILD_DEPENDS_unit = build-essential debhelper devscripts fakeroot libxml2-utils lintian lsb-release xsltproc libssl-dev clang llvm
 BUILD_DEPENDS = $(BUILD_DEPENDS_unit)
 
 MODULES=
 
-# Ubuntu 23.10
-ifeq ($(CODENAME),mantic)
+# Ubuntu 24.04
+ifeq ($(CODENAME),noble)
 include Makefile.php
-include Makefile.python311
 include Makefile.python312
 include Makefile.go
 include Makefile.perl
@@ -30,41 +29,24 @@ 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)
+# 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.jsc18
 include Makefile.jsc19
 include Makefile.jsc20
-include Makefile.wasm
-endif
-
-# Ubuntu 22.10
-ifeq ($(CODENAME),kinetic)
-include Makefile.php
-include Makefile.python27
-include Makefile.python310
-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.jsc21
 include Makefile.wasm
 endif
 
@@ -83,23 +65,6 @@ include Makefile.jsc18
 include Makefile.wasm
 endif
 
-# Ubuntu 21.10
-ifeq ($(CODENAME),impish)
-include Makefile.php
-include Makefile.python27
-include Makefile.python39
-include Makefile.python310
-include Makefile.go
-include Makefile.perl
-include Makefile.ruby
-include Makefile.jsc-common
-include Makefile.jsc11
-include Makefile.jsc16
-include Makefile.jsc17
-include Makefile.jsc18
-include Makefile.wasm
-endif
-
 # Ubuntu 20.04
 ifeq ($(CODENAME),focal)
 include Makefile.php
@@ -113,22 +78,6 @@ include Makefile.jsc11
 include Makefile.wasm
 endif
 
-# Ubuntu 18.04
-ifeq ($(CODENAME),bionic)
-include Makefile.php
-include Makefile.python27
-include Makefile.python36
-include Makefile.python37
-include Makefile.python38
-include Makefile.go
-include Makefile.perl
-include Makefile.ruby
-include Makefile.jsc-common
-include Makefile.jsc8
-include Makefile.jsc11
-include Makefile.wasm
-endif
-
 # Debian 12
 ifeq ($(CODENAME),bookworm)
 include Makefile.php
@@ -165,19 +114,6 @@ include Makefile.jsc11
 include Makefile.wasm
 endif
 
-# Debian 10
-ifeq ($(CODENAME),buster)
-include Makefile.php
-include Makefile.python27
-include Makefile.python37
-include Makefile.go
-include Makefile.perl
-include Makefile.ruby
-include Makefile.jsc-common
-include Makefile.jsc11
-include Makefile.wasm
-endif
-
 CONFIGURE_ARGS_COMMON=\
 	--prefix=/usr \
 	--statedir=/var/lib/unit \
@@ -214,9 +150,12 @@ check-build-depends-%:
 	esac ; \
 	not_installed= ; \
 	for pkg in $${pkgs}; do \
-		dpkg-query -W $${pkg} >/dev/null 2>&1 ; \
-		if [ $$? -ne 0 ]; then \
-			not_installed="$${not_installed} $${pkg}" ; \
+		i=$$(dpkg-query -f '$${db:Status-Status}' -W $${pkg}:$$(dpkg --print-architecture) 2>/dev/null) ; \
+		if [ $$? -ne 0 -o "$${i}" != "installed" ]; then \
+			i=$$(dpkg-query -f '$${db:Status-Status}' -W $${pkg}:all 2>/dev/null) ; \
+			if [ $$? -ne 0 -o "$${i}" != "installed" ]; then \
+				not_installed="$${not_installed} $${pkg}" ; \
+			fi; \
 		fi ; \
 	done ; \
 	if test -n "$${not_installed}" ; then \
diff --git a/pkg/deb/Makefile.jsc10 b/pkg/deb/Makefile.jsc10
deleted file mode 100644
index 43ded86b..00000000
--- a/pkg/deb/Makefile.jsc10
+++ /dev/null
@@ -1,71 +0,0 @@
-MODULES+=		jsc10
-MODULE_SUFFIX_jsc10=	jsc10
-
-MODULE_SUMMARY_jsc10=	Java 10 module for NGINX Unit
-
-MODULE_VERSION_jsc10=	$(VERSION)
-MODULE_RELEASE_jsc10=	1
-
-MODULE_CONFARGS_jsc10=	java --module=java10 --home=/usr/lib/jvm/java-11-openjdk-$$\(DEB_HOST_ARCH\) --jars=/usr/share/unit-jsc-common/
-MODULE_MAKEARGS_jsc10=	java10
-MODULE_INSTARGS_jsc10=	java10-install
-
-MODULE_SOURCES_jsc10=	unit.example-jsc-app \
-			unit.example-jsc10-config
-
-BUILD_DEPENDS_jsc10=	openjdk-11-jdk-headless openjdk-11-jre-headless
-BUILD_DEPENDS+=		$(BUILD_DEPENDS_jsc10)
-
-MODULE_BUILD_DEPENDS_jsc10=,openjdk-11-jdk-headless
-MODULE_DEPENDS_jsc10=,openjdk-11-jre-headless,unit-jsc-common (= $(MODULE_VERSION_jsc_common)-$(MODULE_RELEASE_jsc_common)~$(CODENAME))
-
-define MODULE_PREINSTALL_jsc10
-	mkdir -p debian/unit-jsc10/usr/share/doc/unit-jsc10/examples/jsc-app
-	install -m 644 -p debian/unit.example-jsc-app debian/unit-jsc10/usr/share/doc/unit-jsc10/examples/jsc-app/index.jsp
-	install -m 644 -p debian/unit.example-jsc10-config debian/unit-jsc10/usr/share/doc/unit-jsc10/examples/unit.config
-	install -m 644 -p src/java/README.JSR-340 debian/unit-jsc10/usr/share/doc/unit-jsc10/
-endef
-export MODULE_PREINSTALL_jsc10
-
-define MODULE_POSTINSTALL_jsc10
-	cd $$\(BUILDDIR_unit\) \&\& \
-        DESTDIR=$$\(INSTALLDIR\) make java-shared-uninstall
-endef
-export MODULE_POSTINSTALL_jsc10
-
-define MODULE_POST_jsc10
-cat <<BANNER
-----------------------------------------------------------------------
-
-The $(MODULE_SUMMARY_jsc10) has been installed.
-
-To check out the sample app, run these commands:
-
- sudo service unit restart
- cd /usr/share/doc/unit-$(MODULE_SUFFIX_jsc10)/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_jsc10
diff --git a/pkg/deb/Makefile.jsc16 b/pkg/deb/Makefile.jsc16
deleted file mode 100644
index f45e1299..00000000
--- a/pkg/deb/Makefile.jsc16
+++ /dev/null
@@ -1,71 +0,0 @@
-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.jsc8 b/pkg/deb/Makefile.jsc8
deleted file mode 100644
index d7eed96b..00000000
--- a/pkg/deb/Makefile.jsc8
+++ /dev/null
@@ -1,71 +0,0 @@
-MODULES+=		jsc8
-MODULE_SUFFIX_jsc8=	jsc8
-
-MODULE_SUMMARY_jsc8=	Java 8 module for NGINX Unit
-
-MODULE_VERSION_jsc8=	$(VERSION)
-MODULE_RELEASE_jsc8=	1
-
-MODULE_CONFARGS_jsc8=	java --module=java8 --home=/usr/lib/jvm/java-8-openjdk-$$\(DEB_HOST_ARCH\) --jars=/usr/share/unit-jsc-common/
-MODULE_MAKEARGS_jsc8=	java8
-MODULE_INSTARGS_jsc8=	java8-install
-
-MODULE_SOURCES_jsc8=	unit.example-jsc-app \
-			unit.example-jsc8-config
-
-BUILD_DEPENDS_jsc8=	openjdk-8-jdk-headless openjdk-8-jre-headless
-BUILD_DEPENDS+=		$(BUILD_DEPENDS_jsc8)
-
-MODULE_BUILD_DEPENDS_jsc8=,openjdk-8-jdk-headless
-MODULE_DEPENDS_jsc8=,openjdk-8-jre-headless,unit-jsc-common (= $(MODULE_VERSION_jsc_common)-$(MODULE_RELEASE_jsc_common)~$(CODENAME))
-
-define MODULE_PREINSTALL_jsc8
-	mkdir -p debian/unit-jsc8/usr/share/doc/unit-jsc8/examples/jsc-app
-	install -m 644 -p debian/unit.example-jsc-app debian/unit-jsc8/usr/share/doc/unit-jsc8/examples/jsc-app/index.jsp
-	install -m 644 -p debian/unit.example-jsc8-config debian/unit-jsc8/usr/share/doc/unit-jsc8/examples/unit.config
-	install -m 644 -p src/java/README.JSR-340 debian/unit-jsc8/usr/share/doc/unit-jsc8/
-endef
-export MODULE_PREINSTALL_jsc8
-
-define MODULE_POSTINSTALL_jsc8
-	cd $$\(BUILDDIR_unit\) \&\& \
-        DESTDIR=$$\(INSTALLDIR\) make java-shared-uninstall
-endef
-export MODULE_POSTINSTALL_jsc8
-
-define MODULE_POST_jsc8
-cat <<BANNER
-----------------------------------------------------------------------
-
-The $(MODULE_SUMMARY_jsc8) has been installed.
-
-To check out the sample app, run these commands:
-
- sudo service unit restart
- cd /usr/share/doc/unit-$(MODULE_SUFFIX_jsc8)/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_jsc8
diff --git a/pkg/deb/Makefile.python36 b/pkg/deb/Makefile.python36
deleted file mode 100644
index 4fd898c6..00000000
--- a/pkg/deb/Makefile.python36
+++ /dev/null
@@ -1,46 +0,0 @@
-MODULES+=			python36
-MODULE_SUFFIX_python36=		python3.6
-
-MODULE_SUMMARY_python36=	Python 3.6 module for NGINX Unit
-
-MODULE_VERSION_python36=	$(VERSION)
-MODULE_RELEASE_python36=	1
-
-MODULE_CONFARGS_python36=	python --config=python3.6-config
-MODULE_MAKEARGS_python36=	python3.6
-MODULE_INSTARGS_python36=	python3.6-install
-
-MODULE_SOURCES_python36=	unit.example-python-app \
-				unit.example-python3.6-config
-
-BUILD_DEPENDS_python36=	python3.6-dev
-BUILD_DEPENDS+=		$(BUILD_DEPENDS_python36)
-
-MODULE_BUILD_DEPENDS_python36=,python3.6-dev
-
-define MODULE_PREINSTALL_python36
-	mkdir -p debian/unit-python3.6/usr/share/doc/unit-python3.6/examples/python-app
-	install -m 644 -p debian/unit.example-python-app debian/unit-python3.6/usr/share/doc/unit-python3.6/examples/python-app/wsgi.py
-	install -m 644 -p debian/unit.example-python3.6-config debian/unit-python3.6/usr/share/doc/unit-python3.6/examples/unit.config
-endef
-export MODULE_PREINSTALL_python36
-
-define MODULE_POST_python36
-cat <<BANNER
-----------------------------------------------------------------------
-
-The $(MODULE_SUMMARY_python36) has been installed.
-
-To check out the sample app, run these commands:
-
- sudo service unit restart
- cd /usr/share/doc/unit-$(MODULE_SUFFIX_python36)/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_python36
diff --git a/pkg/deb/Makefile.python37 b/pkg/deb/Makefile.python37
deleted file mode 100644
index 54dd8c4c..00000000
--- a/pkg/deb/Makefile.python37
+++ /dev/null
@@ -1,46 +0,0 @@
-MODULES+=			python37
-MODULE_SUFFIX_python37=		python3.7
-
-MODULE_SUMMARY_python37=	Python 3.7 module for NGINX Unit
-
-MODULE_VERSION_python37=	$(VERSION)
-MODULE_RELEASE_python37=	1
-
-MODULE_CONFARGS_python37=	python --config=python3.7-config
-MODULE_MAKEARGS_python37=	python3.7
-MODULE_INSTARGS_python37=	python3.7-install
-
-MODULE_SOURCES_python37=	unit.example-python-app \
-				unit.example-python3.7-config
-
-BUILD_DEPENDS_python37=	python3.7-dev
-BUILD_DEPENDS+=		$(BUILD_DEPENDS_python37)
-
-MODULE_BUILD_DEPENDS_python37=,python3.7-dev
-
-define MODULE_PREINSTALL_python37
-	mkdir -p debian/unit-python3.7/usr/share/doc/unit-python3.7/examples/python-app
-	install -m 644 -p debian/unit.example-python-app debian/unit-python3.7/usr/share/doc/unit-python3.7/examples/python-app/wsgi.py
-	install -m 644 -p debian/unit.example-python3.7-config debian/unit-python3.7/usr/share/doc/unit-python3.7/examples/unit.config
-endef
-export MODULE_PREINSTALL_python37
-
-define MODULE_POST_python37
-cat <<BANNER
-----------------------------------------------------------------------
-
-The $(MODULE_SUMMARY_python37) has been installed.
-
-To check out the sample app, run these commands:
-
- sudo service unit restart
- cd /usr/share/doc/unit-$(MODULE_SUFFIX_python37)/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_python37
diff --git a/pkg/deb/Makefile.wasm b/pkg/deb/Makefile.wasm
index 8f3fdc67..de89841e 100644
--- a/pkg/deb/Makefile.wasm
+++ b/pkg/deb/Makefile.wasm
@@ -6,14 +6,19 @@ 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 \&\& ./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_CONFARGS_wasm=	wasm-wasi-component
+MODULE_MAKEARGS_wasm=	wasm-wasi-component CFLAGS=\"\$$(shell grep ^CFLAGS \$$(BUILDDIR_\$$*)/build/Makefile | cut -d' ' -f 3-) -Wno-missing-prototypes\"
+MODULE_INSTARGS_wasm=	wasm-wasi-component-install
+
+ifeq (,$(findstring $(CODENAME),bullseye focal))
+MODULE_CONFARGS_wasm+=	\&\& ./configure wasm --include-path=\$$(CURDIR)/pkg/contrib/wasmtime/artifacts/include --lib-path=\$$(CURDIR)/pkg/contrib/wasmtime/artifacts/lib
+MODULE_MAKEARGS_wasm+=	wasm
+MODULE_INSTARGS_wasm+=	wasm-install
 
 MODULE_SOURCES_wasm=
 
-BUILD_DEPENDS_wasm=
-MODULE_BUILD_DEPENDS_wasm=
+BUILD_DEPENDS_wasm=	cmake
+MODULE_BUILD_DEPENDS_wasm=,cmake
 MODULE_DEPENDS_wasm=
 
 BUILD_DEPENDS+=		$(BUILD_DEPENDS_wasm)
@@ -29,9 +34,10 @@ export MODULE_PREINSTALL_wasm
 
 define MODULE_POSTINSTALL_wasm
 	mkdir -p debian/unit-wasm/usr/lib/\$$(dpkg-architecture -q DEB_HOST_MULTIARCH)/
-	install -m 755 -p pkg/contrib/wasmtime/target/release/libwasmtime.so debian/unit-wasm/usr/lib/\$$(dpkg-architecture -q DEB_HOST_MULTIARCH)/
+	install -m 755 -p pkg/contrib/wasmtime/artifacts/lib/libwasmtime.so debian/unit-wasm/usr/lib/\$$(dpkg-architecture -q DEB_HOST_MULTIARCH)/
 endef
 export MODULE_POSTINSTALL_wasm
+endif
 
 define MODULE_POST_wasm
 cat <<BANNER
diff --git a/pkg/deb/debian.module/copyright.unit-jsc8 b/pkg/deb/debian.module/copyright.unit-jsc8
deleted file mode 100644
index 60da2dfa..00000000
--- a/pkg/deb/debian.module/copyright.unit-jsc8
+++ /dev/null
@@ -1,42 +0,0 @@
-
-   NGINX Unit.
-
-   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 2017-2022 Valentin V. Bartenev
-   Copyright 2017-2022 Max Romanov
-   Copyright 2021-2022 Oisín Canty
-   Copyright 2017-2021 Igor Sysoev
-   Copyright 2017-2021 Andrei Belov
-   Copyright 2019-2021 Tiago Natel de Moura
-   Copyright 2019-2020 Axel Duch
-   Copyright 2018-2019 Alexander Borisov
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-       /usr/share/common-licenses/Apache-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-   The unit-jsc8 package provides Java servlet container module
-   for NGINX Unit.
-
-   Java is a registered trademark of Oracle and/or its affiliates.
diff --git a/pkg/deb/debian.module/rules-noarch.in b/pkg/deb/debian.module/rules-noarch.in
index e56e06bc..f311438d 100644
--- a/pkg/deb/debian.module/rules-noarch.in
+++ b/pkg/deb/debian.module/rules-noarch.in
@@ -3,8 +3,13 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
+include /usr/share/dpkg/vendor.mk
+ifeq ($(shell $(call dpkg_vendor_derives_from,ubuntu)),yes)
+export DEB_CFLAGS_MAINT_APPEND=-fPIC
+else
 export DEB_CFLAGS_MAINT_APPEND=-Wp,-D_FORTIFY_SOURCE=2 -fPIC
+endif
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
 
diff --git a/pkg/deb/debian.module/rules.in b/pkg/deb/debian.module/rules.in
index 7814fbfd..8877ff23 100755
--- a/pkg/deb/debian.module/rules.in
+++ b/pkg/deb/debian.module/rules.in
@@ -3,8 +3,13 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
+include /usr/share/dpkg/vendor.mk
+ifeq ($(shell $(call dpkg_vendor_derives_from,ubuntu)),yes)
+export DEB_CFLAGS_MAINT_APPEND=-fPIC
+else
 export DEB_CFLAGS_MAINT_APPEND=-Wp,-D_FORTIFY_SOURCE=2 -fPIC
+endif
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
 
diff --git a/pkg/deb/debian.module/unit.example-jsc16-config b/pkg/deb/debian.module/unit.example-jsc16-config
deleted file mode 100644
index 0b10a44d..00000000
--- a/pkg/deb/debian.module/unit.example-jsc16-config
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"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-jsc8-config b/pkg/deb/debian.module/unit.example-jsc8-config
deleted file mode 100644
index 4d79112f..00000000
--- a/pkg/deb/debian.module/unit.example-jsc8-config
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"applications": {
-		"example_java8": {
-			"processes": 1,
-			"type": "java 1.8.0",
-			"webapp": "/usr/share/doc/unit-jsc8/examples/jsc-app"
-		}
-	},
-
-	"listeners": {
-		"*:8800": {
-			"pass": "applications/example_java8"
-		}
-	}
-}
diff --git a/pkg/deb/debian.module/unit.example-python3.6-config b/pkg/deb/debian.module/unit.example-python3.6-config
deleted file mode 100644
index 543024ff..00000000
--- a/pkg/deb/debian.module/unit.example-python3.6-config
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"applications": {
-		"example_python": {
-			"type": "python 3.6",
-			"processes": 2,
-			"path": "/usr/share/doc/unit-python3.6/examples/python-app",
-			"module": "wsgi"
-		}
-	},
-
-	"listeners": {
-		"*:8400": {
-			"pass": "applications/example_python"
-		}
-	}
-}
diff --git a/pkg/deb/debian.module/unit.example-python3.7-config b/pkg/deb/debian.module/unit.example-python3.7-config
deleted file mode 100644
index e7b8dbc3..00000000
--- a/pkg/deb/debian.module/unit.example-python3.7-config
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"applications": {
-		"example_python": {
-			"type": "python 3.7",
-			"processes": 2,
-			"path": "/usr/share/doc/unit-python3.7/examples/python-app",
-			"module": "wsgi"
-		}
-	},
-
-	"listeners": {
-		"*:8400": {
-			"pass": "applications/example_python"
-		}
-	}
-}
diff --git a/pkg/deb/debian/rules.in b/pkg/deb/debian/rules.in
index 55a4ebec..dd75b562 100644
--- a/pkg/deb/debian/rules.in
+++ b/pkg/deb/debian/rules.in
@@ -3,8 +3,13 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
+include /usr/share/dpkg/vendor.mk
+ifeq ($(shell $(call dpkg_vendor_derives_from,ubuntu)),yes)
+export DEB_CFLAGS_MAINT_APPEND=-fPIC
+else
 export DEB_CFLAGS_MAINT_APPEND=-Wp,-D_FORTIFY_SOURCE=2 -fPIC
+endif
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
 export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed -pie
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk