From ca0dc2954c254081a9b23c1e1f760de0c3fadc66 Mon Sep 17 00:00:00 2001
From: Andrei Belov <defan@nginx.com>
Date: Wed, 1 Dec 2021 09:01:52 +0300
Subject: Packages: adjusted debhelper minimal version for Debian/Ubuntu.

Forgotten in 199a11eceb3c.

While here, Standards-Version increased to 4.1.4 (matches Ubuntu 18.04
as the oldest supported distro).
---
 pkg/deb/debian.module/control-noarch.in | 4 ++--
 pkg/deb/debian.module/control.in        | 4 ++--
 pkg/deb/debian/control.in               | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'pkg')

diff --git a/pkg/deb/debian.module/control-noarch.in b/pkg/deb/debian.module/control-noarch.in
index d9d9e5e1..323377d9 100644
--- a/pkg/deb/debian.module/control-noarch.in
+++ b/pkg/deb/debian.module/control-noarch.in
@@ -2,9 +2,9 @@ Source: %%NAME%%
 Section: admin
 Priority: extra
 Maintainer: %%PACKAGE_VENDOR%%
-Build-Depends: debhelper (>= 9),
+Build-Depends: debhelper (>= 11),
                linux-libc-dev%%MODULE_BUILD_DEPENDS%%
-Standards-Version: 3.9.5
+Standards-Version: 4.1.4
 Homepage: https://unit.nginx.org
 
 Package: %%NAME%%
diff --git a/pkg/deb/debian.module/control.in b/pkg/deb/debian.module/control.in
index 9a6fa797..f5ce8ae4 100644
--- a/pkg/deb/debian.module/control.in
+++ b/pkg/deb/debian.module/control.in
@@ -2,11 +2,11 @@ Source: %%NAME%%
 Section: admin
 Priority: extra
 Maintainer: %%PACKAGE_VENDOR%%
-Build-Depends: debhelper (>= 9),
+Build-Depends: debhelper (>= 11),
                linux-libc-dev,
                libssl-dev,
                libpcre2-dev%%MODULE_BUILD_DEPENDS%%
-Standards-Version: 3.9.5
+Standards-Version: 4.1.4
 Homepage: https://unit.nginx.org
 
 Package: %%NAME%%
diff --git a/pkg/deb/debian/control.in b/pkg/deb/debian/control.in
index 4d59520e..691bafed 100644
--- a/pkg/deb/debian/control.in
+++ b/pkg/deb/debian/control.in
@@ -2,11 +2,11 @@ Source: unit
 Section: admin
 Priority: extra
 Maintainer: %%PACKAGE_VENDOR%%
-Build-Depends: debhelper (>= 9),
+Build-Depends: debhelper (>= 11),
                linux-libc-dev,
                libssl-dev,
                libpcre2-dev
-Standards-Version: 3.9.5
+Standards-Version: 4.1.4
 Homepage: https://unit.nginx.org
 
 Package: unit
-- 
cgit 


From c58601c11fd2f2c583d94f31b63c7d16319a2614 Mon Sep 17 00:00:00 2001
From: Konstantin Pavlov <thresh@nginx.com>
Date: Tue, 30 Nov 2021 17:00:47 +0300
Subject: Docker: respect the binary from CMD in the entrypoint.

---
 pkg/docker/docker-entrypoint.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkg')

diff --git a/pkg/docker/docker-entrypoint.sh b/pkg/docker/docker-entrypoint.sh
index f455a958..59529925 100755
--- a/pkg/docker/docker-entrypoint.sh
+++ b/pkg/docker/docker-entrypoint.sh
@@ -24,7 +24,7 @@ if [ "$1" = "unitd" -o "$1" = "unitd-debug" ]; then
     else
         if /usr/bin/find "/docker-entrypoint.d/" -mindepth 1 -print -quit 2>/dev/null | /bin/grep -q .; then
             echo "$0: /docker-entrypoint.d/ is not empty, launching Unit daemon to perform initial configuration..."
-            /usr/sbin/unitd --control unix:/var/run/control.unit.sock
+            /usr/sbin/$1 --control unix:/var/run/control.unit.sock
 
             while [ ! -S /var/run/control.unit.sock ]; do echo "$0: Waiting for control socket to be created..."; /bin/sleep 0.1; done
             # even when the control socket exists, it does not mean unit has finished initialisation
-- 
cgit 


From 7edc5b82d5e48d5f5d06334af82b891b0ccc3add Mon Sep 17 00:00:00 2001
From: Andrei Belov <defan@nginx.com>
Date: Thu, 2 Dec 2021 08:52:52 +0300
Subject: Packages: added systemd service for debug binary.

---
 pkg/deb/debian/rules.in                     |  3 ++-
 pkg/deb/debian/unit-debug.service           | 14 ++++++++++++++
 pkg/rpm/rpmbuild/SOURCES/unit-debug.service | 26 ++++++++++++++++++++++++++
 pkg/rpm/unit.spec.in                        | 12 ++++++++----
 4 files changed, 50 insertions(+), 5 deletions(-)
 create mode 100644 pkg/deb/debian/unit-debug.service
 create mode 100644 pkg/rpm/rpmbuild/SOURCES/unit-debug.service

(limited to 'pkg')

diff --git a/pkg/deb/debian/rules.in b/pkg/deb/debian/rules.in
index 3f1f9db8..fe7d5c7c 100644
--- a/pkg/deb/debian/rules.in
+++ b/pkg/deb/debian/rules.in
@@ -99,7 +99,8 @@ install: build do.tests
 	dh_testroot
 	dh_prep
 	dh_installdirs
-	dh_installsystemd
+	dh_installsystemd -punit --name=unit unit.service
+	dh_installsystemd -punit --name=unit-debug --no-start --no-enable unit-debug.service
 	dh_installlogrotate
 	cd $(BUILDDIR_unit) && DESTDIR=$(INSTALLDIR) make install
 	cd $(BUILDDIR_unit) && DESTDIR=$(INSTALLDIR_dev) make libunit-install
diff --git a/pkg/deb/debian/unit-debug.service b/pkg/deb/debian/unit-debug.service
new file mode 100644
index 00000000..252d8451
--- /dev/null
+++ b/pkg/deb/debian/unit-debug.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=NGINX Unit
+Wants=network-online.target
+After=network-online.target
+
+[Service]
+Type=forking
+PIDFile=/var/run/unit.pid
+EnvironmentFile=-/etc/default/unit
+ExecStart=/usr/sbin/unitd-debug $DAEMON_ARGS
+ExecReload=
+
+[Install]
+WantedBy=multi-user.target
diff --git a/pkg/rpm/rpmbuild/SOURCES/unit-debug.service b/pkg/rpm/rpmbuild/SOURCES/unit-debug.service
new file mode 100644
index 00000000..2cef24fb
--- /dev/null
+++ b/pkg/rpm/rpmbuild/SOURCES/unit-debug.service
@@ -0,0 +1,26 @@
+# Modifying this file in-place is not recommended, because changes
+# will be overwritten during package upgrades.  To customize the
+# behaviour, run "systemctl edit unit-debug" to create an override unit.
+
+# For example, to change options given to the unitd binary at startup,
+# create an override unit (as is done by systemctl edit) and enter
+# the following:
+
+#       [Service]
+#       Environment="UNITD_OPTIONS=--log /var/log/unit/unit.log --pid /var/run/unit/unit.pid"
+
+[Unit]
+Description=NGINX Unit
+Wants=network-online.target
+After=network-online.target
+
+[Service]
+Type=simple
+Environment="UNITD_OPTIONS=--log /var/log/unit/unit.log --pid /var/run/unit/unit.pid"
+ExecStart=/usr/sbin/unitd-debug $UNITD_OPTIONS --no-daemon
+ExecReload=
+RuntimeDirectory=unit
+RuntimeDirectoryMode=0755
+
+[Install]
+WantedBy=multi-user.target
diff --git a/pkg/rpm/unit.spec.in b/pkg/rpm/unit.spec.in
index b35b8998..f643b77f 100644
--- a/pkg/rpm/unit.spec.in
+++ b/pkg/rpm/unit.spec.in
@@ -39,8 +39,9 @@ Group: System Environment/Daemons
 
 Source0: unit-%{version}.tar.gz
 Source1: unit.service
-Source2: unit.example.config
-Source3: unit.logrotate
+Source2: unit-debug.service
+Source3: unit.example.config
+Source4: unit.logrotate
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: systemd
@@ -112,11 +113,11 @@ DESTDIR=%{buildroot} make unitd-install libunit-install manpage-install
 %{__mkdir} -p %{buildroot}%{_localstatedir}/log/unit
 %{__mkdir} -p %{buildroot}%{_localstatedir}/run/unit
 %{__mkdir} -p %{buildroot}%{_sysconfdir}/logrotate.d
-%{__install} -m 644 -p %{SOURCE3} \
+%{__install} -m 644 -p %{SOURCE4} \
     %{buildroot}%{_sysconfdir}/logrotate.d/unit
 %{__mkdir} -p %{buildroot}%{_sysconfdir}/unit
 %{__mkdir} -p %{buildroot}%{_datadir}/doc/unit/examples
-%{__install} -m 644 -p %{SOURCE2} \
+%{__install} -m 644 -p %{SOURCE3} \
     %{buildroot}%{_datadir}/doc/unit/examples/example.config
 %{__install} -m 644 -p CHANGES \
     %{buildroot}%{_datadir}/doc/unit/
@@ -127,6 +128,7 @@ DESTDIR=%{buildroot} make unitd-install libunit-install manpage-install
 
 %{__rm} -rf %{buildroot}%{_initrddir}/
 %{__install} -p -D -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/unit.service
+%{__install} -p -D -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/unit-debug.service
 
 QA_SKIP_BUILD_ROOT=1
 export QA_SKIP_BUILD_ROOT
@@ -153,6 +155,7 @@ getent passwd unit >/dev/null || \
     -d /nonexistent -c "unit user" unit
 if [ $1 -eq 1 ]; then
     /usr/bin/systemctl preset unit.service >/dev/null 2>&1 ||:
+    /usr/bin/systemctl preset unit-debug.service >/dev/null 2>&1 ||:
     cat <<BANNER
 ----------------------------------------------------------------------
 
@@ -200,6 +203,7 @@ BANNER
 %attr(0755,root,root) %{_sbindir}/unitd-debug
 %dir %{_sysconfdir}/unit
 %{_unitdir}/unit.service
+%{_unitdir}/unit-debug.service
 %dir %attr(0755,root,root) %ghost %{_localstatedir}/run/unit
 %dir %{_datadir}/doc/unit
 %{_datadir}/doc/unit/*
-- 
cgit 


From 3e0ece20b5ad106905faffa9a0a3a527c3aba88c Mon Sep 17 00:00:00 2001
From: Konstantin Pavlov <thresh@nginx.com>
Date: Wed, 1 Dec 2021 18:34:20 +0300
Subject: Docker: made Dockerfiles architecture agnostic.

---
 pkg/docker/Makefile            | 4 ++--
 pkg/docker/template.Dockerfile | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'pkg')

diff --git a/pkg/docker/Makefile b/pkg/docker/Makefile
index a2c1a52b..18c406a9 100644
--- a/pkg/docker/Makefile
+++ b/pkg/docker/Makefile
@@ -23,7 +23,7 @@ CONTAINER_go ?=		golang:$(VERSION_go)
 CONFIGURE_go ?=		go --go-path=$$GOPATH
 INSTALL_go ?=		go-install-src libunit-install
 define COPY_go
-COPY --from=BUILDER /usr/lib/x86_64-linux-gnu/libunit.a /usr/lib/x86_64-linux-gnu/\n\$
+COPY --from=BUILDER /usr/lib/\*-linux-gnu/libunit.a /tmp/\n\$
 COPY --from=BUILDER /usr/include/nxt_* /usr/include/\n\$
 COPY --from=BUILDER /go/src/ /go/src/
 endef
@@ -39,7 +39,7 @@ CONTAINER_node ?=	node:$(VERSION_node)
 CONFIGURE_node ?=	nodejs --node-gyp=/usr/local/lib/node_modules/npm/bin/node-gyp-bin/node-gyp
 INSTALL_node ?=		node node-install libunit-install
 define COPY_node
-COPY --from=BUILDER /usr/lib/x86_64-linux-gnu/libunit.a /usr/lib/x86_64-linux-gnu/\n\$
+COPY --from=BUILDER /usr/lib/\*-linux-gnu/libunit.a /tmp/\n\$
 COPY --from=BUILDER /usr/include/nxt_* /usr/include/\n\$
 COPY --from=BUILDER /usr/local/lib/node_modules/unit-http/ /usr/local/lib/node_modules/unit-http/
 endef
diff --git a/pkg/docker/template.Dockerfile b/pkg/docker/template.Dockerfile
index 55feecc6..2d964eb6 100644
--- a/pkg/docker/template.Dockerfile
+++ b/pkg/docker/template.Dockerfile
@@ -48,6 +48,10 @@ COPY --from=BUILDER /usr/lib/unit/ /usr/lib/unit/
 COPY --from=BUILDER /requirements.apt /requirements.apt
 @@COPY@@
 RUN set -x \
+    && if [ -f "/tmp/libunit.a" ]; then \
+        mv /tmp/libunit.a /usr/lib/$(dpkg-architecture -q DEB_HOST_MULTIARCH)/libunit.a; \
+        rm -f /tmp/libunit.a; \
+    fi \
     && mkdir -p /var/lib/unit/ \
     && mkdir /docker-entrypoint.d/ \
     && addgroup --system unit \
-- 
cgit 


From 650784928293bb07b5b4acf4b14d3845b011556d Mon Sep 17 00:00:00 2001
From: Konstantin Pavlov <thresh@nginx.com>
Date: Fri, 17 Dec 2021 17:15:55 +0300
Subject: Docker: bumped PHP image version.

---
 pkg/docker/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkg')

diff --git a/pkg/docker/Makefile b/pkg/docker/Makefile
index 18c406a9..91038b4c 100644
--- a/pkg/docker/Makefile
+++ b/pkg/docker/Makefile
@@ -50,7 +50,7 @@ CONFIGURE_perl ?=	perl
 INSTALL_perl ?=		perl-install
 COPY_perl =
 
-VERSION_php ?=		8.0
+VERSION_php ?=		8.1
 CONTAINER_php ?=	php:$(VERSION_php)-cli
 CONFIGURE_php ?=	php
 INSTALL_php ?=		php-install
-- 
cgit 


From 485886d8f9a665e9c416a98dd00e5c836b6bf27c Mon Sep 17 00:00:00 2001
From: Konstantin Pavlov <thresh@nginx.com>
Date: Thu, 13 Jan 2022 11:35:12 +0300
Subject: Docker: bumped Python image version.

---
 pkg/docker/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkg')

diff --git a/pkg/docker/Makefile b/pkg/docker/Makefile
index 91038b4c..39261b0a 100644
--- a/pkg/docker/Makefile
+++ b/pkg/docker/Makefile
@@ -56,7 +56,7 @@ CONFIGURE_php ?=	php
 INSTALL_php ?=		php-install
 COPY_php =			RUN ldconfig
 
-VERSION_python ?=	3.9
+VERSION_python ?=	3.10
 CONTAINER_python ?=	python:$(VERSION_python)
 CONFIGURE_python ?=	python --config=/usr/local/bin/python3-config
 INSTALL_python ?=	python3-install
-- 
cgit 


From 5857754ec75312c426b9277a34d0b3cfd237d22e Mon Sep 17 00:00:00 2001
From: Valentin Bartenev <vbart@nginx.com>
Date: Tue, 15 Feb 2022 18:21:10 +0300
Subject: Updated copyright notice.

---
 pkg/deb/debian.module/copyright.unit-jsc10    | 15 +++++++++++----
 pkg/deb/debian.module/copyright.unit-jsc11    | 15 +++++++++++----
 pkg/deb/debian.module/copyright.unit-jsc8     | 15 +++++++++++----
 pkg/deb/debian/copyright                      | 12 +++++++-----
 pkg/rpm/rpmbuild/SOURCES/COPYRIGHT.unit-jsc10 | 15 +++++++++++----
 pkg/rpm/rpmbuild/SOURCES/COPYRIGHT.unit-jsc11 | 15 +++++++++++----
 pkg/rpm/rpmbuild/SOURCES/COPYRIGHT.unit-jsc8  | 15 +++++++++++----
 7 files changed, 73 insertions(+), 29 deletions(-)

(limited to 'pkg')

diff --git a/pkg/deb/debian.module/copyright.unit-jsc10 b/pkg/deb/debian.module/copyright.unit-jsc10
index dbad728b..42dbd3b9 100644
--- a/pkg/deb/debian.module/copyright.unit-jsc10
+++ b/pkg/deb/debian.module/copyright.unit-jsc10
@@ -1,10 +1,17 @@
 
    NGINX Unit.
 
-   Copyright 2017-2019 NGINX, Inc.
-   Copyright 2017-2019 Igor Sysoev
-   Copyright 2017-2019 Valentin V. Bartenev
-   Copyright 2017-2019 Max Romanov
+   Copyright 2017-2022 NGINX, Inc.
+   Copyright 2017-2022 Valentin V. Bartenev
+   Copyright 2017-2022 Max Romanov
+   Copyright 2017-2022 Andrei Zeliankou
+   Copyright 2018-2022 Konstantin Pavlov
+   Copyright 2021-2022 Zhidao Hong
+   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");
diff --git a/pkg/deb/debian.module/copyright.unit-jsc11 b/pkg/deb/debian.module/copyright.unit-jsc11
index 413c0094..b2e4a117 100644
--- a/pkg/deb/debian.module/copyright.unit-jsc11
+++ b/pkg/deb/debian.module/copyright.unit-jsc11
@@ -1,10 +1,17 @@
 
    NGINX Unit.
 
-   Copyright 2017-2019 NGINX, Inc.
-   Copyright 2017-2019 Igor Sysoev
-   Copyright 2017-2019 Valentin V. Bartenev
-   Copyright 2017-2019 Max Romanov
+   Copyright 2017-2022 NGINX, Inc.
+   Copyright 2017-2022 Valentin V. Bartenev
+   Copyright 2017-2022 Max Romanov
+   Copyright 2017-2022 Andrei Zeliankou
+   Copyright 2018-2022 Konstantin Pavlov
+   Copyright 2021-2022 Zhidao Hong
+   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");
diff --git a/pkg/deb/debian.module/copyright.unit-jsc8 b/pkg/deb/debian.module/copyright.unit-jsc8
index 96b62102..1dab9cce 100644
--- a/pkg/deb/debian.module/copyright.unit-jsc8
+++ b/pkg/deb/debian.module/copyright.unit-jsc8
@@ -1,10 +1,17 @@
 
    NGINX Unit.
 
-   Copyright 2017-2019 NGINX, Inc.
-   Copyright 2017-2019 Igor Sysoev
-   Copyright 2017-2019 Valentin V. Bartenev
-   Copyright 2017-2019 Max Romanov
+   Copyright 2017-2022 NGINX, Inc.
+   Copyright 2017-2022 Valentin V. Bartenev
+   Copyright 2017-2022 Max Romanov
+   Copyright 2017-2022 Andrei Zeliankou
+   Copyright 2018-2022 Konstantin Pavlov
+   Copyright 2021-2022 Zhidao Hong
+   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");
diff --git a/pkg/deb/debian/copyright b/pkg/deb/debian/copyright
index 2a2c5fd0..487c92c5 100644
--- a/pkg/deb/debian/copyright
+++ b/pkg/deb/debian/copyright
@@ -1,13 +1,15 @@
 
    NGINX Unit.
 
-   Copyright 2017-2021 NGINX, Inc.
+   Copyright 2017-2022 NGINX, Inc.
+   Copyright 2017-2022 Valentin V. Bartenev
+   Copyright 2017-2022 Max Romanov
+   Copyright 2017-2022 Andrei Zeliankou
+   Copyright 2018-2022 Konstantin Pavlov
+   Copyright 2021-2022 Zhidao Hong
+   Copyright 2021-2022 Oisín Canty
    Copyright 2017-2021 Igor Sysoev
-   Copyright 2017-2021 Valentin V. Bartenev
-   Copyright 2017-2021 Max Romanov
-   Copyright 2017-2021 Andrei Zeliankou
    Copyright 2017-2021 Andrei Belov
-   Copyright 2018-2021 Konstantin Pavlov
    Copyright 2019-2021 Tiago Natel de Moura
    Copyright 2019-2020 Axel Duch
    Copyright 2018-2019 Alexander Borisov
diff --git a/pkg/rpm/rpmbuild/SOURCES/COPYRIGHT.unit-jsc10 b/pkg/rpm/rpmbuild/SOURCES/COPYRIGHT.unit-jsc10
index 665785b2..c7860e4b 100644
--- a/pkg/rpm/rpmbuild/SOURCES/COPYRIGHT.unit-jsc10
+++ b/pkg/rpm/rpmbuild/SOURCES/COPYRIGHT.unit-jsc10
@@ -1,10 +1,17 @@
 
    NGINX Unit.
 
-   Copyright 2017-2019 NGINX, Inc.
-   Copyright 2017-2019 Igor Sysoev
-   Copyright 2017-2019 Valentin V. Bartenev
-   Copyright 2017-2019 Max Romanov
+   Copyright 2017-2022 NGINX, Inc.
+   Copyright 2017-2022 Valentin V. Bartenev
+   Copyright 2017-2022 Max Romanov
+   Copyright 2017-2022 Andrei Zeliankou
+   Copyright 2018-2022 Konstantin Pavlov
+   Copyright 2021-2022 Zhidao Hong
+   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");
diff --git a/pkg/rpm/rpmbuild/SOURCES/COPYRIGHT.unit-jsc11 b/pkg/rpm/rpmbuild/SOURCES/COPYRIGHT.unit-jsc11
index e92a8245..b08fcc34 100644
--- a/pkg/rpm/rpmbuild/SOURCES/COPYRIGHT.unit-jsc11
+++ b/pkg/rpm/rpmbuild/SOURCES/COPYRIGHT.unit-jsc11
@@ -1,10 +1,17 @@
 
    NGINX Unit.
 
-   Copyright 2017-2019 NGINX, Inc.
-   Copyright 2017-2019 Igor Sysoev
-   Copyright 2017-2019 Valentin V. Bartenev
-   Copyright 2017-2019 Max Romanov
+   Copyright 2017-2022 NGINX, Inc.
+   Copyright 2017-2022 Valentin V. Bartenev
+   Copyright 2017-2022 Max Romanov
+   Copyright 2017-2022 Andrei Zeliankou
+   Copyright 2018-2022 Konstantin Pavlov
+   Copyright 2021-2022 Zhidao Hong
+   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");
diff --git a/pkg/rpm/rpmbuild/SOURCES/COPYRIGHT.unit-jsc8 b/pkg/rpm/rpmbuild/SOURCES/COPYRIGHT.unit-jsc8
index 1e7dbff6..5e31863d 100644
--- a/pkg/rpm/rpmbuild/SOURCES/COPYRIGHT.unit-jsc8
+++ b/pkg/rpm/rpmbuild/SOURCES/COPYRIGHT.unit-jsc8
@@ -1,10 +1,17 @@
 
    NGINX Unit.
 
-   Copyright 2017-2019 NGINX, Inc.
-   Copyright 2017-2019 Igor Sysoev
-   Copyright 2017-2019 Valentin V. Bartenev
-   Copyright 2017-2019 Max Romanov
+   Copyright 2017-2022 NGINX, Inc.
+   Copyright 2017-2022 Valentin V. Bartenev
+   Copyright 2017-2022 Max Romanov
+   Copyright 2017-2022 Andrei Zeliankou
+   Copyright 2018-2022 Konstantin Pavlov
+   Copyright 2021-2022 Zhidao Hong
+   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");
-- 
cgit 


From 967fa8f78afd0cd960e0159e61dbbe9ca8eabf91 Mon Sep 17 00:00:00 2001
From: Konstantin Pavlov <thresh@nginx.com>
Date: Wed, 11 May 2022 12:59:39 +0400
Subject: Docker: bumped language versions.

---
 pkg/docker/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkg')

diff --git a/pkg/docker/Makefile b/pkg/docker/Makefile
index 39261b0a..5c48f925 100644
--- a/pkg/docker/Makefile
+++ b/pkg/docker/Makefile
@@ -18,7 +18,7 @@ INSTALL_minimal ?=	version
 define COPY_minimal
 endef
 
-VERSION_go ?=		1.17
+VERSION_go ?=		1.18
 CONTAINER_go ?=		golang:$(VERSION_go)
 CONFIGURE_go ?=		go --go-path=$$GOPATH
 INSTALL_go ?=		go-install-src libunit-install
@@ -62,7 +62,7 @@ CONFIGURE_python ?=	python --config=/usr/local/bin/python3-config
 INSTALL_python ?=	python3-install
 COPY_python =
 
-VERSION_ruby ?=		3.0
+VERSION_ruby ?=		3.1
 CONTAINER_ruby ?=	ruby:$(VERSION_ruby)
 CONFIGURE_ruby ?=	ruby
 INSTALL_ruby ?=		ruby-install
-- 
cgit 


From 1fe389c2e216f21ba12ac7e373bcc26e43bde710 Mon Sep 17 00:00:00 2001
From: Konstantin Pavlov <thresh@nginx.com>
Date: Wed, 11 May 2022 13:06:17 +0400
Subject: Regenerated Dockerfiles.

---
 pkg/docker/Dockerfile.go1.17     | 75 --------------------------------------
 pkg/docker/Dockerfile.go1.18     | 79 ++++++++++++++++++++++++++++++++++++++++
 pkg/docker/Dockerfile.jsc11      |  4 ++
 pkg/docker/Dockerfile.minimal    |  4 ++
 pkg/docker/Dockerfile.node16     |  6 ++-
 pkg/docker/Dockerfile.perl5.34   |  4 ++
 pkg/docker/Dockerfile.php8.0     | 73 -------------------------------------
 pkg/docker/Dockerfile.php8.1     | 77 +++++++++++++++++++++++++++++++++++++++
 pkg/docker/Dockerfile.python3.10 | 77 +++++++++++++++++++++++++++++++++++++++
 pkg/docker/Dockerfile.python3.9  | 73 -------------------------------------
 pkg/docker/Dockerfile.ruby3.0    | 73 -------------------------------------
 pkg/docker/Dockerfile.ruby3.1    | 77 +++++++++++++++++++++++++++++++++++++++
 12 files changed, 327 insertions(+), 295 deletions(-)
 delete mode 100644 pkg/docker/Dockerfile.go1.17
 create mode 100644 pkg/docker/Dockerfile.go1.18
 delete mode 100644 pkg/docker/Dockerfile.php8.0
 create mode 100644 pkg/docker/Dockerfile.php8.1
 create mode 100644 pkg/docker/Dockerfile.python3.10
 delete mode 100644 pkg/docker/Dockerfile.python3.9
 delete mode 100644 pkg/docker/Dockerfile.ruby3.0
 create mode 100644 pkg/docker/Dockerfile.ruby3.1

(limited to 'pkg')

diff --git a/pkg/docker/Dockerfile.go1.17 b/pkg/docker/Dockerfile.go1.17
deleted file mode 100644
index e7443e8c..00000000
--- a/pkg/docker/Dockerfile.go1.17
+++ /dev/null
@@ -1,75 +0,0 @@
-FROM golang:1.17 as BUILDER
-
-LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
-
-RUN set -ex \
-    && apt-get update \
-    && apt-get install --no-install-recommends --no-install-suggests -y ca-certificates mercurial build-essential libssl-dev libpcre2-dev \
-    && mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
-    && hg clone https://hg.nginx.org/unit \
-    && cd unit \
-    && hg up 1.26.1 \
-    && NCPU="$(getconf _NPROCESSORS_ONLN)" \
-    && DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
-    && CC_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_CFLAGS_MAINT_APPEND="-Wp,-D_FORTIFY_SOURCE=2 -fPIC" dpkg-buildflags --get CFLAGS)" \
-    && LD_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_LDFLAGS_MAINT_APPEND="-Wl,--as-needed -pie" dpkg-buildflags --get LDFLAGS)" \
-    && CONFIGURE_ARGS="--prefix=/usr \
-                --state=/var/lib/unit \
-                --control=unix:/var/run/control.unit.sock \
-                --pid=/var/run/unit.pid \
-                --log=/var/log/unit.log \
-                --tmp=/var/tmp \
-                --user=unit \
-                --group=unit \
-                --openssl \
-                --libdir=/usr/lib/$DEB_HOST_MULTIARCH" \
-    && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modules=/usr/lib/unit/debug-modules --debug \
-    && make -j $NCPU unitd \
-    && install -pm755 build/unitd /usr/sbin/unitd-debug \
-    && make clean \
-    && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modules=/usr/lib/unit/modules \
-    && make -j $NCPU unitd \
-    && install -pm755 build/unitd /usr/sbin/unitd \
-    && make clean \
-    && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --modules=/usr/lib/unit/debug-modules --debug \
-    && ./configure go --go-path=$GOPATH \
-    && make -j $NCPU go-install-src libunit-install \
-    && make clean \
-    && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --modules=/usr/lib/unit/modules \
-    && ./configure go --go-path=$GOPATH \
-    && make -j $NCPU go-install-src libunit-install \
-    && ldd /usr/sbin/unitd | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq > /requirements.apt
-
-FROM golang:1.17
-COPY docker-entrypoint.sh /usr/local/bin/
-COPY --from=BUILDER /usr/sbin/unitd /usr/sbin/unitd
-COPY --from=BUILDER /usr/sbin/unitd-debug /usr/sbin/unitd-debug
-COPY --from=BUILDER /usr/lib/unit/ /usr/lib/unit/
-COPY --from=BUILDER /requirements.apt /requirements.apt
-COPY --from=BUILDER /usr/lib/x86_64-linux-gnu/libunit.a /usr/lib/x86_64-linux-gnu/
-COPY --from=BUILDER /usr/include/nxt_* /usr/include/
-COPY --from=BUILDER /go/src/ /go/src/
-RUN set -x \
-    && mkdir -p /var/lib/unit/ \
-    && mkdir /docker-entrypoint.d/ \
-    && addgroup --system unit \
-    && adduser \
-         --system \
-         --disabled-login \
-         --ingroup unit \
-         --no-create-home \
-         --home /nonexistent \
-         --gecos "unit user" \
-         --shell /bin/false \
-         unit \
-    && apt update \
-    && apt --no-install-recommends --no-install-suggests -y install curl $(cat /requirements.apt) \
-    && apt-get clean && rm -rf /var/lib/apt/lists/* \
-    && rm -f /requirements.apt \
-    && ln -sf /dev/stdout /var/log/unit.log
-
-STOPSIGNAL SIGTERM
-
-ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
-
-CMD ["unitd", "--no-daemon", "--control", "unix:/var/run/control.unit.sock"]
diff --git a/pkg/docker/Dockerfile.go1.18 b/pkg/docker/Dockerfile.go1.18
new file mode 100644
index 00000000..f76fd229
--- /dev/null
+++ b/pkg/docker/Dockerfile.go1.18
@@ -0,0 +1,79 @@
+FROM golang:1.18 as BUILDER
+
+LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
+
+RUN set -ex \
+    && apt-get update \
+    && apt-get install --no-install-recommends --no-install-suggests -y ca-certificates mercurial build-essential libssl-dev libpcre2-dev \
+    && mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
+    && hg clone https://hg.nginx.org/unit \
+    && cd unit \
+    && hg up 1.26.1 \
+    && NCPU="$(getconf _NPROCESSORS_ONLN)" \
+    && DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
+    && CC_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_CFLAGS_MAINT_APPEND="-Wp,-D_FORTIFY_SOURCE=2 -fPIC" dpkg-buildflags --get CFLAGS)" \
+    && LD_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_LDFLAGS_MAINT_APPEND="-Wl,--as-needed -pie" dpkg-buildflags --get LDFLAGS)" \
+    && CONFIGURE_ARGS="--prefix=/usr \
+                --state=/var/lib/unit \
+                --control=unix:/var/run/control.unit.sock \
+                --pid=/var/run/unit.pid \
+                --log=/var/log/unit.log \
+                --tmp=/var/tmp \
+                --user=unit \
+                --group=unit \
+                --openssl \
+                --libdir=/usr/lib/$DEB_HOST_MULTIARCH" \
+    && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modules=/usr/lib/unit/debug-modules --debug \
+    && make -j $NCPU unitd \
+    && install -pm755 build/unitd /usr/sbin/unitd-debug \
+    && make clean \
+    && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modules=/usr/lib/unit/modules \
+    && make -j $NCPU unitd \
+    && install -pm755 build/unitd /usr/sbin/unitd \
+    && make clean \
+    && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --modules=/usr/lib/unit/debug-modules --debug \
+    && ./configure go --go-path=$GOPATH \
+    && make -j $NCPU go-install-src libunit-install \
+    && make clean \
+    && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --modules=/usr/lib/unit/modules \
+    && ./configure go --go-path=$GOPATH \
+    && make -j $NCPU go-install-src libunit-install \
+    && ldd /usr/sbin/unitd | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq > /requirements.apt
+
+FROM golang:1.18
+COPY docker-entrypoint.sh /usr/local/bin/
+COPY --from=BUILDER /usr/sbin/unitd /usr/sbin/unitd
+COPY --from=BUILDER /usr/sbin/unitd-debug /usr/sbin/unitd-debug
+COPY --from=BUILDER /usr/lib/unit/ /usr/lib/unit/
+COPY --from=BUILDER /requirements.apt /requirements.apt
+COPY --from=BUILDER /usr/lib/*-linux-gnu/libunit.a /tmp/
+COPY --from=BUILDER /usr/include/nxt_* /usr/include/
+COPY --from=BUILDER /go/src/ /go/src/
+RUN set -x \
+    && if [ -f "/tmp/libunit.a" ]; then \
+        mv /tmp/libunit.a /usr/lib/$(dpkg-architecture -q DEB_HOST_MULTIARCH)/libunit.a; \
+        rm -f /tmp/libunit.a; \
+    fi \
+    && mkdir -p /var/lib/unit/ \
+    && mkdir /docker-entrypoint.d/ \
+    && addgroup --system unit \
+    && adduser \
+         --system \
+         --disabled-login \
+         --ingroup unit \
+         --no-create-home \
+         --home /nonexistent \
+         --gecos "unit user" \
+         --shell /bin/false \
+         unit \
+    && apt update \
+    && apt --no-install-recommends --no-install-suggests -y install curl $(cat /requirements.apt) \
+    && apt-get clean && rm -rf /var/lib/apt/lists/* \
+    && rm -f /requirements.apt \
+    && ln -sf /dev/stdout /var/log/unit.log
+
+STOPSIGNAL SIGTERM
+
+ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
+
+CMD ["unitd", "--no-daemon", "--control", "unix:/var/run/control.unit.sock"]
diff --git a/pkg/docker/Dockerfile.jsc11 b/pkg/docker/Dockerfile.jsc11
index 8e89fc22..a6b1a006 100644
--- a/pkg/docker/Dockerfile.jsc11
+++ b/pkg/docker/Dockerfile.jsc11
@@ -48,6 +48,10 @@ COPY --from=BUILDER /usr/lib/unit/ /usr/lib/unit/
 COPY --from=BUILDER /requirements.apt /requirements.apt
 COPY --from=BUILDER /usr/share/unit-jsc-common/ /usr/share/unit-jsc-common/
 RUN set -x \
+    && if [ -f "/tmp/libunit.a" ]; then \
+        mv /tmp/libunit.a /usr/lib/$(dpkg-architecture -q DEB_HOST_MULTIARCH)/libunit.a; \
+        rm -f /tmp/libunit.a; \
+    fi \
     && mkdir -p /var/lib/unit/ \
     && mkdir /docker-entrypoint.d/ \
     && addgroup --system unit \
diff --git a/pkg/docker/Dockerfile.minimal b/pkg/docker/Dockerfile.minimal
index 36c9af1c..c594c9ab 100644
--- a/pkg/docker/Dockerfile.minimal
+++ b/pkg/docker/Dockerfile.minimal
@@ -48,6 +48,10 @@ COPY --from=BUILDER /usr/lib/unit/ /usr/lib/unit/
 COPY --from=BUILDER /requirements.apt /requirements.apt
 
 RUN set -x \
+    && if [ -f "/tmp/libunit.a" ]; then \
+        mv /tmp/libunit.a /usr/lib/$(dpkg-architecture -q DEB_HOST_MULTIARCH)/libunit.a; \
+        rm -f /tmp/libunit.a; \
+    fi \
     && mkdir -p /var/lib/unit/ \
     && mkdir /docker-entrypoint.d/ \
     && addgroup --system unit \
diff --git a/pkg/docker/Dockerfile.node16 b/pkg/docker/Dockerfile.node16
index 3b4a98e2..90fa25fc 100644
--- a/pkg/docker/Dockerfile.node16
+++ b/pkg/docker/Dockerfile.node16
@@ -46,10 +46,14 @@ COPY --from=BUILDER /usr/sbin/unitd /usr/sbin/unitd
 COPY --from=BUILDER /usr/sbin/unitd-debug /usr/sbin/unitd-debug
 COPY --from=BUILDER /usr/lib/unit/ /usr/lib/unit/
 COPY --from=BUILDER /requirements.apt /requirements.apt
-COPY --from=BUILDER /usr/lib/x86_64-linux-gnu/libunit.a /usr/lib/x86_64-linux-gnu/
+COPY --from=BUILDER /usr/lib/*-linux-gnu/libunit.a /tmp/
 COPY --from=BUILDER /usr/include/nxt_* /usr/include/
 COPY --from=BUILDER /usr/local/lib/node_modules/unit-http/ /usr/local/lib/node_modules/unit-http/
 RUN set -x \
+    && if [ -f "/tmp/libunit.a" ]; then \
+        mv /tmp/libunit.a /usr/lib/$(dpkg-architecture -q DEB_HOST_MULTIARCH)/libunit.a; \
+        rm -f /tmp/libunit.a; \
+    fi \
     && mkdir -p /var/lib/unit/ \
     && mkdir /docker-entrypoint.d/ \
     && addgroup --system unit \
diff --git a/pkg/docker/Dockerfile.perl5.34 b/pkg/docker/Dockerfile.perl5.34
index cee1a829..5c52cafc 100644
--- a/pkg/docker/Dockerfile.perl5.34
+++ b/pkg/docker/Dockerfile.perl5.34
@@ -48,6 +48,10 @@ COPY --from=BUILDER /usr/lib/unit/ /usr/lib/unit/
 COPY --from=BUILDER /requirements.apt /requirements.apt
 
 RUN set -x \
+    && if [ -f "/tmp/libunit.a" ]; then \
+        mv /tmp/libunit.a /usr/lib/$(dpkg-architecture -q DEB_HOST_MULTIARCH)/libunit.a; \
+        rm -f /tmp/libunit.a; \
+    fi \
     && mkdir -p /var/lib/unit/ \
     && mkdir /docker-entrypoint.d/ \
     && addgroup --system unit \
diff --git a/pkg/docker/Dockerfile.php8.0 b/pkg/docker/Dockerfile.php8.0
deleted file mode 100644
index 07290b74..00000000
--- a/pkg/docker/Dockerfile.php8.0
+++ /dev/null
@@ -1,73 +0,0 @@
-FROM php:8.0-cli as BUILDER
-
-LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
-
-RUN set -ex \
-    && apt-get update \
-    && apt-get install --no-install-recommends --no-install-suggests -y ca-certificates mercurial build-essential libssl-dev libpcre2-dev \
-    && mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
-    && hg clone https://hg.nginx.org/unit \
-    && cd unit \
-    && hg up 1.26.1 \
-    && NCPU="$(getconf _NPROCESSORS_ONLN)" \
-    && DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
-    && CC_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_CFLAGS_MAINT_APPEND="-Wp,-D_FORTIFY_SOURCE=2 -fPIC" dpkg-buildflags --get CFLAGS)" \
-    && LD_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_LDFLAGS_MAINT_APPEND="-Wl,--as-needed -pie" dpkg-buildflags --get LDFLAGS)" \
-    && CONFIGURE_ARGS="--prefix=/usr \
-                --state=/var/lib/unit \
-                --control=unix:/var/run/control.unit.sock \
-                --pid=/var/run/unit.pid \
-                --log=/var/log/unit.log \
-                --tmp=/var/tmp \
-                --user=unit \
-                --group=unit \
-                --openssl \
-                --libdir=/usr/lib/$DEB_HOST_MULTIARCH" \
-    && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modules=/usr/lib/unit/debug-modules --debug \
-    && make -j $NCPU unitd \
-    && install -pm755 build/unitd /usr/sbin/unitd-debug \
-    && make clean \
-    && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modules=/usr/lib/unit/modules \
-    && make -j $NCPU unitd \
-    && install -pm755 build/unitd /usr/sbin/unitd \
-    && make clean \
-    && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --modules=/usr/lib/unit/debug-modules --debug \
-    && ./configure php \
-    && make -j $NCPU php-install \
-    && make clean \
-    && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --modules=/usr/lib/unit/modules \
-    && ./configure php \
-    && make -j $NCPU php-install \
-    && ldd /usr/sbin/unitd | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq > /requirements.apt
-
-FROM php:8.0-cli
-COPY docker-entrypoint.sh /usr/local/bin/
-COPY --from=BUILDER /usr/sbin/unitd /usr/sbin/unitd
-COPY --from=BUILDER /usr/sbin/unitd-debug /usr/sbin/unitd-debug
-COPY --from=BUILDER /usr/lib/unit/ /usr/lib/unit/
-COPY --from=BUILDER /requirements.apt /requirements.apt
-RUN ldconfig
-RUN set -x \
-    && mkdir -p /var/lib/unit/ \
-    && mkdir /docker-entrypoint.d/ \
-    && addgroup --system unit \
-    && adduser \
-         --system \
-         --disabled-login \
-         --ingroup unit \
-         --no-create-home \
-         --home /nonexistent \
-         --gecos "unit user" \
-         --shell /bin/false \
-         unit \
-    && apt update \
-    && apt --no-install-recommends --no-install-suggests -y install curl $(cat /requirements.apt) \
-    && apt-get clean && rm -rf /var/lib/apt/lists/* \
-    && rm -f /requirements.apt \
-    && ln -sf /dev/stdout /var/log/unit.log
-
-STOPSIGNAL SIGTERM
-
-ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
-
-CMD ["unitd", "--no-daemon", "--control", "unix:/var/run/control.unit.sock"]
diff --git a/pkg/docker/Dockerfile.php8.1 b/pkg/docker/Dockerfile.php8.1
new file mode 100644
index 00000000..68c4b915
--- /dev/null
+++ b/pkg/docker/Dockerfile.php8.1
@@ -0,0 +1,77 @@
+FROM php:8.1-cli as BUILDER
+
+LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
+
+RUN set -ex \
+    && apt-get update \
+    && apt-get install --no-install-recommends --no-install-suggests -y ca-certificates mercurial build-essential libssl-dev libpcre2-dev \
+    && mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
+    && hg clone https://hg.nginx.org/unit \
+    && cd unit \
+    && hg up 1.26.1 \
+    && NCPU="$(getconf _NPROCESSORS_ONLN)" \
+    && DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
+    && CC_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_CFLAGS_MAINT_APPEND="-Wp,-D_FORTIFY_SOURCE=2 -fPIC" dpkg-buildflags --get CFLAGS)" \
+    && LD_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_LDFLAGS_MAINT_APPEND="-Wl,--as-needed -pie" dpkg-buildflags --get LDFLAGS)" \
+    && CONFIGURE_ARGS="--prefix=/usr \
+                --state=/var/lib/unit \
+                --control=unix:/var/run/control.unit.sock \
+                --pid=/var/run/unit.pid \
+                --log=/var/log/unit.log \
+                --tmp=/var/tmp \
+                --user=unit \
+                --group=unit \
+                --openssl \
+                --libdir=/usr/lib/$DEB_HOST_MULTIARCH" \
+    && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modules=/usr/lib/unit/debug-modules --debug \
+    && make -j $NCPU unitd \
+    && install -pm755 build/unitd /usr/sbin/unitd-debug \
+    && make clean \
+    && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modules=/usr/lib/unit/modules \
+    && make -j $NCPU unitd \
+    && install -pm755 build/unitd /usr/sbin/unitd \
+    && make clean \
+    && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --modules=/usr/lib/unit/debug-modules --debug \
+    && ./configure php \
+    && make -j $NCPU php-install \
+    && make clean \
+    && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --modules=/usr/lib/unit/modules \
+    && ./configure php \
+    && make -j $NCPU php-install \
+    && ldd /usr/sbin/unitd | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq > /requirements.apt
+
+FROM php:8.1-cli
+COPY docker-entrypoint.sh /usr/local/bin/
+COPY --from=BUILDER /usr/sbin/unitd /usr/sbin/unitd
+COPY --from=BUILDER /usr/sbin/unitd-debug /usr/sbin/unitd-debug
+COPY --from=BUILDER /usr/lib/unit/ /usr/lib/unit/
+COPY --from=BUILDER /requirements.apt /requirements.apt
+RUN ldconfig
+RUN set -x \
+    && if [ -f "/tmp/libunit.a" ]; then \
+        mv /tmp/libunit.a /usr/lib/$(dpkg-architecture -q DEB_HOST_MULTIARCH)/libunit.a; \
+        rm -f /tmp/libunit.a; \
+    fi \
+    && mkdir -p /var/lib/unit/ \
+    && mkdir /docker-entrypoint.d/ \
+    && addgroup --system unit \
+    && adduser \
+         --system \
+         --disabled-login \
+         --ingroup unit \
+         --no-create-home \
+         --home /nonexistent \
+         --gecos "unit user" \
+         --shell /bin/false \
+         unit \
+    && apt update \
+    && apt --no-install-recommends --no-install-suggests -y install curl $(cat /requirements.apt) \
+    && apt-get clean && rm -rf /var/lib/apt/lists/* \
+    && rm -f /requirements.apt \
+    && ln -sf /dev/stdout /var/log/unit.log
+
+STOPSIGNAL SIGTERM
+
+ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
+
+CMD ["unitd", "--no-daemon", "--control", "unix:/var/run/control.unit.sock"]
diff --git a/pkg/docker/Dockerfile.python3.10 b/pkg/docker/Dockerfile.python3.10
new file mode 100644
index 00000000..50094af4
--- /dev/null
+++ b/pkg/docker/Dockerfile.python3.10
@@ -0,0 +1,77 @@
+FROM python:3.10 as BUILDER
+
+LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
+
+RUN set -ex \
+    && apt-get update \
+    && apt-get install --no-install-recommends --no-install-suggests -y ca-certificates mercurial build-essential libssl-dev libpcre2-dev \
+    && mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
+    && hg clone https://hg.nginx.org/unit \
+    && cd unit \
+    && hg up 1.26.1 \
+    && NCPU="$(getconf _NPROCESSORS_ONLN)" \
+    && DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
+    && CC_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_CFLAGS_MAINT_APPEND="-Wp,-D_FORTIFY_SOURCE=2 -fPIC" dpkg-buildflags --get CFLAGS)" \
+    && LD_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_LDFLAGS_MAINT_APPEND="-Wl,--as-needed -pie" dpkg-buildflags --get LDFLAGS)" \
+    && CONFIGURE_ARGS="--prefix=/usr \
+                --state=/var/lib/unit \
+                --control=unix:/var/run/control.unit.sock \
+                --pid=/var/run/unit.pid \
+                --log=/var/log/unit.log \
+                --tmp=/var/tmp \
+                --user=unit \
+                --group=unit \
+                --openssl \
+                --libdir=/usr/lib/$DEB_HOST_MULTIARCH" \
+    && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modules=/usr/lib/unit/debug-modules --debug \
+    && make -j $NCPU unitd \
+    && install -pm755 build/unitd /usr/sbin/unitd-debug \
+    && make clean \
+    && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modules=/usr/lib/unit/modules \
+    && make -j $NCPU unitd \
+    && install -pm755 build/unitd /usr/sbin/unitd \
+    && make clean \
+    && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --modules=/usr/lib/unit/debug-modules --debug \
+    && ./configure python --config=/usr/local/bin/python3-config \
+    && make -j $NCPU python3-install \
+    && make clean \
+    && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --modules=/usr/lib/unit/modules \
+    && ./configure python --config=/usr/local/bin/python3-config \
+    && make -j $NCPU python3-install \
+    && ldd /usr/sbin/unitd | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq > /requirements.apt
+
+FROM python:3.10
+COPY docker-entrypoint.sh /usr/local/bin/
+COPY --from=BUILDER /usr/sbin/unitd /usr/sbin/unitd
+COPY --from=BUILDER /usr/sbin/unitd-debug /usr/sbin/unitd-debug
+COPY --from=BUILDER /usr/lib/unit/ /usr/lib/unit/
+COPY --from=BUILDER /requirements.apt /requirements.apt
+
+RUN set -x \
+    && if [ -f "/tmp/libunit.a" ]; then \
+        mv /tmp/libunit.a /usr/lib/$(dpkg-architecture -q DEB_HOST_MULTIARCH)/libunit.a; \
+        rm -f /tmp/libunit.a; \
+    fi \
+    && mkdir -p /var/lib/unit/ \
+    && mkdir /docker-entrypoint.d/ \
+    && addgroup --system unit \
+    && adduser \
+         --system \
+         --disabled-login \
+         --ingroup unit \
+         --no-create-home \
+         --home /nonexistent \
+         --gecos "unit user" \
+         --shell /bin/false \
+         unit \
+    && apt update \
+    && apt --no-install-recommends --no-install-suggests -y install curl $(cat /requirements.apt) \
+    && apt-get clean && rm -rf /var/lib/apt/lists/* \
+    && rm -f /requirements.apt \
+    && ln -sf /dev/stdout /var/log/unit.log
+
+STOPSIGNAL SIGTERM
+
+ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
+
+CMD ["unitd", "--no-daemon", "--control", "unix:/var/run/control.unit.sock"]
diff --git a/pkg/docker/Dockerfile.python3.9 b/pkg/docker/Dockerfile.python3.9
deleted file mode 100644
index 22491edb..00000000
--- a/pkg/docker/Dockerfile.python3.9
+++ /dev/null
@@ -1,73 +0,0 @@
-FROM python:3.9 as BUILDER
-
-LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
-
-RUN set -ex \
-    && apt-get update \
-    && apt-get install --no-install-recommends --no-install-suggests -y ca-certificates mercurial build-essential libssl-dev libpcre2-dev \
-    && mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
-    && hg clone https://hg.nginx.org/unit \
-    && cd unit \
-    && hg up 1.26.1 \
-    && NCPU="$(getconf _NPROCESSORS_ONLN)" \
-    && DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
-    && CC_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_CFLAGS_MAINT_APPEND="-Wp,-D_FORTIFY_SOURCE=2 -fPIC" dpkg-buildflags --get CFLAGS)" \
-    && LD_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_LDFLAGS_MAINT_APPEND="-Wl,--as-needed -pie" dpkg-buildflags --get LDFLAGS)" \
-    && CONFIGURE_ARGS="--prefix=/usr \
-                --state=/var/lib/unit \
-                --control=unix:/var/run/control.unit.sock \
-                --pid=/var/run/unit.pid \
-                --log=/var/log/unit.log \
-                --tmp=/var/tmp \
-                --user=unit \
-                --group=unit \
-                --openssl \
-                --libdir=/usr/lib/$DEB_HOST_MULTIARCH" \
-    && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modules=/usr/lib/unit/debug-modules --debug \
-    && make -j $NCPU unitd \
-    && install -pm755 build/unitd /usr/sbin/unitd-debug \
-    && make clean \
-    && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modules=/usr/lib/unit/modules \
-    && make -j $NCPU unitd \
-    && install -pm755 build/unitd /usr/sbin/unitd \
-    && make clean \
-    && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --modules=/usr/lib/unit/debug-modules --debug \
-    && ./configure python --config=/usr/local/bin/python3-config \
-    && make -j $NCPU python3-install \
-    && make clean \
-    && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --modules=/usr/lib/unit/modules \
-    && ./configure python --config=/usr/local/bin/python3-config \
-    && make -j $NCPU python3-install \
-    && ldd /usr/sbin/unitd | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq > /requirements.apt
-
-FROM python:3.9
-COPY docker-entrypoint.sh /usr/local/bin/
-COPY --from=BUILDER /usr/sbin/unitd /usr/sbin/unitd
-COPY --from=BUILDER /usr/sbin/unitd-debug /usr/sbin/unitd-debug
-COPY --from=BUILDER /usr/lib/unit/ /usr/lib/unit/
-COPY --from=BUILDER /requirements.apt /requirements.apt
-
-RUN set -x \
-    && mkdir -p /var/lib/unit/ \
-    && mkdir /docker-entrypoint.d/ \
-    && addgroup --system unit \
-    && adduser \
-         --system \
-         --disabled-login \
-         --ingroup unit \
-         --no-create-home \
-         --home /nonexistent \
-         --gecos "unit user" \
-         --shell /bin/false \
-         unit \
-    && apt update \
-    && apt --no-install-recommends --no-install-suggests -y install curl $(cat /requirements.apt) \
-    && apt-get clean && rm -rf /var/lib/apt/lists/* \
-    && rm -f /requirements.apt \
-    && ln -sf /dev/stdout /var/log/unit.log
-
-STOPSIGNAL SIGTERM
-
-ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
-
-CMD ["unitd", "--no-daemon", "--control", "unix:/var/run/control.unit.sock"]
diff --git a/pkg/docker/Dockerfile.ruby3.0 b/pkg/docker/Dockerfile.ruby3.0
deleted file mode 100644
index 8da13e20..00000000
--- a/pkg/docker/Dockerfile.ruby3.0
+++ /dev/null
@@ -1,73 +0,0 @@
-FROM ruby:3.0 as BUILDER
-
-LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
-
-RUN set -ex \
-    && apt-get update \
-    && apt-get install --no-install-recommends --no-install-suggests -y ca-certificates mercurial build-essential libssl-dev libpcre2-dev \
-    && mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
-    && hg clone https://hg.nginx.org/unit \
-    && cd unit \
-    && hg up 1.26.1 \
-    && NCPU="$(getconf _NPROCESSORS_ONLN)" \
-    && DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
-    && CC_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_CFLAGS_MAINT_APPEND="-Wp,-D_FORTIFY_SOURCE=2 -fPIC" dpkg-buildflags --get CFLAGS)" \
-    && LD_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_LDFLAGS_MAINT_APPEND="-Wl,--as-needed -pie" dpkg-buildflags --get LDFLAGS)" \
-    && CONFIGURE_ARGS="--prefix=/usr \
-                --state=/var/lib/unit \
-                --control=unix:/var/run/control.unit.sock \
-                --pid=/var/run/unit.pid \
-                --log=/var/log/unit.log \
-                --tmp=/var/tmp \
-                --user=unit \
-                --group=unit \
-                --openssl \
-                --libdir=/usr/lib/$DEB_HOST_MULTIARCH" \
-    && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modules=/usr/lib/unit/debug-modules --debug \
-    && make -j $NCPU unitd \
-    && install -pm755 build/unitd /usr/sbin/unitd-debug \
-    && make clean \
-    && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modules=/usr/lib/unit/modules \
-    && make -j $NCPU unitd \
-    && install -pm755 build/unitd /usr/sbin/unitd \
-    && make clean \
-    && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --modules=/usr/lib/unit/debug-modules --debug \
-    && ./configure ruby \
-    && make -j $NCPU ruby-install \
-    && make clean \
-    && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --modules=/usr/lib/unit/modules \
-    && ./configure ruby \
-    && make -j $NCPU ruby-install \
-    && ldd /usr/sbin/unitd | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq > /requirements.apt
-
-FROM ruby:3.0
-COPY docker-entrypoint.sh /usr/local/bin/
-COPY --from=BUILDER /usr/sbin/unitd /usr/sbin/unitd
-COPY --from=BUILDER /usr/sbin/unitd-debug /usr/sbin/unitd-debug
-COPY --from=BUILDER /usr/lib/unit/ /usr/lib/unit/
-COPY --from=BUILDER /requirements.apt /requirements.apt
-RUN gem install rack
-RUN set -x \
-    && mkdir -p /var/lib/unit/ \
-    && mkdir /docker-entrypoint.d/ \
-    && addgroup --system unit \
-    && adduser \
-         --system \
-         --disabled-login \
-         --ingroup unit \
-         --no-create-home \
-         --home /nonexistent \
-         --gecos "unit user" \
-         --shell /bin/false \
-         unit \
-    && apt update \
-    && apt --no-install-recommends --no-install-suggests -y install curl $(cat /requirements.apt) \
-    && apt-get clean && rm -rf /var/lib/apt/lists/* \
-    && rm -f /requirements.apt \
-    && ln -sf /dev/stdout /var/log/unit.log
-
-STOPSIGNAL SIGTERM
-
-ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
-
-CMD ["unitd", "--no-daemon", "--control", "unix:/var/run/control.unit.sock"]
diff --git a/pkg/docker/Dockerfile.ruby3.1 b/pkg/docker/Dockerfile.ruby3.1
new file mode 100644
index 00000000..47dec1ed
--- /dev/null
+++ b/pkg/docker/Dockerfile.ruby3.1
@@ -0,0 +1,77 @@
+FROM ruby:3.1 as BUILDER
+
+LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
+
+RUN set -ex \
+    && apt-get update \
+    && apt-get install --no-install-recommends --no-install-suggests -y ca-certificates mercurial build-essential libssl-dev libpcre2-dev \
+    && mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
+    && hg clone https://hg.nginx.org/unit \
+    && cd unit \
+    && hg up 1.26.1 \
+    && NCPU="$(getconf _NPROCESSORS_ONLN)" \
+    && DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
+    && CC_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_CFLAGS_MAINT_APPEND="-Wp,-D_FORTIFY_SOURCE=2 -fPIC" dpkg-buildflags --get CFLAGS)" \
+    && LD_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_LDFLAGS_MAINT_APPEND="-Wl,--as-needed -pie" dpkg-buildflags --get LDFLAGS)" \
+    && CONFIGURE_ARGS="--prefix=/usr \
+                --state=/var/lib/unit \
+                --control=unix:/var/run/control.unit.sock \
+                --pid=/var/run/unit.pid \
+                --log=/var/log/unit.log \
+                --tmp=/var/tmp \
+                --user=unit \
+                --group=unit \
+                --openssl \
+                --libdir=/usr/lib/$DEB_HOST_MULTIARCH" \
+    && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modules=/usr/lib/unit/debug-modules --debug \
+    && make -j $NCPU unitd \
+    && install -pm755 build/unitd /usr/sbin/unitd-debug \
+    && make clean \
+    && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modules=/usr/lib/unit/modules \
+    && make -j $NCPU unitd \
+    && install -pm755 build/unitd /usr/sbin/unitd \
+    && make clean \
+    && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --modules=/usr/lib/unit/debug-modules --debug \
+    && ./configure ruby \
+    && make -j $NCPU ruby-install \
+    && make clean \
+    && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --modules=/usr/lib/unit/modules \
+    && ./configure ruby \
+    && make -j $NCPU ruby-install \
+    && ldd /usr/sbin/unitd | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq > /requirements.apt
+
+FROM ruby:3.1
+COPY docker-entrypoint.sh /usr/local/bin/
+COPY --from=BUILDER /usr/sbin/unitd /usr/sbin/unitd
+COPY --from=BUILDER /usr/sbin/unitd-debug /usr/sbin/unitd-debug
+COPY --from=BUILDER /usr/lib/unit/ /usr/lib/unit/
+COPY --from=BUILDER /requirements.apt /requirements.apt
+RUN gem install rack
+RUN set -x \
+    && if [ -f "/tmp/libunit.a" ]; then \
+        mv /tmp/libunit.a /usr/lib/$(dpkg-architecture -q DEB_HOST_MULTIARCH)/libunit.a; \
+        rm -f /tmp/libunit.a; \
+    fi \
+    && mkdir -p /var/lib/unit/ \
+    && mkdir /docker-entrypoint.d/ \
+    && addgroup --system unit \
+    && adduser \
+         --system \
+         --disabled-login \
+         --ingroup unit \
+         --no-create-home \
+         --home /nonexistent \
+         --gecos "unit user" \
+         --shell /bin/false \
+         unit \
+    && apt update \
+    && apt --no-install-recommends --no-install-suggests -y install curl $(cat /requirements.apt) \
+    && apt-get clean && rm -rf /var/lib/apt/lists/* \
+    && rm -f /requirements.apt \
+    && ln -sf /dev/stdout /var/log/unit.log
+
+STOPSIGNAL SIGTERM
+
+ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
+
+CMD ["unitd", "--no-daemon", "--control", "unix:/var/run/control.unit.sock"]
-- 
cgit 


From b512eff4acb97955ba48797d1299c27070a57e1a Mon Sep 17 00:00:00 2001
From: Konstantin Pavlov <thresh@nginx.com>
Date: Thu, 5 May 2022 13:25:52 +0400
Subject: Packages: added Ubuntu 22.04 "jammy" support.

---
 pkg/deb/Makefile | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'pkg')

diff --git a/pkg/deb/Makefile b/pkg/deb/Makefile
index 66a5f33a..3e1d53c5 100644
--- a/pkg/deb/Makefile
+++ b/pkg/deb/Makefile
@@ -19,6 +19,20 @@ BUILD_DEPENDS = $(BUILD_DEPENDS_unit)
 
 MODULES=
 
+# Ubuntu 22.04
+ifeq ($(CODENAME),jammy)
+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
+endif
+
 # Ubuntu 21.10
 ifeq ($(CODENAME),impish)
 include Makefile.php
-- 
cgit 


From 3e06ae3b34fa1fb1aff15186ddd4588f4f5aa3b3 Mon Sep 17 00:00:00 2001
From: Konstantin Pavlov <thresh@nginx.com>
Date: Mon, 16 May 2022 17:22:40 +0400
Subject: Packages: ship README.md and CONTRIBUTING.md.

---
 pkg/deb/Makefile                      | 2 +-
 pkg/deb/debian.module/rules-noarch.in | 3 ++-
 pkg/deb/debian.module/rules.in        | 3 ++-
 pkg/deb/debian/rules.in               | 6 ++++--
 pkg/rpm/Makefile                      | 2 +-
 pkg/rpm/unit.spec.in                  | 4 +++-
 6 files changed, 13 insertions(+), 7 deletions(-)

(limited to 'pkg')

diff --git a/pkg/deb/Makefile b/pkg/deb/Makefile
index 3e1d53c5..52813e37 100644
--- a/pkg/deb/Makefile
+++ b/pkg/deb/Makefile
@@ -194,7 +194,7 @@ 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 configure auto src test version go docs/man/unitd.8.in
+		LICENSE NOTICE CHANGES README.md CONTRIBUTING.md configure auto src test version go docs/man/unitd.8.in
 	mv debuild/$(SRCDIR).tar.gz debuild/unit_$(VERSION).orig.tar.gz
 	cd debuild && tar zxf unit_$(VERSION).orig.tar.gz
 
diff --git a/pkg/deb/debian.module/rules-noarch.in b/pkg/deb/debian.module/rules-noarch.in
index a24602c4..0f05aaba 100644
--- a/pkg/deb/debian.module/rules-noarch.in
+++ b/pkg/deb/debian.module/rules-noarch.in
@@ -26,7 +26,8 @@ config.env.%:
 	cp -Pa $(CURDIR)/CHANGES $(BUILDDIR_$*)/
 	cp -Pa $(CURDIR)/LICENSE $(BUILDDIR_$*)/
 	cp -Pa $(CURDIR)/NOTICE $(BUILDDIR_$*)/
-	cp -Pa $(CURDIR)/README $(BUILDDIR_$*)/
+	cp -Pa $(CURDIR)/README.md $(BUILDDIR_$*)/
+	cp -Pa $(CURDIR)/CONTRIBUTING.md $(BUILDDIR_$*)/
 	cp -Pa $(CURDIR)/go $(BUILDDIR_$*)/
 	touch $@
 
diff --git a/pkg/deb/debian.module/rules.in b/pkg/deb/debian.module/rules.in
index 8ee277b3..f1217553 100755
--- a/pkg/deb/debian.module/rules.in
+++ b/pkg/deb/debian.module/rules.in
@@ -26,7 +26,8 @@ config.env.%:
 	cp -Pa $(CURDIR)/CHANGES $(BUILDDIR_$*)/
 	cp -Pa $(CURDIR)/LICENSE $(BUILDDIR_$*)/
 	cp -Pa $(CURDIR)/NOTICE $(BUILDDIR_$*)/
-	cp -Pa $(CURDIR)/README $(BUILDDIR_$*)/
+	cp -Pa $(CURDIR)/README.md $(BUILDDIR_$*)/
+	cp -Pa $(CURDIR)/CONTRIBUTING.md $(BUILDDIR_$*)/
 	cp -Pa $(CURDIR)/go $(BUILDDIR_$*)/
 	touch $@
 
diff --git a/pkg/deb/debian/rules.in b/pkg/deb/debian/rules.in
index fe7d5c7c..d2e34796 100644
--- a/pkg/deb/debian/rules.in
+++ b/pkg/deb/debian/rules.in
@@ -31,7 +31,8 @@ config.env.%:
 	cp -Pa $(CURDIR)/CHANGES $(BUILDDIR_$*)/
 	cp -Pa $(CURDIR)/LICENSE $(BUILDDIR_$*)/
 	cp -Pa $(CURDIR)/NOTICE $(BUILDDIR_$*)/
-	cp -Pa $(CURDIR)/README $(BUILDDIR_$*)/
+	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/
@@ -109,7 +110,8 @@ install: build do.tests
 	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
-	install -m 644 README $(INSTALLDIR)/usr/share/doc/unit/
+	install -m 644 README.md $(INSTALLDIR)/usr/share/doc/unit/
+	install -m 644 CONTRIBUTING.md $(INSTALLDIR)/usr/share/doc/unit/
 	install -m 644 NOTICE $(INSTALLDIR)/usr/share/doc/unit/
 
 binary-indep: build install
diff --git a/pkg/rpm/Makefile b/pkg/rpm/Makefile
index 011eba5b..73a111c8 100644
--- a/pkg/rpm/Makefile
+++ b/pkg/rpm/Makefile
@@ -223,7 +223,7 @@ endif
 rpmbuild/SOURCES/unit-$(VERSION).tar.gz:
 	cd ../.. && tar -czf pkg/rpm/rpmbuild/SOURCES/unit-$(VERSION).tar.gz \
 		--transform "s#^#unit-$(VERSION)/#" \
-		LICENSE NOTICE CHANGES README configure auto src test version go docs/man/unitd.8.in
+		LICENSE NOTICE CHANGES README.md CONTRIBUTING.md configure auto src test version go docs/man/unitd.8.in
 
 unit: check-build-depends-unit rpmbuild/SPECS/unit.spec rpmbuild/SOURCES/unit-$(VERSION).tar.gz
 	@echo "===> Building $@ package" ; \
diff --git a/pkg/rpm/unit.spec.in b/pkg/rpm/unit.spec.in
index f643b77f..4cbc7358 100644
--- a/pkg/rpm/unit.spec.in
+++ b/pkg/rpm/unit.spec.in
@@ -123,7 +123,9 @@ DESTDIR=%{buildroot} make unitd-install libunit-install manpage-install
     %{buildroot}%{_datadir}/doc/unit/
 %{__install} -m 644 -p NOTICE \
     %{buildroot}%{_datadir}/doc/unit/COPYRIGHT
-%{__install} -m 644 -p README \
+%{__install} -m 644 -p README.md \
+    %{buildroot}%{_datadir}/doc/unit/
+%{__install} -m 644 -p CONTRIBUTING.md \
     %{buildroot}%{_datadir}/doc/unit/
 
 %{__rm} -rf %{buildroot}%{_initrddir}/
-- 
cgit 


From 237ddbe1770485eab0723aac3a5dca92e1a0c5d9 Mon Sep 17 00:00:00 2001
From: Konstantin Pavlov <thresh@nginx.com>
Date: Thu, 26 May 2022 10:52:58 +0400
Subject: Packaging: Go: use GO111MODULE=auto in build instructions.

---
 pkg/deb/Makefile.go | 2 +-
 pkg/rpm/Makefile.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkg')

diff --git a/pkg/deb/Makefile.go b/pkg/deb/Makefile.go
index cdccb5ed..b9463076 100644
--- a/pkg/deb/Makefile.go
+++ b/pkg/deb/Makefile.go
@@ -36,7 +36,7 @@ The $(MODULE_SUMMARY_go) has been installed.
 
 To check out the sample app, run these commands:
 
- GOPATH=/usr/share/gocode go build -o /tmp/go-app /usr/share/doc/unit-$(MODULE_SUFFIX_go)/examples/go-app/let-my-people.go
+ GOPATH=/usr/share/gocode GO111MODULE=auto go build -o /tmp/go-app /usr/share/doc/unit-$(MODULE_SUFFIX_go)/examples/go-app/let-my-people.go
  sudo service unit restart
  cd /usr/share/doc/unit-$(MODULE_SUFFIX_go)/examples
  sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock http://localhost/config
diff --git a/pkg/rpm/Makefile.go b/pkg/rpm/Makefile.go
index e3891ab4..a1421bee 100644
--- a/pkg/rpm/Makefile.go
+++ b/pkg/rpm/Makefile.go
@@ -65,7 +65,7 @@ The $(MODULE_SUMMARY_go) has been installed.
 
 To check the sample app, run these commands:
 
- GOPATH=%{gopath} go build -o /tmp/go-app /usr/share/doc/unit-go/examples/go-app/let-my-people.go
+ GOPATH=%{gopath} GO111MODULE=auto go build -o /tmp/go-app /usr/share/doc/unit-go/examples/go-app/let-my-people.go
  sudo service unit start
  cd /usr/share/doc/%{name}/examples
  sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/unit/control.sock http://localhost/config
-- 
cgit 


From 3d53bba5b373fc80d9bf7f3e50f63639637e228c Mon Sep 17 00:00:00 2001
From: Konstantin Pavlov <thresh@nginx.com>
Date: Tue, 31 May 2022 18:35:39 +0400
Subject: Packaging: added support for RHEL 9.

---
 pkg/rpm/Makefile          | 12 ++++++++++++
 pkg/rpm/Makefile.python39 |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

(limited to 'pkg')

diff --git a/pkg/rpm/Makefile b/pkg/rpm/Makefile
index 73a111c8..a360b36e 100644
--- a/pkg/rpm/Makefile
+++ b/pkg/rpm/Makefile
@@ -16,6 +16,8 @@ else ifeq ($(shell test `rpm --eval '0%{?rhel} -eq 7 -a 0%{?amzn} -eq 0'`; echo
 OSVER = centos7
 else ifeq ($(shell rpm --eval "%{?rhel}"), 8)
 OSVER = centos8
+else ifeq ($(shell rpm --eval "%{?rhel}"), 9)
+OSVER = centos9
 else ifeq ($(shell rpm --eval "%{?amzn}"), 1)
 OSVER = amazonlinux1
 else ifeq ($(shell rpm --eval "%{?amzn}"), 2)
@@ -84,6 +86,16 @@ include Makefile.jsc8
 include Makefile.jsc11
 endif
 
+ifeq ($(OSVER), centos9)
+include Makefile.php
+include Makefile.python39
+include Makefile.go
+include Makefile.perl
+include Makefile.jsc-common
+include Makefile.jsc8
+include Makefile.jsc11
+endif
+
 ifeq ($(OSVER), amazonlinux1)
 include Makefile.php
 include Makefile.python27
diff --git a/pkg/rpm/Makefile.python39 b/pkg/rpm/Makefile.python39
index 8e444e56..3f791111 100644
--- a/pkg/rpm/Makefile.python39
+++ b/pkg/rpm/Makefile.python39
@@ -13,7 +13,7 @@ MODULE_INSTARGS_python39=	python3.9-install
 MODULE_SOURCES_python39=	unit.example-python-app \
 			unit.example-python39-config
 
-ifneq (,$(findstring $(OSVER),opensuse-tumbleweed sles fedora amazonlinux2))
+ifneq (,$(findstring $(OSVER),opensuse-tumbleweed sles fedora amazonlinux2 centos9))
 BUILD_DEPENDS_python39=	python3-devel
 else
 BUILD_DEPENDS_python39=	python39-devel
-- 
cgit 


From 3d1fa29f1d03e392df534b6589d3e1d2ed883671 Mon Sep 17 00:00:00 2001
From: Andrei Zeliankou <zelenkov@nginx.com>
Date: Thu, 2 Jun 2022 12:31:55 +0000
Subject: Generated Dockerfiles for Unit 1.27.0.

---
 pkg/docker/Dockerfile.go1.18     | 2 +-
 pkg/docker/Dockerfile.jsc11      | 2 +-
 pkg/docker/Dockerfile.minimal    | 2 +-
 pkg/docker/Dockerfile.node16     | 2 +-
 pkg/docker/Dockerfile.perl5.34   | 2 +-
 pkg/docker/Dockerfile.php8.1     | 2 +-
 pkg/docker/Dockerfile.python3.10 | 2 +-
 pkg/docker/Dockerfile.ruby3.1    | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'pkg')

diff --git a/pkg/docker/Dockerfile.go1.18 b/pkg/docker/Dockerfile.go1.18
index f76fd229..9162d8cf 100644
--- a/pkg/docker/Dockerfile.go1.18
+++ b/pkg/docker/Dockerfile.go1.18
@@ -8,7 +8,7 @@ RUN set -ex \
     && mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
     && hg clone https://hg.nginx.org/unit \
     && cd unit \
-    && hg up 1.26.1 \
+    && hg up 1.27.0 \
     && NCPU="$(getconf _NPROCESSORS_ONLN)" \
     && DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
     && CC_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_CFLAGS_MAINT_APPEND="-Wp,-D_FORTIFY_SOURCE=2 -fPIC" dpkg-buildflags --get CFLAGS)" \
diff --git a/pkg/docker/Dockerfile.jsc11 b/pkg/docker/Dockerfile.jsc11
index a6b1a006..69fc72ad 100644
--- a/pkg/docker/Dockerfile.jsc11
+++ b/pkg/docker/Dockerfile.jsc11
@@ -8,7 +8,7 @@ RUN set -ex \
     && mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
     && hg clone https://hg.nginx.org/unit \
     && cd unit \
-    && hg up 1.26.1 \
+    && hg up 1.27.0 \
     && NCPU="$(getconf _NPROCESSORS_ONLN)" \
     && DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
     && CC_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_CFLAGS_MAINT_APPEND="-Wp,-D_FORTIFY_SOURCE=2 -fPIC" dpkg-buildflags --get CFLAGS)" \
diff --git a/pkg/docker/Dockerfile.minimal b/pkg/docker/Dockerfile.minimal
index c594c9ab..730e1893 100644
--- a/pkg/docker/Dockerfile.minimal
+++ b/pkg/docker/Dockerfile.minimal
@@ -8,7 +8,7 @@ RUN set -ex \
     && mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
     && hg clone https://hg.nginx.org/unit \
     && cd unit \
-    && hg up 1.26.1 \
+    && hg up 1.27.0 \
     && NCPU="$(getconf _NPROCESSORS_ONLN)" \
     && DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
     && CC_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_CFLAGS_MAINT_APPEND="-Wp,-D_FORTIFY_SOURCE=2 -fPIC" dpkg-buildflags --get CFLAGS)" \
diff --git a/pkg/docker/Dockerfile.node16 b/pkg/docker/Dockerfile.node16
index 90fa25fc..246105d8 100644
--- a/pkg/docker/Dockerfile.node16
+++ b/pkg/docker/Dockerfile.node16
@@ -8,7 +8,7 @@ RUN set -ex \
     && mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
     && hg clone https://hg.nginx.org/unit \
     && cd unit \
-    && hg up 1.26.1 \
+    && hg up 1.27.0 \
     && NCPU="$(getconf _NPROCESSORS_ONLN)" \
     && DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
     && CC_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_CFLAGS_MAINT_APPEND="-Wp,-D_FORTIFY_SOURCE=2 -fPIC" dpkg-buildflags --get CFLAGS)" \
diff --git a/pkg/docker/Dockerfile.perl5.34 b/pkg/docker/Dockerfile.perl5.34
index 5c52cafc..db87d209 100644
--- a/pkg/docker/Dockerfile.perl5.34
+++ b/pkg/docker/Dockerfile.perl5.34
@@ -8,7 +8,7 @@ RUN set -ex \
     && mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
     && hg clone https://hg.nginx.org/unit \
     && cd unit \
-    && hg up 1.26.1 \
+    && hg up 1.27.0 \
     && NCPU="$(getconf _NPROCESSORS_ONLN)" \
     && DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
     && CC_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_CFLAGS_MAINT_APPEND="-Wp,-D_FORTIFY_SOURCE=2 -fPIC" dpkg-buildflags --get CFLAGS)" \
diff --git a/pkg/docker/Dockerfile.php8.1 b/pkg/docker/Dockerfile.php8.1
index 68c4b915..5c18a9bc 100644
--- a/pkg/docker/Dockerfile.php8.1
+++ b/pkg/docker/Dockerfile.php8.1
@@ -8,7 +8,7 @@ RUN set -ex \
     && mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
     && hg clone https://hg.nginx.org/unit \
     && cd unit \
-    && hg up 1.26.1 \
+    && hg up 1.27.0 \
     && NCPU="$(getconf _NPROCESSORS_ONLN)" \
     && DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
     && CC_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_CFLAGS_MAINT_APPEND="-Wp,-D_FORTIFY_SOURCE=2 -fPIC" dpkg-buildflags --get CFLAGS)" \
diff --git a/pkg/docker/Dockerfile.python3.10 b/pkg/docker/Dockerfile.python3.10
index 50094af4..09e7f42a 100644
--- a/pkg/docker/Dockerfile.python3.10
+++ b/pkg/docker/Dockerfile.python3.10
@@ -8,7 +8,7 @@ RUN set -ex \
     && mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
     && hg clone https://hg.nginx.org/unit \
     && cd unit \
-    && hg up 1.26.1 \
+    && hg up 1.27.0 \
     && NCPU="$(getconf _NPROCESSORS_ONLN)" \
     && DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
     && CC_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_CFLAGS_MAINT_APPEND="-Wp,-D_FORTIFY_SOURCE=2 -fPIC" dpkg-buildflags --get CFLAGS)" \
diff --git a/pkg/docker/Dockerfile.ruby3.1 b/pkg/docker/Dockerfile.ruby3.1
index 47dec1ed..0baedc32 100644
--- a/pkg/docker/Dockerfile.ruby3.1
+++ b/pkg/docker/Dockerfile.ruby3.1
@@ -8,7 +8,7 @@ RUN set -ex \
     && mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
     && hg clone https://hg.nginx.org/unit \
     && cd unit \
-    && hg up 1.26.1 \
+    && hg up 1.27.0 \
     && NCPU="$(getconf _NPROCESSORS_ONLN)" \
     && DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
     && CC_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_CFLAGS_MAINT_APPEND="-Wp,-D_FORTIFY_SOURCE=2 -fPIC" dpkg-buildflags --get CFLAGS)" \
-- 
cgit