<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/0a1f0b29eefe04271a7a2b6beb5fed2f833036d3">https://github.com/macports/macports-ports/commit/0a1f0b29eefe04271a7a2b6beb5fed2f833036d3</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 0a1f0b2 e2fsprogs: Update to 1.45.6
</span>0a1f0b2 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0a1f0b29eefe04271a7a2b6beb5fed2f833036d3
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Mar 26 09:50:21 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> e2fsprogs: Update to 1.45.6
</span>---
sysutils/e2fsprogs/Portfile | 9 ++++---
sysutils/e2fsprogs/files/loff_t.patch | 50 +++++++++++++++++++++++++++++++++++
2 files changed, 55 insertions(+), 4 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 df29804..2c11ef7 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,10 +3,10 @@
</span> PortSystem 1.0
name e2fsprogs
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.45.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 1f8ae352805c9e1c3ef618beb4b95cebe31a54a3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 91e72a2f6fee21b89624d8ece5a4b3751a17b28775d32cd048921050b4760ed9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 7938826
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.45.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 541a235a3f3122f03fcf612e2339176572597edd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 5f64ac50a2b60b8e67c5b382bb137dec39344017103caffc3a61554424f2d693 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 7938544
</span>
categories sysutils
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,6 +49,7 @@ if {${subport} eq ${name}} {
</span> port:libcomerr
patchfiles-append patch-Makefile.in-remove-included-libcomerr.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append loff_t.patch
</span>
pre-build {
ln -fs ${prefix}/bin/compile_et ${worksrcpath}/lib/et/compile_et
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/e2fsprogs/files/loff_t.patch b/sysutils/e2fsprogs/files/loff_t.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..232d9c3
</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/loff_t.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,50 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Use ext2_loff_t instead of loff_t which is not portable.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://sourceforge.net/p/e2fsprogs/code/ci/1df6a455505b483bd493acb97be9c4c719064700/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/ext2fs/imager.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/ext2fs/imager.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -67,7 +67,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ blk64_t blk;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ssize_t actual;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ errcode_t retval;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- loff_t r;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ext2_loff_t r;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ buf = malloc(fs->blocksize * BUF_BLOCKS);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!buf)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- misc/e2fuzz.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ misc/e2fuzz.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -33,9 +33,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static double user_corrupt_pct = 0.0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if !defined HAVE_PWRITE64 && !defined HAVE_PWRITE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-static ssize_t my_pwrite(int fd, const void *buf, size_t count, off_t offset)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (lseek(fd, offset, SEEK_SET) < 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static ssize_t my_pwrite(int fd, const void *buf, size_t count,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ext2_loff_t offset)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (ext2fs_llseek(fd, offset, SEEK_SET) < 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return write(fd, buf, count);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -82,7 +83,7 @@
</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;'>+ static errcode_t find_metadata_blocks(ext2_filsys fs, ext2fs_block_bitmap bmap,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- off_t *corrupt_bytes)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ext2_loff_t *corrupt_bytes)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dgrp_t i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ blk64_t b, c;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -181,9 +182,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int flags, fd;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ext2_filsys fs = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ext2fs_block_bitmap corrupt_map;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- loff_t hsize, count, off, offset, corrupt_bytes;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ext2_loff_t hsize, count, off, offset, corrupt_bytes, i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned char c;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- loff_t i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* If mounted rw, force dryrun mode */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ret = ext2fs_check_if_mounted(fsname, &flags);
</span></pre><pre style='margin:0'>
</pre>