aboutsummaryrefslogtreecommitdiffstats
path: root/main/e2fsprogs
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2013-09-27 14:05:54 +0000
committerTimo Teräs <timo.teras@iki.fi>2013-09-27 14:22:24 +0000
commit4bcc6d4b25febf5771be27c1b373c30c38e80c93 (patch)
treec30cbbdf6b1e734526a7f6aa2def61048e93ee94 /main/e2fsprogs
parent392988ed3d9401f39ab7fed37a8d76de993eda8b (diff)
downloadaports-4bcc6d4b25febf5771be27c1b373c30c38e80c93.tar.bz2
aports-4bcc6d4b25febf5771be27c1b373c30c38e80c93.tar.xz
main/e2fsprogs: use standard types
fixes musl build, patch from sabotage.
Diffstat (limited to 'main/e2fsprogs')
-rw-r--r--main/e2fsprogs/APKBUILD20
-rw-r--r--main/e2fsprogs/fix_uint64_t.patch16
2 files changed, 31 insertions, 5 deletions
diff --git a/main/e2fsprogs/APKBUILD b/main/e2fsprogs/APKBUILD
index d3c3d824e3..71273a3c63 100644
--- a/main/e2fsprogs/APKBUILD
+++ b/main/e2fsprogs/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=e2fsprogs
pkgver=1.42.8
-pkgrel=0
+pkgrel=1
pkgdesc="Standard Ext2/3/4 filesystem utilities"
url="http://e2fsprogs.sourceforge.net"
arch="all"
@@ -10,13 +10,20 @@ depends=
install=
makedepends="util-linux-dev pkgconfig"
subpackages="$pkgname-dev $pkgname-doc libcom_err"
-source="http://downloads.sourceforge.net/sourceforge/e2fsprogs/e2fsprogs-$pkgver.tar.gz"
+source="http://downloads.sourceforge.net/sourceforge/e2fsprogs/e2fsprogs-$pkgver.tar.gz
+ fix_uint64_t.patch"
depends_dev="util-linux-dev"
_builddir="$srcdir"/$pkgname-$pkgver
prepare() {
+ local i
cd "$_builddir"
+ for i in $source; do
+ case $i in
+ *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+ esac
+ done
}
build () {
@@ -49,6 +56,9 @@ libcom_err() {
mv "$pkgdir"/lib/libcom_err* "$subpkgdir"/lib/
}
-md5sums="8ef664b6eb698aa6b733df59b17b9ed4 e2fsprogs-1.42.8.tar.gz"
-sha256sums="b984aaf1fe888d6a4cf8c2e8d397207879599b5368f1d33232c1ec9d68d00c97 e2fsprogs-1.42.8.tar.gz"
-sha512sums="69447105cbfec6099a8b7686d7cb8f4727d8c7c3f438acd0ec065ece70c225ce2c5e72e22ba16d88ef6dac81112b7571083d0cadd2fd1c82415c959ae632e61c e2fsprogs-1.42.8.tar.gz"
+md5sums="8ef664b6eb698aa6b733df59b17b9ed4 e2fsprogs-1.42.8.tar.gz
+2c1d4c967eaadd29a4caa10d34004fb9 fix_uint64_t.patch"
+sha256sums="b984aaf1fe888d6a4cf8c2e8d397207879599b5368f1d33232c1ec9d68d00c97 e2fsprogs-1.42.8.tar.gz
+b08907df2c226aba25b46a0f945eaf1c980bdb8d1ed729ae43eaae9b1d37fa91 fix_uint64_t.patch"
+sha512sums="69447105cbfec6099a8b7686d7cb8f4727d8c7c3f438acd0ec065ece70c225ce2c5e72e22ba16d88ef6dac81112b7571083d0cadd2fd1c82415c959ae632e61c e2fsprogs-1.42.8.tar.gz
+2b9895d604c193098587b323e957f1d454b5c6963b10afb61054822736c22517ce2660b2eeb0b6b6b09d95caf11cc5b100af3e26d3713c5e6891a09305b1967f fix_uint64_t.patch"
diff --git a/main/e2fsprogs/fix_uint64_t.patch b/main/e2fsprogs/fix_uint64_t.patch
new file mode 100644
index 0000000000..8433e11ab0
--- /dev/null
+++ b/main/e2fsprogs/fix_uint64_t.patch
@@ -0,0 +1,16 @@
+--- e2fsprogs-1.42.8.orig/lib/ext2fs/unix_io.c
++++ e2fsprogs-1.42.8/lib/ext2fs/unix_io.c
+@@ -931,10 +931,10 @@
+
+ if (channel->flags & CHANNEL_FLAGS_BLOCK_DEVICE) {
+ #ifdef BLKDISCARD
+- __uint64_t range[2];
++ uint64_t range[2];
+
+- range[0] = (__uint64_t)(block) * channel->block_size;
+- range[1] = (__uint64_t)(count) * channel->block_size;
++ range[0] = (uint64_t)(block) * channel->block_size;
++ range[1] = (uint64_t)(count) * channel->block_size;
+
+ ret = ioctl(data->dev, BLKDISCARD, &range);
+ #else