Add 2 additional encryption modules from http://www.carceri.dk/index.php?redirect=other_bestcrypt, remove some deprecated code in the ebuild.

5 files changed, 172 insertions, 2 deletions

diff --git a/app-crypt/bestcrypt/ChangeLog b/app-crypt/bestcrypt/ChangeLog
index 6902d273ad9d..536da503bbc1 100644
--- a/app-crypt/bestcrypt/ChangeLog
+++ b/app-crypt/bestcrypt/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-crypt/bestcrypt
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/ChangeLog,v 1.19 2004/10/07 17:11:23 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/ChangeLog,v 1.20 2004/10/31 15:06:06 lostlogic Exp $
+
+*bestcrypt-1.5_p7-r1 (31 Oct 2004)
+
+  31 Oct 2004; Brandon Low <lostlogic@gentoo.org> +files/bcrypt3,
+  +bestcrypt-1.5_p7-r1.ebuild:
+  Add 2 additional encryption modules from
+  http://www.carceri.dk/index.php?redirect=other_bestcrypt, remove some
+  deprecated code in the ebuild.
 
 *bestcrypt-1.5_p7 (07 Oct 2004)
 
diff --git a/app-crypt/bestcrypt/Manifest b/app-crypt/bestcrypt/Manifest
index 27a30263089a..7d4fa9031cbd 100644
--- a/app-crypt/bestcrypt/Manifest
+++ b/app-crypt/bestcrypt/Manifest
@@ -2,11 +2,13 @@ MD5 84d875011ca557b0ef037f38047bf330 bestcrypt-1.2_p6.ebuild 1539
 MD5 d420cae4702001db3c9d401bba45f917 bestcrypt-1.4_p2.ebuild 1516
 MD5 458b118ea3f626f7f6a245efa5366215 bestcrypt-1.5_p6.ebuild 1500
 MD5 ebdf18b78fd87efd486d7880203fb8ec bestcrypt-1.5_p1.ebuild 1665
+MD5 d44218a866c56617b39616874ede7ddc bestcrypt-1.5_p7-r1.ebuild 1684
 MD5 d5eb4d76e4ccea13d1ddc2f84326dc29 bestcrypt-1.5_p5.ebuild 1501
-MD5 c2114d73f5d2a906b12ba4484a49464a ChangeLog 3147
+MD5 42f2cb6580a2a65e95b613c2501c59d3 ChangeLog 3429
 MD5 566cf4f89e44670d0aba4a745913d748 metadata.xml 224
 MD5 01e9c2227bbb3fd5ce1ccc68c921b018 bestcrypt-1.5_p7.ebuild 1508
 MD5 40c01633137047f428dcc798ecdcf0fb bestcrypt-1.5_p2.ebuild 1650
+MD5 4b5ee352a3df35a5803d9013b763afec files/digest-bestcrypt-1.5_p7-r1 136
 MD5 612a37e4db226c3ff5e6f261c20085f1 files/bestcrypt-1.5_p2-makefile_fix.patch 2047
 MD5 c5fbab81816aa1d6f319f8434d2db2b2 files/bcrypt 3113
 MD5 b0b2c330ce5e18ccd0ad06aa6aff62a3 files/digest-bestcrypt-1.2_p6 67
@@ -20,4 +22,5 @@ MD5 9e28557b9e0d6e148ba9da712b789909 files/bestcrypt-1.5_p2-bdev_file_fix.patch
 MD5 612a37e4db226c3ff5e6f261c20085f1 files/bestcrypt-1.5_p5-makefile_fix.patch 2047
 MD5 c77a72f4f64ecd2ff3f754543ca23aad files/bestcrypt-1.5_p6-makefile_fix.patch 2286
 MD5 5b4b4d2cf3a069dcc49e6803af149665 files/bcrypt2 3097
+MD5 0627a90c642911ade3f933e5b6ecd6c0 files/bcrypt3 3159
 MD5 ae0a806bcd924019822cdbfdc0dbcfec files/bestcrypt-1.5_p7-makefile_fix.patch 2519
diff --git a/app-crypt/bestcrypt/bestcrypt-1.5_p7-r1.ebuild b/app-crypt/bestcrypt/bestcrypt-1.5_p7-r1.ebuild
new file mode 100644
index 000000000000..d5d51446279d
--- /dev/null
+++ b/app-crypt/bestcrypt/bestcrypt-1.5_p7-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/bestcrypt-1.5_p7-r1.ebuild,v 1.1 2004/10/31 15:06:06 lostlogic Exp $
+
+inherit flag-o-matic eutils check-kernel
+
+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 http://www.carceri.dk/files/bcrypt-rc6-serpent.diff.gz"
+
+LICENSE="bestcrypt"
+SLOT="0"
+IUSE=""
+KEYWORDS="~x86 ~amd64"
+
+DEPEND="virtual/linux-sources"
+
+S=${WORKDIR}/bcrypt
+
+src_unpack() {
+	unpack BestCrypt-${PV/_p/-}.tar.gz
+	cd ${S}
+
+	epatch ${DISTDIR}/bcrypt-rc6-serpent.diff.gz
+	epatch ${FILESDIR}/${P}-makefile_fix.patch
+}
+
+src_compile() {
+	filter-flags -fforce-addr
+
+	emake -j1 EXTRA_CFLAGS="${CFLAGS}" EXTRA_CXXFLAGS="${CXXFLAGS}" || die
+}
+
+src_install() {
+	dodir \
+		/usr/bin \
+		/etc/init.d \
+		/etc/rc.d/rc{0,1,2,3,4,5,6}.d \
+		/etc/rc{0,1,2,3,4,5,6}.d \
+		/usr/share/man/man8 \
+		/lib/modules/${KV}/kernel/drivers/block
+	einstall MAN_PATH="/usr/share/man" \
+		 root="${D}" \
+		 MOD_PATH=/lib/modules/${KV}/kernel/drivers/block
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/bcrypt3 bcrypt
+	rm -rf ${D}/etc/rc*.d
+	dodoc README LICENSE
+
+	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"
+}
diff --git a/app-crypt/bestcrypt/files/bcrypt3 b/app-crypt/bestcrypt/files/bcrypt3
new file mode 100644
index 000000000000..50106161a247
--- /dev/null
+++ b/app-crypt/bestcrypt/files/bcrypt3
@@ -0,0 +1,101 @@
+#!/sbin/runscript
+#
+# bestcrypt         Encrypted File Systems.
+#
+# Version:      1.2
+#
+# Revision:  $Id: bcrypt3,v 1.1 2004/10/31 15:06:06 lostlogic Exp $
+#
+# Author:       Jetico Inc. (support@jetico.com)
+#
+# Modified by Stefan Tittel (with thanks to steveb) to work around
+# the "xargs: environment too large for exec"-error occuring in
+# the gentoo 1.4 linux distribution.
+
+# chkconfig: 2345 85 98
+# description: BestCrypt init script
+
+
+# Source function library.
+#. /etc/rc.d/init.d/functions
+
+# See how we were called.
+
+KERNEL_VERSION=`uname -r|sed 's/\(.\..\).*/\1/'`
+
+start() {
+	ebegin "Initializing BestCrypt"
+	declare -i status=0
+	rm -rf /dev/bcrypt?* 2>/dev/null
+        if [ $KERNEL_VERSION = "2.2" ]; then
+         mknod -m 666 /dev/bcrypt0 b 7 128
+         mknod -m 666 /dev/bcrypt1 b 7 129
+         mknod -m 666 /dev/bcrypt2 b 7 130
+         mknod -m 666 /dev/bcrypt3 b 7 131
+         mknod -m 666 /dev/bcrypt4 b 7 132
+         mknod -m 666 /dev/bcrypt5 b 7 133
+         mknod -m 666 /dev/bcrypt6 b 7 134
+         mknod -m 666 /dev/bcrypt7 b 7 135
+         mknod -m 666 /dev/bcrypt8 b 7 136
+         mknod -m 666 /dev/bcrypt9 b 7 137
+         mknod -m 666 /dev/bcrypt10 b 7 138
+         mknod -m 666 /dev/bcrypt11 b 7 139
+         mknod -m 666 /dev/bcrypt12 b 7 140
+         mknod -m 666 /dev/bcrypt13 b 7 141
+         mknod -m 666 /dev/bcrypt14 b 7 142
+         mknod -m 666 /dev/bcrypt15 b 7 143
+        else
+	  if [ ! -c /dev/.devfsd ]
+	  then
+            mknod -m 666 /dev/bcrypt0 b 188 0
+            mknod -m 666 /dev/bcrypt1 b 188 1
+            mknod -m 666 /dev/bcrypt2 b 188 2
+            mknod -m 666 /dev/bcrypt3 b 188 3
+            mknod -m 666 /dev/bcrypt4 b 188 4
+            mknod -m 666 /dev/bcrypt5 b 188 5
+            mknod -m 666 /dev/bcrypt6 b 188 6
+            mknod -m 666 /dev/bcrypt7 b 188 7
+            mknod -m 666 /dev/bcrypt8 b 188 8
+            mknod -m 666 /dev/bcrypt9 b 188 9
+            mknod -m 666 /dev/bcrypt10 b 188 10
+            mknod -m 666 /dev/bcrypt11 b 188 11
+            mknod -m 666 /dev/bcrypt12 b 188 12
+            mknod -m 666 /dev/bcrypt13 b 188 13
+            mknod -m 666 /dev/bcrypt14 b 188 14
+            mknod -m 666 /dev/bcrypt15 b 188 15
+          fi
+	fi
+	modprobe bc || status=1
+	modprobe bc_blowfish || status=1
+	modprobe bc_des || status=1
+	modprobe bc_gost || status=1
+	modprobe bc_twofish || status=1
+	modprobe bc_bf448 || status=1
+	modprobe bc_bf128 || status=1
+	modprobe bc_3des || status=1
+	modprobe bc_idea || status=1
+	modprobe bc_rijn || status=1
+	modprobe bc_cast || status=1
+	modprobe bc_rc6 || status=1
+	modprobe bc_serpent || status=1
+	eend ${status}
+}
+
+stop() {
+	ebegin "Unmounting encrypted filesystems"
+
+# The original line causing the "xargs: environment too large for exec error".	
+	# grep BestCrypt /etc/mtab |awk '{print $2}'|xargs -r -n 1 bctool umount
+
+# The line for which it work's fine now.
+	for i in $(grep BestCrypt /etc/mtab | awk '{print $2}') ; do bctool umount ${i} ; done
+
+	eend $?
+	ebegin "Shutting down BestCrypt modules"
+	for i in `lsmod |egrep "^bc_.*" |awk '{print $1}' `; do 
+		rmmod $i
+	done
+	rm -f /dev/bcrypt?* 2>/dev/null
+	rmmod bc
+	eend $?
+}
diff --git a/app-crypt/bestcrypt/files/digest-bestcrypt-1.5_p7-r1 b/app-crypt/bestcrypt/files/digest-bestcrypt-1.5_p7-r1
new file mode 100644
index 000000000000..aa40b63e8f08
--- /dev/null
+++ b/app-crypt/bestcrypt/files/digest-bestcrypt-1.5_p7-r1
@@ -0,0 +1,2 @@
+MD5 7883533e8d62c598e66a86f1eb8feb8f BestCrypt-1.5-7.tar.gz 168103
+MD5 aa6e1f0e9ee797b409267bdba1f6534e bcrypt-rc6-serpent.diff.gz 5718