Version bump loop-aes support #153140 by Alon Bar-Lev.

Package-Manager: portage-2.1.2_pre3-r9

4 files changed, 224 insertions, 8 deletions

diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog
index d7de40de82a2..39b272b44be4 100644
--- a/sys-apps/util-linux/ChangeLog
+++ b/sys-apps/util-linux/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/util-linux
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.168 2006/09/04 01:54:32 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.169 2006/10/28 22:37:36 vapier Exp $
+
+*util-linux-2.12r-r5 (28 Oct 2006)
+
+  28 Oct 2006; Mike Frysinger <vapier@gentoo.org>
+  +util-linux-2.12r-r5.ebuild:
+  Version bump loop-aes support #153140 by Alon Bar-Lev.
 
   04 Sep 2006; Saleem Abdulrasool <compnerd@gentoo.org>
   util-linux-2.12r-r4.ebuild:
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index f25661521e6e..c5042fe4dc3a 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -142,6 +142,7 @@ MD5 65f42fbf981464410f7d5d84a429e920 files/util-linux-no-kill.patch 642
 RMD160 cb9bef851804fbcd9a0910cb39123f65f72bbdc5 files/util-linux-no-kill.patch 642
 SHA256 c72803b0918589dbd409e22368853330bc84d875c91936fc5e899686c1642aaf files/util-linux-no-kill.patch 642
 DIST loop-AES-v3.1d.tar.bz2 169228 RMD160 36707f6ed2f57dabd7278c9d6386a25c2c012d59 SHA1 0be0d2e4e70c79a53b2ac6462659c1e36d2e69e6 SHA256 05826b3238d5d9f134426cb8575496508205ef607e0a9075b50510c8e0e8a23c
+DIST loop-AES-v3.1e.tar.bz2 169664 RMD160 78a54330a343103900cc479d58645ec77563ded0 SHA1 10535c8279e55555686af9e39945ccff2434e44f SHA256 6b1d671a9e3cadeef7a8f391cda4b5b883d0d1bf91d08d2746af8e4780fdff9d
 DIST util-linux-2.12i-cryptoapi-losetup.patch.bz2 4800 RMD160 82e54aedd691aa93b67de9dfb9049a3f012a29f7 SHA1 69b757c28b6401abe454f060c2a24da49e2d129a SHA256 565a0cc6c3c148a66969276ae9d34dc34f19fbd45df2740343793ee067b3700f
 DIST util-linux-2.12i.tar.gz 1975468 RMD160 f055a94ad247dc59293f7b933c12bdda135159fc SHA1 deb940cb61d9ae0b481b6469ea496f762a2581a8 SHA256 28e2fc70d7507e158d8861c958461aef1c4bbf4157a8ebbc237943944e5a8c4a
 DIST util-linux-2.12r.tar.bz2 1370907 RMD160 51950aafd5cbcb574e69fbd6b28d15a106147e64 SHA1 740b7eb5ae1148b2200b2cd34a0a6c4b0db577e4 SHA256 b8e499b338ce9fbd1fb315194b26540ec823c0afc46c9e145ac7a3e38ad57e6b
@@ -150,14 +151,18 @@ EBUILD util-linux-2.12r-r4.ebuild 6183 RMD160 101947bd6a5d3d1ff0165c455f09b460a4
 MD5 1007944e07bafbd4a7b3148d18908ae1 util-linux-2.12r-r4.ebuild 6183
 RMD160 101947bd6a5d3d1ff0165c455f09b460a4f53c75 util-linux-2.12r-r4.ebuild 6183
 SHA256 b38f53ff05b6313f2de702bed477d0f08039e089588a84f0ee081e143ebb0e16 util-linux-2.12r-r4.ebuild 6183
+EBUILD util-linux-2.12r-r5.ebuild 6195 RMD160 38679199a5368d7ee11f8d3cb4f0b4e0800520a2 SHA1 718bc1c579cd7ee0ede938e67162a6104154be3f SHA256 5d5752f4517a5695c358e2088665f1262a25759ae71c7a3f00b45040f1e0c59c
+MD5 c31121488460423f9b31b067bfbda9ec util-linux-2.12r-r5.ebuild 6195
+RMD160 38679199a5368d7ee11f8d3cb4f0b4e0800520a2 util-linux-2.12r-r5.ebuild 6195
+SHA256 5d5752f4517a5695c358e2088665f1262a25759ae71c7a3f00b45040f1e0c59c util-linux-2.12r-r5.ebuild 6195
 EBUILD util-linux-2.13_pre7.ebuild 3966 RMD160 32c7da644b8cb8d60f28bad16887c6d2057e3a8d SHA1 5a61924b1d2b2ac41758b004e40dd29dfdeda67a SHA256 3a442bac3eb4b31ebbd0e35d69371ce44b7a99b4deb262dd56901eddcfb21590
 MD5 cc0a5d67857d79a67a9a64e6d8e6654e util-linux-2.13_pre7.ebuild 3966
 RMD160 32c7da644b8cb8d60f28bad16887c6d2057e3a8d util-linux-2.13_pre7.ebuild 3966
 SHA256 3a442bac3eb4b31ebbd0e35d69371ce44b7a99b4deb262dd56901eddcfb21590 util-linux-2.13_pre7.ebuild 3966
-MISC ChangeLog 26669 RMD160 ed279fbb3e947e6427209a303a71a9518aafd1f1 SHA1 401954b70f017dee4ab228a52fd26fa25729d210 SHA256 9ac093ae26d6459f6b395ec33c6edd9e33b34ef404b9da55d3e593a56f165e10
-MD5 95a6755d4a3abfca6a52c1df17e1a373 ChangeLog 26669
-RMD160 ed279fbb3e947e6427209a303a71a9518aafd1f1 ChangeLog 26669
-SHA256 9ac093ae26d6459f6b395ec33c6edd9e33b34ef404b9da55d3e593a56f165e10 ChangeLog 26669
+MISC ChangeLog 26842 RMD160 9ac8a607c541cf00ba2769411570402643e38371 SHA1 314f03e5a9f56a8a874e6c0d15b77e73afdafbf7 SHA256 a2c9ea146e9443af647957a32fc51aa3ec7d690718059ae5677502dcdedd3b89
+MD5 c653f3561938773f556f9e7940ed14d5 ChangeLog 26842
+RMD160 9ac8a607c541cf00ba2769411570402643e38371 ChangeLog 26842
+SHA256 a2c9ea146e9443af647957a32fc51aa3ec7d690718059ae5677502dcdedd3b89 ChangeLog 26842
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -165,13 +170,16 @@ SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata
 MD5 6421fe13202c10b9686a8cb3b30df52e files/digest-util-linux-2.12r-r4 1063
 RMD160 2c750eac9e3132bebea49c80403d9e9b5aed664a files/digest-util-linux-2.12r-r4 1063
 SHA256 2651b1de75726f533fa1f6436a0d7e38698913c3f10d9a892f42729d13a5a8c0 files/digest-util-linux-2.12r-r4 1063
+MD5 64b04043386f51246640c4a87aa9d2e2 files/digest-util-linux-2.12r-r5 1063
+RMD160 6c7b420256fcaf458b90c860481835747c3eea38 files/digest-util-linux-2.12r-r5 1063
+SHA256 60efe4ca6a920b4545e7d25e13ac9a54b9513c95c57af7c125855166beec0e8b files/digest-util-linux-2.12r-r5 1063
 MD5 fa2145f67ea227e8c3e2b1d85cdb7755 files/digest-util-linux-2.13_pre7 515
 RMD160 64c0119e9dab7b275abe5297428cf8c647d65c62 files/digest-util-linux-2.13_pre7 515
 SHA256 cc20416a6e7904dd3a3debc667520ae214bfb4f14d6226eb9436018e2f00e50f files/digest-util-linux-2.13_pre7 515
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFNW9mamhnQswr0vIRAuVVAKCGr5jYicoEGXz5wdD/4xZPrX9gBgCgkBN5
-Yrz+uFZIFiDR7WlGfF40AXQ=
-=w2HW
+iD8DBQFFQ9v4amhnQswr0vIRAtKtAKCsbdX4bYiGMWel3I2JzYjYdwu3pgCdEChp
+9+Tcxtt24wGeQc8r0juA6Hs=
+=MUmO
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/util-linux/files/digest-util-linux-2.12r-r5 b/sys-apps/util-linux/files/digest-util-linux-2.12r-r5
new file mode 100644
index 000000000000..04d85016b9c7
--- /dev/null
+++ b/sys-apps/util-linux/files/digest-util-linux-2.12r-r5
@@ -0,0 +1,12 @@
+MD5 021d6a83e05a13ad84cd601d5e5ecefb loop-AES-v3.1e.tar.bz2 169664
+RMD160 78a54330a343103900cc479d58645ec77563ded0 loop-AES-v3.1e.tar.bz2 169664
+SHA256 6b1d671a9e3cadeef7a8f391cda4b5b883d0d1bf91d08d2746af8e4780fdff9d loop-AES-v3.1e.tar.bz2 169664
+MD5 dee120b17425e1edf0a0c64f0e249c20 util-linux-2.12i-cryptoapi-losetup.patch.bz2 4800
+RMD160 82e54aedd691aa93b67de9dfb9049a3f012a29f7 util-linux-2.12i-cryptoapi-losetup.patch.bz2 4800
+SHA256 565a0cc6c3c148a66969276ae9d34dc34f19fbd45df2740343793ee067b3700f util-linux-2.12i-cryptoapi-losetup.patch.bz2 4800
+MD5 6e0deccf97db98d2ae751577d019efa4 util-linux-2.12i.tar.gz 1975468
+RMD160 f055a94ad247dc59293f7b933c12bdda135159fc util-linux-2.12i.tar.gz 1975468
+SHA256 28e2fc70d7507e158d8861c958461aef1c4bbf4157a8ebbc237943944e5a8c4a util-linux-2.12i.tar.gz 1975468
+MD5 af9d9e03038481fbf79ea3ac33f116f9 util-linux-2.12r.tar.bz2 1370907
+RMD160 51950aafd5cbcb574e69fbd6b28d15a106147e64 util-linux-2.12r.tar.bz2 1370907
+SHA256 b8e499b338ce9fbd1fb315194b26540ec823c0afc46c9e145ac7a3e38ad57e6b util-linux-2.12r.tar.bz2 1370907
diff --git a/sys-apps/util-linux/util-linux-2.12r-r5.ebuild b/sys-apps/util-linux/util-linux-2.12r-r5.ebuild
new file mode 100644
index 000000000000..a2b1dfbaff24
--- /dev/null
+++ b/sys-apps/util-linux/util-linux-2.12r-r5.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2006 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.12r-r5.ebuild,v 1.1 2006/10/28 22:37:36 vapier Exp $
+
+inherit eutils flag-o-matic toolchain-funcs
+
+OLD_CRYPT_VER=2.12i
+LOOP_AES_VER=3.1e
+DESCRIPTION="Various useful Linux utilities"
+HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux/"
+SRC_URI="mirror://kernel/linux/utils/${PN}/${P}.tar.bz2
+	old-crypt? (
+		mirror://kernel/linux/utils/${PN}/${PN}-${OLD_CRYPT_VER}.tar.gz
+		mirror://gentoo/util-linux-${OLD_CRYPT_VER}-cryptoapi-losetup.patch.bz2
+	)
+	crypt? ( http://loop-aes.sourceforge.net/loop-AES/loop-AES-v${LOOP_AES_VER}.tar.bz2 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="crypt old-crypt nls static selinux perl"
+
+RDEPEND=">=sys-libs/ncurses-5.2-r2
+	>=sys-fs/e2fsprogs-1.34
+	selinux? ( sys-libs/libselinux )
+	crypt? ( app-crypt/hashalot )
+	perl? ( dev-lang/perl )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	virtual/os-headers"
+
+OLD_CRYPT_P=${WORKDIR}/${PN}-${OLD_CRYPT_VER}
+
+yesno() { useq $1 && echo yes || echo no; }
+
+src_unpack() {
+	unpack ${A}
+
+	# Old crypt support
+	if use old-crypt ; then
+		cd "${OLD_CRYPT_P}"
+		ewarn "You should update your system as USE=old-crypt"
+		ewarn "support will be dropped in future versions."
+		epatch "${WORKDIR}"/util-linux-${OLD_CRYPT_VER}-cryptoapi-losetup.patch
+	fi
+
+	cd "${S}"
+
+	# crypto support
+	use crypt && epatch "${WORKDIR}"/loop-AES-v${LOOP_AES_VER}/${P}.diff
+
+	# Fall back to cracklib if default words file doesnt exist #114416
+	epatch "${FILESDIR}"/${PN}-2.12r-cracklib-words.patch
+
+	# Fix rare failures with -j4 or higher
+	epatch "${FILESDIR}"/${PN}-2.11z-parallel-make.patch
+
+	# Fix -f usage with -a and in general
+	epatch "${FILESDIR}"/${PN}-2.12q-more-fake-checks-v2.patch
+
+	# Fix mtab updates with `mount --move /foo /bar` #104697
+	epatch "${FILESDIR}"/${PN}-2.12q-update-mtab-when-moving.patch
+
+	# Respect -n with -r and umount #98675
+	epatch "${FILESDIR}"/${PN}-2.12q-umount-dont-write-mtab-with-remount.patch
+
+	# A few fixes to beat update_mtab() into submission.
+	epatch "${FILESDIR}"/${PN}-2.12q-update_mtab-fixes.patch
+
+	# Use update_mtab() to avoid dups in mtab for 'mount -f'
+	epatch "${FILESDIR}"/${PN}-2.12q-use-update_mtab-for-fake.patch
+
+	# Fix unreadable df output when using devfs ... this check is kind of
+	# a hack, but whatever, the output isnt critical at all :P
+	[[ -e /dev/.devfsd ]] && 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.
+	epatch "${FILESDIR}"/${PN}-2.11z-agetty-domainname-option.patch
+
+	# Fix french translation typo #75693
+	epatch "${FILESDIR}"/${PN}-2.12q-i18n-update.patch
+
+	# Add NFS4 support (kernel 2.5/2.6)
+	epatch "${FILESDIR}"/${PN}-2.12i-nfsv4.patch
+
+	# ignore managed/kudzu options #70873
+	epatch "${FILESDIR}"/${PN}-2.12i-ignore-managed.patch
+
+	# swapon gets confused by symlinks in /dev #69162
+	epatch "${FILESDIR}"/${PN}-2.12p-swapon-check-symlinks.patch
+
+	# fix simple buffer overflow (from Debian)
+	epatch "${FILESDIR}"/${PN}-2.12q-debian-10cfdisk.patch
+
+	# don't build fdisk on m68k
+	epatch "${FILESDIR}"/${PN}-2.12q-no-m68k-fdisk.patch
+
+	# don't force umask to 022 #93671
+	epatch "${FILESDIR}"/${PN}-2.12q-dont-umask.patch
+
+	# fix cal display when using featureless terminals #112406
+	epatch "${FILESDIR}"/${PN}-2.12r-cal-dumb-terminal.patch
+
+	# Bug #108988 unable to always seek when omiting frame pointers
+	epatch "${FILESDIR}"/${PN}-2.12r-fdisk-frame-pointers.patch
+
+	# don't treat sparc/arm specially
+	epatch "${FILESDIR}"/${PN}-2.12r-umount-no-special.patch
+
+	# Patches from Fedora
+	epatch "${FILESDIR}"/${PN}-2.12r-umount-nosysfs.patch
+
+	# fix mips n32 (no llseek syscall)
+	epatch "${FILESDIR}"/${PN}-2.12-mips-lseek.patch
+
+	# Enable random features
+	local mconfigs="MCONFIG"
+	use old-crypt && mconfigs="${mconfigs} ${OLD_CRYPT_P}/MCONFIG"
+	sed -i \
+		-e "/^HAVE_SELINUX=/s:no:$(yesno selinux):" \
+		-e "/^DISABLE_NLS=/s:no:$(yesno !nls):" \
+		-e "/^HAVE_KILL=/s:no:yes:" \
+		-e "/^HAVE_SLN=/s:no:yes:" \
+		-e "/^HAVE_TSORT/s:no:yes:" \
+		-e "s:-pipe -O2 \$(CPUOPT) -fomit-frame-pointer:${CFLAGS}:" \
+		-e "s:CPU=.*:CPU=${CHOST%%-*}:" \
+		-e "s:SUIDMODE=.*4755:SUIDMODE=4711:" \
+		${mconfigs} || die "MCONFIG sed"
+}
+
+src_compile() {
+	append-ldflags $(bindnow-flags)
+	use static && append-ldflags -static
+	export CC="$(tc-getCC)"
+
+	econf || die "configure failed"
+	emake || die "emake failed"
+
+	cd partx
+	has_version '>=sys-kernel/linux-headers-2.6' && \
+	has_version '<sys-kernel/linux-headers-2.6.18' \
+		&& append-flags -include linux/compiler.h
+	emake CFLAGS="${CFLAGS}" || die "make partx failed"
+
+	if use old-crypt ; then
+		cd "${OLD_CRYPT_P}"
+		econf || die "old configure failed"
+		emake -C lib || die "old lib failed"
+		emake -C mount losetup mount || die "old make failed"
+	fi
+}
+
+src_install() {
+	make install DESTDIR="${D}" || die "install failed"
+	dosym ../man8/agetty.8 /usr/share/man/man1/getty.1
+	dosbin partx/{addpart,delpart,partx} || die "dosbin"
+	use perl || rm -f "${D}"/usr/bin/chkdupexe
+
+	newinitd "${FILESDIR}"/crypto-loop.initd crypto-loop
+	newconfd "${FILESDIR}"/crypto-loop.confd crypto-loop
+
+	# man-pages installs renice(1p) but util-linux does renice(8)
+	dosym ../man8/renice.8 /usr/share/man/man1/renice.1
+
+	dodoc HISTORY MAINTAINER README VERSION
+	docinto examples
+	dodoc example.files/*
+
+	if use old-crypt ; then
+		cd "${OLD_CRYPT_P}"/mount
+		into /
+		newbin mount mount-old-crypt || die
+		newbin losetup losetup-old-crypt || die
+		fperms 4711 /bin/{mount,losetup}-old-crypt
+	fi
+}
+
+pkg_postinst() {
+	if ! use old-crypt && use crypt ; then
+		ewarn "This version of util-linux includes crypto support"
+		ewarn "for loop-aes instead of the old cryptoapi."
+		ewarn "If you need the older support, please re-emerge"
+		ewarn "util-linux with USE=old-crypt.  This will create"
+		ewarn "/sbin/mount-old-crypt and /sbin/losetup-old-crypt."
+	fi
+}