<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/153b8eeb08bbc7bb93ecba24cc7079928d654ad8">https://github.com/macports/macports-ports/commit/153b8eeb08bbc7bb93ecba24cc7079928d654ad8</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 153b8eeb08b e2fsprogs: Update to 1.47.0
</span>153b8eeb08b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 153b8eeb08bbc7bb93ecba24cc7079928d654ad8
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sun Feb 26 15:26:27 2023 -0600
<span style='display:block; white-space:pre;color:#404040;'> e2fsprogs: Update to 1.47.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/57380
</span>---
sysutils/e2fsprogs/Portfile | 38 +++++++++-------
sysutils/e2fsprogs/files/dlopen-darwin.patch | 13 ++++++
sysutils/e2fsprogs/files/loff_t.patch | 50 ----------------------
...atch-Makefile.in-remove-included-libcomerr.diff | 14 +++---
.../files/patch-lib__Makefile.darwin-lib.diff | 16 +++----
sysutils/e2fsprogs/files/patch-probe.c.diff | 10 -----
6 files changed, 51 insertions(+), 90 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 ace2c0cd37a..6ee04d58ed1 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,13 +3,12 @@
</span> PortSystem 1.0
name e2fsprogs
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.45.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 541a235a3f3122f03fcf612e2339176572597edd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5f64ac50a2b60b8e67c5b382bb137dec39344017103caffc3a61554424f2d693 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 7938544
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.47.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 265632437032fcc27d07fac6e700315c7fb1b93f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6667afde56eef0c6af26684974400e4d2288ea49e9441bf5e6229195d51a3578 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 9637717
</span>
categories sysutils
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> maintainers {ryandesign @ryandesign} openmaintainer
license GPL-2 LGPL-2+ MIT BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,22 +19,19 @@ long_description Utilities to create, check and manipulate extended 2
</span> 3 and 4 filesystem (ext2, ext3, ext4) which are \
commonly used on Linux.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://e2fsprogs.sourceforge.net/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://e2fsprogs.sourceforge.net
</span> master_sites sourceforge:project/e2fsprogs/e2fsprogs/v${version}
depends_build port:gettext \
port:pkgconfig
depends_lib port:gettext-runtime
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# destroot fails without gmkdir
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Report this bug to the developers
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append path:libexec/coreutils/libstdbuf.so:coreutils
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-lib__Makefile.darwin-lib.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-probe.c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-lib__Makefile.darwin-lib.diff
</span>
configure.args-append --enable-bsd-shlibs
<span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.checks.implicit_function_declaration.whitelist-append strchr
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Enable verbose build messages
build.args-append V=1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,14 +44,14 @@ if {${subport} eq ${name}} {
</span> --disable-uuidd
depends_lib-append port:ossp-uuid \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libcomerr
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libcomerr \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libmagic
</span>
patchfiles-append patch-Makefile.in-remove-included-libcomerr.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 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;background:#ffe0e0;'>- ln -fs ${prefix}/lib/libcom_err.1.1.dylib ${worksrcpath}/lib/libcom_err.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -fs ${prefix}/lib/libcom_err.dylib ${worksrcpath}/lib/libcom_err.dylib
</span> }
destroot.target-append install-libs
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -76,6 +72,9 @@ subport libcomerr {
</span> not have the problems identified with mechanisms commonly in use.
license MIT BSD
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Don't look for libmagic. It's not used by this subport.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append ac_cv_lib_magic_magic_file=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # If we don't force this version of awk, we'd have to add a dependency on
# gawk.
configure.env-append AWK=/usr/bin/awk
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -83,6 +82,13 @@ subport libcomerr {
</span> build.args-append -C lib/et
destroot.args-append -C lib/et
post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -fs libcom_err.1.1.dylib ${destroot}${prefix}/lib/libcom_err.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -fs {*}[glob -tails -directory ${destroot}${prefix}/lib libcom_err.*.dylib] ${destroot}${prefix}/lib/libcom_err.dylib
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append dlopen-darwin.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/lib/support/plausible.c
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/e2fsprogs/files/dlopen-darwin.patch b/sysutils/e2fsprogs/files/dlopen-darwin.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d0290a6daf0
</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/dlopen-darwin.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix path to dlopen libmagic.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/tytso/e2fsprogs/issues/133
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/support/plausible.c.orig 2023-02-06 21:31:53.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/support/plausible.c 2023-02-26 16:12:16.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -62,7 +62,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int magic_library_available(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!magic_handle) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- magic_handle = dlopen("libmagic.so.1", RTLD_NOW);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ magic_handle = dlopen("@PREFIX@/lib/libmagic.dylib", RTLD_NOW);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!magic_handle)
</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;color:#808080;'>diff --git a/sysutils/e2fsprogs/files/loff_t.patch b/sysutils/e2fsprogs/files/loff_t.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 232d9c3a6de..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/e2fsprogs/files/loff_t.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,50 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Use ext2_loff_t instead of loff_t which is not portable.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://sourceforge.net/p/e2fsprogs/code/ci/1df6a455505b483bd493acb97be9c4c719064700/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/ext2fs/imager.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/ext2fs/imager.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -67,7 +67,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- blk64_t blk;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ssize_t actual;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- errcode_t retval;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- loff_t r;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ext2_loff_t r;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- buf = malloc(fs->blocksize * BUF_BLOCKS);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!buf)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- misc/e2fuzz.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ misc/e2fuzz.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -33,9 +33,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static double user_corrupt_pct = 0.0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if !defined HAVE_PWRITE64 && !defined HAVE_PWRITE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--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:#ffe0e0;'>--{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (lseek(fd, offset, SEEK_SET) < 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static ssize_t my_pwrite(int fd, const void *buf, size_t count,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ext2_loff_t offset)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (ext2fs_llseek(fd, offset, SEEK_SET) < 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return write(fd, buf, count);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -82,7 +83,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static errcode_t find_metadata_blocks(ext2_filsys fs, ext2fs_block_bitmap bmap,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- off_t *corrupt_bytes)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ext2_loff_t *corrupt_bytes)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dgrp_t i;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- blk64_t b, c;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -181,9 +182,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int flags, fd;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ext2_filsys fs = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ext2fs_block_bitmap corrupt_map;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- loff_t hsize, count, off, offset, corrupt_bytes;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ext2_loff_t hsize, count, off, offset, corrupt_bytes, i;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unsigned char c;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- loff_t i;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* If mounted rw, force dryrun mode */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ret = ext2fs_check_if_mounted(fsname, &flags);
</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 581b23833e8..7aba0f806b2 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,17 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.in.orig 2019-05-27 21:21:49.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile.in 2019-07-10 20:25:46.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -18,7 +18,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+When building e2fsprogs, don't build libcomerr again. In MacPorts, we
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build libcomerr in a separate subport.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.in.orig 2023-02-06 21:31:53.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile.in 2023-02-26 14:06:19.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19,7 +19,7 @@
</span> @ALL_CMT@E2P_LIB_SUBDIR= lib/e2p
@ALL_CMT@EXT2FS_LIB_SUBDIR= lib/ext2fs
-LIB_SUBDIRS=lib/et lib/ss $(E2P_LIB_SUBDIR) $(UUID_LIB_SUBDIR) \
+LIB_SUBDIRS=lib/ss $(E2P_LIB_SUBDIR) $(UUID_LIB_SUBDIR) \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- $(BLKID_LIB_SUBDIR) $(SUPPORT_LIB_SUBDIR) $(EXT2FS_LIB_SUBDIR) intl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(BLKID_LIB_SUBDIR) $(SUPPORT_LIB_SUBDIR) $(EXT2FS_LIB_SUBDIR)
</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;'>-@@ -39,7 +39,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PROG_SUBDIRS=e2fsck $(DEBUGFS_DIR) misc $(RESIZE_DIR) tests/progs \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -44,7 +44,6 @@
</span> subs: $(DEP_SUBSTITUTE)
@for i in $(SUBS) ; do if test -d `dirname $$i` ; \
then $(MAKE) $$i || exit $$? ; fi ; done
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/e2fsprogs/files/patch-lib__Makefile.darwin-lib.diff b/sysutils/e2fsprogs/files/patch-lib__Makefile.darwin-lib.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 2616e115491..ed9ac308ba4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/e2fsprogs/files/patch-lib__Makefile.darwin-lib.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/e2fsprogs/files/patch-lib__Makefile.darwin-lib.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/Makefile.darwin-lib.orig 2009-07-01 21:36:13.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/Makefile.darwin-lib 2009-08-07 18:47:46.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -23,7 +23,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(BSD_LIB): $(OBJS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Use LDFLAGS when making the dylib.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/Makefile.darwin-lib.orig 2023-02-06 21:31:53.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/Makefile.darwin-lib 2023-02-26 14:03:45.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -25,6 +25,7 @@
</span> $(E) " GEN_BSD_SOLIB $(BSD_LIB)"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(Q) (cd pic; $(CC) -dynamiclib -compatibility_version 1.0 -current_version $(BSDLIB_VERSION) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(Q) (cd pic; $(CC) $(LDFLAGS) -dynamiclib -install_name $(BSDLIB_INSTALL_DIR)/$(BSD_LIB) -compatibility_version 1.0 -current_version $(BSDLIB_VERSION) -Wl,-single_module \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -flat_namespace -undefined warning -o $(BSD_LIB) $(OBJS))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(Q) (cd pic; $(CC) -dynamiclib -compatibility_version 1.0 -current_version $(BSDLIB_VERSION) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -install_name $(BSDLIB_INSTALL_DIR)/$(BSD_LIB) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(LDFLAGS) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -undefined dynamic_lookup -o $(BSD_LIB) $(OBJS))
</span> $(Q) $(MV) pic/$(BSD_LIB) .
$(Q) $(RM) -f ../$(BSD_LIB)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/e2fsprogs/files/patch-probe.c.diff b/sysutils/e2fsprogs/files/patch-probe.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index d013a6b3ac7..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/e2fsprogs/files/patch-probe.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/blkid/probe.c 2020-11-15 14:19:10.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/blkid/probe.c.fixed 2020-11-15 14:21:25.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -17,6 +17,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <string.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <time.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <unistd.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <fcntl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <ctype.h>
</span></pre><pre style='margin:0'>
</pre>