summaryrefslogtreecommitdiffhomepage
path: root/pkg
diff options
context:
space:
mode:
authorKonstantin Pavlov <thresh@nginx.com>2022-06-02 16:51:49 +0400
committerKonstantin Pavlov <thresh@nginx.com>2022-06-02 16:51:49 +0400
commitd9fddee1dbfc1f5d49c8f40386289d7188030952 (patch)
tree842a62b343ac33eba10e7a426a10b55bb1c46aed /pkg
parent420395ee2e7cd464e157c49bea3d74f15bf25f30 (diff)
parent0d48fe73c4450901622373e35f6ff3a944ec13d6 (diff)
downloadunit-d9fddee1dbfc1f5d49c8f40386289d7188030952.tar.gz
unit-d9fddee1dbfc1f5d49c8f40386289d7188030952.tar.bz2
Merged with the default branch.1.27.0-1
Diffstat (limited to 'pkg')
-rw-r--r--pkg/deb/Makefile16
-rw-r--r--pkg/deb/Makefile.go2
-rw-r--r--pkg/deb/debian.module/copyright.unit-jsc1015
-rw-r--r--pkg/deb/debian.module/copyright.unit-jsc1115
-rw-r--r--pkg/deb/debian.module/copyright.unit-jsc815
-rw-r--r--pkg/deb/debian.module/rules-noarch.in3
-rwxr-xr-xpkg/deb/debian.module/rules.in3
-rw-r--r--pkg/deb/debian/copyright12
-rw-r--r--pkg/deb/debian/rules.in6
-rw-r--r--pkg/docker/Dockerfile.go1.18 (renamed from pkg/docker/Dockerfile.go1.17)12
-rw-r--r--pkg/docker/Dockerfile.jsc116
-rw-r--r--pkg/docker/Dockerfile.minimal6
-rw-r--r--pkg/docker/Dockerfile.node168
-rw-r--r--pkg/docker/Dockerfile.perl5.346
-rw-r--r--pkg/docker/Dockerfile.php8.16
-rw-r--r--pkg/docker/Dockerfile.python3.106
-rw-r--r--pkg/docker/Dockerfile.ruby3.1 (renamed from pkg/docker/Dockerfile.ruby3.0)10
-rw-r--r--pkg/docker/Makefile8
-rw-r--r--pkg/docker/template.Dockerfile4
-rw-r--r--pkg/rpm/Makefile14
-rw-r--r--pkg/rpm/Makefile.go2
-rw-r--r--pkg/rpm/Makefile.python392
-rw-r--r--pkg/rpm/rpmbuild/SOURCES/COPYRIGHT.unit-jsc1015
-rw-r--r--pkg/rpm/rpmbuild/SOURCES/COPYRIGHT.unit-jsc1115
-rw-r--r--pkg/rpm/rpmbuild/SOURCES/COPYRIGHT.unit-jsc815
-rw-r--r--pkg/rpm/unit.spec.in4
26 files changed, 169 insertions, 57 deletions
diff --git a/pkg/deb/Makefile b/pkg/deb/Makefile
index 66a5f33a..52813e37 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
@@ -180,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/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/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.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/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/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/docker/Dockerfile.go1.17 b/pkg/docker/Dockerfile.go1.18
index e7443e8c..9162d8cf 100644
--- a/pkg/docker/Dockerfile.go1.17
+++ b/pkg/docker/Dockerfile.go1.18
@@ -1,4 +1,4 @@
-FROM golang:1.17 as BUILDER
+FROM golang:1.18 as BUILDER
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
@@ -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)" \
@@ -40,16 +40,20 @@ RUN set -ex \
&& 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
+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/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 /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 \
diff --git a/pkg/docker/Dockerfile.jsc11 b/pkg/docker/Dockerfile.jsc11
index 8e89fc22..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)" \
@@ -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..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)" \
@@ -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..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)" \
@@ -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..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)" \
@@ -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.1 b/pkg/docker/Dockerfile.php8.1
index 43f4bb03..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)" \
@@ -48,6 +48,10 @@ 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 \
diff --git a/pkg/docker/Dockerfile.python3.10 b/pkg/docker/Dockerfile.python3.10
index 17c1d9b0..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)" \
@@ -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.ruby3.0 b/pkg/docker/Dockerfile.ruby3.1
index 8da13e20..0baedc32 100644
--- a/pkg/docker/Dockerfile.ruby3.0
+++ b/pkg/docker/Dockerfile.ruby3.1
@@ -1,4 +1,4 @@
-FROM ruby:3.0 as BUILDER
+FROM ruby:3.1 as BUILDER
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
@@ -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)" \
@@ -40,7 +40,7 @@ RUN set -ex \
&& 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
+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
@@ -48,6 +48,10 @@ 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 \
diff --git a/pkg/docker/Makefile b/pkg/docker/Makefile
index f8578986..5c48f925 100644
--- a/pkg/docker/Makefile
+++ b/pkg/docker/Makefile
@@ -18,12 +18,12 @@ 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
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
@@ -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
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 \
diff --git a/pkg/rpm/Makefile b/pkg/rpm/Makefile
index 011eba5b..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
@@ -223,7 +235,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/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
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
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");
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}/