[149199] trunk/dports/sysutils/e2fsprogs

[ryandesign at macports.org]

Revision: 149199
          https://trac.macports.org/changeset/149199
Author:   ryandesign at macports.org
Date:     2016-06-04 19:48:36 -0700 (Sat, 04 Jun 2016)
Log Message:
-----------
e2fsprogs: update to 1.43

Modified Paths:
--------------
    trunk/dports/sysutils/e2fsprogs/Portfile
    trunk/dports/sysutils/e2fsprogs/files/patch-Makefile.in-remove-included-libcomerr.diff

Added Paths:
-----------
    trunk/dports/sysutils/e2fsprogs/files/patch-e2fsck-jfs_user.h.diff
    trunk/dports/sysutils/e2fsprogs/files/patch-lib-ext2fs-ext2_err.et.in.diff

Modified: trunk/dports/sysutils/e2fsprogs/Portfile
===================================================================
--- trunk/dports/sysutils/e2fsprogs/Portfile	2016-06-05 02:43:04 UTC (rev 149198)
+++ trunk/dports/sysutils/e2fsprogs/Portfile	2016-06-05 02:48:36 UTC (rev 149199)
@@ -4,7 +4,7 @@
 PortSystem                  1.0
 
 name                        e2fsprogs
-version                     1.42.13
+version                     1.43
 categories                  sysutils
 platforms                   darwin
 maintainers                 ryandesign openmaintainer
@@ -20,8 +20,8 @@
 homepage                    http://e2fsprogs.sourceforge.net/
 master_sites                sourceforge:project/e2fsprogs/e2fsprogs/v${version}
 
-checksums                   rmd160  e1c5ef94f3fcdf672bdf3b0e07511171943f8e69 \
-                            sha256  59993ff3a44f82e504561e0ebf95e8c8fa9f9f5746eb6a7182239605d2a4e2d4
+checksums                   rmd160  0f6db81a81c6a6ddcbf1b319e1127650c904af08 \
+                            sha256  8729c4a7d2e7bb194ea4ea76db5473d9d0161cc94ad1641c50d7d61910055f0a
 
 depends_build               port:pkgconfig
 depends_lib                 port:gettext
@@ -45,7 +45,9 @@
     depends_lib-append          port:ossp-uuid \
                                 port:libcomerr
 
-    patchfiles-append           patch-Makefile.in-remove-included-libcomerr.diff
+    patchfiles-append           patch-Makefile.in-remove-included-libcomerr.diff \
+                                patch-e2fsck-jfs_user.h.diff \
+                                patch-lib-ext2fs-ext2_err.et.in.diff
 
     pre-build {
         ln -fs ${prefix}/bin/compile_et ${worksrcpath}/lib/et/compile_et

Modified: trunk/dports/sysutils/e2fsprogs/files/patch-Makefile.in-remove-included-libcomerr.diff
===================================================================
--- trunk/dports/sysutils/e2fsprogs/files/patch-Makefile.in-remove-included-libcomerr.diff	2016-06-05 02:43:04 UTC (rev 149198)
+++ trunk/dports/sysutils/e2fsprogs/files/patch-Makefile.in-remove-included-libcomerr.diff	2016-06-05 02:48:36 UTC (rev 149199)
@@ -1,11 +1,11 @@
---- Makefile.in.orig	2014-08-02 15:26:22.000000000 -0500
-+++ Makefile.in	2015-05-15 02:04:19.000000000 -0500
+--- Makefile.in.orig	2016-03-06 19:25:00.000000000 -0600
++++ Makefile.in	2016-06-04 21:35:16.000000000 -0500
 @@ -15,7 +15,7 @@
  @BLKID_CMT at BLKID_LIB_SUBDIR= lib/blkid
- QUOTA_LIB_SUBDIR= lib/quota
+ SUPPORT_LIB_SUBDIR= lib/support
  
--LIB_SUBDIRS=lib/et lib/ss lib/e2p $(UUID_LIB_SUBDIR) $(BLKID_LIB_SUBDIR) $(QUOTA_LIB_SUBDIR) lib/ext2fs intl
-+LIB_SUBDIRS=lib/ss lib/e2p $(UUID_LIB_SUBDIR) $(BLKID_LIB_SUBDIR) $(QUOTA_LIB_SUBDIR) lib/ext2fs intl
+-LIB_SUBDIRS=lib/et lib/ss lib/e2p $(UUID_LIB_SUBDIR) $(BLKID_LIB_SUBDIR) $(SUPPORT_LIB_SUBDIR) lib/ext2fs intl
++LIB_SUBDIRS=lib/ss lib/e2p $(UUID_LIB_SUBDIR) $(BLKID_LIB_SUBDIR) $(SUPPORT_LIB_SUBDIR) lib/ext2fs intl
  PROG_SUBDIRS=e2fsck $(DEBUGFS_DIR) misc $(RESIZE_DIR) tests/progs po
  SUBDIRS=util $(LIB_SUBDIRS) $(PROG_SUBDIRS) tests
  
@@ -15,5 +15,5 @@
  		then $(MAKE) $$i || exit $$? ; fi ; done
 -	@(if test -d lib/et ; then cd lib/et && $(MAKE) compile_et; fi)
  	@(if test -d lib/ext2fs ; then cd lib/ext2fs && $(MAKE) ext2_err.h; fi)
+ 	@(if test -d lib/support ; then cd lib/support && $(MAKE) prof_err.h; fi)
  
- progs: all-progs-recursive

Added: trunk/dports/sysutils/e2fsprogs/files/patch-e2fsck-jfs_user.h.diff
===================================================================
--- trunk/dports/sysutils/e2fsprogs/files/patch-e2fsck-jfs_user.h.diff	                        (rev 0)
+++ trunk/dports/sysutils/e2fsprogs/files/patch-e2fsck-jfs_user.h.diff	2016-06-05 02:48:36 UTC (rev 149199)
@@ -0,0 +1,16 @@
+http://git.kernel.org/cgit/fs/ext2/e2fsprogs.git/commit/?id=b41a4ffa509df9f16f614dd1483cec77c3260a6c
+--- e2fsck/jfs_user.h.orig
++++ e2fsck/jfs_user.h
+@@ -182,10 +182,10 @@ extern e2fsck_t e2fsck_global_ctx;  /* Try your very best not to use this! */
+ #endif /* DEBUGFS */
+ 
+ #ifndef EFSBADCRC
+-#define EFSBADCRC	EBADMSG		/* Bad CRC detected */
++#define EFSBADCRC	EXT2_ET_BAD_CRC
+ #endif
+ #ifndef EFSCORRUPTED
+-#define EFSCORRUPTED	EUCLEAN		/* Filesystem is corrupted */
++#define EFSCORRUPTED	EXT2_ET_FILESYSTEM_CORRUPTED
+ #endif
+ 
+ /* recovery.c */

Added: trunk/dports/sysutils/e2fsprogs/files/patch-lib-ext2fs-ext2_err.et.in.diff
===================================================================
--- trunk/dports/sysutils/e2fsprogs/files/patch-lib-ext2fs-ext2_err.et.in.diff	                        (rev 0)
+++ trunk/dports/sysutils/e2fsprogs/files/patch-lib-ext2fs-ext2_err.et.in.diff	2016-06-05 02:48:36 UTC (rev 149199)
@@ -0,0 +1,14 @@
+http://git.kernel.org/cgit/fs/ext2/e2fsprogs.git/commit/?id=b41a4ffa509df9f16f614dd1483cec77c3260a6c
+--- lib/ext2fs/ext2_err.et.in.orig
++++ lib/ext2fs/ext2_err.et.in
+@@ -530,4 +530,10 @@ ec	EXT2_ET_UNDO_FILE_CORRUPT,
+ ec	EXT2_ET_UNDO_FILE_WRONG,
+ 	"Wrong undo file for this filesystem"
+ 
++ec	EXT2_ET_FILESYSTEM_CORRUPTED,
++	"File system is corrupted"
++
++ec	EXT2_ET_BAD_CRC,
++	"Bad CRC detected in file system"
++
+ 	end
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160604/d3180d17/attachment.html>