diff options
-rw-r--r-- | main/e2fsprogs/APKBUILD | 8 | ||||
-rw-r--r-- | main/e2fsprogs/swapfs-big-endian-FTBFS.patch | 19 |
2 files changed, 3 insertions, 24 deletions
diff --git a/main/e2fsprogs/APKBUILD b/main/e2fsprogs/APKBUILD index 4c4c8796ee..b7d45dcf8b 100644 --- a/main/e2fsprogs/APKBUILD +++ b/main/e2fsprogs/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=e2fsprogs -pkgver=1.43.8 -pkgrel=1 +pkgver=1.43.9 +pkgrel=0 pkgdesc="Standard Ext2/3/4 filesystem utilities" url="http://e2fsprogs.sourceforge.net" arch="all" @@ -13,7 +13,6 @@ options="!check" makedepends="$depends_dev linux-headers" subpackages="$pkgname-dev $pkgname-doc libcom_err $pkgname-libs $pkgname-extra" source="https://www.kernel.org/pub/linux/kernel/people/tytso/$pkgname/v$pkgver/$pkgname-$pkgver.tar.xz - swapfs-big-endian-FTBFS.patch " builddir="$srcdir/$pkgname-$pkgver" @@ -67,5 +66,4 @@ extra() { mv "$pkgdir"/usr "$subpkgdir"/ } -sha512sums="539f310909aafcd40062da067c94d3b355bdecee122ecb5ea53e137f57e8699bd4d549a7f161c796d9a3d7a7b5822e8c01b47e4babdeb7243eb64a022dda2f74 e2fsprogs-1.43.8.tar.xz -7e653a7e0c8ba8335193ee888e71a9aea50622733b2a284d5233b20b1afa8208da5cd678baae8d43eefb629c95cf68f3166f3281de77c2d33c2c487e6f389563 swapfs-big-endian-FTBFS.patch" +sha512sums="0a4b9d0dcec26ab16563b874f4c3060994d0b11cff3e5385069b46205eca116619516b546d18e29fb8cb3bb69cd5e7acc895d11a18765a7897954c779c956055 e2fsprogs-1.43.9.tar.xz" diff --git a/main/e2fsprogs/swapfs-big-endian-FTBFS.patch b/main/e2fsprogs/swapfs-big-endian-FTBFS.patch deleted file mode 100644 index fee4e0dbce..0000000000 --- a/main/e2fsprogs/swapfs-big-endian-FTBFS.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/lib/ext2fs/swapfs.c -+++ b/lib/ext2fs/swapfs.c -@@ -19,6 +19,7 @@ - - #include "ext2_fs.h" - #include "ext2fs.h" -+#include "ext2fsP.h" - #include <ext2fs/ext2_ext_attr.h> - - #ifdef WORDS_BIGENDIAN -@@ -358,7 +359,7 @@ void ext2fs_swap_inode_full(ext2_filsys - if (inode_includes(inode_size, i_projid)) - t->i_projid = ext2fs_swab16(f->i_projid); - /* catch new static fields added after i_projid */ -- EXT2FS_BUILD_BUG_ON(sizeof(ext2_inode_large) != 160); -+ EXT2FS_BUILD_BUG_ON(sizeof(struct ext2_inode_large) != 160); - - i = sizeof(struct ext2_inode) + extra_isize + sizeof(__u32); - if (bufsize < (int) i) |