Merge tag '1.33.0' into packaging.

Unit 1.33.0 release.

7 files changed, 12 insertions, 106 deletions

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"
-		}
-	}
-}