system/e2fsprogs: bump and finally close #25

3 files changed, 133 insertions, 0 deletions

diff --git a/system/e2fsprogs/APKBUILD b/system/e2fsprogs/APKBUILD
new file mode 100644
index 000000000..748fab308
--- /dev/null
+++ b/system/e2fsprogs/APKBUILD
@@ -0,0 +1,64 @@
+# Contributor: Valery Kartel <valery.kartel@gmail.com>
+# Maintainer: 
+pkgname=e2fsprogs
+pkgver=1.44.2
+pkgrel=0
+pkgdesc="Standard ext2/3/4 filesystem utilities"
+url="http://e2fsprogs.sourceforge.net"
+arch="all"
+options="!checkroot"
+license="GPL-2.0-only AND LGPL-2.0-only AND MIT"
+depends=""
+depends_dev="util-linux-dev"
+makedepends="$depends_dev linux-headers"
+subpackages="$pkgname-lang $pkgname-dev $pkgname-doc libcom_err $pkgname-libs"
+source="https://www.kernel.org/pub/linux/kernel/people/tytso/$pkgname/v$pkgver/$pkgname-$pkgver.tar.xz
+	debugfs-spurious-message.patch
+	test-patch.patch
+	"
+
+build () {
+	cd "$builddir"
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--mandir=/usr/share/man \
+		--enable-elf-shlibs \
+		--enable-symlink-install \
+		--disable-fsck \
+		--disable-uuidd \
+		--disable-libuuid \
+		--disable-libblkid \
+		--disable-tls
+	make
+}
+
+check() {
+	cd "$builddir"
+	make check
+}
+
+package() {
+	cd "$builddir"
+	make -j1 LDCONFIG=: DESTDIR="$pkgdir" install install-libs
+}
+
+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
+}
+
+libcom_err() {
+	pkgdesc="Common error description library"
+	mkdir -p "$subpkgdir"/lib
+	mv "$pkgdir"/lib/libcom_err* "$subpkgdir"/lib/
+}
+
+sha512sums="db34be8c2b606da565a46635d9ed859ccc28921c9a494dd90fbe461a400d0411b0ec6582d3a858adc916d68ec5e835814da798f1cb44710b75fc4efe0145eb90  e2fsprogs-1.44.2.tar.xz
+4e224a46beb73147485fe47de06bdf451c5a2fd4ea3835364f57d53d4ee80f2cb807a25bce40bacfa9abe1e0f81d1a4b1be5cb160b5c1103de6492288c5f8b7a  debugfs-spurious-message.patch
+2718073be717f0f3b56147bb375fdffd3328cf920b12b474313f9c993184b73228b4478a91ba7913ef08a1119320ce1befe6eab20858c9ebc1c4b4890483f687  test-patch.patch"
diff --git a/system/e2fsprogs/debugfs-spurious-message.patch b/system/e2fsprogs/debugfs-spurious-message.patch
new file mode 100644
index 000000000..6ecb226da
--- /dev/null
+++ b/system/e2fsprogs/debugfs-spurious-message.patch
@@ -0,0 +1,28 @@
+From 5f63e5c4f9c45abafe6ea2ee31b1e85c97bf6ef2 Mon Sep 17 00:00:00 2001
+From: Theodore Ts'o <tytso@mit.edu>
+Date: Sun, 24 Jun 2018 21:21:49 -0400
+Subject: debugfs: suppress spurious "checksum errors" message for unrelated
+ failures
+
+Signed-off-by: Theodore Ts'o <tytso@mit.edu>
+---
+ debugfs/debugfs.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c
+index 2bf6a30..ecca810 100644
+--- a/debugfs/debugfs.c
++++ b/debugfs/debugfs.c
+@@ -172,7 +172,8 @@ static void open_filesystem(char *device, int open_flags, blk64_t superblock,
+ try_open_again:
+ 	retval = ext2fs_open(device, open_flags, superblock, blocksize,
+ 			     io_ptr, &current_fs);
+-	if (retval && !(open_flags & EXT2_FLAG_IGNORE_CSUM_ERRORS)) {
++	if (retval && (retval == EXT2_ET_SB_CSUM_INVALID) &&
++	    !(open_flags & EXT2_FLAG_IGNORE_CSUM_ERRORS)) {
+ 		open_flags |= EXT2_FLAG_IGNORE_CSUM_ERRORS;
+ 		printf("Checksum errors in superblock!  Retrying...\n");
+ 		goto try_open_again;
+-- 
+cgit v1.1
+
diff --git a/system/e2fsprogs/test-patch.patch b/system/e2fsprogs/test-patch.patch
new file mode 100644
index 000000000..149124561
--- /dev/null
+++ b/system/e2fsprogs/test-patch.patch
@@ -0,0 +1,41 @@
+From 579e9ae1ddd15d7f9c9d01b23133b6187ae1b2b9 Mon Sep 17 00:00:00 2001
+From: Theodore Ts'o <tytso@mit.edu>
+Date: Mon, 25 Jun 2018 09:43:18 -0400
+Subject: tests: fix up f_detect_junk and f_detect_xfs
+
+The golden output files for these two tests were out of date.
+
+Signed-off-by: Theodore Ts'o <tytso@mit.edu>
+---
+ tests/f_detect_junk/expect          | 1 -
+ tests/f_detect_xfs/expect           | 1 -
+ tests/f_detect_xfs/expect.nodebugfs | 2 --
+ 3 files changed, 4 deletions(-)
+
+diff --git a/tests/f_detect_junk/expect b/tests/f_detect_junk/expect
+index 59f34b8..39f99af 100644
+--- a/tests/f_detect_junk/expect
++++ b/tests/f_detect_junk/expect
+@@ -13,7 +13,6 @@ is corrupt, and you might try running e2fsck with an alternate superblock:
+ 
+ *** debugfs
+ test.img: Bad magic number in super-block while opening filesystem
+-Checksum errors in superblock!  Retrying...
+ *** tune2fs
+ ../misc/tune2fs: Bad magic number in super-block while trying to open test.img
+ *** mke2fs
+diff --git a/tests/f_detect_xfs/expect b/tests/f_detect_xfs/expect
+index fb510d9..a48e8af 100644
+--- a/tests/f_detect_xfs/expect
++++ b/tests/f_detect_xfs/expect
+@@ -14,7 +14,6 @@ is corrupt, and you might try running e2fsck with an alternate superblock:
+ test.img contains a xfs file system labelled 'test_filsys'
+ *** debugfs
+ test.img: Bad magic number in super-block while opening filesystem
+-Checksum errors in superblock!  Retrying...
+ test.img contains a xfs file system labelled 'test_filsys'
+ *** tune2fs
+ ../misc/tune2fs: Bad magic number in super-block while trying to open test.img
+-- 
+cgit v1.1
+