Date: Tue, 29 Dec 2015 11:48:30 +0000 (UTC) From: Matthias Andree <mandree@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r404737 - in head/sysutils/e2fsprogs: . files Message-ID: <201512291148.tBTBmUZ3007019@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mandree Date: Tue Dec 29 11:48:30 2015 New Revision: 404737 URL: https://svnweb.freebsd.org/changeset/ports/404737 Log: Update to upstream release 1.42.13. Changelog: <http://e2fsprogs.sourceforge.net/e2fsprogs-release.html#1.42.13>; Added: head/sysutils/e2fsprogs/files/patch-zzz-f449486d (contents, props changed) Deleted: head/sysutils/e2fsprogs/files/patch-zzz-160f131deed7d3db2aa958051eef7ae8fafa8539 head/sysutils/e2fsprogs/files/patch-zzz-407916f5af4443e0ddd9469c57fc1684c07f9294 head/sysutils/e2fsprogs/files/patch-zzz-63b4cbb8bc8602d5dfe80413005142a7b59c25ef head/sysutils/e2fsprogs/files/patch-zzz-CVE-2015-1572-49d0fe2a14f2a23da2fe299643379b8c1d37df73 head/sysutils/e2fsprogs/files/patch-zzz-beec19ff21d41c84dbbc2ab8d0df25147912ff59 head/sysutils/e2fsprogs/files/patch-zzz-dab7435917698bb490cce61fc8be1be0a862cf66 head/sysutils/e2fsprogs/files/patch-zzz-e9a5c6e3607d17641543aa5e801af22563fb1410 head/sysutils/e2fsprogs/files/patch-zzz-f38676c3e4001359b96576204e9024557ef5fd1b head/sysutils/e2fsprogs/files/patch-zzz-f8d3d1661885a07ac9ef639dda0ce23d181a2c73 Modified: head/sysutils/e2fsprogs/Makefile head/sysutils/e2fsprogs/distinfo head/sysutils/e2fsprogs/pkg-plist Modified: head/sysutils/e2fsprogs/Makefile ============================================================================== --- head/sysutils/e2fsprogs/Makefile Tue Dec 29 11:14:59 2015 (r404736) +++ head/sysutils/e2fsprogs/Makefile Tue Dec 29 11:48:30 2015 (r404737) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= e2fsprogs -PORTVERSION= 1.42.12 -PORTREVISION?= 2 +PORTVERSION= 1.42.13 +PORTREVISION?= 0 CATEGORIES?= sysutils MASTER_SITES= KERNEL_ORG/linux/kernel/people/tytso/${PORTNAME}/v${PORTVERSION} @@ -74,8 +74,9 @@ post-patch:: @${REINPLACE_CMD} -e 's/<malloc\.h>/<stdlib.h>/' ${WRKSRC}/*/*.c # disable f_mmp_garbage, fails on FreeBSD, and the resize*big_expand tests, # which are too unwieldy to run automatically (need too much free space). -# f_extent_oobounds fails in Tinderbox and is fine outside, reason unclear. -.for i in f_mmp_garbage m_bigjournal r_64bit_big_expand r_bigalloc_big_expand r_ext4_big_expand +# f_extent_oobounds appears to have differences in screen output, reason +# unclear. +.for i in f_mmp_garbage m_bigjournal r_64bit_big_expand r_bigalloc_big_expand r_ext4_big_expand f_extent_oobounds @${MV} ${WRKSRC}/tests/${i} ${WRKSRC}/tests/disabled_test-${i} .endfor Modified: head/sysutils/e2fsprogs/distinfo ============================================================================== --- head/sysutils/e2fsprogs/distinfo Tue Dec 29 11:14:59 2015 (r404736) +++ head/sysutils/e2fsprogs/distinfo Tue Dec 29 11:48:30 2015 (r404737) @@ -1,2 +1,2 @@ -SHA256 (e2fsprogs-1.42.12.tar.xz) = 6dadcd3b759195150d20154ab9d6516e3b3cbb35d66d461f55ae94a2854e7de8 -SIZE (e2fsprogs-1.42.12.tar.xz) = 4777592 +SHA256 (e2fsprogs-1.42.13.tar.xz) = e16474b5a3a30f9197160c4b91bd48d5a463583049c0fcc405b6f0f7075aa0c7 +SIZE (e2fsprogs-1.42.13.tar.xz) = 4802740 Added: head/sysutils/e2fsprogs/files/patch-zzz-f449486d ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/e2fsprogs/files/patch-zzz-f449486d Tue Dec 29 11:48:30 2015 (r404737) @@ -0,0 +1,38 @@ +From f449486d631987983b4275d246b7bbbb551f3235 Mon Sep 17 00:00:00 2001 +From: Andreas Dilger <adilger@dilger.ca> +Date: Mon, 30 Nov 2015 12:09:44 -0500 +Subject: libext2fs: fix tst_badblocks buffer overrun + +The test2[] array is not 0-terminated and the create_test_list() for +loop does not terminate properly at the end of this array, but +continues until it hits the 0 at the end of test3[]. + +Reported-by: Hanno Boeck <hanno@hboeck.de> +Addresses: https://bugzilla.kernel.org/show_bug.cgi?id=104311 +Signed-off-by: Andreas Dilger <adilger@dilger.ca> +Signed-off-by: Theodore Ts'o <tytso@mit.edu> +--- + lib/ext2fs/tst_badblocks.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/ext2fs/tst_badblocks.c b/lib/ext2fs/tst_badblocks.c +index 3b39ef1..c685f33 100644 +--- ./lib/ext2fs/tst_badblocks.c ++++ ./lib/ext2fs/tst_badblocks.c +@@ -30,11 +30,11 @@ + #define DEL_BLK 0x0002 + + blk_t test1[] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 0 }; +-blk_t test2[] = { 11, 10, 9, 8, 7, 6, 5, 4, 3, 3, 2, 1 }; ++blk_t test2[] = { 11, 10, 9, 8, 7, 6, 5, 4, 3, 3, 2, 1, 0 }; + blk_t test3[] = { 3, 1, 4, 5, 9, 2, 7, 10, 5, 6, 10, 8, 0 }; + blk_t test4[] = { 20, 50, 12, 17, 13, 2, 66, 23, 56, 0 }; + blk_t test4a[] = { +- 20, 1, ++ 20, 1, + 50, 1, + 3, 0, + 17, 1, +-- +cgit v0.11.2 + Modified: head/sysutils/e2fsprogs/pkg-plist ============================================================================== --- head/sysutils/e2fsprogs/pkg-plist Tue Dec 29 11:14:59 2015 (r404736) +++ head/sysutils/e2fsprogs/pkg-plist Tue Dec 29 11:48:30 2015 (r404737) @@ -58,6 +58,7 @@ sbin/resize2fs sbin/tune2fs %%NLS%%share/locale/ca/LC_MESSAGES/e2fsprogs.mo %%NLS%%share/locale/cs/LC_MESSAGES/e2fsprogs.mo +%%NLS%%share/locale/da/LC_MESSAGES/e2fsprogs.mo %%NLS%%share/locale/de/LC_MESSAGES/e2fsprogs.mo %%NLS%%share/locale/eo/LC_MESSAGES/e2fsprogs.mo %%NLS%%share/locale/es/LC_MESSAGES/e2fsprogs.mo
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512291148.tBTBmUZ3007019>