Date: Wednesday, February 8, 2023 @ 11:39:10 Author: freswa Revision: 468364
replace CVE-2023-25139 patch with upstream commit Modified: glibc/trunk/PKGBUILD ----------+ PKGBUILD | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2023-02-08 11:27:04 UTC (rev 468363) +++ PKGBUILD 2023-02-08 11:39:10 UTC (rev 468364) @@ -9,7 +9,7 @@ pkgbase=glibc pkgname=(glibc lib32-glibc) pkgver=2.37 -_commit=a704fd9a133bfb10510e18702f48a6a9c88dbbd5 +_commit=6fe86ecd787a2624cd638131629ba9a824040308 pkgrel=2 arch=(x86_64) url='https://www.gnu.org/software/libc' @@ -22,7 +22,6 @@ lib32-glibc.conf sdt.h sdt-config.h reenable_DT_HASH.patch - cve-2023-25139.patch ) validpgpkeys=(7273542B39962DF7B299931416792B4EA25340F8 # Carlos O'Donell BC7C7372637EC10C57D7AA6579C43DFBF1CF2187) # Siddhesh Poyarekar @@ -32,8 +31,7 @@ '7c265e6d36a5c0dff127093580827d15519b6c7205c2e1300e82f0fb5b9dd00b6accb40c56581f18179c4fbbc95bd2bf1b900ace867a83accde0969f7b609f8a' 'a6a5e2f2a627cc0d13d11a82458cfd0aa75ec1c5a3c7647e5d5a3bb1d4c0770887a3909bfda1236803d5bc9801bfd6251e13483e9adf797e4725332cd0d91a0e' '214e995e84b342fe7b2a7704ce011b7c7fc74c2971f98eeb3b4e677b99c860addc0a7d91b8dc0f0b8be7537782ee331999e02ba48f4ccc1c331b60f27d715678' - '5fdd133c367af2f5454ea1eea7907de12166fb95eb59dbe33eae16aa9e26209b6585972bc1c80e36a0af4bfb04296acaf940ee78cd624cdcbab9669dff46c051' - '917b876dbc2bc23d15ffedb56bfb51611f8c7a5b8321281a2cf488d442a45c38fc754e857573843042bf7cc3df87d4271bc723acd52aab4c8fc3c8f07d41456e') + '5fdd133c367af2f5454ea1eea7907de12166fb95eb59dbe33eae16aa9e26209b6585972bc1c80e36a0af4bfb04296acaf940ee78cd624cdcbab9669dff46c051') prepare() { mkdir -p glibc-build lib32-glibc-build @@ -45,11 +43,6 @@ # which relies on DT_HASH to be present in these libs. # reconsider 2023-01 patch -Np1 -i "${srcdir}"/reenable_DT_HASH.patch - - # Add a temporary patch for cve 2023-25139 until a fix has been backported. - # Technical the fix itself is complete but the test cases aren't. - # See https://sourceware.org/bugzilla/show_bug.cgi?id=30068 - patch -Np1 -i "${srcdir}"/cve-2023-25139.patch } build() {
