Enhanced script support

5 files changed, 173 insertions, 3 deletions

diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog
index 01059e911fe8..3cc0d5ff649b 100644
--- a/sys-apps/util-linux/ChangeLog
+++ b/sys-apps/util-linux/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/util-linux
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.36 2003/05/29 21:28:39 method Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.37 2003/06/01 05:32:45 lostlogic Exp $
+
+*util-linux-2.11z-r4 (01 Jun 2003)
+
+  01 Jun 2003; Brandon Low <lostlogic@gentoo.org> util-linux-2.11z-r4.ebuild:
+  Add enhancement to script command from bug 21147
 
   26 May 2003; Patrick Kursawe <phosphan@gentoo.org>
   util-linux-2.11z-r3.ebuild:
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 9751d6cbaa2f..73bc74cbc765 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -1,10 +1,10 @@
 MD5 3f738c149e18be2c4ddaf28207532a3e util-linux-2.11y.ebuild 2102
 MD5 f0ca9bfd03dd9dfb19f90d6fa293cadb util-linux-2.11z-r2.ebuild 2244
-MD5 6ee899c17ae4b6d7574be429dd299a01 util-linux-2.11z-r4.ebuild 2470
+MD5 20176a6749fee4d6aa09820670064317 util-linux-2.11z-r4.ebuild 2473
 MD5 2d40c7c6fcebb69566baf1b824a34e0f util-linux-2.11z-r1.ebuild 2326
 MD5 7eadd69eea3ba2b4634baa4e0d6a479f util-linux-2.11z-r3.ebuild 2374
 MD5 9c21573bab76550a6a1db7377328468e util-linux-2.11o-r3.ebuild 1698
-MD5 efb8330d3e117084af3e6406797db8c1 ChangeLog 6083
+MD5 3133b3c9d9eb1db73cc9479a5a384199 ChangeLog 6086
 MD5 48e36b9b6ea3bed4ea25292f9ae5a958 files/digest-util-linux-2.11y 152
 MD5 e3697bc8fd6a344e8cba1c7d32e34790 files/util-linux-2.11y-parallel-make.patch 369
 MD5 939305c630f0d2196de84e79f220dd8d files/digest-util-linux-2.11o-r3 138
diff --git a/sys-apps/util-linux/files/digest-util-linux-2.11z-r4 b/sys-apps/util-linux/files/digest-util-linux-2.11z-r4
new file mode 100644
index 000000000000..b479cd78fc10
--- /dev/null
+++ b/sys-apps/util-linux/files/digest-util-linux-2.11z-r4
@@ -0,0 +1,2 @@
+MD5 abaab0a441233d6b7763b89ea5ab4078 util-linux-2.11z.tar.bz2 1266784
+MD5 9d6c4c8a99188b6696b0735fa48f67c2 util-linux-2.11z-crypt-gentoo.patch.bz2 18249
diff --git a/sys-apps/util-linux/files/util-linux-2.11z-script.patch b/sys-apps/util-linux/files/util-linux-2.11z-script.patch
new file mode 100644
index 000000000000..c92ec185a982
--- /dev/null
+++ b/sys-apps/util-linux/files/util-linux-2.11z-script.patch
@@ -0,0 +1,67 @@
+--- util-linux-2.11z/misc-utils/script.1	2002-01-12 11:45:00.000000000 -0800
++++ ./misc-utils/script.1	2003-05-12 16:40:34.000000000 -0700
+@@ -40,6 +40,7 @@
+ .Sh SYNOPSIS
+ .Nm script
+ .Op Fl a
++.Op Fl c Ar COMMAND
+ .Op Fl f
+ .Op Fl q
+ .Op Fl t
+@@ -69,6 +70,10 @@
+ or
+ .Pa typescript ,
+ retaining the prior contents.
++.It Fl c Ar COMMAND
++Run the COMMAND rather than an interactive shell.
++This makes it easy for a script to capture the output of a program that
++behaves differently when its stdout is not a tty.
+ .It Fl f
+ Flush output after each write. This is nice for telecooperation:
+ One person does `mkfifo foo; script -f foo' and another can
+--- util-linux-2.11z/misc-utils/script.c	2002-11-26 08:18:00.000000000 -0800
++++ ./misc-utils/script.c	2003-05-12 16:33:27.000000000 -0700
+@@ -91,6 +91,7 @@
+ char	line[] = "/dev/ptyXX";
+ #endif
+ int	aflg = 0;
++char	*cflg;
+ int	fflg = 0;
+ int	qflg = 0;
+ int	tflg = 0;
+@@ -135,11 +136,14 @@
+ 		}
+ 	}
+ 
+-	while ((ch = getopt(argc, argv, "afqt")) != -1)
++	while ((ch = getopt(argc, argv, "ac:fqt")) != -1)
+ 		switch((char)ch) {
+ 		case 'a':
+ 			aflg++;
+ 			break;
++		case 'c':
++			cflg = optarg;
++			break;
+ 		case 'f':
+ 			fflg++;
+ 			break;
+@@ -284,6 +288,7 @@
+ 
+ void
+ doshell() {
++	char *opt = cflg? "-c" : "-i";
+ 	/***
+ 	int t;
+ 
+@@ -301,9 +306,9 @@
+ 	(void) dup2(slave, 2);
+ 	(void) close(slave);
+ #ifdef __linux__
+-	execl(shell, strrchr(shell, '/') + 1, "-i", 0);
++	execl(shell, strrchr(shell, '/') + 1, opt, cflg, 0);
+ #else
+-	execl(shell, "sh", "-i", 0);
++	execl(shell, "sh", opt, cflg, 0);
+ #endif
+ 	perror(shell);
+ 	fail();
diff --git a/sys-apps/util-linux/util-linux-2.11z-r4.ebuild b/sys-apps/util-linux/util-linux-2.11z-r4.ebuild
new file mode 100644
index 000000000000..72eed2e546ce
--- /dev/null
+++ b/sys-apps/util-linux/util-linux-2.11z-r4.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.11z-r4.ebuild,v 1.1 2003/06/01 05:32:45 lostlogic Exp $
+
+IUSE="crypt nls selinux static pam"
+
+inherit eutils flag-o-matic
+
+filter-flags -fPIC
+
+S=${WORKDIR}/${P}
+CRYPT_PATCH_P="${P}-crypt-gentoo"
+DESCRIPTION="Various useful Linux utilities"
+SRC_URI="mirror://kernel/linux/utils/${PN}/${P}.tar.bz2
+	crypt? ( mirror://gentoo/${CRYPT_PATCH_P}.patch.bz2 )"
+HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux/"
+
+KEYWORDS="~x86 ~ppc ~sparc ~alpha arm ~mips"
+SLOT="0"
+LICENSE="GPL-2"
+
+DEPEND="virtual/glibc
+	>=sys-apps/sed-4.0.5
+	>=sys-libs/ncurses-5.2-r2
+	!selinux? ( pam? ( sys-apps/pam-login ) )
+	selinux? ( sys-apps/shadow )"
+
+RDEPEND="${DEPEND} dev-lang/perl
+	nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+
+	if [ ! -z "`use crypt`" ] ; then
+		epatch ${DISTDIR}/${CRYPT_PATCH_P}.patch.bz2
+	fi
+
+	# Fix rare failures with -j4 or higher
+	epatch ${FILESDIR}/${P}-parallel-make.patch
+
+	# Fix unreadable df output
+	epatch ${FILESDIR}/no-symlink-resolve.patch
+
+	# Support the upcoming "script -c COMMAND" feature now.
+	epatch ${FILESDIR}/${P}-script.patch
+
+	# <kumba@gentoo.org> (22 Apr 2003)
+	# Fix fdisk so it works on SGI Disk Labels and lets the user
+	# Actually select a partition, rather than automatically
+	# choosing "4".
+	if [ "${ARCH}" = "mips" ]
+	then
+		epatch ${FILESDIR}/${P}-mips-fdisk-fix.patch
+	fi
+
+	#enable pam only if we use it
+	use pam && sed -i "s:HAVE_PAM=no:HAVE_PAM=yes:" MCONFIG || die "MCONFIG Pam"
+
+	sed -i \
+		-e "s:-pipe -O2 \$(CPUOPT) -fomit-frame-pointer:${CFLAGS}:" \
+		-e "s:CPU=.*:CPU=${CHOST%%-*}:" \
+		-e "s:HAVE_PAM=no:HAVE_PAM=yes:" \
+		-e "s:HAVE_SLN=no:HAVE_SLN=yes:" \
+		-e "s:HAVE_TSORT=no:HAVE_TSORT=yes:" \
+		-e "s:usr/man:usr/share/man:" \
+		-e "s:usr/info:usr/share/info:" \
+		MCONFIG || die "MCONFIG sed"
+
+	if [ -z "`use nls`" ] ; then
+		sed -i -e 's/DISABLE_NLS=no/DISABLE_NLS=yes/' MCONFIG ||
+			die "MCONFIG nls sed"
+	fi
+}
+
+src_compile() {
+
+	econf || die "configure failed"
+
+	if [ "`use static`" ] ; then
+		export LDFLAGS=-static
+	fi
+	emake || die "emake failed"
+	cd sys-utils && makeinfo *.texi || die "makeinfo failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "install failed"
+
+	dodoc HISTORY MAINTAINER README VERSION
+	docinto licenses
+	dodoc licenses/* HISTORY
+	docinto examples
+	dodoc example.files/*
+}