sys-fs/loop-aes: Fix DEPEND in 3.6b[-r1] to address bug 370635. Version bump to 3.6c. Remove old ebuilds/patches.

Package-Manager: portage-2.2.0_alpha38/cvs/Linux x86_64

8 files changed, 49 insertions, 140 deletions

diff --git a/sys-fs/loop-aes/ChangeLog b/sys-fs/loop-aes/ChangeLog
index 72bad92a44a8..b4ac7c3359c1 100644
--- a/sys-fs/loop-aes/ChangeLog
+++ b/sys-fs/loop-aes/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sys-fs/loop-aes
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/loop-aes/ChangeLog,v 1.78 2011/06/08 13:13:16 c1pher Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/loop-aes/ChangeLog,v 1.79 2011/06/13 16:56:43 c1pher Exp $
+
+*loop-aes-3.6c (13 Jun 2011)
+
+  13 Jun 2011; Dane Smith <c1pher@gentoo.org> -loop-aes-3.5b.ebuild,
+  -loop-aes-3.6a.ebuild, loop-aes-3.6b.ebuild, loop-aes-3.6b-r1.ebuild,
+  +loop-aes-3.6c.ebuild, -files/loop-AES-v3.5b-20101231.diff:
+  *Change DEPEND in 3.6b[-r1] to require +loop-aes in util-linux.
+  Fixes bug 370635.
+  *Add new version 3.6c.
+  *Remove old versions / patches.
+  *Add myself to metadata that way I actually get CC'd on bugs.
 
 *loop-aes-3.6b-r1 (08 Jun 2011)
 
diff --git a/sys-fs/loop-aes/Manifest b/sys-fs/loop-aes/Manifest
index b5caae05001c..61c4530e2434 100644
--- a/sys-fs/loop-aes/Manifest
+++ b/sys-fs/loop-aes/Manifest
@@ -1,30 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX loop-AES-v3.5b-20101231.diff 1543 RMD160 404b0cb55c3845f65af2034ae64fd03a972d3eb2 SHA1 b5571c1ee67fadf55d6cf12ecdb7bb00fbb94dd8 SHA256 9b3b84bab585caebd1f945b2afd4903e128f567dd988964ba9b56515493e8cf6
-DIST loop-AES-v3.5b.tar.bz2 329087 RMD160 3af5822f1adea54189190e9f6b6650bcba760635 SHA1 a13d4b81ef016dc0e5d8e6e509c3ba743afd03ea SHA256 2f3983fdd45a627b3e4e9157846192c04ac90447810e09d7a3de2c8055a368c7
-DIST loop-AES-v3.6a.tar.bz2 268798 RMD160 9d21800270b500600494b41aef7cfd146dd00a90 SHA1 2b39e7f32ce86118838601063a02f68466a41610 SHA256 27e62781022faf2a220056fee6f7a463bc4a556f30ad2460202a487c01f739b4
 DIST loop-AES-v3.6b.tar.bz2 250771 RMD160 b15e528ecd113e13243dc41b356f1d07b2d4996c SHA1 a8074dbaf53c2d07e9f1d637cdde04be05d85b07 SHA256 3e3dbf3e248f069274aa2ef9f938ee2b116d9ce368b98c5f0ee3b5ec6db948ce
-EBUILD loop-aes-3.5b.ebuild 1887 RMD160 30fdbcf7b0302cd3be333ff35153d9958e1cef01 SHA1 b0e6332ef40aaabd587cc1380e947393b97ebbd0 SHA256 4dbbc580ebb4fc279cf8f4caea3dd5501cac778750949dc64bf5b94334f09755
-EBUILD loop-aes-3.6a.ebuild 1752 RMD160 dd49fa0d06952ddffc52e4349ab99cc1cf470ca6 SHA1 e8f61820f088489ec23f559d4d4a604f25be0357 SHA256 cc5a1b93452f28e94cfa3f1eb5b8dbaf836b67256715f73468dec444b5425baa
-EBUILD loop-aes-3.6b-r1.ebuild 2062 RMD160 3e572127eaa9bcfc3b656e89666dd2aeb8ffe1ab SHA1 cee1befbbf96ac7c7ac5e9cb04c7ef8bc6699f65 SHA256 661341e8f354fcf571928b8cbc86e37a61422a50f94049a16c44e29fa4bbaf22
-EBUILD loop-aes-3.6b.ebuild 1752 RMD160 ee91ff673b9ac9cddc6e75d87bfc3b8913c92d45 SHA1 50486255409327610702a2fb8ea570d608fc8335 SHA256 61e70d82f602f0668830e9c6717e43495a785455dc0717fda14dad8469b17a54
-MISC ChangeLog 10502 RMD160 01803684c1a6190e386663537f7ea680c3258901 SHA1 1040caf35ae53b72a73e53047c0e6cb0aea813fa SHA256 99d192d97319bf9111b3d93115a2a6f5ed2837728216b9b41db2c78f2462e6cc
-MISC metadata.xml 540 RMD160 eeb15ee36b9ba19341c68ac21870ff08a7dfe2dd SHA1 e40616f87ab7d5e7949a2a442393d6e308fb6d8e SHA256 1b058e97fb2f2c4831739d470938c878090d511fb223102107eb86b9819a7b8c
+DIST loop-AES-v3.6c.tar.bz2 251279 RMD160 3268764bfabcc723db0cc20758cb0df5305071a5 SHA1 ffcc509ef1cfb365317f2b8f64e8bf130159f5bb SHA256 2fdd0811df62e9c8847c75c884f68ba8054d8b9234e0aa1388848462d55d50e5
+EBUILD loop-aes-3.6b-r1.ebuild 2026 RMD160 99817aad5f9f5ffc592caf242e160d60347b13a0 SHA1 665bed2d6430ef1b6c328e6e7e6adba414c65230 SHA256 24c75c54b9777e2dff15e758fc264a3cdcec6ec6d48e8841762b2cda7019ae24
+EBUILD loop-aes-3.6b.ebuild 1716 RMD160 b56017d7a9dd67a547d456ebf7cfe86672fa963d SHA1 c0304269385912e96c9f87f3d053d4b4d4988736 SHA256 827122d8a7980181e314ff077bc6bf118202a82d2f49ced84338282066a2d176
+EBUILD loop-aes-3.6c.ebuild 2023 RMD160 3a05cf1ea5effe3941acada99095dc58c6edd6c0 SHA1 462fd15cd35ea7b798e3167ff7cc9a74663412d0 SHA256 c02e1003f9b74f01a869ee96e83fb00d4bc98e064ee2d65a20faacad465a60a0
+MISC ChangeLog 10945 RMD160 02b43fd9c14145169500ec678d3f888637409429 SHA1 614dd41643f8383ed581a7a1922d0f309ea45a31 SHA256 fc52b501de736220d3a2bacdc134a0e6b22a5c6507d1b6588e5ffc3668ee9675
+MISC metadata.xml 630 RMD160 d541f76ff785c5a465083f63c3b2db295b14ea61 SHA1 b718eff27f88d100ebbf87226369fa73c47d59ac SHA256 86f90370147d521d5b9b22780b4229b8b36055549414a1288bc0ace44946fc46
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJN73RMAAoJEEsurZwMLhUxS8AQAKDt6up4tHSEZpixVaYLaKrq
-yeC3gx+Q0RJx72G1DKslCbkPP+KEr4cNgFib3Z4+sK4kgf1SS2pRJznIlKLVZt5H
-274cPRJuS0xUUNgc4G/xlB0zf6zFe986BLX1c7yt5DhLMN2rv4f558NfWAqm/z+S
-vsfGWNgW6fXcrEnhUBOjjPFNqdh1NYWSMtFAcgZqdyvINmTdIXdA26zhsA3kL9Sx
-s6SmeQj6tsqE+bQie9uvLfV1bxIY2N2Sbr/GMzmtOdo9qvbpGKy8Fo1X7B6Uhwpu
-+s6jvcQFtRE7ZfmeUezxdcZpVUTm3CTogXrYuhnPepn8N4V6FG2Yq52JrZXPNA1O
-5EIbYn815GC3cO8CgHltJ/zMSI+yGwFjXSEIBcVC/KqpditIxdBlB0AF65XU1icG
-7MZHmYPGAcuaypSkowSvGPuWdxykLmOaBT0k2+9pA9o06+KnNw7QOGWGIrNDw1Cl
-ImaZwWGZ+GtGzj+JT2oH5BcuuPg/7YgeidegBCXLXBES53qD7zssybiuMWKC50VP
-aPbFDi4ip9REj80pUS2Kyh/1j2kOBSYjR3NFshIhNGaSf+N7EJFPC4Hbq536RG6W
-EBIdwnUnG93ek7CUVJ7DDEbjktNYDWIO5LRWL0JZ22wkp9qC5fO2n828LUrJqRlC
-hZ7QC9I7F6xkz2JHe3py
-=JT06
+iQIcBAEBAgAGBQJN9kAkAAoJEEsurZwMLhUxPMgP/3mmjPiuGMxgtwUveU6bvGkE
+OdK8+9GGVwC9qGI47jbwueGam8p5wrG+bn9IWVMtQbCMXx26sELNZqqMr8MPeNKB
+Ksw37fADL7yUr0M/W72FBABbzr3QunfcM23k6TsqscN7a3pE+0cDeF2ypvq5lgIe
+Hzxw9Odv8F15abPFfid5pai+DbW3xj2DyZJOt2fZ/57c9ybvWR+ePYi/fBMwoinz
+7ESHuxWcMx+9+Q3cghWn4PMiHVJUQuL8ZcOxnn+Q8sbZmFn7qadl6A9PmzxoCUUe
+GrJoxWCt6Au5OisnsOrg4GE2XXQQh5hzSgqnuWAE7Yrl4KJeOYYKrC9O+lPM9jT/
+epT2QbS7rdRCFRz8Uj4c+Amqpx29ZfZdsEUsjqjctJI9+i/sU8hliWgu6A2ZCn8l
+9fBrrjpKhkwY9tqcocfs0bTdH7uJd5MCuNKxqfi1V9xMFsMuD8dqIogFrPvtLu5Y
+DDLAijZl+t9lwNUlBP8S/DRRsACxYRYlOVO7ONfMHEfR59Y8YaNsZHZKzrivkm9Z
+EQ6Mr6Ce6nkmOE789B2EIyx6qP6KTdYbJYLusM3MTpv9wXCJQrRwxIbaNIUvgtxe
+uv3nXbrOm7mOFhkOEf2hSE01ugeDHNL29DsrmgPxAc5K5MFR1M7Oy4LjeLvHmgMf
+ZWQ7lYUXUk3YWfDCwypu
+=iLKN
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/loop-aes/files/loop-AES-v3.5b-20101231.diff b/sys-fs/loop-aes/files/loop-AES-v3.5b-20101231.diff
deleted file mode 100644
index b654127eae05..000000000000
--- a/sys-fs/loop-aes/files/loop-AES-v3.5b-20101231.diff
+++ /dev/null
@@ -1,39 +0,0 @@
---- ../loop-AES-v3.5b/loop.c-2.6b.patched	2010-11-11 08:09:58.000000000 +0200
-+++ ./loop.c-2.6b.patched	2010-12-30 08:27:16.000000000 +0200
-@@ -1306,7 +1306,11 @@
- 	blk_queue_segment_boundary(lo->lo_queue, PAGE_CACHE_SIZE - 1);
- 	blk_queue_max_segments(lo->lo_queue, BLK_MAX_SEGMENTS);
- 	blk_queue_max_hw_sectors(lo->lo_queue, BLK_SAFE_MAX_SECTORS);
-+#if defined(QUEUE_FLAG_CLUSTER)
- 	lo->lo_queue->queue_flags &= ~(1 << QUEUE_FLAG_CLUSTER);
-+#else
-+	lo->lo_queue->limits.cluster = 0;
-+#endif
- 	blk_queue_flush(lo->lo_queue, 0);
- 
- 	/*
---- ../loop-AES-v3.5b/kernel-2.6.37-rc1.diff	2010-11-11 08:22:07.000000000 +0200
-+++ ./kernel-2.6.37-rc1.diff	2010-12-30 08:31:22.000000000 +0200
-@@ -76,8 +76,8 @@
-  
- diff -urN linux-2.6.37-rc1-noloop/drivers/block/loop.c linux-2.6.37-rc1-AES/drivers/block/loop.c
- --- linux-2.6.37-rc1-noloop/drivers/block/loop.c	1970-01-01 02:00:00.000000000 +0200
--+++ linux-2.6.37-rc1-AES/drivers/block/loop.c	2010-11-11 08:16:47.000000000 +0200
--@@ -0,0 +1,3133 @@
-++++ linux-2.6.37-rc1-AES/drivers/block/loop.c	2010-12-30 08:27:16.000000000 +0200
-+@@ -0,0 +1,3137 @@
- +/*
- + *  linux/drivers/block/loop.c
- + *
-@@ -2456,7 +2456,11 @@
- +	blk_queue_segment_boundary(lo->lo_queue, PAGE_CACHE_SIZE - 1);
- +	blk_queue_max_segments(lo->lo_queue, BLK_MAX_SEGMENTS);
- +	blk_queue_max_hw_sectors(lo->lo_queue, BLK_SAFE_MAX_SECTORS);
-++#if defined(QUEUE_FLAG_CLUSTER)
- +	lo->lo_queue->queue_flags &= ~(1 << QUEUE_FLAG_CLUSTER);
-++#else
-++	lo->lo_queue->limits.cluster = 0;
-++#endif
- +	blk_queue_flush(lo->lo_queue, 0);
- +
- +	/*
diff --git a/sys-fs/loop-aes/loop-aes-3.5b.ebuild b/sys-fs/loop-aes/loop-aes-3.5b.ebuild
deleted file mode 100644
index 8fa8ac95c928..000000000000
--- a/sys-fs/loop-aes/loop-aes-3.5b.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/loop-aes/loop-aes-3.5b.ebuild,v 1.5 2011/01/08 21:34:37 maekke Exp $
-
-EAPI="3"
-
-inherit eutils linux-mod
-
-MY_P="${PN/aes/AES}-v${PV}"
-
-DESCRIPTION="Linux kernel module to encrypt local file systems and disk partitions with AES cipher."
-HOMEPAGE="http://loop-aes.sourceforge.net/loop-AES.README"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~hppa ~ppc ~sparc x86"
-IUSE="extra-ciphers keyscrub padlock"
-
-DEPEND="|| ( >=sys-apps/util-linux-2.12r[crypt] >=sys-apps/util-linux-2.12r[loop-aes] )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	CONFIG_CHECK="!BLK_DEV_LOOP"
-	MODULE_NAMES="loop(block::tmp-d-kbuild)"
-	BUILD_TARGETS="all"
-
-	BUILD_PARAMS=" \
-		LINUX_SOURCE=\"${KERNEL_DIR}\" \
-		KBUILD_OUTPUT=\"${KBUILD_OUTPUT}\" \
-		USE_KBUILD=y MODINST=n RUNDM=n"
-	use keyscrub && BUILD_PARAMS="${BUILD_PARAMS} KEYSCRUB=y"
-	use padlock && BUILD_PARAMS="${BUILD_PARAMS} PADLOCK=y"
-
-	if use extra-ciphers; then
-		MODULE_NAMES="${MODULE_NAMES}
-			loop_blowfish(block::tmp-d-kbuild)
-			loop_serpent(block::tmp-d-kbuild)
-			loop_twofish(block::tmp-d-kbuild)"
-		BUILD_PARAMS="${BUILD_PARAMS} EXTRA_CIPHERS=y"
-	fi
-}
-
-src_prepare() {
-	sed -e 's/make/$(MAKE)/g' -i Makefile || die "sed failed"
-
-	# http://loop-aes.sourceforge.net/updates/loop-AES-v3.5b-20101231.diff.bz2
-	epatch "${FILESDIR}/loop-AES-v3.5b-20101231.diff"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	dodoc README || die "dodoc failed"
-	dobin loop-aes-keygen || die "dobin failed"
-	doman loop-aes-keygen.1 || die "doman failed"
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	einfo
-	einfo "For more instructions take a look at examples in README at:"
-	einfo "'${EPREFIX}/usr/share/doc/${PF}'"
-	einfo
-}
diff --git a/sys-fs/loop-aes/loop-aes-3.6b-r1.ebuild b/sys-fs/loop-aes/loop-aes-3.6b-r1.ebuild
index c7b629a1f0e3..ceedc5cef531 100644
--- a/sys-fs/loop-aes/loop-aes-3.6b-r1.ebuild
+++ b/sys-fs/loop-aes/loop-aes-3.6b-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/loop-aes/loop-aes-3.6b-r1.ebuild,v 1.1 2011/06/08 13:13:16 c1pher Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/loop-aes/loop-aes-3.6b-r1.ebuild,v 1.2 2011/06/13 16:56:43 c1pher Exp $
 
 EAPI="3"
 
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
 IUSE="aes-ni extra-ciphers keyscrub padlock"
 
-DEPEND="|| ( >=sys-apps/util-linux-2.12r[crypt] >=sys-apps/util-linux-2.12r[loop-aes] )"
+DEPEND=">=sys-apps/util-linux-2.12r[crypt,loop-aes]"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/sys-fs/loop-aes/loop-aes-3.6b.ebuild b/sys-fs/loop-aes/loop-aes-3.6b.ebuild
index 9f9e19f2034a..431839b081fd 100644
--- a/sys-fs/loop-aes/loop-aes-3.6b.ebuild
+++ b/sys-fs/loop-aes/loop-aes-3.6b.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/loop-aes/loop-aes-3.6b.ebuild,v 1.4 2011/06/02 14:12:26 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/loop-aes/loop-aes-3.6b.ebuild,v 1.5 2011/06/13 16:56:43 c1pher Exp $
 
 EAPI="3"
 
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="amd64 arm ~hppa ~ppc ~sparc x86"
 IUSE="extra-ciphers keyscrub padlock"
 
-DEPEND="|| ( >=sys-apps/util-linux-2.12r[crypt] >=sys-apps/util-linux-2.12r[loop-aes] )"
+DEPEND=">=sys-apps/util-linux-2.12r[crypt,loop-aes]"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/sys-fs/loop-aes/loop-aes-3.6a.ebuild b/sys-fs/loop-aes/loop-aes-3.6c.ebuild
index b3cb9569782e..571d4a393921 100644
--- a/sys-fs/loop-aes/loop-aes-3.6a.ebuild
+++ b/sys-fs/loop-aes/loop-aes-3.6c.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/loop-aes/loop-aes-3.6a.ebuild,v 1.3 2011/04/19 13:28:30 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/loop-aes/loop-aes-3.6c.ebuild,v 1.1 2011/06/13 16:56:43 c1pher Exp $
 
 EAPI="3"
 
@@ -14,10 +14,10 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~sparc x86"
-IUSE="extra-ciphers keyscrub padlock"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
+IUSE="aes-ni extra-ciphers keyscrub padlock"
 
-DEPEND="|| ( >=sys-apps/util-linux-2.12r[crypt] >=sys-apps/util-linux-2.12r[loop-aes] )"
+DEPEND=">=sys-apps/util-linux-2.12r[crypt,loop-aes]"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
@@ -33,6 +33,7 @@ pkg_setup() {
 		LINUX_SOURCE=\"${KERNEL_DIR}\" \
 		KBUILD_OUTPUT=\"${KBUILD_OUTPUT}\" \
 		USE_KBUILD=y MODINST=n RUNDM=n"
+	use aes-ni && BUILD_PARAMS="${BUILD_PARAMS} INTELAES=y"
 	use keyscrub && BUILD_PARAMS="${BUILD_PARAMS} KEYSCRUB=y"
 	use padlock && BUILD_PARAMS="${BUILD_PARAMS} PADLOCK=y"
 
@@ -64,4 +65,9 @@ pkg_postinst() {
 	einfo "For more instructions take a look at examples in README at:"
 	einfo "'${EPREFIX}/usr/share/doc/${PF}'"
 	einfo
+	einfo "If you have a newer Intel processor (i5, i7), and you use AES"
+	einfo "you may want to consider using the aes-ni use flag. It will"
+	einfo "use your processors native AES instructions giving quite a speed"
+	einfo "increase."
+	einfo
 }
diff --git a/sys-fs/loop-aes/metadata.xml b/sys-fs/loop-aes/metadata.xml
index 57d37123fd8d..428ee6534692 100644
--- a/sys-fs/loop-aes/metadata.xml
+++ b/sys-fs/loop-aes/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>crypto</herd>
+	<maintainer>
+		<email>c1pher@gentoo.org</email>
+		<name>Dane Smith</name>
+	</maintainer>
 	<use>
 		<flag name='aes-ni'>Enable support for Intel's AES instruction
 			set</flag>