Skip to content
Snippets Groups Projects
Verified Commit 5117d41e authored by Frederik Schwan's avatar Frederik Schwan
Browse files

upgpkg: 2.39-2: fix CVE-2024-2961

parent 8b1b69f8
No related branches found
No related tags found
No related merge requests found
pkgbase = glibc
pkgver = 2.39
pkgrel = 1
pkgrel = 2
url = https://www.gnu.org/software/libc
arch = x86_64
license = GPL-2.0-or-later
......@@ -11,7 +11,7 @@ pkgbase = glibc
makedepends = python
options = staticlibs
options = !lto
source = git+https://sourceware.org/git/glibc.git#commit=6d1e3fb07b45e2e31e469b16cf21b24bccf8914c
source = git+https://sourceware.org/git/glibc.git#commit=31da30f23cddd36db29d5b6a1c7619361b271fb4
source = locale.gen.txt
source = locale-gen
source = lib32-glibc.conf
......@@ -19,7 +19,7 @@ pkgbase = glibc
source = sdt-config.h
validpgpkeys = 7273542B39962DF7B299931416792B4EA25340F8
validpgpkeys = BC7C7372637EC10C57D7AA6579C43DFBF1CF2187
b2sums = SKIP
b2sums = 2466e8da98fd97cce07cd55fb836a56209d0e2d4f7b05a308dfe848fd7fa1398c838659ab4e8f3500c2bc13af16a369e78525c79b976af172306421f8383c637
b2sums = c859bf2dfd361754c9e3bbd89f10de31f8e81fd95dc67b77d10cb44e23834b096ba3caa65fbc1bd655a8696c6450dfd5a096c476b3abf5c7e125123f97ae1a72
b2sums = 04fbb3b0b28705f41ccc6c15ed5532faf0105370f22133a2b49867e790df0491f5a1255220ff6ebab91a462f088d0cf299491b3eb8ea53534cb8638a213e46e3
b2sums = 7c265e6d36a5c0dff127093580827d15519b6c7205c2e1300e82f0fb5b9dd00b6accb40c56581f18179c4fbbc95bd2bf1b900ace867a83accde0969f7b609f8a
......
......@@ -9,8 +9,8 @@
pkgbase=glibc
pkgname=(glibc lib32-glibc glibc-locales)
pkgver=2.39
_commit=6d1e3fb07b45e2e31e469b16cf21b24bccf8914c
pkgrel=1
_commit=31da30f23cddd36db29d5b6a1c7619361b271fb4
pkgrel=2
arch=(x86_64)
url='https://www.gnu.org/software/libc'
license=(GPL-2.0-or-later LGPL-2.1-or-later)
......@@ -24,7 +24,7 @@ source=(git+https://sourceware.org/git/glibc.git#commit=${_commit}
)
validpgpkeys=(7273542B39962DF7B299931416792B4EA25340F8 # Carlos O'Donell
BC7C7372637EC10C57D7AA6579C43DFBF1CF2187) # Siddhesh Poyarekar
b2sums=('SKIP'
b2sums=('2466e8da98fd97cce07cd55fb836a56209d0e2d4f7b05a308dfe848fd7fa1398c838659ab4e8f3500c2bc13af16a369e78525c79b976af172306421f8383c637'
'c859bf2dfd361754c9e3bbd89f10de31f8e81fd95dc67b77d10cb44e23834b096ba3caa65fbc1bd655a8696c6450dfd5a096c476b3abf5c7e125123f97ae1a72'
'04fbb3b0b28705f41ccc6c15ed5532faf0105370f22133a2b49867e790df0491f5a1255220ff6ebab91a462f088d0cf299491b3eb8ea53534cb8638a213e46e3'
'7c265e6d36a5c0dff127093580827d15519b6c7205c2e1300e82f0fb5b9dd00b6accb40c56581f18179c4fbbc95bd2bf1b900ace867a83accde0969f7b609f8a'
......@@ -121,7 +121,7 @@ check() (
sed -i 's/-Werror=format-security/-Wformat-security/' config.make # failure to build testsuite
sed -i '/CFLAGS/s/-fno-plt//' config.make # 16 failures
sed -i '/CFLAGS/s/-fexceptions//' config.make # 1 failure
LDFLAGS=${LDFLAGS/,-z,now/} # 10 failures
LDFLAGS=${LDFLAGS/-Wl,-z,now/} # 10 failures
# The following tests fail due to restrictions in the Arch build system
# The correct fix is to add the following to the systemd-nspawn call:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment