From af70b3b58b8f99efe3be05d5801a2ad1eebfb393 Mon Sep 17 00:00:00 2001 From: doupengda Date: Thu, 9 Nov 2023 10:58:12 +0800 Subject: [PATCH] Modify patch 9030 defined multiple times (cherry picked from commit 5ffc1199b1878d27a4f85d1e97c940242498e96d) --- glibc.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/glibc.spec b/glibc.spec index 3dbdb9d..19c2493 100644 --- a/glibc.spec +++ b/glibc.spec @@ -70,7 +70,7 @@ ############################################################################## Name: glibc Version: 2.34 -Release: 139 +Release: 140 Summary: The GNU libc libraries License: %{all_license} URL: http://www.gnu.org/software/glibc/ @@ -326,7 +326,7 @@ Patch9036: add-pthread_cond_clockwait-GLIBC_2_28.patch Patch9037: 0001-ld.so-support-ld.so-mmap-hugetlb-hugepage-according-.patch Patch9038: 0002-elf-ld.so-keep-compatible-with-the-original-policy-o.patch Patch9039: 0003-elf-ld.so-remove-_mmap_hole-when-ld.so-mmap-PT_LOAD-.patch -Patch9030: elf-ld.so-add-MAP_NORESERVE-flag-for-the-first-mmap-2MB-contig.patch +Patch9040: elf-ld.so-add-MAP_NORESERVE-flag-for-the-first-mmap-2MB-contig.patch Patch9041: elf-ld.so-prohibit-multiple-i-options-and-do-not-allow-i-speci.patch Patch9042: elf-ld.so-Consider-maybe-existing-hole-between-PT_LO.patch Patch9043: add-GB18030-2022-charmap-BZ-30243.patch @@ -1504,6 +1504,9 @@ fi %endif %changelog +* Thu Nov 9 2023 doupengda - 2.34-140 +- Modify patch 9030 defined multiple times + * Thu Oct 26 2023 zhangnaichuan - 2.34-139 - posix: Fix some crashes in wordexp -- Gitee