Date: Fri, 6 Feb 2009 16:38:41 GMT From: Matthias Andree <matthias.andree@gmx.de> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/131449: [MAINTAINER] update sysutils/e2fsprogs to 1.41.4 Message-ID: <200902061638.n16Gcf06059219@www.freebsd.org> Resent-Message-ID: <200902061640.n16Ge5XF084866@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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 <bsd.port.post.mk>
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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200902061638.n16Gcf06059219>