chase latest; fixes

3 files changed, 87 insertions, 1 deletions

diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog
index e7245a9b4350..6756b2a9d7d4 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 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.13 2002/08/14 15:17:32 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.14 2002/10/27 07:43:12 woodchip Exp $
+
+*util-linux-2.11w (27 Oct 2002)
+
+  27 Oct 2002; Donny Davies <woodchip@gentoo.org> :
+  Chase latest release.  Fixes potential root exploit.
 
 *util-linux-2.11u (14 Aug 2002)
 
diff --git a/sys-apps/util-linux/files/digest-util-linux-2.11w b/sys-apps/util-linux/files/digest-util-linux-2.11w
new file mode 100644
index 000000000000..d9a8311f8024
--- /dev/null
+++ b/sys-apps/util-linux/files/digest-util-linux-2.11w
@@ -0,0 +1,2 @@
+MD5 36d6bcdf415d6b486205cc64abb7af77 util-linux-2.11w.tar.gz 1787665
+MD5 16a8654556dcd1ea21d00c14291ecb28 util-linux-2.11r.patch.gz 18744
diff --git a/sys-apps/util-linux/util-linux-2.11w.ebuild b/sys-apps/util-linux/util-linux-2.11w.ebuild
new file mode 100644
index 000000000000..c1c8035d5c1e
--- /dev/null
+++ b/sys-apps/util-linux/util-linux-2.11w.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2002 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.11w.ebuild,v 1.1 2002/10/27 07:43:12 woodchip Exp $
+
+IUSE="crypt nls"
+
+CRYPT_PATCH_P=${PN}-${PV/1w/1r}
+S=${WORKDIR}/${P}
+DESCRIPTION="Various useful Linux utilities"
+SRC_URI="http://www.kernel.org/pub/linux/utils/${PN}/${P}.tar.gz
+	crypt? ( http://www.kernel.org/pub/linux/kernel/people/hvr/util-linux-patch-int/${CRYPT_PATCH_P}.patch.gz )"
+HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux/"
+KEYWORDS="~x86 ~ppc ~sparc ~sparc64 ~alpha"
+LICENSE="GPL-2"
+
+DEPEND="virtual/glibc
+	>=sys-libs/ncurses-5.2-r2
+	sys-apps/pam-login"
+
+RDEPEND="$DEPEND sys-devel/perl
+	nls? ( sys-devel/gettext )"
+
+SLOT="0"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+
+	cd ${S}
+
+	if [ ! -z "`use crypt`" ]
+	then
+		gunzip -c ${DISTDIR}/${CRYPT_PATCH_P}.patch.gz | patch -p1 || die
+	fi
+
+	patch -p0 < ${FILESDIR}/util-linux-2.11u-gentoo.patch || die
+
+	cp MCONFIG MCONFIG.orig
+	sed -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.orig > MCONFIG
+}
+
+src_compile() {
+
+	./configure || die
+
+	if [ -z "`use nls`" ]
+	then
+		cp defines.h defines.h.orig	
+		grep -v "ENABLE_NLS" \
+			defines.h.orig > defines.h
+		cp defines.h defines.h.orig
+		grep -v "HAVE_libintl_h" \
+			defines.h.orig > defines.h
+
+		cp Makefile Makefile.orig
+		sed -e "s:SUBDIRS=po \\\:SUBDIRS= \\\:g" \
+			Makefile.orig > Makefile
+	fi
+	
+	emake LDFLAGS="" || die
+	cd sys-utils; makeinfo *.texi || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	dodoc HISTORY MAINTAINER README VERSION
+	docinto licenses
+	dodoc licenses/* HISTORY
+	docinto examples
+	dodoc example.files/*
+}
+