commit:     48024c56267ee610c7e26f602f1cd9a6b9ae0fe4
Author:     Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 12 03:15:33 2016 +0000
Commit:     Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
CommitDate: Sun Jun 12 03:22:05 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48024c56

app-crypt/bestcrypt: cleanup

Package-Manager: portage-2.2.28

 app-crypt/bestcrypt/Manifest                       |   1 -
 app-crypt/bestcrypt/bestcrypt-2.0.9.ebuild         |  76 ---------------
 .../bestcrypt/files/bestcrypt-2.0.0-build.patch    |  59 -----------
 .../bestcrypt/files/bestcrypt-2.0.4-build.patch    | 108 ---------------------
 4 files changed, 244 deletions(-)

diff --git a/app-crypt/bestcrypt/Manifest b/app-crypt/bestcrypt/Manifest
index f4d5acc..e3a8df2 100644
--- a/app-crypt/bestcrypt/Manifest
+++ b/app-crypt/bestcrypt/Manifest
@@ -1,2 +1 @@
 DIST BestCrypt-2.0.11.tar.gz 2191182 SHA256 
f6aef665eb8ff5eb1ef0f15ce496d7ac62d13e7dbc3031d5d4555a0a5de22ad0 SHA512 
f6848153fc68690c116796bd5feb80dc1776f344327de5ac485dddc5b60280b491e2e5c9f266d6f30b7095396cd06b5bdad5d322b4ac24ab612ec642dbc08fe2
 WHIRLPOOL 
036e7e967a3ef963b481310aa7732cbb764e0647f05796038892fcdc7ab772c48e5d57476ea7ba293d44a877fb42a55858f92fe018d54729f9845ccfd4f41988
-DIST BestCrypt-2.0.9.tar.gz 2109108 SHA256 
8bf7e7e0f694668cc36e175226b99daf0149fa60e1f87bfe60ee1495559a01d8 SHA512 
76b534c2b41b22d580c051f446dd97dd1de1d0a98f83b0236ac3f7fac2790e37f2e4e55842087102180e61c1bfd2bb6d5f2fee5355c2ac9b34510439a360be1f
 WHIRLPOOL 
76d01e075a5383bb7bfcb90b1aa274e62573d25e279852477a6d1bc0de25a97dd6f49548feb7f8ded775f95a322305c6b9e9c25f75eed3535476cb6df4f28663

diff --git a/app-crypt/bestcrypt/bestcrypt-2.0.9.ebuild 
b/app-crypt/bestcrypt/bestcrypt-2.0.9.ebuild
deleted file mode 100644
index 283652a..0000000
--- a/app-crypt/bestcrypt/bestcrypt-2.0.9.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils linux-mod toolchain-funcs versionator
-
-MY_PN="BestCrypt"
-DESCRIPTION="commercially licensed transparent filesystem encryption"
-HOMEPAGE="http://www.jetico.com/";
-SRC_URI="http://www.jetico.com/linux/${MY_PN}-${PV}.tar.gz";
-
-LICENSE="bestcrypt"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="virtual/linux-sources
-       app-shells/bash"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_PN}-${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}/${PN}-2.0.6-build.patch"
-}
-
-src_compile() {
-       MAKEOPTS="-j1" linux-mod_src_compile \
-               CXX="$(tc-getCXX)"
-       MAKEOPTS="-j1" emake \
-               CC="$(tc-getCC)" \
-               CXX="$(tc-getCXX)" \
-               AR="$(tc-getAR)" \
-               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-2.0.0-build.patch 
b/app-crypt/bestcrypt/files/bestcrypt-2.0.0-build.patch
deleted file mode 100644
index 876f30b..0000000
--- a/app-crypt/bestcrypt/files/bestcrypt-2.0.0-build.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 63baafb..995d48e 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)
- 
-@@ -101,7 +102,7 @@ $(shell mkdir -p $(TARGET_DIR)/kernel)
- #
- 
- # default target builds console tool with modules
--all: Makefile helpers module bctool-app
-+all: Makefile helpers bctool-app
-       true
- 
- # GUI executable with helpers and console tool
-@@ -216,7 +217,7 @@ module-clean: force-look
- #
- 
- # install for default target
--install: module-install bctool-app-install helpers-install
-+install: bctool-app-install helpers-install
-       true
- 
- # uninstall for default target
-@@ -224,6 +225,7 @@ uninstall: before-uninstall module-uninstall 
bctool-app-uninstall helpers-uninst
-       true
- 
- helpers-install:
-+      install -o root -m 755 -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
-@@ -247,7 +249,9 @@ before-uninstall: force-look
- 
- # install for main executable only
- bctool-app-install: force-look
-+      install -o root -m 755 -d $(PREFIX)/usr/bin
-       install -o root -m 0755 -s build/bctool             $(PREFIX)/usr/bin/
-+      install -o root -m 755 -d $(PREFIX)/$(MAN_PATH)/man8
-       install -m 644 bctool.8                             
$(PREFIX)/$(MAN_PATH)/man8/     
- 
- # uninstall for main executable only

diff --git a/app-crypt/bestcrypt/files/bestcrypt-2.0.4-build.patch 
b/app-crypt/bestcrypt/files/bestcrypt-2.0.4-build.patch
deleted file mode 100644
index 8154833..0000000
--- a/app-crypt/bestcrypt/files/bestcrypt-2.0.4-build.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From 38ef9fdb4b6690825fe3e54b6b44173e00316a94 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <[email protected]>
-Date: Sun, 6 Jul 2014 21:28:11 +0300
-Subject: [PATCH 1/3] build: respect CFLAGS/LDFLAGS
-
-Signed-off-by: Alon Bar-Lev <[email protected]>
----
- 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 <[email protected]>
-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 <[email protected]>
----
- 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 <[email protected]>
-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 <[email protected]>
----
- 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
-

Reply via email to