8 files changed, 14 insertions, 265 deletions
diff --git a/app-crypt/bestcrypt/ChangeLog b/app-crypt/bestcrypt/ChangeLog
index 5720dd1ecd8c..cded09762862 100644
--- a/app-crypt/bestcrypt/ChangeLog
+++ b/app-crypt/bestcrypt/ChangeLog
@@ -1,6 +1,14 @@
 # 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.58 2007/05/14 04:38:48 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/ChangeLog,v 1.59 2007/12/25 07:07:02 alonbl Exp $
+
+*bestcrypt-1.6_p15 (25 Dec 2007)
+
+  25 Dec 2007; Alon Bar-Lev <alonbl@gentoo.org>
+  -files/bestcrypt-1.6_p14-module.patch, -bestcrypt-1.6_p11.ebuild,
+  -bestcrypt-1.6_p13.ebuild, -bestcrypt-1.6_p14.ebuild,
+  +bestcrypt-1.6_p15.ebuild:
+  Upstream accepted our patches
 
 *bestcrypt-1.6_p13 (14 May 2007)
 
diff --git a/app-crypt/bestcrypt/bestcrypt-1.6_p11.ebuild b/app-crypt/bestcrypt/bestcrypt-1.6_p11.ebuild
deleted file mode 100644
index fa01bdb723c1..000000000000
--- a/app-crypt/bestcrypt/bestcrypt-1.6_p11.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# 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.2 2007/07/13 21:47:34 mr_bones_ 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/bestcrypt-1.6_p13.ebuild b/app-crypt/bestcrypt/bestcrypt-1.6_p13.ebuild
deleted file mode 100644
index 09b452ae31ea..000000000000
--- a/app-crypt/bestcrypt/bestcrypt-1.6_p13.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# 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_p13.ebuild,v 1.2 2007/07/13 21:47:34 mr_bones_ 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/bestcrypt-1.6_p14.ebuild b/app-crypt/bestcrypt/bestcrypt-1.6_p15.ebuild
index e2dc5c909a78..bc0aee87dccf 100644
--- a/app-crypt/bestcrypt/bestcrypt-1.6_p14.ebuild
+++ b/app-crypt/bestcrypt/bestcrypt-1.6_p15.ebuild
@@ -1,6 +1,6 @@
 # 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_p14.ebuild,v 1.2 2007/11/10 11:15:16 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/bestcrypt-1.6_p15.ebuild,v 1.1 2007/12/25 07:07:02 alonbl Exp $
 
 inherit flag-o-matic eutils linux-mod toolchain-funcs multilib
 
@@ -49,10 +49,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}/${P}-module.patch"
-
-	if use x86;
-	then
+	if use x86;	then
 		epatch "${WORKDIR}/bcrypt-rc6-serpent.diff"
 	else
 		epatch "${WORKDIR}/bcrypt-rc6-serpent-c.diff"
diff --git a/app-crypt/bestcrypt/files/bestcrypt-1.6_p14-module.patch b/app-crypt/bestcrypt/files/bestcrypt-1.6_p14-module.patch
deleted file mode 100644
index 6d87c1db34e3..000000000000
--- a/app-crypt/bestcrypt/files/bestcrypt-1.6_p14-module.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -urNp bcrypt-1.6-14.org/mod/Makefile bcrypt-1.6-14/mod/Makefile
---- bcrypt-1.6-14.org/mod/Makefile	2006-11-09 07:43:33.000000000 +0200
-+++ bcrypt-1.6-14/mod/Makefile	2007-11-10 13:06:48.000000000 +0200
-@@ -127,7 +127,7 @@ endif
- endif
- endif
- 
--LDFLAGS = -d -r
-+override LDFLAGS = -d -r
- 
- SUBDIRS = gost blowfish twofish des bf128 bf448 cast idea 3des rijn
- OBJS += bc_mgr.o
-diff -urNp bcrypt-1.6-14.org/mod/Makefile.alg bcrypt-1.6-14/mod/Makefile.alg
---- bcrypt-1.6-14.org/mod/Makefile.alg	2006-10-20 12:16:01.000000000 +0200
-+++ bcrypt-1.6-14/mod/Makefile.alg	2007-11-10 13:06:56.000000000 +0200
-@@ -22,7 +22,7 @@
- CC = gcc
- LD = ld
- LN_S = ln -s
--LDFLAGS = -d -r
-+override LDFLAGS = -d -r
- ifeq ($(K2616), yes)
- KBDEF += -DKBUILD_MODNAME=\"$(MODNAME)\" -DKBUILD_BASENAME=\"BestCrypt\" -D_KBUILD_QUOTES
- else
diff --git a/app-crypt/bestcrypt/files/digest-bestcrypt-1.6_p13 b/app-crypt/bestcrypt/files/digest-bestcrypt-1.6_p13
deleted file mode 100644
index 63435cd759a2..000000000000
--- a/app-crypt/bestcrypt/files/digest-bestcrypt-1.6_p13
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 efb1438954dde293c421cd77fde49d54 BestCrypt-1.6-13.tar.gz 196083
-RMD160 02d853c8db58e819f58f4206149b5e73fc39006b BestCrypt-1.6-13.tar.gz 196083
-SHA256 2ba343d406223e19f6bb8daf3f44c067a9cf07ed35d3912bae5219aca38ea98e BestCrypt-1.6-13.tar.gz 196083
-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_p14 b/app-crypt/bestcrypt/files/digest-bestcrypt-1.6_p14
deleted file mode 100644
index 99c17505f88f..000000000000
--- a/app-crypt/bestcrypt/files/digest-bestcrypt-1.6_p14
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 e3616521426d2da7104116cd23031f2b BestCrypt-1.6-14.tar.gz 196111
-RMD160 d41d9068f28f8a122ea896261630f7cd17dec903 BestCrypt-1.6-14.tar.gz 196111
-SHA256 a3e56bf6270c63c47c745b841e1c3eb4de5ade0ff8296a535bcca1ce5f76d2ad BestCrypt-1.6-14.tar.gz 196111
-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_p11 b/app-crypt/bestcrypt/files/digest-bestcrypt-1.6_p15
index 739910ba4502..dd09d6355310 100644
--- a/app-crypt/bestcrypt/files/digest-bestcrypt-1.6_p11
+++ b/app-crypt/bestcrypt/files/digest-bestcrypt-1.6_p15
@@ -1,6 +1,6 @@
-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 ba4897938e7149b4938b066069f13fd5 BestCrypt-1.6-15.tar.gz 213134
+RMD160 efe89ccd86df820f871f12379337dad4ad7163a8 BestCrypt-1.6-15.tar.gz 213134
+SHA256 9b695bc5b0e4271df4a872482870b498b633bed5dd9455012acb870a8c4bc8f7 BestCrypt-1.6-15.tar.gz 213134
 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