version bump

Package-Manager: portage-2.0.53_rc7

5 files changed, 179 insertions, 5 deletions

diff --git a/app-crypt/bestcrypt/ChangeLog b/app-crypt/bestcrypt/ChangeLog
index 1672fd0c5785..2a00b25b7868 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.37 2005/11/10 18:56:09 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/ChangeLog,v 1.38 2005/11/10 19:19:02 dragonheart Exp $
+
+*bestcrypt-1.6_p2 (10 Nov 2005)
+
+  10 Nov 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/bestcrypt-1.6_p2-makefile_fix.patch, +bestcrypt-1.6_p2.ebuild:
+  version bump
 
   10 Nov 2005; Daniel Black <dragonheart@gentoo.org>
   +files/bestcrypt-1.6_p1-kgsha256makefile_fix.patch,
diff --git a/app-crypt/bestcrypt/Manifest b/app-crypt/bestcrypt/Manifest
index aecc75de4a1c..12c4cbb2ca68 100644
--- a/app-crypt/bestcrypt/Manifest
+++ b/app-crypt/bestcrypt/Manifest
@@ -1,28 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 5b8fda8e824903e5a1241e8f134fb5c1 ChangeLog 7529
+MD5 99f332b677685308fbccafd1a6568a55 ChangeLog 7703
 MD5 e30c17c4efee41b1ed3f849680d9cdfa bestcrypt-1.5_p10.ebuild 2974
 MD5 01fa3fab9cef0bcfe01671f972ba1052 bestcrypt-1.5_p11.ebuild 3130
 MD5 3c2d03aae97763035f173f2bb94dee06 bestcrypt-1.6_p1-r1.ebuild 3080
 MD5 dbc881283e69a96c6b64f474e7ad732b bestcrypt-1.6_p1-r2.ebuild 3368
 MD5 647e65173bc7229527e94aea50a6f3fd bestcrypt-1.6_p1.ebuild 3317
+MD5 2bcc5b3d69cf980c5e75f97b4698b47d bestcrypt-1.6_p2.ebuild 3174
 MD5 063ae0f67213da39ed4dd75a594b3b07 files/bcrypt3 3246
 MD5 e9585e8f08138f46bdda7b88ddd81cd8 files/bestcrypt-1.5_p10-makefile_fix.patch 1136
 MD5 009cee9a408478ebf4f7c1a381c7e8b2 files/bestcrypt-1.5_p11-makefile_fix.patch 1148
 MD5 6827793707b540d0174ef30904e3ded1 files/bestcrypt-1.6_p1-kgsha256makefile_fix.patch 313
 MD5 e4fb0265d55a570daf750fa7c0b8414c files/bestcrypt-1.6_p1-makefile_fix.patch 1367
+MD5 cf95724607cedd581c142b4dc421d6d4 files/bestcrypt-1.6_p2-makefile_fix.patch 1760
 MD5 01225cc87eee84cf54232c86b04e8c93 files/bestcrypt.devfs 1673
 MD5 c9fdd7c76eb3731a6166cc9ff17bf722 files/digest-bestcrypt-1.5_p10 137
 MD5 0f4e6e0c1442b612832726753739f6b2 files/digest-bestcrypt-1.5_p11 208
 MD5 dee6aa8c71224187da9fbc2b2a6fc167 files/digest-bestcrypt-1.6_p1 136
 MD5 6a91a7867c21eaa1be5ac4b829ae34d9 files/digest-bestcrypt-1.6_p1-r1 207
 MD5 6a91a7867c21eaa1be5ac4b829ae34d9 files/digest-bestcrypt-1.6_p1-r2 207
+MD5 115400b8e4184f161f23a15a3b3bf724 files/digest-bestcrypt-1.6_p2 207
 MD5 566cf4f89e44670d0aba4a745913d748 metadata.xml 224
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFDc5fWmdTrptrqvGERAqgxAJ4+k2/Kkigg5HZa4Rtmp+kKOke5PgCfQDAo
-aAkmqykySqeESuOqm+RDqAo=
-=uS4a
+iD8DBQFDc50zmdTrptrqvGERAo2MAJsHuIctIXB8ONpHplD8saI46PCgYwCfYrNh
+KAJgwWXla96jVqCB/VLsm0w=
+=LXcw
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/bestcrypt/bestcrypt-1.6_p2.ebuild b/app-crypt/bestcrypt/bestcrypt-1.6_p2.ebuild
new file mode 100644
index 000000000000..d94c319e47ba
--- /dev/null
+++ b/app-crypt/bestcrypt/bestcrypt-1.6_p2.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/bestcrypt-1.6_p2.ebuild,v 1.1 2005/11/10 19:19:02 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
+
+	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_p2-makefile_fix.patch b/app-crypt/bestcrypt/files/bestcrypt-1.6_p2-makefile_fix.patch
new file mode 100644
index 000000000000..d9871d449754
--- /dev/null
+++ b/app-crypt/bestcrypt/files/bestcrypt-1.6_p2-makefile_fix.patch
@@ -0,0 +1,53 @@
+diff -ruN bcrypt.orig/kgsha/Makefile bcrypt/kgsha/Makefile
+--- bcrypt.orig/kgsha/Makefile	2005-08-11 16:08:32.000000000 +1000
++++ bcrypt/kgsha/Makefile	2005-11-11 05:59:59.000000000 +1100
+@@ -20,6 +20,7 @@
+ 
+ CPP=g++
+ CPPFLAGS = -fPIC -Wall -Werror -fno-strength-reduce -I../include 
++CPPFLAGS += $(EXTRA_CXXFLAGS)
+ 
+ TARGET = libkgsha.so
+ HEADERS = kg_defs.h kgsha.h kblock.h sha1.h random.h
+diff -ruN bcrypt.orig/kgsha256/Makefile bcrypt/kgsha256/Makefile
+--- bcrypt.orig/kgsha256/Makefile	2005-08-11 16:08:32.000000000 +1000
++++ bcrypt/kgsha256/Makefile	2005-11-11 05:59:42.000000000 +1100
+@@ -20,6 +20,7 @@
+ 
+ CPP=g++
+ CPPFLAGS = -fPIC -Wall -Werror -fno-strength-reduce -I../include 
++CPPFLAGS += $(EXTRA_CXXFLAGS)
+ 
+ TARGET = libkgsha256.so
+ HEADERS = kg_defs.h kblock.h
+diff -ruN bcrypt.orig/mod/Makefile bcrypt/mod/Makefile
+--- bcrypt.orig/mod/Makefile	2005-01-06 20:15:48.000000000 +1100
++++ bcrypt/mod/Makefile	2005-11-11 05:58:27.000000000 +1100
+@@ -101,15 +101,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	2005-11-11 05:58:27.000000000 +1100
+@@ -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.6_p2 b/app-crypt/bestcrypt/files/digest-bestcrypt-1.6_p2
new file mode 100644
index 000000000000..a41731f432f8
--- /dev/null
+++ b/app-crypt/bestcrypt/files/digest-bestcrypt-1.6_p2
@@ -0,0 +1,3 @@
+MD5 4d35a7bab0c2ba2049bf9774b9ded3d9 BestCrypt-1.6-2.tar.gz 194602
+MD5 d68956f4c2ed795c68a451a451de27bb bcrypt-rc6-serpent-c.diff.gz 6034
+MD5 aa6e1f0e9ee797b409267bdba1f6534e bcrypt-rc6-serpent.diff.gz 5718