Version bump, fix alternate kernel dir bug#514500

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key BF20DC51)

5 files changed, 189 insertions, 171 deletions

diff --git a/app-crypt/bestcrypt/ChangeLog b/app-crypt/bestcrypt/ChangeLog
index 756d300f3c4f..48f80d0a58cf 100644
--- a/app-crypt/bestcrypt/ChangeLog
+++ b/app-crypt/bestcrypt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-crypt/bestcrypt
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/ChangeLog,v 1.75 2013/03/02 21:49:24 alonbl Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/ChangeLog,v 1.76 2014/07/06 19:07:36 alonbl Exp $
+
+*bestcrypt-2.0.4 (06 Jul 2014)
+
+  06 Jul 2014; Alon Bar-Lev <alonbl@gentoo.org> +bestcrypt-2.0.4.ebuild,
+  +files/bestcrypt-2.0.4-build.patch, -bestcrypt-1.7.0.ebuild,
+  -files/bestcrypt-1.7.0-respect_LDFLAGS.patch:
+  Version bump, fix alternate kernel dir bug#514500
 
   02 Mar 2013; Alon Bar-Lev <alonbl@gentoo.org> bestcrypt-1.7.0.ebuild:
   Remove stable keywords as truecrypt never been maintained properly upstream,
diff --git a/app-crypt/bestcrypt/bestcrypt-1.7.0.ebuild b/app-crypt/bestcrypt/bestcrypt-1.7.0.ebuild
deleted file mode 100644
index 660ea22be102..000000000000
--- a/app-crypt/bestcrypt/bestcrypt-1.7.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/bestcrypt-1.7.0.ebuild,v 1.4 2013/03/02 21:49:24 alonbl Exp $
-
-EAPI="2"
-
-inherit eutils flag-o-matic linux-mod toolchain-funcs versionator
-
-MY_PN="bcrypt"
-MY_PV="$(replace_version_separator 2 -)"
-DESCRIPTION="commercially licensed transparent filesystem encryption"
-HOMEPAGE="http://www.jetico.com/"
-SRC_URI="http://www.jetico.com/linux/BestCrypt-${MY_PV}.tar.gz"
-
-LICENSE="bestcrypt"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="virtual/linux-sources"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	MODULE_NAMES="bc(block:mod)
-		bc_3des(block:mod:mod/3des)
-		bc_bf128(block:mod:mod/bf128)
-		bc_bf448(block:mod:mod/bf448)
-		bc_blowfish(block:mod:mod/blowfish)
-		bc_cast(block:mod:mod/cast)
-		bc_des(block:mod:mod/des)
-		bc_gost(block:mod:mod/gost)
-		bc_idea(block:mod:mod/idea)
-		bc_rijn(block:mod:mod/rijn)
-		bc_twofish(block:mod:mod/twofish)"
-	BUILD_TARGETS="all"
-	BUILD_PARAMS=" \
-		CPP=\"$(tc-getCXX)\" \
-		KERNEL_DIR=\"${KV_DIR}\" \
-		VER=${KV_MAJOR}.${KV_MINOR} \
-		KEXT=${KV_OBJ}"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-respect_LDFLAGS.patch"
-}
-
-src_compile() {
-	linux-mod_src_compile
-
-	filter-flags -fforce-addr
-
-	emake BC_CPP="$(tc-getCXX)" EXTRA_CFLAGS="${CXXFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	dobin build/bctool
-	dolib.so build/lib{bccore,kgsha{,256}}.so
-	local link
-	for link in bcmount bcumount bcformat bcfsck bcnew bcpasswd bcinfo bclink bcunlink bcmake_hidden bcreencrypt; do
-		dosym bctool "/usr/bin/${link}"
-	done
-	insinto /etc
-	newins etc/bc.conf bc.conf
-	newinitd "${FILESDIR}/bcrypt3" bcrypt
-	sed -e '/\(bc_rc6\|bc_serpent\)/d' -i "${D}etc/init.d/bcrypt"
-	dodoc HIDDEN_PART README
-	doman man/bctool.8
-}
-
-pkg_postinst() {
-	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-2.0.4.ebuild b/app-crypt/bestcrypt/bestcrypt-2.0.4.ebuild
new file mode 100644
index 000000000000..91fb0469e801
--- /dev/null
+++ b/app-crypt/bestcrypt/bestcrypt-2.0.4.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/bestcrypt-2.0.4.ebuild,v 1.1 2014/07/06 19:07:36 alonbl Exp $
+
+EAPI="5"
+
+inherit eutils linux-mod toolchain-funcs versionator
+
+MY_PN="bcrypt"
+MY_PV="$(replace_version_separator 2 -)"
+DESCRIPTION="commercially licensed transparent filesystem encryption"
+HOMEPAGE="http://www.jetico.com/"
+SRC_URI="http://www.jetico.com/linux/BestCrypt-${MY_PV}.tar.gz"
+
+LICENSE="bestcrypt"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="virtual/linux-sources"
+RDEPEND=""
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+pkg_setup() {
+	CONFIG_CHECK="MODULES"
+	linux-mod_pkg_setup
+
+	MODULE_NAMES="bestcrypt(block::kernel/kmod)
+		bc_3des(crypto::kernel/kmod/crypto/algs/3des)
+		bc_bf128(crypto::kernel/kmod/crypto/algs/bf128)
+		bc_bf448(crypto::kernel/kmod/crypto/algs/bf448)
+		bc_blowfish(crypto::kernel/kmod/crypto/algs/blowfish)
+		bc_cast(crypto::kernel/kmod/crypto/algs/cast)
+		bc_des(crypto::kernel/kmod/crypto/algs/des)
+		bc_gost(crypto::kernel/kmod/crypto/algs/gost)
+		bc_idea(crypto::kernel/kmod/crypto/algs/idea)
+		bc_rijn(crypto::kernel/kmod/crypto/algs/rijn)"
+	BUILD_TARGETS="module"
+	BUILD_PARAMS=" \
+		BC_KERNEL_DIR=\"${KERNEL_DIR}\""
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-build.patch"
+}
+
+src_compile() {
+	MAKEOPTS="-j1" linux-mod_src_compile
+	MAKEOPTS="-j1" emake \
+		CFLAGS="${CXXFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	linux-mod_src_install
+
+	emake install PREFIX="${ED}" install
+
+	newinitd "${FILESDIR}/bcrypt3" bcrypt
+	sed -e '/\(bc_rc6\|bc_serpent\|bc_twofish\)/d' -i "${D}etc/init.d/bcrypt"
+	dodoc HIDDEN_PART README
+}
+
+pkg_postinst() {
+	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/files/bestcrypt-1.7.0-respect_LDFLAGS.patch b/app-crypt/bestcrypt/files/bestcrypt-1.7.0-respect_LDFLAGS.patch
deleted file mode 100644
index e07cb3e5ff58..000000000000
--- a/app-crypt/bestcrypt/files/bestcrypt-1.7.0-respect_LDFLAGS.patch
+++ /dev/null
@@ -1,86 +0,0 @@
---- Makefile
-+++ Makefile
-@@ -37,7 +37,7 @@
- BC_CPP     	= g++
- BC_CFLAGS       = -Wall -fno-strict-aliasing -I$(FRAMEWORK_PATH) $(EXTRA_CFLAGS) -DBC_BACKEND_HAS_PIO
- 
--LDFLAGS 	= -Wl,-whole-archive,$(BC_BUILD)/$(BACKEND),$(BC_BUILD)/$(TOOLS),-no-whole-archive -L$(BC_BUILD) -lbccore
-+LIBS    	= -Wl,-whole-archive,$(BC_BUILD)/$(BACKEND),$(BC_BUILD)/$(TOOLS),-no-whole-archive -L$(BC_BUILD) -lbccore -ldl
- 
- # main target
- # build subtargets and core
-@@ -46,14 +46,14 @@
- 
- release: Makefile
- 	set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i BC_BUILD="$(BC_BUILD)" BC_CPP=$(BC_CPP) BC_CFLAGS="$(BC_CFLAGS)"; done 
--	$(BC_CPP) $(LDFLAGS) -o $(BC_BUILD)/$(TARGET) 
-+	$(BC_CPP) $(LDFLAGS) -o $(BC_BUILD)/$(TARGET) $(LIBS)
- 
- debug: Makefile 
- 	set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i BC_BUILD="$(BC_BUILD)" BC_CPP=$(BC_CPP) BC_CFLAGS="$(BC_CFLAGS) -pg -DBC_DEBUG"; done 
--	$(BC_CPP) $(LDFLAGS) -o $(BC_BUILD)/$(TARGET) 
-+	$(BC_CPP) $(LDFLAGS) -o $(BC_BUILD)/$(TARGET) $(LIBS)
- 
- 
--# subtragets build
-+# subtargets build
- subdirs:
- 
- install: subdirs
---- core/Makefile
-+++ core/Makefile
-@@ -23,7 +23,8 @@
- # build flags
- CFLAGS 		= -fPIC 
- CFLAGS 		+= $(BC_CFLAGS)
--LDFLAGS		= -shared -Wl,-soname,$(DYNAMIC) -Wl,-whole-archive,$(LOCAL_BUILD)/$(STATIC),-no-whole-archive -ldl
-+LDFLAGS		+= -shared -Wl,-soname,$(DYNAMIC)
-+LIBS    	= -Wl,-whole-archive,$(LOCAL_BUILD)/$(STATIC),-no-whole-archive -ldl
- 
- 
- # ----------------------------------------------------------
-@@ -35,7 +36,7 @@
- 
- 
- $(DYNAMIC): $(STATIC) Makefile
--	$(BC_CPP) $(LDFLAGS) -o $(LOCAL_BUILD)/$(DYNAMIC)
-+	$(BC_CPP) $(LDFLAGS) -o $(LOCAL_BUILD)/$(DYNAMIC) $(LIBS)
- 
- 
- $(STATIC): 
---- core/mod/v7/kgsha/Makefile
-+++ core/mod/v7/kgsha/Makefile
-@@ -20,12 +20,13 @@
- TARGET = libkgsha.so
- OBJ = sha1.o random.o sha1defs.o
- COMMON = ../libkgsha_common.a
--LDFLAGS = -shared -Wl,-soname,$(TARGET) -Wl,-whole-archive,$(COMMON),-no-whole-archive 
-+LDFLAGS += -shared -Wl,-soname,$(TARGET)
-+LIBS = -Wl,-whole-archive,$(COMMON),-no-whole-archive 
- 
- all: $(TARGET) Makefile
- 
- $(TARGET):$(OBJ)
--	$(CPP) $(OBJ) $(LDFLAGS) -o $(TARGET) 
-+	$(CPP) $(OBJ) $(LDFLAGS) -o $(TARGET) $(LIBS)
- 	$(CP) $(TARGET) $(BUILD_PATH)
- 
- %.o: %.cpp
---- core/mod/v7/kgsha256/Makefile
-+++ core/mod/v7/kgsha256/Makefile
-@@ -21,12 +21,13 @@
- TARGET = libkgsha256.so
- OBJ = sha256.o random.o sha256defs.o
- COMMON = ../libkgsha_common.a
--LDFLAGS = -shared -Wl,-soname,$(TARGET) -Wl,-whole-archive,$(COMMON),-no-whole-archive 
-+LDFLAGS += -shared -Wl,-soname,$(TARGET)
-+LIBS = -Wl,-whole-archive,$(COMMON),-no-whole-archive 
- 
- all: $(TARGET) Makefile
- 
- $(TARGET):$(OBJ)
--	$(CPP) $(OBJ) $(LDFLAGS) -o $(TARGET) 
-+	$(CPP) $(OBJ) $(LDFLAGS) -o $(TARGET) $(LIBS)
- 	$(CP) $(TARGET) $(BUILD_PATH)
- 
- %.o: %.cpp
diff --git a/app-crypt/bestcrypt/files/bestcrypt-2.0.4-build.patch b/app-crypt/bestcrypt/files/bestcrypt-2.0.4-build.patch
new file mode 100644
index 000000000000..8154833890ac
--- /dev/null
+++ b/app-crypt/bestcrypt/files/bestcrypt-2.0.4-build.patch
@@ -0,0 +1,108 @@
+From 38ef9fdb4b6690825fe3e54b6b44173e00316a94 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Sun, 6 Jul 2014 21:28:11 +0300
+Subject: [PATCH 1/3] build: respect CFLAGS/LDFLAGS
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ Makefile | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 17abf61..e89bb76 100644
+--- a/Makefile
++++ b/Makefile
+@@ -56,7 +56,8 @@ KGSHA_LIB = $(KGSHA_BUILD_DIR)/lib$(KGSHA_LIB_NAME).a
+ KGGHOST_LIB = $(KGGHOST_BUILD_DIR)/lib$(KGGHOST_LIB_NAME).a
+ SPACEMAP_LIB = $(SPACEMAP_BUILD_DIR)/lib$(SPACEMAP_LIB_NAME).a
+ 
+-BC_EXTRA_CFLAGS= -D_LARGE_FILES -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
++BC_EXTRA_CFLAGS= $(CFLAGS) -D_LARGE_FILES -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
++BC_EXTRA_LDFLAGS = $(LDFLAGS)
+ 
+ #
+ # commands
+@@ -86,7 +87,7 @@ BCTOOL_OBJS =   container/linux/file.o \
+                 src/bctool-rawlink.o
+ 
+ BCTOOL_CFLAGS = $(BC_EXTRA_CFLAGS) -DBC_LINUX -Wall -I. -Icertificate/  
+-BCTOOL_LDFLAGS = -L$(TARGET_DIR) -l$(KERN_LIB_NAME) -l$(KGSHA_LIB_NAME) \
++BCTOOL_LDFLAGS = $(BC_EXTRA_LDFLAGS) -L$(TARGET_DIR) -l$(KERN_LIB_NAME) -l$(KGSHA_LIB_NAME) \
+                  -l$(KGGHOST_LIB_NAME) -l$(CERT_LIB_NAME) -l$(SPACEMAP_LIB_NAME) \
+                  -ludev -lpthread -l$(FS_LIB_NAME)
+ 
+-- 
+1.8.5.5
+
+From 632ba530d94675c62213ec9f2bd9a37a411a6050 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Sun, 6 Jul 2014 21:30:49 +0300
+Subject: [PATCH 2/3] build: create directories before put file + use install
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ Makefile | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index e89bb76..3cd36fd 100644
+--- a/Makefile
++++ b/Makefile
+@@ -238,6 +238,7 @@ uninstall: before-uninstall module-uninstall console-uninstall helpers-uninstall
+ 	true
+ 
+ helpers-install:
++	install -o root -m 0755 -d $(PREFIX)/sbin
+ 	install -o root -m 4755 -s $(TARGET_DIR)/bcmount_helper      $(PREFIX)/sbin
+ 	install -o root -m 4755 -s $(TARGET_DIR)/bcumount_helper     $(PREFIX)/sbin
+ 	install -o root -m 4755 -s $(TARGET_DIR)/bcrrpart_helper     $(PREFIX)/sbin
+@@ -261,9 +262,9 @@ before-uninstall: force-look
+ 
+ # install for console only
+ console-install: force-look
+-	mkdir -p $(PREFIX)/usr/bin
++	install -o root -m 0755 -d $(PREFIX)/usr/bin
+ 	install -o root -m 0755 -s build/bctool             $(PREFIX)/usr/bin/
+-	mkdir -p $(PREFIX)/$(MAN_PATH)/man8
++	install -o root -m 0755 -d $(PREFIX)/$(MAN_PATH)/man8
+ 	install -m 644 bctool.8                             $(PREFIX)/$(MAN_PATH)/man8/     
+ 
+ # uninstall for console only
+-- 
+1.8.5.5
+
+From 4bce59bd9bc5a201caf5f2ff3e2080e7e5a01733 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Sun, 6 Jul 2014 21:34:21 +0300
+Subject: [PATCH 3/3] build: do not auto build/install module
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 3cd36fd..a3fd59e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -98,7 +98,7 @@ TESTS_TARGET = $(TARGET_DIR)/tests/bctool-tests
+ #
+ 
+ # default target builds console tool with modules
+-all: Makefile helpers module console
++all: Makefile helpers console
+ 	true
+ 
+ rebuild: clean all
+@@ -226,7 +226,7 @@ module-clean: force-look
+ #
+ 
+ # install for default target
+-install: module-install console-install helpers-install
++install: console-install helpers-install
+ 	true
+ 
+ # used by RPM creation script
+-- 
+1.8.5.5
+