Version bump, upstream received our patches

(Portage version: 2.1.2-r5)

3 files changed, 123 insertions, 1 deletions

diff --git a/app-crypt/bestcrypt/ChangeLog b/app-crypt/bestcrypt/ChangeLog
index 4b2e358e7874..103c981509b0 100644
--- a/app-crypt/bestcrypt/ChangeLog
+++ b/app-crypt/bestcrypt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-crypt/bestcrypt
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/ChangeLog,v 1.56 2007/01/24 16:51:04 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/ChangeLog,v 1.57 2007/02/01 11:47:10 alonbl Exp $
+
+*bestcrypt-1.6_p11 (01 Feb 2007)
+
+  01 Feb 2007; Alon Bar-Lev <alonbl@gentoo.org> +bestcrypt-1.6_p11.ebuild:
+  Version bump, upstream received our patches
 
   24 Jan 2007; Marius Mauch <genone@gentoo.org> bestcrypt-1.6_p10-r1.ebuild:
   Replacing einfo with elog
diff --git a/app-crypt/bestcrypt/bestcrypt-1.6_p11.ebuild b/app-crypt/bestcrypt/bestcrypt-1.6_p11.ebuild
new file mode 100644
index 000000000000..f88830eec791
--- /dev/null
+++ b/app-crypt/bestcrypt/bestcrypt-1.6_p11.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/bestcrypt-1.6_p11.ebuild,v 1.1 2007/02/01 11:47:10 alonbl Exp $
+
+inherit flag-o-matic eutils linux-mod toolchain-funcs multilib
+
+MY_PN="bcrypt"
+MY_PV="${PV/_p/-}"
+DESCRIPTION="commercially licensed transparent filesystem encryption"
+HOMEPAGE="http://www.jetico.com/"
+SRC_URI="http://www.jetico.com/linux/BestCrypt-${MY_PV}.tar.gz
+	!x86? ( mirror://gentoo/bcrypt-rc6-serpent-c.diff.gz )
+	x86? ( http://www.carceri.dk/files/bcrypt-rc6-serpent.diff.gz )"
+
+LICENSE="bestcrypt"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="virtual/linux-sources"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+#get-version
+MODULE_NAMES="bc(block:"${S}"/mod)
+		bc_des(block:"${S}"/mod/des)
+		bc_3des(block:"${S}"/mod/3des)
+		bc_bf128(block:"${S}"/mod/bf128)
+		bc_bf448(block:"${S}"/mod/bf448)
+		bc_blowfish(block:"${S}"/mod/blowfish)
+		bc_cast(block:"${S}"/mod/cast)
+		bc_gost(block:"${S}"/mod/gost)
+		bc_idea(block:"${S}"/mod/idea)
+		bc_rijn(block:"${S}"/mod/rijn)
+		bc_twofish(block:"${S}"/mod/twofish)
+		bc_serpent(block:"${S}"/mod/serpent)
+		bc_rc6(block:"${S}"/mod/rc6)"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	if use x86;
+	then
+		epatch "${WORKDIR}/bcrypt-rc6-serpent.diff"
+	else
+		epatch "${WORKDIR}/bcrypt-rc6-serpent-c.diff"
+	fi
+}
+
+src_compile() {
+	filter-flags -fforce-addr
+
+	emake -C kgsha CPP="$(tc-getCXX)" EXTRA_CXXFLAGS="${CXXFLAGS}" || die "library compile failed"
+	emake -C kgsha256 CPP="$(tc-getCXX)"  EXTRA_CXXFLAGS="${CXXFLAGS}" || die "library compile failed"
+	emake -C src CC="$(tc-getCC)"  EXTRA_CFLAGS="${CFLAGS} -I../kgsha256" || die "bctool compile failed"
+
+	# Don't put stack protection in the kernel - it just is bad
+	_filter-hardened -fstack-protector-all -fstack-protector
+
+	emake  -C mod KERNEL_DIR=${KV_DIR} KEXT=${KV_OBJ} CC=$(tc-getCC) LD=$(tc-getLD) \
+		AS=$(tc-getAS) CPP=$(tc-getCXX) EXTRA_CFLAGS="${CFLAGS}" \
+		KVER=${KV_MAJOR}.${KV_MINOR} \
+		|| die "compile failed"
+
+	einfo "Modules compiled"
+}
+
+src_install() {
+	linux-mod_src_install
+
+	cd "${S}"
+	dodir /etc
+	insinto /etc
+	newins etc/bc.conf bc.conf
+
+	dobin bin/bctool
+	insinto /usr/bin
+	for link in bcumount bcformat bcfsck bcnew bcpasswd bcinfo \
+		bclink bcunlink bcmake_hidden bcreencrypt;
+	do
+		dosym bctool /usr/bin/${link}
+	done
+
+	# bug 107392
+	insinto /usr/$(get_libdir)
+	doins lib/libkgsha{,256}.so
+
+	doman man/bctool.8
+	newinitd "${FILESDIR}"/bcrypt3 bcrypt
+	dodoc README HIDDEN_PART
+}
+
+
+pkg_postinst() {
+	elog "If you are using the serpent or rc6 encryption modules and have any problems,"
+	elog "please submit bugs to http://bugs.gentoo.org because these modules are not part"
+	elog "of the standard distribution of BestCrypt for Linux released by Jetico."
+	elog "For more information on these additional modules:"
+	elog "visit http://www.carceri.dk/index.php?redirect=other_bestcrypt"
+
+	ewarn
+	ewarn "The BestCrypt drivers are not free - Please purchace a license from "
+	ewarn "http://www.jetico.com/"
+	ewarn
+
+	linux-mod_pkg_postinst
+}
diff --git a/app-crypt/bestcrypt/files/digest-bestcrypt-1.6_p11 b/app-crypt/bestcrypt/files/digest-bestcrypt-1.6_p11
new file mode 100644
index 000000000000..739910ba4502
--- /dev/null
+++ b/app-crypt/bestcrypt/files/digest-bestcrypt-1.6_p11
@@ -0,0 +1,9 @@
+MD5 c75f9cdb0dabf0e0b77362adc14c8e47 BestCrypt-1.6-11.tar.gz 196136
+RMD160 dfb8fa0891b16a238d20fc1b0c8c288b82825314 BestCrypt-1.6-11.tar.gz 196136
+SHA256 5149eb75b53b8f1ef71ce8b490b6290f306fff9aced1fce01caec5ff473be7ee BestCrypt-1.6-11.tar.gz 196136
+MD5 d68956f4c2ed795c68a451a451de27bb bcrypt-rc6-serpent-c.diff.gz 6034
+RMD160 127d0f2d562f1fdbfa6a8db5d83e92703a90ccc4 bcrypt-rc6-serpent-c.diff.gz 6034
+SHA256 6161a5bb5711307351eab95e53174bb7f181f870a4755e59ea1ad3eff9427bf5 bcrypt-rc6-serpent-c.diff.gz 6034
+MD5 aa6e1f0e9ee797b409267bdba1f6534e bcrypt-rc6-serpent.diff.gz 5718
+RMD160 f388894ea0f3d1055dffaf118083baefa5822000 bcrypt-rc6-serpent.diff.gz 5718
+SHA256 1407b27e6a8390f62b66985d25f91ca1b68ff89ca5d9c211f0e83868214bdde8 bcrypt-rc6-serpent.diff.gz 5718