mirrors/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-08-05 21:37:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

main/e2fsprogs: upgrade to 1.47.1

Browse Source 
remove lfs64.patch, fixed upstream
enable check on riscv64
This commit is contained in:
Milan P. Stanić 2024-06-29 11:16:50 +00:00 committed by Natanael Copa
parent 6bf85bbdc8
commit 53db9ddf28
2 changed files with 4 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
main/e2fsprogs/APKBUILD
View File

@ -1,15 +1,15 @@
# Contributor: Valery Kartel <valery.kartel@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=e2fsprogs
pkgver=1.47.0
pkgrel=5
pkgver=1.47.1
pkgrel=0
pkgdesc="Standard Ext2/3/4 filesystem utilities"
url="https://e2fsprogs.sourceforge.net/"
arch="all"
license="GPL-2.0-or-later AND LGPL-2.0-or-later AND BSD-3-Clause AND MIT"
depends_dev="util-linux-dev gawk"
# XXX: build hack to upgrade live on builders
makedepends="$depends_dev musl>1.2.3_git20230322-r2 linux-headers fuse-dev"
makedepends="$depends_dev musl>1.2.3_git20230322-r2 linux-headers fuse3-dev"
checkdepends="diffutils perl coreutils"
subpackages="
$pkgname-static
@ -22,19 +22,8 @@ subpackages="
$pkgname-extra
"
source="$pkgname-$pkgver.tar.gz::https://github.com/tytso/e2fsprogs/archive/v$pkgver.tar.gz
lfs64.patch
"
case $CHOST in
riscv64*)
# j_recover_fast_commit appears to be a false negative due to a compiler
# bug or hardware bug
#
# https://marc.info/?l=linux-ext4&m=161307702015761&w=2
options="!check"
;;
esac
# secfixes:
# 1.45.5-r0:
# - CVE-2019-5188
@ -120,6 +109,5 @@ extra() {
}
sha512sums="
9cb895f7deed8ee513595b7c232db8345cb7e54e6cbb33e6eeab31c860c892cbc9d721756ac1429e6731e219e1c6aacc25075d517e979397c66bf764bc8bc9fa e2fsprogs-1.47.0.tar.gz
9b97f91529844ad04a613d61ef762951859640d2677b4e37648ecc7cfbfc0b4831e8f3e49ad952fc16267d53e6e7c6cf588350a3e36edc2e22779f43d9ef17cf lfs64.patch
7e59746e14df9e29034693f415dc4bcbd405217712e2d9e594dcc755bbc1c9f3c4f66ba37e4289b022c337c5aae3d96561c0cd88fa21082ed1017d2a000d3b82 e2fsprogs-1.47.1.tar.gz
"

42
main/e2fsprogs/lfs64.patch
View File

@ -1,42 +0,0 @@
From 92f8226c3cf7d84a4937766420a411e68771dfc2 Mon Sep 17 00:00:00 2001
From: Mike Cui <cuicui@gmail.com>
Date: Sun, 7 May 2023 02:46:47 -0700
Subject: [PATCH] ext2fs: Use 64-bit lseek when SIZEOF_OFF_T is 64bits
musl-1.2.4 no longer defines lseek64, and since off_t is always 64-bits,
autoconf decides to not pass in -D_FILE_OFFSET_BITS=64 when compiling,
and this results in a compilation failure.
Instead of checking _FILE_OFFSET_BITS=64, let's just check if
SIZEOF_OFF_T is SIZEOF_LONG_LONG. Also, SIZEOF_LONG is irrelevant.
---
lib/blkid/llseek.c | 2 +-
lib/ext2fs/llseek.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/blkid/llseek.c b/lib/blkid/llseek.c
index 59298646f..f24e40b1f 100644
--- a/lib/blkid/llseek.c
+++ b/lib/blkid/llseek.c
@@ -50,7 +50,7 @@ extern long long llseek(int fd, long long offset, int origin);
#else /* ! HAVE_LLSEEK */
-#if SIZEOF_LONG == SIZEOF_LONG_LONG
+#if SIZEOF_OFF_T == SIZEOF_LONG_LONG
#define llseek lseek
diff --git a/lib/ext2fs/llseek.c b/lib/ext2fs/llseek.c
index 45f21d09d..713312aa8 100644
--- a/lib/ext2fs/llseek.c
+++ b/lib/ext2fs/llseek.c
@@ -51,7 +51,7 @@ extern long long llseek (int fd, long long offset, int origin);
#else /* ! HAVE_LLSEEK */
-#if SIZEOF_LONG == SIZEOF_LONG_LONG || _FILE_OFFSET_BITS+0 == 64
+#if SIZEOF_OFF_T == SIZEOF_LONG_LONG
#define my_llseek lseek