new revision

4 files changed, 153 insertions, 17 deletions

diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog
index a3ba3304ef14..81386fc162a9 100644
--- a/sys-apps/util-linux/ChangeLog
+++ b/sys-apps/util-linux/ChangeLog
@@ -1,6 +1,14 @@
 # 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.60 2003/10/29 03:14:07 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.61 2003/12/03 00:36:41 brad_mssw Exp $
+
+*util-linux-2.12-r1 (02 Dec 2003)
+
+  02 Dec 2003; Brad House <brad_mssw@gentoo.org> util-linux-2.12-r1.ebuild:
+  Add cryptoapi support to util-linux-2.12
+  Mailing list post with info:
+  http://www.kerneli.org/pipermail/cryptoapi-devel/2003-September/000634.html
+  Follow thread for usage.
 
   28 Oct 2003; Chris PeBenito <pebenito@gentoo.org> util-linux-2.12.ebuild,
   files/util-linux-2.12-selinux.diff.bz2:
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 753f161f6f53..2e8988ea7186 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -1,24 +1,26 @@
+MD5 348a1dae9021cd820ad472f21f1f607d ChangeLog 10025
 MD5 10ccac17abb08cd30711a1cd4dc4c8c5 util-linux-2.11y.ebuild 2107
-MD5 11c630af9afcb46fa6240b4eac732a50 util-linux-2.11z-r7.ebuild 3333
-MD5 2fa09c44b77b652d4f9f704fc181e2b8 ChangeLog 9733
-MD5 3b0660f770fc2196fcfd1c6e697b2402 util-linux-2.12.ebuild 3222
+MD5 b73abbe53ce7a49cad81cc855b7d5924 util-linux-2.11z-r4.ebuild 2410
 MD5 c6692828888581ffce700c60c14ea9b8 util-linux-2.11z-r5.ebuild 2776
 MD5 c9ddba73f3eba7bc701c2b727c67a453 util-linux-2.11z-r6.ebuild 3139
-MD5 b73abbe53ce7a49cad81cc855b7d5924 util-linux-2.11z-r4.ebuild 2410
-MD5 18371db840b08f5782e3f8f96c4efe8d files/util-linux-2.11z-pic.patch 3056
-MD5 90b5a47385e394b9112357282c35eb4a files/util-linux-2.11z-script.patch 1580
-MD5 0be8df03dae23c81a0e929e58a4114e0 files/util-linux-2.11z-01-nfsv4.dif 13442
-MD5 02afa4d774f45ab0b9ef42ecc1748005 files/digest-util-linux-2.11z-r6 153
+MD5 11c630af9afcb46fa6240b4eac732a50 util-linux-2.11z-r7.ebuild 3333
+MD5 3b0660f770fc2196fcfd1c6e697b2402 util-linux-2.12.ebuild 3222
+MD5 82e4b62a4ea618bcb4080c244f21edff util-linux-2.12-r1.ebuild 3561
+MD5 48e36b9b6ea3bed4ea25292f9ae5a958 files/digest-util-linux-2.11y 152
 MD5 02afa4d774f45ab0b9ef42ecc1748005 files/digest-util-linux-2.11z-r4 153
-MD5 02afa4d774f45ab0b9ef42ecc1748005 files/digest-util-linux-2.11z-r7 153
-MD5 b5a7097b2c3372d333485da73cd7a41e files/util-linux-2.11z-agetty-domainname-option.patch 1809
-MD5 8d4f1146f0699deb1e6872e1c81293e3 files/util-linux-2.12-selinux.diff.bz2 2558
-MD5 e3697bc8fd6a344e8cba1c7d32e34790 files/util-linux-2.11z-parallel-make.patch 369
-MD5 0f2f1ddaeaf52622fa80f4f08bb25a6b files/util-linux-2.11z-01-nfsv4-crypt.dif 13460
-MD5 6aa1c240dd789327ea92e36309052950 files/no-symlink-resolve.patch 316
 MD5 02afa4d774f45ab0b9ef42ecc1748005 files/digest-util-linux-2.11z-r5 153
+MD5 02afa4d774f45ab0b9ef42ecc1748005 files/digest-util-linux-2.11z-r6 153
+MD5 02afa4d774f45ab0b9ef42ecc1748005 files/digest-util-linux-2.11z-r7 153
 MD5 830453d37b748b7e2ec454603e33b920 files/digest-util-linux-2.12 151
-MD5 48e36b9b6ea3bed4ea25292f9ae5a958 files/digest-util-linux-2.11y 152
-MD5 e3697bc8fd6a344e8cba1c7d32e34790 files/util-linux-2.11y-parallel-make.patch 369
+MD5 6aa1c240dd789327ea92e36309052950 files/no-symlink-resolve.patch 316
 MD5 50b088dbe0471cb0a49ad1f9b967ee04 files/util-linux-2.11u-gentoo.patch 367
+MD5 e3697bc8fd6a344e8cba1c7d32e34790 files/util-linux-2.11y-parallel-make.patch 369
+MD5 0f2f1ddaeaf52622fa80f4f08bb25a6b files/util-linux-2.11z-01-nfsv4-crypt.dif 13460
+MD5 0be8df03dae23c81a0e929e58a4114e0 files/util-linux-2.11z-01-nfsv4.dif 13442
+MD5 b5a7097b2c3372d333485da73cd7a41e files/util-linux-2.11z-agetty-domainname-option.patch 1809
 MD5 6dc0134d8d5f325a86257698d2184718 files/util-linux-2.11z-mips-fdisk-fix.patch 1698
+MD5 e3697bc8fd6a344e8cba1c7d32e34790 files/util-linux-2.11z-parallel-make.patch 369
+MD5 18371db840b08f5782e3f8f96c4efe8d files/util-linux-2.11z-pic.patch 3056
+MD5 90b5a47385e394b9112357282c35eb4a files/util-linux-2.11z-script.patch 1580
+MD5 8d4f1146f0699deb1e6872e1c81293e3 files/util-linux-2.12-selinux.diff.bz2 2558
+MD5 5a1bf3d383850b6c8ca05cc4fe76c813 files/digest-util-linux-2.12-r1 154
diff --git a/sys-apps/util-linux/files/digest-util-linux-2.12-r1 b/sys-apps/util-linux/files/digest-util-linux-2.12-r1
new file mode 100644
index 000000000000..cedffcb9a126
--- /dev/null
+++ b/sys-apps/util-linux/files/digest-util-linux-2.12-r1
@@ -0,0 +1,2 @@
+MD5 997adf78b98d9d1c5db4f37ea982acff util-linux-2.12.tar.gz 1857871
+MD5 1734111e696acfb6d08f52f1e1b3d024 util-linux-2.12-cryptoapi-losetup.patch.bz2 4871
diff --git a/sys-apps/util-linux/util-linux-2.12-r1.ebuild b/sys-apps/util-linux/util-linux-2.12-r1.ebuild
new file mode 100644
index 000000000000..cada58935a86
--- /dev/null
+++ b/sys-apps/util-linux/util-linux-2.12-r1.ebuild
@@ -0,0 +1,124 @@
+# 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.12-r1.ebuild,v 1.1 2003/12/03 00:36:41 brad_mssw Exp $
+
+IUSE="crypt nls static pam selinux"
+
+inherit eutils flag-o-matic
+
+## see below for details on pic.patch
+case ${ARCH} in
+	"x86"|"hppa"|"sparc"|"ppc")
+		;;
+	*)
+		filter-flags -fPIC
+		;;
+esac
+
+S="${WORKDIR}/${P}"
+CRYPT_PATCH_P="${P}-cryptoapi-losetup"
+SELINUX_PATCH="util-linux-2.12-selinux.diff.bz2"
+DESCRIPTION="Various useful Linux utilities"
+SRC_URI="mirror://kernel/linux/utils/${PN}/${P}.tar.gz
+	ftp://ftp.cwi.nl/pub/aeb/${PN}/${P}.tar.gz
+	crypt? ( mirror://gentoo/${CRYPT_PATCH_P}.patch.bz2 )"
+HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux/"
+
+KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~alpha ~arm ~mips ~hppa ~ia64"
+SLOT="0"
+LICENSE="GPL-2"
+
+DEPEND="virtual/glibc
+	>=sys-apps/sed-4.0.5
+	>=sys-libs/ncurses-5.2-r2
+	selinux? ( sys-libs/libselinux )
+	pam? ( sys-apps/pam-login )
+	crypt? ( app-crypt/hashalot )"
+
+RDEPEND="${DEPEND} dev-lang/perl
+	nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+
+	# CryptoAPI losetup patch for the cryptoapi sepecific
+	# to the 2.6 linux kernel. Needs hashalot.
+	# Original patch location:
+	# http://www.stwing.org/~sluskyb/util-linux/losetup-combined.patch
+	# Mailing list post with info:
+	# http://www.kerneli.org/pipermail/cryptoapi-devel/2003-September/000634.html
+	# Follow thread for usage.
+	use crypt && epatch ${DISTDIR}/${CRYPT_PATCH_P}.patch.bz2
+
+	# Fix rare failures with -j4 or higher
+	epatch ${FILESDIR}/${PN}-2.11z-parallel-make.patch
+
+	# Fix unreadable df output
+	epatch ${FILESDIR}/no-symlink-resolve.patch
+
+	# Add the O option to agetty to display DNS domainname in the issue
+	# file, thanks to Marius Mauch <genone@genone.de>, bug #22275.
+	#
+	# NOTE:  Removing this will break future baselayout, so PLEASE
+	#        consult with me before doing so.
+	#
+	# <azarah@gentoo.og> (17 Jul 2003)
+	epatch ${FILESDIR}/${PN}-2.11z-agetty-domainname-option.patch
+
+	# Add NFS4 support (kernel 2.5/2.6).
+#	if [ ! -z "`use crypt`" ] ; then
+#		epatch ${FILESDIR}/${PN}-2.11z-01-nfsv4-crypt.dif
+#	else
+		epatch ${FILESDIR}/${PN}-2.11z-01-nfsv4.dif
+#	fi
+
+	# <solar@gentoo.org> This patch should allow us to remove -fPIC
+	# out of the filter-flags we need this be able to emit position
+	# independent code so we can link our elf executables as shared
+	# objects. "prelink" should now also be able to take advantage
+	epatch ${FILESDIR}/${PN}-2.11z-pic.patch
+
+	#enable pam only if we use it
+	use pam && sed -i "s:HAVE_PAM=no:HAVE_PAM=yes:" MCONFIG
+
+	use selinux && epatch ${FILESDIR}/${SELINUX_PATCH}
+
+	sed -i \
+		-e "s:-pipe -O2 \$(CPUOPT) -fomit-frame-pointer:${CFLAGS}:" \
+		-e "s:CPU=.*:CPU=${CHOST%%-*}:" \
+		-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:" \
+		-e "s:SUIDMODE=.*4755:SUIDMODE=4711:" \
+		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() {
+	if [ "`use static`" ] ; then
+		export LDFLAGS="${LDFLAGS} -static"
+	fi
+
+	econf || die "configure failed"
+
+	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/*
+}
+