diff options
| -rw-r--r-- | sysutils/e2fsprogs/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/e2fsprogs/distinfo | 6 | ||||
| -rw-r--r-- | sysutils/e2fsprogs/files/patch-lib_ext2fs_blkmap64__rb.c | 36 |
3 files changed, 4 insertions, 40 deletions
diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile index 246febb4066b..3b662b2fb6d4 100644 --- a/sysutils/e2fsprogs/Makefile +++ b/sysutils/e2fsprogs/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= e2fsprogs -PORTVERSION= 1.46.1 +PORTVERSION= 1.46.2 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 a8f2748775d0..159866d2bc11 100644 --- a/sysutils/e2fsprogs/distinfo +++ b/sysutils/e2fsprogs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1613160077 -SHA256 (e2fsprogs-1.46.1.tar.xz) = bbe6af3b7bb7119556b6f57a78d41b330007738bca8530b2ba95d2ba35430151 -SIZE (e2fsprogs-1.46.1.tar.xz) = 7019700 +TIMESTAMP = 1615412280 +SHA256 (e2fsprogs-1.46.2.tar.xz) = 23aa093295c94e71ef1be490c4004871c5b01d216a8cb4d111fa6c0aac354168 +SIZE (e2fsprogs-1.46.2.tar.xz) = 7020552 diff --git a/sysutils/e2fsprogs/files/patch-lib_ext2fs_blkmap64__rb.c b/sysutils/e2fsprogs/files/patch-lib_ext2fs_blkmap64__rb.c deleted file mode 100644 index 9be4f29e3ec9..000000000000 --- a/sysutils/e2fsprogs/files/patch-lib_ext2fs_blkmap64__rb.c +++ /dev/null @@ -1,36 +0,0 @@ ---- lib/ext2fs/blkmap64_rb.c.orig 2021-01-29 22:02:31 UTC -+++ lib/ext2fs/blkmap64_rb.c -@@ -12,6 +12,7 @@ - #include "config.h" - #include <stdio.h> - #include <string.h> -+#include <inttypes.h> - #if HAVE_UNISTD_H - #include <unistd.h> - #endif -@@ -907,7 +908,7 @@ static void rb_print_stats(ext2fs_generic_bitmap_64 bi - struct ext2fs_rb_private *bp; - struct rb_node *node = NULL; - struct bmap_rb_extent *ext; -- __u64 count = 0; -+ unsigned long long count = 0; - __u64 max_size = 0; - __u64 min_size = ULONG_MAX; - __u64 size = 0, avg_size = 0; -@@ -951,12 +952,12 @@ static void rb_print_stats(ext2fs_generic_bitmap_64 bi - fprintf(stderr, "%16llu extents (%llu bytes)\n", - count, ((count * sizeof(struct bmap_rb_extent)) + - sizeof(struct ext2fs_rb_private))); -- fprintf(stderr, "%16llu bits minimum size\n", -+ fprintf(stderr, "%16" PRIu64 " bits minimum size\n", - min_size); -- fprintf(stderr, "%16llu bits maximum size\n" -- "%16llu bits average size\n", -+ fprintf(stderr, "%16" PRIu64 " bits maximum size\n" -+ "%16" PRIu64 " bits average size\n", - max_size, avg_size); -- fprintf(stderr, "%16llu bits set in bitmap (out of %llu)\n", size, -+ fprintf(stderr, "%16" PRIu64 " bits set in bitmap (out of %" PRIu64 ")\n", size, - bitmap->real_end - bitmap->start); - fprintf(stderr, - "%16.4lf memory / bitmap bit memory ratio (bitarray = 1)\n", |