cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFH: r520555

Browse Source 
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)
This commit is contained in:
Matthias Andree 2019-12-21 13:26:50 +00:00
parent 345eef1ee0
commit 3367c555dd
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/branches/2019Q4/; revision=520564
6 changed files with 5 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sysutils/e2fsprogs/Makefile
View File

@ -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}

6
sysutils/e2fsprogs/distinfo
View File

@ -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

21
sysutils/e2fsprogs/files/patch-e2fsck_e2fsck.c
View File

@ -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 */

9
sysutils/e2fsprogs/files/patch-lib__uuid__gen_uuid.c
View File

@ -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) {

11
sysutils/e2fsprogs/files/patch-lib_uuid_tst__uuid.c
View File

@ -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) {

11
sysutils/e2fsprogs/files/patch-lib_uuid_uuid__time.c
View File

@ -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;