<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a898759ec614fe2a9013d16c7f6314fd09935663">https://github.com/macports/macports-ports/commit/a898759ec614fe2a9013d16c7f6314fd09935663</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new a898759 e2fsprogs: Update to 1.44.4
</span>a898759 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a898759ec614fe2a9013d16c7f6314fd09935663
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sun Oct 14 03:01:38 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> e2fsprogs: Update to 1.44.4
</span>---
sysutils/e2fsprogs/Portfile | 11 ++--
sysutils/e2fsprogs/files/__GNUC_PREREQ.patch | 62 ++++++++++++++++++++++
...atch-Makefile.in-remove-included-libcomerr.diff | 20 +++----
3 files changed, 78 insertions(+), 15 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/e2fsprogs/Portfile b/sysutils/e2fsprogs/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9ea659b..17c9003 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/e2fsprogs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/e2fsprogs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,11 @@
</span> PortSystem 1.0
name e2fsprogs
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.44.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.44.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 8e8fee42b7d0637371f3f9f47398d82e3bc50ad5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 dd707688f0fc353941931c20081f26ec8e54b0bc1ac3f7601f479f9c7675dcb2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 7596925
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories sysutils
platforms darwin
maintainers {ryandesign @ryandesign} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,14 +23,11 @@ long_description Utilities to create, check and manipulate extended 2
</span> homepage http://e2fsprogs.sourceforge.net/
master_sites sourceforge:project/e2fsprogs/e2fsprogs/v${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 7811d02e9a4e74e5686a7b93a77c8a03d329d1a3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c2ae6d8ce6fb96b55886cf761411fc22ab41976f4f8297fc54c706df442483be \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 7570472
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_build port:pkgconfig
depends_lib port:gettext
patchfiles patch-lib__Makefile.darwin-lib.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append __GNUC_PREREQ.patch
</span>
configure.args-append --enable-bsd-shlibs
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/e2fsprogs/files/__GNUC_PREREQ.patch b/sysutils/e2fsprogs/files/__GNUC_PREREQ.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..61bf019
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/e2fsprogs/files/__GNUC_PREREQ.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,62 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 98c6113b414782eb5bfcb67c33d09950ed203f20 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Theodore Ts'o <tytso@mit.edu>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 10 Oct 2018 22:25:54 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: Define __GNUC_PREREQ if necessary
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The __GNUC_PREREQ convenience macro is defined by glibc's header
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+files. If it isn't available, make it available for us to use.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Signed-off-by: Theodore Ts'o <tytso@mit.edu>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/ext2fs/ext2_fs.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/ext2fs/ext2_fs.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -18,6 +18,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <ext2fs/ext2_types.h> /* Changed from linux/types.h */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef __GNUC_PREREQ
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__GNUC__) && defined(__GNUC_MINOR__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define __GNUC_PREREQ(maj, min) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define __GNUC_PREREQ(maj, min) 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * The second extended filesystem constants/structures
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/ext2fs/hashmap.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/ext2fs/hashmap.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4,6 +4,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <stdint.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef __GNUC_PREREQ
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__GNUC__) && defined(__GNUC_MINOR__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define __GNUC_PREREQ(maj, min) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define __GNUC_PREREQ(maj, min) 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct ext2fs_hashmap {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint32_t size;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint32_t(*hash)(const void *key, size_t len);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/uuid/uuidP.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/uuid/uuidP.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -55,6 +55,14 @@ struct uuid {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint8_t node[6];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef __GNUC_PREREQ
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__GNUC__) && defined(__GNUC_MINOR__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define __GNUC_PREREQ(maj, min) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define __GNUC_PREREQ(maj, min) 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * prototypes
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/e2fsprogs/files/patch-Makefile.in-remove-included-libcomerr.diff b/sysutils/e2fsprogs/files/patch-Makefile.in-remove-included-libcomerr.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index e560f2d..4142178 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/e2fsprogs/files/patch-Makefile.in-remove-included-libcomerr.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/e2fsprogs/files/patch-Makefile.in-remove-included-libcomerr.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +1,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.in.orig 2016-03-06 19:25:00.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile.in 2016-06-04 21:35:16.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15,7 +15,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @BLKID_CMT@BLKID_LIB_SUBDIR= lib/blkid
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SUPPORT_LIB_SUBDIR= lib/support
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.in.orig 2018-08-18 21:26:58.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile.in 2018-08-22 10:10:50.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17,7 +17,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @ALL_CMT@E2P_LIB_SUBDIR= lib/e2p
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @ALL_CMT@EXT2FS_LIB_SUBDIR= lib/ext2fs
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>--LIB_SUBDIRS=lib/et lib/ss lib/e2p $(UUID_LIB_SUBDIR) $(BLKID_LIB_SUBDIR) $(SUPPORT_LIB_SUBDIR) lib/ext2fs intl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LIB_SUBDIRS=lib/ss lib/e2p $(UUID_LIB_SUBDIR) $(BLKID_LIB_SUBDIR) $(SUPPORT_LIB_SUBDIR) lib/ext2fs intl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PROG_SUBDIRS=e2fsck $(DEBUGFS_DIR) misc $(RESIZE_DIR) tests/progs po
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SUBDIRS=util $(LIB_SUBDIRS) $(PROG_SUBDIRS) tests
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LIB_SUBDIRS=lib/et lib/ss $(E2P_LIB_SUBDIR) $(UUID_LIB_SUBDIR) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LIB_SUBDIRS=lib/ss $(E2P_LIB_SUBDIR) $(UUID_LIB_SUBDIR) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(BLKID_LIB_SUBDIR) $(SUPPORT_LIB_SUBDIR) $(EXT2FS_LIB_SUBDIR) intl
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -32,7 +32,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PROG_SUBDIRS=e2fsck $(DEBUGFS_DIR) misc $(RESIZE_DIR) tests/progs po
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -36,7 +36,6 @@
</span> subs: $(DEP_SUBSTITUTE)
@for i in $(SUBS) ; do if test -d `dirname $$i` ; \
then $(MAKE) $$i || exit $$? ; fi ; done
</pre><pre style='margin:0'>
</pre>