diff options
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/e2fsprogs/Makefile | 5 | ||||
| -rw-r--r-- | sysutils/e2fsprogs/PLIST | 11 | ||||
| -rw-r--r-- | sysutils/e2fsprogs/distinfo | 16 | ||||
| -rw-r--r-- | sysutils/e2fsprogs/patches/patch-ac | 4 | ||||
| -rw-r--r-- | sysutils/e2fsprogs/patches/patch-an | 4 | ||||
| -rw-r--r-- | sysutils/e2fsprogs/patches/patch-lib_ext2fs_bitops.c | 8 |
6 files changed, 26 insertions, 22 deletions
diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile index 544607078b1..8400eaeb466 100644 --- a/sysutils/e2fsprogs/Makefile +++ b/sysutils/e2fsprogs/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.22 2016/08/09 21:46:06 jdolecek Exp $ +# $NetBSD: Makefile,v 1.23 2017/02/03 14:08:11 mef Exp $ -DISTNAME= e2fsprogs-1.43.1 +DISTNAME= e2fsprogs-1.43.4 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=e2fsprogs/} @@ -24,6 +24,7 @@ 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 diff --git a/sysutils/e2fsprogs/PLIST b/sysutils/e2fsprogs/PLIST index e6190c3a296..94ff25c3cd0 100644 --- a/sysutils/e2fsprogs/PLIST +++ b/sysutils/e2fsprogs/PLIST @@ -1,11 +1,10 @@ -@comment $NetBSD: PLIST,v 1.7 2016/08/09 21:46:06 jdolecek Exp $ +@comment $NetBSD: PLIST,v 1.8 2017/02/03 14:08:11 mef 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 @@ -27,13 +26,11 @@ man/man8/findfs.8 man/man8/fsck.ext2.8 man/man8/fsck.ext3.8 man/man8/fsck.ext4.8 -man/man8/fsck.ext4dev.8 man/man8/logsave.8 man/man8/mke2fs.8 man/man8/mkfs.ext2.8 man/man8/mkfs.ext3.8 man/man8/mkfs.ext4.8 -man/man8/mkfs.ext4dev.8 man/man8/mklost+found.8 man/man8/resize2fs.8 man/man8/tune2fs.8 @@ -52,13 +49,11 @@ sbin/findfs sbin/fsck.ext2 sbin/fsck.ext3 sbin/fsck.ext4 -sbin/fsck.ext4dev sbin/logsave sbin/mke2fs sbin/mkfs.ext2 sbin/mkfs.ext3 sbin/mkfs.ext4 -sbin/mkfs.ext4dev sbin/mklost+found sbin/resize2fs sbin/tune2fs @@ -70,11 +65,15 @@ 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/fi/LC_MESSAGES/e2fsprogs.mo share/locale/fr/LC_MESSAGES/e2fsprogs.mo +share/locale/hu/LC_MESSAGES/e2fsprogs.mo share/locale/id/LC_MESSAGES/e2fsprogs.mo share/locale/it/LC_MESSAGES/e2fsprogs.mo +share/locale/ms/LC_MESSAGES/e2fsprogs.mo share/locale/nl/LC_MESSAGES/e2fsprogs.mo share/locale/pl/LC_MESSAGES/e2fsprogs.mo +share/locale/sr/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 diff --git a/sysutils/e2fsprogs/distinfo b/sysutils/e2fsprogs/distinfo index 4b813f287cf..5141c4cdc64 100644 --- a/sysutils/e2fsprogs/distinfo +++ b/sysutils/e2fsprogs/distinfo @@ -1,18 +1,18 @@ -$NetBSD: distinfo,v 1.20 2016/08/09 21:46:06 jdolecek Exp $ +$NetBSD: distinfo,v 1.21 2017/02/03 14:08:11 mef Exp $ -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 (e2fsprogs-1.43.4.tar.gz) = f7cf8c82805103b53f89ad5da641e1085281d411 +RMD160 (e2fsprogs-1.43.4.tar.gz) = 4e99649f17ad009446260c3a7800ea56652f94f0 +SHA512 (e2fsprogs-1.43.4.tar.gz) = 069349baa095869b2b1dbdfe8ff32e5c1bc0084a9b73c3f1f72ac7d7205a48cf9697b6fbac6f9ebd7593c439f79e619384f638f72d6843bb24b310b14e46b4f4 +Size (e2fsprogs-1.43.4.tar.gz) = 7552516 bytes SHA1 (patch-ab) = 9b686655a75239279a456dc8889113be06519cd7 -SHA1 (patch-ac) = 1b938d2b9032896aa1caf85c21727b328ecae2de +SHA1 (patch-ac) = 1d1c27fde75e3c8db8327a4519417bb2c733f953 SHA1 (patch-af) = bcda43bb14afdbf6a98dfedd949af4d1aff443d6 -SHA1 (patch-an) = 0649c3dbd33932265c291a593b393a55b2707626 +SHA1 (patch-an) = 1199b17c4e65b8825b78fc02f7b2c9164eee56ef 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.c) = 0ca90ee35d255b8f590a216554a22b738c6083bc SHA1 (patch-lib_ext2fs_bitops.h) = 8eec77c83bf85423a1420b18405e9ba655131528 SHA1 (patch-lib_ext2fs_ext2fs.h) = 2811fd3eff03dd4fb7f72df4c854d2c33b37846f SHA1 (patch-lib_ext2fs_tdb.c) = dd50993cd0beba0451cfb3422ca9f54700ee0e38 diff --git a/sysutils/e2fsprogs/patches/patch-ac b/sysutils/e2fsprogs/patches/patch-ac index 4e1c52e15c2..1e8a3e7c258 100644 --- a/sysutils/e2fsprogs/patches/patch-ac +++ b/sysutils/e2fsprogs/patches/patch-ac @@ -1,4 +1,6 @@ -$NetBSD: patch-ac,v 1.4 2016/08/09 21:46:07 jdolecek Exp $ +$NetBSD: patch-ac,v 1.5 2017/02/03 14:08:11 mef Exp $ + +DragonFly Support --- lib/blkid/getsize.c.orig 2016-06-08 21:39:43.000000000 +0000 +++ lib/blkid/getsize.c diff --git a/sysutils/e2fsprogs/patches/patch-an b/sysutils/e2fsprogs/patches/patch-an index 6a35f7b1e08..81fc66738e1 100644 --- a/sysutils/e2fsprogs/patches/patch-an +++ b/sysutils/e2fsprogs/patches/patch-an @@ -1,4 +1,6 @@ -$NetBSD: patch-an,v 1.3 2016/08/09 21:46:07 jdolecek Exp $ +$NetBSD: patch-an,v 1.4 2017/02/03 14:08:11 mef Exp $ + +/* Where to find the config file */ --- e2fsck/e2fsck.h.orig 2016-06-08 21:39:43.000000000 +0000 +++ e2fsck/e2fsck.h diff --git a/sysutils/e2fsprogs/patches/patch-lib_ext2fs_bitops.c b/sysutils/e2fsprogs/patches/patch-lib_ext2fs_bitops.c index bee5607a577..73ad2ecf2de 100644 --- a/sysutils/e2fsprogs/patches/patch-lib_ext2fs_bitops.c +++ b/sysutils/e2fsprogs/patches/patch-lib_ext2fs_bitops.c @@ -1,7 +1,7 @@ -$NetBSD: patch-lib_ext2fs_bitops.c,v 1.1 2016/08/09 21:46:07 jdolecek Exp $ +$NetBSD: patch-lib_ext2fs_bitops.c,v 1.2 2017/02/03 14:08:11 mef Exp $ ---- lib/ext2fs/bitops.c.orig 2013-09-09 14:29:01.000000000 +0000 -+++ lib/ext2fs/bitops.c +--- 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 @@ -116,14 +116,14 @@ int ext2fs_test_bit64(__u64 nr, const vo return (mask & *ADDR); } @@ -22,7 +22,7 @@ $NetBSD: patch-lib_ext2fs_bitops.c,v 1.1 2016/08/09 21:46:07 jdolecek Exp $ @@ -139,19 +139,19 @@ unsigned int ext2fs_bitcount(const void unsigned int res = 0; - while (((((unsigned long) cp) & 3) != 0) && (nbytes > 0)) { + while (((((uintptr_t) cp) & 3) != 0) && (nbytes > 0)) { - res += popcount8(*cp++); + res += ext2fs_popcount8(*cp++); nbytes--; |