Version bump, closes bug#149483. Upstream merged all our patches, so we don't need them anymore.

(Portage version: 2.1.1)

3 files changed, 127 insertions, 1 deletions

diff --git a/app-crypt/bestcrypt/ChangeLog b/app-crypt/bestcrypt/ChangeLog
index 00a51735d648..290b4a65cc50 100644
--- a/app-crypt/bestcrypt/ChangeLog
+++ b/app-crypt/bestcrypt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-crypt/bestcrypt
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/ChangeLog,v 1.49 2006/10/19 00:16:48 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/ChangeLog,v 1.50 2006/10/20 14:25:39 alonbl Exp $
+
+  20 Oct 2006; Alon Bar-Lev <alonbl@gentoo.org> -bestcrypt-1.6_p7.ebuild,
+  +bestcrypt-1.6_p8.ebuild:
+  Version bump, closes bug#149483. Upstream merged all our patches, so we
+  don't need them anymore.
+
+*bestcrypt-1.6_p8 (20 Oct 2006)
 
   19 Oct 2006; Markus Ullmann <jokey@gentoo.org> bestcrypt-1.6_p5.ebuild:
   minor QA: IUSE wrt bug #150083
diff --git a/app-crypt/bestcrypt/bestcrypt-1.6_p8.ebuild b/app-crypt/bestcrypt/bestcrypt-1.6_p8.ebuild
new file mode 100644
index 000000000000..84539958fd27
--- /dev/null
+++ b/app-crypt/bestcrypt/bestcrypt-1.6_p8.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/bestcrypt-1.6_p8.ebuild,v 1.1 2006/10/20 14:25:39 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 SYMSRC=bc_dev${KV_MAJOR}${KV_MINOR}.c bc_dev.ver EXTRA_CFLAGS="${CFLAGS}" \
+		|| die "compile failed"
+
+	emake  -C mod OBJS="bc_dev${KV_MAJOR}${KV_MINOR}.o bc_mgr.o" \
+		KERNEL_DIR=${KV_DIR} KEXT=${KV_OBJ} CC=$(tc-getCC) LD=$(tc-getLD) \
+		AS=$(tc-getAS) CPP=$(tc-getCXX) EXTRA_CFLAGS="${CFLAGS}" || die "compile failed"
+
+	einfo "Modules compiled"
+}
+
+src_install() {
+	linux-mod_src_install
+
+	cd "${S}"
+	dodir /etc
+	cp etc/bc.conf "${D}"/etc/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() {
+
+	einfo "If you are using the serpent or rc6 encryption modules and have any problems,"
+	einfo "please submit bugs to http://bugs.gentoo.org because these modules are not part"
+	einfo "of the standard distribution of BestCrypt for Linux released by Jetico."
+	einfo "For more information on these additional modules:"
+	einfo "visit http://www.carceri.dk/index.php?redirect=other_bestcrypt"
+
+	einfo
+	ewarn "The BestCrypt drivers are not free - Please purchace a license from "
+	ewarn "http://www.jetico.com/"
+
+	einfo
+	linux-mod_pkg_postinst
+}
diff --git a/app-crypt/bestcrypt/files/digest-bestcrypt-1.6_p8 b/app-crypt/bestcrypt/files/digest-bestcrypt-1.6_p8
new file mode 100644
index 000000000000..da7c9e243b17
--- /dev/null
+++ b/app-crypt/bestcrypt/files/digest-bestcrypt-1.6_p8
@@ -0,0 +1,9 @@
+MD5 774cf029d8f02085f0fcda0ab4ab5627 BestCrypt-1.6-8.tar.gz 195314
+RMD160 f5451d7ba238199a3602136383e04654acda9c1f BestCrypt-1.6-8.tar.gz 195314
+SHA256 2229a0caf1a806052b505edd0a33882119e9981e07468c3b71a743db9c453073 BestCrypt-1.6-8.tar.gz 195314
+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