Disable aes-loop and forward port the cryptoapi patch. Devices encrypted with the old cryptoapi arent compatible with the aes-loop work.

5 files changed, 24 insertions, 13 deletions

diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog
index 05ea56e5c858..db57b9f28085 100644
--- a/sys-apps/util-linux/ChangeLog
+++ b/sys-apps/util-linux/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/util-linux
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.90 2004/11/12 02:26:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.91 2004/11/14 08:46:54 vapier Exp $
+
+*util-linux-2.12i-r1 (14 Nov 2004)
+
+  14 Nov 2004; Mike Frysinger <vapier@gentoo.org>
+  +util-linux-2.12i-r1.ebuild, -util-linux-2.12i.ebuild:
+  Disable aes-loop and forward port the cryptoapi patch. Devices encrypted
+  with the old cryptoapi arent compatible with the aes-loop work.
 
 *util-linux-2.12i (11 Nov 2004)
 
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 69e6794f6919..ac4e3066f3e8 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 0d31f933db829385acf5be9aaa1d9b05 ChangeLog 15282
+MD5 3f602e7b8a396f9ddc07ce687d935361 ChangeLog 15567
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 a4ef29239ccf28cf039d13951c6b8c06 util-linux-2.11z-r8.ebuild 3135
 MD5 3c3a1ff0272a0ff8c192ac49031ec8cd util-linux-2.11z-r9.ebuild 3328
@@ -11,7 +11,7 @@ MD5 956fda46dcf04bbb717ec282840edada util-linux-2.12-r4.ebuild 4101
 MD5 b1770169fdbfa0b28480dbebf67d3222 util-linux-2.12-r5.ebuild 4196
 MD5 4bb184b87ec90bdc579a71f53214f21a util-linux-2.12b-r1.ebuild 4983
 MD5 46b84caf300acc762451ca3631a2bb14 util-linux-2.12b.ebuild 4874
-MD5 5861525b8e2bf45c3795698fd161ce05 util-linux-2.12i.ebuild 3396
+MD5 da16c06477485565a6febe73cb666ba8 util-linux-2.12i-r1.ebuild 3632
 MD5 02afa4d774f45ab0b9ef42ecc1748005 files/digest-util-linux-2.11z-r8 153
 MD5 02afa4d774f45ab0b9ef42ecc1748005 files/digest-util-linux-2.11z-r9 153
 MD5 830453d37b748b7e2ec454603e33b920 files/digest-util-linux-2.12-r2 151
@@ -38,10 +38,10 @@ MD5 e9d23ba9f2e86d57084dce2b34d76c10 files/util-linux-2.12b-fat-LABEL-support.pa
 MD5 58cfa6f70a144bbe55e6aa1b85f72a96 files/util-linux-2.12b-gcloop-with-crypt.patch 3846
 MD5 a0217db1b99dfa1f137c22c36343a623 files/util-linux-2.12b-gcloop.patch 3844
 MD5 07a3dfffc55bcc7ef2868e025beb853e files/util-linux-2.12b-pic.patch 2874
-MD5 cb9bf2176aac6e5654699d922dd483aa files/digest-util-linux-2.12i 223
 MD5 712184d7725a7aeb17cb0ef0e7549e72 files/util-linux-swapon-check-symlinks.patch 968
 MD5 87912a793169fad4258077f2f6957616 files/digest-util-linux-2.12b-r1 156
 MD5 61beee95fb4696a6af11ffb84ddb055c files/util-linux-2.12i-ignore-managed.patch 506
+MD5 cfa3960fd97ca16c85b0d1b87e6ba226 files/digest-util-linux-2.12i-r1 156
 MD5 0be8df03dae23c81a0e929e58a4114e0 files/util-linux-2.11z-01-nfsv4.dif 13442
 MD5 a9bc06c292401d6f2d27e8e4ebf7e6ae files/util-linux-2.12i-fat-LABEL-support.patch 2304
 MD5 33ddd96078cf91030b80f73eb70f5371 files/util-linux-2.12i-swapon-check-symlinks.patch 875
@@ -49,7 +49,7 @@ MD5 73c0cb6f9aa5fa84e701fc68d0478aac files/util-linux-2.12i-nfsv4.patch 12854
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFBlvm3HTu7gpaalycRAnGnAKCo2zgBXDlfh1wxRVo8cAjSCiI1egCgrQMv
-G+2jjGGloA6Q0J+QsLqoO6E=
-=X5gI
+iD8DBQFBlxuqHTu7gpaalycRApZWAJwI69uzEMPzoAPtnEr7C82RNpYvrACfcPCx
+UozEGol7SAy5+3GnGjph6a0=
+=h8Sj
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/util-linux/files/digest-util-linux-2.12i b/sys-apps/util-linux/files/digest-util-linux-2.12i
deleted file mode 100644
index 13435271bfbe..000000000000
--- a/sys-apps/util-linux/files/digest-util-linux-2.12i
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6e0deccf97db98d2ae751577d019efa4 util-linux-2.12i.tar.gz 1975468
-MD5 1de89f3967b8fa74b5f98bc0fb099de2 loop-AES-v2.2d.tar.bz2 153810
-MD5 bdd7e3ba9df96725a19b1daa67e8b8e8 util-linux-2.12i-cryptoapi-losetup.patch.bz2 4773
diff --git a/sys-apps/util-linux/files/digest-util-linux-2.12i-r1 b/sys-apps/util-linux/files/digest-util-linux-2.12i-r1
new file mode 100644
index 000000000000..81d8805cba4a
--- /dev/null
+++ b/sys-apps/util-linux/files/digest-util-linux-2.12i-r1
@@ -0,0 +1,2 @@
+MD5 6e0deccf97db98d2ae751577d019efa4 util-linux-2.12i.tar.gz 1975468
+MD5 dee120b17425e1edf0a0c64f0e249c20 util-linux-2.12i-cryptoapi-losetup.patch.bz2 4800
diff --git a/sys-apps/util-linux/util-linux-2.12i.ebuild b/sys-apps/util-linux/util-linux-2.12i-r1.ebuild
index ccfafae0f7be..96a383199054 100644
--- a/sys-apps/util-linux/util-linux-2.12i.ebuild
+++ b/sys-apps/util-linux/util-linux-2.12i-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.12i.ebuild,v 1.2 2004/11/12 21:24:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.12i-r1.ebuild,v 1.1 2004/11/14 08:46:54 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -8,7 +8,11 @@ AES_VER="2.2d"
 DESCRIPTION="Various useful Linux utilities"
 HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux/"
 SRC_URI="mirror://kernel/linux/utils/${PN}/${P}.tar.gz
-	crypt? ( http://loop-aes.sourceforge.net/loop-AES/loop-AES-v${AES_VER}.tar.bz2 )"
+	crypt? (
+		mirror://gentoo/util-linux-2.12i-cryptoapi-losetup.patch.bz2
+		http://dev.gentoo.org/~vapier/dist/util-linux-2.12i-cryptoapi-losetup.patch.bz2
+	)"
+#	crypt? ( http://loop-aes.sourceforge.net/loop-AES/loop-AES-v${AES_VER}.tar.bz2 )
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -32,7 +36,8 @@ src_unpack() {
 	cd ${S}
 
 	# crypto support, yummy #24458
-	use crypt && epatch ${WORKDIR}/loop-AES-v${AES_VER}/util-linux-*.diff
+	#use crypt && epatch ${WORKDIR}/loop-AES-v${AES_VER}/util-linux-*.diff
+	use crypt && epatch ${WORKDIR}/util-linux-2.12i-cryptoapi-losetup.patch
 
 	# Fix rare failures with -j4 or higher
 	epatch ${FILESDIR}/${PN}-2.11z-parallel-make.patch