svn commit: r563848 - in head: misc/e2fsprogs-libblkid sysutils/e2fsprogs sysutils/e2fsprogs/files

Matthias Andree mandree at FreeBSD.org
Tue Feb 2 23:15:17 UTC 2021 

Author: mandree
Date: Tue Feb  2 23:15:15 2021
New Revision: 563848
URL: https://svnweb.freebsd.org/changeset/ports/563848

Log:
  sysutils/e2fsprogs: update to new 1.45.7 upstream release
  
  Changelog:
  https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/plain/doc/RelNotes/v1.45.7.txt?h=v1.45.7
  
  MFH:		2021Q1

Added:
  head/sysutils/e2fsprogs/files/patch-lib_support_Makefile.in   (contents, props changed)
Deleted:
  head/sysutils/e2fsprogs/files/patch-0-tytso-1-Use-ext2_loff_t-instead-of-loff_t.patch
  head/sysutils/e2fsprogs/files/patch-0-tytso-2-e2fsck-fix-various-gcc-Wall-nits.patch
  head/sysutils/e2fsprogs/files/patch-0-tytso-3-tests-use-grep-E-for-better-portability-in-r_inline_.patch
Modified:
  head/misc/e2fsprogs-libblkid/Makefile
  head/sysutils/e2fsprogs/Makefile
  head/sysutils/e2fsprogs/distinfo
  head/sysutils/e2fsprogs/files/patch-e2fsck__unix.c
  head/sysutils/e2fsprogs/files/patch-misc__Makefile.in
  head/sysutils/e2fsprogs/files/patch-tests_Makefile.in

Modified: head/misc/e2fsprogs-libblkid/Makefile
==============================================================================
--- head/misc/e2fsprogs-libblkid/Makefile	Tue Feb  2 22:49:11 2021	(r563847)
+++ head/misc/e2fsprogs-libblkid/Makefile	Tue Feb  2 23:15:15 2021	(r563848)
@@ -1,7 +1,7 @@
 # Created by: Matthias Andree <matthias.andree at gmx.de>
 # $FreeBSD$
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	misc devel
 PKGNAMESUFFIX=	-libblkid
 

Modified: head/sysutils/e2fsprogs/Makefile
==============================================================================
--- head/sysutils/e2fsprogs/Makefile	Tue Feb  2 22:49:11 2021	(r563847)
+++ head/sysutils/e2fsprogs/Makefile	Tue Feb  2 23:15:15 2021	(r563848)
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	e2fsprogs
-PORTVERSION=	1.45.6
-PORTREVISION?=	5
+PORTVERSION=	1.45.7
+PORTREVISION?=	0
 CATEGORIES?=	sysutils
 MASTER_SITES=	KERNEL_ORG/linux/kernel/people/tytso/${PORTNAME}/v${PORTVERSION}
 
@@ -213,19 +213,16 @@ _CHECK_JOBS=${_MAKE_JOBS}
 _CHECK_JOBS=
 .endif
 
+_checkaddargs=
 .if ${PORT_OPTIONS:MBASHTESTS}
 _CHECK_SHELL=${SHELL}
+_checkaddargs+=--eval SHELL:=${BASH_CMD}
 .else
 _CHECK_SHELL=${LOCALBASE}/bin/bash
 .endif
 
-_checkaddargs=
 .if !defined(TMPDIR)
 _checkaddargs+=TMPDIR=${WRKDIR}/tmp
-.endif
-
-.if ${PORT_OPTIONS:MBASHTESTS}
-_checkaddargs+=--eval SHELL:=${BASH_CMD}
 .endif
 
 .if ${PORT_OPTIONS:MSLOWTESTS}

Modified: head/sysutils/e2fsprogs/distinfo
==============================================================================
--- head/sysutils/e2fsprogs/distinfo	Tue Feb  2 22:49:11 2021	(r563847)
+++ head/sysutils/e2fsprogs/distinfo	Tue Feb  2 23:15:15 2021	(r563848)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1584954798
-SHA256 (e2fsprogs-1.45.6.tar.xz) = ffa7ae6954395abdc50d0f8605d8be84736465afc53b8938ef473fcf7ff44256
-SIZE (e2fsprogs-1.45.6.tar.xz) = 5572144
+TIMESTAMP = 1612301930
+SHA256 (e2fsprogs-1.45.7.tar.xz) = 62d49c86d9d4becf305093edd65464484dc9ea41c6ff9ae4f536e4a341b171a2
+SIZE (e2fsprogs-1.45.7.tar.xz) = 5570052

Modified: head/sysutils/e2fsprogs/files/patch-e2fsck__unix.c
==============================================================================
--- head/sysutils/e2fsprogs/files/patch-e2fsck__unix.c	Tue Feb  2 22:49:11 2021	(r563847)
+++ head/sysutils/e2fsprogs/files/patch-e2fsck__unix.c	Tue Feb  2 23:15:15 2021	(r563848)
@@ -2,7 +2,7 @@
 // remove the #define _XOPEN_SOURCE 600
 // It would hide all non-POSIX declarations, including SIGINFO.
 
---- e2fsck/unix.c.orig	2020-03-21 04:24:04 UTC
+--- e2fsck/unix.c.orig	2021-01-29 05:51:02 UTC
 +++ e2fsck/unix.c
 @@ -9,8 +9,6 @@
   * %End-Header%
@@ -13,6 +13,15 @@
  #include "config.h"
  #include <stdio.h>
  #ifdef HAVE_STDLIB_H
+@@ -37,7 +35,7 @@ extern int optind;
+ #include <sys/ioctl.h>
+ #endif
+ #ifdef HAVE_MALLOC_H
+-#include <malloc.h>
++#include <stdlib.h>
+ #endif
+ #ifdef HAVE_SYS_TYPES_H
+ #include <sys/types.h>
 @@ -602,6 +600,24 @@ static int e2fsck_update_progress(e2fsck_t ctx, int pa
  	return 0;
  }

Added: head/sysutils/e2fsprogs/files/patch-lib_support_Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/e2fsprogs/files/patch-lib_support_Makefile.in	Tue Feb  2 23:15:15 2021	(r563848)
@@ -0,0 +1,11 @@
+--- lib/support/Makefile.in.orig	2021-01-29 05:51:02 UTC
++++ lib/support/Makefile.in
+@@ -44,7 +44,7 @@ LIBDIR= support
+ @MAKEFILE_LIBRARY@
+ @MAKEFILE_PROFILE@
+ 
+-COMPILE_ET=	_ET_DIR_OVERRIDE=$(srcdir)/../et ../et/compile_et
++COMPILE_ET=	/usr/bin/env _ET_DIR_OVERRIDE=$(srcdir)/../et ../et/compile_et
+ 
+ .c.o:
+ 	$(E) "	CC $<"

Modified: head/sysutils/e2fsprogs/files/patch-misc__Makefile.in
==============================================================================
--- head/sysutils/e2fsprogs/files/patch-misc__Makefile.in	Tue Feb  2 22:49:11 2021	(r563847)
+++ head/sysutils/e2fsprogs/files/patch-misc__Makefile.in	Tue Feb  2 23:15:15 2021	(r563848)
@@ -1,6 +1,6 @@
---- misc/Makefile.in.orig	2020-01-06 23:10:17 UTC
+--- misc/Makefile.in.orig	2021-01-29 05:51:02 UTC
 +++ misc/Makefile.in
-@@ -34,17 +34,17 @@ INSTALL = @INSTALL@
+@@ -35,17 +35,17 @@ MKDIR_P = @MKDIR_P@
  
  SPROGS=		mke2fs badblocks tune2fs dumpe2fs $(BLKID_PROG) logsave \
  			$(E2IMAGE_PROG) @FSCK_PROG@ e2undo
@@ -23,7 +23,7 @@
  UMANPAGES+=	@FUSE_CMT@ fuse2fs.1
  
  LPROGS=		@E2INITRD_PROG@
-@@ -147,14 +147,14 @@ profiled:
+@@ -148,14 +148,14 @@ profiled:
  
  mke2fs.conf: $(srcdir)/mke2fs.conf.in
  	if test -f $(srcdir)/mke2fs.conf.custom.in ; then \
@@ -41,7 +41,7 @@
  		>  default_profile.c
  findsuper: findsuper.o
  	$(E) "	LD $@"
-@@ -605,34 +605,9 @@ install: all $(SMANPAGES) $(UMANPAGES) installdirs
+@@ -606,34 +606,9 @@ install: all $(SMANPAGES) $(UMANPAGES) installdirs
  		(cd $(DESTDIR)$(man5dir); \
  			$(LN) $(LINK_INSTALL_FLAGS) ext4.5 $$i.5); \
  	done

Modified: head/sysutils/e2fsprogs/files/patch-tests_Makefile.in
==============================================================================
--- head/sysutils/e2fsprogs/files/patch-tests_Makefile.in	Tue Feb  2 22:49:11 2021	(r563847)
+++ head/sysutils/e2fsprogs/files/patch-tests_Makefile.in	Tue Feb  2 23:15:15 2021	(r563848)
@@ -1,6 +1,6 @@
---- tests/Makefile.in.orig	2019-07-15 01:03:14 UTC
+--- tests/Makefile.in.orig	2021-01-29 05:51:02 UTC
 +++ tests/Makefile.in
-@@ -16,7 +16,7 @@ all:: @DO_TEST_SUITE@ test_one test_script
+@@ -17,7 +17,7 @@ all:: @DO_TEST_SUITE@ test_one test_script
  test_one: $(srcdir)/test_one.in Makefile mke2fs.conf test_data.tmp
  	@echo "Creating test_one script..."
  	@[ -f test_one ] && chmod u+w test_one || true

More information about the svn-ports-all mailing list