sys-fs/loop-aes: Add support for AES-NI wrt bug 362357.

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

4 files changed, 99 insertions, 6 deletions

diff --git a/sys-fs/loop-aes/ChangeLog b/sys-fs/loop-aes/ChangeLog
index 0e24401c853a..72bad92a44a8 100644
--- a/sys-fs/loop-aes/ChangeLog
+++ b/sys-fs/loop-aes/ChangeLog
@@ -1,6 +1,13 @@
 # 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.77 2011/06/02 14:12:26 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/loop-aes/ChangeLog,v 1.78 2011/06/08 13:13:16 c1pher Exp $
+
+*loop-aes-3.6b-r1 (08 Jun 2011)
+
+  08 Jun 2011; Dane Smith <c1pher@gentoo.org> +loop-aes-3.6b-r1.ebuild,
+  metadata.xml:
+  Revision bump. Add support for AES-NI via new use flag aes-ni. Closes bug
+  362357.
 
   02 Jun 2011; Markus Meier <maekke@gentoo.org> loop-aes-3.6b.ebuild:
   arm stable, bug #364407
diff --git a/sys-fs/loop-aes/Manifest b/sys-fs/loop-aes/Manifest
index 37203ebffe5f..b5caae05001c 100644
--- a/sys-fs/loop-aes/Manifest
+++ b/sys-fs/loop-aes/Manifest
@@ -7,13 +7,24 @@ DIST loop-AES-v3.6a.tar.bz2 268798 RMD160 9d21800270b500600494b41aef7cfd146dd00a
 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 10294 RMD160 873edcaa4f8e520f7ceab3a631cf1aae16c638c0 SHA1 de7f9fbe1c863c4bc9b95a84e829891a6b5fe2c7 SHA256 051bb8384d654191e519bf5333828774579cdfc50b3251318879b4b22dcb21f1
-MISC metadata.xml 461 RMD160 5c7cf2ea64a6e0c4519fbb596872b1feb6583143 SHA1 a0d63932ae4f7a3b7f61f6f4ad401e001f50badb SHA256 d7e451c7fb45124d41ed1949ba055aa798f4b54fe79a800a8406e0f82dde246b
+MISC ChangeLog 10502 RMD160 01803684c1a6190e386663537f7ea680c3258901 SHA1 1040caf35ae53b72a73e53047c0e6cb0aea813fa SHA256 99d192d97319bf9111b3d93115a2a6f5ed2837728216b9b41db2c78f2462e6cc
+MISC metadata.xml 540 RMD160 eeb15ee36b9ba19341c68ac21870ff08a7dfe2dd SHA1 e40616f87ab7d5e7949a2a442393d6e308fb6d8e SHA256 1b058e97fb2f2c4831739d470938c878090d511fb223102107eb86b9819a7b8c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3nmlkACgkQkKaRLQcq0GKLFwCfVBsGD6hzGt0cD1+xHSKNgEaF
-ifoAnRqDHFCv+U2ARNCHamSNdYk/TRWV
-=uu4c
+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
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/loop-aes/loop-aes-3.6b-r1.ebuild b/sys-fs/loop-aes/loop-aes-3.6b-r1.ebuild
new file mode 100644
index 000000000000..c7b629a1f0e3
--- /dev/null
+++ b/sys-fs/loop-aes/loop-aes-3.6b-r1.ebuild
@@ -0,0 +1,73 @@
+# 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 $
+
+EAPI="3"
+
+inherit 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="aes-ni 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 aes-ni && BUILD_PARAMS="${BUILD_PARAMS} INTELAES=y"
+	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"
+}
+
+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
+	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 11fbfdd1e2db..57d37123fd8d 100644
--- a/sys-fs/loop-aes/metadata.xml
+++ b/sys-fs/loop-aes/metadata.xml
@@ -3,6 +3,8 @@
 <pkgmetadata>
 	<herd>crypto</herd>
 	<use>
+		<flag name='aes-ni'>Enable support for Intel's AES instruction
+			set</flag>
 		<flag name='extra-ciphers'>Enable extra ciphers</flag>
 		<flag name='keyscrub'>Protects the encryption key in memory but takes
 			more cpu resources</flag>