From 804a12fed0f1c534412f687f89e101b5cb5b97c8 Mon Sep 17 00:00:00 2001
From: Konstantin Pavlov <thresh@nginx.com>
Date: Mon, 20 May 2024 12:52:02 -0700
Subject: Packages: remove support for EOL Fedora versions (35-38)

---
 pkg/rpm/Makefile                                   | 28 -----------
 pkg/rpm/Makefile.python27                          |  2 +-
 pkg/rpm/Makefile.python310                         | 57 ----------------------
 pkg/rpm/Makefile.python311                         |  4 --
 pkg/rpm/Makefile.python36                          |  2 +-
 pkg/rpm/Makefile.python37                          |  2 +-
 pkg/rpm/Makefile.python39                          |  2 +-
 .../rpmbuild/SOURCES/unit.example-python310-config | 16 ------
 8 files changed, 4 insertions(+), 109 deletions(-)
 delete mode 100644 pkg/rpm/Makefile.python310
 delete mode 100644 pkg/rpm/rpmbuild/SOURCES/unit.example-python310-config

(limited to 'pkg')

diff --git a/pkg/rpm/Makefile b/pkg/rpm/Makefile
index 5d28fb2c..dad76e83 100644
--- a/pkg/rpm/Makefile
+++ b/pkg/rpm/Makefile
@@ -20,10 +20,6 @@ else ifeq ($(shell rpm --eval "%{?amzn}"), 2)
 OSVER = amazonlinux2
 else ifeq ($(shell rpm --eval "%{?amzn}"), 2023)
 OSVER = amazonlinux2023
-else ifeq ($(shell test `rpm --eval '0%{?fedora} -ge 35 -a 0%{?fedora} -le 36'`; echo $$?),0)
-OSVER = fedora
-else ifeq ($(shell test `rpm --eval '0%{?fedora} -ge 37 -a 0%{?fedora} -le 38'`; echo $$?),0)
-OSVER = fedora37
 else ifeq ($(shell test `rpm --eval '0%{?fedora} -ge 39'`; echo $$?),0)
 OSVER = fedora39
 endif
@@ -102,30 +98,6 @@ include Makefile.jsc17
 include Makefile.wasm
 endif
 
-ifeq ($(OSVER), fedora)
-include Makefile.php
-include Makefile.python310
-include Makefile.go
-include Makefile.perl
-include Makefile.ruby
-include Makefile.jsc-common
-include Makefile.jsc8
-include Makefile.jsc11
-include Makefile.wasm
-endif
-
-ifeq ($(OSVER), fedora37)
-include Makefile.php
-include Makefile.python311
-include Makefile.go
-include Makefile.perl
-include Makefile.ruby
-include Makefile.jsc-common
-include Makefile.jsc8
-include Makefile.jsc11
-include Makefile.wasm
-endif
-
 ifeq ($(OSVER), fedora39)
 include Makefile.php
 include Makefile.python312
diff --git a/pkg/rpm/Makefile.python27 b/pkg/rpm/Makefile.python27
index 3de5f634..1d59b81d 100644
--- a/pkg/rpm/Makefile.python27
+++ b/pkg/rpm/Makefile.python27
@@ -13,7 +13,7 @@ MODULE_INSTARGS_python27=	python2.7-install
 MODULE_SOURCES_python27=	unit.example-python-app \
 			unit.example-python27-config
 
-ifneq (,$(findstring $(OSVER),fedora centos8))
+ifneq (,$(findstring $(OSVER),centos8))
 BUILD_DEPENDS_python27=	python2-devel
 else ifneq (,$(findstring $(OSVER),centos7 amazonlinux2))
 BUILD_DEPENDS_python27=	python-devel
diff --git a/pkg/rpm/Makefile.python310 b/pkg/rpm/Makefile.python310
deleted file mode 100644
index 50731475..00000000
--- a/pkg/rpm/Makefile.python310
+++ /dev/null
@@ -1,57 +0,0 @@
-MODULES+=		python310
-MODULE_SUFFIX_python310=	python3.10
-
-MODULE_SUMMARY_python310=	Python 3.10 module for NGINX Unit
-
-MODULE_VERSION_python310=	$(VERSION)
-MODULE_RELEASE_python310=	1
-
-MODULE_CONFARGS_python310=	python --config=python3.10-config
-MODULE_MAKEARGS_python310=	python3.10
-MODULE_INSTARGS_python310=	python3.10-install
-
-MODULE_SOURCES_python310=	unit.example-python-app \
-			unit.example-python310-config
-
-ifneq (,$(findstring $(OSVER),fedora amazonlinux2))
-BUILD_DEPENDS_python310=	python3-devel
-else
-BUILD_DEPENDS_python310=	python310-devel
-endif
-
-BUILD_DEPENDS+=		$(BUILD_DEPENDS_python310)
-
-define MODULE_PREINSTALL_python310
-%{__mkdir} -p %{buildroot}%{_datadir}/doc/unit-python310/examples/python-app
-%{__install} -m 644 -p %{SOURCE100} \
-    %{buildroot}%{_datadir}/doc/unit-python310/examples/python-app/wsgi.py
-%{__install} -m 644 -p %{SOURCE101} \
-    %{buildroot}%{_datadir}/doc/unit-python310/examples/unit.config
-endef
-export MODULE_PREINSTALL_python310
-
-define MODULE_FILES_python310
-%{_libdir}/unit/modules/*
-%{_libdir}/unit/debug-modules/*
-endef
-export MODULE_FILES_python310
-
-define MODULE_POST_python310
-cat <<BANNER
-----------------------------------------------------------------------
-
-The $(MODULE_SUMMARY_python310) 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_python310
diff --git a/pkg/rpm/Makefile.python311 b/pkg/rpm/Makefile.python311
index ae58d722..10c9c69b 100644
--- a/pkg/rpm/Makefile.python311
+++ b/pkg/rpm/Makefile.python311
@@ -13,11 +13,7 @@ MODULE_INSTARGS_python311=	python3.11-install
 MODULE_SOURCES_python311=	unit.example-python-app \
 			unit.example-python311-config
 
-ifneq (,$(findstring $(OSVER),fedora37))
-BUILD_DEPENDS_python311=	python3-devel
-else
 BUILD_DEPENDS_python311=	python3.11-devel
-endif
 
 BUILD_DEPENDS+=		$(BUILD_DEPENDS_python311)
 
diff --git a/pkg/rpm/Makefile.python36 b/pkg/rpm/Makefile.python36
index c1fc8b6c..a9a97c9f 100644
--- a/pkg/rpm/Makefile.python36
+++ b/pkg/rpm/Makefile.python36
@@ -13,7 +13,7 @@ MODULE_INSTARGS_python36=	python3.6-install
 MODULE_SOURCES_python36=	unit.example-python-app \
 			unit.example-python36-config
 
-ifneq (,$(findstring $(OSVER),fedora centos7))
+ifneq (,$(findstring $(OSVER),centos7))
 BUILD_DEPENDS_python36=	python3-devel
 else
 BUILD_DEPENDS_python36=	python36-devel
diff --git a/pkg/rpm/Makefile.python37 b/pkg/rpm/Makefile.python37
index c0604fd9..1feae6a4 100644
--- a/pkg/rpm/Makefile.python37
+++ b/pkg/rpm/Makefile.python37
@@ -13,7 +13,7 @@ MODULE_INSTARGS_python37=	python3.7-install
 MODULE_SOURCES_python37=	unit.example-python-app \
 			unit.example-python37-config
 
-ifneq (,$(findstring $(OSVER),fedora amazonlinux2))
+ifneq (,$(findstring $(OSVER),amazonlinux2))
 BUILD_DEPENDS_python37=	python3-devel
 else
 BUILD_DEPENDS_python37=	python37-devel
diff --git a/pkg/rpm/Makefile.python39 b/pkg/rpm/Makefile.python39
index 7a3ae0b0..25f2a2a8 100644
--- a/pkg/rpm/Makefile.python39
+++ b/pkg/rpm/Makefile.python39
@@ -13,7 +13,7 @@ MODULE_INSTARGS_python39=	python3.9-install
 MODULE_SOURCES_python39=	unit.example-python-app \
 			unit.example-python39-config
 
-ifneq (,$(findstring $(OSVER),fedora amazonlinux2 amazonlinux2023 centos9))
+ifneq (,$(findstring $(OSVER),amazonlinux2 amazonlinux2023 centos9))
 BUILD_DEPENDS_python39=	python3-devel
 else
 BUILD_DEPENDS_python39=	python39-devel
diff --git a/pkg/rpm/rpmbuild/SOURCES/unit.example-python310-config b/pkg/rpm/rpmbuild/SOURCES/unit.example-python310-config
deleted file mode 100644
index 8a73ca53..00000000
--- a/pkg/rpm/rpmbuild/SOURCES/unit.example-python310-config
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"applications": {
-		"example_python": {
-			"type": "python 3.10",
-			"processes": 2,
-			"path": "/usr/share/doc/unit-python310/examples/python-app",
-			"module": "wsgi"
-		}
-	},
-
-	"listeners": {
-		"*:8400": {
-			"pass": "applications/example_python"
-		}
-	}
-}
-- 
cgit