From owner-svn-ports-all@freebsd.org  Sat Dec 21 11:22:18 2019
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 656481D0DAB;
 Sat, 21 Dec 2019 11:22:18 +0000 (UTC)
 (envelope-from mandree@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 47g39k26sVz495Z;
 Sat, 21 Dec 2019 11:22:18 +0000 (UTC)
 (envelope-from mandree@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2A397EA45;
 Sat, 21 Dec 2019 11:22:18 +0000 (UTC)
 (envelope-from mandree@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xBLBMIoQ095027;
 Sat, 21 Dec 2019 11:22:18 GMT (envelope-from mandree@FreeBSD.org)
Received: (from mandree@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id xBLBMH2K095024;
 Sat, 21 Dec 2019 11:22:17 GMT (envelope-from mandree@FreeBSD.org)
Message-Id: <201912211122.xBLBMH2K095024@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mandree set sender to
 mandree@FreeBSD.org using -f
From: Matthias Andree <mandree@FreeBSD.org>
Date: Sat, 21 Dec 2019 11:22:17 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r520555 - in head/sysutils/e2fsprogs: . files
X-SVN-Group: ports-head
X-SVN-Commit-Author: mandree
X-SVN-Commit-Paths: in head/sysutils/e2fsprogs: . files
X-SVN-Commit-Revision: 520555
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 21 Dec 2019 11:22:18 -0000

Author: mandree
Date: Sat Dec 21 11:22:17 2019
New Revision: 520555
URL: https://svnweb.freebsd.org/changeset/ports/520555

Log:
  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.
  
  MFH:		2019Q4
  Security:	ad3451b9-23e0-11ea-8b36-f1925a339a82
  Security:	CVE-2019-5094

Deleted:
  head/sysutils/e2fsprogs/files/patch-e2fsck_e2fsck.c
  head/sysutils/e2fsprogs/files/patch-lib_uuid_tst__uuid.c
  head/sysutils/e2fsprogs/files/patch-lib_uuid_uuid__time.c
Modified:
  head/sysutils/e2fsprogs/Makefile
  head/sysutils/e2fsprogs/distinfo
  head/sysutils/e2fsprogs/files/patch-lib__uuid__gen_uuid.c

Modified: head/sysutils/e2fsprogs/Makefile
==============================================================================
--- head/sysutils/e2fsprogs/Makefile	Sat Dec 21 11:04:12 2019	(r520554)
+++ head/sysutils/e2fsprogs/Makefile	Sat Dec 21 11:22:17 2019	(r520555)
@@ -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: head/sysutils/e2fsprogs/distinfo
==============================================================================
--- head/sysutils/e2fsprogs/distinfo	Sat Dec 21 11:04:12 2019	(r520554)
+++ head/sysutils/e2fsprogs/distinfo	Sat Dec 21 11:22:17 2019	(r520555)
@@ -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: head/sysutils/e2fsprogs/files/patch-lib__uuid__gen_uuid.c
==============================================================================
--- head/sysutils/e2fsprogs/files/patch-lib__uuid__gen_uuid.c	Sat Dec 21 11:04:12 2019	(r520554)
+++ head/sysutils/e2fsprogs/files/patch-lib__uuid__gen_uuid.c	Sat Dec 21 11:22:17 2019	(r520555)
@@ -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) {