aboutsummaryrefslogtreecommitdiffstats
path: root/main/e2fsprogs/APKBUILD
diff options
context:
space:
mode:
Diffstat (limited to 'main/e2fsprogs/APKBUILD')
-rw-r--r--main/e2fsprogs/APKBUILD77
1 files changed, 49 insertions, 28 deletions
diff --git a/main/e2fsprogs/APKBUILD b/main/e2fsprogs/APKBUILD
index 2dbdba1e48b..c0ea044bf6d 100644
--- a/main/e2fsprogs/APKBUILD
+++ b/main/e2fsprogs/APKBUILD
@@ -1,19 +1,30 @@
# Contributor: Valery Kartel <valery.kartel@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=e2fsprogs
-pkgver=1.46.2
-pkgrel=0
+pkgver=1.47.0
+pkgrel=5
pkgdesc="Standard Ext2/3/4 filesystem utilities"
-url="http://e2fsprogs.sourceforge.net"
+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"
-makedepends="$depends_dev linux-headers"
-checkdepends="diffutils perl"
-subpackages="$pkgname-static $pkgname-dev $pkgname-doc libcom_err $pkgname-libs $pkgname-extra"
+# XXX: build hack to upgrade live on builders
+makedepends="$depends_dev musl>1.2.3_git20230322-r2 linux-headers fuse-dev"
+checkdepends="diffutils perl coreutils"
+subpackages="
+ $pkgname-static
+ $pkgname-dev
+ libcom_err
+ fuse2fs
+ fuse2fs-doc:fuse2fs_doc:noarch
+ $pkgname-doc
+ $pkgname-libs
+ $pkgname-extra
+ "
source="$pkgname-$pkgver.tar.gz::https://github.com/tytso/e2fsprogs/archive/v$pkgver.tar.gz
- ensure-small-filesystems-are-Y2038-ok.patch
+ lfs64.patch
"
+
case $CHOST in
riscv64*)
# j_recover_fast_commit appears to be a false negative due to a compiler
@@ -31,6 +42,7 @@ esac
# - CVE-2019-5094
build() {
+ CFLAGS="$CFLAGS -flto=auto" \
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -62,7 +74,7 @@ check() {
}
package() {
- make -j1 MKDIR_P="install -d" DESTDIR="$pkgdir" install install-libs
+ make -j1 DESTDIR="$pkgdir" install install-libs
mv "$pkgdir"/sbin/* "$pkgdir"/usr/sbin/
local i; for i in e2fsck mke2fs mkfs.* fsck.*; do
mv "$pkgdir"/usr/sbin/$i "$pkgdir"/sbin/
@@ -71,34 +83,43 @@ package() {
dev() {
default_dev
- mkdir -p "$subpkgdir"/usr/bin
- mkdir -p "$subpkgdir"/usr/share
- mv "$pkgdir"/usr/bin/compile_et "$pkgdir"/usr/bin/mk_cmds \
- "$subpkgdir"/usr/bin/
- mv "$pkgdir"/usr/share/et "$pkgdir"/usr/share/ss \
- "$subpkgdir"/usr/share
+
+ amove \
+ usr/bin/compile_et \
+ usr/bin/mk_cmds \
+ usr/share/et \
+ usr/share/ss
}
libcom_err() {
pkgdesc="Common error description library"
- mkdir -p "$subpkgdir"/lib
- mv "$pkgdir"/lib/libcom_err* "$subpkgdir"/lib/
+
+ amove lib/libcom_err*
+}
+
+fuse2fs() {
+ pkgdesc="Ext2/3/4 filesystem driver for FUSE"
+ amove usr/bin/fuse2fs
+}
+
+fuse2fs_doc() {
+ pkgdesc="Ext2/3/4 filesystem driver for FUSE (documentation)"
+ install_if="fuse2fs=$pkgver-r$pkgrel docs"
+
+ amove usr/share/man/man1/fuse2fs.1
+ gzip -9 "$subpkgdir"/usr/share/man/man1/fuse2fs.1
}
extra() {
- depends="$pkgname"
+ depends="$pkgname=$pkgver-r$pkgrel"
pkgdesc="Ext2/3/4 filesystem extra utilities"
- mkdir -p "$subpkgdir"
- rmdir "$pkgdir"/lib
- mv "$pkgdir"/usr "$subpkgdir"/
-}
-static() {
- depends=""
- pkgdesc="$pkgdesc (static libraries)"
- mkdir -p "$subpkgdir"/usr/lib
- mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib
+ mkdir -p "$subpkgdir"
+ amove usr
+ rmdir "$pkgdir"/lib || true
}
-sha512sums="2550cb2fbed0c9cc6f0df0e8870cb36dd1c8d4e66321c9551b0fb14d343c7b3f09110424db2699926b8249600c0788c1a2e270fae9d0bacecd71f96745883b30 e2fsprogs-1.46.2.tar.gz
-daf63f8ca704eaa9a3293444469ef1a36c09806614d20e844b451af2426d5c8611a61669c99e4702f1fd787145cf9a34f1345ae5ed15ef47c41ca02f03302231 ensure-small-filesystems-are-Y2038-ok.patch"
+sha512sums="
+9cb895f7deed8ee513595b7c232db8345cb7e54e6cbb33e6eeab31c860c892cbc9d721756ac1429e6731e219e1c6aacc25075d517e979397c66bf764bc8bc9fa e2fsprogs-1.47.0.tar.gz
+9b97f91529844ad04a613d61ef762951859640d2677b4e37648ecc7cfbfc0b4831e8f3e49ad952fc16267d53e6e7c6cf588350a3e36edc2e22779f43d9ef17cf lfs64.patch
+"