From 156be4ed77b637d70e0b0ecafedc04acbf78d8b1 Mon Sep 17 00:00:00 2001
From: renbo <rb01097748@alibaba-inc.com>
Date: Fri, 13 Dec 2024 11:28:51 +0800
Subject: [PATCH 1/2] [CVE] update to python3.11-3.11.11-1.src.rpm

to #IBB20Y
update to python3.11-3.11.11-1.src.rpm
Project: TC2024080204

Signed-off-by: renbo <rb01097748@alibaba-inc.com>
---
 1000-add-anolis-platform.patch | 26 --------------------------
 1001-support-loongarch64.patch | 26 --------------------------
 download                       |  4 ++--
 python3.11.spec                | 14 +++++---------
 4 files changed, 7 insertions(+), 63 deletions(-)
 delete mode 100644 1000-add-anolis-platform.patch
 delete mode 100644 1001-support-loongarch64.patch

diff --git a/1000-add-anolis-platform.patch b/1000-add-anolis-platform.patch
deleted file mode 100644
index 83605e1..0000000
--- a/1000-add-anolis-platform.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 9cb4b626aa0cad11a407daa52ba56d5b2857d69f Mon Sep 17 00:00:00 2001
-From: rpm-build <rpm-build>
-Date: Mon, 14 Oct 2024 17:29:28 +0800
-Subject: [PATCH] add anolis platform
-
-Signed-off-by: rpm-build <rpm-build>
----
- Doc/library/gettext.rst | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Doc/library/gettext.rst b/Doc/library/gettext.rst
-index 41beac3..52b1d9d 100644
---- a/Doc/library/gettext.rst
-+++ b/Doc/library/gettext.rst
-@@ -636,7 +636,7 @@ implementations, and valuable experience to the creation of this module:
- 
- .. rubric:: Footnotes
- 
--.. [#] The default locale directory is system dependent; for example, on Red Hat Linux
-+.. [#] The default locale directory is system dependent; for example, on Anolis OS
-    it is :file:`/usr/share/locale`, but on Solaris it is :file:`/usr/lib/locale`.
-    The :mod:`!gettext` module does not try to support these system dependent
-    defaults; instead its default is :file:`{sys.base_prefix}/share/locale` (see
--- 
-2.43.5
-
diff --git a/1001-support-loongarch64.patch b/1001-support-loongarch64.patch
deleted file mode 100644
index ed9381e..0000000
--- a/1001-support-loongarch64.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From fc76a1d9be245be9fedaacd96faa5ef4ebda3cbb Mon Sep 17 00:00:00 2001
-From: rpm-build <rpm-build>
-Date: Fri, 13 Sep 2024 13:29:09 +0800
-Subject: [PATCH 2/2] support loongarch64
-
-Signed-off-by: rpm-build <rpm-build>
----
- configure.ac | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 861f7a0..132fc5f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1040,6 +1040,8 @@ cat > conftest.c <<EOF
- #  else
- #   error unknown platform triplet
- #  endif
-+# elif defined(__loongarch64)
-+        loongarch64-linux-gnu
- # else
- #   error unknown platform triplet
- # endif
--- 
-2.43.0
-
diff --git a/download b/download
index a06d020..e4b8417 100644
--- a/download
+++ b/download
@@ -1,2 +1,2 @@
-af59e243df4c7019f941ae51891c10bc  Python-3.11.10.tar.xz
-bc5322cdc41eaf4e7e69d65eee9a8062  Python-3.11.10.tar.xz.asc
+3e497037b170fe4be5f462c4964596f2  Python-3.11.11.tar.xz
+629857d6a502450988c9516146864afc  Python-3.11.11.tar.xz.asc
diff --git a/python3.11.spec b/python3.11.spec
index 0fd28b1..5846d33 100644
--- a/python3.11.spec
+++ b/python3.11.spec
@@ -1,4 +1,3 @@
-%define anolis_release .0.1
 %global __python3 /usr/bin/python3.11
 %global python3_pkgversion 3.11
 
@@ -17,11 +16,11 @@ URL: https://www.python.org/
 
 #  WARNING  When rebasing to a new Python version,
 #           remember to update the python3-docs package as well
-%global general_version %{pybasever}.10
+%global general_version %{pybasever}.11
 #global prerel ...
 %global upstream_version %{general_version}%{?prerel}
 Version: %{general_version}%{?prerel:~%{prerel}}
-Release: 1%{anolis_release}%{?dist}
+Release: 1%{?dist}
 License: Python
 
 
@@ -412,9 +411,6 @@ Patch422: 00422-fix-expat-tests.patch
 #
 #     https://github.com/fedora-python/cpython
 
-# Rebrand for Anolis OS
-Patch1000: 1000-add-anolis-platform.patch
-Patch1001: 1001-support-loongarch64.patch
 
 # ==========================================
 # Descriptions, and metadata for subpackages
@@ -1859,9 +1855,9 @@ fi
 # ======================================================
 
 %changelog
-* Thu Nov 07 2024 <rb01097748@alibaba-inc.com> - 3.11.10-1.0.1
-- Rebrand for Anolis OS
-- Support loongarch64 platform
+* Tue Dec 03 2024 Lumír Balhar <lbalhar@redhat.com> - 3.11.11-1
+- Update to 3.11.11
+Resolves: RHEL-64879
 
 * Mon Sep 09 2024 Tomáš Hrnčiar <thrnciar@redhat.com> - 3.11.10-1
 - Update to 3.11.10
-- 
Gitee


From a5a79593e35240bba3f79af41bc14a2f9a9dd7dc Mon Sep 17 00:00:00 2001
From: Bo Ren <rb01097748@alibaba-inc.com>
Date: Fri, 13 Sep 2024 13:34:25 +0800
Subject: [PATCH 2/2] Rebrand for Anolis OS and support loongarch64

Signed-off-by: Bo Ren <rb01097748@alibaba-inc.com>

Conflicts:
	python3.11.spec
---
 1000-add-anolis-platform.patch | 26 ++++++++++++++++++++++++++
 1001-support-loongarch64.patch | 26 ++++++++++++++++++++++++++
 python3.11.spec                | 10 +++++++++-
 3 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100644 1000-add-anolis-platform.patch
 create mode 100644 1001-support-loongarch64.patch

diff --git a/1000-add-anolis-platform.patch b/1000-add-anolis-platform.patch
new file mode 100644
index 0000000..83605e1
--- /dev/null
+++ b/1000-add-anolis-platform.patch
@@ -0,0 +1,26 @@
+From 9cb4b626aa0cad11a407daa52ba56d5b2857d69f Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Mon, 14 Oct 2024 17:29:28 +0800
+Subject: [PATCH] add anolis platform
+
+Signed-off-by: rpm-build <rpm-build>
+---
+ Doc/library/gettext.rst | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Doc/library/gettext.rst b/Doc/library/gettext.rst
+index 41beac3..52b1d9d 100644
+--- a/Doc/library/gettext.rst
++++ b/Doc/library/gettext.rst
+@@ -636,7 +636,7 @@ implementations, and valuable experience to the creation of this module:
+ 
+ .. rubric:: Footnotes
+ 
+-.. [#] The default locale directory is system dependent; for example, on Red Hat Linux
++.. [#] The default locale directory is system dependent; for example, on Anolis OS
+    it is :file:`/usr/share/locale`, but on Solaris it is :file:`/usr/lib/locale`.
+    The :mod:`!gettext` module does not try to support these system dependent
+    defaults; instead its default is :file:`{sys.base_prefix}/share/locale` (see
+-- 
+2.43.5
+
diff --git a/1001-support-loongarch64.patch b/1001-support-loongarch64.patch
new file mode 100644
index 0000000..ed9381e
--- /dev/null
+++ b/1001-support-loongarch64.patch
@@ -0,0 +1,26 @@
+From fc76a1d9be245be9fedaacd96faa5ef4ebda3cbb Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Fri, 13 Sep 2024 13:29:09 +0800
+Subject: [PATCH 2/2] support loongarch64
+
+Signed-off-by: rpm-build <rpm-build>
+---
+ configure.ac | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 861f7a0..132fc5f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1040,6 +1040,8 @@ cat > conftest.c <<EOF
+ #  else
+ #   error unknown platform triplet
+ #  endif
++# elif defined(__loongarch64)
++        loongarch64-linux-gnu
+ # else
+ #   error unknown platform triplet
+ # endif
+-- 
+2.43.0
+
diff --git a/python3.11.spec b/python3.11.spec
index 5846d33..c52bb29 100644
--- a/python3.11.spec
+++ b/python3.11.spec
@@ -1,3 +1,4 @@
+%define anolis_release .0.1
 %global __python3 /usr/bin/python3.11
 %global python3_pkgversion 3.11
 
@@ -20,7 +21,7 @@ URL: https://www.python.org/
 #global prerel ...
 %global upstream_version %{general_version}%{?prerel}
 Version: %{general_version}%{?prerel:~%{prerel}}
-Release: 1%{?dist}
+Release: 1%{anolis_release}%{?dist}
 License: Python
 
 
@@ -411,6 +412,9 @@ Patch422: 00422-fix-expat-tests.patch
 #
 #     https://github.com/fedora-python/cpython
 
+# Rebrand for Anolis OS
+Patch1000: 1000-add-anolis-platform.patch
+Patch1001: 1001-support-loongarch64.patch
 
 # ==========================================
 # Descriptions, and metadata for subpackages
@@ -1855,6 +1859,10 @@ fi
 # ======================================================
 
 %changelog
+* Fri Dec 13 2024 <rb01097748@alibaba-inc.com> - 3.11.11-1.0.1
+- Rebrand for Anolis OS
+- Support loongarch64 platform
+
 * Tue Dec 03 2024 Lumír Balhar <lbalhar@redhat.com> - 3.11.11-1
 - Update to 3.11.11
 Resolves: RHEL-64879
-- 
Gitee