diff options
| author | mandree <mandree@FreeBSD.org> | 2017-09-11 00:01:18 +0800 |
|---|---|---|
| committer | mandree <mandree@FreeBSD.org> | 2017-09-11 00:01:18 +0800 |
| commit | c4dec12fdef39292569ea975057b1e8ed37547a0 (patch) | |
| tree | 20c0efa7a8231d00a80fe9218c89d8d0ca83f59f | |
| parent | 973c7c8ebe57faad8307b39d9b3c7b4204e4906d (diff) | |
| download | freebsd-ports-gnome-c4dec12fdef39292569ea975057b1e8ed37547a0.tar.gz freebsd-ports-gnome-c4dec12fdef39292569ea975057b1e8ed37547a0.tar.zst freebsd-ports-gnome-c4dec12fdef39292569ea975057b1e8ed37547a0.zip | |
Update to new upstream release 1.43.6.
This fixes FreeBSD-related regressions observed in 1.43.4 and 1.43.5,
and portability issues around quota support on 32-bit builds.
Changelog: <http://e2fsprogs.sourceforge.net/e2fsprogs-release.html#1.43.6>
[The MFH request will also need to take 1.43.5 upgrades into account,
so the easiest would probably to merge the entire history since branching.]
MFH: 2017Q3
| -rw-r--r-- | sysutils/e2fsprogs/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/e2fsprogs/distinfo | 6 | ||||
| -rw-r--r-- | sysutils/e2fsprogs/files/patch-lib__ext2fs__unix_io.c | 19 | ||||
| -rw-r--r-- | sysutils/e2fsprogs/files/patch-lib_support_mkquota.c | 21 |
4 files changed, 5 insertions, 45 deletions
diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile index 671bea906fbf..ed6222ae691a 100644 --- a/sysutils/e2fsprogs/Makefile +++ b/sysutils/e2fsprogs/Makefile @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= e2fsprogs -PORTVERSION= 1.43.5 -PORTREVISION?= 1 +PORTVERSION= 1.43.6 +PORTREVISION?= 0 CATEGORIES?= sysutils MASTER_SITES= KERNEL_ORG/linux/kernel/people/tytso/${PORTNAME}/v${PORTVERSION} diff --git a/sysutils/e2fsprogs/distinfo b/sysutils/e2fsprogs/distinfo index cffc116eab11..d5683c98bc81 100644 --- a/sysutils/e2fsprogs/distinfo +++ b/sysutils/e2fsprogs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1502496004 -SHA256 (e2fsprogs-1.43.5.tar.xz) = 261f3d9ade383fbf032a19140c9c25e998cc0f71a1ae686614fb3ae0eb955a17 -SIZE (e2fsprogs-1.43.5.tar.xz) = 5301436 +TIMESTAMP = 1505057223 +SHA256 (e2fsprogs-1.43.6.tar.xz) = c9b226234ee878a8d89951f3b155cec7416dd0ec09c932c855f1b1df8ad93402 +SIZE (e2fsprogs-1.43.6.tar.xz) = 5288388 diff --git a/sysutils/e2fsprogs/files/patch-lib__ext2fs__unix_io.c b/sysutils/e2fsprogs/files/patch-lib__ext2fs__unix_io.c deleted file mode 100644 index 7839d1a217cd..000000000000 --- a/sysutils/e2fsprogs/files/patch-lib__ext2fs__unix_io.c +++ /dev/null @@ -1,19 +0,0 @@ -commit 649dbee84cf208244db7195d40e7fe57ddbea57a -Author: Matthias Andree <matthias.andree@gmx.de> -Date: Sun Aug 27 14:09:52 2017 +0200 - - Always obtain alignment on FreeBSD. - -diff --git a/lib/ext2fs/unix_io.c b/lib/ext2fs/unix_io.c -index 64141954..65f237ef 100644 ---- ./lib/ext2fs/unix_io.c -+++ ./lib/ext2fs/unix_io.c -@@ -636,7 +636,7 @@ static errcode_t unix_open_channel(const char *name, int fd, - #endif - - #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) -- if (io->flags & CHANNEL_FLAGS_BLOCK_DEVICE) { -+ { - int dio_align = ext2fs_get_dio_alignment(fd); - - if (io->align < dio_align) diff --git a/sysutils/e2fsprogs/files/patch-lib_support_mkquota.c b/sysutils/e2fsprogs/files/patch-lib_support_mkquota.c deleted file mode 100644 index 527ed144b662..000000000000 --- a/sysutils/e2fsprogs/files/patch-lib_support_mkquota.c +++ /dev/null @@ -1,21 +0,0 @@ ---- lib/support/mkquota.c.orig 2017-07-24 19:15:39 UTC -+++ lib/support/mkquota.c -@@ -10,6 +10,7 @@ - #include <errno.h> - #include <string.h> - #include <fcntl.h> -+#include <inttypes.h> - - #include "ext2fs/ext2_fs.h" - #include "ext2fs/ext2fs.h" -@@ -523,8 +524,8 @@ static int scan_dquots_callback(struct d - if (dq->dq_dqb.dqb_curspace != dquot->dq_dqb.dqb_curspace || - dq->dq_dqb.dqb_curinodes != dquot->dq_dqb.dqb_curinodes) { - scan_data->usage_is_inconsistent = 1; -- fprintf(stderr, "[QUOTA WARNING] Usage inconsistent for ID %u:" -- "actual (%ld, %ld) != expected (%ld, %ld)\n", -+ fprintf(stderr, "[QUOTA WARNING] Usage inconsistent for ID %" PRIu32 ":" -+ "actual (%" PRId64 ", %" PRId64 ") != expected (%" PRId64 ", %" PRId64 ")\n", - dq->dq_id, dq->dq_dqb.dqb_curspace, - dq->dq_dqb.dqb_curinodes, - dquot->dq_dqb.dqb_curspace, |