CVS commit: pkgsrc/sysutils/e2fsprogs

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/sysutils/e2fsprogs
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Fri, 8 Dec 2017 08:12:58 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Dec  8 08:12:58 UTC 2017

Modified Files:
        pkgsrc/sysutils/e2fsprogs: Makefile PLIST distinfo
        pkgsrc/sysutils/e2fsprogs/patches: patch-ac patch-aw
            patch-debugfs_debugfs.c patch-lib_ext2fs_bitops.c
            patch-misc_create__inode.c

Log Message:
e2fsprogs: updated to 1.43.7

PkgSrc:
* Depend on devel/libuuid and devel/libblkid
* Do not install uuidgen; now it is provided by devel/libuuid
* Fix PLIST/fsck on Linux.

E2fsprogs 1.43.7:

Fix the error handling code in debugfs, fuse2fs and tune2fs so errors
trying to replay the journal won't accidentally result in a seg fault
if reopening the file system after the journal replay fails for some
reason.

Fix resize2fs to avoid it from either failing or corrupting the file
system image in certain corner cases when doing an off-line resize.

Fix many spelling mistakes in various man pages, code comments, and
program messages.

Fix e2fsck and debugfs so that maliciously corrupted file systems will
not cause buffer overflows.

Update German translation.

Fixed various Debian Packaging Issues.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/sysutils/e2fsprogs/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/sysutils/e2fsprogs/PLIST
cvs rdiff -u -r1.23 -r1.24 pkgsrc/sysutils/e2fsprogs/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/sysutils/e2fsprogs/patches/patch-ac
cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/e2fsprogs/patches/patch-aw
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/sysutils/e2fsprogs/patches/patch-debugfs_debugfs.c \
    pkgsrc/sysutils/e2fsprogs/patches/patch-misc_create__inode.c
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/sysutils/e2fsprogs/patches/patch-lib_ext2fs_bitops.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/e2fsprogs/Makefile
diff -u pkgsrc/sysutils/e2fsprogs/Makefile:1.25 pkgsrc/sysutils/e2fsprogs/Makefile:1.26
--- pkgsrc/sysutils/e2fsprogs/Makefile:1.25     Thu Sep 21 09:48:56 2017
+++ pkgsrc/sysutils/e2fsprogs/Makefile  Fri Dec  8 08:12:58 2017
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2017/09/21 09:48:56 jperkin Exp $
+# $NetBSD: Makefile,v 1.26 2017/12/08 08:12:58 adam Exp $
 
-DISTNAME=      e2fsprogs-1.43.4
+DISTNAME=      e2fsprogs-1.43.7
 CATEGORIES=    sysutils
-MASTER_SITES=  https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/${DISTNAME:S/e2fsprogs-/v/}/ \
-               ${MASTER_SITE_SOURCEFORGE:=e2fsprogs/}
+MASTER_SITES=  https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PKGVERSION_NOREV}/
+#MASTER_SITES+=        ${MASTER_SITE_SOURCEFORGE:=e2fsprogs/}
 EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -11,14 +11,20 @@ HOMEPAGE=   http://e2fsprogs.sourceforge.n
 COMMENT=       Second extended file system (ext2fs) management programs
 LICENSE=       gnu-gpl-v2 AND gnu-lgpl-v2 AND modified-bsd AND mit
 
-GNU_CONFIGURE= yes
-USE_LANGUAGES= c99
-USE_TOOLS+=    makeinfo gmake
-INFO_FILES=    yes
+USE_LANGUAGES=         c99
+USE_LIBTOOL=           yes
+USE_TOOLS+=            gmake makeinfo pkg-config
+GNU_CONFIGURE=         yes
+# Use external libraries
+CONFIGURE_ARGS+=       --disable-libblkid
+CONFIGURE_ARGS+=       --disable-libuuid
+CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
+INFO_FILES=            yes
 
 .include "../../mk/bsd.prefs.mk"
-
-CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR:Q}
+.if ${OPSYS} == "Darwin"
+BUILDLINK_TRANSFORM+=  rm:-luuid
+.endif
 
 # Only build fsck(8) on platforms that need it.
 PLIST_VARS+=           fsck
@@ -27,22 +33,19 @@ PLIST.fsck=         yes
 .else
 CONFIGURE_ARGS+=       --disable-fsck
 .endif
-#CONFIGURE_ARGS+=      --mandir=${PREFIX}/man
 
 EGDIR=                 ${PREFIX}/share/examples/ext2fs
 CONF_FILES+=           ${EGDIR}/mke2fs.conf ${PKG_SYSCONFDIR}/mke2fs.conf
-INSTALL_MAKE_FLAGS=    ${MAKE_FLAGS} root_sysconfdir=${EGDIR:Q}
+INSTALL_MAKE_FLAGS=    ${MAKE_FLAGS} root_sysconfdir=${EGDIR}
 
 SUBST_CLASSES+=                man
 SUBST_MESSAGE.man=     Give correct path for man page
 SUBST_STAGE.man=       post-patch
-
 SUBST_FILES.man+=      misc/mke2fs.8.in
 SUBST_FILES.man+=      misc/mke2fs.conf.5.in
 SUBST_FILES.man+=      e2fsck/e2fsck.conf.5.in
 SUBST_FILES.man+=      lib/blkid/libblkid.3.in
 SUBST_FILES.man+=      misc/blkid.8.in
-
 SUBST_SED.man+=                -e '/mke2fs.conf/s,/etc,@root_sysconfdir@,'
 SUBST_SED.man+=                -e '/mke2fs.conf/s,/etc,@root_sysconfdir@,'
 # next (two) path's in the man page do not exist
@@ -50,4 +53,6 @@ SUBST_SED.man+=               -e '/e2fsck.conf/s,/etc
 SUBST_SED.man+=                -e   '/blkid.tab/s,/etc,@root_sysconfdir@,'
 
 .include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/libblkid/buildlink3.mk"
+.include "../../devel/libuuid/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/sysutils/e2fsprogs/PLIST
diff -u pkgsrc/sysutils/e2fsprogs/PLIST:1.8 pkgsrc/sysutils/e2fsprogs/PLIST:1.9
--- pkgsrc/sysutils/e2fsprogs/PLIST:1.8 Fri Feb  3 14:08:11 2017
+++ pkgsrc/sysutils/e2fsprogs/PLIST     Fri Dec  8 08:12:58 2017
@@ -1,19 +1,16 @@
-@comment $NetBSD: PLIST,v 1.8 2017/02/03 14:08:11 mef Exp $
+@comment $NetBSD: PLIST,v 1.9 2017/12/08 08:12:58 adam Exp $
 bin/chattr
 bin/lsattr
-bin/uuidgen
 info/libext2fs.info
 lib/e2initrd_helper
 man/man1/chattr.1
 man/man1/lsattr.1
-man/man1/uuidgen.1
 man/man5/e2fsck.conf.5
 man/man5/ext2.5
 man/man5/ext3.5
 man/man5/ext4.5
 man/man5/mke2fs.conf.5
 man/man8/badblocks.8
-man/man8/blkid.8
 man/man8/debugfs.8
 man/man8/dumpe2fs.8
 man/man8/e2freefrag.8
@@ -22,7 +19,7 @@ man/man8/e2image.8
 man/man8/e2label.8
 man/man8/e2undo.8
 man/man8/filefrag.8
-man/man8/findfs.8
+${PLIST.fsck}man/man8/fsck.8
 man/man8/fsck.ext2.8
 man/man8/fsck.ext3.8
 man/man8/fsck.ext4.8
@@ -34,9 +31,7 @@ man/man8/mkfs.ext4.8
 man/man8/mklost+found.8
 man/man8/resize2fs.8
 man/man8/tune2fs.8
-man/man8/uuidd.8
 sbin/badblocks
-sbin/blkid
 sbin/debugfs
 sbin/dumpe2fs
 sbin/e2freefrag
@@ -45,7 +40,7 @@ sbin/e2image
 sbin/e2label
 sbin/e2undo
 sbin/filefrag
-sbin/findfs
+${PLIST.fsck}sbin/fsck
 sbin/fsck.ext2
 sbin/fsck.ext3
 sbin/fsck.ext4
@@ -57,7 +52,6 @@ sbin/mkfs.ext4
 sbin/mklost+found
 sbin/resize2fs
 sbin/tune2fs
-sbin/uuidd
 share/examples/ext2fs/mke2fs.conf
 share/locale/ca/LC_MESSAGES/e2fsprogs.mo
 share/locale/cs/LC_MESSAGES/e2fsprogs.mo

Index: pkgsrc/sysutils/e2fsprogs/distinfo
diff -u pkgsrc/sysutils/e2fsprogs/distinfo:1.23 pkgsrc/sysutils/e2fsprogs/distinfo:1.24
--- pkgsrc/sysutils/e2fsprogs/distinfo:1.23     Thu Sep 21 09:48:56 2017
+++ pkgsrc/sysutils/e2fsprogs/distinfo  Fri Dec  8 08:12:58 2017
@@ -1,21 +1,21 @@
-$NetBSD: distinfo,v 1.23 2017/09/21 09:48:56 jperkin Exp $
+$NetBSD: distinfo,v 1.24 2017/12/08 08:12:58 adam Exp $
 
-SHA1 (e2fsprogs-1.43.4.tar.xz) = 3073dfe3d67075d3ae68e41e78120f14a18ac9ba
-RMD160 (e2fsprogs-1.43.4.tar.xz) = cb6fb31aa7242d3e72f0427aac0271848d467ffe
-SHA512 (e2fsprogs-1.43.4.tar.xz) = c0f699e70d6d346a8130d965053f7951bb10a56aabce37938ec8f28d07b976adf5680c941cddae17c17b2f73bfaf5491f05e39e667d2416b7d30c807fbd8a630
-Size (e2fsprogs-1.43.4.tar.xz) = 5265788 bytes
+SHA1 (e2fsprogs-1.43.7.tar.xz) = 06c5798cbd72d8c6655f5442848ffd33a0c913fc
+RMD160 (e2fsprogs-1.43.7.tar.xz) = ccfa3a6e474fbb3c5314bd5b6e6cc00eb1bb5076
+SHA512 (e2fsprogs-1.43.7.tar.xz) = 2ef270364d3cea620db3c3b9932849d0ff5b49d4a9a9b24f0d1ac36888199bd67432edc5f939d9f697ee0342b71a063e1ad4ce8119528a7adab7a777c1de57ba
+Size (e2fsprogs-1.43.7.tar.xz) = 5286684 bytes
 SHA1 (patch-ab) = 9b686655a75239279a456dc8889113be06519cd7
-SHA1 (patch-ac) = 1d1c27fde75e3c8db8327a4519417bb2c733f953
+SHA1 (patch-ac) = 1a7faec14d69cb1d317908297e5500c0cb72aa4f
 SHA1 (patch-af) = bcda43bb14afdbf6a98dfedd949af4d1aff443d6
 SHA1 (patch-an) = 1199b17c4e65b8825b78fc02f7b2c9164eee56ef
 SHA1 (patch-ao) = a8fcacf506b003bf40ecadd5260ff0a6628ad2e6
 SHA1 (patch-as) = be316e404840a47422edbee65177bf6a9c94b335
-SHA1 (patch-aw) = 544634d6603762dabaeffe950440f533c6495b32
-SHA1 (patch-debugfs_debugfs.c) = 6092c8e61fcdda2e5b669dad26b6c335cc45c4c5
+SHA1 (patch-aw) = d864c60c302230acdbdb1e33436883ad594c6808
+SHA1 (patch-debugfs_debugfs.c) = 085d29bc53e616dbeb08f4f48fd9d94e1d837e80
 SHA1 (patch-e2fsck_jfs__user.h) = 2fd21cedabc4356a0d76a6caa1dbf73461750800
-SHA1 (patch-lib_ext2fs_bitops.c) = 0ca90ee35d255b8f590a216554a22b738c6083bc
+SHA1 (patch-lib_ext2fs_bitops.c) = 068cc0dfb6b2a6a185178479f20100917c7407c8
 SHA1 (patch-lib_ext2fs_bitops.h) = 8eec77c83bf85423a1420b18405e9ba655131528
 SHA1 (patch-lib_ext2fs_ext2fs.h) = 2811fd3eff03dd4fb7f72df4c854d2c33b37846f
 SHA1 (patch-lib_ext2fs_tdb.c) = dd50993cd0beba0451cfb3422ca9f54700ee0e38
 SHA1 (patch-lib_uuid_gen__uuid.c) = 083ac45a8d2d30a5c272720fb9a6a1785c97eee2
-SHA1 (patch-misc_create__inode.c) = 7b9b49bc6bdcf5845bb81414faed987c74228940
+SHA1 (patch-misc_create__inode.c) = b3a9f313ea7cb55d9a40c7916a7862472e0aeaa8

Index: pkgsrc/sysutils/e2fsprogs/patches/patch-ac
diff -u pkgsrc/sysutils/e2fsprogs/patches/patch-ac:1.5 pkgsrc/sysutils/e2fsprogs/patches/patch-ac:1.6
--- pkgsrc/sysutils/e2fsprogs/patches/patch-ac:1.5      Fri Feb  3 14:08:11 2017
+++ pkgsrc/sysutils/e2fsprogs/patches/patch-ac  Fri Dec  8 08:12:58 2017
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.5 2017/02/03 14:08:11 mef Exp $
+$NetBSD: patch-ac,v 1.6 2017/12/08 08:12:58 adam Exp $
 
 DragonFly Support
 
---- lib/blkid/getsize.c.orig   2016-06-08 21:39:43.000000000 +0000
+--- lib/blkid/getsize.c.orig   2017-10-16 05:45:45.000000000 +0000
 +++ lib/blkid/getsize.c
 @@ -36,6 +36,9 @@
  #ifdef HAVE_SYS_DISKLABEL_H
@@ -30,7 +30,7 @@ DragonFly Support
  
 @@ -151,8 +159,11 @@ blkid_loff_t blkid_get_dev_size(int fd)
                if (fstat(fd, &st) >= 0 &&
-                   (S_ISBLK(st.st_mode) || S_ISCHR(st.st_mode)))
+                   blkidP_is_disk_device(st.st_mode))
                        part = st.st_rdev & 7;
 -
 +#ifdef __DragonFly__

Index: pkgsrc/sysutils/e2fsprogs/patches/patch-aw
diff -u pkgsrc/sysutils/e2fsprogs/patches/patch-aw:1.3 pkgsrc/sysutils/e2fsprogs/patches/patch-aw:1.4
--- pkgsrc/sysutils/e2fsprogs/patches/patch-aw:1.3      Tue Aug  9 21:46:07 2016
+++ pkgsrc/sysutils/e2fsprogs/patches/patch-aw  Fri Dec  8 08:12:58 2017
@@ -1,15 +1,15 @@
-$NetBSD: patch-aw,v 1.3 2016/08/09 21:46:07 jdolecek Exp $
+$NetBSD: patch-aw,v 1.4 2017/12/08 08:12:58 adam Exp $
 
 Don't gzip info file
 
---- doc/Makefile.in.orig       2010-02-10 23:16:03.000000000 +0000
+--- doc/Makefile.in.orig       2017-10-16 05:45:45.000000000 +0000
 +++ doc/Makefile.in
-@@ -26,8 +26,6 @@ install-doc-libs: libext2fs.info libext2
+@@ -27,8 +27,6 @@ install-doc-libs: libext2fs.info libext2
                echo "  INSTALL_DATA $(infodir)/$$i" ; \
                $(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/$$i ; \
        done
 -      $(E) "  GZIP $(infodir)/libext2fs.info*"
--      -$(Q) gzip -9 $(DESTDIR)$(infodir)/libext2fs.info*
+-      -$(Q) gzip -9n $(DESTDIR)$(infodir)/libext2fs.info*
  
  uninstall-doc-libs:
        $(RM) -rf $(DESTDIR)$(infodir)/libext2fs.info*

Index: pkgsrc/sysutils/e2fsprogs/patches/patch-debugfs_debugfs.c
diff -u pkgsrc/sysutils/e2fsprogs/patches/patch-debugfs_debugfs.c:1.1 pkgsrc/sysutils/e2fsprogs/patches/patch-debugfs_debugfs.c:1.2
--- pkgsrc/sysutils/e2fsprogs/patches/patch-debugfs_debugfs.c:1.1       Thu Sep 21 09:48:56 2017
+++ pkgsrc/sysutils/e2fsprogs/patches/patch-debugfs_debugfs.c   Fri Dec  8 08:12:58 2017
@@ -1,13 +1,13 @@
-$NetBSD: patch-debugfs_debugfs.c,v 1.1 2017/09/21 09:48:56 jperkin Exp $
+$NetBSD: patch-debugfs_debugfs.c,v 1.2 2017/12/08 08:12:58 adam Exp $
 
 Fix build on SunOS.
 
---- debugfs/debugfs.c.orig     2016-09-02 04:17:32.000000000 +0000
+--- debugfs/debugfs.c.orig     2017-10-16 05:45:45.000000000 +0000
 +++ debugfs/debugfs.c
-@@ -26,6 +26,9 @@ extern char *optarg;
- #include <errno.h>
+@@ -29,6 +29,9 @@ extern char *optarg;
+ #ifdef HAVE_SYS_SYSMACROS_H
+ #include <sys/sysmacros.h>
  #endif
- #include <fcntl.h>
 +#ifdef __sun
 +#include <sys/mkdev.h>
 +#endif
Index: pkgsrc/sysutils/e2fsprogs/patches/patch-misc_create__inode.c
diff -u pkgsrc/sysutils/e2fsprogs/patches/patch-misc_create__inode.c:1.1 pkgsrc/sysutils/e2fsprogs/patches/patch-misc_create__inode.c:1.2
--- pkgsrc/sysutils/e2fsprogs/patches/patch-misc_create__inode.c:1.1    Thu Sep 21 09:48:56 2017
+++ pkgsrc/sysutils/e2fsprogs/patches/patch-misc_create__inode.c        Fri Dec  8 08:12:58 2017
@@ -1,16 +1,16 @@
-$NetBSD: patch-misc_create__inode.c,v 1.1 2017/09/21 09:48:56 jperkin Exp $
+$NetBSD: patch-misc_create__inode.c,v 1.2 2017/12/08 08:12:58 adam Exp $
 
 Fix build on SunOS.
 
---- misc/create_inode.c.orig   2017-01-31 06:08:02.000000000 +0000
+--- misc/create_inode.c.orig   2017-10-16 05:45:45.000000000 +0000
 +++ misc/create_inode.c
-@@ -22,6 +22,9 @@
- #include <attr/xattr.h>
+@@ -25,6 +25,9 @@
+ #ifdef HAVE_SYS_SYSMACROS_H
+ #include <sys/sysmacros.h>
  #endif
- #include <sys/ioctl.h>
 +#ifdef __sun
 +#include <sys/mkdev.h>
 +#endif
+ 
  #include <ext2fs/ext2fs.h>
  #include <ext2fs/ext2_types.h>
- #include <ext2fs/fiemap.h>

Index: pkgsrc/sysutils/e2fsprogs/patches/patch-lib_ext2fs_bitops.c
diff -u pkgsrc/sysutils/e2fsprogs/patches/patch-lib_ext2fs_bitops.c:1.2 pkgsrc/sysutils/e2fsprogs/patches/patch-lib_ext2fs_bitops.c:1.3
--- pkgsrc/sysutils/e2fsprogs/patches/patch-lib_ext2fs_bitops.c:1.2     Fri Feb  3 14:08:11 2017
+++ pkgsrc/sysutils/e2fsprogs/patches/patch-lib_ext2fs_bitops.c Fri Dec  8 08:12:58 2017
@@ -1,4 +1,6 @@
-$NetBSD: patch-lib_ext2fs_bitops.c,v 1.2 2017/02/03 14:08:11 mef Exp $
+$NetBSD: patch-lib_ext2fs_bitops.c,v 1.3 2017/12/08 08:12:58 adam Exp $
+
+Avoid conflict with popcountXX().
 
 --- lib/ext2fs/bitops.c.orig   2016-09-02 13:17:32.000000000 +0900
 +++ lib/ext2fs/bitops.c        2017-02-03 21:44:49.000000000 +0900

Prev by Date: CVS commit: pkgsrc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index