pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/sysutils/e2fsprogs Update e2fsprogs to 1.43.1, using w...
details: https://anonhg.NetBSD.org/pkgsrc/rev/415cb4712b5b
branches: trunk
changeset: 350966:415cb4712b5b
user: jdolecek <jdolecek%pkgsrc.org@localhost>
date: Tue Aug 09 21:46:06 2016 +0000
description:
Update e2fsprogs to 1.43.1, using wip package for version 1.42.12 as base
Changes too numerous, see following page for details:
http://e2fsprogs.sourceforge.net/e2fsprogs-release.html#1.43.1
Compile-tested on NetBSD and Mac OS X
diffstat:
sysutils/e2fsprogs/DESCR | 4 +-
sysutils/e2fsprogs/Makefile | 21 +++++++-
sysutils/e2fsprogs/PLIST | 11 +++-
sysutils/e2fsprogs/distinfo | 38 ++++++--------
sysutils/e2fsprogs/patches/patch-ab | 28 ++++++-----
sysutils/e2fsprogs/patches/patch-ac | 49 ++++++++++---------
sysutils/e2fsprogs/patches/patch-af | 6 ++-
sysutils/e2fsprogs/patches/patch-an | 10 ++--
sysutils/e2fsprogs/patches/patch-ao | 4 +-
sysutils/e2fsprogs/patches/patch-as | 4 +-
sysutils/e2fsprogs/patches/patch-aw | 4 +-
sysutils/e2fsprogs/patches/patch-e2fsck_jfs__user.h | 16 +++--
sysutils/e2fsprogs/patches/patch-lib_ext2fs_bitops.c | 44 +++++++++++++++++
sysutils/e2fsprogs/patches/patch-lib_ext2fs_bitops.h | 16 +++--
sysutils/e2fsprogs/patches/patch-lib_ext2fs_ext2fs.h | 14 +++--
sysutils/e2fsprogs/patches/patch-lib_ext2fs_tdb.c | 15 ++++--
16 files changed, 185 insertions(+), 99 deletions(-)
diffs (truncated from 474 to 300 lines):
diff -r 7084b12a6f8c -r 415cb4712b5b sysutils/e2fsprogs/DESCR
--- a/sysutils/e2fsprogs/DESCR Tue Aug 09 20:54:47 2016 +0000
+++ b/sysutils/e2fsprogs/DESCR Tue Aug 09 21:46:06 2016 +0000
@@ -1,2 +1,2 @@
-The filesystem utilities for the EXT2 filesystem, including e2fsck, mke2fs,
-dumpe2fs, fsck, and others.
+The filesystem utilities for the EXT2/EXT3/EXT4 filesystem, including
+e2fsck, mke2fs, dumpe2fs, fsck, and others.
diff -r 7084b12a6f8c -r 415cb4712b5b sysutils/e2fsprogs/Makefile
--- a/sysutils/e2fsprogs/Makefile Tue Aug 09 20:54:47 2016 +0000
+++ b/sysutils/e2fsprogs/Makefile Tue Aug 09 21:46:06 2016 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.21 2014/05/04 00:43:00 rodent Exp $
+# $NetBSD: Makefile,v 1.22 2016/08/09 21:46:06 jdolecek Exp $
-DISTNAME= e2fsprogs-1.41.12
+DISTNAME= e2fsprogs-1.43.1
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=e2fsprogs/}
@@ -29,4 +29,21 @@
CONF_FILES+= ${EGDIR}/mke2fs.conf ${PKG_SYSCONFDIR}/mke2fs.conf
INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} root_sysconfdir=${EGDIR:Q}
+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
+SUBST_SED.man+= -e '/e2fsck.conf/s,/etc,@root_sysconfdir@,'
+SUBST_SED.man+= -e '/blkid.tab/s,/etc,@root_sysconfdir@,'
+
+.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 7084b12a6f8c -r 415cb4712b5b sysutils/e2fsprogs/PLIST
--- a/sysutils/e2fsprogs/PLIST Tue Aug 09 20:54:47 2016 +0000
+++ b/sysutils/e2fsprogs/PLIST Tue Aug 09 21:46:06 2016 +0000
@@ -1,13 +1,17 @@
-@comment $NetBSD: PLIST,v 1.6 2010/12/23 06:34:50 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.7 2016/08/09 21:46:06 jdolecek Exp $
bin/chattr
bin/lsattr
bin/uuidgen
info/libext2fs.info
lib/e2initrd_helper
man/man1/chattr.1
+man/man1/fuse2fs.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
@@ -20,7 +24,6 @@
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
@@ -46,7 +49,6 @@
sbin/e2undo
sbin/filefrag
sbin/findfs
-${PLIST.fsck}sbin/fsck
sbin/fsck.ext2
sbin/fsck.ext3
sbin/fsck.ext4
@@ -64,7 +66,9 @@
share/examples/ext2fs/mke2fs.conf
share/locale/ca/LC_MESSAGES/e2fsprogs.mo
share/locale/cs/LC_MESSAGES/e2fsprogs.mo
+share/locale/da/LC_MESSAGES/e2fsprogs.mo
share/locale/de/LC_MESSAGES/e2fsprogs.mo
+share/locale/eo/LC_MESSAGES/e2fsprogs.mo
share/locale/es/LC_MESSAGES/e2fsprogs.mo
share/locale/fr/LC_MESSAGES/e2fsprogs.mo
share/locale/id/LC_MESSAGES/e2fsprogs.mo
@@ -73,5 +77,6 @@
share/locale/pl/LC_MESSAGES/e2fsprogs.mo
share/locale/sv/LC_MESSAGES/e2fsprogs.mo
share/locale/tr/LC_MESSAGES/e2fsprogs.mo
+share/locale/uk/LC_MESSAGES/e2fsprogs.mo
share/locale/vi/LC_MESSAGES/e2fsprogs.mo
share/locale/zh_CN/LC_MESSAGES/e2fsprogs.mo
diff -r 7084b12a6f8c -r 415cb4712b5b sysutils/e2fsprogs/distinfo
--- a/sysutils/e2fsprogs/distinfo Tue Aug 09 20:54:47 2016 +0000
+++ b/sysutils/e2fsprogs/distinfo Tue Aug 09 21:46:06 2016 +0000
@@ -1,22 +1,18 @@
-$NetBSD: distinfo,v 1.19 2015/11/04 01:32:12 agc Exp $
+$NetBSD: distinfo,v 1.20 2016/08/09 21:46:06 jdolecek Exp $
-SHA1 (e2fsprogs-1.41.12.tar.gz) = 62b002fe507b2ddafc24b89532e472fe4b55a14f
-RMD160 (e2fsprogs-1.41.12.tar.gz) = aa7f9a2e350fcab85c72deaaee5fdc2a5e9fb6e7
-SHA512 (e2fsprogs-1.41.12.tar.gz) = 9ca618ae21574cf25e9249b445cc8e89a4ddc9d717ba650af084979f95771e42026395148d7f38a9489402a81a8fbeb60524eb9cf8e9eec3b309fee7e6469bab
-Size (e2fsprogs-1.41.12.tar.gz) = 4496194 bytes
-SHA1 (patch-ab) = f18d86265be543bab68813200fb49099ad8af909
-SHA1 (patch-ac) = 8f47354ee719d4b933eccc8c8f0a0c7fb7b0feff
-SHA1 (patch-af) = 8e1c2f5b90b78fdd4c5a4fcb573f23fc1db6e90f
-SHA1 (patch-am) = 9c3be47010f6101e4f41343e108b967c88847c12
-SHA1 (patch-an) = 62acb3f18f61ae6a729a8eebd308a1a1efe83e50
-SHA1 (patch-ao) = 241b33700249d09f60f11f3167ef8cf771d1e588
-SHA1 (patch-ap) = 4f9f8e47ecbea53acb1318e5ef0abe58cfbbb9ce
-SHA1 (patch-ar) = 9103ed55e0f13451fbb2f34c4bee28f5e24c216a
-SHA1 (patch-as) = 6066be5bf84753419407d2ee70cd8934b918c298
-SHA1 (patch-at) = 53cbd25d89a9df733ba931490c1dcb77b20ddbe3
-SHA1 (patch-av) = 92c9d34c82cba121744cfff5b23e4b92c9442545
-SHA1 (patch-aw) = cb5e382077c07f0ced114fcbf195537cc7b0058c
-SHA1 (patch-e2fsck_jfs__user.h) = d0b8058f00a4ac5445645017bf83aafc8af63c8a
-SHA1 (patch-lib_ext2fs_bitops.h) = 3d3c8862e00622a0b715e7ef162d229910b43ec1
-SHA1 (patch-lib_ext2fs_ext2fs.h) = 0bd9fbfcf33008d90cecb7821d04791b27f286f2
-SHA1 (patch-lib_ext2fs_tdb.c) = 21f2109420b6e35f3a5c194f26ce14f6cb07f4ef
+SHA1 (e2fsprogs-1.43.1.tar.gz) = 26b75c27ba434e72ef630b160782a01b4d992b7a
+RMD160 (e2fsprogs-1.43.1.tar.gz) = 0392ed04ae20b2d6150d2cbce9c0fbc7f9d85f57
+SHA512 (e2fsprogs-1.43.1.tar.gz) = 979f6b83f0c0650fd27e0a63dfe0cfb7690de71977f374a43ccdb0b77f49c40531d6b9a6a16c4a3b31a16cc4f4906846862a489c6d4b8bf036530ce72ffd36bb
+Size (e2fsprogs-1.43.1.tar.gz) = 7009831 bytes
+SHA1 (patch-ab) = 9b686655a75239279a456dc8889113be06519cd7
+SHA1 (patch-ac) = 1b938d2b9032896aa1caf85c21727b328ecae2de
+SHA1 (patch-af) = bcda43bb14afdbf6a98dfedd949af4d1aff443d6
+SHA1 (patch-an) = 0649c3dbd33932265c291a593b393a55b2707626
+SHA1 (patch-ao) = a8fcacf506b003bf40ecadd5260ff0a6628ad2e6
+SHA1 (patch-as) = be316e404840a47422edbee65177bf6a9c94b335
+SHA1 (patch-aw) = 544634d6603762dabaeffe950440f533c6495b32
+SHA1 (patch-e2fsck_jfs__user.h) = 2fd21cedabc4356a0d76a6caa1dbf73461750800
+SHA1 (patch-lib_ext2fs_bitops.c) = eb183d82a45c6902f45fcbffb71b6d9b61b248ad
+SHA1 (patch-lib_ext2fs_bitops.h) = 8eec77c83bf85423a1420b18405e9ba655131528
+SHA1 (patch-lib_ext2fs_ext2fs.h) = 2811fd3eff03dd4fb7f72df4c854d2c33b37846f
+SHA1 (patch-lib_ext2fs_tdb.c) = dd50993cd0beba0451cfb3422ca9f54700ee0e38
diff -r 7084b12a6f8c -r 415cb4712b5b sysutils/e2fsprogs/patches/patch-ab
--- a/sysutils/e2fsprogs/patches/patch-ab Tue Aug 09 20:54:47 2016 +0000
+++ b/sysutils/e2fsprogs/patches/patch-ab Tue Aug 09 21:46:06 2016 +0000
@@ -1,8 +1,10 @@
-$NetBSD: patch-ab,v 1.3 2008/09/21 16:16:06 joerg Exp $
+$NetBSD: patch-ab,v 1.4 2016/08/09 21:46:07 jdolecek Exp $
+
+DragonFly support
---- lib/ext2fs/getsize.c.orig 2007-06-30 15:58:34 +0300
-+++ lib/ext2fs/getsize.c
-@@ -32,6 +32,9 @@
+--- lib/ext2fs/getsize.c.orig 2014-08-03 05:26:22.000000000 +0900
++++ lib/ext2fs/getsize.c 2014-12-10 20:45:18.000000000 +0900
+@@ -33,6 +33,9 @@
#ifdef HAVE_SYS_DISKLABEL_H
#include <sys/disklabel.h>
#endif
@@ -10,17 +12,17 @@
+#include <sys/disklabel32.h>
+#endif
#ifdef HAVE_SYS_DISK_H
- #ifdef HAVE_SYS_QUEUE_H
- #include <sys/queue.h> /* for LIST_HEAD */
-@@ -154,7 +157,11 @@ errcode_t ext2fs_get_device_size(const c
+ #include <sys/disk.h>
#endif
+@@ -198,7 +201,11 @@ errcode_t ext2fs_get_device_size2(const
#ifdef HAVE_SYS_DISKLABEL_H
- int part;
+ {
+ int part;
+#ifdef __DragonFly__
-+ struct disklabel32 lab;
++ struct disklabel32 lab;
+#else
- struct disklabel lab;
+ struct disklabel lab;
+#endif
- struct partition *pp;
- char ch;
- #endif /* HAVE_SYS_DISKLABEL_H */
+ struct partition *pp;
+ char ch;
+
diff -r 7084b12a6f8c -r 415cb4712b5b sysutils/e2fsprogs/patches/patch-ac
--- a/sysutils/e2fsprogs/patches/patch-ac Tue Aug 09 20:54:47 2016 +0000
+++ b/sysutils/e2fsprogs/patches/patch-ac Tue Aug 09 21:46:06 2016 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.3 2008/09/21 16:16:06 joerg Exp $
+$NetBSD: patch-ac,v 1.4 2016/08/09 21:46:07 jdolecek Exp $
---- lib/blkid/getsize.c.orig 2008-06-30 00:05:45 +0300
+--- lib/blkid/getsize.c.orig 2016-06-08 21:39:43.000000000 +0000
+++ lib/blkid/getsize.c
-@@ -32,6 +32,9 @@
+@@ -36,6 +36,9 @@
#ifdef HAVE_SYS_DISKLABEL_H
#include <sys/disklabel.h>
#endif
@@ -10,31 +10,32 @@
+#include <sys/disklabel32.h>
+#endif
#ifdef HAVE_SYS_DISK_H
- #ifdef HAVE_SYS_QUEUE_H
- #include <sys/queue.h> /* for LIST_HEAD */
-@@ -86,8 +89,13 @@ blkid_loff_t blkid_get_dev_size(int fd)
+ #include <sys/disk.h>
#endif
- #ifdef HAVE_SYS_DISKLABEL_H
- int part = -1;
+@@ -134,8 +137,13 @@ blkid_loff_t blkid_get_dev_size(int fd)
+ #if defined(HAVE_SYS_DISKLABEL_H) && defined(DIOCGDINFO)
+ {
+ int part = -1;
+#ifdef __DragonFly__
-+ struct disklabel32 lab;
-+ struct partition32 *pp;
++ struct disklabel32 lab;
++ struct partition32 *pp;
+#else
- struct disklabel lab;
- struct partition *pp;
+ struct disklabel lab;
+ struct partition *pp;
+#endif
- char ch;
- struct stat st;
- #endif /* HAVE_SYS_DISKLABEL_H */
-@@ -144,7 +152,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)))
- part = st.st_rdev & 7;
+ char ch;
+ struct stat st;
+
+@@ -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)))
+ part = st.st_rdev & 7;
+-
+#ifdef __DragonFly__
-+ if (part >= 0 && (ioctl(fd, DIOCGDINFO32, (char *)&lab) >= 0)) {
++ if (part >= 0 && (ioctl(fd, DIOCGDINFO32, (char *)&lab) >= 0)) {
+#else
- if (part >= 0 && (ioctl(fd, DIOCGDINFO, (char *)&lab) >= 0)) {
+ if (part >= 0 && (ioctl(fd, DIOCGDINFO, (char *)&lab) >= 0)) {
+#endif
- pp = &lab.d_partitions[part];
- if (pp->p_size)
- return pp->p_size << 9;
+ pp = &lab.d_partitions[part];
+ if (pp->p_size)
+ return pp->p_size << 9;
diff -r 7084b12a6f8c -r 415cb4712b5b sysutils/e2fsprogs/patches/patch-af
--- a/sysutils/e2fsprogs/patches/patch-af Tue Aug 09 20:54:47 2016 +0000
+++ b/sysutils/e2fsprogs/patches/patch-af Tue Aug 09 21:46:06 2016 +0000
@@ -1,4 +1,8 @@
-$NetBSD: patch-af,v 1.7 2010/12/23 06:34:50 ryoon Exp $
+$NetBSD: patch-af,v 1.8 2016/08/09 21:46:07 jdolecek Exp $
+
+Add a patch to use struct statvfs on NetBSD 2.0F and newer. Fixes PR 25891
+by Andreas Wiese.
+Upate __NetBSD_Version__ statvfs check from 200060000 to 299000900
--- lib/ext2fs/ismounted.c.orig 2010-05-18 03:04:39.000000000 +0000
+++ lib/ext2fs/ismounted.c
diff -r 7084b12a6f8c -r 415cb4712b5b sysutils/e2fsprogs/patches/patch-an
--- a/sysutils/e2fsprogs/patches/patch-an Tue Aug 09 20:54:47 2016 +0000
+++ b/sysutils/e2fsprogs/patches/patch-an Tue Aug 09 21:46:06 2016 +0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-an,v 1.2 2010/12/23 06:34:50 ryoon Exp $
+$NetBSD: patch-an,v 1.3 2016/08/09 21:46:07 jdolecek Exp $
---- e2fsck/e2fsck.h.orig 2010-05-13 22:59:49.000000000 +0000
+--- e2fsck/e2fsck.h.orig 2016-06-08 21:39:43.000000000 +0000
+++ e2fsck/e2fsck.h
-@@ -61,6 +61,10 @@
- #define P_(singular, plural, n) ((n) == 1 ? (singular) : (plural))
- #endif
+@@ -69,6 +69,10 @@
+
+ #include "support/quotaio.h"
+#ifndef ETC_DIR
+#define ETC_DIR "/etc" /* Where to find the config file */
diff -r 7084b12a6f8c -r 415cb4712b5b sysutils/e2fsprogs/patches/patch-ao
--- a/sysutils/e2fsprogs/patches/patch-ao Tue Aug 09 20:54:47 2016 +0000
+++ b/sysutils/e2fsprogs/patches/patch-ao Tue Aug 09 21:46:06 2016 +0000
@@ -1,4 +1,6 @@
-$NetBSD: patch-ao,v 1.2 2010/12/23 06:34:50 ryoon Exp $
+$NetBSD: patch-ao,v 1.3 2016/08/09 21:46:07 jdolecek Exp $
+
+Where to find the config file
--- lib/blkid/blkidP.h.orig 2009-08-13 01:39:57.000000000 +0000
+++ lib/blkid/blkidP.h
diff -r 7084b12a6f8c -r 415cb4712b5b sysutils/e2fsprogs/patches/patch-as
--- a/sysutils/e2fsprogs/patches/patch-as Tue Aug 09 20:54:47 2016 +0000
+++ b/sysutils/e2fsprogs/patches/patch-as Tue Aug 09 21:46:06 2016 +0000
Home |
Main Index |
Thread Index |
Old Index