Commit f415ff8c authored by Natanael Copa's avatar Natanael Copa

main/e2fsprogs: upgrade to 1.42.10

parent 04b75797
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=e2fsprogs
pkgver=1.42.9
pkgver=1.42.10
pkgrel=0
pkgdesc="Standard Ext2/3/4 filesystem utilities"
url="http://e2fsprogs.sourceforge.net"
......@@ -8,12 +8,11 @@ arch="all"
license="GPL LGPL MIT"
depends=
install=
makedepends="util-linux-dev pkgconfig"
depends_dev="util-linux-dev"
makedepends="$depends_dev"
subpackages="$pkgname-dev $pkgname-doc libcom_err"
source="http://downloads.sourceforge.net/sourceforge/e2fsprogs/e2fsprogs-$pkgver.tar.gz
fix_uint64_t.patch"
source="http://downloads.sourceforge.net/sourceforge/e2fsprogs/e2fsprogs-$pkgver.tar.gz"
depends_dev="util-linux-dev"
_builddir="$srcdir"/$pkgname-$pkgver
prepare() {
......@@ -26,7 +25,7 @@ prepare() {
done
}
build () {
build () {
cd "$_builddir"
./configure \
--build=$CBUILD \
......@@ -56,9 +55,6 @@ libcom_err() {
mv "$pkgdir"/lib/libcom_err* "$subpkgdir"/lib/
}
md5sums="3f8e41e63b432ba114b33f58674563f7 e2fsprogs-1.42.9.tar.gz
64cc1406a634a16b6e411a49e67715e9 fix_uint64_t.patch"
sha256sums="2f92ac06e92fa00f2ada3ee67dad012d74d685537527ad1241d82f2d041f2802 e2fsprogs-1.42.9.tar.gz
4ad117a5bbd9d134b0e65b89094c3efe276c3a3456f45bd7842dd046803ec861 fix_uint64_t.patch"
sha512sums="31041c45bc4e4a37fc4a1026424e15d4fc8fbf990c968fc9fba92861d9bec15f192dee8d5341cc2215af30a86b0bdb12d8a01f3c113b79a66c65f4a737136bb7 e2fsprogs-1.42.9.tar.gz
b8645d1d83527f1ddd8a59b8a3f4658b226d76fc381fde6f38f77d3866038541a237d3a31ced657ad9950c798da299b33cdf55b138f71ab352d62969d9b995ae fix_uint64_t.patch"
md5sums="62bfe2fe0a194c5c37165789ac2825a8 e2fsprogs-1.42.10.tar.gz"
sha256sums="7b6e85c666d8fdd6062c75ba953de0e5481673bebef5f40f749a52a46476e29f e2fsprogs-1.42.10.tar.gz"
sha512sums="9ac99152722af3a9de03cdbb49a3095df59c488978da825527c99c86959a6ef8edd4953a03beba491fd281cb2fc3e917504682e36c3bc7208463812788807826 e2fsprogs-1.42.10.tar.gz"
diff -ru e2fsprogs-1.42.8.orig/lib/ext2fs/unix_io.c e2fsprogs-1.42.8/lib/ext2fs/unix_io.c
--- e2fsprogs-1.42.8.orig/lib/ext2fs/unix_io.c 2013-09-27 17:26:55.203155268 +0300
+++ e2fsprogs-1.42.8/lib/ext2fs/unix_io.c 2013-09-27 17:27:27.782978767 +0300
@@ -23,6 +23,7 @@
#include "config.h"
#include <stdio.h>
+#include <stdint.h>
#include <string.h>
#if HAVE_UNISTD_H
#include <unistd.h>
@@ -931,10 +932,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
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment