version bump as per bug #130785 thanks Mike Auty

(Portage version: 2.1_pre9-r2)

8 files changed, 220 insertions, 2 deletions

diff --git a/app-crypt/bestcrypt/ChangeLog b/app-crypt/bestcrypt/ChangeLog
index 3b6e7d10823f..eed10d2077b5 100644
--- a/app-crypt/bestcrypt/ChangeLog
+++ b/app-crypt/bestcrypt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/bestcrypt
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/ChangeLog,v 1.39 2005/11/12 10:02:43 dragonheart Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/ChangeLog,v 1.40 2006/04/23 07:24:16 dragonheart Exp $
+
+*bestcrypt-1.6_p5 (23 Apr 2006)
+
+  23 Apr 2006; Daniel Black <dragonheart@gentoo.org>
+  +files/bestcrypt-1.6_p5-makefile_fix.patch, +bestcrypt-1.6_p5.ebuild:
+  version bump as per bug #130785 thanks Mike Auty
 
 *bestcrypt-1.6_p2-r1 (12 Nov 2005)
 
diff --git a/app-crypt/bestcrypt/bestcrypt-1.6_p5.ebuild b/app-crypt/bestcrypt/bestcrypt-1.6_p5.ebuild
new file mode 100644
index 000000000000..71c768ff74ba
--- /dev/null
+++ b/app-crypt/bestcrypt/bestcrypt-1.6_p5.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_p5.ebuild,v 1.1 2006/04/23 07:24:16 dragonheart Exp $
+
+inherit flag-o-matic eutils linux-mod toolchain-funcs
+
+MY_PN="bcrypt"
+DESCRIPTION="commercially licensed transparent filesystem encryption"
+HOMEPAGE="http://www.jetico.com/"
+SRC_URI="http://www.jetico.com/linux/BestCrypt-${PV/_p/-}.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}/bcrypt"
+
+#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}
+	epatch "${FILESDIR}"/${P}-makefile_fix.patch
+	epatch "${FILESDIR}"/${PN}-1.6_p2-path.patch
+
+	if use x86;
+	then
+		epatch bcrypt-rc6-serpent.diff
+	else
+		epatch 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
+	append-flags -fno-stack-protector-all -fno-stack-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/lib
+	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/bestcrypt-1.6_p5-makefile_fix.patch b/app-crypt/bestcrypt/files/bestcrypt-1.6_p5-makefile_fix.patch
new file mode 100644
index 000000000000..b29f78996cb5
--- /dev/null
+++ b/app-crypt/bestcrypt/files/bestcrypt-1.6_p5-makefile_fix.patch
@@ -0,0 +1,71 @@
+diff -ruN bcrypt.orig/kgsha/Makefile bcrypt/kgsha/Makefile
+--- bcrypt.orig/kgsha/Makefile	2006-03-07 16:52:28.000000000 +1100
++++ bcrypt/kgsha/Makefile	2006-04-23 17:23:31.000000000 +1000
+@@ -20,6 +20,7 @@
+ 
+ CPP=g++
+ CPPFLAGS = -fPIC -Wall -Werror -fno-strength-reduce -I../include -g
++CPPFLAGS += $(EXTRA_CXXFLAGS)
+ 
+ TARGET = libkgsha.so
+ HEADERS = kg_defs.h kgsha.h kblock.h sha1.h random.h
+@@ -32,7 +33,7 @@
+ 	$(CPP) $(CPPFLAGS) -c -o $@ $<
+ 
+ $(TARGET):	$(OBJ)
+-		$(LD) $(OBJ)  -o $(TARGET)
++		$(LD) $(OBJ) --soname $(TARGET) --as-needed  -o $(TARGET) -lc
+ 		cp -f $(TARGET) ../lib
+ #		cp -f $(HEADERS) ../include
+ clean:
+diff -ruN bcrypt.orig/kgsha256/Makefile bcrypt/kgsha256/Makefile
+--- bcrypt.orig/kgsha256/Makefile	2006-03-07 16:52:28.000000000 +1100
++++ bcrypt/kgsha256/Makefile	2006-04-23 17:23:18.000000000 +1000
+@@ -20,6 +20,7 @@
+ 
+ CPP=g++
+ CPPFLAGS = -fPIC -Wall -Werror -fno-strength-reduce -I../include -g
++CPPFLAGS += $(EXTRA_CXXFLAGS)
+ 
+ TARGET = libkgsha256.so
+ HEADERS = kg_defs.h kblock.h
+@@ -32,7 +33,7 @@
+ 	$(CPP) $(CPPFLAGS) -c -o $@ $<
+ 
+ $(TARGET):	$(OBJ)
+-		$(LD) $(OBJ)  -o $(TARGET)
++		$(LD) $(OBJ) --soname $(TARGET) --as-needed  -o $(TARGET) -lc
+ 		cp -f $(TARGET) ../lib
+ 		cp -f $(HEADERS) ../include
+ clean:
+diff -ruN bcrypt.orig/mod/Makefile bcrypt/mod/Makefile
+--- bcrypt.orig/mod/Makefile	2006-04-12 15:32:39.000000000 +1000
++++ bcrypt/mod/Makefile	2006-04-23 17:22:42.000000000 +1000
+@@ -110,15 +110,7 @@
+ 
+ CFLAGS += -I$(CUR_DIR)/../include/ -I$(KERNEL_DIR)/include/
+ 
+-ifeq ($(ARCH), alpha)
+-CFLAGS += -O2 -pipe -fno-strict-aliasing -fno-common -mno-fp-regs -ffixed-8 -mcpu=ev5
+-else
+-ifeq ($(ARCH), x86_64)
+-CFLAGS += -O2 -fno-strength-reduce -fno-strict-aliasing -mcmodel=kernel
+-else
+-CFLAGS += -O6 -fno-strength-reduce -fno-strict-aliasing 
+-endif
+-endif
++CFLAGS += $(EXTRA_CFLAGS)
+ 
+ LDFLAGS = -d -r
+ 
+diff -ruN bcrypt.orig/src/Makefile bcrypt/src/Makefile
+--- bcrypt.orig/src/Makefile	2005-05-14 16:53:06.000000000 +1000
++++ bcrypt/src/Makefile	2006-04-23 17:22:42.000000000 +1000
+@@ -24,6 +24,7 @@
+ CFLAGS += -L../lib -I../include/ 
+ CFLAGS += -Wall -fno-strict-aliasing -g # -O2
+ #CFLAGS += -g -static -O6
++CFLAGS += $(EXTRA_CFLAGS)
+ LDFLAGS = -ldl -lstdc++
+ 
+ TARGET = bctool
diff --git a/app-crypt/bestcrypt/files/digest-bestcrypt-1.5_p10 b/app-crypt/bestcrypt/files/digest-bestcrypt-1.5_p10
index d369aa8f1b8a..a7f268236118 100644
--- a/app-crypt/bestcrypt/files/digest-bestcrypt-1.5_p10
+++ b/app-crypt/bestcrypt/files/digest-bestcrypt-1.5_p10
@@ -1,2 +1,6 @@
 MD5 77ddc2bb846edded4921fa4adbf8320f BestCrypt-1.5-10.tar.gz 169899
+RMD160 6086e7a930b2f6b1d3e532473eb41212d5512300 BestCrypt-1.5-10.tar.gz 169899
+SHA256 29dfc468b3ff0facc4c0a9d40afe682d3637b521b85046e3608eb7f8ff043a0e BestCrypt-1.5-10.tar.gz 169899
 MD5 aa6e1f0e9ee797b409267bdba1f6534e bcrypt-rc6-serpent.diff.gz 5718
+RMD160 f388894ea0f3d1055dffaf118083baefa5822000 bcrypt-rc6-serpent.diff.gz 5718
+SHA256 1407b27e6a8390f62b66985d25f91ca1b68ff89ca5d9c211f0e83868214bdde8 bcrypt-rc6-serpent.diff.gz 5718
diff --git a/app-crypt/bestcrypt/files/digest-bestcrypt-1.5_p11 b/app-crypt/bestcrypt/files/digest-bestcrypt-1.5_p11
index 68a7d46acd39..dcdc00b91dd6 100644
--- a/app-crypt/bestcrypt/files/digest-bestcrypt-1.5_p11
+++ b/app-crypt/bestcrypt/files/digest-bestcrypt-1.5_p11
@@ -1,3 +1,9 @@
 MD5 30ebb215a29951d9db1e96b97ab2d9df BestCrypt-1.5-11.tar.gz 170110
+RMD160 39357390dfebdd349da7e8bf14b0429a36b406fe BestCrypt-1.5-11.tar.gz 170110
+SHA256 9fff1d66cd34bea5815eb2f6bfeb34d94069e21aa2b24dfaccdbd98487cb6621 BestCrypt-1.5-11.tar.gz 170110
 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
diff --git a/app-crypt/bestcrypt/files/digest-bestcrypt-1.6_p1-r2 b/app-crypt/bestcrypt/files/digest-bestcrypt-1.6_p1-r2
index da72c6b6638d..1634e39cbb84 100644
--- a/app-crypt/bestcrypt/files/digest-bestcrypt-1.6_p1-r2
+++ b/app-crypt/bestcrypt/files/digest-bestcrypt-1.6_p1-r2
@@ -1,3 +1,9 @@
 MD5 966088b98018c477438d908ad763056c BestCrypt-1.6-1.tar.gz 194566
+RMD160 3726f8fef55f4fa308ab022cedaf2b901d474215 BestCrypt-1.6-1.tar.gz 194566
+SHA256 9d1d1b71368e42537f72df501dd61664cc5c2133dd89638f1a7a152ac0b44b26 BestCrypt-1.6-1.tar.gz 194566
 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
diff --git a/app-crypt/bestcrypt/files/digest-bestcrypt-1.6_p2-r1 b/app-crypt/bestcrypt/files/digest-bestcrypt-1.6_p2-r1
index a41731f432f8..b0ad25cb4185 100644
--- a/app-crypt/bestcrypt/files/digest-bestcrypt-1.6_p2-r1
+++ b/app-crypt/bestcrypt/files/digest-bestcrypt-1.6_p2-r1
@@ -1,3 +1,9 @@
 MD5 4d35a7bab0c2ba2049bf9774b9ded3d9 BestCrypt-1.6-2.tar.gz 194602
+RMD160 2030c2a15d4feda955c374ed2ff7ed7fca211308 BestCrypt-1.6-2.tar.gz 194602
+SHA256 91d4c5ffdee82d1a3be06912b3c499e7d4640e072f5e9d41c854e981ad190b45 BestCrypt-1.6-2.tar.gz 194602
 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
diff --git a/app-crypt/bestcrypt/files/digest-bestcrypt-1.6_p5 b/app-crypt/bestcrypt/files/digest-bestcrypt-1.6_p5
new file mode 100644
index 000000000000..de5094e97110
--- /dev/null
+++ b/app-crypt/bestcrypt/files/digest-bestcrypt-1.6_p5
@@ -0,0 +1,9 @@
+MD5 e0a390cb24bd08f22290bb7c7f635981 BestCrypt-1.6-5.tar.gz 194939
+RMD160 969f67ac374282ef32d6a37ba1079bef220cc543 BestCrypt-1.6-5.tar.gz 194939
+SHA256 066b8ba630a234a0bd92987020665bfad07675fa0db563744c02af28c00444bd BestCrypt-1.6-5.tar.gz 194939
+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