From 90c30d0847965a8fdfafa3257c573dc312dcc65c Mon Sep 17 00:00:00 2001 From: Renbo Date: Wed, 5 Jun 2024 15:50:43 +0800 Subject: [PATCH 1/3] update to ansible-core-2.16.3-2.src.rpm Signed-off-by: Renbo --- ...modify-judgment-condition-of-version.patch | 26 ------------ ansible-core.spec | 40 ++++++++----------- download | 4 +- remove-bundled-deps-from-requirements.patch | 7 +--- 4 files changed, 21 insertions(+), 56 deletions(-) delete mode 100644 1000-modify-judgment-condition-of-version.patch diff --git a/1000-modify-judgment-condition-of-version.patch b/1000-modify-judgment-condition-of-version.patch deleted file mode 100644 index 45c5709..0000000 --- a/1000-modify-judgment-condition-of-version.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 8e28b12ca36e66eda887236055680bb7f974817c Mon Sep 17 00:00:00 2001 -From: wb-zh951434 -Date: Thu, 18 Jan 2024 14:39:52 +0800 -Subject: [PATCH] modify judgment condition of version - -Signed-off-by: wb-zh951434 ---- - lib/ansible/compat/importlib_resources.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/ansible/compat/importlib_resources.py b/lib/ansible/compat/importlib_resources.py -index ed104d6..324d7bf 100644 ---- a/lib/ansible/compat/importlib_resources.py -+++ b/lib/ansible/compat/importlib_resources.py -@@ -8,7 +8,7 @@ import sys - - HAS_IMPORTLIB_RESOURCES = False - --if sys.version_info < (3, 10): -+if sys.version_info < (3, 7): - try: - from importlib_resources import files # type: ignore[import] # pylint: disable=unused-import - except ImportError: --- -2.31.1 - diff --git a/ansible-core.spec b/ansible-core.spec index 969cccd..3098da4 100644 --- a/ansible-core.spec +++ b/ansible-core.spec @@ -1,6 +1,5 @@ -%define anolis_release .0.2 -%global __python3 /usr/bin/python3.9 -%global python3_pkgversion 39 +%global __python3 /usr/bin/python3.12 +%global python3_pkgversion 3.12 # We need this because we are no longer noarch, since our bundled deps might # conceivably need to compile arch-specific things. But we currently have no @@ -38,8 +37,8 @@ Name: ansible-core Summary: SSH-based configuration management, deployment, and task execution system -Version: 2.15.3 -Release: 1%{anolis_release}%{?dist} +Version: 2.16.3 +Release: 2%{?dist} ExcludeArch: i686 Group: Development/Libraries @@ -59,7 +58,6 @@ Source7: https://files.pythonhosted.org/packages/source/r/resolvelib/resolvelib- Source8: https://sourceforge.net/projects/docutils/files/docutils/%{docutils_version}/docutils-%{docutils_version}.tar.gz Patch0: remove-bundled-deps-from-requirements.patch -Patch1000: 1000-modify-judgment-condition-of-version.patch URL: http://ansible.com @@ -118,18 +116,9 @@ are transferred to managed machines automatically. This package installs the ansible-test command for testing modules and plugins developed for ansible. -%package doc -Summary: Documents for %{name} -BuildArch: noarch -Requires: %{name} = %{version}-%{release} - -%description doc -Doc pages for %{name}. - %prep %setup -q -b1 -b3 -b4 -b5 -b6 -b7 -b8 -n ansible-core-%{version} %patch0 -p1 -%patch1000 -p1 # Fix all Python shebangs recursively in ansible-test %{py3_shebang_fix} test/lib/ansible_test @@ -208,6 +197,7 @@ strip --strip-unneeded %{vendor_path}/markupsafe/_speedups%{python3_ext_suffix} %{_bindir}/ansible* %exclude %{_bindir}/ansible-test %config(noreplace) %{_sysconfdir}/ansible/ +%doc README.md PKG-INFO COPYING %doc changelogs/CHANGELOG-v2.*.rst %doc %{_mandir}/man1/ansible* %{_datadir}/ansible/ @@ -219,16 +209,20 @@ strip --strip-unneeded %{vendor_path}/markupsafe/_speedups%{python3_ext_suffix} %{_bindir}/ansible-test %{python3_sitelib}/ansible_test -%files doc -%doc README.md PKG-INFO COPYING - %changelog -* Thu Jan 18 2024 Zhao Hang - 2.15.3-1.0.2 -- Modify judgment condition of version +* Mon Feb 05 2024 Dimitri Savineau - 2.16.3-2 +- rebuild with python 3.12 (RHEL-24141) + +* Fri Feb 02 2024 Dimitri Savineau - 2.16.3-1 +- ansible-core 2.16.3 release (RHEL-23782) +- Fix CVE-2024-0690 (possible information leak in tasks that ignore + ANSIBLE_NO_LOG configuration) (RHEL-22123) + +* Tue Dec 12 2023 Dimitri Savineau - 2.16.2-1 +- ansible-core 2.16.2 release (RHEL-19297) -* Wed Dec 06 2023 Bo Ren - 2.15.3-1.0.1 -- Add doc sub package -- Update python version (Zhao Hang) +* Thu Dec 07 2023 Dimitri Savineau - 2.16.1-1 +- ansible-core 2.16.1 release (RHEL-18965) * Wed Aug 16 2023 Dimitri Savineau - 2.15.3-1 - ansible-core 2.15.3 release (rhbz#2232431) diff --git a/download b/download index f5d6fe6..0438510 100644 --- a/download +++ b/download @@ -1,5 +1,5 @@ -8a973daaad91bb051f434765155b4e53 ansible-core-2.15.3.tar.gz -e6fd6985c25b1005b0501c324de1e961 ansible-documentation-2.15.3.tar.gz +507946329f7de4cde162809d042f315a ansible-core-2.16.3.tar.gz +8847c10eda0a25c93831e869c4f6b19d ansible-documentation-2.16.3.tar.gz 93bcfe0065cf1d0b6a0bcabeca7a2335 docutils-0.20.1.tar.gz d31148abd89c1df1cdb077a55db27d02 Jinja2-3.1.2.tar.gz 02f337b98aef11bd0fee9c5ae860173b MarkupSafe-2.1.2.tar.gz diff --git a/remove-bundled-deps-from-requirements.patch b/remove-bundled-deps-from-requirements.patch index 8000217..27c3f99 100644 --- a/remove-bundled-deps-from-requirements.patch +++ b/remove-bundled-deps-from-requirements.patch @@ -1,8 +1,8 @@ diff --git a/requirements.txt b/requirements.txt -index a07aa98506..ef189d6594 100644 +index 5eaf9f2cbc..792daa209a 100644 --- a/requirements.txt +++ b/requirements.txt -@@ -3,16 +3,8 @@ +@@ -3,13 +3,5 @@ # packages. Thus, this should be the loosest set possible (only required # packages, not optional ones, and with the widest range of versions that could # be suitable) @@ -10,9 +10,6 @@ index a07aa98506..ef189d6594 100644 PyYAML >= 5.1 # PyYAML 5.1 is required for Python 3.8+ support cryptography -packaging - # importlib.resources in stdlib for py3.9 is lacking native hooks for - # importlib.resources.files - importlib_resources >= 5.0, < 5.1; python_version < '3.10' -# NOTE: resolvelib 0.x version bumps should be considered major/breaking -# NOTE: and we should update the upper cap with care, at least until 1.0 -# NOTE: Ref: https://github.com/sarugaku/resolvelib/issues/69 -- Gitee From 3257004efcdbc28e55b8c19c0040d63ffc24051e Mon Sep 17 00:00:00 2001 From: Bo Ren Date: Fri, 15 Jul 2022 14:34:36 +0800 Subject: [PATCH 2/3] add doc sub package --- ansible-core.spec | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/ansible-core.spec b/ansible-core.spec index 3098da4..dd94a9b 100644 --- a/ansible-core.spec +++ b/ansible-core.spec @@ -1,3 +1,4 @@ +%define anolis_release .0.1 %global __python3 /usr/bin/python3.12 %global python3_pkgversion 3.12 @@ -38,7 +39,7 @@ Name: ansible-core Summary: SSH-based configuration management, deployment, and task execution system Version: 2.16.3 -Release: 2%{?dist} +Release: 2%{anolis_release}%{?dist} ExcludeArch: i686 Group: Development/Libraries @@ -116,6 +117,14 @@ are transferred to managed machines automatically. This package installs the ansible-test command for testing modules and plugins developed for ansible. +%package doc +Summary: Documents for %{name} +BuildArch: noarch +Requires: %{name} = %{version}-%{release} + +%description doc +Doc pages for %{name}. + %prep %setup -q -b1 -b3 -b4 -b5 -b6 -b7 -b8 -n ansible-core-%{version} %patch0 -p1 @@ -197,7 +206,6 @@ strip --strip-unneeded %{vendor_path}/markupsafe/_speedups%{python3_ext_suffix} %{_bindir}/ansible* %exclude %{_bindir}/ansible-test %config(noreplace) %{_sysconfdir}/ansible/ -%doc README.md PKG-INFO COPYING %doc changelogs/CHANGELOG-v2.*.rst %doc %{_mandir}/man1/ansible* %{_datadir}/ansible/ @@ -209,7 +217,13 @@ strip --strip-unneeded %{vendor_path}/markupsafe/_speedups%{python3_ext_suffix} %{_bindir}/ansible-test %{python3_sitelib}/ansible_test +%files doc +%doc README.md PKG-INFO COPYING + %changelog +* Wed Jun 05 2024 Bo Ren - 2.16.3-2.0.1 +- Add doc sub package + * Mon Feb 05 2024 Dimitri Savineau - 2.16.3-2 - rebuild with python 3.12 (RHEL-24141) -- Gitee From e6720ad36d88e7b8641eb692b99f6e9adaeae400 Mon Sep 17 00:00:00 2001 From: Renbo Date: Mon, 21 Oct 2024 10:09:04 +0800 Subject: [PATCH 3/3] Modify python version Signed-off-by: Renbo --- ansible-core.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ansible-core.spec b/ansible-core.spec index dd94a9b..2d26c47 100644 --- a/ansible-core.spec +++ b/ansible-core.spec @@ -1,6 +1,6 @@ %define anolis_release .0.1 -%global __python3 /usr/bin/python3.12 -%global python3_pkgversion 3.12 +%global __python3 /usr/bin/python3.11 +%global python3_pkgversion 3.11 # We need this because we are no longer noarch, since our bundled deps might # conceivably need to compile arch-specific things. But we currently have no @@ -223,6 +223,7 @@ strip --strip-unneeded %{vendor_path}/markupsafe/_speedups%{python3_ext_suffix} %changelog * Wed Jun 05 2024 Bo Ren - 2.16.3-2.0.1 - Add doc sub package +- Modify python version * Mon Feb 05 2024 Dimitri Savineau - 2.16.3-2 - rebuild with python 3.12 (RHEL-24141) -- Gitee