svn commit: r520564 - in branches/2019Q4/sysutils/e2fsprogs: . files

[Matthias Andree]

Author: mandree
Date: Sat Dec 21 13:26:50 2019
New Revision: 520564
URL: https://svnweb.freebsd.org/changeset/ports/520564

Log:
  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)

Deleted:
  branches/2019Q4/sysutils/e2fsprogs/files/patch-e2fsck_e2fsck.c
  branches/2019Q4/sysutils/e2fsprogs/files/patch-lib_uuid_tst__uuid.c
  branches/2019Q4/sysutils/e2fsprogs/files/patch-lib_uuid_uuid__time.c
Modified:
  branches/2019Q4/sysutils/e2fsprogs/Makefile
  branches/2019Q4/sysutils/e2fsprogs/distinfo
  branches/2019Q4/sysutils/e2fsprogs/files/patch-lib__uuid__gen_uuid.c
Directory Properties:
  branches/2019Q4/   (props changed)

Modified: branches/2019Q4/sysutils/e2fsprogs/Makefile
==============================================================================
--- branches/2019Q4/sysutils/e2fsprogs/Makefile	Sat Dec 21 12:50:58 2019	(r520563)
+++ branches/2019Q4/sysutils/e2fsprogs/Makefile	Sat Dec 21 13:26:50 2019	(r520564)
@@ -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}
 

Modified: branches/2019Q4/sysutils/e2fsprogs/distinfo
==============================================================================
--- branches/2019Q4/sysutils/e2fsprogs/distinfo	Sat Dec 21 12:50:58 2019	(r520563)
+++ branches/2019Q4/sysutils/e2fsprogs/distinfo	Sat Dec 21 13:26:50 2019	(r520564)
@@ -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

Modified: branches/2019Q4/sysutils/e2fsprogs/files/patch-lib__uuid__gen_uuid.c
==============================================================================
--- branches/2019Q4/sysutils/e2fsprogs/files/patch-lib__uuid__gen_uuid.c	Sat Dec 21 12:50:58 2019	(r520563)
+++ branches/2019Q4/sysutils/e2fsprogs/files/patch-lib__uuid__gen_uuid.c	Sat Dec 21 13:26:50 2019	(r520564)
@@ -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) {