version bump on 1.5 series. added linux-mod_pkg_postinst to pkg_postinst (bug #100582)

(Portage version: 2.0.51.22-r2)

8 files changed, 185 insertions, 18 deletions

diff --git a/app-crypt/bestcrypt/ChangeLog b/app-crypt/bestcrypt/ChangeLog
index 333756f7a70c..5608d8cbf9b7 100644
--- a/app-crypt/bestcrypt/ChangeLog
+++ b/app-crypt/bestcrypt/ChangeLog
@@ -1,6 +1,15 @@
 # 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.33 2005/06/21 09:17:55 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/ChangeLog,v 1.34 2005/08/07 11:27:44 dragonheart Exp $
+
+*bestcrypt-1.5_p11 (07 Aug 2005)
+
+  07 Aug 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/bestcrypt-1.5_p11-makefile_fix.patch, bestcrypt-1.5_p10.ebuild,
+  +bestcrypt-1.5_p11.ebuild, bestcrypt-1.6_p1.ebuild,
+  bestcrypt-1.6_p1-r1.ebuild:
+  version bump on 1.5 series. added linux-mod_pkg_postinst to pkg_postinst
+  (bug #100582). thanks to Craig for reporting
 
 *bestcrypt-1.6_p1-r1 (21 Jun 2005)
 
diff --git a/app-crypt/bestcrypt/Manifest b/app-crypt/bestcrypt/Manifest
index 19f5227f1119..8a0c64dcea83 100644
--- a/app-crypt/bestcrypt/Manifest
+++ b/app-crypt/bestcrypt/Manifest
@@ -1,11 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 03a05d9dede8471e658c93d0e3c3df6e ChangeLog 6624
-MD5 abf0fef6742da4a36b40993466610cc9 bestcrypt-1.6_p1-r1.ebuild 3048
-MD5 68121ad348d78c8efdebce17ab7bbb81 bestcrypt-1.5_p10.ebuild 2942
+MD5 632a2a251b0d7191bcbc566dd6058fa5 ChangeLog 6991
+MD5 97edd32d32d6ef7e5bd42bd918eab3b3 bestcrypt-1.6_p1-r1.ebuild 3080
+MD5 51909b3650aa8460493e6da346051866 bestcrypt-1.5_p10.ebuild 2974
 MD5 566cf4f89e44670d0aba4a745913d748 metadata.xml 224
-MD5 c2c1f3279f95f65b86cf226f84bace9b bestcrypt-1.6_p1.ebuild 3285
+MD5 77295da2e0fd6cee1cccd2db6499aa1f bestcrypt-1.6_p1.ebuild 3317
+MD5 985e9bd26902be95342937d92679cbb1 bestcrypt-1.5_p11.ebuild 3130
 MD5 e4fb0265d55a570daf750fa7c0b8414c files/bestcrypt-1.6_p1-makefile_fix.patch 1367
 MD5 063ae0f67213da39ed4dd75a594b3b07 files/bcrypt3 3246
 MD5 dee6aa8c71224187da9fbc2b2a6fc167 files/digest-bestcrypt-1.6_p1 136
@@ -13,10 +11,5 @@ MD5 c9fdd7c76eb3731a6166cc9ff17bf722 files/digest-bestcrypt-1.5_p10 137
 MD5 e9585e8f08138f46bdda7b88ddd81cd8 files/bestcrypt-1.5_p10-makefile_fix.patch 1136
 MD5 01225cc87eee84cf54232c86b04e8c93 files/bestcrypt.devfs 1673
 MD5 6a91a7867c21eaa1be5ac4b829ae34d9 files/digest-bestcrypt-1.6_p1-r1 207
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCt+VKmdTrptrqvGERAsKVAKCNkuTMS5cjT3njnq++8KWBex8GAwCeJ9TY
-AklTnf1T38Fa8y+VB1vvR5o=
-=TDkZ
------END PGP SIGNATURE-----
+MD5 0f4e6e0c1442b612832726753739f6b2 files/digest-bestcrypt-1.5_p11 208
+MD5 009cee9a408478ebf4f7c1a381c7e8b2 files/bestcrypt-1.5_p11-makefile_fix.patch 1148
diff --git a/app-crypt/bestcrypt/bestcrypt-1.5_p10.ebuild b/app-crypt/bestcrypt/bestcrypt-1.5_p10.ebuild
index 00b192c661eb..d7a6edb97957 100644
--- a/app-crypt/bestcrypt/bestcrypt-1.5_p10.ebuild
+++ b/app-crypt/bestcrypt/bestcrypt-1.5_p10.ebuild
@@ -1,6 +1,6 @@
 # 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.5_p10.ebuild,v 1.5 2005/06/19 00:57:23 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/bestcrypt-1.5_p10.ebuild,v 1.6 2005/08/07 11:27:44 dragonheart Exp $
 
 inherit flag-o-matic eutils linux-mod toolchain-funcs
 
@@ -101,4 +101,7 @@ pkg_postinst() {
 	if [ -e "${ROOT}/dev/.devfsd" ]; then
 		killall -HUP devfsd
 	fi
+
+	einfo
+	linux-mod_pkg_postinst
 }
diff --git a/app-crypt/bestcrypt/bestcrypt-1.5_p11.ebuild b/app-crypt/bestcrypt/bestcrypt-1.5_p11.ebuild
new file mode 100644
index 000000000000..a7364e7bf972
--- /dev/null
+++ b/app-crypt/bestcrypt/bestcrypt-1.5_p11.ebuild
@@ -0,0 +1,114 @@
+# 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.5_p11.ebuild,v 1.1 2005/08/07 11:27:44 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_serpent(block:${S}/mod/serpent)
+		bc_rc6(block:${S}/mod/rc6)
+		bc_twofish(block:${S}/mod/twofish)"
+
+src_unpack() {
+	unpack "BestCrypt-${PV/_p/-}.tar.gz"
+	cd "${S}"
+
+	if use x86;
+	then
+		epatch "${DISTDIR}"/bcrypt-rc6-serpent.diff.gz
+	else
+		epatch "${DISTDIR}"/bcrypt-rc6-serpent-c.diff.gz
+	fi
+
+	epatch "${FILESDIR}/${P}"-makefile_fix.patch
+}
+
+src_compile() {
+
+	filter-flags -fforce-addr
+
+	emake -C kgsha EXTRA_CXXFLAGS="${CXXFLAGS}" || die "library compile failed"
+	emake -C src EXTRA_CFLAGS="${CFLAGS}" || 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
+
+
+	doman man/bctool.8
+	newinitd ${FILESDIR}/bcrypt3 bcrypt
+	dodoc README LICENSE HIDDEN_PART
+
+	insinto /etc/devfs.d
+	doins ${FILESDIR}/bestcrypt.devfs
+}
+
+
+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/"
+
+	if [ -e "${ROOT}/dev/.devfsd" ]; then
+		killall -HUP devfsd
+	fi
+
+	einfo
+	linux-mod_pkg_postinst
+}
diff --git a/app-crypt/bestcrypt/bestcrypt-1.6_p1-r1.ebuild b/app-crypt/bestcrypt/bestcrypt-1.6_p1-r1.ebuild
index a9e15ccb7242..5bcd7bdca9c9 100644
--- a/app-crypt/bestcrypt/bestcrypt-1.6_p1-r1.ebuild
+++ b/app-crypt/bestcrypt/bestcrypt-1.6_p1-r1.ebuild
@@ -1,6 +1,6 @@
 # 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_p1-r1.ebuild,v 1.2 2005/06/21 10:00:21 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/bestcrypt-1.6_p1-r1.ebuild,v 1.3 2005/08/07 11:27:44 dragonheart Exp $
 
 inherit flag-o-matic eutils linux-mod toolchain-funcs
 
@@ -105,4 +105,7 @@ pkg_postinst() {
 	if [ -e "${ROOT}/dev/.devfsd" ]; then
 		killall -HUP devfsd
 	fi
+
+	einfo
+	linux-mod_pkg_postinst
 }
diff --git a/app-crypt/bestcrypt/bestcrypt-1.6_p1.ebuild b/app-crypt/bestcrypt/bestcrypt-1.6_p1.ebuild
index 82eb99e6913f..3b9f0419f1ea 100644
--- a/app-crypt/bestcrypt/bestcrypt-1.6_p1.ebuild
+++ b/app-crypt/bestcrypt/bestcrypt-1.6_p1.ebuild
@@ -1,6 +1,6 @@
 # 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_p1.ebuild,v 1.3 2005/06/20 13:37:37 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/bestcrypt-1.6_p1.ebuild,v 1.4 2005/08/07 11:27:44 dragonheart Exp $
 
 inherit flag-o-matic eutils linux-mod toolchain-funcs
 
@@ -112,4 +112,7 @@ pkg_postinst() {
 	if [ -e "${ROOT}/dev/.devfsd" ]; then
 		killall -HUP devfsd
 	fi
+
+	einfo
+	linux-mod_pkg_postinst
 }
diff --git a/app-crypt/bestcrypt/files/bestcrypt-1.5_p11-makefile_fix.patch b/app-crypt/bestcrypt/files/bestcrypt-1.5_p11-makefile_fix.patch
new file mode 100644
index 000000000000..aeb451add3f6
--- /dev/null
+++ b/app-crypt/bestcrypt/files/bestcrypt-1.5_p11-makefile_fix.patch
@@ -0,0 +1,39 @@
+--- mod/Makefile.orig	2005-01-06 20:15:48.000000000 +1100
++++ mod/Makefile	2005-08-07 21:14:23.000000000 +1000
+@@ -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
+ 
+--- src/Makefile.orig	2004-12-16 19:42:35.000000000 +1100
++++ src/Makefile	2005-08-07 21:14:23.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 =
+ 
+ TARGETS = bctool
+--- kgsha/Makefile.orig	2002-10-29 18:11:45.000000000 +1100
++++ kgsha/Makefile	2005-08-07 21:14:23.000000000 +1000
+@@ -20,6 +20,7 @@
+ 
+ CPP=g++
+ CPPFLAGS = -Wall -Werror -fno-strength-reduce -I../include -g 
++CPPFLAGS += $(EXTRA_CXXFLAGS)
+ 
+ TARGET = libkgsha.a
+ HEADERS = kg_defs.h kgsha.h kblock.h sha1.h random.h
diff --git a/app-crypt/bestcrypt/files/digest-bestcrypt-1.5_p11 b/app-crypt/bestcrypt/files/digest-bestcrypt-1.5_p11
new file mode 100644
index 000000000000..68a7d46acd39
--- /dev/null
+++ b/app-crypt/bestcrypt/files/digest-bestcrypt-1.5_p11
@@ -0,0 +1,3 @@
+MD5 30ebb215a29951d9db1e96b97ab2d9df BestCrypt-1.5-11.tar.gz 170110
+MD5 d68956f4c2ed795c68a451a451de27bb bcrypt-rc6-serpent-c.diff.gz 6034
+MD5 aa6e1f0e9ee797b409267bdba1f6534e bcrypt-rc6-serpent.diff.gz 5718