From 97b4de0d4accfc7ccda561da9856db5f0f560b6b Mon Sep 17 00:00:00 2001 From: Andrei Belov Date: Fri, 26 Mar 2021 18:29:26 +0300 Subject: Packages: corrected permissions for /var/log/unit in rpm. Found by rpmlint. --- pkg/rpm/unit.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkg') diff --git a/pkg/rpm/unit.spec.in b/pkg/rpm/unit.spec.in index 3a148b9d..9d16265d 100644 --- a/pkg/rpm/unit.spec.in +++ b/pkg/rpm/unit.spec.in @@ -203,7 +203,7 @@ BANNER %dir %{_libdir}/unit/modules %dir %{_libdir}/unit/debug-modules %dir %{_sharedstatedir}/unit -%dir %attr(0700,root,root) %{_localstatedir}/log/unit +%dir %attr(0755,root,root) %{_localstatedir}/log/unit %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %{_mandir}/man8/unitd.8* -- cgit From a5eca0b83fec1ec26f8f4a1e471be3b78772cef9 Mon Sep 17 00:00:00 2001 From: Valentin Bartenev Date: Wed, 31 Mar 2021 18:39:42 +0300 Subject: Packages: fixed "dist" target to include man page in the archive. --- pkg/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkg') diff --git a/pkg/Makefile b/pkg/Makefile index 15ff075d..4cf9ff80 100644 --- a/pkg/Makefile +++ b/pkg/Makefile @@ -14,7 +14,7 @@ dist: hg archive unit-$(VERSION).tar.gz \ -r $(VERSION) \ -p unit-$(VERSION) \ - -X "../.hg*" -X "../pkg/" -X "../docs/" + -X "../.hg*" -X "../pkg/" -X "../docs/*.*" -X "../docs/Makefile" $(SHA512SUM) unit-$(VERSION).tar.gz > unit-$(VERSION).tar.gz.sha512 rpm: -- cgit From 30922c5741af0c712f465d0e98b71f8848c0db91 Mon Sep 17 00:00:00 2001 From: Konstantin Pavlov Date: Thu, 8 Apr 2021 10:55:30 +0300 Subject: Packages: moved Amazon Linux 2 packages to use openssl 1.1 --- pkg/rpm/Makefile | 4 ++++ pkg/rpm/unit.spec.in | 4 ++++ 2 files changed, 8 insertions(+) (limited to 'pkg') diff --git a/pkg/rpm/Makefile b/pkg/rpm/Makefile index 75327c49..f9c57b5b 100644 --- a/pkg/rpm/Makefile +++ b/pkg/rpm/Makefile @@ -41,8 +41,12 @@ endif ifneq (,$(findstring $(OSVER),opensuse-leap opensuse-tumbleweed sles)) BUILD_DEPENDS_unit += libxml2-tools libxslt1 libopenssl-devel else +ifneq (,$(findstring $(OSVER),amazonlinux2)) +BUILD_DEPENDS_unit += libxml2 libxslt openssl11-devel +else BUILD_DEPENDS_unit += libxml2 libxslt openssl-devel endif +endif BUILD_DEPENDS = $(BUILD_DEPENDS_unit) diff --git a/pkg/rpm/unit.spec.in b/pkg/rpm/unit.spec.in index 9d16265d..07ca9e6f 100644 --- a/pkg/rpm/unit.spec.in +++ b/pkg/rpm/unit.spec.in @@ -4,8 +4,12 @@ %if 0%{?rhel}%{?fedora} BuildRequires: gcc +%if 0%{?amzn2} +BuildRequires: openssl11-devel +%else BuildRequires: openssl-devel %endif +%endif %if 0%{?rhel} %if 0%{?amzn} == 0 -- cgit From d5889d7daa1c404af72bba830c5337ad6502d850 Mon Sep 17 00:00:00 2001 From: Konstantin Pavlov Date: Mon, 12 Apr 2021 18:39:45 +0300 Subject: Packages: fixed Amazon Linux 2 module packages to use openssl 1.1 --- pkg/rpm/unit.module.spec.in | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'pkg') diff --git a/pkg/rpm/unit.module.spec.in b/pkg/rpm/unit.module.spec.in index 39083e66..101b4991 100644 --- a/pkg/rpm/unit.module.spec.in +++ b/pkg/rpm/unit.module.spec.in @@ -9,8 +9,12 @@ %if 0%{?rhel}%{?fedora} BuildRequires: gcc +%if 0%{?amzn2} +BuildRequires: openssl11-devel +%else BuildRequires: openssl-devel %endif +%endif %if 0%{?suse_version} >= 1315 BuildRequires: libopenssl-devel -- cgit From f90754f84a375d5183ed6883862d19dfd417225a Mon Sep 17 00:00:00 2001 From: Andrei Belov Date: Wed, 21 Apr 2021 16:07:26 +0300 Subject: Packages: switched to common address for package maintainers. --- pkg/deb/Makefile | 6 +++++ pkg/deb/debian.module/control-noarch.in | 2 +- pkg/deb/debian.module/control.in | 2 +- pkg/deb/debian/control | 41 --------------------------------- pkg/deb/debian/control.in | 41 +++++++++++++++++++++++++++++++++ pkg/rpm/Makefile | 4 ++++ pkg/rpm/unit.module.spec.in | 3 +-- pkg/rpm/unit.spec.in | 3 +-- 8 files changed, 55 insertions(+), 47 deletions(-) delete mode 100644 pkg/deb/debian/control create mode 100644 pkg/deb/debian/control.in (limited to 'pkg') diff --git a/pkg/deb/Makefile b/pkg/deb/Makefile index 8c33fc53..d28351d0 100644 --- a/pkg/deb/Makefile +++ b/pkg/deb/Makefile @@ -8,6 +8,8 @@ DEFAULT_RELEASE := 1 VERSION ?= $(DEFAULT_VERSION) RELEASE ?= $(DEFAULT_RELEASE) +PACKAGE_VENDOR = NGINX Packaging + SRCDIR= unit-$(VERSION) CODENAME = $(shell lsb_release -cs) @@ -205,6 +207,9 @@ debuild/$(SRCDIR)/debian: echo '9' > debuild/$(SRCDIR)/debian/compat ; \ mkdir -p debuild/$(SRCDIR)/debian/source ; \ echo '3.0 (quilt)' > debuild/$(SRCDIR)/debian/source/format ; \ + cat debian/control.in | sed \ + -e "s#%%PACKAGE_VENDOR%%#$(PACKAGE_VENDOR)#g" \ + > debuild/$(SRCDIR)/debian/control ; \ cat debian/rules.in | sed \ -e "s#%%CONFIGURE_ARGS%%#$(CONFIGURE_ARGS)#g" \ > debuild/$(SRCDIR)/debian/rules ; \ @@ -280,6 +285,7 @@ endif -e "s#%%UNIT_RELEASE%%#$(RELEASE)#g" \ -e "s#%%VERSION%%#$(MODULE_VERSION_$*)#g" \ -e "s#%%RELEASE%%#$(MODULE_RELEASE_$*)#g" \ + -e "s#%%PACKAGE_VENDOR%%#$(PACKAGE_VENDOR)#g" \ -e "s#%%MODULE_BUILD_DEPENDS%%#$(MODULE_BUILD_DEPENDS_$*)#g" \ -e "s#%%MODULE_DEPENDS%%#$(MODULE_DEPENDS_$*)#g" \ > $@/$(SRCDIR)/debian/control ; \ diff --git a/pkg/deb/debian.module/control-noarch.in b/pkg/deb/debian.module/control-noarch.in index e22bb49a..d9d9e5e1 100644 --- a/pkg/deb/debian.module/control-noarch.in +++ b/pkg/deb/debian.module/control-noarch.in @@ -1,7 +1,7 @@ Source: %%NAME%% Section: admin Priority: extra -Maintainer: Andrei Belov +Maintainer: %%PACKAGE_VENDOR%% Build-Depends: debhelper (>= 9), linux-libc-dev%%MODULE_BUILD_DEPENDS%% Standards-Version: 3.9.5 diff --git a/pkg/deb/debian.module/control.in b/pkg/deb/debian.module/control.in index 7e28f5e9..9a6fa797 100644 --- a/pkg/deb/debian.module/control.in +++ b/pkg/deb/debian.module/control.in @@ -1,7 +1,7 @@ Source: %%NAME%% Section: admin Priority: extra -Maintainer: Andrei Belov +Maintainer: %%PACKAGE_VENDOR%% Build-Depends: debhelper (>= 9), linux-libc-dev, libssl-dev, diff --git a/pkg/deb/debian/control b/pkg/deb/debian/control deleted file mode 100644 index a8e8cdc4..00000000 --- a/pkg/deb/debian/control +++ /dev/null @@ -1,41 +0,0 @@ -Source: unit -Section: admin -Priority: extra -Maintainer: Andrei Belov -Build-Depends: debhelper (>= 9), - linux-libc-dev, - libssl-dev, - libpcre2-dev -Standards-Version: 3.9.5 -Homepage: https://unit.nginx.org - -Package: unit -Section: admin -Architecture: any -Depends: lsb-base, - ${misc:Depends}, ${shlibs:Depends} -Description: NGINX Unit - NGINX Unit is a runtime and delivery environment for modern distributed - applications. It runs the application code in multiple languages - (PHP, Python, Go, etc.), and tightly couples it with traffic delivery - in and out of the application. Take this application server and proxy - directly in the cloud / container environments and fully control your app - dynamically via an API. - -Package: unit-dbg -Section: debug -Architecture: any -Priority: extra -Depends: unit (= ${binary:Version}), - ${misc:Depends} -Description: NGINX Unit (debug symbols) - This package contains the debugging symbols for NGINX Unit. - -Package: unit-dev -Section: libdevel -Priority: optional -Architecture: any -Depends: unit (= ${binary:Version}), - ${misc:Depends} -Description: NGINX Unit (development files) - Library and include files required for NGINX Unit modules development. diff --git a/pkg/deb/debian/control.in b/pkg/deb/debian/control.in new file mode 100644 index 00000000..4d59520e --- /dev/null +++ b/pkg/deb/debian/control.in @@ -0,0 +1,41 @@ +Source: unit +Section: admin +Priority: extra +Maintainer: %%PACKAGE_VENDOR%% +Build-Depends: debhelper (>= 9), + linux-libc-dev, + libssl-dev, + libpcre2-dev +Standards-Version: 3.9.5 +Homepage: https://unit.nginx.org + +Package: unit +Section: admin +Architecture: any +Depends: lsb-base, + ${misc:Depends}, ${shlibs:Depends} +Description: NGINX Unit + NGINX Unit is a runtime and delivery environment for modern distributed + applications. It runs the application code in multiple languages + (PHP, Python, Go, etc.), and tightly couples it with traffic delivery + in and out of the application. Take this application server and proxy + directly in the cloud / container environments and fully control your app + dynamically via an API. + +Package: unit-dbg +Section: debug +Architecture: any +Priority: extra +Depends: unit (= ${binary:Version}), + ${misc:Depends} +Description: NGINX Unit (debug symbols) + This package contains the debugging symbols for NGINX Unit. + +Package: unit-dev +Section: libdevel +Priority: optional +Architecture: any +Depends: unit (= ${binary:Version}), + ${misc:Depends} +Description: NGINX Unit (development files) + Library and include files required for NGINX Unit modules development. diff --git a/pkg/rpm/Makefile b/pkg/rpm/Makefile index f9c57b5b..e67846cf 100644 --- a/pkg/rpm/Makefile +++ b/pkg/rpm/Makefile @@ -8,6 +8,8 @@ DEFAULT_RELEASE := 1 VERSION ?= $(DEFAULT_VERSION) RELEASE ?= $(DEFAULT_RELEASE) +PACKAGE_VENDOR = NGINX Packaging + ifeq ($(shell test `rpm --eval '0%{?rhel} -eq 6 -a 0%{?amzn} -eq 0'`; echo $$?), 0) OSVER = centos6 else ifeq ($(shell test `rpm --eval '0%{?rhel} -eq 7 -a 0%{?amzn} -eq 0'`; echo $$?), 0) @@ -205,6 +207,7 @@ rpmbuild/SPECS/unit.spec: unit.spec.in ../../docs/changes.xml | rpmbuild/SPECS sed -e "s#%%VERSION%%#$(VERSION)#g" \ -e "s#%%RELEASE%%#$(RELEASE)#g" \ -e "s#%%CONFIGURE_ARGS%%#$(CONFIGURE_ARGS)#g" \ + -e "s#%%PACKAGE_VENDOR%%#$(PACKAGE_VENDOR)#g" \ > rpmbuild/SPECS/unit.spec cd ../../docs && make ../build/unit.rpm-changelog ifneq ($(DEFAULT_VERSION)$(DEFAULT_RELEASE), $(VERSION)$(RELEASE)) @@ -252,6 +255,7 @@ rpmbuild/SPECS/unit-%.spec: unit.module.spec.in ../../docs/changes.xml | rpmbuil -e "s#%%RELEASE%%#$(MODULE_RELEASE_$*)#g" \ -e "s#%%UNIT_VERSION%%#$(VERSION)#g" \ -e "s#%%UNIT_RELEASE%%#$(RELEASE)#g" \ + -e "s#%%PACKAGE_VENDOR%%#$(PACKAGE_VENDOR)#g" \ -e "s#%%MODULE_SOURCES%%#$${sources}#g" \ -e "s#%%CONFIGURE_ARGS%%#$(CONFIGURE_ARGS)#g" \ -e "s#%%MODULE_CONFARGS%%#$(MODULE_CONFARGS_$*)#g" \ diff --git a/pkg/rpm/unit.module.spec.in b/pkg/rpm/unit.module.spec.in index 101b4991..4f096c73 100644 --- a/pkg/rpm/unit.module.spec.in +++ b/pkg/rpm/unit.module.spec.in @@ -32,9 +32,8 @@ Summary: %%SUMMARY%% Version: %%VERSION%% Release: %%RELEASE%%%{?dist}.ngx License: ASL 2.0 -Vendor: Nginx Software, Inc. +Vendor: %%PACKAGE_VENDOR%% URL: https://unit.nginx.org/ -Packager: Nginx Software, Inc. Group: System Environment/Daemons Source0: unit-%{version}.tar.gz diff --git a/pkg/rpm/unit.spec.in b/pkg/rpm/unit.spec.in index 07ca9e6f..b35b8998 100644 --- a/pkg/rpm/unit.spec.in +++ b/pkg/rpm/unit.spec.in @@ -33,9 +33,8 @@ Summary: NGINX Unit Version: %%VERSION%% Release: %%RELEASE%%%{?dist}.ngx License: ASL 2.0 -Vendor: Nginx Software, Inc. +Vendor: %%PACKAGE_VENDOR%% URL: https://unit.nginx.org/ -Packager: Nginx Software, Inc. Group: System Environment/Daemons Source0: unit-%{version}.tar.gz -- cgit From e00ad18d8082f9db5c49c220d796c78beab53cae Mon Sep 17 00:00:00 2001 From: Andrei Belov Date: Thu, 27 May 2021 13:12:52 +0300 Subject: Packages: added Ubuntu 21.04 "hirsute" support. --- pkg/deb/Makefile | 15 +++++ pkg/deb/Makefile.jsc-common | 2 +- pkg/deb/Makefile.jsc16 | 71 ++++++++++++++++++++++ pkg/deb/Makefile.jsc17 | 71 ++++++++++++++++++++++ pkg/deb/Makefile.python39 | 46 ++++++++++++++ pkg/deb/debian.module/unit.example-jsc16-config | 15 +++++ pkg/deb/debian.module/unit.example-jsc17-config | 15 +++++ .../debian.module/unit.example-python3.9-config | 16 +++++ 8 files changed, 250 insertions(+), 1 deletion(-) create mode 100644 pkg/deb/Makefile.jsc16 create mode 100644 pkg/deb/Makefile.jsc17 create mode 100644 pkg/deb/Makefile.python39 create mode 100644 pkg/deb/debian.module/unit.example-jsc16-config create mode 100644 pkg/deb/debian.module/unit.example-jsc17-config create mode 100644 pkg/deb/debian.module/unit.example-python3.9-config (limited to 'pkg') diff --git a/pkg/deb/Makefile b/pkg/deb/Makefile index d28351d0..c343eb53 100644 --- a/pkg/deb/Makefile +++ b/pkg/deb/Makefile @@ -19,6 +19,21 @@ BUILD_DEPENDS = $(BUILD_DEPENDS_unit) MODULES= +# Ubuntu 21.04 +ifeq ($(CODENAME),hirsute) +include Makefile.php +include Makefile.python27 +include Makefile.python39 +include Makefile.go +include Makefile.perl +include Makefile.ruby +include Makefile.jsc-common +include Makefile.jsc11 +include Makefile.jsc15 +include Makefile.jsc16 +include Makefile.jsc17 +endif + # Ubuntu 20.10 ifeq ($(CODENAME),groovy) include Makefile.php diff --git a/pkg/deb/Makefile.jsc-common b/pkg/deb/Makefile.jsc-common index f7a6010b..1c4a77b5 100644 --- a/pkg/deb/Makefile.jsc-common +++ b/pkg/deb/Makefile.jsc-common @@ -6,7 +6,7 @@ MODULE_SUMMARY_jsc_common= Java shared packages for NGINX Unit MODULE_VERSION_jsc_common= $(VERSION) MODULE_RELEASE_jsc_common= 1 -ifneq (,$(findstring $(CODENAME),groovy focal eoan disco buster)) +ifneq (,$(findstring $(CODENAME),hirsute groovy focal eoan disco buster)) JAVA_MINVERSION= 11 else JAVA_MINVERSION= 8 diff --git a/pkg/deb/Makefile.jsc16 b/pkg/deb/Makefile.jsc16 new file mode 100644 index 00000000..f45e1299 --- /dev/null +++ b/pkg/deb/Makefile.jsc16 @@ -0,0 +1,71 @@ +MODULES+= jsc16 +MODULE_SUFFIX_jsc16= jsc16 + +MODULE_SUMMARY_jsc16= Java 16 module for NGINX Unit + +MODULE_VERSION_jsc16= $(VERSION) +MODULE_RELEASE_jsc16= 1 + +MODULE_CONFARGS_jsc16= java --module=java16 --home=/usr/lib/jvm/java-16-openjdk-$$\(DEB_HOST_ARCH\) --jars=/usr/share/unit-jsc-common/ +MODULE_MAKEARGS_jsc16= java16 +MODULE_INSTARGS_jsc16= java16-install + +MODULE_SOURCES_jsc16= unit.example-jsc-app \ + unit.example-jsc16-config + +BUILD_DEPENDS_jsc16= openjdk-16-jdk-headless openjdk-16-jre-headless +BUILD_DEPENDS+= $(BUILD_DEPENDS_jsc16) + +MODULE_BUILD_DEPENDS_jsc16=,openjdk-16-jdk-headless +MODULE_DEPENDS_jsc16=,openjdk-16-jre-headless,unit-jsc-common (= $(MODULE_VERSION_jsc_common)-$(MODULE_RELEASE_jsc_common)~$(CODENAME)) + +define MODULE_PREINSTALL_jsc16 + mkdir -p debian/unit-jsc16/usr/share/doc/unit-jsc16/examples/jsc-app + install -m 644 -p debian/unit.example-jsc-app debian/unit-jsc16/usr/share/doc/unit-jsc16/examples/jsc-app/index.jsp + install -m 644 -p debian/unit.example-jsc16-config debian/unit-jsc16/usr/share/doc/unit-jsc16/examples/unit.config + install -m 644 -p src/java/README.JSR-340 debian/unit-jsc16/usr/share/doc/unit-jsc16/ +endef +export MODULE_PREINSTALL_jsc16 + +define MODULE_POSTINSTALL_jsc16 + cd $$\(BUILDDIR_unit\) \&\& \ + DESTDIR=$$\(INSTALLDIR\) make java-shared-uninstall +endef +export MODULE_POSTINSTALL_jsc16 + +define MODULE_POST_jsc16 +cat < Date: Thu, 27 May 2021 16:07:15 +0300 Subject: Generated Dockerfiles for Unit 1.24.0. --- pkg/docker/Dockerfile.go1.15 | 2 +- pkg/docker/Dockerfile.jsc11 | 2 +- pkg/docker/Dockerfile.minimal | 2 +- pkg/docker/Dockerfile.node15 | 2 +- pkg/docker/Dockerfile.perl5.32 | 2 +- pkg/docker/Dockerfile.php8.0 | 2 +- pkg/docker/Dockerfile.python3.9 | 2 +- pkg/docker/Dockerfile.ruby2.7 | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) (limited to 'pkg') diff --git a/pkg/docker/Dockerfile.go1.15 b/pkg/docker/Dockerfile.go1.15 index 45642662..d446a934 100644 --- a/pkg/docker/Dockerfile.go1.15 +++ b/pkg/docker/Dockerfile.go1.15 @@ -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.23.0 \ + && hg up 1.24.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 4cfc541d..b66ebe73 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.23.0 \ + && hg up 1.24.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 59aaa6a3..69a70e33 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.23.0 \ + && hg up 1.24.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.node15 b/pkg/docker/Dockerfile.node15 index 7eddfb26..1e3846a3 100644 --- a/pkg/docker/Dockerfile.node15 +++ b/pkg/docker/Dockerfile.node15 @@ -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.23.0 \ + && hg up 1.24.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.32 b/pkg/docker/Dockerfile.perl5.32 index aa000f63..2fccbf63 100644 --- a/pkg/docker/Dockerfile.perl5.32 +++ b/pkg/docker/Dockerfile.perl5.32 @@ -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.23.0 \ + && hg up 1.24.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.0 b/pkg/docker/Dockerfile.php8.0 index 4534f9b5..02db27cf 100644 --- a/pkg/docker/Dockerfile.php8.0 +++ b/pkg/docker/Dockerfile.php8.0 @@ -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.23.0 \ + && hg up 1.24.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.9 b/pkg/docker/Dockerfile.python3.9 index e8650d44..44472a12 100644 --- a/pkg/docker/Dockerfile.python3.9 +++ b/pkg/docker/Dockerfile.python3.9 @@ -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.23.0 \ + && hg up 1.24.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.ruby2.7 b/pkg/docker/Dockerfile.ruby2.7 index aa8cdb3f..7875c470 100644 --- a/pkg/docker/Dockerfile.ruby2.7 +++ b/pkg/docker/Dockerfile.ruby2.7 @@ -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.23.0 \ + && hg up 1.24.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