diff options
23 files changed, 2 insertions, 795 deletions
diff --git a/pkg/deb/Makefile b/pkg/deb/Makefile index 52813e37..c4f085f8 100644 --- a/pkg/deb/Makefile +++ b/pkg/deb/Makefile @@ -49,21 +49,6 @@ include Makefile.jsc17 include Makefile.jsc18 endif -# Ubuntu 21.04 -ifeq ($(CODENAME),hirsute) -include Makefile.php -include Makefile.python27 -include Makefile.python39 -include Makefile.go -include Makefile.perl -include Makefile.ruby -include Makefile.jsc-common -include Makefile.jsc11 -include Makefile.jsc15 -include Makefile.jsc16 -include Makefile.jsc17 -endif - # Ubuntu 20.04 ifeq ($(CODENAME),focal) include Makefile.php diff --git a/pkg/deb/Makefile.jsc13 b/pkg/deb/Makefile.jsc13 deleted file mode 100644 index d22944dc..00000000 --- a/pkg/deb/Makefile.jsc13 +++ /dev/null @@ -1,71 +0,0 @@ -MODULES+= jsc13 -MODULE_SUFFIX_jsc13= jsc13 - -MODULE_SUMMARY_jsc13= Java 13 module for NGINX Unit - -MODULE_VERSION_jsc13= $(VERSION) -MODULE_RELEASE_jsc13= 1 - -MODULE_CONFARGS_jsc13= java --module=java13 --home=/usr/lib/jvm/java-13-openjdk-$$\(DEB_HOST_ARCH\) --jars=/usr/share/unit-jsc-common/ -MODULE_MAKEARGS_jsc13= java13 -MODULE_INSTARGS_jsc13= java13-install - -MODULE_SOURCES_jsc13= unit.example-jsc-app \ - unit.example-jsc13-config - -BUILD_DEPENDS_jsc13= openjdk-13-jdk-headless openjdk-13-jre-headless -BUILD_DEPENDS+= $(BUILD_DEPENDS_jsc13) - -MODULE_BUILD_DEPENDS_jsc13=,openjdk-13-jdk-headless -MODULE_DEPENDS_jsc13=,openjdk-13-jre-headless,unit-jsc-common (= $(MODULE_VERSION_jsc_common)-$(MODULE_RELEASE_jsc_common)~$(CODENAME)) - -define MODULE_PREINSTALL_jsc13 - mkdir -p debian/unit-jsc13/usr/share/doc/unit-jsc13/examples/jsc-app - install -m 644 -p debian/unit.example-jsc-app debian/unit-jsc13/usr/share/doc/unit-jsc13/examples/jsc-app/index.jsp - install -m 644 -p debian/unit.example-jsc13-config debian/unit-jsc13/usr/share/doc/unit-jsc13/examples/unit.config - install -m 644 -p src/java/README.JSR-340 debian/unit-jsc13/usr/share/doc/unit-jsc13/ -endef -export MODULE_PREINSTALL_jsc13 - -define MODULE_POSTINSTALL_jsc13 - cd $$\(BUILDDIR_unit\) \&\& \ - DESTDIR=$$\(INSTALLDIR\) make java-shared-uninstall -endef -export MODULE_POSTINSTALL_jsc13 - -define MODULE_POST_jsc13 -cat <<BANNER ----------------------------------------------------------------------- - -The $(MODULE_SUMMARY_jsc13) has been installed. - -To check out the sample app, run these commands: - - sudo service unit restart - cd /usr/share/doc/unit-$(MODULE_SUFFIX_jsc13)/examples - sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock http://localhost/config - curl http://localhost:8800/ - -Online documentation is available at https://unit.nginx.org - -NOTICE: - -This version of Unit code is made available in support of the open source -development process. This is an intermediate build made available for -testing purposes only. This Unit code is untested and presumed incompatible -with the JSR 340 Java Servlet 3.1 specification. You should not deploy or -write to this code. You should instead deploy and write production -applications on pre-built binaries that have been tested and certified -to meet the JSR-340 compatibility requirements such as certified binaries -published for the JSR-340 reference implementation available at -https://javaee.github.io/glassfish/. - -Redistribution of any Intermediate Build must retain this notice. - -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. - ----------------------------------------------------------------------- -BANNER -endef -export MODULE_POST_jsc13 diff --git a/pkg/deb/Makefile.jsc14 b/pkg/deb/Makefile.jsc14 deleted file mode 100644 index 9b53a385..00000000 --- a/pkg/deb/Makefile.jsc14 +++ /dev/null @@ -1,71 +0,0 @@ -MODULES+= jsc14 -MODULE_SUFFIX_jsc14= jsc14 - -MODULE_SUMMARY_jsc14= Java 14 module for NGINX Unit - -MODULE_VERSION_jsc14= $(VERSION) -MODULE_RELEASE_jsc14= 1 - -MODULE_CONFARGS_jsc14= java --module=java14 --home=/usr/lib/jvm/java-14-openjdk-$$\(DEB_HOST_ARCH\) --jars=/usr/share/unit-jsc-common/ -MODULE_MAKEARGS_jsc14= java14 -MODULE_INSTARGS_jsc14= java14-install - -MODULE_SOURCES_jsc14= unit.example-jsc-app \ - unit.example-jsc14-config - -BUILD_DEPENDS_jsc14= openjdk-14-jdk-headless openjdk-14-jre-headless -BUILD_DEPENDS+= $(BUILD_DEPENDS_jsc14) - -MODULE_BUILD_DEPENDS_jsc14=,openjdk-14-jdk-headless -MODULE_DEPENDS_jsc14=,openjdk-14-jre-headless,unit-jsc-common (= $(MODULE_VERSION_jsc_common)-$(MODULE_RELEASE_jsc_common)~$(CODENAME)) - -define MODULE_PREINSTALL_jsc14 - mkdir -p debian/unit-jsc14/usr/share/doc/unit-jsc14/examples/jsc-app - install -m 644 -p debian/unit.example-jsc-app debian/unit-jsc14/usr/share/doc/unit-jsc14/examples/jsc-app/index.jsp - install -m 644 -p debian/unit.example-jsc14-config debian/unit-jsc14/usr/share/doc/unit-jsc14/examples/unit.config - install -m 644 -p src/java/README.JSR-340 debian/unit-jsc14/usr/share/doc/unit-jsc14/ -endef -export MODULE_PREINSTALL_jsc14 - -define MODULE_POSTINSTALL_jsc14 - cd $$\(BUILDDIR_unit\) \&\& \ - DESTDIR=$$\(INSTALLDIR\) make java-shared-uninstall -endef -export MODULE_POSTINSTALL_jsc14 - -define MODULE_POST_jsc14 -cat <<BANNER ----------------------------------------------------------------------- - -The $(MODULE_SUMMARY_jsc14) has been installed. - -To check out the sample app, run these commands: - - sudo service unit restart - cd /usr/share/doc/unit-$(MODULE_SUFFIX_jsc14)/examples - sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock http://localhost/config - curl http://localhost:8800/ - -Online documentation is available at https://unit.nginx.org - -NOTICE: - -This version of Unit code is made available in support of the open source -development process. This is an intermediate build made available for -testing purposes only. This Unit code is untested and presumed incompatible -with the JSR 340 Java Servlet 3.1 specification. You should not deploy or -write to this code. You should instead deploy and write production -applications on pre-built binaries that have been tested and certified -to meet the JSR-340 compatibility requirements such as certified binaries -published for the JSR-340 reference implementation available at -https://javaee.github.io/glassfish/. - -Redistribution of any Intermediate Build must retain this notice. - -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. - ----------------------------------------------------------------------- -BANNER -endef -export MODULE_POST_jsc14 diff --git a/pkg/deb/Makefile.jsc15 b/pkg/deb/Makefile.jsc15 deleted file mode 100644 index 10b5505b..00000000 --- a/pkg/deb/Makefile.jsc15 +++ /dev/null @@ -1,71 +0,0 @@ -MODULES+= jsc15 -MODULE_SUFFIX_jsc15= jsc15 - -MODULE_SUMMARY_jsc15= Java 15 module for NGINX Unit - -MODULE_VERSION_jsc15= $(VERSION) -MODULE_RELEASE_jsc15= 1 - -MODULE_CONFARGS_jsc15= java --module=java15 --home=/usr/lib/jvm/java-15-openjdk-$$\(DEB_HOST_ARCH\) --jars=/usr/share/unit-jsc-common/ -MODULE_MAKEARGS_jsc15= java15 -MODULE_INSTARGS_jsc15= java15-install - -MODULE_SOURCES_jsc15= unit.example-jsc-app \ - unit.example-jsc15-config - -BUILD_DEPENDS_jsc15= openjdk-15-jdk-headless openjdk-15-jre-headless -BUILD_DEPENDS+= $(BUILD_DEPENDS_jsc15) - -MODULE_BUILD_DEPENDS_jsc15=,openjdk-15-jdk-headless -MODULE_DEPENDS_jsc15=,openjdk-15-jre-headless,unit-jsc-common (= $(MODULE_VERSION_jsc_common)-$(MODULE_RELEASE_jsc_common)~$(CODENAME)) - -define MODULE_PREINSTALL_jsc15 - mkdir -p debian/unit-jsc15/usr/share/doc/unit-jsc15/examples/jsc-app - install -m 644 -p debian/unit.example-jsc-app debian/unit-jsc15/usr/share/doc/unit-jsc15/examples/jsc-app/index.jsp - install -m 644 -p debian/unit.example-jsc15-config debian/unit-jsc15/usr/share/doc/unit-jsc15/examples/unit.config - install -m 644 -p src/java/README.JSR-340 debian/unit-jsc15/usr/share/doc/unit-jsc15/ -endef -export MODULE_PREINSTALL_jsc15 - -define MODULE_POSTINSTALL_jsc15 - cd $$\(BUILDDIR_unit\) \&\& \ - DESTDIR=$$\(INSTALLDIR\) make java-shared-uninstall -endef -export MODULE_POSTINSTALL_jsc15 - -define MODULE_POST_jsc15 -cat <<BANNER ----------------------------------------------------------------------- - -The $(MODULE_SUMMARY_jsc15) has been installed. - -To check out the sample app, run these commands: - - sudo service unit restart - cd /usr/share/doc/unit-$(MODULE_SUFFIX_jsc15)/examples - sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock http://localhost/config - curl http://localhost:8800/ - -Online documentation is available at https://unit.nginx.org - -NOTICE: - -This version of Unit code is made available in support of the open source -development process. This is an intermediate build made available for -testing purposes only. This Unit code is untested and presumed incompatible -with the JSR 340 Java Servlet 3.1 specification. You should not deploy or -write to this code. You should instead deploy and write production -applications on pre-built binaries that have been tested and certified -to meet the JSR-340 compatibility requirements such as certified binaries -published for the JSR-340 reference implementation available at -https://javaee.github.io/glassfish/. - -Redistribution of any Intermediate Build must retain this notice. - -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. - ----------------------------------------------------------------------- -BANNER -endef -export MODULE_POST_jsc15 diff --git a/pkg/deb/Makefile.python b/pkg/deb/Makefile.python deleted file mode 100644 index 9bf02bac..00000000 --- a/pkg/deb/Makefile.python +++ /dev/null @@ -1,46 +0,0 @@ -MODULES+= python -MODULE_SUFFIX_python= python - -MODULE_SUMMARY_python= Python module for NGINX Unit - -MODULE_VERSION_python= $(VERSION) -MODULE_RELEASE_python= 1 - -MODULE_CONFARGS_python= python -MODULE_MAKEARGS_python= python -MODULE_INSTARGS_python= python-install - -MODULE_SOURCES_python= unit.example-python-app \ - unit.example-python-config - -BUILD_DEPENDS_python= python-dev -BUILD_DEPENDS+= $(BUILD_DEPENDS_python) - -MODULE_BUILD_DEPENDS_python=,python-dev - -define MODULE_PREINSTALL_python - mkdir -p debian/unit-python/usr/share/doc/unit-python/examples/python-app - install -m 644 -p debian/unit.example-python-app debian/unit-python/usr/share/doc/unit-python/examples/python-app/wsgi.py - install -m 644 -p debian/unit.example-python-config debian/unit-python/usr/share/doc/unit-python/examples/unit.config -endef -export MODULE_PREINSTALL_python - -define MODULE_POST_python -cat <<BANNER ----------------------------------------------------------------------- - -The $(MODULE_SUMMARY_python) has been installed. - -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 http://localhost/config - curl http://localhost:8400/ - -Online documentation is available at https://unit.nginx.org - ----------------------------------------------------------------------- -BANNER -endef -export MODULE_POST_python diff --git a/pkg/deb/Makefile.python34 b/pkg/deb/Makefile.python34 deleted file mode 100644 index 03c496bd..00000000 --- a/pkg/deb/Makefile.python34 +++ /dev/null @@ -1,46 +0,0 @@ -MODULES+= python34 -MODULE_SUFFIX_python34= python3.4 - -MODULE_SUMMARY_python34= Python 3.4 module for NGINX Unit - -MODULE_VERSION_python34= $(VERSION) -MODULE_RELEASE_python34= 1 - -MODULE_CONFARGS_python34= python --config=python3.4-config -MODULE_MAKEARGS_python34= python3.4 -MODULE_INSTARGS_python34= python3.4-install - -MODULE_SOURCES_python34= unit.example-python-app \ - unit.example-python3.4-config - -BUILD_DEPENDS_python34= python3.4-dev -BUILD_DEPENDS+= $(BUILD_DEPENDS_python34) - -MODULE_BUILD_DEPENDS_python34=,python3.4-dev - -define MODULE_PREINSTALL_python34 - mkdir -p debian/unit-python3.4/usr/share/doc/unit-python3.4/examples/python-app - install -m 644 -p debian/unit.example-python-app debian/unit-python3.4/usr/share/doc/unit-python3.4/examples/python-app/wsgi.py - install -m 644 -p debian/unit.example-python3.4-config debian/unit-python3.4/usr/share/doc/unit-python3.4/examples/unit.config -endef -export MODULE_PREINSTALL_python34 - -define MODULE_POST_python34 -cat <<BANNER ----------------------------------------------------------------------- - -The $(MODULE_SUMMARY_python34) has been installed. - -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 http://localhost/config - curl http://localhost:8400/ - -Online documentation is available at https://unit.nginx.org - ----------------------------------------------------------------------- -BANNER -endef -export MODULE_POST_python34 diff --git a/pkg/deb/Makefile.python35 b/pkg/deb/Makefile.python35 deleted file mode 100644 index 514a4bf6..00000000 --- a/pkg/deb/Makefile.python35 +++ /dev/null @@ -1,46 +0,0 @@ -MODULES+= python35 -MODULE_SUFFIX_python35= python3.5 - -MODULE_SUMMARY_python35= Python 3.5 module for NGINX Unit - -MODULE_VERSION_python35= $(VERSION) -MODULE_RELEASE_python35= 1 - -MODULE_CONFARGS_python35= python --config=python3.5-config -MODULE_MAKEARGS_python35= python3.5 -MODULE_INSTARGS_python35= python3.5-install - -MODULE_SOURCES_python35= unit.example-python-app \ - unit.example-python3.5-config - -BUILD_DEPENDS_python35= python3.5-dev -BUILD_DEPENDS+= $(BUILD_DEPENDS_python35) - -MODULE_BUILD_DEPENDS_python35=,python3.5-dev - -define MODULE_PREINSTALL_python35 - mkdir -p debian/unit-python3.5/usr/share/doc/unit-python3.5/examples/python-app - install -m 644 -p debian/unit.example-python-app debian/unit-python3.5/usr/share/doc/unit-python3.5/examples/python-app/wsgi.py - install -m 644 -p debian/unit.example-python3.5-config debian/unit-python3.5/usr/share/doc/unit-python3.5/examples/unit.config -endef -export MODULE_PREINSTALL_python35 - -define MODULE_POST_python35 -cat <<BANNER ----------------------------------------------------------------------- - -The $(MODULE_SUMMARY_python35) has been installed. - -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 http://localhost/config - curl http://localhost:8400/ - -Online documentation is available at https://unit.nginx.org - ----------------------------------------------------------------------- -BANNER -endef -export MODULE_POST_python35 diff --git a/pkg/deb/debian.module/copyright.unit-jsc10 b/pkg/deb/debian.module/copyright.unit-jsc10 deleted file mode 100644 index 42dbd3b9..00000000 --- a/pkg/deb/debian.module/copyright.unit-jsc10 +++ /dev/null @@ -1,33 +0,0 @@ - - NGINX Unit. - - Copyright 2017-2022 NGINX, Inc. - Copyright 2017-2022 Valentin V. Bartenev - Copyright 2017-2022 Max Romanov - Copyright 2017-2022 Andrei Zeliankou - Copyright 2018-2022 Konstantin Pavlov - Copyright 2021-2022 Zhidao Hong - Copyright 2021-2022 Oisín Canty - Copyright 2017-2021 Igor Sysoev - Copyright 2017-2021 Andrei Belov - Copyright 2019-2021 Tiago Natel de Moura - Copyright 2019-2020 Axel Duch - Copyright 2018-2019 Alexander Borisov - - Licensed under the Apache License, Version 2.0 (the "License"); - 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/unit.example-jsc10-config b/pkg/deb/debian.module/unit.example-jsc10-config deleted file mode 100644 index 969491e5..00000000 --- a/pkg/deb/debian.module/unit.example-jsc10-config +++ /dev/null @@ -1,15 +0,0 @@ -{ - "applications": { - "example_java10": { - "processes": 1, - "type": "java 10", - "webapp": "/usr/share/doc/unit-jsc10/examples/jsc-app" - } - }, - - "listeners": { - "*:8800": { - "pass": "applications/example_java10" - } - } -} diff --git a/pkg/deb/debian.module/unit.example-jsc13-config b/pkg/deb/debian.module/unit.example-jsc13-config deleted file mode 100644 index ac0b1db6..00000000 --- a/pkg/deb/debian.module/unit.example-jsc13-config +++ /dev/null @@ -1,15 +0,0 @@ -{ - "applications": { - "example_java13": { - "processes": 1, - "type": "java 13", - "webapp": "/usr/share/doc/unit-jsc13/examples/jsc-app" - } - }, - - "listeners": { - "*:8800": { - "pass": "applications/example_java13" - } - } -} diff --git a/pkg/deb/debian.module/unit.example-jsc14-config b/pkg/deb/debian.module/unit.example-jsc14-config deleted file mode 100644 index 76109835..00000000 --- a/pkg/deb/debian.module/unit.example-jsc14-config +++ /dev/null @@ -1,15 +0,0 @@ -{ - "applications": { - "example_java14": { - "processes": 1, - "type": "java 14", - "webapp": "/usr/share/doc/unit-jsc14/examples/jsc-app" - } - }, - - "listeners": { - "*:8800": { - "pass": "applications/example_java14" - } - } -} diff --git a/pkg/deb/debian.module/unit.example-jsc15-config b/pkg/deb/debian.module/unit.example-jsc15-config deleted file mode 100644 index 9f9aec15..00000000 --- a/pkg/deb/debian.module/unit.example-jsc15-config +++ /dev/null @@ -1,15 +0,0 @@ -{ - "applications": { - "example_java15": { - "processes": 1, - "type": "java 15", - "webapp": "/usr/share/doc/unit-jsc15/examples/jsc-app" - } - }, - - "listeners": { - "*:8800": { - "pass": "applications/example_java15" - } - } -} diff --git a/pkg/deb/debian.module/unit.example-jsc9-config b/pkg/deb/debian.module/unit.example-jsc9-config deleted file mode 100644 index a8faa268..00000000 --- a/pkg/deb/debian.module/unit.example-jsc9-config +++ /dev/null @@ -1,15 +0,0 @@ -{ - "applications": { - "example_java9": { - "processes": 1, - "type": "java 9", - "webapp": "/usr/share/doc/unit-jsc9/examples/jsc-app" - } - }, - - "listeners": { - "*:8800": { - "pass": "applications/example_java9" - } - } -} diff --git a/pkg/deb/debian.module/unit.example-python-config b/pkg/deb/debian.module/unit.example-python-config deleted file mode 100644 index b3d3a2e5..00000000 --- a/pkg/deb/debian.module/unit.example-python-config +++ /dev/null @@ -1,16 +0,0 @@ -{ - "applications": { - "example_python": { - "type": "python", - "processes": 2, - "path": "/usr/share/doc/unit-python/examples/python-app", - "module": "wsgi" - } - }, - - "listeners": { - "*:8400": { - "pass": "applications/example_python" - } - } -} diff --git a/pkg/deb/debian.module/unit.example-python3.4-config b/pkg/deb/debian.module/unit.example-python3.4-config deleted file mode 100644 index e6d90acf..00000000 --- a/pkg/deb/debian.module/unit.example-python3.4-config +++ /dev/null @@ -1,16 +0,0 @@ -{ - "applications": { - "example_python": { - "type": "python 3.4", - "processes": 2, - "path": "/usr/share/doc/unit-python3.4/examples/python-app", - "module": "wsgi" - } - }, - - "listeners": { - "*:8400": { - "pass": "applications/example_python" - } - } -} diff --git a/pkg/deb/debian.module/unit.example-python3.5-config b/pkg/deb/debian.module/unit.example-python3.5-config deleted file mode 100644 index 480327ec..00000000 --- a/pkg/deb/debian.module/unit.example-python3.5-config +++ /dev/null @@ -1,16 +0,0 @@ -{ - "applications": { - "example_python": { - "type": "python 3.5", - "processes": 2, - "path": "/usr/share/doc/unit-python3.5/examples/python-app", - "module": "wsgi" - } - }, - - "listeners": { - "*:8400": { - "pass": "applications/example_python" - } - } -} diff --git a/pkg/rpm/Makefile b/pkg/rpm/Makefile index a360b36e..a6b2955b 100644 --- a/pkg/rpm/Makefile +++ b/pkg/rpm/Makefile @@ -10,16 +10,12 @@ RELEASE ?= $(DEFAULT_RELEASE) PACKAGE_VENDOR = NGINX Packaging <nginx-packaging@f5.com> -ifeq ($(shell test `rpm --eval '0%{?rhel} -eq 6 -a 0%{?amzn} -eq 0'`; echo $$?), 0) -OSVER = centos6 -else ifeq ($(shell test `rpm --eval '0%{?rhel} -eq 7 -a 0%{?amzn} -eq 0'`; echo $$?), 0) +ifeq ($(shell test `rpm --eval '0%{?rhel} -eq 7 -a 0%{?amzn} -eq 0'`; echo $$?), 0) OSVER = centos7 else ifeq ($(shell rpm --eval "%{?rhel}"), 8) OSVER = centos8 else ifeq ($(shell rpm --eval "%{?rhel}"), 9) OSVER = centos9 -else ifeq ($(shell rpm --eval "%{?amzn}"), 1) -OSVER = amazonlinux1 else ifeq ($(shell rpm --eval "%{?amzn}"), 2) OSVER = amazonlinux2 else ifeq ($(shell test `rpm --eval '0%{?suse_version} -ge 1315 -a 0%{?suse_version} -lt 1330 -a 0%{?is_opensuse} -eq 1'`; echo $$?), 0) @@ -28,7 +24,7 @@ else ifeq ($(shell test `rpm --eval '0%{?suse_version} -ge 1330 -a 0%{?is_opensu OSVER = opensuse-tumbleweed else ifeq ($(shell test `rpm --eval '0%{?suse_version} -ge 1315 -a 0%{?is_opensuse} -eq 0'`; echo $$?), 0) OSVER = sles -else ifeq ($(shell test `rpm --eval '0%{?fedora} -ge 26'`; echo $$?),0) +else ifeq ($(shell test `rpm --eval '0%{?fedora} -ge 35'`; echo $$?),0) OSVER = fedora endif @@ -38,10 +34,6 @@ ifeq ($(OSVER), centos7) BUILD_DEPENDS_unit += which endif -ifeq ($(OSVER), amazonlinux1) -BUILD_DEPENDS_unit += system-rpm-config -endif - ifneq (,$(findstring $(OSVER),opensuse-leap opensuse-tumbleweed sles)) BUILD_DEPENDS_unit += libxml2-tools libxslt1 libopenssl-devel else @@ -56,14 +48,6 @@ BUILD_DEPENDS = $(BUILD_DEPENDS_unit) MODULES= -ifeq ($(OSVER), centos6) -include Makefile.php -include Makefile.python -include Makefile.go -include Makefile.jsc-common -include Makefile.jsc8 -endif - ifeq ($(OSVER), centos7) include Makefile.php include Makefile.python27 @@ -96,18 +80,6 @@ include Makefile.jsc8 include Makefile.jsc11 endif -ifeq ($(OSVER), amazonlinux1) -include Makefile.php -include Makefile.python27 -include Makefile.python34 -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.python27 @@ -143,20 +115,7 @@ endif ifeq ($(OSVER), fedora) include Makefile.php -ifeq ($(shell test `rpm --eval '0%{?fedora} -lt 32'`; echo $$?),0) -include Makefile.python27 -endif -ifeq ($(shell test `rpm --eval '0%{?fedora} -ge 35'`; echo $$?),0) include Makefile.python310 -else ifeq ($(shell test `rpm --eval '0%{?fedora} -ge 33'`; echo $$?),0) -include Makefile.python39 -else ifeq ($(shell test `rpm --eval '0%{?fedora} -ge 32'`; echo $$?),0) -include Makefile.python38 -else 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.python b/pkg/rpm/Makefile.python deleted file mode 100644 index 334d62c1..00000000 --- a/pkg/rpm/Makefile.python +++ /dev/null @@ -1,57 +0,0 @@ -MODULES+= python -MODULE_SUFFIX_python= python - -MODULE_SUMMARY_python= Python module for NGINX Unit - -MODULE_VERSION_python= $(VERSION) -MODULE_RELEASE_python= 1 - -MODULE_CONFARGS_python= python -MODULE_MAKEARGS_python= python -MODULE_INSTARGS_python= python-install - -MODULE_SOURCES_python= unit.example-python-app \ - unit.example-python-config - -ifeq ($(shell rpm --eval "%{?amzn}"), 1) -BUILD_DEPENDS_python= python26-devel -else -BUILD_DEPENDS_python= python-devel -endif - -BUILD_DEPENDS+= $(BUILD_DEPENDS_python) - -define MODULE_PREINSTALL_python -%{__mkdir} -p %{buildroot}%{_datadir}/doc/unit-python/examples/python-app -%{__install} -m 644 -p %{SOURCE100} \ - %{buildroot}%{_datadir}/doc/unit-python/examples/python-app/wsgi.py -%{__install} -m 644 -p %{SOURCE101} \ - %{buildroot}%{_datadir}/doc/unit-python/examples/unit.config -endef -export MODULE_PREINSTALL_python - -define MODULE_FILES_python -%{_libdir}/unit/modules/* -%{_libdir}/unit/debug-modules/* -endef -export MODULE_FILES_python - -define MODULE_POST_python -cat <<BANNER ----------------------------------------------------------------------- - -The $(MODULE_SUMMARY_python) has been installed. - -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/unit/control.sock http://localhost/config - curl http://localhost:8400/ - -Online documentation is available at https://unit.nginx.org - ----------------------------------------------------------------------- -BANNER -endef -export MODULE_POST_python diff --git a/pkg/rpm/Makefile.python35 b/pkg/rpm/Makefile.python35 deleted file mode 100644 index 6f866771..00000000 --- a/pkg/rpm/Makefile.python35 +++ /dev/null @@ -1,52 +0,0 @@ -MODULES+= python35 -MODULE_SUFFIX_python35= python3.5 - -MODULE_SUMMARY_python35= Python 3.5 module for NGINX Unit - -MODULE_VERSION_python35= $(VERSION) -MODULE_RELEASE_python35= 1 - -MODULE_CONFARGS_python35= python --config=python3.5-config -MODULE_MAKEARGS_python35= python3.5 -MODULE_INSTARGS_python35= python3.5-install - -MODULE_SOURCES_python35= unit.example-python-app \ - unit.example-python35-config - -BUILD_DEPENDS_python35= python35-devel -BUILD_DEPENDS+= $(BUILD_DEPENDS_python35) - -define MODULE_PREINSTALL_python35 -%{__mkdir} -p %{buildroot}%{_datadir}/doc/unit-python35/examples/python-app -%{__install} -m 644 -p %{SOURCE100} \ - %{buildroot}%{_datadir}/doc/unit-python35/examples/python-app/wsgi.py -%{__install} -m 644 -p %{SOURCE101} \ - %{buildroot}%{_datadir}/doc/unit-python35/examples/unit.config -endef -export MODULE_PREINSTALL_python35 - -define MODULE_FILES_python35 -%{_libdir}/unit/modules/* -%{_libdir}/unit/debug-modules/* -endef -export MODULE_FILES_python35 - -define MODULE_POST_python35 -cat <<BANNER ----------------------------------------------------------------------- - -The $(MODULE_SUMMARY_python35) has been installed. - -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/unit/control.sock http://localhost/config - curl http://localhost:8400/ - -Online documentation is available at https://unit.nginx.org - ----------------------------------------------------------------------- -BANNER -endef -export MODULE_POST_python35 diff --git a/pkg/rpm/Makefile.python38 b/pkg/rpm/Makefile.python38 deleted file mode 100644 index ffcca07f..00000000 --- a/pkg/rpm/Makefile.python38 +++ /dev/null @@ -1,57 +0,0 @@ -MODULES+= python38 -MODULE_SUFFIX_python38= python3.8 - -MODULE_SUMMARY_python38= Python 3.8 module for NGINX Unit - -MODULE_VERSION_python38= $(VERSION) -MODULE_RELEASE_python38= 1 - -MODULE_CONFARGS_python38= python --config=python3.8-config -MODULE_MAKEARGS_python38= python3.8 -MODULE_INSTARGS_python38= python3.8-install - -MODULE_SOURCES_python38= unit.example-python-app \ - unit.example-python38-config - -ifneq (,$(findstring $(OSVER),opensuse-tumbleweed sles fedora amazonlinux2)) -BUILD_DEPENDS_python38= python3-devel -else -BUILD_DEPENDS_python38= python38-devel -endif - -BUILD_DEPENDS+= $(BUILD_DEPENDS_python38) - -define MODULE_PREINSTALL_python38 -%{__mkdir} -p %{buildroot}%{_datadir}/doc/unit-python38/examples/python-app -%{__install} -m 644 -p %{SOURCE100} \ - %{buildroot}%{_datadir}/doc/unit-python38/examples/python-app/wsgi.py -%{__install} -m 644 -p %{SOURCE101} \ - %{buildroot}%{_datadir}/doc/unit-python38/examples/unit.config -endef -export MODULE_PREINSTALL_python38 - -define MODULE_FILES_python38 -%{_libdir}/unit/modules/* -%{_libdir}/unit/debug-modules/* -endef -export MODULE_FILES_python38 - -define MODULE_POST_python38 -cat <<BANNER ----------------------------------------------------------------------- - -The $(MODULE_SUMMARY_python38) has been installed. - -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/unit/control.sock http://localhost/config - curl http://localhost:8400/ - -Online documentation is available at https://unit.nginx.org - ----------------------------------------------------------------------- -BANNER -endef -export MODULE_POST_python38 diff --git a/pkg/rpm/rpmbuild/SOURCES/COPYRIGHT.unit-jsc10 b/pkg/rpm/rpmbuild/SOURCES/COPYRIGHT.unit-jsc10 deleted file mode 100644 index c7860e4b..00000000 --- a/pkg/rpm/rpmbuild/SOURCES/COPYRIGHT.unit-jsc10 +++ /dev/null @@ -1,32 +0,0 @@ - - NGINX Unit. - - Copyright 2017-2022 NGINX, Inc. - Copyright 2017-2022 Valentin V. Bartenev - Copyright 2017-2022 Max Romanov - Copyright 2017-2022 Andrei Zeliankou - Copyright 2018-2022 Konstantin Pavlov - Copyright 2021-2022 Zhidao Hong - Copyright 2021-2022 Oisín Canty - Copyright 2017-2021 Igor Sysoev - Copyright 2017-2021 Andrei Belov - Copyright 2019-2021 Tiago Natel de Moura - Copyright 2019-2020 Axel Duch - Copyright 2018-2019 Alexander Borisov - - Licensed under the Apache License, Version 2.0 (the "License"); - 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/unit.example-python35-config b/pkg/rpm/rpmbuild/SOURCES/unit.example-python35-config deleted file mode 100644 index f9923a49..00000000 --- a/pkg/rpm/rpmbuild/SOURCES/unit.example-python35-config +++ /dev/null @@ -1,16 +0,0 @@ -{ - "applications": { - "example_python": { - "type": "python 3.5", - "processes": 2, - "path": "/usr/share/doc/unit-python35/examples/python-app", - "module": "wsgi" - } - }, - - "listeners": { - "*:8400": { - "pass": "applications/example_python" - } - } -} diff --git a/pkg/rpm/rpmbuild/SOURCES/unit.example-python38-config b/pkg/rpm/rpmbuild/SOURCES/unit.example-python38-config deleted file mode 100644 index c98d1a52..00000000 --- a/pkg/rpm/rpmbuild/SOURCES/unit.example-python38-config +++ /dev/null @@ -1,16 +0,0 @@ -{ - "applications": { - "example_python": { - "type": "python 3.8", - "processes": 2, - "path": "/usr/share/doc/unit-python38/examples/python-app", - "module": "wsgi" - } - }, - - "listeners": { - "*:8400": { - "pass": "applications/example_python" - } - } -} |