From ca0dc2954c254081a9b23c1e1f760de0c3fadc66 Mon Sep 17 00:00:00 2001 From: Andrei Belov 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/deb') 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 7edc5b82d5e48d5f5d06334af82b891b0ccc3add Mon Sep 17 00:00:00 2001 From: Andrei Belov 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 ++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 pkg/deb/debian/unit-debug.service (limited to 'pkg/deb') 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 -- cgit From 5857754ec75312c426b9277a34d0b3cfd237d22e Mon Sep 17 00:00:00 2001 From: Valentin Bartenev 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 +++++++----- 4 files changed, 40 insertions(+), 17 deletions(-) (limited to 'pkg/deb') 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 -- cgit From b512eff4acb97955ba48797d1299c27070a57e1a Mon Sep 17 00:00:00 2001 From: Konstantin Pavlov 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/deb') 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 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 ++++-- 4 files changed, 9 insertions(+), 5 deletions(-) (limited to 'pkg/deb') 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 -- cgit From 237ddbe1770485eab0723aac3a5dca92e1a0c5d9 Mon Sep 17 00:00:00 2001 From: Konstantin Pavlov Date: Thu, 26 May 2022 10:52:58 +0400 Subject: Packaging: Go: use GO111MODULE=auto in build instructions. --- pkg/deb/Makefile.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkg/deb') 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 -- cgit