Date: Wed, 18 Jun 2008 15:43:06 +0200 (CEST) From: Matthias Andree <matthias.andree@gmx.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/124715: [MAINTAINER] sysutils/e2fsprogs: update to 1.40.11 Message-ID: <20080618134306.E2B5EC193@merlin.emma.line.org> Resent-Message-ID: <200806181350.m5IDo1ik024695@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 124715
>Category: ports
>Synopsis: [MAINTAINER] sysutils/e2fsprogs: update to 1.40.11
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Wed Jun 18 13:50:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Matthias Andree
>Release: FreeBSD 6.3-STABLE i386
>Organization:
>Environment:
System: FreeBSD merlin.emma.line.org 6.3-STABLE FreeBSD 6.3-STABLE #33: Sun Jun 1 11:12:24 CEST
>Description:
- Update to 1.40.11
- Use assembly bitops, a new patch (provided by upstream maintainer Ted Ts'o to
OpenBSD porter Frantisek Holop) fixes the related crashes.
Added file(s):
- files/patch-lib_ext2fs_bitmaps.c
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- e2fsprogs-1.40.11.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/sysutils/e2fsprogs/Makefile /usr/home/emma/ports/sysutils/e2fsprogs/Makefile
--- /usr/ports/sysutils/e2fsprogs/Makefile 2008-06-06 16:02:57.000000000 +0200
+++ /usr/home/emma/ports/sysutils/e2fsprogs/Makefile 2008-06-18 15:41:48.000000000 +0200
@@ -6,8 +6,8 @@
#
PORTNAME= e2fsprogs
-PORTVERSION= 1.40.10
-PORTREVISION?= 1
+PORTVERSION= 1.40.11
+PORTREVISION?= 0
CATEGORIES?= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -22,11 +22,8 @@
--with-cc='${CC}' --with-linker='${LD}' \
--with-ccopts='${CFLAGS}' \
--with-root-prefix='${PREFIX}'
-# for unknown reasons, the assembly bitops cause SIGSEGV.
-# _EXT2_USE_C_VERSIONS_ uses C bitops, these appear to work fine.
CONFIGURE_ENV+= CPPFLAGS='${CPPFLAGS} -I${WRKSRC}/lib \
- -I${LOCALBASE}/include -D_EXT2_USE_C_VERSIONS_'
-
+ -I${LOCALBASE}/include'
MAKE_ARGS+= LDFLAGS='${LDFLAGS} -L${LOCALBASE}/lib'
OPTIONS= NLS "Enable national language support" on
diff -ruN --exclude=CVS /usr/ports/sysutils/e2fsprogs/distinfo /usr/home/emma/ports/sysutils/e2fsprogs/distinfo
--- /usr/ports/sysutils/e2fsprogs/distinfo 2008-06-05 13:45:29.000000000 +0200
+++ /usr/home/emma/ports/sysutils/e2fsprogs/distinfo 2008-06-18 14:35:37.000000000 +0200
@@ -1,3 +1,3 @@
-MD5 (e2fsprogs-1.40.10.tar.gz) = 6174d70fb26858861f842f28486a8e83
-SHA256 (e2fsprogs-1.40.10.tar.gz) = 36071b91510d4101a35887b7c654962945c571e8285af9fa974a7a6265dfaabc
-SIZE (e2fsprogs-1.40.10.tar.gz) = 4092763
+MD5 (e2fsprogs-1.40.11.tar.gz) = 004cea70d724fdc7f1a952dffe4c9db8
+SHA256 (e2fsprogs-1.40.11.tar.gz) = 3eeb0c3513b3b251f5d51ec3413bc77e3a21cb8bc84a1979022a67fe733c897b
+SIZE (e2fsprogs-1.40.11.tar.gz) = 4116013
diff -ruN --exclude=CVS /usr/ports/sysutils/e2fsprogs/files/patch-lib_ext2fs_bitmaps.c /usr/home/emma/ports/sysutils/e2fsprogs/files/patch-lib_ext2fs_bitmaps.c
--- /usr/ports/sysutils/e2fsprogs/files/patch-lib_ext2fs_bitmaps.c 1970-01-01 01:00:00.000000000 +0100
+++ /usr/home/emma/ports/sysutils/e2fsprogs/files/patch-lib_ext2fs_bitmaps.c 2008-06-18 15:22:50.000000000 +0200
@@ -0,0 +1,16 @@
+# To fix bitops related crash
+# patch provided by Ted Ts'o to Frantisek Holop (OpenBSD porter)
+
+diff --git a/lib/ext2fs/bitmaps.c b/lib/ext2fs/bitmaps.c
+index 696baad..843a75f 100644
+--- a/lib/ext2fs/bitmaps.c
++++ b/lib/ext2fs/bitmaps.c
+@@ -56,7 +56,7 @@ static errcode_t make_bitmap(__u32 start, __u32 end, __u32 real_end,
+ } else
+ bitmap->description = 0;
+
+- size = (size_t) (((bitmap->real_end - bitmap->start) / 8) + 1);
++ size = (size_t) (((bitmap->real_end - bitmap->start) / 8) + 2);
+ retval = ext2fs_get_mem(size, &bitmap->bitmap);
+ if (retval) {
+ ext2fs_free_mem(&bitmap->description);
--- e2fsprogs-1.40.11.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20080618134306.E2B5EC193>