Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 7 Oct 2014 19:15:53 +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: r370388 - in head: devel/e2fsprogs-libss misc/e2fsprogs-libblkid misc/e2fsprogs-libuuid sysutils/e2fsprogs sysutils/e2fsprogs/files
Message-ID:  <201410071915.s97JFrQo061043@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mandree
Date: Tue Oct  7 19:15:52 2014
New Revision: 370388
URL: https://svnweb.freebsd.org/changeset/ports/370388
QAT: https://qat.redports.org/buildarchive/r370388/

Log:
  Update to new upstream release 1.42.12.
  Changelog:	http://e2fsprogs.sourceforge.net/e2fsprogs-release.html#1.42.12
  
  Reset PORTREVISION on slaves.
  Remove @dirrm* from master's + slaves' pkg-plist.
  Remove patches overcome by upstream events.
  Ignore PORTSCOUT - it can't figure out the directory structure.
  No longer run self-test in parallel - exhausts redports directory.
  
  Mark BROKEN on 11-CURRENT - causes miscompilation (bogus numbers in
  output, SIGSEGV/SIGBUS):
    https://redports.org/~mandree/20141007190638-31576-251231/e2fsprogs-1.42.12.log
    https://redports.org/~mandree/20141007185700-4151-251228/e2fsprogs-1.42.12.log

Deleted:
  head/sysutils/e2fsprogs/files/patch-350897
  head/sysutils/e2fsprogs/files/patch-tests-md5sum
Modified:
  head/devel/e2fsprogs-libss/Makefile
  head/devel/e2fsprogs-libss/pkg-plist
  head/misc/e2fsprogs-libblkid/Makefile
  head/misc/e2fsprogs-libblkid/pkg-plist
  head/misc/e2fsprogs-libuuid/Makefile
  head/misc/e2fsprogs-libuuid/pkg-plist
  head/sysutils/e2fsprogs/Makefile
  head/sysutils/e2fsprogs/distinfo
  head/sysutils/e2fsprogs/pkg-plist

Modified: head/devel/e2fsprogs-libss/Makefile
==============================================================================
--- head/devel/e2fsprogs-libss/Makefile	Tue Oct  7 18:28:27 2014	(r370387)
+++ head/devel/e2fsprogs-libss/Makefile	Tue Oct  7 19:15:52 2014	(r370388)
@@ -1,7 +1,7 @@
 # Created by: Ben Kaduk <kaduk@mit.edu>
 # $FreeBSD$
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	devel
 PKGNAMESUFFIX=	-libss
 

Modified: head/devel/e2fsprogs-libss/pkg-plist
==============================================================================
--- head/devel/e2fsprogs-libss/pkg-plist	Tue Oct  7 18:28:27 2014	(r370387)
+++ head/devel/e2fsprogs-libss/pkg-plist	Tue Oct  7 19:15:52 2014	(r370388)
@@ -9,5 +9,3 @@ libdata/pkgconfig/ss.pc
 man/man1/mk_cmds.1.gz
 share/ss/ct_c.awk
 share/ss/ct_c.sed
-@dirrm include/ss
-@dirrm share/ss

Modified: head/misc/e2fsprogs-libblkid/Makefile
==============================================================================
--- head/misc/e2fsprogs-libblkid/Makefile	Tue Oct  7 18:28:27 2014	(r370387)
+++ head/misc/e2fsprogs-libblkid/Makefile	Tue Oct  7 19:15:52 2014	(r370388)
@@ -1,7 +1,7 @@
 # Created by: Matthias Andree <matthias.andree@gmx.de>
 # $FreeBSD$
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	misc devel
 PKGNAMESUFFIX=	-libblkid
 

Modified: head/misc/e2fsprogs-libblkid/pkg-plist
==============================================================================
--- head/misc/e2fsprogs-libblkid/pkg-plist	Tue Oct  7 18:28:27 2014	(r370387)
+++ head/misc/e2fsprogs-libblkid/pkg-plist	Tue Oct  7 19:15:52 2014	(r370388)
@@ -5,5 +5,4 @@ lib/libblkid.so.1
 lib/libblkid.so
 lib/libblkid.a
 libdata/pkgconfig/blkid.pc
-@dirrm include/blkid
 man/man3/libblkid.3.gz

Modified: head/misc/e2fsprogs-libuuid/Makefile
==============================================================================
--- head/misc/e2fsprogs-libuuid/Makefile	Tue Oct  7 18:28:27 2014	(r370387)
+++ head/misc/e2fsprogs-libuuid/Makefile	Tue Oct  7 19:15:52 2014	(r370388)
@@ -1,7 +1,7 @@
 # Created by: Matthias Andree <matthias.andree@gmx.de>
 # $FreeBSD$
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	misc devel
 PKGNAMESUFFIX=	-libuuid
 

Modified: head/misc/e2fsprogs-libuuid/pkg-plist
==============================================================================
--- head/misc/e2fsprogs-libuuid/pkg-plist	Tue Oct  7 18:28:27 2014	(r370387)
+++ head/misc/e2fsprogs-libuuid/pkg-plist	Tue Oct  7 19:15:52 2014	(r370388)
@@ -20,6 +20,5 @@ man/man3/uuid_generate_time.3.gz
 man/man8/uuidd.8.gz
 sbin/uuidd
 @exec mkdir -p /var/run/libuuid
-@dirrm include/uuid
 @unexec %D/etc/rc.d/uuidd stop  >/dev/null 2>&1 || true
 @unexec rmdir /var/run/libuuid  >/dev/null 2>&1 || true

Modified: head/sysutils/e2fsprogs/Makefile
==============================================================================
--- head/sysutils/e2fsprogs/Makefile	Tue Oct  7 18:28:27 2014	(r370387)
+++ head/sysutils/e2fsprogs/Makefile	Tue Oct  7 19:15:52 2014	(r370388)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	e2fsprogs
-PORTVERSION=	1.42.10
+PORTVERSION=	1.42.12
 PORTREVISION?=	0
 CATEGORIES?=	sysutils
 MASTER_SITES=	KERNEL_ORG/linux/kernel/people/tytso/${PORTNAME}/v${PORTVERSION}
@@ -12,6 +12,8 @@ COMMENT?=	Utilities & library to manipul
 
 LICENSE=	GPLv2
 
+PORTSCOUT=	ignore	# cannot handle the version in the directory
+
 PATCH_STRIP=	-p1
 USES=		gmake pkgconfig tar:xz
 USE_CSTD=	gnu99
@@ -51,6 +53,10 @@ USES+=		gettext iconv:build
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} >= 1100000
+BROKEN=		Segfaults and miscalculations observed on redports
+.endif
+
 .if ${PORT_OPTIONS:MNLS}
 PLIST_SUB=	NLS=""
 . if empty(ICONV_LIB)
@@ -119,7 +125,9 @@ post-build:
 # 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 && ${MKDIR} ${WRKDIR}/tmp && ${MAKE_CMD} -j${MAKE_JOBS_NUMBER} check TMPDIR=${WRKDIR}/tmp \
+# do not add -j options to ${MAKE_CMD} below, this might break
+# due to excessive disk space use.
+	cd ${WRKSRC}/tests && ${MKDIR} ${WRKDIR}/tmp && ${MAKE_CMD} check TMPDIR=${WRKDIR}/tmp \
 	    || { head -n30000 ${WRKSRC}/tests/*.failed 2>/dev/null ; exit 1 ; }
 
 post-install:

Modified: head/sysutils/e2fsprogs/distinfo
==============================================================================
--- head/sysutils/e2fsprogs/distinfo	Tue Oct  7 18:28:27 2014	(r370387)
+++ head/sysutils/e2fsprogs/distinfo	Tue Oct  7 19:15:52 2014	(r370388)
@@ -1,2 +1,2 @@
-SHA256 (e2fsprogs-1.42.10.tar.xz) = 1f3324e80b042e8b9c2791c5b5de57afa205989b170e5800764ea60cb3961599
-SIZE (e2fsprogs-1.42.10.tar.xz) = 4676804
+SHA256 (e2fsprogs-1.42.12.tar.xz) = 6dadcd3b759195150d20154ab9d6516e3b3cbb35d66d461f55ae94a2854e7de8
+SIZE (e2fsprogs-1.42.12.tar.xz) = 4777592

Modified: head/sysutils/e2fsprogs/pkg-plist
==============================================================================
--- head/sysutils/e2fsprogs/pkg-plist	Tue Oct  7 18:28:27 2014	(r370387)
+++ head/sysutils/e2fsprogs/pkg-plist	Tue Oct  7 19:15:52 2014	(r370388)
@@ -59,6 +59,7 @@ sbin/tune2fs
 %%NLS%%share/locale/ca/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%share/locale/cs/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
 %%NLS%%share/locale/fr/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%share/locale/id/LC_MESSAGES/e2fsprogs.mo
@@ -67,5 +68,6 @@ sbin/tune2fs
 %%NLS%%share/locale/pl/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/e2fsprogs.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/e2fsprogs.mo



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410071915.s97JFrQo061043>