Merged with the default branch.1.27.0-1

7 files changed, 51 insertions, 16 deletions

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