From aeeb57b148620c5f1948e31610e5c0cd8f4e3f9d Mon Sep 17 00:00:00 2001 From: joborun Date: Thu, 18 Apr 2024 15:11:17 +0300 Subject: [PATCH] upg glibc xfsprogs --- glibc/PKGBUILD | 66 +++++++++++++++++++++++------------------- glibc/PKGBUILD-arch | 8 ++--- xfsprogs/PKGBUILD | 7 +++-- xfsprogs/PKGBUILD-arch | 6 ++-- xfsprogs/key | 1 + 5 files changed, 48 insertions(+), 40 deletions(-) diff --git a/glibc/PKGBUILD b/glibc/PKGBUILD index 3260350..a6056b5 100644 --- a/glibc/PKGBUILD +++ b/glibc/PKGBUILD @@ -11,8 +11,8 @@ pkgbase=glibc pkgname=(glibc lib32-glibc glibc-locales) pkgver=2.39 -_commit=6d1e3fb07b45e2e31e469b16cf21b24bccf8914c -pkgrel=01 +_commit=31da30f23cddd36db29d5b6a1c7619361b271fb4 +pkgrel=02 url='https://www.gnu.org/software/libc' makedepends=(git gd lib32-gcc-libs python) options=(staticlibs !lto) @@ -104,30 +104,30 @@ _skip_test() { sed -i "/\b${test} /d" "${srcdir}"/glibc/${file} } -#check() ( -# cd glibc-build -# -# # adjust/remove buildflags that cause false-positive testsuite failures -# sed -i '/FORTIFY/d' configparms # failure to build testsuite -# 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 -# -# # 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: -# # --system-call-filter="@clock @memlock @pkey" -# _skip_test test-errno-linux sysdeps/unix/sysv/linux/Makefile -# _skip_test tst-mlock2 sysdeps/unix/sysv/linux/Makefile -# _skip_test tst-ntp_gettime sysdeps/unix/sysv/linux/Makefile -# _skip_test tst-ntp_gettimex sysdeps/unix/sysv/linux/Makefile -# _skip_test tst-pkey sysdeps/unix/sysv/linux/Makefile -# _skip_test tst-process_mrelease sysdeps/unix/sysv/linux/Makefile -# _skip_test tst-shstk-legacy-1g sysdeps/x86_64/Makefile -# _skip_test tst-adjtime time/Makefile -# -# make -O check -#) +check() ( + cd glibc-build + + # adjust/remove buildflags that cause false-positive testsuite failures + sed -i '/FORTIFY/d' configparms # failure to build testsuite + 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/-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: + # --system-call-filter="@clock @memlock @pkey" + _skip_test test-errno-linux sysdeps/unix/sysv/linux/Makefile + _skip_test tst-mlock2 sysdeps/unix/sysv/linux/Makefile + _skip_test tst-ntp_gettime sysdeps/unix/sysv/linux/Makefile + _skip_test tst-ntp_gettimex sysdeps/unix/sysv/linux/Makefile + _skip_test tst-pkey sysdeps/unix/sysv/linux/Makefile + _skip_test tst-process_mrelease sysdeps/unix/sysv/linux/Makefile + _skip_test tst-shstk-legacy-1g sysdeps/x86_64/Makefile + _skip_test tst-adjtime time/Makefile + + make -O check +) package_glibc() { pkgdesc='GNU C Library w/o systemd - linux-api 6.6' @@ -219,6 +219,13 @@ license=(GPL-2.0-or-later LGPL-2.1-or-later) validpgpkeys=(7273542B39962DF7B299931416792B4EA25340F8 # Carlos O'Donell BC7C7372637EC10C57D7AA6579C43DFBF1CF2187) # Siddhesh Poyarekar +b2sums=('2466e8da98fd97cce07cd55fb836a56209d0e2d4f7b05a308dfe848fd7fa1398c838659ab4e8f3500c2bc13af16a369e78525c79b976af172306421f8383c637' + 'c859bf2dfd361754c9e3bbd89f10de31f8e81fd95dc67b77d10cb44e23834b096ba3caa65fbc1bd655a8696c6450dfd5a096c476b3abf5c7e125123f97ae1a72' + '04fbb3b0b28705f41ccc6c15ed5532faf0105370f22133a2b49867e790df0491f5a1255220ff6ebab91a462f088d0cf299491b3eb8ea53534cb8638a213e46e3' + '7c265e6d36a5c0dff127093580827d15519b6c7205c2e1300e82f0fb5b9dd00b6accb40c56581f18179c4fbbc95bd2bf1b900ace867a83accde0969f7b609f8a' + 'a6a5e2f2a627cc0d13d11a82458cfd0aa75ec1c5a3c7647e5d5a3bb1d4c0770887a3909bfda1236803d5bc9801bfd6251e13483e9adf797e4725332cd0d91a0e' + '214e995e84b342fe7b2a7704ce011b7c7fc74c2971f98eeb3b4e677b99c860addc0a7d91b8dc0f0b8be7537782ee331999e02ba48f4ccc1c331b60f27d715678') + sha256sums=(SKIP 2a7dd6c906b6c54a68f48a21898664a32fdb136cbd9ff7bfd48f01d1aaa649ae # locale.gen.txt 8c5cc09018cbd65e8570430f872e118caa2644e311d6200b7d5f0cba837fbba4 # locale-gen @@ -226,8 +233,7 @@ sha256sums=(SKIP 774061aff612a377714a509918a9e0e0aafce708b87d2d7e06b1bd1f6542fe70 # sdt.h cdc234959c6fdb43f000d3bb7d1080b0103f4080f5e67bcfe8ae1aaf477812f0) # sdt-config.h -## 33f9c61d4cbaad50cb4b080d45767af0d5e978fc108d89355099ea04149c0799 glibc-2.39-01-x86_64.pkg.tar.lz -## 030f1f7d5692cab021c19b363f26ea6f13f8704d7b313696481f468fef859cc8 glibc-locales-2.39-01-x86_64.pkg.tar.lz -## 105ec6f12e5cec29b0782e096886883b2639906e586a17bcb58bafc2af013c12 lib32-glibc-2.39-01-x86_64.pkg.tar.lz - ## +2b214d9d7c3cff814870e513001036b757309bca3d073be2d24e6beec0cb3749 glibc-2.39-02-x86_64.pkg.tar.lz +838b594cb8a0be8ad9514afd021b5783aa4ecb14badf5bd611e42d079b97b762 glibc-locales-2.39-02-x86_64.pkg.tar.lz +502e2b35770495edc0b1f5ffc6bf422192ade62c25436725a009fa170f281aa2 lib32-glibc-2.39-02-x86_64.pkg.tar.lz diff --git a/glibc/PKGBUILD-arch b/glibc/PKGBUILD-arch index 85fba0b..71083c4 100644 --- a/glibc/PKGBUILD-arch +++ b/glibc/PKGBUILD-arch @@ -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: diff --git a/xfsprogs/PKGBUILD b/xfsprogs/PKGBUILD index 9661345..e96dd89 100644 --- a/xfsprogs/PKGBUILD +++ b/xfsprogs/PKGBUILD @@ -6,7 +6,7 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=xfsprogs -pkgver=6.6.0 +pkgver=6.7.0 pkgrel=01 pkgdesc="XFS filesystem utilities w/o systemd" # url="https://xfs.org" @@ -56,12 +56,13 @@ package() { arch=(x86_64) -license=('LGPL') +license=('GPL-2.0-only' 'LGPL-2.1-only') validpgpkeys=(2B8185919E8D248981869DED20AE1692E13DDEE0 # Eric Sandeen 4020459E58C1A52511F5399113F703E6C11CF6F0) # Carlos Maiolino +b2sums=('810ffde66e8de47ce264406591ef6fd6f24b52ab44a0b7a58f7858c8eee442c9f33988f968940560ab5a455ceac7c9b2de1376f3fba816d19eec81f3e92d8529') sha256sums=(SKIP) -## 7dc33090f946de011dbad7f4ace5bd7c15dfda7055efec0b805307356468aa6b xfsprogs-6.6.0-01-x86_64.pkg.tar.lz +## a410a00619df1d370c7ed0affecfd28761a1b2dbcc0b9c8a1ad93ab97295a133 xfsprogs-6.7.0-01-x86_64.pkg.tar.lz diff --git a/xfsprogs/PKGBUILD-arch b/xfsprogs/PKGBUILD-arch index 722662d..8a9903c 100644 --- a/xfsprogs/PKGBUILD-arch +++ b/xfsprogs/PKGBUILD-arch @@ -1,11 +1,11 @@ # Maintainer: Tobias Powalowski pkgname=xfsprogs -pkgver=6.6.0 +pkgver=6.7.0 pkgrel=1 pkgdesc="XFS filesystem utilities" arch=('x86_64') -license=('LGPL') +license=('GPL-2.0-only' 'LGPL-2.1-only') url="https://xfs.wiki.kernel.org" depends=('sh' 'util-linux-libs' 'device-mapper' 'libinih' 'liburcu') optdepends=('icu: for xfs_scrub' @@ -14,7 +14,7 @@ optdepends=('icu: for xfs_scrub' makedepends=('git' 'icu') options=('!makeflags') source=("git+https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git?signed#tag=v${pkgver}") -b2sums=('SKIP') +b2sums=('810ffde66e8de47ce264406591ef6fd6f24b52ab44a0b7a58f7858c8eee442c9f33988f968940560ab5a455ceac7c9b2de1376f3fba816d19eec81f3e92d8529') validpgpkeys=( '2B8185919E8D248981869DED20AE1692E13DDEE0' # Eric Sandeen '4020459E58C1A52511F5399113F703E6C11CF6F0' # Carlos Maiolino diff --git a/xfsprogs/key b/xfsprogs/key index 0578113..63dca13 100644 --- a/xfsprogs/key +++ b/xfsprogs/key @@ -1,2 +1,3 @@ gpg -v --recv-key 20AE1692E13DDEE0 gpg -v --recv-key 13F703E6C11CF6F0 +gpg --recv-key 4675A111E50B5FA6