Pull in updates from live git ebuild. Apply upstream fix for cfdisk input issue #328959 by James L. Hammons. Update loop-aes patch #326363.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 196 insertions, 2 deletions

diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog
index 0abfc80da76e..e18352a64f18 100644
--- a/sys-apps/util-linux/ChangeLog
+++ b/sys-apps/util-linux/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/util-linux
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.314 2010/07/10 15:59:11 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.315 2010/07/19 21:50:36 vapier Exp $
+
+*util-linux-2.18-r1 (19 Jul 2010)
+
+  19 Jul 2010; Mike Frysinger <vapier@gentoo.org>
+  +util-linux-2.18-r1.ebuild,
+  +files/util-linux-2.18-cfdisk-string-len.patch:
+  Pull in updates from live git ebuild. Apply upstream fix for cfdisk input
+  issue #328959 by James L. Hammons. Update loop-aes patch #326363.
 
   10 Jul 2010; Jeroen Roovers <jer@gentoo.org> util-linux-2.17.2.ebuild:
   Stable for HPPA (bug #326339).
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 3a46d340d6b4..3dd3e4d12826 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -1,15 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX crypto-loop.confd 412 RMD160 5e65febe9641a8362078fdae39b4ac955fb2e63b SHA1 2f881a24ff67115e74de7a11c66a34a745060864 SHA256 188c945e5e6c54cb14874057c625ff30b72fb33d3d5648e53de2f231a3375600
 AUX crypto-loop.initd 1729 RMD160 fa53920677d793cf98cad994e4dabd53e53d8d04 SHA1 19d3b7c4aa95cdadde2f6fb81a391081eae04f42 SHA256 b8329250c865e79a1e761d713c2270c99d5fe96e0d5a7ca646946fab65c4b810
+AUX util-linux-2.18-cfdisk-string-len.patch 1683 RMD160 a96c6e3e58155ec337d9c0b6332f9dc097929cd4 SHA1 a74e8bf9ed61b4f726d986d4468e03b0169b107d SHA256 6f9203bf6ab5c9c3985f18d39f95e01dea00738496ec9d4b9b01a32d49cb7781
 AUX util-linux-2.18-ncursesw.patch 2163 RMD160 dbf1cd9fbb6c017d0980a7a18064793517f17b69 SHA1 542dcfb520407df8c4b44df967164a7bd632d710 SHA256 e36b3ac4ee5084baa8db5b1d20b4ef07e4061913645718a576b09100d910fed5
 AUX util-linux-2.18-slang.patch 3412 RMD160 1fcb0ab2770bd5c2702ab984e533d8bb02d66257 SHA1 6a244f0c4c8982ac4a7dd2d0e13b88ca5a7638dc SHA256 e0dc6a468ac641a47b06d878eda95d56c63683d22423cc87471b0546cffbbc2c
 DIST util-linux-2.16.1-loop-aes.patch.bz2 58371 RMD160 d759cff55d8e45a007c1a08e57fc2fc71a01b403 SHA1 5d26a6bccb301cde31358a8caae30c4729347836 SHA256 e5e4e53d1d486b8ed1fbc68f44843e67a893e810c1d8074ba8ee7ffc47382966
 DIST util-linux-ng-2.16.2.tar.bz2 3521956 RMD160 8c27748d804ad00efb153bf62f8c74756413888b SHA1 ace7a87ea61154210d9a11dd66b1b49d8130a828 SHA256 b1c3f5986b97753f3f83338b36aa25fc1370d96734313047da257df489f9a3eb
 DIST util-linux-ng-2.17.1-20100308.diff.bz2 57867 RMD160 26584b886ac8db1ec723690a685a442615366f2c SHA1 f76a2deb4b4012e98d82517d84dfb09725533a51 SHA256 c7478553e03ba7cbe28ddb066361966567d97b0746a13396bff12a83183014a0
 DIST util-linux-ng-2.17.2.tar.bz2 3815657 RMD160 398aa54c6001acc16bc2d049ccbdb62824776ba3 SHA1 69275de84f7dabb7a5d90d0046c3a6b861c16a1d SHA256 c9ae801b6a5ab20b7749a278a8bf6830ef53adc5e8b7eb0ac1a9f410c774118f
+DIST util-linux-ng-2.18-20100706.diff.bz2 58805 RMD160 5b1d645ecf33af652c7be704f213558d5c70202e SHA1 c36d29f27a2ce3f2ec746ae48712ae8ea74af856 SHA256 cde75f181eb998316a7d695da3c93b1894de3cc2b45df2f2c3f21e8b0280b4a4
 DIST util-linux-ng-2.18.tar.bz2 7669676 RMD160 4781871a8f86195b886e81d364d41a57d67869e3 SHA1 154db0512caae0b6e90eee4b7312d4caf3d6b978 SHA256 b8c5c07c763888aa712b4585393346667a00793127c54cef0470cfa456b031cc
 EBUILD util-linux-2.16.2.ebuild 2599 RMD160 c1e3c9a2b4f65074aeec0d377a85573d54c8cca6 SHA1 e2429b7a7da6de737b01719f55b9674ee2bfead8 SHA256 aac6bb667221ab92704b857d4e26805e670f5f7ba7f175706e4b3d613db6b814
 EBUILD util-linux-2.17.2.ebuild 3031 RMD160 c98492cd4e958aad3271cc34864e07df58def593 SHA1 d09b0bb37481edb83324e085586d9cbf5af56d35 SHA256 8ee2765ce0f4b6be18e6d394a70bf3355b7a481fb666ccebba92e68f066b8ad6
+EBUILD util-linux-2.18-r1.ebuild 3205 RMD160 adf5d0eb1ce9e805932cb2c29cd84acd53b9806c SHA1 b142fc42cb7a8ab3ff48912c1c277062b1e2d51e SHA256 1b75f408b985dfed0b999c6d88767be5df86c513b99ddc7fda4215274b421dd1
 EBUILD util-linux-2.18.ebuild 3107 RMD160 c28101e31fe9ac96fe86f9b066321ee25c8589d9 SHA1 4b29bb3017148253fd7af80f3d8ef604eb3df42f SHA256 fdb99da9d6586ffc2f69f5f6dbd8d25c4d46c22fd41a026c6440843049c53679
 EBUILD util-linux-9999.ebuild 3057 RMD160 99092b9db2f5fad5e1d4d7ea5028182a0a5df9df SHA1 d39ae6544a28b9973f69b94321b21b9fd089c049 SHA256 0516d07aed00faee00dcca4ab29e35bc0e87aedf3a25b4e0ca3d5288b5b56295
-MISC ChangeLog 47714 RMD160 3a69b7f87a5010173c731e6ca16e9f195486e98c SHA1 24cca0384217dc6f1b00a4e3ae4d67d4bb395b25 SHA256 a9e6e18e70eb2ae0ec5a1fdc9119406d0253fed0ff9a093a2e324be432130d47
+MISC ChangeLog 48027 RMD160 783c283c328b25b36680c02fa47aac15e63659df SHA1 9841d80ad951f4e97e3f1ab51b0dfc445d281019 SHA256 5c6752761db642bc30eadd82213013dee880f1e1d05a073e6f66914ab43d6c28
 MISC metadata.xml 309 RMD160 d386a285872f68f80198f63be994dc8179e2254f SHA1 0e2ba366c96f233cf76e649dfa1eb1ba1ab8a897 SHA256 ccc7a0dd3a5a579aac578db211c116840fecf84e7e2c92d21efb430b51467264
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iF4EAREIAAYFAkxEx/sACgkQTwhj9JtAlp477AEAiHaIsd1lbtYvZmxNGAEsoOvT
+RbPjcGQhemlyQewyRMwA/3f35Ovn76F9GJ8cvtx9Ya2UICfyaywkEawZF/4X5pdt
+=HR1v
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/util-linux/files/util-linux-2.18-cfdisk-string-len.patch b/sys-apps/util-linux/files/util-linux-2.18-cfdisk-string-len.patch
new file mode 100644
index 000000000000..5b2d5f198ed7
--- /dev/null
+++ b/sys-apps/util-linux/files/util-linux-2.18-cfdisk-string-len.patch
@@ -0,0 +1,59 @@
+http://bugs.gentoo.org/328959
+
+From 54a0fe298b4d6d948cffbd6fbbbe7dbabc9a6bb1 Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Mon, 19 Jul 2010 22:52:58 +0200
+Subject: [PATCH] cfdisk: get_string not calculating correct limits
+
+Reported-by: James L. Hammons <jlhamm@acm.org>
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ fdisk/cfdisk.c |   11 ++++++++---
+ 1 files changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/fdisk/cfdisk.c b/fdisk/cfdisk.c
+index 7fa0b19..e7955fe 100644
+--- a/fdisk/cfdisk.c
++++ b/fdisk/cfdisk.c
+@@ -421,6 +421,11 @@ fdexit(int ret) {
+     exit(ret);
+ }
+ 
++/*
++ * Note that @len is size of @str buffer.
++ *
++ * Returns number of read bytes (without \0).
++ */
+ static int
+ get_string(char *str, int len, char *def) {
+     size_t cells = 0, i = 0;
+@@ -472,7 +477,7 @@ get_string(char *str, int len, char *def) {
+ 	    break;
+ 	default:
+ #if defined(HAVE_LIBNCURSESW) && defined(HAVE_WIDECHAR)
+-	    if (i < len && iswprint(c)) {
++	    if (i + 1 < len && iswprint(c)) {
+ 		wchar_t wc = (wchar_t) c;
+ 		char s[MB_CUR_MAX + 1];
+ 		int  sz = wctomb(s, wc);
+@@ -492,7 +497,7 @@ get_string(char *str, int len, char *def) {
+ 			putchar(BELL);
+ 	    }
+ #else
+-	    if (i < len && isprint(c)) {
++	    if (i + 1 < len && isprint(c)) {
+ 	        mvaddch(y, x + cells, c);
+ 		if (use_def) {
+ 		    clrtoeol();
+@@ -2405,7 +2410,7 @@ change_id(int i) {
+ 
+     sprintf(def, "%02X", new_id);
+     mvaddstr(COMMAND_LINE_Y, COMMAND_LINE_X, _("Enter filesystem type: "));
+-    if ((len = get_string(id, 2, def)) <= 0 && len != GS_DEFAULT)
++    if ((len = get_string(id, 3, def)) <= 0 && len != GS_DEFAULT)
+ 	return;
+ 
+     if (len != GS_DEFAULT) {
+-- 
+1.7.1.1
+
diff --git a/sys-apps/util-linux/util-linux-2.18-r1.ebuild b/sys-apps/util-linux/util-linux-2.18-r1.ebuild
new file mode 100644
index 000000000000..f478eaf37ca0
--- /dev/null
+++ b/sys-apps/util-linux/util-linux-2.18-r1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.18-r1.ebuild,v 1.1 2010/07/19 21:50:36 vapier Exp $
+
+EAPI="2"
+
+EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux-ng/util-linux-ng.git"
+inherit eutils toolchain-funcs libtool flag-o-matic
+[[ ${PV} == "9999" ]] && inherit git autotools
+
+MY_PV=${PV/_/-}
+MY_P=${PN}-ng-${MY_PV}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="Various useful Linux utilities"
+HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux-ng/"
+if [[ ${PV} == "9999" ]] ; then
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	SRC_URI="mirror://kernel/linux/utils/util-linux-ng/v${PV:0:4}/${MY_P}.tar.bz2
+		loop-aes? ( http://loop-aes.sourceforge.net/updates/util-linux-ng-2.18-20100706.diff.bz2 )"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="crypt loop-aes nls old-linux perl selinux slang uclibc unicode"
+
+RDEPEND="!sys-process/schedutils
+	!sys-apps/setarch
+	>=sys-libs/ncurses-5.2-r2
+	!<sys-libs/e2fsprogs-libs-1.41.8
+	!<sys-fs/e2fsprogs-1.41.8
+	perl? ( dev-lang/perl )
+	selinux? ( sys-libs/libselinux )
+	slang? ( sys-libs/slang )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	virtual/os-headers"
+
+src_prepare() {
+	if [[ ${PV} == "9999" ]] ; then
+		autopoint --force
+		eautoreconf
+	else
+		use loop-aes && epatch "${WORKDIR}"/util-linux-ng-*.diff
+	fi
+	use uclibc && sed -i -e s/versionsort/alphasort/g -e s/strverscmp.h/dirent.h/g mount/lomount.c
+	epatch "${FILESDIR}"/${P}-ncursesw.patch
+	epatch "${FILESDIR}"/${P}-slang.patch #326373
+	epatch "${FILESDIR}"/${P}-cfdisk-string-len.patch #328959
+	elibtoolize
+}
+
+lfs_fallocate_test() {
+	# Make sure we can use fallocate with LFS #300307
+	cat <<-EOF > "${T}"/fallocate.c
+	#define _GNU_SOURCE
+	#include <fcntl.h>
+	main() { return fallocate(0, 0, 0, 0); }
+	EOF
+	append-lfs-flags
+	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.c -o /dev/null >/dev/null 2>&1 \
+		|| export ac_cv_func_fallocate=no
+	rm -f "${T}"/fallocate.c
+}
+
+src_configure() {
+	lfs_fallocate_test
+	econf \
+		--enable-fs-paths-extra=/usr/sbin \
+		$(use_enable nls) \
+		--enable-agetty \
+		--enable-cramfs \
+		$(use_enable old-linux elvtune) \
+		--disable-init \
+		--disable-kill \
+		--disable-last \
+		--disable-mesg \
+		--enable-partx \
+		--enable-raw \
+		--enable-rename \
+		--disable-reset \
+		--disable-login-utils \
+		--enable-schedutils \
+		--disable-wall \
+		--enable-write \
+		--without-pam \
+		$(use unicode || echo --with-ncurses) \
+		$(use_with selinux) \
+		$(use_with slang) \
+		$(tc-has-tls || echo --disable-tls)
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die "install failed"
+	dodoc AUTHORS NEWS README* TODO docs/*
+
+	if ! use perl ; then #284093
+		rm "${D}"/usr/bin/chkdupexe || die
+		rm "${D}"/usr/share/man/man1/chkdupexe.1 || die
+	fi
+
+	# need the libs in /
+	gen_usr_ldscript -a blkid uuid
+	# e2fsprogs-libs didnt install .la files, and .pc work fine
+	rm -f "${D}"/usr/$(get_libdir)/*.la
+
+	if use crypt ; then
+		newinitd "${FILESDIR}"/crypto-loop.initd crypto-loop || die
+		newconfd "${FILESDIR}"/crypto-loop.confd crypto-loop || die
+	fi
+}