diff options
Diffstat (limited to 'core/e2fsprogs')
| -rwxr-xr-x | core/e2fsprogs/build | 2 | ||||
| -rw-r--r-- | core/e2fsprogs/checksums | 3 | ||||
| -rw-r--r-- | core/e2fsprogs/patches/fix-musl.patch | 23 | ||||
| -rw-r--r-- | core/e2fsprogs/sources | 3 | ||||
| -rw-r--r-- | core/e2fsprogs/version | 2 |
5 files changed, 3 insertions, 30 deletions
diff --git a/core/e2fsprogs/build b/core/e2fsprogs/build index 9c144907..35dcd376 100755 --- a/core/e2fsprogs/build +++ b/core/e2fsprogs/build @@ -3,8 +3,6 @@ export CFLAGS="$CFLAGS -static" export LDFLAGS="$LDFLAGS -static" -patch -p1 < fix-musl.patch - ./configure \ --prefix=/usr \ --sbindir=/usr/bin \ diff --git a/core/e2fsprogs/checksums b/core/e2fsprogs/checksums index 68d093ed..5663a351 100644 --- a/core/e2fsprogs/checksums +++ b/core/e2fsprogs/checksums @@ -1,2 +1 @@ -91d61cef9a251a18e49a700be0028a8d35b0549a25d2bc263af6fa5d9f7c7d13 e2fsprogs-1.46.0.tar.xz -3a6977348094c9629b2e62bc02ce77947cb11aa425e49d884debac16eca1258a fix-musl.patch +bbe6af3b7bb7119556b6f57a78d41b330007738bca8530b2ba95d2ba35430151 e2fsprogs-1.46.1.tar.xz diff --git a/core/e2fsprogs/patches/fix-musl.patch b/core/e2fsprogs/patches/fix-musl.patch deleted file mode 100644 index 5a53ed1b..00000000 --- a/core/e2fsprogs/patches/fix-musl.patch +++ /dev/null @@ -1,23 +0,0 @@ -Previous versions only used qsort, so I am basically reverting this change -so that it works in Musl. qsort_r isn't defined in Musl. - -Cem Keylan - ---- a/e2fsck/rehash.c 2021-02-03 12:11:27.912285401 +0300 -+++ b/e2fsck/rehash.c 2021-02-03 12:12:18.213423881 +0300 -@@ -1048,11 +1048,11 @@ - /* Sort the list */ - resort: - if (fd.compress && fd.num_array > 1) -- qsort_r(fd.harray+2, fd.num_array-2, sizeof(struct hash_entry), -- hash_cmp, &name_cmp_ctx); -+ qsort(fd.harray+2, fd.num_array-2, sizeof(struct hash_entry), -+ hash_cmp); - else -- qsort_r(fd.harray, fd.num_array, sizeof(struct hash_entry), -- hash_cmp, &name_cmp_ctx); -+ qsort(fd.harray, fd.num_array, sizeof(struct hash_entry), -+ hash_cmp); - - /* - * Look for duplicates diff --git a/core/e2fsprogs/sources b/core/e2fsprogs/sources index 6a21d81d..ede8f5ee 100644 --- a/core/e2fsprogs/sources +++ b/core/e2fsprogs/sources @@ -1,2 +1 @@ -https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.46.0/e2fsprogs-1.46.0.tar.xz -patches/fix-musl.patch +https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.46.1/e2fsprogs-1.46.1.tar.xz diff --git a/core/e2fsprogs/version b/core/e2fsprogs/version index 8c3df8ce..871a61ca 100644 --- a/core/e2fsprogs/version +++ b/core/e2fsprogs/version @@ -1 +1 @@ -1.46.0 1 +1.46.1 1 |