From 325421eac71e83a95edf178fc6ea5ee36c8da1bb Mon Sep 17 00:00:00 2001 From: Andrei Belov Date: Thu, 27 Dec 2018 11:06:43 +0300 Subject: Packages: URL fixed in examples to work with latest curl. --- pkg/deb/Makefile.go | 2 +- pkg/deb/Makefile.go110 | 2 +- pkg/deb/Makefile.go17 | 2 +- pkg/deb/Makefile.go18 | 2 +- pkg/deb/Makefile.go19 | 2 +- pkg/deb/Makefile.perl | 2 +- pkg/deb/Makefile.php | 2 +- pkg/deb/Makefile.python | 2 +- pkg/deb/Makefile.python27 | 2 +- pkg/deb/Makefile.python34 | 2 +- pkg/deb/Makefile.python35 | 2 +- pkg/deb/Makefile.python36 | 2 +- pkg/deb/Makefile.ruby | 2 +- pkg/rpm/Makefile.go | 2 +- pkg/rpm/Makefile.perl | 2 +- pkg/rpm/Makefile.php | 2 +- pkg/rpm/Makefile.python | 2 +- pkg/rpm/Makefile.python27 | 2 +- pkg/rpm/Makefile.python34 | 2 +- pkg/rpm/Makefile.python35 | 2 +- pkg/rpm/Makefile.python36 | 2 +- pkg/rpm/Makefile.ruby | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) (limited to 'pkg') diff --git a/pkg/deb/Makefile.go b/pkg/deb/Makefile.go index bbade7a3..3399f5ca 100644 --- a/pkg/deb/Makefile.go +++ b/pkg/deb/Makefile.go @@ -37,7 +37,7 @@ 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 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 :/config + sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock http://localhost/config curl http://localhost:8500/ Online documentation is available at https://unit.nginx.org diff --git a/pkg/deb/Makefile.go110 b/pkg/deb/Makefile.go110 index 9fb3da9d..0e956d9f 100644 --- a/pkg/deb/Makefile.go110 +++ b/pkg/deb/Makefile.go110 @@ -37,7 +37,7 @@ To check out the sample app, run these commands: GOPATH=/usr/share/gocode /usr/lib/go-1.10/bin/go build -o /tmp/go1.10-app /usr/share/doc/unit-$(MODULE_SUFFIX_go110)/examples/go-app/let-my-people.go sudo service unit restart cd /usr/share/doc/unit-$(MODULE_SUFFIX_go110)/examples - sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock :/config + sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock http://localhost/config curl http://localhost:8500/ Online documentation is available at https://unit.nginx.org diff --git a/pkg/deb/Makefile.go17 b/pkg/deb/Makefile.go17 index 4c3cc73f..d014edd1 100644 --- a/pkg/deb/Makefile.go17 +++ b/pkg/deb/Makefile.go17 @@ -37,7 +37,7 @@ To check out the sample app, run these commands: GOPATH=/usr/share/gocode /usr/lib/go-1.7/bin/go build -o /tmp/go1.7-app /usr/share/doc/unit-$(MODULE_SUFFIX_go17)/examples/go-app/let-my-people.go sudo service unit restart cd /usr/share/doc/unit-$(MODULE_SUFFIX_go17)/examples - sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock :/config + sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock http://localhost/config curl http://localhost:8500/ Online documentation is available at https://unit.nginx.org diff --git a/pkg/deb/Makefile.go18 b/pkg/deb/Makefile.go18 index a9db87e0..597f4804 100644 --- a/pkg/deb/Makefile.go18 +++ b/pkg/deb/Makefile.go18 @@ -37,7 +37,7 @@ To check out the sample app, run these commands: GOPATH=/usr/share/gocode /usr/lib/go-1.8/bin/go build -o /tmp/go1.8-app /usr/share/doc/unit-$(MODULE_SUFFIX_go18)/examples/go-app/let-my-people.go sudo service unit restart cd /usr/share/doc/unit-$(MODULE_SUFFIX_go18)/examples - sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock :/config + sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock http://localhost/config curl http://localhost:8500/ Online documentation is available at https://unit.nginx.org diff --git a/pkg/deb/Makefile.go19 b/pkg/deb/Makefile.go19 index 43611560..60d4b239 100644 --- a/pkg/deb/Makefile.go19 +++ b/pkg/deb/Makefile.go19 @@ -37,7 +37,7 @@ To check out the sample app, run these commands: GOPATH=/usr/share/gocode /usr/lib/go-1.9/bin/go build -o /tmp/go1.9-app /usr/share/doc/unit-$(MODULE_SUFFIX_go19)/examples/go-app/let-my-people.go sudo service unit restart cd /usr/share/doc/unit-$(MODULE_SUFFIX_go19)/examples - sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock :/config + sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock http://localhost/config curl http://localhost:8500/ Online documentation is available at https://unit.nginx.org diff --git a/pkg/deb/Makefile.perl b/pkg/deb/Makefile.perl index 186b8e5a..7ac3ea11 100644 --- a/pkg/deb/Makefile.perl +++ b/pkg/deb/Makefile.perl @@ -35,7 +35,7 @@ To check out the sample app, run these commands: sudo service unit restart cd /usr/share/doc/unit-$(MODULE_SUFFIX_perl)/examples - sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock :/config + sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock http://localhost/config curl http://localhost:8600/ Online documentation is available at https://unit.nginx.org diff --git a/pkg/deb/Makefile.php b/pkg/deb/Makefile.php index 193670e7..d05d5ad5 100644 --- a/pkg/deb/Makefile.php +++ b/pkg/deb/Makefile.php @@ -42,7 +42,7 @@ To check out the sample app, run these commands: sudo service unit restart cd /usr/share/doc/unit-$(MODULE_SUFFIX_php)/examples - sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock :/config + sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock http://localhost/config curl http://localhost:8300/ Online documentation is available at https://unit.nginx.org diff --git a/pkg/deb/Makefile.python b/pkg/deb/Makefile.python index dec64b26..9bf02bac 100644 --- a/pkg/deb/Makefile.python +++ b/pkg/deb/Makefile.python @@ -35,7 +35,7 @@ To check out the sample app, run these commands: sudo service unit restart cd /usr/share/doc/unit-$(MODULE_SUFFIX_python)/examples - sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock :/config + sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock http://localhost/config curl http://localhost:8400/ Online documentation is available at https://unit.nginx.org diff --git a/pkg/deb/Makefile.python27 b/pkg/deb/Makefile.python27 index ae1ae4c0..cf4f49d9 100644 --- a/pkg/deb/Makefile.python27 +++ b/pkg/deb/Makefile.python27 @@ -35,7 +35,7 @@ To check out the sample app, run these commands: sudo service unit restart cd /usr/share/doc/unit-$(MODULE_SUFFIX_python27)/examples - sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock :/config + sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock http://localhost/config curl http://localhost:8400/ Online documentation is available at https://unit.nginx.org diff --git a/pkg/deb/Makefile.python34 b/pkg/deb/Makefile.python34 index 5e043ef4..03c496bd 100644 --- a/pkg/deb/Makefile.python34 +++ b/pkg/deb/Makefile.python34 @@ -35,7 +35,7 @@ To check out the sample app, run these commands: sudo service unit restart cd /usr/share/doc/unit-$(MODULE_SUFFIX_python34)/examples - sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock :/config + sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock http://localhost/config curl http://localhost:8400/ Online documentation is available at https://unit.nginx.org diff --git a/pkg/deb/Makefile.python35 b/pkg/deb/Makefile.python35 index 557690a9..514a4bf6 100644 --- a/pkg/deb/Makefile.python35 +++ b/pkg/deb/Makefile.python35 @@ -35,7 +35,7 @@ To check out the sample app, run these commands: sudo service unit restart cd /usr/share/doc/unit-$(MODULE_SUFFIX_python35)/examples - sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock :/config + sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock http://localhost/config curl http://localhost:8400/ Online documentation is available at https://unit.nginx.org diff --git a/pkg/deb/Makefile.python36 b/pkg/deb/Makefile.python36 index 07cbba90..4fd898c6 100644 --- a/pkg/deb/Makefile.python36 +++ b/pkg/deb/Makefile.python36 @@ -35,7 +35,7 @@ To check out the sample app, run these commands: sudo service unit restart cd /usr/share/doc/unit-$(MODULE_SUFFIX_python36)/examples - sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock :/config + sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock http://localhost/config curl http://localhost:8400/ Online documentation is available at https://unit.nginx.org diff --git a/pkg/deb/Makefile.ruby b/pkg/deb/Makefile.ruby index 1cb6baab..dd85cd38 100644 --- a/pkg/deb/Makefile.ruby +++ b/pkg/deb/Makefile.ruby @@ -37,7 +37,7 @@ To check out the sample app, run these commands: sudo service unit restart cd /usr/share/doc/unit-$(MODULE_SUFFIX_ruby)/examples - sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock :/config + sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock http://localhost/config curl http://localhost:8700/ Online documentation is available at https://unit.nginx.org diff --git a/pkg/rpm/Makefile.go b/pkg/rpm/Makefile.go index d13e8d1a..f031c7ba 100644 --- a/pkg/rpm/Makefile.go +++ b/pkg/rpm/Makefile.go @@ -64,7 +64,7 @@ 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 sudo service unit start cd /usr/share/doc/%{name}/examples - sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock :/config + sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock http://localhost/config curl http://localhost:8500/ Online documentation is available at https://unit.nginx.org diff --git a/pkg/rpm/Makefile.perl b/pkg/rpm/Makefile.perl index 90259e9e..84c15260 100644 --- a/pkg/rpm/Makefile.perl +++ b/pkg/rpm/Makefile.perl @@ -51,7 +51,7 @@ To check out the sample app, run these commands: sudo service unit start cd /usr/share/doc/%{name}/examples - sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock :/config + sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock http://localhost/config curl http://localhost:8600/ Online documentation is available at https://unit.nginx.org diff --git a/pkg/rpm/Makefile.php b/pkg/rpm/Makefile.php index b4f093b7..eedcce4e 100644 --- a/pkg/rpm/Makefile.php +++ b/pkg/rpm/Makefile.php @@ -46,7 +46,7 @@ To check out the sample app, run these commands: sudo service unit start cd /usr/share/doc/%{name}/examples - sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock :/config + sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock http://localhost/config curl http://localhost:8300/ Online documentation is available at https://unit.nginx.org diff --git a/pkg/rpm/Makefile.python b/pkg/rpm/Makefile.python index 0b0eb7bd..bb408bb5 100644 --- a/pkg/rpm/Makefile.python +++ b/pkg/rpm/Makefile.python @@ -46,7 +46,7 @@ To check the sample app, run these commands: sudo service unit start cd /usr/share/doc/%{name}/examples - sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock :/config + sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock http://localhost/config curl http://localhost:8400/ Online documentation is available at https://unit.nginx.org diff --git a/pkg/rpm/Makefile.python27 b/pkg/rpm/Makefile.python27 index 7d15bdd9..c6a2ec65 100644 --- a/pkg/rpm/Makefile.python27 +++ b/pkg/rpm/Makefile.python27 @@ -48,7 +48,7 @@ To check the sample app, run these commands: sudo service unit start cd /usr/share/doc/%{name}/examples - sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock :/config + sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock http://localhost/config curl http://localhost:8400/ Online documentation is available at https://unit.nginx.org diff --git a/pkg/rpm/Makefile.python34 b/pkg/rpm/Makefile.python34 index 152007a2..1dc10f9c 100644 --- a/pkg/rpm/Makefile.python34 +++ b/pkg/rpm/Makefile.python34 @@ -46,7 +46,7 @@ To check the sample app, run these commands: sudo service unit start cd /usr/share/doc/%{name}/examples - sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock :/config + sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock http://localhost/config curl http://localhost:8400/ Online documentation is available at https://unit.nginx.org diff --git a/pkg/rpm/Makefile.python35 b/pkg/rpm/Makefile.python35 index 3f075702..3e4e0a2e 100644 --- a/pkg/rpm/Makefile.python35 +++ b/pkg/rpm/Makefile.python35 @@ -41,7 +41,7 @@ To check the sample app, run these commands: sudo service unit start cd /usr/share/doc/%{name}/examples - sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock :/config + sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock http://localhost/config curl http://localhost:8400/ Online documentation is available at https://unit.nginx.org diff --git a/pkg/rpm/Makefile.python36 b/pkg/rpm/Makefile.python36 index fd55840e..d674d8fe 100644 --- a/pkg/rpm/Makefile.python36 +++ b/pkg/rpm/Makefile.python36 @@ -46,7 +46,7 @@ To check the sample app, run these commands: sudo service unit start cd /usr/share/doc/%{name}/examples - sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock :/config + sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock http://localhost/config curl http://localhost:8400/ Online documentation is available at https://unit.nginx.org diff --git a/pkg/rpm/Makefile.ruby b/pkg/rpm/Makefile.ruby index 5702fb44..92416338 100644 --- a/pkg/rpm/Makefile.ruby +++ b/pkg/rpm/Makefile.ruby @@ -55,7 +55,7 @@ To check the sample app, run these commands: sudo service unit start cd /usr/share/doc/%{name}/examples - sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock :/config + sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock http://localhost/config curl http://localhost:8700/ Online documentation is available at https://unit.nginx.org -- cgit From be049932b100c7a64c0dd261d21b73ea817f8100 Mon Sep 17 00:00:00 2001 From: Andrei Belov Date: Thu, 27 Dec 2018 11:07:24 +0300 Subject: Packages: Ubuntu 18.10 "cosmic" support added. --- pkg/deb/Makefile | 12 ++++++ pkg/deb/Makefile.python37 | 46 ++++++++++++++++++++++ .../debian.module/unit.example-python3.7-config | 17 ++++++++ 3 files changed, 75 insertions(+) create mode 100644 pkg/deb/Makefile.python37 create mode 100644 pkg/deb/debian.module/unit.example-python3.7-config (limited to 'pkg') diff --git a/pkg/deb/Makefile b/pkg/deb/Makefile index 2dcf6f50..1a16b6ee 100644 --- a/pkg/deb/Makefile +++ b/pkg/deb/Makefile @@ -17,6 +17,18 @@ BUILD_DEPENDS = $(BUILD_DEPENDS_unit) MODULES= +# Ubuntu 18.10 +ifeq ($(CODENAME),cosmic) +include Makefile.php +include Makefile.python27 +include Makefile.python36 +include Makefile.python37 +include Makefile.go19 +include Makefile.go110 +include Makefile.perl +include Makefile.ruby +endif + # Ubuntu 18.04 ifeq ($(CODENAME),bionic) include Makefile.php diff --git a/pkg/deb/Makefile.python37 b/pkg/deb/Makefile.python37 new file mode 100644 index 00000000..54dd8c4c --- /dev/null +++ b/pkg/deb/Makefile.python37 @@ -0,0 +1,46 @@ +MODULES+= python37 +MODULE_SUFFIX_python37= python3.7 + +MODULE_SUMMARY_python37= Python 3.7 module for NGINX Unit + +MODULE_VERSION_python37= $(VERSION) +MODULE_RELEASE_python37= 1 + +MODULE_CONFARGS_python37= python --config=python3.7-config +MODULE_MAKEARGS_python37= python3.7 +MODULE_INSTARGS_python37= python3.7-install + +MODULE_SOURCES_python37= unit.example-python-app \ + unit.example-python3.7-config + +BUILD_DEPENDS_python37= python3.7-dev +BUILD_DEPENDS+= $(BUILD_DEPENDS_python37) + +MODULE_BUILD_DEPENDS_python37=,python3.7-dev + +define MODULE_PREINSTALL_python37 + mkdir -p debian/unit-python3.7/usr/share/doc/unit-python3.7/examples/python-app + install -m 644 -p debian/unit.example-python-app debian/unit-python3.7/usr/share/doc/unit-python3.7/examples/python-app/wsgi.py + install -m 644 -p debian/unit.example-python3.7-config debian/unit-python3.7/usr/share/doc/unit-python3.7/examples/unit.config +endef +export MODULE_PREINSTALL_python37 + +define MODULE_POST_python37 +cat < Date: Wed, 9 Jan 2019 18:03:48 +0300 Subject: Year 2019. --- pkg/deb/debian/copyright | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'pkg') diff --git a/pkg/deb/debian/copyright b/pkg/deb/debian/copyright index b795c3a0..fe52d6aa 100644 --- a/pkg/deb/debian/copyright +++ b/pkg/deb/debian/copyright @@ -1,10 +1,11 @@ NGINX Unit. - Copyright 2017-2018 NGINX, Inc. - Copyright 2017-2018 Igor Sysoev - Copyright 2017-2018 Valentin V. Bartenev - Copyright 2017-2018 Max Romanov + Copyright 2017-2019 NGINX, Inc. + Copyright 2017-2019 Igor Sysoev + Copyright 2017-2019 Valentin V. Bartenev + Copyright 2017-2019 Max Romanov + Copyright 2018-2019 Alexander Borisov Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. -- cgit From b1649bce9ed1521a48e18b22fb58aaf09f9637b0 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 24 Jan 2019 13:03:25 +0300 Subject: Packages: Fedora >= 29 have python 3.7. Closes #211. --- pkg/rpm/Makefile | 4 ++ pkg/rpm/Makefile.python37 | 57 ++++++++++++++++++++++ .../rpmbuild/SOURCES/unit.example-python37-config | 17 +++++++ 3 files changed, 78 insertions(+) create mode 100644 pkg/rpm/Makefile.python37 create mode 100644 pkg/rpm/rpmbuild/SOURCES/unit.example-python37-config (limited to 'pkg') diff --git a/pkg/rpm/Makefile b/pkg/rpm/Makefile index ef7f3361..86b3e3f1 100644 --- a/pkg/rpm/Makefile +++ b/pkg/rpm/Makefile @@ -89,7 +89,11 @@ endif ifeq ($(OSVER), fedora) include Makefile.php include Makefile.python27 +ifeq ($(shell test `rpm --eval '0%{?fedora} -ge 29'`; echo $$?),0) +include Makefile.python37 +else include Makefile.python36 +endif include Makefile.go include Makefile.perl include Makefile.ruby diff --git a/pkg/rpm/Makefile.python37 b/pkg/rpm/Makefile.python37 new file mode 100644 index 00000000..48f0b5c1 --- /dev/null +++ b/pkg/rpm/Makefile.python37 @@ -0,0 +1,57 @@ +MODULES+= python37 +MODULE_SUFFIX_python37= python3.7 + +MODULE_SUMMARY_python37= Python 3.7 module for NGINX Unit + +MODULE_VERSION_python37= $(VERSION) +MODULE_RELEASE_python37= 1 + +MODULE_CONFARGS_python37= python --config=python3.7-config +MODULE_MAKEARGS_python37= python3.7 +MODULE_INSTARGS_python37= python3.7-install + +MODULE_SOURCES_python37= unit.example-python-app \ + unit.example-python37-config + +ifneq (,$(findstring $(OSVER),opensuse-tumbleweed sles fedora)) +BUILD_DEPENDS_python37= python3-devel +else +BUILD_DEPENDS_python37= python37-devel +endif + +BUILD_DEPENDS+= $(BUILD_DEPENDS_python37) + +define MODULE_PREINSTALL_python37 +%{__mkdir} -p %{buildroot}%{_datadir}/doc/unit-python37/examples/python-app +%{__install} -m 644 -p %{SOURCE100} \ + %{buildroot}%{_datadir}/doc/unit-python37/examples/python-app/wsgi.py +%{__install} -m 644 -p %{SOURCE101} \ + %{buildroot}%{_datadir}/doc/unit-python37/examples/unit.config +endef +export MODULE_PREINSTALL_python37 + +define MODULE_FILES_python37 +%{_libdir}/unit/modules/* +%{_libdir}/unit/debug-modules/* +endef +export MODULE_FILES_python37 + +define MODULE_POST_python37 +cat < Date: Thu, 24 Jan 2019 14:05:58 +0300 Subject: Packages: systemd and other improvements. See the following links for details: https://github.com/nginx/unit/pull/212 https://github.com/nginx/unit/issues/213 Closes #155, closes #212, closes #213. --- pkg/rpm/Makefile | 2 +- pkg/rpm/rpmbuild/SOURCES/unit.logrotate | 10 +++++++++ pkg/rpm/rpmbuild/SOURCES/unit.service | 20 +++++++++++++---- pkg/rpm/rpmbuild/SOURCES/unit.sysconf | 2 +- pkg/rpm/unit.spec.in | 38 ++++++++++++++++++++++++--------- 5 files changed, 56 insertions(+), 16 deletions(-) create mode 100644 pkg/rpm/rpmbuild/SOURCES/unit.logrotate (limited to 'pkg') diff --git a/pkg/rpm/Makefile b/pkg/rpm/Makefile index 86b3e3f1..d817b434 100644 --- a/pkg/rpm/Makefile +++ b/pkg/rpm/Makefile @@ -102,7 +102,7 @@ endif CONFIGURE_ARGS=\ --prefix=/usr \ --state=%{_sharedstatedir}/unit \ - --control="unix:/var/run/control.unit.sock" \ + --control="unix:/var/run/unit/control.sock" \ --pid=/var/run/unit.pid \ --log=/var/log/unit.log \ --tests \ diff --git a/pkg/rpm/rpmbuild/SOURCES/unit.logrotate b/pkg/rpm/rpmbuild/SOURCES/unit.logrotate new file mode 100644 index 00000000..8fb00199 --- /dev/null +++ b/pkg/rpm/rpmbuild/SOURCES/unit.logrotate @@ -0,0 +1,10 @@ +/var/log/unit/*.log { + missingok + nocreate + notifempty + postrotate + if [ -f /var/run/unit/unit.pid ]; then + /bin/kill -SIGUSR1 `cat /var/run/unit/unit.pid` + fi + endscript +} diff --git a/pkg/rpm/rpmbuild/SOURCES/unit.service b/pkg/rpm/rpmbuild/SOURCES/unit.service index 4aaf70cd..f888685f 100644 --- a/pkg/rpm/rpmbuild/SOURCES/unit.service +++ b/pkg/rpm/rpmbuild/SOURCES/unit.service @@ -1,14 +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" 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 /run/unit/unit.pid" + [Unit] Description=NGINX Unit Wants=network-online.target After=network-online.target [Service] -Type=forking -PIDFile=/run/unit.pid -EnvironmentFile=-/etc/sysconfig/unit -ExecStart=/usr/sbin/unitd $UNITD_OPTIONS +Type=simple +Environment="UNITD_OPTIONS=--log /var/log/unit/unit.log --pid /run/unit/unit.pid" +ExecStart=/usr/sbin/unitd $UNITD_OPTIONS --no-daemon ExecReload= +RuntimeDirectory=unit +RuntimeDirectoryMode=0755 [Install] WantedBy=multi-user.target diff --git a/pkg/rpm/rpmbuild/SOURCES/unit.sysconf b/pkg/rpm/rpmbuild/SOURCES/unit.sysconf index 0b28558f..9146bdac 100644 --- a/pkg/rpm/rpmbuild/SOURCES/unit.sysconf +++ b/pkg/rpm/rpmbuild/SOURCES/unit.sysconf @@ -1 +1 @@ -UNITD_OPTIONS="--log /var/log/unit.log --pid /run/unit.pid" +UNITD_OPTIONS="--log /var/log/unit/unit.log --pid /var/run/unit/unit.pid" diff --git a/pkg/rpm/unit.spec.in b/pkg/rpm/unit.spec.in index 1ef02881..d69a3dc9 100644 --- a/pkg/rpm/unit.spec.in +++ b/pkg/rpm/unit.spec.in @@ -1,25 +1,31 @@ # distribution specific definitions -%define use_systemd (0%{?rhel} && 0%{?rhel} >= 7) || (0%{?suse_version} >= 1315) +%define use_systemd (0%{?rhel} >= 7 || 0%{?fedora} >= 19 || 0%{?suse_version} >= 1315) %define bdir %{_builddir}/%{name}-%{version} %define dotests 0 %if ( 0%{?rhel} == 5 || 0%{?rhel} == 6 ) Requires: initscripts >= 8.36 -BuildRequires: openssl-devel %endif -%if 0%{?rhel} == 7 -Requires: systemd -BuildRequires: systemd-units +%if %{use_systemd} +BuildRequires: systemd +Requires(post): systemd +Requires(preun): systemd +Requires(postun): systemd +%endif + +%if 0%{?rhel}%{?fedora} +BuildRequires: gcc BuildRequires: openssl-devel +%endif + +%if 0%{?rhel} %if 0%{?amzn} == 0 -%define dist .el7 +%define dist .el%{?rhel} %endif %endif %if 0%{?suse_version} >= 1315 -BuildRequires: systemd -Requires: systemd BuildRequires: libopenssl-devel %endif @@ -45,6 +51,7 @@ Source1: unit.service Source2: unit.init Source3: unit.sysconf Source4: unit.example.config +Source5: unit.logrotate BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -103,9 +110,16 @@ DESTDIR=%{buildroot} make unitd-install libunit-install %{__mkdir} -p %{buildroot}%{_libdir}/unit/modules %{__mkdir} -p %{buildroot}%{_libdir}/unit/debug-modules %{__mkdir} -p %{buildroot}%{_sharedstatedir}/unit +%{__mkdir} -p %{buildroot}%{_localstatedir}/log/unit +%{__mkdir} -p %{buildroot}%{_localstatedir}/run/unit +%if ! %{use_systemd} %{__mkdir} -p %{buildroot}%{_sysconfdir}/sysconfig %{__install} -m 644 -p %{SOURCE3} \ - %{buildroot}%{_sysconfdir}/sysconfig/unit + %{buildroot}%{_sysconfdir}/sysconfig/unitd +%endif +%{__mkdir} -p %{buildroot}%{_sysconfdir}/logrotate.d +%{__install} -m 644 -p %{SOURCE5} \ + %{buildroot}%{_sysconfdir}/logrotate.d/unit %{__mkdir} -p %{buildroot}%{_sysconfdir}/unit %{__mkdir} -p %{buildroot}%{_datadir}/doc/unit/examples %{__install} -m 644 -p %{SOURCE4} \ @@ -185,11 +199,13 @@ fi %defattr(-,root,root,-) %attr(0755,root,root) %{_sbindir}/unitd %attr(0755,root,root) %{_sbindir}/unitd-debug -%config(noreplace) %{_sysconfdir}/sysconfig/unit %dir %{_sysconfdir}/unit %if %{use_systemd} %{_unitdir}/unit.service +%dir %attr(0755,root,root) %ghost %{_localstatedir}/run/unit %else +%config(noreplace) %{_sysconfdir}/sysconfig/unitd +%dir %attr(0755,root,root) %{_localstatedir}/run/unit %{_initrddir}/unit %endif %dir %{_datadir}/doc/unit @@ -197,6 +213,8 @@ fi %dir %{_libdir}/unit/modules %dir %{_libdir}/unit/debug-modules %dir %{_sharedstatedir}/unit +%dir %attr(0700,root,root) %{_localstatedir}/log/unit +%config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %files devel %{_libdir}/libunit.a -- cgit From 3b7f28f23cf9592a24272bccfba325414cc07fb1 Mon Sep 17 00:00:00 2001 From: Andrei Belov Date: Thu, 24 Jan 2019 15:18:19 +0300 Subject: Packages: fixed control socket path after 7012b4fd5113. --- pkg/rpm/Makefile.go | 2 +- pkg/rpm/Makefile.perl | 2 +- pkg/rpm/Makefile.php | 2 +- pkg/rpm/Makefile.python | 2 +- pkg/rpm/Makefile.python27 | 2 +- pkg/rpm/Makefile.python34 | 2 +- pkg/rpm/Makefile.python35 | 2 +- pkg/rpm/Makefile.python36 | 2 +- pkg/rpm/Makefile.python37 | 2 +- pkg/rpm/Makefile.ruby | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) (limited to 'pkg') diff --git a/pkg/rpm/Makefile.go b/pkg/rpm/Makefile.go index f031c7ba..09dffd21 100644 --- a/pkg/rpm/Makefile.go +++ b/pkg/rpm/Makefile.go @@ -64,7 +64,7 @@ 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 sudo service unit start cd /usr/share/doc/%{name}/examples - sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock http://localhost/config + sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/unit/control.sock http://localhost/config curl http://localhost:8500/ Online documentation is available at https://unit.nginx.org diff --git a/pkg/rpm/Makefile.perl b/pkg/rpm/Makefile.perl index 84c15260..f59b7353 100644 --- a/pkg/rpm/Makefile.perl +++ b/pkg/rpm/Makefile.perl @@ -51,7 +51,7 @@ To check out the sample app, run these commands: sudo service unit start cd /usr/share/doc/%{name}/examples - sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock http://localhost/config + sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/unit/control.sock http://localhost/config curl http://localhost:8600/ Online documentation is available at https://unit.nginx.org diff --git a/pkg/rpm/Makefile.php b/pkg/rpm/Makefile.php index eedcce4e..8f39efc0 100644 --- a/pkg/rpm/Makefile.php +++ b/pkg/rpm/Makefile.php @@ -46,7 +46,7 @@ To check out the sample app, run these commands: sudo service unit start cd /usr/share/doc/%{name}/examples - sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock http://localhost/config + sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/unit/control.sock http://localhost/config curl http://localhost:8300/ Online documentation is available at https://unit.nginx.org diff --git a/pkg/rpm/Makefile.python b/pkg/rpm/Makefile.python index bb408bb5..334d62c1 100644 --- a/pkg/rpm/Makefile.python +++ b/pkg/rpm/Makefile.python @@ -46,7 +46,7 @@ To check the sample app, run these commands: sudo service unit start cd /usr/share/doc/%{name}/examples - sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock http://localhost/config + sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/unit/control.sock http://localhost/config curl http://localhost:8400/ Online documentation is available at https://unit.nginx.org diff --git a/pkg/rpm/Makefile.python27 b/pkg/rpm/Makefile.python27 index c6a2ec65..005eff17 100644 --- a/pkg/rpm/Makefile.python27 +++ b/pkg/rpm/Makefile.python27 @@ -48,7 +48,7 @@ To check the sample app, run these commands: sudo service unit start cd /usr/share/doc/%{name}/examples - sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock http://localhost/config + sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/unit/control.sock http://localhost/config curl http://localhost:8400/ Online documentation is available at https://unit.nginx.org diff --git a/pkg/rpm/Makefile.python34 b/pkg/rpm/Makefile.python34 index 1dc10f9c..83c0bdb6 100644 --- a/pkg/rpm/Makefile.python34 +++ b/pkg/rpm/Makefile.python34 @@ -46,7 +46,7 @@ To check the sample app, run these commands: sudo service unit start cd /usr/share/doc/%{name}/examples - sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock http://localhost/config + sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/unit/control.sock http://localhost/config curl http://localhost:8400/ Online documentation is available at https://unit.nginx.org diff --git a/pkg/rpm/Makefile.python35 b/pkg/rpm/Makefile.python35 index 3e4e0a2e..6f866771 100644 --- a/pkg/rpm/Makefile.python35 +++ b/pkg/rpm/Makefile.python35 @@ -41,7 +41,7 @@ To check the sample app, run these commands: sudo service unit start cd /usr/share/doc/%{name}/examples - sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock http://localhost/config + sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/unit/control.sock http://localhost/config curl http://localhost:8400/ Online documentation is available at https://unit.nginx.org diff --git a/pkg/rpm/Makefile.python36 b/pkg/rpm/Makefile.python36 index d674d8fe..25e33968 100644 --- a/pkg/rpm/Makefile.python36 +++ b/pkg/rpm/Makefile.python36 @@ -46,7 +46,7 @@ To check the sample app, run these commands: sudo service unit start cd /usr/share/doc/%{name}/examples - sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock http://localhost/config + sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/unit/control.sock http://localhost/config curl http://localhost:8400/ Online documentation is available at https://unit.nginx.org diff --git a/pkg/rpm/Makefile.python37 b/pkg/rpm/Makefile.python37 index 48f0b5c1..ed9462b8 100644 --- a/pkg/rpm/Makefile.python37 +++ b/pkg/rpm/Makefile.python37 @@ -46,7 +46,7 @@ To check the sample app, run these commands: sudo service unit start cd /usr/share/doc/%{name}/examples - sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock http://localhost/config + sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/unit/control.sock http://localhost/config curl http://localhost:8400/ Online documentation is available at https://unit.nginx.org diff --git a/pkg/rpm/Makefile.ruby b/pkg/rpm/Makefile.ruby index 92416338..51c2949d 100644 --- a/pkg/rpm/Makefile.ruby +++ b/pkg/rpm/Makefile.ruby @@ -55,7 +55,7 @@ To check the sample app, run these commands: sudo service unit start cd /usr/share/doc/%{name}/examples - sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock http://localhost/config + sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/unit/control.sock http://localhost/config curl http://localhost:8700/ Online documentation is available at https://unit.nginx.org -- cgit From 9e383ecaf21138e51bceee89eb1cd1b342a980ad Mon Sep 17 00:00:00 2001 From: Andrei Belov Date: Thu, 24 Jan 2019 16:47:32 +0300 Subject: Packages: disabled debugsource generation on relevant platforms. In particular, this fixes unit-go package building on Fedora >= 29. --- pkg/rpm/unit.module.spec.in | 11 +++++++++++ pkg/rpm/unit.spec.in | 11 +++++++++++ 2 files changed, 22 insertions(+) (limited to 'pkg') diff --git a/pkg/rpm/unit.module.spec.in b/pkg/rpm/unit.module.spec.in index 03d4addb..8b8a3433 100644 --- a/pkg/rpm/unit.module.spec.in +++ b/pkg/rpm/unit.module.spec.in @@ -44,6 +44,10 @@ This package contains %%SUMMARY%%. %debug_package %endif +%if 0%{?fedora} +%define _debugsource_template %{nil} +%endif + %prep %setup -qcTn %{name}-%{unit_version} tar --strip-components=1 -zxf %{SOURCE0} @@ -78,6 +82,13 @@ DESTDIR=%{buildroot} make %%MODULE_INSTARGS%% DESTDIR=%{buildroot} make %%MODULE_INSTARGS%% %check +%{__rm} -rf %{buildroot}/usr/src +cd %{bdir} +grep -v 'usr/src' debugfiles.list > debugfiles.list.new && mv debugfiles.list.new debugfiles.list +cat /dev/null > debugsources.list +%if 0%{?suse_version} >= 1500 +cat /dev/null > debugsourcefiles.list +%endif %clean %{__rm} -rf %{buildroot} diff --git a/pkg/rpm/unit.spec.in b/pkg/rpm/unit.spec.in index d69a3dc9..05ee79af 100644 --- a/pkg/rpm/unit.spec.in +++ b/pkg/rpm/unit.spec.in @@ -67,6 +67,10 @@ dynamically via an API. %debug_package %endif +%if 0%{?fedora} +%define _debugsource_template %{nil} +%endif + %package devel Summary: NGINX Unit (development files) Version: %%VERSION%% @@ -147,6 +151,13 @@ export QA_SKIP_BUILD_ROOT %if %{dotests} cd %{bdir} && make tests && ./build/tests %endif +%{__rm} -rf %{buildroot}/usr/src +cd %{bdir} +grep -v 'usr/src' debugfiles.list > debugfiles.list.new && mv debugfiles.list.new debugfiles.list +cat /dev/null > debugsources.list +%if 0%{?suse_version} >= 1500 +cat /dev/null > debugsourcefiles.list +%endif %clean %{__rm} -rf %{buildroot} -- cgit From 43ad6be2f04d4212bd97ffc9d8a2fe833d8f218c Mon Sep 17 00:00:00 2001 From: Andrei Belov Date: Thu, 14 Feb 2019 17:21:36 +0300 Subject: Packages: removed unit-perl on CentOS 6. CentOS 6 has Perl version 5.10, which is unsupported by Unit. --- pkg/rpm/Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'pkg') diff --git a/pkg/rpm/Makefile b/pkg/rpm/Makefile index d817b434..fdc31302 100644 --- a/pkg/rpm/Makefile +++ b/pkg/rpm/Makefile @@ -46,7 +46,13 @@ BUILD_DEPENDS = $(BUILD_DEPENDS_unit) MODULES= -ifneq (,$(findstring $(OSVER),centos6 centos7 amazonlinux2)) +ifeq ($(OSVER), centos6) +include Makefile.php +include Makefile.python +include Makefile.go +endif + +ifneq (,$(findstring $(OSVER),centos7 amazonlinux2)) include Makefile.php include Makefile.python include Makefile.go -- cgit From 1ba49d925031a74f1a6b6f31991562583f3271b5 Mon Sep 17 00:00:00 2001 From: Andrei Belov Date: Thu, 14 Feb 2019 17:21:37 +0300 Subject: Packages: added "-fno-strict-aliasing" flag on CentOS 6 x86_64. Closes #221 on GitHub. --- pkg/rpm/unit.module.spec.in | 4 ++++ pkg/rpm/unit.spec.in | 5 +++++ 2 files changed, 9 insertions(+) (limited to 'pkg') diff --git a/pkg/rpm/unit.module.spec.in b/pkg/rpm/unit.module.spec.in index 8b8a3433..d06db231 100644 --- a/pkg/rpm/unit.module.spec.in +++ b/pkg/rpm/unit.module.spec.in @@ -10,7 +10,11 @@ %define unit_version %%UNIT_VERSION%% %define unit_release %%UNIT_RELEASE%%%{?dist}.ngx +%if (0%{?rhel} == 6) && (%{_arch} == x86_64) +%define CC_OPT %{optflags} -fno-strict-aliasing +%else %define CC_OPT %{optflags} +%endif %define CONFIGURE_ARGS $(echo "%%CONFIGURE_ARGS%%") diff --git a/pkg/rpm/unit.spec.in b/pkg/rpm/unit.spec.in index 05ee79af..2d5c1bd1 100644 --- a/pkg/rpm/unit.spec.in +++ b/pkg/rpm/unit.spec.in @@ -29,7 +29,12 @@ BuildRequires: openssl-devel BuildRequires: libopenssl-devel %endif +%if (0%{?rhel} == 6) && (%{_arch} == x86_64) +%define CC_OPT %{optflags} -fno-strict-aliasing -fPIC +%else %define CC_OPT %{optflags} -fPIC +%endif + %define LD_OPT -Wl,-z,relro -Wl,-z,now -pie %define CONFIGURE_ARGS $(echo "%%CONFIGURE_ARGS%%") -- cgit From 608e09e9def182756e2f1650c6f3416b209fbf58 Mon Sep 17 00:00:00 2001 From: Alexander Borisov Date: Fri, 22 Feb 2019 16:31:44 +0300 Subject: Improvement and unification of version processing in build scripts. This also eliminates expressions that incompatible with BSD make, thus fixing installation of Node.js module on FreeBSD (broken by dace60fc4926). --- pkg/Makefile | 4 ++-- pkg/deb/Makefile | 5 ++--- pkg/docker/Makefile | 6 +++--- pkg/npm/Makefile | 10 +++------- pkg/rpm/Makefile | 5 ++--- 5 files changed, 12 insertions(+), 18 deletions(-) (limited to 'pkg') diff --git a/pkg/Makefile b/pkg/Makefile index 6001a034..7926606d 100644 --- a/pkg/Makefile +++ b/pkg/Makefile @@ -1,8 +1,8 @@ #!/usr/bin/make -VERSION ?= $(shell grep 'define NXT_VERSION' ../src/nxt_main.h \ - | sed -e 's/^.*"\(.*\)".*/\1/') +include ../version +VERSION ?= $(NXT_VERSION) RELEASE ?= 1 default: diff --git a/pkg/deb/Makefile b/pkg/deb/Makefile index 1a16b6ee..29792f90 100644 --- a/pkg/deb/Makefile +++ b/pkg/deb/Makefile @@ -1,11 +1,10 @@ #!/usr/bin/make -DEFAULT_VERSION := $(shell grep 'define NXT_VERSION' ../../src/nxt_main.h \ - | sed -e 's/^.*"\(.*\)".*/\1/') +include ../../version DEFAULT_RELEASE := 1 -VERSION ?= $(DEFAULT_VERSION) +VERSION ?= $(NXT_VERSION) RELEASE ?= $(DEFAULT_RELEASE) SRCDIR= unit-$(VERSION) diff --git a/pkg/docker/Makefile b/pkg/docker/Makefile index 140ac5b3..cf6de78d 100644 --- a/pkg/docker/Makefile +++ b/pkg/docker/Makefile @@ -1,10 +1,10 @@ #!/usr/bin/make -DEFAULT_VERSION := $(shell grep 'define NXT_VERSION' ../../src/nxt_main.h \ - | sed -e 's/^.*"\(.*\)".*/\1/') +include ../../version + DEFAULT_RELEASE := 1 -VERSION ?= $(DEFAULT_VERSION) +VERSION ?= $(NXT_VERSION) RELEASE ?= $(DEFAULT_RELEASE) CODENAME := stretch diff --git a/pkg/npm/Makefile b/pkg/npm/Makefile index dfa9ccdc..8636dd0b 100644 --- a/pkg/npm/Makefile +++ b/pkg/npm/Makefile @@ -1,13 +1,9 @@ #!/usr/bin/make -DEFAULT_VERSION := $(shell grep 'define NXT_VERSION' ../../src/nxt_main.h \ - | sed -e 's/^.*"\(.*\)".*/\1/') +include ../../version -DEFAULT_VERNUM := $(shell grep 'define NXT_VERNUM' ../../src/nxt_main.h \ - | sed -e 's/[^0-9]//g') - -VERSION ?= $(DEFAULT_VERSION) -VERNUM ?= $(DEFAULT_VERNUM) +VERSION ?= $(NXT_VERSION) +VERNUM ?= $(NXT_VERNUM) NPM ?= npm default: diff --git a/pkg/rpm/Makefile b/pkg/rpm/Makefile index fdc31302..2157e808 100644 --- a/pkg/rpm/Makefile +++ b/pkg/rpm/Makefile @@ -1,11 +1,10 @@ #!/usr/bin/make -DEFAULT_VERSION := $(shell grep 'define NXT_VERSION' ../../src/nxt_main.h \ - | sed -e 's/^.*"\(.*\)".*/\1/') +include ../../version DEFAULT_RELEASE := 1 -VERSION ?= $(DEFAULT_VERSION) +VERSION ?= $(NXT_VERSION) RELEASE ?= $(DEFAULT_RELEASE) ifeq ($(shell rpm --eval "%{?rhel}"), 6) -- cgit From 79e3185f3318654285766d849c0c06d713517251 Mon Sep 17 00:00:00 2001 From: Andrei Belov Date: Tue, 26 Feb 2019 14:39:08 +0300 Subject: Packages: fixed packages build, broken in 00d8049418cf. --- pkg/deb/debian.module/rules.in | 2 ++ pkg/deb/debian/rules.in | 2 ++ pkg/rpm/Makefile | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) (limited to 'pkg') diff --git a/pkg/deb/debian.module/rules.in b/pkg/deb/debian.module/rules.in index 22e381fe..e41b05d4 100755 --- a/pkg/deb/debian.module/rules.in +++ b/pkg/deb/debian.module/rules.in @@ -22,6 +22,7 @@ config.env.%: cp -Pa $(CURDIR)/configure $(BUILDDIR_$*)/ cp -Pa $(CURDIR)/src $(BUILDDIR_$*)/ cp -Pa $(CURDIR)/test $(BUILDDIR_$*)/ + cp -Pa $(CURDIR)/version $(BUILDDIR_$*)/ touch $@ configure.unit: config.env.unit @@ -65,6 +66,7 @@ clean: dh_testroot dh_clean find $(CURDIR) -maxdepth 1 -size 0 -delete + rm -rf $(BUILDDIR_unit) $(BUILDDIR_unit_debug) install: build dh_testdir diff --git a/pkg/deb/debian/rules.in b/pkg/deb/debian/rules.in index 7eab391d..a8c4c948 100644 --- a/pkg/deb/debian/rules.in +++ b/pkg/deb/debian/rules.in @@ -26,6 +26,7 @@ config.env.%: cp -Pa $(CURDIR)/configure $(BUILDDIR_$*)/ cp -Pa $(CURDIR)/src $(BUILDDIR_$*)/ cp -Pa $(CURDIR)/test $(BUILDDIR_$*)/ + cp -Pa $(CURDIR)/version $(BUILDDIR_$*)/ touch $@ configure.unit: config.env.unit @@ -83,6 +84,7 @@ clean: dh_testroot dh_clean find $(CURDIR) -maxdepth 1 -size 0 -delete + rm -rf $(BUILDDIR_unit) $(BUILDDIR_unit_debug) install: build do.tests dh_testdir diff --git a/pkg/rpm/Makefile b/pkg/rpm/Makefile index 2157e808..56cf31b5 100644 --- a/pkg/rpm/Makefile +++ b/pkg/rpm/Makefile @@ -170,7 +170,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 + LICENSE NOTICE CHANGES README configure auto src test version unit: check-build-depends-unit rpmbuild/SPECS/unit.spec rpmbuild/SOURCES/unit-$(VERSION).tar.gz @echo "===> Building $@ package" ; \ -- cgit From aa7478267aa53667a29a021ddc0d425cf877b89e Mon Sep 17 00:00:00 2001 From: Andrei Belov Date: Tue, 26 Feb 2019 14:53:28 +0300 Subject: Packages: yet another fix added, missed in a7af31b69692. --- pkg/deb/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkg') diff --git a/pkg/deb/Makefile b/pkg/deb/Makefile index 29792f90..ffd9aa2e 100644 --- a/pkg/deb/Makefile +++ b/pkg/deb/Makefile @@ -170,7 +170,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 + LICENSE NOTICE CHANGES README configure auto src test version mv debuild/$(SRCDIR).tar.gz debuild/unit_$(VERSION).orig.tar.gz cd debuild && tar zxf unit_$(VERSION).orig.tar.gz -- cgit From ce6ce15c2042421588cd7f0635744239caf1cb31 Mon Sep 17 00:00:00 2001 From: Valentin Bartenev Date: Tue, 26 Feb 2019 17:42:20 +0300 Subject: Fixed violation of the strict aliasing rules in 5d0edd35c4ce. In order to reduce number of operations over rb-tree and process them in batches simultaneously, all the timers changes are temporary stored in array. While processing of these changes, the same memory is also used for storing pointers to postpone timers adding. As the same block of memory has been referenced by two different types of pointers (nxt_timer_change_t * and nxt_timer_t **), some compilers may reorder operations with these pointers and produce broken code. See ticket #221 on GitHub for a particular case. Now the same "nxt_timer_change_t" structure is used in both cases. Also, reverted the -fno-strict-aliasing flag, which has been introduced in ef76227ec159 as a workaround for this issue. --- pkg/rpm/unit.module.spec.in | 4 ---- pkg/rpm/unit.spec.in | 5 ----- 2 files changed, 9 deletions(-) (limited to 'pkg') diff --git a/pkg/rpm/unit.module.spec.in b/pkg/rpm/unit.module.spec.in index d06db231..8b8a3433 100644 --- a/pkg/rpm/unit.module.spec.in +++ b/pkg/rpm/unit.module.spec.in @@ -10,11 +10,7 @@ %define unit_version %%UNIT_VERSION%% %define unit_release %%UNIT_RELEASE%%%{?dist}.ngx -%if (0%{?rhel} == 6) && (%{_arch} == x86_64) -%define CC_OPT %{optflags} -fno-strict-aliasing -%else %define CC_OPT %{optflags} -%endif %define CONFIGURE_ARGS $(echo "%%CONFIGURE_ARGS%%") diff --git a/pkg/rpm/unit.spec.in b/pkg/rpm/unit.spec.in index 2d5c1bd1..05ee79af 100644 --- a/pkg/rpm/unit.spec.in +++ b/pkg/rpm/unit.spec.in @@ -29,12 +29,7 @@ BuildRequires: openssl-devel BuildRequires: libopenssl-devel %endif -%if (0%{?rhel} == 6) && (%{_arch} == x86_64) -%define CC_OPT %{optflags} -fno-strict-aliasing -fPIC -%else %define CC_OPT %{optflags} -fPIC -%endif - %define LD_OPT -Wl,-z,relro -Wl,-z,now -pie %define CONFIGURE_ARGS $(echo "%%CONFIGURE_ARGS%%") -- cgit From 5c9fe8c3060f8204b143abae6d81ee8363aba060 Mon Sep 17 00:00:00 2001 From: Valentin Bartenev Date: Wed, 27 Feb 2019 17:25:28 +0300 Subject: Added trailing zero to version string. While it looks nicer without zero 3-rd version number, this should improve interoperability. Version string can be parsed or used for sorting. And it is easier to handle and less confusing when there is constant number of version parts. Moreover, NPM also expects version format with 3 parts. So ".0" has already been used in Node.js module version. --- pkg/npm/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkg') diff --git a/pkg/npm/Makefile b/pkg/npm/Makefile index 8636dd0b..ef8ef7b5 100644 --- a/pkg/npm/Makefile +++ b/pkg/npm/Makefile @@ -13,7 +13,7 @@ copy: cp -rp ../../src/nodejs/unit-http . echo '#define NXT_NODE_VERNUM ${VERNUM}' > unit-http/version.h mv unit-http/binding_pub.gyp unit-http/binding.gyp - sed -e 's/"version"\s*:.*/"version": "${VERSION}.0",/' \ + sed -e 's/"version"\s*:.*/"version": "${VERSION}",/' \ unit-http/package.json > unit-http/package.json.tmp mv unit-http/package.json.tmp unit-http/package.json -- cgit From 7ce6f0597543baee4275e8d66567d08f2ddaf48b Mon Sep 17 00:00:00 2001 From: Andrei Belov Date: Thu, 28 Feb 2019 18:22:15 +0300 Subject: Packages: added unit-jsc (Java Servlet Container) family. --- pkg/deb/Makefile | 28 +- pkg/deb/Makefile.jsc-common | 28 + pkg/deb/Makefile.jsc10 | 53 ++ pkg/deb/Makefile.jsc11 | 53 ++ pkg/deb/Makefile.jsc8 | 53 ++ pkg/deb/debian.module/control-noarch.in | 23 + pkg/deb/debian.module/copyright.unit-jsc-common | 868 +++++++++++++++++++++ pkg/deb/debian.module/rules-noarch.in | 107 +++ pkg/deb/debian.module/rules.in | 7 +- pkg/deb/debian.module/unit.example-jsc-app | 12 + pkg/deb/debian.module/unit.example-jsc10-config | 15 + pkg/deb/debian.module/unit.example-jsc11-config | 15 + pkg/deb/debian.module/unit.example-jsc8-config | 15 + pkg/deb/debian.module/unit.example-jsc9-config | 15 + pkg/deb/debian/rules.in | 4 + pkg/rpm/Makefile | 39 +- pkg/rpm/Makefile.jsc-common | 41 + pkg/rpm/Makefile.jsc11 | 65 ++ pkg/rpm/Makefile.jsc8 | 65 ++ pkg/rpm/rpmbuild/SOURCES/COPYRIGHT.unit-jsc-common | 868 +++++++++++++++++++++ pkg/rpm/rpmbuild/SOURCES/unit.example-jsc-app | 12 + pkg/rpm/rpmbuild/SOURCES/unit.example-jsc11-config | 15 + pkg/rpm/rpmbuild/SOURCES/unit.example-jsc8-config | 15 + pkg/rpm/unit.module.spec.in | 6 + 24 files changed, 2408 insertions(+), 14 deletions(-) create mode 100644 pkg/deb/Makefile.jsc-common create mode 100644 pkg/deb/Makefile.jsc10 create mode 100644 pkg/deb/Makefile.jsc11 create mode 100644 pkg/deb/Makefile.jsc8 create mode 100644 pkg/deb/debian.module/control-noarch.in create mode 100644 pkg/deb/debian.module/copyright.unit-jsc-common create mode 100644 pkg/deb/debian.module/rules-noarch.in create mode 100644 pkg/deb/debian.module/unit.example-jsc-app create mode 100644 pkg/deb/debian.module/unit.example-jsc10-config create mode 100644 pkg/deb/debian.module/unit.example-jsc11-config create mode 100644 pkg/deb/debian.module/unit.example-jsc8-config create mode 100644 pkg/deb/debian.module/unit.example-jsc9-config create mode 100644 pkg/rpm/Makefile.jsc-common create mode 100644 pkg/rpm/Makefile.jsc11 create mode 100644 pkg/rpm/Makefile.jsc8 create mode 100644 pkg/rpm/rpmbuild/SOURCES/COPYRIGHT.unit-jsc-common create mode 100644 pkg/rpm/rpmbuild/SOURCES/unit.example-jsc-app create mode 100644 pkg/rpm/rpmbuild/SOURCES/unit.example-jsc11-config create mode 100644 pkg/rpm/rpmbuild/SOURCES/unit.example-jsc8-config (limited to 'pkg') diff --git a/pkg/deb/Makefile b/pkg/deb/Makefile index ffd9aa2e..3d747402 100644 --- a/pkg/deb/Makefile +++ b/pkg/deb/Makefile @@ -26,6 +26,9 @@ include Makefile.go19 include Makefile.go110 include Makefile.perl include Makefile.ruby +include Makefile.jsc-common +include Makefile.jsc8 +include Makefile.jsc11 endif # Ubuntu 18.04 @@ -37,6 +40,9 @@ include Makefile.go19 include Makefile.go110 include Makefile.perl include Makefile.ruby +include Makefile.jsc-common +include Makefile.jsc8 +include Makefile.jsc10 endif # Ubuntu 17.10 @@ -69,6 +75,8 @@ include Makefile.python35 include Makefile.go include Makefile.perl include Makefile.ruby +include Makefile.jsc-common +include Makefile.jsc8 endif # Ubuntu 14.04 @@ -87,6 +95,8 @@ include Makefile.go17 include Makefile.go18 include Makefile.perl include Makefile.ruby +include Makefile.jsc-common +include Makefile.jsc8 endif # Debian 8 @@ -200,7 +210,11 @@ else -e "s#%%CODENAME%%#$(CODENAME)#g" \ > $@/$(SRCDIR)/debian/changelog endif - cp debian/copyright debuild-$*/$(SRCDIR)/debian/ + if [ -f debian.module/copyright.unit-$(MODULE_SUFFIX_$*) ]; then \ + cp debian.module/copyright.unit-$(MODULE_SUFFIX_$*) debuild-$*/$(SRCDIR)/debian/copyright ; \ + else \ + cp debian/copyright debuild-$*/$(SRCDIR)/debian/ ; \ + fi @{ \ set -e ; \ for src in $(MODULE_SOURCES_$*); do \ @@ -209,8 +223,9 @@ endif definitions=`echo "$$MODULE_DEFINITIONS_$*" | sed -e ':a' -e 'N' -e '$$!ba' -e "s/\n/\$$CR/g"` ; \ prebuild=`echo "$$MODULE_PREBUILD_$*" | sed -e ':a' -e 'N' -e '$$!ba' -e "s/\n/\$$CR/g"` ; \ preinstall=`echo "$$MODULE_PREINSTALL_$*" | sed -e ':a' -e 'N' -e '$$!ba' -e "s/\n/\$$CR/g"` ; \ + postinstall=`echo "$$MODULE_POSTINSTALL_$*" | sed -e ':a' -e 'N' -e '$$!ba' -e "s/\n/\$$CR/g"` ; \ post=`echo "$$MODULE_POST_$*" | sed -e ':a' -e 'N' -e '$$!ba' -e "s/\n/\$$CR/g"` ; \ - cat debian.module/control.in | sed \ + cat debian.module/$(if $(MODULE_NOARCH_$*),control-noarch.in,control.in) | sed \ -e "s#%%NAME%%#unit-$(MODULE_SUFFIX_$*)#g" \ -e "s#%%SUMMARY%%#$(MODULE_SUMMARY_$*)#g" \ -e "s#%%CODENAME%%#$(CODENAME)#g" \ @@ -221,7 +236,7 @@ endif -e "s#%%MODULE_BUILD_DEPENDS%%#$(MODULE_BUILD_DEPENDS_$*)#g" \ -e "s#%%MODULE_DEPENDS%%#$(MODULE_DEPENDS_$*)#g" \ > $@/$(SRCDIR)/debian/control ; \ - cat debian.module/rules.in | sed \ + cat debian.module/$(if $(MODULE_NOARCH_$*),rules-noarch.in,rules.in) | sed \ -e "s#%%NAME%%#unit-$(MODULE_SUFFIX_$*)#g" \ -e "s#%%CODENAME%%#$(CODENAME)#g" \ -e "s#%%UNIT_VERSION%%#$(VERSION)#g" \ @@ -233,6 +248,7 @@ endif -e "s#%%MODULE_DEFINITIONS%%#$${definitions}#g" \ -e "s#%%MODULE_PREBUILD%%#$${prebuild}#g" \ -e "s#%%MODULE_PREINSTALL%%#$${preinstall}#g" \ + -e "s#%%MODULE_POSTINSTALL%%#$${postinstall}#g" \ > $@/$(SRCDIR)/debian/rules ; \ cat debian.module/preinst.in | sed \ -e "s#%%MODULE_POST%%#$$post#g" \ @@ -249,8 +265,9 @@ unit-%: check-build-depends-% | debuild-% test: unit modules @{ \ - for so in `find debuild-*/unit-$(VERSION)/debian/build-unit/ -type f -name "*.so"` ; do \ + for so in `find debuild-*/unit-$(VERSION)/debian/build-unit/ -type f \( -name "*.so" -o -name "*.jar" \)`; do \ soname=`basename $${so}` ; \ + test "$${soname}" = "java.unit.so" && continue ; \ test -h debuild/unit-$(VERSION)/debian/build-unit/build/$${soname} || \ ln -fs `pwd`/$${so} debuild/unit-$(VERSION)/debian/build-unit/build/$${soname} ; \ done ; \ @@ -259,8 +276,9 @@ test: unit modules test-debug: unit modules @{ \ - for so in `find debuild-*/unit-$(VERSION)/debian/build-unit-debug/ -type f -name "*.so"` ; do \ + for so in `find debuild-*/unit-$(VERSION)/debian/build-unit-debug/ -type f \( -name "*.so" -o -name "*.jar" \)`; do \ soname=`basename $${so}` ; \ + test "$${soname}" = "java.unit.so" && continue ; \ test -h debuild/unit-$(VERSION)/debian/build-unit-debug/build/$${soname} || \ ln -fs `pwd`/$${so} debuild/unit-$(VERSION)/debian/build-unit-debug/build/$${soname} ; \ done ; \ diff --git a/pkg/deb/Makefile.jsc-common b/pkg/deb/Makefile.jsc-common new file mode 100644 index 00000000..902d60df --- /dev/null +++ b/pkg/deb/Makefile.jsc-common @@ -0,0 +1,28 @@ +MODULES+= jsc_common +MODULE_SUFFIX_jsc_common= jsc-common + +MODULE_SUMMARY_jsc_common= Java shared packages for NGINX Unit + +MODULE_VERSION_jsc_common= $(VERSION) +MODULE_RELEASE_jsc_common= 1 + +MODULE_CONFARGS_jsc_common= java --home=/usr/lib/jvm/java-8-openjdk-$$\(DEB_HOST_ARCH\) --jars=/usr/share/unit-jsc-common/ +MODULE_MAKEARGS_jsc_common= java +MODULE_INSTARGS_jsc_common= java-shared-install + +BUILD_DEPENDS_jsc_common= openjdk-8-jdk-headless openjdk-8-jre-headless +BUILD_DEPENDS+= $(BUILD_DEPENDS_jsc_common) + +MODULE_NOARCH_jsc_common= true + +define MODULE_POST_jsc_common +cat < +Build-Depends: debhelper (>= 9), + linux-libc-dev%%MODULE_BUILD_DEPENDS%% +Standards-Version: 3.9.5 +Homepage: https://unit.nginx.org + +Package: %%NAME%% +Section: admin +Architecture: all +Depends: lsb-base, + ${misc:Depends}, + unit (= %%UNIT_VERSION%%-%%UNIT_RELEASE%%~%%CODENAME%%)%%MODULE_DEPENDS%% +Description: %%SUMMARY%% + 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. + This package contains %%SUMMARY%%. diff --git a/pkg/deb/debian.module/copyright.unit-jsc-common b/pkg/deb/debian.module/copyright.unit-jsc-common new file mode 100644 index 00000000..08907713 --- /dev/null +++ b/pkg/deb/debian.module/copyright.unit-jsc-common @@ -0,0 +1,868 @@ + +This package includes the following software components distributed +under corresponding licenses: + + * classgraph-4.4.11.jar: MIT + * ecj-3.13.102.jar: EPL 1.0 + * jetty-http-9.4.12.v20180830.jar: Apache 2.0 + EPL 1.0 + * jetty-server-9.4.12.v20180830.jar: Apache 2.0 + EPL 1.0 + * jetty-util-9.4.12.v20180830.jar: Apache 2.0 + EPL 1.0 + * tomcat-api-9.0.13.jar: Apache 2.0 + * tomcat-el-api-9.0.13.jar: Apache 2.0 + * tomcat-jasper-9.0.13.jar: Apache 2.0 + * tomcat-jasper-el-9.0.13.jar: Apache 2.0 + * tomcat-jsp-api-9.0.13.jar: Apache 2.0 + * tomcat-juli-9.0.13.jar: Apache 2.0 + * tomcat-servlet-api-9.0.13.jar: Apache 2.0 + CDDL 1.0 + * tomcat-util-9.0.13.jar: Apache 2.0 + * tomcat-util-scan-9.0.13.jar: Apache 2.0 + +Licenses could be found by the following links and below in this file: + + - MIT (The MIT License): + http://www.opensource.org/licenses/MIT + + - EPL (Eclipse Public License) v1.0: + https://www.eclipse.org/legal/epl-v10.html + + - Apache 2.0: + http://www.apache.org/licenses/LICENSE-2.0.html + + - CDDL (Common Development and Distribution License) v1.0: + https://opensource.org/licenses/CDDL-1.0 + + +====[ MIT license - begin ]=================================================== + +The MIT License (MIT) + +Copyright (c) 2015 Luke Hutchison + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +====[ MIT license - end ]===================================================== + + +====[ EPL license - begin ]=================================================== + +Eclipse Public License - v1.0 + +THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC +LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM +CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. + +1. DEFINITIONS + +"Contribution" means: + +a) in the case of the initial Contributor, the initial code and documentation +distributed under this Agreement, and + +b) in the case of each subsequent Contributor: + +i) changes to the Program, and + +ii) additions to the Program; + +where such changes and/or additions to the Program originate from and are +distributed by that particular Contributor. A Contribution 'originates' from a +Contributor if it was added to the Program by such Contributor itself or +anyone acting on such Contributor's behalf. Contributions do not include +additions to the Program which: (i) are separate modules of software +distributed in conjunction with the Program under their own license agreement, +and (ii) are not derivative works of the Program. "Contributor" means any +person or entity that distributes the Program. + +"Licensed Patents" mean patent claims licensable by a Contributor which are +necessarily infringed by the use or sale of its Contribution alone or when +combined with the Program. + +"Program" means the Contributions distributed in accordance with this +Agreement. + +"Recipient" means anyone who receives the Program under this Agreement, +including all Contributors. + +2. GRANT OF RIGHTS + +a) Subject to the terms of this Agreement, each Contributor hereby grants +Recipient a non-exclusive, worldwide, royalty-free copyright license to +reproduce, prepare derivative works of, publicly display, publicly perform, +distribute and sublicense the Contribution of such Contributor, if any, and +such derivative works, in source code and object code form. + +b) Subject to the terms of this Agreement, each Contributor hereby grants +Recipient a non-exclusive, worldwide, royalty-free patent license under +Licensed Patents to make, use, sell, offer to sell, import and otherwise +transfer the Contribution of such Contributor, if any, in source code and +object code form. This patent license shall apply to the combination of the +Contribution and the Program if, at the time the Contribution is added by the +Contributor, such addition of the Contribution causes such combination to be +covered by the Licensed Patents. The patent license shall not apply to any +other combinations which include the Contribution. No hardware per se is +licensed hereunder. + +c) Recipient understands that although each Contributor grants the licenses to +its Contributions set forth herein, no assurances are provided by any +Contributor that the Program does not infringe the patent or other +intellectual property rights of any other entity. Each Contributor disclaims +any liability to Recipient for claims brought by any other entity based on +infringement of intellectual property rights or otherwise. As a condition to +exercising the rights and licenses granted hereunder, each Recipient hereby +assumes sole responsibility to secure any other intellectual property rights +needed, if any. For example, if a third party patent license is required to +allow Recipient to distribute the Program, it is Recipient's responsibility to +acquire that license before distributing the Program. + +d) Each Contributor represents that to its knowledge it has sufficient +copyright rights in its Contribution, if any, to grant the copyright license +set forth in this Agreement. + +3. REQUIREMENTS + +A Contributor may choose to distribute the Program in object code form under +its own license agreement, provided that: + +a) it complies with the terms and conditions of this Agreement; and + +b) its license agreement: + +i) effectively disclaims on behalf of all Contributors all warranties and +conditions, express and implied, including warranties or conditions of title +and non-infringement, and implied warranties or conditions of merchantability +and fitness for a particular purpose; + +ii) effectively excludes on behalf of all Contributors all liability for +damages, including direct, indirect, special, incidental and consequential +damages, such as lost profits; + +iii) states that any provisions which differ from this Agreement are offered +by that Contributor alone and not by any other party; and + +iv) states that source code for the Program is available from such +Contributor, and informs licensees how to obtain it in a reasonable manner on +or through a medium customarily used for software exchange. + +When the Program is made available in source code form: + +a) it must be made available under this Agreement; and + +b) a copy of this Agreement must be included with each copy of the Program. + +Contributors may not remove or alter any copyright notices contained within +the Program. + +Each Contributor must identify itself as the originator of its Contribution, +if any, in a manner that reasonably allows subsequent Recipients to identify +the originator of the Contribution. + +4. COMMERCIAL DISTRIBUTION + +Commercial distributors of software may accept certain responsibilities with +respect to end users, business partners and the like. While this license is +intended to facilitate the commercial use of the Program, the Contributor who +includes the Program in a commercial product offering should do so in a manner +which does not create potential liability for other Contributors. Therefore, +if a Contributor includes the Program in a commercial product offering, such +Contributor ("Commercial Contributor") hereby agrees to defend and indemnify +every other Contributor ("Indemnified Contributor") against any losses, +damages and costs (collectively "Losses") arising from claims, lawsuits and +other legal actions brought by a third party against the Indemnified +Contributor to the extent caused by the acts or omissions of such Commercial +Contributor in connection with its distribution of the Program in a commercial +product offering. The obligations in this section do not apply to any claims +or Losses relating to any actual or alleged intellectual property +infringement. In order to qualify, an Indemnified Contributor must: a) +promptly notify the Commercial Contributor in writing of such claim, and b) +allow the Commercial Contributor to control, and cooperate with the Commercial +Contributor in, the defense and any related settlement negotiations. The +Indemnified Contributor may participate in any such claim at its own expense. + +For example, a Contributor might include the Program in a commercial product +offering, Product X. That Contributor is then a Commercial Contributor. If +that Commercial Contributor then makes performance claims, or offers +warranties related to Product X, those performance claims and warranties are +such Commercial Contributor's responsibility alone. Under this section, the +Commercial Contributor would have to defend claims against the other +Contributors related to those performance claims and warranties, and if a +court requires any other Contributor to pay any damages as a result, the +Commercial Contributor must pay those damages. + +5. NO WARRANTY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR +IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, +NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each +Recipient is solely responsible for determining the appropriateness of using +and distributing the Program and assumes all risks associated with its +exercise of rights under this Agreement , including but not limited to the +risks and costs of program errors, compliance with applicable laws, damage to +or loss of data, programs or equipment, and unavailability or interruption of +operations. + +6. DISCLAIMER OF LIABILITY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY +CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION +LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE +EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY +OF SUCH DAMAGES. + +7. GENERAL + +If any provision of this Agreement is invalid or unenforceable under +applicable law, it shall not affect the validity or enforceability of the +remainder of the terms of this Agreement, and without further action by the +parties hereto, such provision shall be reformed to the minimum extent +necessary to make such provision valid and enforceable. + +If Recipient institutes patent litigation against any entity (including a +cross-claim or counterclaim in a lawsuit) alleging that the Program itself +(excluding combinations of the Program with other software or hardware) +infringes such Recipient's patent(s), then such Recipient's rights granted +under Section 2(b) shall terminate as of the date such litigation is filed. + +All Recipient's rights under this Agreement shall terminate if it fails to +comply with any of the material terms or conditions of this Agreement and does +not cure such failure in a reasonable period of time after becoming aware of +such noncompliance. If all Recipient's rights under this Agreement terminate, +Recipient agrees to cease use and distribution of the Program as soon as +reasonably practicable. However, Recipient's obligations under this Agreement +and any licenses granted by Recipient relating to the Program shall continue +and survive. + +Everyone is permitted to copy and distribute copies of this Agreement, but in +order to avoid inconsistency the Agreement is copyrighted and may only be +modified in the following manner. The Agreement Steward reserves the right to +publish new versions (including revisions) of this Agreement from time to +time. No one other than the Agreement Steward has the right to modify this +Agreement. The Eclipse Foundation is the initial Agreement Steward. The +Eclipse Foundation may assign the responsibility to serve as the Agreement +Steward to a suitable separate entity. Each new version of the Agreement will +be given a distinguishing version number. The Program (including +Contributions) may always be distributed subject to the version of the +Agreement under which it was received. In addition, after a new version of the +Agreement is published, Contributor may elect to distribute the Program +(including its Contributions) under the new version. Except as expressly +stated in Sections 2(a) and 2(b) above, Recipient receives no rights or +licenses to the intellectual property of any Contributor under this Agreement, +whether expressly, by implication, estoppel or otherwise. All rights in the +Program not expressly granted under this Agreement are reserved. + +This Agreement is governed by the laws of the State of New York and the +intellectual property laws of the United States of America. No party to this +Agreement will bring a legal action under this Agreement more than one year +after the cause of action arose. Each party waives its rights to a jury trial +in any resulting litigation. + +====[ EPL license - begin ]=================================================== + + +====[ Apache 2.0 license - begin ]============================================ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +====[ Apache 2.0 license - end ]============================================== + + +====[ CDDL v1.0 license - start ]============================================= + +COMMON DEVELOPMENT AND DISTRIBUTION LICENSE Version 1.0 + +1. Definitions. + + 1.1. "Contributor" means each individual or entity that creates + or contributes to the creation of Modifications. + + 1.2. "Contributor Version" means the combination of the Original + Software, prior Modifications used by a Contributor (if any), + and the Modifications made by that particular Contributor. + + 1.3. "Covered Software" means (a) the Original Software, or (b) + Modifications, or (c) the combination of files containing + Original Software with files containing Modifications, in + each case including portions thereof. + + 1.4. "Executable" means the Covered Software in any form other + than Source Code. + + 1.5. "Initial Developer" means the individual or entity that first + makes Original Software available under this License. + + 1.6. "Larger Work" means a work which combines Covered Software or + portions thereof with code not governed by the terms of this + License. + + 1.7. "License" means this document. + + 1.8. "Licensable" means having the right to grant, to the maximum + extent possible, whether at the time of the initial grant or + subsequently acquired, any and all of the rights conveyed + herein. + + 1.9. "Modifications" means the Source Code and Executable form of + any of the following: + + A. Any file that results from an addition to, deletion from or + modification of the contents of a file containing Original + Software or previous Modifications; + + B. Any new file that contains any part of the Original + Software or previous Modifications; or + + C. Any new file that is contributed or otherwise made + available under the terms of this License. + + 1.10. "Original Software" means the Source Code and Executable + form of computer software code that is originally released + under this License. + + 1.11. "Patent Claims" means any patent claim(s), now owned or + hereafter acquired, including without limitation, method, + process, and apparatus claims, in any patent Licensable by + grantor. + + 1.12. "Source Code" means (a) the common form of computer software + code in which modifications are made and (b) associated + documentation included in or with such code. + + 1.13. "You" (or "Your") means an individual or a legal entity + exercising rights under, and complying with all of the terms + of, this License. For legal entities, "You" includes any + entity which controls, is controlled by, or is under common + control with You. For purposes of this definition, + "control" means (a) the power, direct or indirect, to cause + the direction or management of such entity, whether by + contract or otherwise, or (b) ownership of more than fifty + percent (50%) of the outstanding shares or beneficial + ownership of such entity. + +2. License Grants. + + 2.1. The Initial Developer Grant. + + Conditioned upon Your compliance with Section 3.1 below and + subject to third party intellectual property claims, the Initial + Developer hereby grants You a world-wide, royalty-free, + non-exclusive license: + + (a) under intellectual property rights (other than patent or + trademark) Licensable by Initial Developer, to use, + reproduce, modify, display, perform, sublicense and + distribute the Original Software (or portions thereof), + with or without Modifications, and/or as part of a Larger + Work; and + + (b) under Patent Claims infringed by the making, using or + selling of Original Software, to make, have made, use, + practice, sell, and offer for sale, and/or otherwise + dispose of the Original Software (or portions thereof). + + (c) The licenses granted in Sections 2.1(a) and (b) are + effective on the date Initial Developer first distributes + or otherwise makes the Original Software available to a + third party under the terms of this License. + + (d) Notwithstanding Section 2.1(b) above, no patent license is + granted: (1) for code that You delete from the Original + Software, or (2) for infringements caused by: (i) the + modification of the Original Software, or (ii) the + combination of the Original Software with other software + or devices. + + 2.2. Contributor Grant. + + Conditioned upon Your compliance with Section 3.1 below and + subject to third party intellectual property claims, each + Contributor hereby grants You a world-wide, royalty-free, + non-exclusive license: + + (a) under intellectual property rights (other than patent or + trademark) Licensable by Contributor to use, reproduce, + modify, display, perform, sublicense and distribute the + Modifications created by such Contributor (or portions + thereof), either on an unmodified basis, with other + Modifications, as Covered Software and/or as part of a + Larger Work; and + + (b) under Patent Claims infringed by the making, using, or + selling of Modifications made by that Contributor either + alone and/or in combination with its Contributor Version + (or portions of such combination), to make, use, sell, + offer for sale, have made, and/or otherwise dispose of: + (1) Modifications made by that Contributor (or portions + thereof); and (2) the combination of Modifications made by + that Contributor with its Contributor Version (or portions + of such combination). + + (c) The licenses granted in Sections 2.2(a) and 2.2(b) are + effective on the date Contributor first distributes or + otherwise makes the Modifications available to a third + party. + + (d) Notwithstanding Section 2.2(b) above, no patent license is + granted: (1) for any code that Contributor has deleted + from the Contributor Version; (2) for infringements caused + by: (i) third party modifications of Contributor Version, + or (ii) the combination of Modifications made by that + Contributor with other software (except as part of the + Contributor Version) or other devices; or (3) under Patent + Claims infringed by Covered Software in the absence of + Modifications made by that Contributor. + +3. Distribution Obligations. + + 3.1. Availability of Source Code. + + Any Covered Software that You distribute or otherwise make + available in Executable form must also be made available in Source + Code form and that Source Code form must be distributed only under + the terms of this License. You must include a copy of this + License with every copy of the Source Code form of the Covered + Software You distribute or otherwise make available. You must + inform recipients of any such Covered Software in Executable form + as to how they can obtain such Covered Software in Source Code + form in a reasonable manner on or through a medium customarily + used for software exchange. + + 3.2. Modifications. + + The Modifications that You create or to which You contribute are + governed by the terms of this License. You represent that You + believe Your Modifications are Your original creation(s) and/or + You have sufficient rights to grant the rights conveyed by this + License. + + 3.3. Required Notices. + + You must include a notice in each of Your Modifications that + identifies You as the Contributor of the Modification. You may + not remove or alter any copyright, patent or trademark notices + contained within the Covered Software, or any notices of licensing + or any descriptive text giving attribution to any Contributor or + the Initial Developer. + + 3.4. Application of Additional Terms. + + You may not offer or impose any terms on any Covered Software in + Source Code form that alters or restricts the applicable version + of this License or the recipients' rights hereunder. You may + choose to offer, and to charge a fee for, warranty, support, + indemnity or liability obligations to one or more recipients of + Covered Software. However, you may do so only on Your own behalf, + and not on behalf of the Initial Developer or any Contributor. + You must make it absolutely clear that any such warranty, support, + indemnity or liability obligation is offered by You alone, and You + hereby agree to indemnify the Initial Developer and every + Contributor for any liability incurred by the Initial Developer or + such Contributor as a result of warranty, support, indemnity or + liability terms You offer. + + 3.5. Distribution of Executable Versions. + + You may distribute the Executable form of the Covered Software + under the terms of this License or under the terms of a license of + Your choice, which may contain terms different from this License, + provided that You are in compliance with the terms of this License + and that the license for the Executable form does not attempt to + limit or alter the recipient's rights in the Source Code form from + the rights set forth in this License. If You distribute the + Covered Software in Executable form under a different license, You + must make it absolutely clear that any terms which differ from + this License are offered by You alone, not by the Initial + Developer or Contributor. You hereby agree to indemnify the + Initial Developer and every Contributor for any liability incurred + by the Initial Developer or such Contributor as a result of any + such terms You offer. + + 3.6. Larger Works. + + You may create a Larger Work by combining Covered Software with + other code not governed by the terms of this License and + distribute the Larger Work as a single product. In such a case, + You must make sure the requirements of this License are fulfilled + for the Covered Software. + +4. Versions of the License. + + 4.1. New Versions. + + Sun Microsystems, Inc. is the initial license steward and may + publish revised and/or new versions of this License from time to + time. Each version will be given a distinguishing version number. + Except as provided in Section 4.3, no one other than the license + steward has the right to modify this License. + + 4.2. Effect of New Versions. + + You may always continue to use, distribute or otherwise make the + Covered Software available under the terms of the version of the + License under which You originally received the Covered Software. + If the Initial Developer includes a notice in the Original + Software prohibiting it from being distributed or otherwise made + available under any subsequent version of the License, You must + distribute and make the Covered Software available under the terms + of the version of the License under which You originally received + the Covered Software. Otherwise, You may also choose to use, + distribute or otherwise make the Covered Software available under + the terms of any subsequent version of the License published by + the license steward. + + 4.3. Modified Versions. + + When You are an Initial Developer and You want to create a new + license for Your Original Software, You may create and use a + modified version of this License if You: (a) rename the license + and remove any references to the name of the license steward + (except to note that the license differs from this License); and + (b) otherwise make it clear that the license contains terms which + differ from this License. + +5. DISCLAIMER OF WARRANTY. + + COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" + BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, + INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED + SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR + PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND + PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY + COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE + INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY + NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF + WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF + ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS + DISCLAIMER. + +6. TERMINATION. + + 6.1. This License and the rights granted hereunder will terminate + automatically if You fail to comply with terms herein and fail to + cure such breach within 30 days of becoming aware of the breach. + Provisions which, by their nature, must remain in effect beyond + the termination of this License shall survive. + + 6.2. If You assert a patent infringement claim (excluding + declaratory judgment actions) against Initial Developer or a + Contributor (the Initial Developer or Contributor against whom You + assert such claim is referred to as "Participant") alleging that + the Participant Software (meaning the Contributor Version where + the Participant is a Contributor or the Original Software where + the Participant is the Initial Developer) directly or indirectly + infringes any patent, then any and all rights granted directly or + indirectly to You by such Participant, the Initial Developer (if + the Initial Developer is not the Participant) and all Contributors + under Sections 2.1 and/or 2.2 of this License shall, upon 60 days + notice from Participant terminate prospectively and automatically + at the expiration of such 60 day notice period, unless if within + such 60 day period You withdraw Your claim with respect to the + Participant Software against such Participant either unilaterally + or pursuant to a written agreement with Participant. + + 6.3. In the event of termination under Sections 6.1 or 6.2 above, + all end user licenses that have been validly granted by You or any + distributor hereunder prior to termination (excluding licenses + granted to You by any distributor) shall survive termination. + +7. LIMITATION OF LIABILITY. + + UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT + (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE + INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF + COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE + LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR + CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT + LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK + STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER + COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN + INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF + LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL + INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT + APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO + NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR + CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT + APPLY TO YOU. + +8. U.S. GOVERNMENT END USERS. + + The Covered Software is a "commercial item," as that term is + defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial + computer software" (as that term is defined at 48 + C.F.R. 252.227-7014(a)(1)) and "commercial computer software + documentation" as such terms are used in 48 C.F.R. 12.212 + (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 + C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all + U.S. Government End Users acquire Covered Software with only those + rights set forth herein. This U.S. Government Rights clause is in + lieu of, and supersedes, any other FAR, DFAR, or other clause or + provision that addresses Government rights in computer software + under this License. + +9. MISCELLANEOUS. + + This License represents the complete agreement concerning subject + matter hereof. If any provision of this License is held to be + unenforceable, such provision shall be reformed only to the extent + necessary to make it enforceable. This License shall be governed + by the law of the jurisdiction specified in a notice contained + within the Original Software (except to the extent applicable law, + if any, provides otherwise), excluding such jurisdiction's + conflict-of-law provisions. Any litigation relating to this + License shall be subject to the jurisdiction of the courts located + in the jurisdiction and venue specified in a notice contained + within the Original Software, with the losing party responsible + for costs, including, without limitation, court costs and + reasonable attorneys' fees and expenses. The application of the + United Nations Convention on Contracts for the International Sale + of Goods is expressly excluded. Any law or regulation which + provides that the language of a contract shall be construed + against the drafter shall not apply to this License. You agree + that You alone are responsible for compliance with the United + States export administration regulations (and the export control + laws and regulation of any other countries) when You use, + distribute or otherwise make available any Covered Software. + +10. RESPONSIBILITY FOR CLAIMS. + + As between Initial Developer and the Contributors, each party is + responsible for claims and damages arising, directly or + indirectly, out of its utilization of rights under this License + and You agree to work with Initial Developer and Contributors to + distribute such responsibility on an equitable basis. Nothing + herein is intended or shall be deemed to constitute any admission + of liability. + +-------------------------------------------------------------------- + +NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND +DISTRIBUTION LICENSE (CDDL) + +For Covered Software in this distribution, this License shall +be governed by the laws of the State of California (excluding +conflict-of-law provisions). + +Any litigation relating to this License shall be subject to the +jurisdiction of the Federal Courts of the Northern District of +California and the state courts of the State of California, with +venue lying in Santa Clara County, California. + +====[ CDDL v1.0 license - end ]=============================================== diff --git a/pkg/deb/debian.module/rules-noarch.in b/pkg/deb/debian.module/rules-noarch.in new file mode 100644 index 00000000..823675ba --- /dev/null +++ b/pkg/deb/debian.module/rules-noarch.in @@ -0,0 +1,107 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie +export DEB_CFLAGS_MAINT_APPEND=-Wp,-D_FORTIFY_SOURCE=2 -fPIC +DPKG_EXPORT_BUILDFLAGS = 1 +include /usr/share/dpkg/buildflags.mk + +BUILDDIR_unit = $(CURDIR)/debian/build-unit +BUILDDIR_unit_debug = $(CURDIR)/debian/build-unit-debug +INSTALLDIR = $(CURDIR)/debian/%%NAME%% +BASEDIR = $(CURDIR) + +%%MODULE_DEFINITIONS%% + +config.env.%: + dh_testdir + mkdir -p $(BUILDDIR_$*) + cp -Pa $(CURDIR)/auto $(BUILDDIR_$*)/ + cp -Pa $(CURDIR)/configure $(BUILDDIR_$*)/ + cp -Pa $(CURDIR)/src $(BUILDDIR_$*)/ + cp -Pa $(CURDIR)/test $(BUILDDIR_$*)/ + cp -Pa $(CURDIR)/version $(BUILDDIR_$*)/ + cp -Pa $(CURDIR)/CHANGES $(BUILDDIR_$*)/ + cp -Pa $(CURDIR)/LICENSE $(BUILDDIR_$*)/ + cp -Pa $(CURDIR)/NOTICE $(BUILDDIR_$*)/ + cp -Pa $(CURDIR)/README $(BUILDDIR_$*)/ + touch $@ + +configure.unit: config.env.unit + cd $(BUILDDIR_unit) && \ + CFLAGS= ./configure \ + %%CONFIGURE_ARGS%% \ + --modules=/usr/lib/unit/modules \ + --cc-opt="$(CFLAGS)" && \ + ./configure %%MODULE_CONFARGS%% + touch $@ + +configure.unit_debug: config.env.unit_debug + cd $(BUILDDIR_unit_debug) && \ + CFLAGS= ./configure \ + %%CONFIGURE_ARGS%% \ + --modules=/usr/lib/unit/debug-modules \ + --cc-opt="$(CFLAGS)" \ + --debug && \ + ./configure %%MODULE_CONFARGS%% + touch $@ + +build-arch.%: configure.% + dh_testdir + $(MAKE) -C $(BUILDDIR_$*) %%MODULE_MAKEARGS%% + touch $@ + +build-indep: + dh_testdir + touch $@ + +build-arch: build-arch.unit build-arch.unit_debug + dh_testdir + touch $@ + +build: build-arch build-indep + dh_testdir + touch $@ + +clean: + dh_testdir + dh_testroot + dh_clean + find $(CURDIR) -maxdepth 1 -size 0 -delete + rm -rf $(BUILDDIR_unit) $(BUILDDIR_unit_debug) + +install: build + dh_testdir + dh_testroot + dh_prep + dh_installdirs + dh_installinit + dh_installlogrotate +%%MODULE_PREINSTALL%% + cd $(BUILDDIR_unit) && \ + DESTDIR=$(INSTALLDIR) make %%MODULE_INSTARGS%% + cd $(BUILDDIR_unit_debug) && \ + DESTDIR=$(INSTALLDIR) make %%MODULE_INSTARGS%% +%%MODULE_POSTINSTALL%% + +binary-indep: build install + dh_testdir + dh_testroot + dh_installdocs + dh_installchangelogs + dh_link + dh_compress + dh_fixperms + dh_installdeb + dh_perl + dh_gencontrol + dh_md5sums + dh_builddeb + +binary-arch: install + +binary: binary-indep binary-arch + +.PHONY: clean binary-indep binary-arch binary install build diff --git a/pkg/deb/debian.module/rules.in b/pkg/deb/debian.module/rules.in index e41b05d4..1391e01a 100755 --- a/pkg/deb/debian.module/rules.in +++ b/pkg/deb/debian.module/rules.in @@ -23,6 +23,10 @@ config.env.%: cp -Pa $(CURDIR)/src $(BUILDDIR_$*)/ cp -Pa $(CURDIR)/test $(BUILDDIR_$*)/ cp -Pa $(CURDIR)/version $(BUILDDIR_$*)/ + cp -Pa $(CURDIR)/CHANGES $(BUILDDIR_$*)/ + cp -Pa $(CURDIR)/LICENSE $(BUILDDIR_$*)/ + cp -Pa $(CURDIR)/NOTICE $(BUILDDIR_$*)/ + cp -Pa $(CURDIR)/README $(BUILDDIR_$*)/ touch $@ configure.unit: config.env.unit @@ -80,12 +84,13 @@ install: build DESTDIR=$(INSTALLDIR) make %%MODULE_INSTARGS%% cd $(BUILDDIR_unit_debug) && \ DESTDIR=$(INSTALLDIR) make %%MODULE_INSTARGS%% +%%MODULE_POSTINSTALL%% binary-indep: build install dh_testdir dh_testroot dh_installdocs - dh_installchangelogs + dh_installchangelogs dh_link dh_strip --dbg-package=%%NAME%%-dbg dh_shlibdeps diff --git a/pkg/deb/debian.module/unit.example-jsc-app b/pkg/deb/debian.module/unit.example-jsc-app new file mode 100644 index 00000000..be01e123 --- /dev/null +++ b/pkg/deb/debian.module/unit.example-jsc-app @@ -0,0 +1,12 @@ +<%@ page contentType="text/plain"%><%@ page import="java.util.*" %>This is plain text response for "<%= request.getMethod() %> <%= request.getRequestURI() %>". +Here is the list of all system properties: +<% + Properties p = System.getProperties(); + Enumeration keys = p.keys(); + while (keys.hasMoreElements()) { + String key = (String) keys.nextElement(); + String value = (String) p.get(key); + out.println(" " + key + " : " + value); + } +%> +<% response.addHeader("X-Unit-JSP", "ok"); %> diff --git a/pkg/deb/debian.module/unit.example-jsc10-config b/pkg/deb/debian.module/unit.example-jsc10-config new file mode 100644 index 00000000..6929356d --- /dev/null +++ b/pkg/deb/debian.module/unit.example-jsc10-config @@ -0,0 +1,15 @@ +{ + "applications": { + "example_java10": { + "processes": 1, + "type": "java 10", + "webapp": "/usr/share/doc/unit-jsc10/examples/jsc-app" + } + }, + + "listeners": { + "*:8800": { + "application": "example_java10" + } + } +} diff --git a/pkg/deb/debian.module/unit.example-jsc11-config b/pkg/deb/debian.module/unit.example-jsc11-config new file mode 100644 index 00000000..6c1d9549 --- /dev/null +++ b/pkg/deb/debian.module/unit.example-jsc11-config @@ -0,0 +1,15 @@ +{ + "applications": { + "example_java11": { + "processes": 1, + "type": "java 11", + "webapp": "/usr/share/doc/unit-jsc11/examples/jsc-app" + } + }, + + "listeners": { + "*:8800": { + "application": "example_java11" + } + } +} diff --git a/pkg/deb/debian.module/unit.example-jsc8-config b/pkg/deb/debian.module/unit.example-jsc8-config new file mode 100644 index 00000000..0254677b --- /dev/null +++ b/pkg/deb/debian.module/unit.example-jsc8-config @@ -0,0 +1,15 @@ +{ + "applications": { + "example_java8": { + "processes": 1, + "type": "java 1.8.0", + "webapp": "/usr/share/doc/unit-jsc8/examples/jsc-app" + } + }, + + "listeners": { + "*:8800": { + "application": "example_java8" + } + } +} diff --git a/pkg/deb/debian.module/unit.example-jsc9-config b/pkg/deb/debian.module/unit.example-jsc9-config new file mode 100644 index 00000000..c64a1aff --- /dev/null +++ b/pkg/deb/debian.module/unit.example-jsc9-config @@ -0,0 +1,15 @@ +{ + "applications": { + "example_java9": { + "processes": 1, + "type": "java 9", + "webapp": "/usr/share/doc/unit-jsc9/examples/jsc-app" + } + }, + + "listeners": { + "*:8800": { + "application": "example_java9" + } + } +} diff --git a/pkg/deb/debian/rules.in b/pkg/deb/debian/rules.in index a8c4c948..bee9223f 100644 --- a/pkg/deb/debian/rules.in +++ b/pkg/deb/debian/rules.in @@ -27,6 +27,10 @@ config.env.%: cp -Pa $(CURDIR)/src $(BUILDDIR_$*)/ cp -Pa $(CURDIR)/test $(BUILDDIR_$*)/ cp -Pa $(CURDIR)/version $(BUILDDIR_$*)/ + cp -Pa $(CURDIR)/CHANGES $(BUILDDIR_$*)/ + cp -Pa $(CURDIR)/LICENSE $(BUILDDIR_$*)/ + cp -Pa $(CURDIR)/NOTICE $(BUILDDIR_$*)/ + cp -Pa $(CURDIR)/README $(BUILDDIR_$*)/ touch $@ configure.unit: config.env.unit diff --git a/pkg/rpm/Makefile b/pkg/rpm/Makefile index 56cf31b5..d94890f2 100644 --- a/pkg/rpm/Makefile +++ b/pkg/rpm/Makefile @@ -7,9 +7,9 @@ DEFAULT_RELEASE := 1 VERSION ?= $(NXT_VERSION) RELEASE ?= $(DEFAULT_RELEASE) -ifeq ($(shell rpm --eval "%{?rhel}"), 6) +ifeq ($(shell test `rpm --eval '0%{?rhel} -eq 6 -a 0%{?amzn} -eq 0'`; echo $$?), 0) OSVER = centos6 -else ifeq ($(shell rpm --eval "%{?rhel}"), 7) +else ifeq ($(shell test `rpm --eval '0%{?rhel} -eq 7 -a 0%{?amzn} -eq 0'`; echo $$?), 0) OSVER = centos7 else ifeq ($(shell rpm --eval "%{?amzn}"), 1) OSVER = amazonlinux1 @@ -49,13 +49,18 @@ ifeq ($(OSVER), centos6) include Makefile.php include Makefile.python include Makefile.go +include Makefile.jsc-common +include Makefile.jsc8 endif -ifneq (,$(findstring $(OSVER),centos7 amazonlinux2)) +ifeq ($(OSVER), centos7) include Makefile.php include Makefile.python include Makefile.go include Makefile.perl +include Makefile.jsc-common +include Makefile.jsc8 +include Makefile.jsc11 endif ifeq ($(OSVER), amazonlinux1) @@ -66,6 +71,17 @@ include Makefile.python35 include Makefile.python36 include Makefile.go include Makefile.perl +include Makefile.jsc-common +include Makefile.jsc8 +endif + +ifeq ($(OSVER), amazonlinux2) +include Makefile.php +include Makefile.python +include Makefile.go +include Makefile.perl +include Makefile.jsc-common +include Makefile.jsc8 endif ifeq ($(OSVER), opensuse-leap) @@ -102,6 +118,9 @@ endif include Makefile.go include Makefile.perl include Makefile.ruby +include Makefile.jsc-common +include Makefile.jsc8 +include Makefile.jsc11 endif CONFIGURE_ARGS=\ @@ -191,9 +210,10 @@ rpmbuild/SPECS/unit-%.spec: unit.module.spec.in ../../docs/changes.xml | rpmbuil sources="$${sources}\n$${s}" ; \ i=$$(($${i}+1)) ; \ done ; \ - pkgname=$(shell echo $@ | cut -d '/' -f 3 | cut -d '.' -f 1) ; \ + pkgname=$(shell echo $@ | cut -d '/' -f 3 | tr '_' '-' | cut -d '.' -f 1) ; \ definitions=`echo "$$MODULE_DEFINITIONS_$*" | sed -e ':a' -e 'N' -e '$$!ba' -e "s/\n/\$$CR/g"` ; \ preinstall=`echo "$$MODULE_PREINSTALL_$*" | sed -e ':a' -e 'N' -e '$$!ba' -e "s/\n/\$$CR/g"` ; \ + postinstall=`echo "$$MODULE_POSTINSTALL_$*" | sed -e ':a' -e 'N' -e '$$!ba' -e "s/\n/\$$CR/g"` ; \ files=`echo "$$MODULE_FILES_$*" | sed -e ':a' -e 'N' -e '$$!ba' -e "s/\n/\$$CR/g"` ; \ post=`echo "$$MODULE_POST_$*" | sed -e ':a' -e 'N' -e '$$!ba' -e "s/\n/\$$CR/g"` ; \ cat unit.module.spec.in | sed \ @@ -210,6 +230,7 @@ rpmbuild/SPECS/unit-%.spec: unit.module.spec.in ../../docs/changes.xml | rpmbuil -e "s#%%MODULE_INSTARGS%%#$(MODULE_INSTARGS_$*)#g" \ -e "s#%%MODULE_DEFINITIONS%%#$${definitions}#g" \ -e "s#%%MODULE_PREINSTALL%%#$${preinstall}#g" \ + -e "s#%%MODULE_POSTINSTALL%%#$${postinstall}#g" \ -e "s#%%MODULE_FILES%%#$${files}#g" \ -e "s#%%MODULE_POST%%#$${post}#g" \ > $@.tmp ; \ @@ -221,14 +242,15 @@ rpmbuild/SPECS/unit-%.spec: unit.module.spec.in ../../docs/changes.xml | rpmbuil mv $@.tmp $@ unit-%: check-build-depends-% rpmbuild/SPECS/unit-%.spec rpmbuild/SOURCES/unit-$(VERSION).tar.gz - @echo "===> Building $@ package" ; \ + @echo "===> Building $(subst _,-,$@) package" ; \ rpmbuild -D "_topdir `pwd`/rpmbuild" -ba rpmbuild/SPECS/$@.spec && \ - ln -s rpmbuild/BUILD/$@-$(VERSION)/build $@ + ln -s rpmbuild/BUILD/$(subst _,-,$@)-$(VERSION)/build $@ test: unit modules @{ \ - for so in `find rpmbuild/BUILD/*/build-nodebug/ -type f -name "*.so"`; do \ + for so in `find rpmbuild/BUILD/*/build-nodebug/ -type f \( -name "*.so" -o -name "*.jar" \)`; do \ soname=`basename $${so}` ; \ + test "$${soname}" = "java.unit.so" && continue ; \ test -h rpmbuild/BUILD/unit-$(VERSION)/build-nodebug/$${soname} || \ ln -fs `pwd`/$${so} rpmbuild/BUILD/unit-$(VERSION)/build-nodebug/$${soname} ; \ done ; \ @@ -237,8 +259,9 @@ test: unit modules test-debug: unit modules @{ \ - for so in `find rpmbuild/BUILD/*/build-debug/ -type f -name "*.so"`; do \ + for so in `find rpmbuild/BUILD/*/build-debug/ -type f \( -name "*.so" -o -name "*.jar" \)`; do \ soname=`basename $${so}` ; \ + test "$${soname}" = "java.unit.so" && continue ; \ test -h rpmbuild/BUILD/unit-$(VERSION)/build-debug/$${soname} || \ ln -fs `pwd`/$${so} rpmbuild/BUILD/unit-$(VERSION)/build-debug/$${soname} ; \ done ; \ diff --git a/pkg/rpm/Makefile.jsc-common b/pkg/rpm/Makefile.jsc-common new file mode 100644 index 00000000..d73ed06c --- /dev/null +++ b/pkg/rpm/Makefile.jsc-common @@ -0,0 +1,41 @@ +MODULES+= jsc_common +MODULE_SUFFIX_jsc_common= jsc-common + +MODULE_SUMMARY_jsc_common= Java shared packages for NGINX Unit + +MODULE_VERSION_jsc_common= $(VERSION) +MODULE_RELEASE_jsc_common= 1 + +MODULE_CONFARGS_jsc_common= java --home=/usr/lib/jvm/java-1.8.0 --jars=/usr/share/unit-jsc-common/ +MODULE_MAKEARGS_jsc_common= java +MODULE_INSTARGS_jsc_common= java-shared-install + +MODULE_SOURCES_jsc_common= COPYRIGHT.unit-jsc-common + +BUILD_DEPENDS_jsc_common= java-1.8.0-openjdk-devel +BUILD_DEPENDS+= $(BUILD_DEPENDS_jsc_common) + +define MODULE_DEFINITIONS_jsc_common +BuildArch: noarch +endef +export MODULE_DEFINITIONS_jsc_common + +define MODULE_FILES_jsc_common +%dir %{_datadir}/unit-jsc-common +%{_datadir}/unit-jsc-common/* +endef +export MODULE_FILES_jsc_common + +define MODULE_POST_jsc_common +cat <<%@ page import="java.util.*" %>This is plain text response for "<%= request.getMethod() %> <%= request.getRequestURI() %>". +Here is the list of all system properties: +<% + Properties p = System.getProperties(); + Enumeration keys = p.keys(); + while (keys.hasMoreElements()) { + String key = (String) keys.nextElement(); + String value = (String) p.get(key); + out.println(" " + key + " : " + value); + } +%> +<% response.addHeader("X-Unit-JSP", "ok"); %> diff --git a/pkg/rpm/rpmbuild/SOURCES/unit.example-jsc11-config b/pkg/rpm/rpmbuild/SOURCES/unit.example-jsc11-config new file mode 100644 index 00000000..6c1d9549 --- /dev/null +++ b/pkg/rpm/rpmbuild/SOURCES/unit.example-jsc11-config @@ -0,0 +1,15 @@ +{ + "applications": { + "example_java11": { + "processes": 1, + "type": "java 11", + "webapp": "/usr/share/doc/unit-jsc11/examples/jsc-app" + } + }, + + "listeners": { + "*:8800": { + "application": "example_java11" + } + } +} diff --git a/pkg/rpm/rpmbuild/SOURCES/unit.example-jsc8-config b/pkg/rpm/rpmbuild/SOURCES/unit.example-jsc8-config new file mode 100644 index 00000000..0254677b --- /dev/null +++ b/pkg/rpm/rpmbuild/SOURCES/unit.example-jsc8-config @@ -0,0 +1,15 @@ +{ + "applications": { + "example_java8": { + "processes": 1, + "type": "java 1.8.0", + "webapp": "/usr/share/doc/unit-jsc8/examples/jsc-app" + } + }, + + "listeners": { + "*:8800": { + "application": "example_java8" + } + } +} diff --git a/pkg/rpm/unit.module.spec.in b/pkg/rpm/unit.module.spec.in index 8b8a3433..6a229c0f 100644 --- a/pkg/rpm/unit.module.spec.in +++ b/pkg/rpm/unit.module.spec.in @@ -72,14 +72,20 @@ make %%MODULE_MAKEARGS%% %install %{__rm} -rf %{buildroot} %{__mkdir} -p %{buildroot}%{_datadir}/doc/%%NAME%% +if [ `basename %{SOURCE100}` == COPYRIGHT.%{name} ]; then +%{__install} -m 644 -p %{SOURCE100} \ + %{buildroot}%{_datadir}/doc/%%NAME%%/COPYRIGHT +else %{__install} -m 644 -p NOTICE \ %{buildroot}%{_datadir}/doc/%%NAME%%/COPYRIGHT +fi %%MODULE_PREINSTALL%% %{__ln_s} build-debug build DESTDIR=%{buildroot} make %%MODULE_INSTARGS%% %{__rm} -f build %{__ln_s} build-nodebug build DESTDIR=%{buildroot} make %%MODULE_INSTARGS%% +%%MODULE_POSTINSTALL%% %check %{__rm} -rf %{buildroot}/usr/src -- cgit From 5b98f0a55204c65b42fc5606e0ad2ba9bd01568c Mon Sep 17 00:00:00 2001 From: Andrei Belov Date: Fri, 1 Mar 2019 10:46:46 +0300 Subject: Packages: removed Ubuntu 17.04 and 17.10 references due to EOL. --- pkg/deb/Makefile | 22 ---------------------- 1 file changed, 22 deletions(-) (limited to 'pkg') diff --git a/pkg/deb/Makefile b/pkg/deb/Makefile index 3d747402..f481ff02 100644 --- a/pkg/deb/Makefile +++ b/pkg/deb/Makefile @@ -45,28 +45,6 @@ include Makefile.jsc8 include Makefile.jsc10 endif -# Ubuntu 17.10 -ifeq ($(CODENAME),artful) -include Makefile.php -include Makefile.python27 -include Makefile.python36 -include Makefile.go18 -include Makefile.go19 -include Makefile.perl -include Makefile.ruby -endif - -# Ubuntu 17.04 -ifeq ($(CODENAME),zesty) -include Makefile.php -include Makefile.python27 -include Makefile.python35 -include Makefile.go17 -include Makefile.go18 -include Makefile.perl -include Makefile.ruby -endif - # Ubuntu 16.04 ifeq ($(CODENAME),xenial) include Makefile.php -- cgit From 2e4853f4d7b4a1e49bc4dedd3c9cba61134fb511 Mon Sep 17 00:00:00 2001 From: Andrei Belov Date: Fri, 1 Mar 2019 16:04:41 +0300 Subject: Packages: added Java trademark notice to corresponding packages. --- pkg/deb/debian.module/copyright.unit-jsc-common | 8 +++++-- pkg/deb/debian.module/copyright.unit-jsc10 | 26 ++++++++++++++++++++++ pkg/deb/debian.module/copyright.unit-jsc11 | 26 ++++++++++++++++++++++ pkg/deb/debian.module/copyright.unit-jsc8 | 26 ++++++++++++++++++++++ pkg/rpm/rpmbuild/SOURCES/COPYRIGHT.unit-jsc-common | 8 +++++-- pkg/rpm/rpmbuild/SOURCES/COPYRIGHT.unit-jsc10 | 25 +++++++++++++++++++++ pkg/rpm/rpmbuild/SOURCES/COPYRIGHT.unit-jsc11 | 25 +++++++++++++++++++++ pkg/rpm/rpmbuild/SOURCES/COPYRIGHT.unit-jsc8 | 25 +++++++++++++++++++++ 8 files changed, 165 insertions(+), 4 deletions(-) create mode 100644 pkg/deb/debian.module/copyright.unit-jsc10 create mode 100644 pkg/deb/debian.module/copyright.unit-jsc11 create mode 100644 pkg/deb/debian.module/copyright.unit-jsc8 create mode 100644 pkg/rpm/rpmbuild/SOURCES/COPYRIGHT.unit-jsc10 create mode 100644 pkg/rpm/rpmbuild/SOURCES/COPYRIGHT.unit-jsc11 create mode 100644 pkg/rpm/rpmbuild/SOURCES/COPYRIGHT.unit-jsc8 (limited to 'pkg') diff --git a/pkg/deb/debian.module/copyright.unit-jsc-common b/pkg/deb/debian.module/copyright.unit-jsc-common index 08907713..accb1834 100644 --- a/pkg/deb/debian.module/copyright.unit-jsc-common +++ b/pkg/deb/debian.module/copyright.unit-jsc-common @@ -1,6 +1,10 @@ -This package includes the following software components distributed -under corresponding licenses: +The unit-jsc-common package includes supplementary Java archives (JARs) +required by Java servlet container module for NGINX Unit. + +Java is a registered trademark of Oracle and/or its affiliates. + +The following software components distributed under corresponding licenses: * classgraph-4.4.11.jar: MIT * ecj-3.13.102.jar: EPL 1.0 diff --git a/pkg/deb/debian.module/copyright.unit-jsc10 b/pkg/deb/debian.module/copyright.unit-jsc10 new file mode 100644 index 00000000..dbad728b --- /dev/null +++ b/pkg/deb/debian.module/copyright.unit-jsc10 @@ -0,0 +1,26 @@ + + NGINX Unit. + + Copyright 2017-2019 NGINX, Inc. + Copyright 2017-2019 Igor Sysoev + Copyright 2017-2019 Valentin V. Bartenev + Copyright 2017-2019 Max Romanov + Copyright 2018-2019 Alexander Borisov + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + /usr/share/common-licenses/Apache-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + The unit-jsc10 package provides Java servlet container module + for NGINX Unit. + + Java is a registered trademark of Oracle and/or its affiliates. diff --git a/pkg/deb/debian.module/copyright.unit-jsc11 b/pkg/deb/debian.module/copyright.unit-jsc11 new file mode 100644 index 00000000..413c0094 --- /dev/null +++ b/pkg/deb/debian.module/copyright.unit-jsc11 @@ -0,0 +1,26 @@ + + NGINX Unit. + + Copyright 2017-2019 NGINX, Inc. + Copyright 2017-2019 Igor Sysoev + Copyright 2017-2019 Valentin V. Bartenev + Copyright 2017-2019 Max Romanov + Copyright 2018-2019 Alexander Borisov + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + /usr/share/common-licenses/Apache-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + The unit-jsc11 package provides Java servlet container module + for NGINX Unit. + + Java is a registered trademark of Oracle and/or its affiliates. diff --git a/pkg/deb/debian.module/copyright.unit-jsc8 b/pkg/deb/debian.module/copyright.unit-jsc8 new file mode 100644 index 00000000..96b62102 --- /dev/null +++ b/pkg/deb/debian.module/copyright.unit-jsc8 @@ -0,0 +1,26 @@ + + NGINX Unit. + + Copyright 2017-2019 NGINX, Inc. + Copyright 2017-2019 Igor Sysoev + Copyright 2017-2019 Valentin V. Bartenev + Copyright 2017-2019 Max Romanov + Copyright 2018-2019 Alexander Borisov + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + /usr/share/common-licenses/Apache-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + The unit-jsc8 package provides Java servlet container module + for NGINX Unit. + + Java is a registered trademark of Oracle and/or its affiliates. diff --git a/pkg/rpm/rpmbuild/SOURCES/COPYRIGHT.unit-jsc-common b/pkg/rpm/rpmbuild/SOURCES/COPYRIGHT.unit-jsc-common index 08907713..accb1834 100644 --- a/pkg/rpm/rpmbuild/SOURCES/COPYRIGHT.unit-jsc-common +++ b/pkg/rpm/rpmbuild/SOURCES/COPYRIGHT.unit-jsc-common @@ -1,6 +1,10 @@ -This package includes the following software components distributed -under corresponding licenses: +The unit-jsc-common package includes supplementary Java archives (JARs) +required by Java servlet container module for NGINX Unit. + +Java is a registered trademark of Oracle and/or its affiliates. + +The following software components distributed under corresponding licenses: * classgraph-4.4.11.jar: MIT * ecj-3.13.102.jar: EPL 1.0 diff --git a/pkg/rpm/rpmbuild/SOURCES/COPYRIGHT.unit-jsc10 b/pkg/rpm/rpmbuild/SOURCES/COPYRIGHT.unit-jsc10 new file mode 100644 index 00000000..665785b2 --- /dev/null +++ b/pkg/rpm/rpmbuild/SOURCES/COPYRIGHT.unit-jsc10 @@ -0,0 +1,25 @@ + + NGINX Unit. + + Copyright 2017-2019 NGINX, Inc. + Copyright 2017-2019 Igor Sysoev + Copyright 2017-2019 Valentin V. Bartenev + Copyright 2017-2019 Max Romanov + Copyright 2018-2019 Alexander Borisov + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + The unit-jsc10 package provides Java servlet container module + for NGINX Unit. + + Java is a registered trademark of Oracle and/or its affiliates. diff --git a/pkg/rpm/rpmbuild/SOURCES/COPYRIGHT.unit-jsc11 b/pkg/rpm/rpmbuild/SOURCES/COPYRIGHT.unit-jsc11 new file mode 100644 index 00000000..e92a8245 --- /dev/null +++ b/pkg/rpm/rpmbuild/SOURCES/COPYRIGHT.unit-jsc11 @@ -0,0 +1,25 @@ + + NGINX Unit. + + Copyright 2017-2019 NGINX, Inc. + Copyright 2017-2019 Igor Sysoev + Copyright 2017-2019 Valentin V. Bartenev + Copyright 2017-2019 Max Romanov + Copyright 2018-2019 Alexander Borisov + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + The unit-jsc11 package provides Java servlet container module + for NGINX Unit. + + Java is a registered trademark of Oracle and/or its affiliates. diff --git a/pkg/rpm/rpmbuild/SOURCES/COPYRIGHT.unit-jsc8 b/pkg/rpm/rpmbuild/SOURCES/COPYRIGHT.unit-jsc8 new file mode 100644 index 00000000..1e7dbff6 --- /dev/null +++ b/pkg/rpm/rpmbuild/SOURCES/COPYRIGHT.unit-jsc8 @@ -0,0 +1,25 @@ + + NGINX Unit. + + Copyright 2017-2019 NGINX, Inc. + Copyright 2017-2019 Igor Sysoev + Copyright 2017-2019 Valentin V. Bartenev + Copyright 2017-2019 Max Romanov + Copyright 2018-2019 Alexander Borisov + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + The unit-jsc8 package provides Java servlet container module + for NGINX Unit. + + Java is a registered trademark of Oracle and/or its affiliates. -- cgit From 1b0595c74c62a73741f96794651fe284e4c1ec86 Mon Sep 17 00:00:00 2001 From: Andrei Belov Date: Fri, 1 Mar 2019 18:16:57 +0300 Subject: Packages: added JSR-340 compatibility notice to unit-jsc packages. --- pkg/deb/Makefile.jsc-common | 4 +++- pkg/deb/Makefile.jsc10 | 18 ++++++++++++++++++ pkg/deb/Makefile.jsc11 | 18 ++++++++++++++++++ pkg/deb/Makefile.jsc8 | 18 ++++++++++++++++++ pkg/rpm/Makefile.jsc11 | 4 ++++ pkg/rpm/Makefile.jsc8 | 4 ++++ 6 files changed, 65 insertions(+), 1 deletion(-) (limited to 'pkg') diff --git a/pkg/deb/Makefile.jsc-common b/pkg/deb/Makefile.jsc-common index 902d60df..42fdb12f 100644 --- a/pkg/deb/Makefile.jsc-common +++ b/pkg/deb/Makefile.jsc-common @@ -20,7 +20,9 @@ cat < Date: Fri, 1 Mar 2019 18:23:39 +0300 Subject: Generated Dockerfiles for Unit 1.8.0. --- pkg/docker/Dockerfile.full | 2 +- pkg/docker/Dockerfile.go1.7-dev | 2 +- pkg/docker/Dockerfile.go1.8-dev | 2 +- pkg/docker/Dockerfile.minimal | 2 +- pkg/docker/Dockerfile.perl5.24 | 2 +- pkg/docker/Dockerfile.php7.0 | 2 +- pkg/docker/Dockerfile.python2.7 | 2 +- pkg/docker/Dockerfile.python3.5 | 2 +- pkg/docker/Dockerfile.ruby2.3 | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) (limited to 'pkg') diff --git a/pkg/docker/Dockerfile.full b/pkg/docker/Dockerfile.full index 99b18fc1..7e688710 100644 --- a/pkg/docker/Dockerfile.full +++ b/pkg/docker/Dockerfile.full @@ -2,7 +2,7 @@ FROM debian:stretch-slim LABEL maintainer="NGINX Docker Maintainers " -ENV UNIT_VERSION 1.7.1-1~stretch +ENV UNIT_VERSION 1.8.0-1~stretch RUN set -x \ && apt-get update \ diff --git a/pkg/docker/Dockerfile.go1.7-dev b/pkg/docker/Dockerfile.go1.7-dev index eb75e7b0..c0245ea7 100644 --- a/pkg/docker/Dockerfile.go1.7-dev +++ b/pkg/docker/Dockerfile.go1.7-dev @@ -2,7 +2,7 @@ FROM debian:stretch-slim LABEL maintainer="NGINX Docker Maintainers " -ENV UNIT_VERSION 1.7.1-1~stretch +ENV UNIT_VERSION 1.8.0-1~stretch RUN set -x \ && apt-get update \ diff --git a/pkg/docker/Dockerfile.go1.8-dev b/pkg/docker/Dockerfile.go1.8-dev index c60853ac..3c13c018 100644 --- a/pkg/docker/Dockerfile.go1.8-dev +++ b/pkg/docker/Dockerfile.go1.8-dev @@ -2,7 +2,7 @@ FROM debian:stretch-slim LABEL maintainer="NGINX Docker Maintainers " -ENV UNIT_VERSION 1.7.1-1~stretch +ENV UNIT_VERSION 1.8.0-1~stretch RUN set -x \ && apt-get update \ diff --git a/pkg/docker/Dockerfile.minimal b/pkg/docker/Dockerfile.minimal index f944da7f..b48f8410 100644 --- a/pkg/docker/Dockerfile.minimal +++ b/pkg/docker/Dockerfile.minimal @@ -2,7 +2,7 @@ FROM debian:stretch-slim LABEL maintainer="NGINX Docker Maintainers " -ENV UNIT_VERSION 1.7.1-1~stretch +ENV UNIT_VERSION 1.8.0-1~stretch RUN set -x \ && apt-get update \ diff --git a/pkg/docker/Dockerfile.perl5.24 b/pkg/docker/Dockerfile.perl5.24 index ee3ba4bf..4d5f502e 100644 --- a/pkg/docker/Dockerfile.perl5.24 +++ b/pkg/docker/Dockerfile.perl5.24 @@ -2,7 +2,7 @@ FROM debian:stretch-slim LABEL maintainer="NGINX Docker Maintainers " -ENV UNIT_VERSION 1.7.1-1~stretch +ENV UNIT_VERSION 1.8.0-1~stretch RUN set -x \ && apt-get update \ diff --git a/pkg/docker/Dockerfile.php7.0 b/pkg/docker/Dockerfile.php7.0 index 4468dafd..0afcf28a 100644 --- a/pkg/docker/Dockerfile.php7.0 +++ b/pkg/docker/Dockerfile.php7.0 @@ -2,7 +2,7 @@ FROM debian:stretch-slim LABEL maintainer="NGINX Docker Maintainers " -ENV UNIT_VERSION 1.7.1-1~stretch +ENV UNIT_VERSION 1.8.0-1~stretch RUN set -x \ && apt-get update \ diff --git a/pkg/docker/Dockerfile.python2.7 b/pkg/docker/Dockerfile.python2.7 index dec5d3cf..57619e26 100644 --- a/pkg/docker/Dockerfile.python2.7 +++ b/pkg/docker/Dockerfile.python2.7 @@ -2,7 +2,7 @@ FROM debian:stretch-slim LABEL maintainer="NGINX Docker Maintainers " -ENV UNIT_VERSION 1.7.1-1~stretch +ENV UNIT_VERSION 1.8.0-1~stretch RUN set -x \ && apt-get update \ diff --git a/pkg/docker/Dockerfile.python3.5 b/pkg/docker/Dockerfile.python3.5 index 0d93fb07..410f395c 100644 --- a/pkg/docker/Dockerfile.python3.5 +++ b/pkg/docker/Dockerfile.python3.5 @@ -2,7 +2,7 @@ FROM debian:stretch-slim LABEL maintainer="NGINX Docker Maintainers " -ENV UNIT_VERSION 1.7.1-1~stretch +ENV UNIT_VERSION 1.8.0-1~stretch RUN set -x \ && apt-get update \ diff --git a/pkg/docker/Dockerfile.ruby2.3 b/pkg/docker/Dockerfile.ruby2.3 index ff9474cc..7b674178 100644 --- a/pkg/docker/Dockerfile.ruby2.3 +++ b/pkg/docker/Dockerfile.ruby2.3 @@ -2,7 +2,7 @@ FROM debian:stretch-slim LABEL maintainer="NGINX Docker Maintainers " -ENV UNIT_VERSION 1.7.1-1~stretch +ENV UNIT_VERSION 1.8.0-1~stretch RUN set -x \ && apt-get update \ -- cgit