From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Feb 6 16:40:05 2009 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 93D3210656C1 for ; Fri, 6 Feb 2009 16:40:05 +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 6CCDF8FC21 for ; Fri, 6 Feb 2009 16:40:05 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n16Ge5Ox084867 for ; Fri, 6 Feb 2009 16:40:05 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n16Ge5XF084866; Fri, 6 Feb 2009 16:40:05 GMT (envelope-from gnats) Resent-Date: Fri, 6 Feb 2009 16:40:05 GMT Resent-Message-Id: <200902061640.n16Ge5XF084866@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 B104F106564A for ; Fri, 6 Feb 2009 16:38:42 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 5EA2D8FC1C for ; Fri, 6 Feb 2009 16:38:42 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id n16Gcg2f059226 for ; Fri, 6 Feb 2009 16:38:42 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id n16Gcf06059219; Fri, 6 Feb 2009 16:38:41 GMT (envelope-from nobody) Message-Id: <200902061638.n16Gcf06059219@www.freebsd.org> Date: Fri, 6 Feb 2009 16:38:41 GMT From: Matthias Andree To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/131449: [MAINTAINER] update sysutils/e2fsprogs to 1.41.4 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: Fri, 06 Feb 2009 16:40:06 -0000 >Number: 131449 >Category: ports >Synopsis: [MAINTAINER] update sysutils/e2fsprogs to 1.41.4 >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: Fri Feb 06 16:40:05 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Matthias Andree >Release: 8-CURRENT >Organization: - >Environment: >Description: the attached patch updates sysutils/e2fsprogs to the new upstream release 1.41.4. >How-To-Repeat: >Fix: Patch attached with submission follows: ===> Updating from CVS M Makefile M distinfo M pkg-install M pkg-plist ===> Generating patch ===> Viewing diff with more Index: Makefile =================================================================== RCS file: /home/ncvs/ports/sysutils/e2fsprogs/Makefile,v retrieving revision 1.50 diff -u -r1.50 Makefile --- Makefile 10 Dec 2008 07:35:18 -0000 1.50 +++ Makefile 6 Feb 2009 16:35:21 -0000 @@ -6,7 +6,7 @@ # PORTNAME= e2fsprogs -PORTVERSION= 1.41.3 +PORTVERSION= 1.41.4 PORTREVISION?= 0 CATEGORIES?= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED} @@ -51,9 +51,11 @@ .if defined(WITHOUT_NLS) CONFIGURE_ARGS+=--disable-nls PLIST_SUB= NLS="@comment " +libintl= .else USE_GETTEXT= yes PLIST_SUB= NLS="" +libintl= "${LOCALBASE}/lib/libintl.a ${LOCALBASE}/lib/libiconv.a" .endif .if ${ARCH} == "sparc64" @@ -77,7 +79,7 @@ && ${GMAKE} e2fsck \ STATIC_LIBS="../lib/libext2fs.a ../lib/libcom_err.a \ ../lib/libblkid.a ../lib/libuuid.a" \ - LIBINTL="${LOCALBASE}/lib/libintl.a ${LOCALBASE}/lib/libiconv.a" + LIBINTL=${libintl} # Regression check: avoid a port (not upstream!) 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: " @@ -108,11 +110,6 @@ post-install: ${INSTALL_PROGRAM} ${WRKSRC}/fsck_ext2fs ${PREFIX}/sbin/ - @: # stuff into /sbin since we might need e2fsck early on - ${LN} ${PREFIX}/sbin/fsck_ext2fs /sbin/ 2>/dev/null || \ - ${INSTALL_PROGRAM} ${PREFIX}/sbin/fsck_ext2fs /sbin/ - ${LN} ${PREFIX}/sbin/e2fsck /sbin/ 2>/dev/null || \ - ${INSTALL_PROGRAM} ${PREFIX}/sbin/e2fsck /sbin/ ${INSTALL_MAN} ${FILESDIR}/fsck_ext2fs.8 ${PREFIX}/man/man8/ .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} @@ -122,8 +119,7 @@ .endif PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL @${ECHO_MSG} ; ${CAT} ${PKGMESSAGE} ; ${ECHO_MSG} - -# .if ${MASTERDIR} == ${.CURDIR} +# the next line closes .if ${MASTERDIR} == ${.CURDIR} .endif .include Index: distinfo =================================================================== RCS file: /home/ncvs/ports/sysutils/e2fsprogs/distinfo,v retrieving revision 1.27 diff -u -r1.27 distinfo --- distinfo 15 Oct 2008 16:03:52 -0000 1.27 +++ distinfo 6 Feb 2009 16:35:21 -0000 @@ -1,3 +1,3 @@ -MD5 (e2fsprogs-1.41.3.tar.gz) = b21d26fc46c584021dc9c444933ee1c2 -SHA256 (e2fsprogs-1.41.3.tar.gz) = ce77edae680d090cb8275eca9be282bdbc5fbef028d7bf6f772fb4f04b578d7a -SIZE (e2fsprogs-1.41.3.tar.gz) = 4365234 +MD5 (e2fsprogs-1.41.4.tar.gz) = 59033388df36987d2b9c9bbf7e19bd57 +SHA256 (e2fsprogs-1.41.4.tar.gz) = 2cc10fee2b29add737e454eb634513135b34a638f7ca2b18364864fe089020dc +SIZE (e2fsprogs-1.41.4.tar.gz) = 4389512 Index: pkg-install =================================================================== RCS file: /home/ncvs/ports/sysutils/e2fsprogs/pkg-install,v retrieving revision 1.3 diff -u -r1.3 pkg-install --- pkg-install 23 Sep 2008 08:18:45 -0000 1.3 +++ pkg-install 6 Feb 2009 16:35:21 -0000 @@ -6,6 +6,23 @@ case "$MODE" in POST-INSTALL) + # install fsck tool and wrapper. + err=0 + for i in e2fsck fsck_ext2fs ; do + ln -f ${PKG_PREFIX}/sbin/${i} /sbin 2>/dev/null \ + || cp -p ${PKG_PREFIX}/sbin/${i} /sbin \ + || err=1 + done + if test $err = 1 ; then + echo '========================================================================' + echo 'Warning: cannot install fsck to /sbin!' + echo 'Requesting ext2fs to be checked from /etc/fstab can cause boot failures!' + echo '========================================================================' + echo '' + fi + # + # install configuration file and update + # if test -f ${PKG_PREFIX}/etc/mke2fs.conf; then if cmp -s ${PKG_PREFIX}/etc/mke2fs.conf.dist \ ${PKG_PREFIX}/etc/mke2fs.conf; then @@ -20,7 +37,7 @@ echo "===========================================================================" else mv ${PKG_PREFIX}/etc/mke2fs.conf \ - ${PKG_PREFIX}/etc/mke2fs.conf.e2fsprogs-old + ${PKG_PREFIX}/etc/mke2fs.conf.e2fsprogs-old cp -f -p ${PKG_PREFIX}/etc/mke2fs.conf.dist \ ${PKG_PREFIX}/etc/mke2fs.conf echo "===========================================================================" @@ -37,6 +54,8 @@ fi ;; DEINSTALL) + rm -f /sbin/fsck_ext2fs /sbin/e2fsck \ + || echo "Could not remove /sbin/fsck_ext2fs /sbin/e2fsck. Please remove manually." if cmp -s ${PKG_PREFIX}/etc/mke2fs.conf \ ${PKG_PREFIX}/etc/mke2fs.conf.dist then Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/sysutils/e2fsprogs/pkg-plist,v retrieving revision 1.18 diff -u -r1.18 pkg-plist --- pkg-plist 23 Sep 2008 08:18:45 -0000 1.18 +++ pkg-plist 6 Feb 2009 16:35:21 -0000 @@ -15,9 +15,6 @@ sbin/fsck.ext4 sbin/fsck.ext4dev sbin/fsck_ext2fs -@exec ln -f %D/sbin/e2fsck /sbin 2>/dev/null || cp -p %D/sbin/e2fsck /sbin -@exec ln -f %D/sbin/fsck_ext2fs /sbin 2>/dev/null || cp -p %D/sbin/fsck_ext2fs /sbin -@unexec rm -f /sbin/fsck_ext2fs /sbin/e2fsck sbin/logsave sbin/mke2fs sbin/mkfs.ext2 ===> Done >Release-Note: >Audit-Trail: >Unformatted: