From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Feb 10 13:40:03 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0D90216A41B for ; Sun, 10 Feb 2008 13:40:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id E60A013C448 for ; Sun, 10 Feb 2008 13:40:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m1ADe2gG010074 for ; Sun, 10 Feb 2008 13:40:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m1ADe227010073; Sun, 10 Feb 2008 13:40:02 GMT (envelope-from gnats) Resent-Date: Sun, 10 Feb 2008 13:40:02 GMT Resent-Message-Id: <200802101340.m1ADe227010073@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Matthias Andree Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CCC2D16A41B for ; Sun, 10 Feb 2008 13:39:39 +0000 (UTC) (envelope-from matthias.andree@gmx.de) Received: from mail.gmx.net (mail.gmx.net [213.165.64.20]) by mx1.freebsd.org (Postfix) with SMTP id 1BCC313C45B for ; Sun, 10 Feb 2008 13:39:38 +0000 (UTC) (envelope-from matthias.andree@gmx.de) Received: (qmail invoked by alias); 10 Feb 2008 13:39:37 -0000 Received: from f048067042.adsl.alicedsl.de (EHLO m2a2.dyndns.org) [78.48.67.42] by mail.gmx.net (mp043) with SMTP; 10 Feb 2008 14:39:37 +0100 Received: from localhost (localhost [127.0.0.1]) by merlin.emma.line.org (Postfix) with ESMTP id 54B422013C3; Sun, 10 Feb 2008 14:39:36 +0100 (CET) Received: from m2a2.dyndns.org ([127.0.0.1]) by localhost (m2a2.dyndns.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rpzQYEf+-uU0; Sun, 10 Feb 2008 14:39:35 +0100 (CET) Received: from rho.emma.line.org (vpn-rho.emma.line.org [192.168.0.206]) by merlin.emma.line.org (Postfix) with ESMTP id 6B0D82013C2; Sun, 10 Feb 2008 14:39:35 +0100 (CET) Received: by rho.emma.line.org (Postfix, from userid 500) id F257F5CD0; Sun, 10 Feb 2008 14:39:34 +0100 (CET) Message-Id: <20080210133934.F257F5CD0@rho.emma.line.org> Date: Sun, 10 Feb 2008 14:39:34 +0100 (CET) From: Matthias Andree To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/120500: [MAINTAINER] sysutils/e2fsprogs: update to 1.40.6 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Feb 2008 13:40:03 -0000 >Number: 120500 >Category: ports >Synopsis: [MAINTAINER] sysutils/e2fsprogs: update to 1.40.6 >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: Sun Feb 10 13:40:02 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Matthias Andree >Release: FreeBSD 6.3-RELEASE i386 >Organization: >Environment: System: FreeBSD rho.emma.line.org 6.3-RELEASE FreeBSD 6.3-RELEASE #3: Fri Jan 25 15:12:19 CET 2008 >Description: - Update to 1.40.6 - Add a regression check to avoid libintl/libiconv dependency regressions as observed in 1.40.5 and _1 - Add a few comments - Dump tests/*.failed files on failure, to aid debugging sparc64 problems - Adjust patch line numbers - Drop one misc/Makefile patch that was integrated upstream Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- e2fsprogs-1.40.6.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-02-05 19:40:51.000000000 +0100 +++ /usr/home/emma/ports/sysutils/e2fsprogs/Makefile 2008-02-10 14:30:06.000000000 +0100 @@ -6,8 +6,8 @@ # PORTNAME= e2fsprogs -PORTVERSION= 1.40.5 -PORTREVISION?= 1 +PORTVERSION= 1.40.6 +PORTREVISION?= 0 CATEGORIES?= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -40,7 +40,7 @@ findfs.8 blkid.8 logsave.8 fsck_ext2fs.8 post-extract: - ${CHMOD} u+w ${WRKSRC}/po/*.po ${WRKSRC}/po/*.pot \ + @${CHMOD} u+w ${WRKSRC}/po/*.po ${WRKSRC}/po/*.pot \ ${WRKSRC}/${CONFIGURE_SCRIPT} .endif @@ -51,27 +51,41 @@ PLIST_SUB= NLS="@comment " .else USE_GETTEXT= yes +# We need to make sure that anything that is outside the root file +# system is statically linked, else we're in trouble if e2fsck is needed +# for boot: MAKE_ARGS+= STATIC_LIBS="../lib/libext2fs.a ../lib/libcom_err.a \ - ../lib/libblkid.a ../lib/libuuid.a \ - ${LOCALBASE}/lib/libintl.a ${LOCALBASE}/lib/libiconv.a" + ../lib/libblkid.a ../lib/libuuid.a" \ + LIBINTL="${LOCALBASE}/lib/libintl.a ${LOCALBASE}/lib/libiconv.a" PLIST_SUB= NLS="" .endif post-patch:: - ${REINPLACE_CMD} -E -e \ + @${REINPLACE_CMD} -E -e \ 's:\$$\(libdir\)/pkgconfig:${PREFIX}/libdata/pkgconfig:' \ ${WRKSRC}/lib/*/Makefile.in - @: # don't build/install libext2fs.info - ${REINPLACE_CMD} -e 's/ install-doc-libs$$//' ${WRKSRC}/Makefile.in +# don't build/install libext2fs.info + @${REINPLACE_CMD} -e 's/ install-doc-libs$$//' ${WRKSRC}/Makefile.in .if ${MASTERDIR} == ${.CURDIR} post-build: +# Avoid a regression from 1.40.5, +# check that e2fsck isn't dynalinked against anything but libc.so: + @${ECHO_CMD} -n "===> checking that e2fsck depends on no shared objects beyond libc.so: " + @a="$$(ldd ${WRKSRC}/e2fsck/e2fsck 2>/dev/null \ + | ${GREP} -v 'not a dynamic executable' \ + | ${GREP} '=>' \ + | ${AWK} '{print $$3;}' \ + | ${GREP} -v '^/lib/libc\.so\.' || :)"; \ + if test "x$$a" = "x" ; then echo 'PASS' ; else \ + echo 'FAIL' ; echo '===> e2fsck depends on:' ; echo "$$a" ; exit 1 ; fi +# Update translation binary files .if !defined(WITHOUT_NLS) cd ${WRKSRC}/po && ${MAKE} update-gmo .endif - ${CC} ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -s -static ${LIBS} \ +# Build fsck(8) wrapper + ${CC} ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -s ${LIBS} \ -o ${WRKSRC}/fsck_ext2fs ${FILESDIR}/fsck_ext2fs.c - cd ${WRKSRC}/tests && ${MAKE} check # While the ${MAKE} check can take a minute on an end user's system, the # correctness of tools such as e2fsck is critical to the health of the # file systems. The upstream is not using any *BSD as his development @@ -79,6 +93,9 @@ # test on each and every system and not just package building hosts. # There have been subtle failures induced by Linux-isms in the past. # -- Matthias Andree, package maintainer, 2007-09-18 + @${ECHO_CMD} '===> Running e2fsprogs self-test suite' + cd ${WRKSRC}/tests && ${MAKE} check \ + || { head -n30000 ${WRKSRC}/tests/*.failed 2>/dev/null ; exit 1 ; } post-install: ${INSTALL_PROGRAM} ${WRKSRC}/fsck_ext2fs ${PREFIX}/sbin/ diff -ruN --exclude=CVS /usr/ports/sysutils/e2fsprogs/distinfo /usr/home/emma/ports/sysutils/e2fsprogs/distinfo --- /usr/ports/sysutils/e2fsprogs/distinfo 2008-02-05 14:40:07.000000000 +0100 +++ /usr/home/emma/ports/sysutils/e2fsprogs/distinfo 2008-02-10 13:43:39.000000000 +0100 @@ -1,3 +1,3 @@ -MD5 (e2fsprogs-1.40.5.tar.gz) = 69e55eaf543acfab8e2eb8ba2883d8cd -SHA256 (e2fsprogs-1.40.5.tar.gz) = 11df6d84e0eb0da17938d4802d7872657b464c9a53ed21b0521c929d481d8ac4 -SIZE (e2fsprogs-1.40.5.tar.gz) = 4048882 +MD5 (e2fsprogs-1.40.6.tar.gz) = d219b7be4f7170400c646f5611c0b702 +SHA256 (e2fsprogs-1.40.6.tar.gz) = b5fb67fb6b4f85fdf3256b1c2f9d9473e018d4fd5af0c50b1030ad794160c11e +SIZE (e2fsprogs-1.40.6.tar.gz) = 4072124 diff -ruN --exclude=CVS /usr/ports/sysutils/e2fsprogs/files/patch-SIGINFO-e2fck_unix.c /usr/home/emma/ports/sysutils/e2fsprogs/files/patch-SIGINFO-e2fck_unix.c --- /usr/ports/sysutils/e2fsprogs/files/patch-SIGINFO-e2fck_unix.c 2004-02-24 22:55:22.000000000 +0100 +++ /usr/home/emma/ports/sysutils/e2fsprogs/files/patch-SIGINFO-e2fck_unix.c 2008-02-10 14:27:42.000000000 +0100 @@ -1,6 +1,6 @@ --- e2fsprogs-1.35/e2fsck/unix.c~ Sun Dec 7 18:11:38 2003 +++ e2fsprogs-1.35/e2fsck/unix.c Tue Feb 24 22:13:52 2004 -@@ -416,6 +416,24 @@ +@@ -461,6 +461,24 @@ return 0; } @@ -25,7 +25,7 @@ #define PATH_SET "PATH=/sbin" static void reserve_stdio_fds(void) -@@ -448,6 +466,17 @@ +@@ -493,6 +511,17 @@ ctx->progress_fd = 0; } @@ -43,7 +43,7 @@ static void signal_progress_off(int sig EXT2FS_ATTR((unused))) { e2fsck_t ctx = e2fsck_global_ctx; -@@ -740,6 +769,8 @@ +@@ -825,6 +854,8 @@ sigaction(SIGUSR1, &sa, 0); sa.sa_handler = signal_progress_off; sigaction(SIGUSR2, &sa, 0); diff -ruN --exclude=CVS /usr/ports/sysutils/e2fsprogs/files/patch-configure /usr/home/emma/ports/sysutils/e2fsprogs/files/patch-configure --- /usr/ports/sysutils/e2fsprogs/files/patch-configure 2007-07-04 13:32:35.000000000 +0200 +++ /usr/home/emma/ports/sysutils/e2fsprogs/files/patch-configure 2008-02-10 14:29:05.000000000 +0100 @@ -1,6 +1,6 @@ --- a/configure.orig Thu Jun 8 15:30:16 2006 +++ b/configure Thu Jun 8 15:30:34 2006 -@@ -8095,7 +8095,7 @@ +@@ -9044,7 +9044,7 @@ @@ -9,7 +9,7 @@ stdlib.h string.h unistd.h sys/param.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -@@ -16641,7 +16641,7 @@ +@@ -15105,7 +15105,7 @@ fi { echo "$as_me:$LINENO: checking for unified diff option" >&5 echo $ECHO_N "checking for unified diff option... $ECHO_C" >&6; } diff -ruN --exclude=CVS /usr/ports/sysutils/e2fsprogs/files/patch-lib_ext2fs_ext2_fs.h /usr/home/emma/ports/sysutils/e2fsprogs/files/patch-lib_ext2fs_ext2_fs.h --- /usr/ports/sysutils/e2fsprogs/files/patch-lib_ext2fs_ext2_fs.h 2007-07-04 13:32:35.000000000 +0200 +++ /usr/home/emma/ports/sysutils/e2fsprogs/files/patch-lib_ext2fs_ext2_fs.h 2008-02-10 14:26:11.000000000 +0100 @@ -1,6 +1,6 @@ --- a/lib/ext2fs/ext2_fs.h.orig Sat Jun 30 16:36:37 2007 +++ b/lib/ext2fs/ext2_fs.h Sat Jun 30 16:36:43 2007 -@@ -414,7 +414,7 @@ +@@ -418,7 +418,7 @@ #define i_size_high i_dir_acl diff -ruN --exclude=CVS /usr/ports/sysutils/e2fsprogs/files/patch-misc_Makefile.in /usr/home/emma/ports/sysutils/e2fsprogs/files/patch-misc_Makefile.in --- /usr/ports/sysutils/e2fsprogs/files/patch-misc_Makefile.in 2008-01-13 19:48:27.000000000 +0100 +++ /usr/home/emma/ports/sysutils/e2fsprogs/files/patch-misc_Makefile.in 2008-02-10 14:25:20.000000000 +0100 @@ -19,17 +19,7 @@ LPROGS= @E2INITRD_PROG@ -@@ -251,8 +251,7 @@ - $(DESTDIR)$(root_sbindir) $(DESTDIR)$(bindir) \ - $(DESTDIR)$(man1dir) $(DESTDIR)$(man8dir) \ - $(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir) \ -- $(DESTDIR)$(libdir) $(DESTDIR)/$(root_sysconfdir) \ -- $(DESTDIR)/etc/init.d -+ $(DESTDIR)$(libdir) $(DESTDIR)/$(root_sysconfdir) - - install: all $(SMANPAGES) $(UMANPAGES) installdirs - @for i in $(SPROGS); do \ -@@ -312,11 +311,9 @@ +@@ -311,11 +310,9 @@ echo " INSTALL_DATA $(man5dir)/$$i"; \ $(INSTALL_DATA) $$i $(DESTDIR)$(man5dir)/$$i; \ done --- e2fsprogs-1.40.6.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: