MFH: r520555

sysutils/e2fsprogs: update to 1.45.4 (security fix)

Release Notes:	http://e2fsprogs.sourceforge.net/e2fsprogs-release.html#1.45.4

This removes some patches or hunks that were integrated upstream.

Security:	ad3451b9-23e0-11ea-8b36-f1925a339a82
Security:	CVE-2019-5094

Approved by:	ports-secteam@ (joneum)

6 files changed, 5 insertions, 57 deletions

diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile
index 12801f8b987c..d70f2d390dcc 100644
--- a/sysutils/e2fsprogs/Makefile
+++ b/sysutils/e2fsprogs/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	e2fsprogs
-PORTVERSION=	1.45.3
-PORTREVISION?=	2
+PORTVERSION=	1.45.4
+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 2fa1a21a1a64..a95b878cc49b 100644
--- a/sysutils/e2fsprogs/distinfo
+++ b/sysutils/e2fsprogs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1563611932
-SHA256 (e2fsprogs-1.45.3.tar.xz) = 90d10066b815e27b0b4875f0d5e396c663e0bf55aa3ca10868978d10c6ffe595
-SIZE (e2fsprogs-1.45.3.tar.xz) = 5561452
+TIMESTAMP = 1576924308
+SHA256 (e2fsprogs-1.45.4.tar.xz) = 65faf6b590ca1da97440d6446bd11de9e0914b42553740ba5d9d2a796fa0dc02
+SIZE (e2fsprogs-1.45.4.tar.xz) = 5567164
diff --git a/sysutils/e2fsprogs/files/patch-e2fsck_e2fsck.c b/sysutils/e2fsprogs/files/patch-e2fsck_e2fsck.c
deleted file mode 100644
index c40e19ec1810..000000000000
--- a/sysutils/e2fsprogs/files/patch-e2fsck_e2fsck.c
+++ /dev/null
@@ -1,21 +0,0 @@
-commit a368e0cbfb33d3050dcccccf0bf5a5539d3dac39
-Author: Theodore Ts'o <tytso@mit.edu>
-Date:   Wed Jul 24 22:25:11 2019 -0400
-
-    e2fsck: set E2FSCK_TIME correctly on a 32-bit arch with a 64-bit time_t
-    
-    Addresses-Debian-Bug: #932906
-    
-    Signed-off-by: Theodore Ts'o <tytso@mit.edu>
-
---- e2fsck/e2fsck.c.orig	2019-07-15 01:03:14 UTC
-+++ e2fsck/e2fsck.c
-@@ -37,7 +37,7 @@ errcode_t e2fsck_allocate_context(e2fsck_t *ret)
- 
- 	time_env = getenv("E2FSCK_TIME");
- 	if (time_env)
--		context->now = strtoul(time_env, NULL, 0);
-+		context->now = (time_t) strtoull(time_env, NULL, 0);
- 	else {
- 		context->now = time(0);
- 		if (context->now < 1262322000) /* January 1 2010 */
diff --git a/sysutils/e2fsprogs/files/patch-lib__uuid__gen_uuid.c b/sysutils/e2fsprogs/files/patch-lib__uuid__gen_uuid.c
index 6e2f23215bc8..14349d31fc88 100644
--- a/sysutils/e2fsprogs/files/patch-lib__uuid__gen_uuid.c
+++ b/sysutils/e2fsprogs/files/patch-lib__uuid__gen_uuid.c
@@ -37,12 +37,3 @@
  #endif
  	return 0;
  }
-@@ -408,7 +431,7 @@ try_again:
- 		rewind(state_f);
- 		len = fprintf(state_f,
- 			      "clock: %04x tv: %016lu %08lu adj: %08d\n",
--			      clock_seq, last.tv_sec, (long)last.tv_usec,
-+			      clock_seq, (unsigned long)last.tv_sec, (unsigned long)last.tv_usec,
- 			      adjustment);
- 		fflush(state_f);
- 		if (ftruncate(state_fd, len) < 0) {
diff --git a/sysutils/e2fsprogs/files/patch-lib_uuid_tst__uuid.c b/sysutils/e2fsprogs/files/patch-lib_uuid_tst__uuid.c
deleted file mode 100644
index e39cc8b5481d..000000000000
--- a/sysutils/e2fsprogs/files/patch-lib_uuid_tst__uuid.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/uuid/tst_uuid.c.orig	2018-07-10 05:14:26 UTC
-+++ lib/uuid/tst_uuid.c
-@@ -144,7 +144,7 @@ main(int argc ATTR((unused)) , char **ar
- 	tv.tv_usec = 0;
- 	time_reg = uuid_time(buf, &tv);
- 	printf("UUID generated at %lu reports %lu (%ld.%ld)\n",
--	       time_gen, time_reg, tv.tv_sec, (long)tv.tv_usec);
-+	       (unsigned long)time_gen, (unsigned long)time_reg, (long)tv.tv_sec, (long)tv.tv_usec);
- 	/* allow 1s margin in case of rollover between sampling
- 	 * the current time and when the UUID is generated. */
- 	if (time_reg > time_gen + 1) {
diff --git a/sysutils/e2fsprogs/files/patch-lib_uuid_uuid__time.c b/sysutils/e2fsprogs/files/patch-lib_uuid_uuid__time.c
deleted file mode 100644
index 3d36861636d5..000000000000
--- a/sysutils/e2fsprogs/files/patch-lib_uuid_uuid__time.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/uuid/uuid_time.c.orig	2018-07-10 05:14:26 UTC
-+++ lib/uuid/uuid_time.c
-@@ -165,7 +165,7 @@ main(int argc, char **argv)
- 		printf("Warning: not a time-based UUID, so UUID time "
- 		       "decoding will likely not work!\n");
- 	}
--	printf("UUID time is: (%ld, %ld): %s\n", tv.tv_sec, (long)tv.tv_usec,
-+	printf("UUID time is: (%ld, %ld): %s\n", (long)tv.tv_sec, (long)tv.tv_usec,
- 	       ctime(&time_reg));
- 
- 	return 0;