svn commit: r506982 - in head/sysutils/e2fsprogs: . files

[Matthias Andree]

Author: mandree
Date: Sat Jul 20 09:10:42 2019
New Revision: 506982
URL: https://svnweb.freebsd.org/changeset/ports/506982

Log:
  Update e2fsprogs to new upstream release 1.45.3.
  
  Moves fuse2fs from $(PREFIX)/sbin to $(PREFIX)/bin (it does not
  require privileges).
  
  Bugfix for e2fsck file systems that enabled large_dir and inline
  directories at the same time.
  
  Translation bug fixes.
  
  Release Notes: <http://e2fsprogs.sourceforge.net/e2fsprogs-release.html#1.45.3>
  
  MFH:		2019Q3

Modified:
  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/pkg-plist

Modified: head/sysutils/e2fsprogs/Makefile
==============================================================================
--- head/sysutils/e2fsprogs/Makefile	Sat Jul 20 09:02:20 2019	(r506981)
+++ head/sysutils/e2fsprogs/Makefile	Sat Jul 20 09:10:42 2019	(r506982)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	e2fsprogs
-PORTVERSION=	1.45.2
+PORTVERSION=	1.45.3
 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 Jul 20 09:02:20 2019	(r506981)
+++ head/sysutils/e2fsprogs/distinfo	Sat Jul 20 09:10:42 2019	(r506982)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1559389354
-SHA256 (e2fsprogs-1.45.2.tar.xz) = 4952c9ae91e36d762e13cc5b9e8f7eeb5453e4aee4cd9b7402e73f2d4e65e009
-SIZE (e2fsprogs-1.45.2.tar.xz) = 5560504
+TIMESTAMP = 1563611932
+SHA256 (e2fsprogs-1.45.3.tar.xz) = 90d10066b815e27b0b4875f0d5e396c663e0bf55aa3ca10868978d10c6ffe595
+SIZE (e2fsprogs-1.45.3.tar.xz) = 5561452

Modified: head/sysutils/e2fsprogs/files/patch-e2fsck__unix.c
==============================================================================
--- head/sysutils/e2fsprogs/files/patch-e2fsck__unix.c	Sat Jul 20 09:02:20 2019	(r506981)
+++ head/sysutils/e2fsprogs/files/patch-e2fsck__unix.c	Sat Jul 20 09:10:42 2019	(r506982)
@@ -1,4 +1,4 @@
---- e2fsck/unix.c.orig	2018-07-10 05:14:26 UTC
+--- e2fsck/unix.c.orig	2019-07-15 01:03:14 UTC
 +++ e2fsck/unix.c
 @@ -9,8 +9,6 @@
   * %End-Header%
@@ -18,7 +18,7 @@
  #endif
  #ifdef HAVE_SYS_TYPES_H
  #include <sys/types.h>
-@@ -601,6 +599,24 @@ static int e2fsck_update_progress(e2fsck
+@@ -602,6 +600,24 @@ static int e2fsck_update_progress(e2fsck_t ctx, int pa
  	return 0;
  }
  
@@ -43,7 +43,7 @@
  #define PATH_SET "PATH=/sbin"
  
  /*
-@@ -633,6 +649,17 @@ static void signal_progress_on(int sig E
+@@ -635,6 +651,17 @@ static void signal_progress_on(int sig EXT2FS_ATTR((un
  	ctx->progress = e2fsck_update_progress;
  }
  
@@ -61,7 +61,7 @@
  static void signal_progress_off(int sig EXT2FS_ATTR((unused)))
  {
  	e2fsck_t ctx = e2fsck_global_ctx;
-@@ -1103,6 +1130,10 @@ static errcode_t PRS(int argc, char *arg
+@@ -1111,6 +1138,10 @@ static errcode_t PRS(int argc, char *argv[], e2fsck_t 
  	sigaction(SIGUSR1, &sa, 0);
  	sa.sa_handler = signal_progress_off;
  	sigaction(SIGUSR2, &sa, 0);

Modified: head/sysutils/e2fsprogs/files/patch-misc__Makefile.in
==============================================================================
--- head/sysutils/e2fsprogs/files/patch-misc__Makefile.in	Sat Jul 20 09:02:20 2019	(r506981)
+++ head/sysutils/e2fsprogs/files/patch-misc__Makefile.in	Sat Jul 20 09:10:42 2019	(r506982)
@@ -1,4 +1,4 @@
---- misc/Makefile.in.orig	2018-07-10 05:14:26 UTC
+--- misc/Makefile.in.orig	2019-07-15 01:03:14 UTC
 +++ misc/Makefile.in
 @@ -34,17 +34,17 @@ INSTALL = @INSTALL@
  
@@ -6,7 +6,7 @@
  			$(E2IMAGE_PROG) @FSCK_PROG@ e2undo
 -USPROGS=	mklost+found filefrag e2freefrag $(UUIDD_PROG) \
 +USPROGS=	mklost+found e2freefrag $(UUIDD_PROG) \
- 			$(E4DEFRAG_PROG) $(E4CRYPT_PROG) $(FUSE_PROG)
+ 			$(E4DEFRAG_PROG) $(E4CRYPT_PROG)
  SMANPAGES=	tune2fs.8 mklost+found.8 mke2fs.8 dumpe2fs.8 badblocks.8 \
  			e2label.8 $(FINDFS_MAN) $(BLKID_MAN) $(E2IMAGE_MAN) \
 -			logsave.8 filefrag.8 e2freefrag.8 e2undo.8 \
@@ -16,9 +16,9 @@
  			e2mmpstatus.8
  FMANPAGES=	mke2fs.conf.5 ext4.5
  
--UPROGS=		chattr lsattr @UUID_CMT@ uuidgen
+-UPROGS=		chattr lsattr $(FUSE_PROG) @UUID_CMT@ uuidgen
 -UMANPAGES=	chattr.1 lsattr.1 @UUID_CMT@ uuidgen.1
-+UPROGS=		chattr lsattr
++UPROGS=		chattr lsattr $(FUSE_PROG)
 +UMANPAGES=	chattr.1 lsattr.1
  UMANPAGES+=	@FUSE_CMT@ fuse2fs.1
  
@@ -41,7 +41,7 @@
  		>  default_profile.c
  findsuper: findsuper.o
  	$(E) "	LD $@"
-@@ -600,34 +600,9 @@ install: all $(SMANPAGES) $(UMANPAGES) i
+@@ -600,34 +600,9 @@ install: all $(SMANPAGES) $(UMANPAGES) installdirs
  		(cd $(DESTDIR)$(man5dir); \
  			$(LN) $(LINK_INSTALL_FLAGS) ext4.5 $$i.5); \
  	done

Modified: head/sysutils/e2fsprogs/pkg-plist
==============================================================================
--- head/sysutils/e2fsprogs/pkg-plist	Sat Jul 20 09:02:20 2019	(r506981)
+++ head/sysutils/e2fsprogs/pkg-plist	Sat Jul 20 09:10:42 2019	(r506982)
@@ -1,5 +1,6 @@
 bin/chattr
 bin/e2fsprogs-compile_et
+%%FUSEFS%%bin/fuse2fs
 bin/lsattr
 etc/mke2fs.conf.dist
 include/e2fsprogs/com_err.h
@@ -77,7 +78,6 @@ sbin/fsck.ext2
 sbin/fsck.ext3
 sbin/fsck.ext4
 sbin/fsck_ext2fs
-%%FUSEFS%%sbin/fuse2fs
 sbin/logsave
 sbin/mke2fs
 sbin/mkfs.ext2