aboutsummaryrefslogtreecommitdiffstats
path: root/sysutils
diff options
context:
space:
mode:
authormandree <mandree@FreeBSD.org>2016-09-11 02:00:53 +0800
committermandree <mandree@FreeBSD.org>2016-09-11 02:00:53 +0800
commitb66ed1a7298ef9d601e4d35cdf1b1f9241e4a6a2 (patch)
tree5844ef6b73bd9789ab5c2c01a32ec8ccf6a965fc /sysutils
parent39170898ad12bcf10c866fec41bf9009bcae4b52 (diff)
downloadfreebsd-ports-gnome-b66ed1a7298ef9d601e4d35cdf1b1f9241e4a6a2.tar.gz
freebsd-ports-gnome-b66ed1a7298ef9d601e4d35cdf1b1f9241e4a6a2.tar.zst
freebsd-ports-gnome-b66ed1a7298ef9d601e4d35cdf1b1f9241e4a6a2.zip
Update to new upstream release 1.43.3.
ChangeLog: (also see the log for 1.43.2 that the port skipped!) <http://e2fsprogs.sourceforge.net/e2fsprogs-release.html#1.43.3> While here, refresh patches, and time-limit programs in self-test suite to 60 s CPU time each, to avoid runaway processes from stalling the self-tests for too long. Still no joy on FreeBSD 11+ - the self-test results hint to massive data loss, and more than 10 self-tests fail.
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/e2fsprogs/Makefile4
-rw-r--r--sysutils/e2fsprogs/distinfo6
-rw-r--r--sysutils/e2fsprogs/files/patch-e2fsck__unix.c2
-rw-r--r--sysutils/e2fsprogs/files/patch-lib__uuid__gen_uuid.c2
-rw-r--r--sysutils/e2fsprogs/files/patch-misc__Makefile.in12
-rw-r--r--sysutils/e2fsprogs/files/patch-misc_create__inode.c11
-rw-r--r--sysutils/e2fsprogs/pkg-plist3
7 files changed, 15 insertions, 25 deletions
diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile
index c52b8c6f1255..11b23d6476ba 100644
--- a/sysutils/e2fsprogs/Makefile
+++ b/sysutils/e2fsprogs/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= e2fsprogs
-PORTVERSION= 1.43.1
+PORTVERSION= 1.43.3
PORTREVISION?= 0
CATEGORIES?= sysutils
MASTER_SITES= KERNEL_ORG/linux/kernel/people/tytso/${PORTNAME}/v${PORTVERSION}
@@ -195,7 +195,7 @@ post-build:
@${ECHO_CMD} '===> Running e2fsprogs self-test suite'
# do not add -j options unconditionally to ${MAKE_CMD} below, this might break
# due to excessive disk space use.
- cd ${WRKSRC}/tests && ${MKDIR} ${WRKDIR}/tmp && ${MAKE_CMD} check ${_CHECK_JOBS} ${_checkaddargs} \
+ cd ${WRKSRC}/tests && ulimit -t 60 && ${MKDIR} ${WRKDIR}/tmp && ${MAKE_CMD} check ${_CHECK_JOBS} ${_checkaddargs} \
|| { head -n30000 ${WRKSRC}/tests/*.failed 2>/dev/null ; exit 1 ; }
.else
@${ECHO_CMD} '===> SKIPPING e2fsprogs self-test suite (DISCOURAGED!)'
diff --git a/sysutils/e2fsprogs/distinfo b/sysutils/e2fsprogs/distinfo
index a8d9720b43b5..907fb1b1176e 100644
--- a/sysutils/e2fsprogs/distinfo
+++ b/sysutils/e2fsprogs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1466265501
-SHA256 (e2fsprogs-1.43.1.tar.xz) = 97e36a029224e2606baa6e9ea693b04a4d192ccd714572a1b50a2df9c687b23d
-SIZE (e2fsprogs-1.43.1.tar.xz) = 5078696
+TIMESTAMP = 1473526034
+SHA256 (e2fsprogs-1.43.3.tar.xz) = 744ca4e9a8e6c943601b2744d1ae658e5f37d35b5ea5b1dea86985320bd87f37
+SIZE (e2fsprogs-1.43.3.tar.xz) = 5220304
diff --git a/sysutils/e2fsprogs/files/patch-e2fsck__unix.c b/sysutils/e2fsprogs/files/patch-e2fsck__unix.c
index c70d2db6486b..c59cbd8880f9 100644
--- a/sysutils/e2fsprogs/files/patch-e2fsck__unix.c
+++ b/sysutils/e2fsprogs/files/patch-e2fsck__unix.c
@@ -1,4 +1,4 @@
---- e2fsck/unix.c.orig 2016-05-09 02:18:14 UTC
+--- e2fsck/unix.c.orig 2016-09-02 04:17:32 UTC
+++ e2fsck/unix.c
@@ -9,8 +9,6 @@
* %End-Header%
diff --git a/sysutils/e2fsprogs/files/patch-lib__uuid__gen_uuid.c b/sysutils/e2fsprogs/files/patch-lib__uuid__gen_uuid.c
index 553ba382fe7e..1d077be3b615 100644
--- a/sysutils/e2fsprogs/files/patch-lib__uuid__gen_uuid.c
+++ b/sysutils/e2fsprogs/files/patch-lib__uuid__gen_uuid.c
@@ -1,4 +1,4 @@
---- lib/uuid/gen_uuid.c.orig 2016-03-21 17:21:03 UTC
+--- lib/uuid/gen_uuid.c.orig 2016-09-02 04:17:32 UTC
+++ lib/uuid/gen_uuid.c
@@ -92,6 +92,7 @@
#ifdef HAVE_SYS_RESOURCE_H
diff --git a/sysutils/e2fsprogs/files/patch-misc__Makefile.in b/sysutils/e2fsprogs/files/patch-misc__Makefile.in
index db1d6f8fb5ea..5155ec9bf777 100644
--- a/sysutils/e2fsprogs/files/patch-misc__Makefile.in
+++ b/sysutils/e2fsprogs/files/patch-misc__Makefile.in
@@ -1,4 +1,4 @@
---- misc/Makefile.in.orig 2016-03-18 19:14:18 UTC
+--- misc/Makefile.in.orig 2016-09-02 04:52:46 UTC
+++ misc/Makefile.in
@@ -34,16 +34,16 @@ INSTALL = @INSTALL@
@@ -16,13 +16,13 @@
FMANPAGES= mke2fs.conf.5 ext4.5
-UPROGS= chattr lsattr @UUID_CMT@ uuidgen
--UMANPAGES= chattr.1 fuse2fs.1 lsattr.1 @UUID_CMT@ uuidgen.1
+-UMANPAGES= chattr.1 lsattr.1 @UUID_CMT@ uuidgen.1
+UPROGS= chattr lsattr
-+UMANPAGES= chattr.1 fuse2fs.1 lsattr.1
++UMANPAGES= chattr.1 lsattr.1
+ UMANPAGES+= @FUSE_CMT@ fuse2fs.1
LPROGS= @E2INITRD_PROG@
-
-@@ -143,14 +143,14 @@ profiled:
+@@ -144,14 +144,14 @@ profiled:
mke2fs.conf: $(srcdir)/mke2fs.conf.in
if test -f $(srcdir)/mke2fs.conf.custom.in ; then \
@@ -40,7 +40,7 @@
> default_profile.c
findsuper: findsuper.o
$(E) " LD $@"
-@@ -575,34 +575,9 @@ install: all $(SMANPAGES) $(UMANPAGES) i
+@@ -577,34 +577,9 @@ install: all $(SMANPAGES) $(UMANPAGES) i
(cd $(DESTDIR)$(man5dir); \
$(LN) $(LINK_INSTALL_FLAGS) ext4.5 $$i.5); \
done
diff --git a/sysutils/e2fsprogs/files/patch-misc_create__inode.c b/sysutils/e2fsprogs/files/patch-misc_create__inode.c
deleted file mode 100644
index 218d190c131f..000000000000
--- a/sysutils/e2fsprogs/files/patch-misc_create__inode.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- misc/create_inode.c.orig 2016-06-08 21:39:43 UTC
-+++ misc/create_inode.c
-@@ -450,7 +450,7 @@ static errcode_t try_lseek_copy(ext2_fil
- {
- off_t data = 0, hole;
- off_t data_blk, hole_blk;
-- errcode_t err;
-+ errcode_t err = 0;
-
- /* Try to use SEEK_DATA and SEEK_HOLE */
- while (data < statbuf->st_size) {
diff --git a/sysutils/e2fsprogs/pkg-plist b/sysutils/e2fsprogs/pkg-plist
index c08a5ed14409..b9346c3affb7 100644
--- a/sysutils/e2fsprogs/pkg-plist
+++ b/sysutils/e2fsprogs/pkg-plist
@@ -2,7 +2,6 @@ bin/chattr
bin/lsattr
etc/mke2fs.conf.dist
man/man1/chattr.1.gz
-man/man1/fuse2fs.1.gz
man/man1/lsattr.1.gz
man/man5/e2fsck.conf.5.gz
man/man5/mke2fs.conf.5.gz
@@ -64,10 +63,12 @@ sbin/tune2fs
%%NLS%%share/locale/eo/LC_MESSAGES/e2fsprogs.mo
%%NLS%%share/locale/es/LC_MESSAGES/e2fsprogs.mo
%%NLS%%share/locale/fr/LC_MESSAGES/e2fsprogs.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/e2fsprogs.mo
%%NLS%%share/locale/id/LC_MESSAGES/e2fsprogs.mo
%%NLS%%share/locale/it/LC_MESSAGES/e2fsprogs.mo
%%NLS%%share/locale/nl/LC_MESSAGES/e2fsprogs.mo
%%NLS%%share/locale/pl/LC_MESSAGES/e2fsprogs.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/e2fsprogs.mo
%%NLS%%share/locale/sv/LC_MESSAGES/e2fsprogs.mo
%%NLS%%share/locale/tr/LC_MESSAGES/e2fsprogs.mo
%%NLS%%share/locale/uk/LC_MESSAGES/e2fsprogs.mo