[gentoo-commits] proj/hardened-dev:uclibc commit in: sys-apps/util-linux/, sys-apps/util-linux/files/

["Anthony G. Basile" <blueness@gentoo.org>]

commit:     6ef99ef06bf2652116811f16a54c7b5f76d506db
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 16 20:31:38 2012 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Feb 16 20:31:38 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=6ef99ef0

sys-apps/util-linux: add scanf-as.patch for mips

(Portage version: 2.1.10.44/git/Linux x86_64, signed Manifest commit with key 0xD0455535)

---
 .../files/util-linux-2.20.1-scanf-as.patch         |   12 ++++++++++
 sys-apps/util-linux/metadata.xml                   |    5 +---
 sys-apps/util-linux/util-linux-2.19.1-r99.ebuild   |    2 +-
 ...9.1-r99.ebuild => util-linux-2.20.1-r99.ebuild} |   22 ++++++++++++-------
 4 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/sys-apps/util-linux/files/util-linux-2.20.1-scanf-as.patch b/sys-apps/util-linux/files/util-linux-2.20.1-scanf-as.patch
new file mode 100644
index 0000000..32f20bf
--- /dev/null
+++ b/sys-apps/util-linux/files/util-linux-2.20.1-scanf-as.patch
@@ -0,0 +1,12 @@
+diff -Naur util-linux-2.20.1.orig//include/c.h util-linux-2.20.1/include/c.h
+--- util-linux-2.20.1.orig//include/c.h	2011-10-18 08:22:27.000000000 -0400
++++ util-linux-2.20.1/include/c.h	2012-02-16 15:23:55.000000000 -0500
+@@ -216,7 +216,7 @@
+  */
+ #ifdef HAVE_SCANF_MS_MODIFIER
+ #define UL_SCNsA	"%ms"
+-#elif defined(HAVE_SCANF_AS_MODIFIER)
++#else
+ #define UL_SCNsA	"%as"
+ #endif
+ 

diff --git a/sys-apps/util-linux/metadata.xml b/sys-apps/util-linux/metadata.xml
index 8a9b6a7..2072514 100644
--- a/sys-apps/util-linux/metadata.xml
+++ b/sys-apps/util-linux/metadata.xml
@@ -2,12 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>base-system</herd>
-	<maintainer restrict="sys-apps/util-linux[loop-aes]">
-		<email>c1pher@gentoo.org</email>
-		<name>Dane Smith</name>
-	</maintainer>
 <use>
 	<flag name='cramfs'>build mkfs/fsck helpers for cramfs filesystems</flag>
+	<flag name='ddate'>build ddate helper (Discordian dates)</flag>
 	<flag name='perl'>install the chkdupexe helper script</flag>
 </use>
 </pkgmetadata>

diff --git a/sys-apps/util-linux/util-linux-2.19.1-r99.ebuild b/sys-apps/util-linux/util-linux-2.19.1-r99.ebuild
index 95e961c..14cecaf 100644
--- a/sys-apps/util-linux/util-linux-2.19.1-r99.ebuild
+++ b/sys-apps/util-linux/util-linux-2.19.1-r99.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/${MY_P}
 DESCRIPTION="Various useful Linux utilities"
 HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux/"
 SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.bz2"
-KEYWORDS="amd64 mips x86"
+KEYWORDS="amd64 x86"
 
 LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
 SLOT="0"

diff --git a/sys-apps/util-linux/util-linux-2.19.1-r99.ebuild b/sys-apps/util-linux/util-linux-2.20.1-r99.ebuild
similarity index 81%
copy from sys-apps/util-linux/util-linux-2.19.1-r99.ebuild
copy to sys-apps/util-linux/util-linux-2.20.1-r99.ebuild
index 95e961c..7554c37 100644
--- a/sys-apps/util-linux/util-linux-2.19.1-r99.ebuild
+++ b/sys-apps/util-linux/util-linux-2.20.1-r99.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.19.1-r1.ebuild,v 1.12 2012/01/07 20:54:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.20.1-r1.ebuild,v 1.1 2012/01/07 21:33:35 vapier Exp $
 
 EAPI="3"
 
@@ -14,13 +14,14 @@ S=${WORKDIR}/${MY_P}
 DESCRIPTION="Various useful Linux utilities"
 HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux/"
 SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.bz2"
-KEYWORDS="amd64 mips x86"
+KEYWORDS="~mips"
 
 LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
 SLOT="0"
-IUSE="+cramfs crypt ncurses nls old-linux perl selinux slang uclibc unicode"
+IUSE="+cramfs ddate ncurses nls old-linux perl selinux slang static-libs uclibc unicode"
 
 RDEPEND="
+	<sys-apps/sysvinit-2.88-r3
 	!<sys-libs/e2fsprogs-libs-1.41.8
 	!<sys-fs/e2fsprogs-1.41.8
 	cramfs? ( sys-libs/zlib )
@@ -33,8 +34,7 @@ DEPEND="${RDEPEND}
 	virtual/os-headers"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-mount-a-segv.patch #366213
-	epatch "${FILESDIR}"/${P}-umount-l-nfs.patch #370051
+	epatch "${FILESDIR}"/${P}-scanf-as.patch
 	use uclibc && sed -i -e s/versionsort/alphasort/g -e s/strverscmp.h/dirent.h/g mount/lomount.c
 	elibtoolize
 }
@@ -55,15 +55,14 @@ lfs_fallocate_test() {
 usex() { use $1 && echo ${2:-yes} || echo ${3:-no} ; }
 src_configure() {
 	lfs_fallocate_test
-	append-flags -DHAVE_PROGRAM_INVOCATION_SHORT_NAME
 	econf \
 		--enable-fs-paths-extra=/usr/sbin \
 		$(use_enable nls) \
 		--enable-agetty \
 		$(use_enable cramfs) \
+		$(use_enable ddate) \
 		$(use_enable old-linux elvtune) \
 		--with-ncurses=$(usex ncurses $(usex unicode auto yes) no) \
-		--disable-init \
 		--disable-kill \
 		--disable-last \
 		--disable-mesg \
@@ -78,12 +77,14 @@ src_configure() {
 		--without-pam \
 		$(use_with selinux) \
 		$(use_with slang) \
+		$(use_enable static-libs static) \
 		$(tc-has-tls || echo --disable-tls)
 }
 
 src_install() {
 	emake install DESTDIR="${D}" || die "install failed"
 	dodoc AUTHORS NEWS README* TODO docs/*
+	use ddate || find "${ED}"/usr/share/man -name 'ddate.1*' -delete
 
 	if ! use perl ; then #284093
 		rm "${ED}"/usr/bin/chkdupexe || die
@@ -91,7 +92,12 @@ src_install() {
 	fi
 
 	# need the libs in /
-	gen_usr_ldscript -a blkid uuid
+	gen_usr_ldscript -a blkid mount uuid
 	# e2fsprogs-libs didnt install .la files, and .pc work fine
 	rm -f "${ED}"/usr/$(get_libdir)/*.la
 }
+
+pkg_postinst() {
+	elog "The agetty util now clears the terminal by default.  You"
+	elog "might want to add --noclear to your /etc/inittab lines."
+}