From 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 21:03:06 +0100 Subject: gentoo resync : 14.07.2018 --- app-crypt/bestcrypt/Manifest | 5 + app-crypt/bestcrypt/bestcrypt-2.0.11.ebuild | 78 +++++ app-crypt/bestcrypt/files/bcrypt3 | 104 +++++++ .../bestcrypt/files/bestcrypt-2.0.6-build.patch | 341 +++++++++++++++++++++ app-crypt/bestcrypt/metadata.xml | 8 + 5 files changed, 536 insertions(+) create mode 100644 app-crypt/bestcrypt/Manifest create mode 100644 app-crypt/bestcrypt/bestcrypt-2.0.11.ebuild create mode 100644 app-crypt/bestcrypt/files/bcrypt3 create mode 100644 app-crypt/bestcrypt/files/bestcrypt-2.0.6-build.patch create mode 100644 app-crypt/bestcrypt/metadata.xml (limited to 'app-crypt/bestcrypt') diff --git a/app-crypt/bestcrypt/Manifest b/app-crypt/bestcrypt/Manifest new file mode 100644 index 000000000000..eaa6ef5a3fab --- /dev/null +++ b/app-crypt/bestcrypt/Manifest @@ -0,0 +1,5 @@ +AUX bcrypt3 3197 BLAKE2B 5e9d721a5b4213fcc0e5eb4325c009685dee5bd8dd61f8b47ee1ca29e52faa12b3c6f3c9ab1bc283d7944f4f4178dc831a95348971bde439a7ae77f213df20dc SHA512 370c28c7289d86a0fbf639c85cb755fef10780f86daa4c5ce6071f32d7e36dea8e21f496e09e145c8c091042a70f3666df068611258a16a05d217d5ed355290b +AUX bestcrypt-2.0.6-build.patch 10878 BLAKE2B e7ab526bb514a7a28415cb8e7f109d224ddddc10bd09e9539a2f289b5933abb3fc90378c0a10275113b47d90f18578b8285aacfeb087a5052afd34c9407a6180 SHA512 34e150087fadfcdba5c05c0a4e1d2bfadbc448fe3214663c86ef3a692ec924da011ba11da3fb8f26692c2a52a6ce8c5edd8f20549de42c8dedf965cf3b74d530 +DIST BestCrypt-2.0.11.tar.gz 2191182 BLAKE2B 5fe6d18b0c89273491fbcdb9bf7c73332342fca77cdf457c83f106f5cca693532eea6668e04f7c93828b3d5dc4419872066eda22fb10c780a838ddd78cf79255 SHA512 f6848153fc68690c116796bd5feb80dc1776f344327de5ac485dddc5b60280b491e2e5c9f266d6f30b7095396cd06b5bdad5d322b4ac24ab612ec642dbc08fe2 +EBUILD bestcrypt-2.0.11.ebuild 1791 BLAKE2B eebcc1898f07df120ae5ae0fcbef08971ba7abd93e9ca79520717cecbaaba1f4c7dd20515706e28ec23e762eb34caddd7ee56f11a5be2986bc2b1bcd2adf8749 SHA512 c15210495dccb9d40117d74b80a6e1d991f88916c7293207fcf1c16879b9379a6d486feeee8f6663d0be40026834521070a90d9c8433394a89d4a4cc20f25b98 +MISC metadata.xml 236 BLAKE2B a7bb92e6d53f7252ee56a885bf098930e228a76a75bca119358ca860901ceeecccc43efe5279c54250ebda58f77ae9c97d2ae540d8b399283cb3aa348111fcd2 SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08 diff --git a/app-crypt/bestcrypt/bestcrypt-2.0.11.ebuild b/app-crypt/bestcrypt/bestcrypt-2.0.11.ebuild new file mode 100644 index 000000000000..4ab00f225f3f --- /dev/null +++ b/app-crypt/bestcrypt/bestcrypt-2.0.11.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +inherit 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}" + +DOCS=( + HIDDEN_PART README +) + +PATCHES=( + "${FILESDIR}/${PN}-2.0.6-build.patch" +) + +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_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" +} + +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/bcrypt3 b/app-crypt/bestcrypt/files/bcrypt3 new file mode 100644 index 000000000000..b1b6979e63e0 --- /dev/null +++ b/app-crypt/bestcrypt/files/bcrypt3 @@ -0,0 +1,104 @@ +#!/sbin/openrc-run +# +# bestcrypt Encrypted File Systems. +# +# Version: 1.2 +# +# Revision: $Id$ +# +# Author: Jetico Inc. (support@jetico.com) +# +# Modified by Stefan Tittel (with thanks to steveb) to work around +# the "xargs: environment too large for exec"-error occuring in +# the gentoo 1.4 linux distribution. + +# chkconfig: 2345 85 98 +# description: BestCrypt init script + + +# Source function library. +#. /etc/rc.d/init.d/functions + +# See how we were called. + +KERNEL_VERSION=`uname -r|sed 's/\(.\..\).*/\1/'` + +start() { + ebegin "Initializing BestCrypt" + declare -i status=0 + rm -rf /dev/bcrypt?* 2>/dev/null + if [ $KERNEL_VERSION = "2.2" ]; then + mknod -m 666 /dev/bcrypt0 b 7 128 + mknod -m 666 /dev/bcrypt1 b 7 129 + mknod -m 666 /dev/bcrypt2 b 7 130 + mknod -m 666 /dev/bcrypt3 b 7 131 + mknod -m 666 /dev/bcrypt4 b 7 132 + mknod -m 666 /dev/bcrypt5 b 7 133 + mknod -m 666 /dev/bcrypt6 b 7 134 + mknod -m 666 /dev/bcrypt7 b 7 135 + mknod -m 666 /dev/bcrypt8 b 7 136 + mknod -m 666 /dev/bcrypt9 b 7 137 + mknod -m 666 /dev/bcrypt10 b 7 138 + mknod -m 666 /dev/bcrypt11 b 7 139 + mknod -m 666 /dev/bcrypt12 b 7 140 + mknod -m 666 /dev/bcrypt13 b 7 141 + mknod -m 666 /dev/bcrypt14 b 7 142 + mknod -m 666 /dev/bcrypt15 b 7 143 + else + if [ ! -c /dev/.devfsd ] && [ ! -e /dev/.udev ]; + then + mknod -m 666 /dev/bcrypt0 b 188 0 + mknod -m 666 /dev/bcrypt1 b 188 1 + mknod -m 666 /dev/bcrypt2 b 188 2 + mknod -m 666 /dev/bcrypt3 b 188 3 + mknod -m 666 /dev/bcrypt4 b 188 4 + mknod -m 666 /dev/bcrypt5 b 188 5 + mknod -m 666 /dev/bcrypt6 b 188 6 + mknod -m 666 /dev/bcrypt7 b 188 7 + mknod -m 666 /dev/bcrypt8 b 188 8 + mknod -m 666 /dev/bcrypt9 b 188 9 + mknod -m 666 /dev/bcrypt10 b 188 10 + mknod -m 666 /dev/bcrypt11 b 188 11 + mknod -m 666 /dev/bcrypt12 b 188 12 + mknod -m 666 /dev/bcrypt13 b 188 13 + mknod -m 666 /dev/bcrypt14 b 188 14 + mknod -m 666 /dev/bcrypt15 b 188 15 + fi + fi + modprobe bc || status=1 + modprobe bc_blowfish || status=1 + modprobe bc_des || status=1 + modprobe bc_gost || status=1 + modprobe bc_twofish || status=1 + modprobe bc_bf448 || status=1 + modprobe bc_bf128 || status=1 + modprobe bc_3des || status=1 + modprobe bc_idea || status=1 + modprobe bc_rijn || status=1 + modprobe bc_cast || status=1 + modprobe bc_rc6 || status=1 + modprobe bc_serpent || status=1 + eend ${status} +} + +stop() { + ebegin "Unmounting encrypted filesystems" + +# The original line causing the "xargs: environment too large for exec error". + # grep BestCrypt /etc/mtab |awk '{print $2}'|xargs -r -n 1 bctool umount + +# The line for which it work's fine now. + for i in $(grep BestCrypt /etc/mtab | awk '{print $2}') ; do bctool umount ${i} ; done + + eend $? + ebegin "Shutting down BestCrypt modules" + for i in `lsmod |egrep "^bc_.*" |awk '{print $1}' `; do + rmmod $i + done + if [ ! -c /dev/.devfsd ] && [ ! -e /dev/.udev ]; + then + rm -f /dev/bcrypt?* 2>/dev/null + fi + rmmod bc + eend $? +} diff --git a/app-crypt/bestcrypt/files/bestcrypt-2.0.6-build.patch b/app-crypt/bestcrypt/files/bestcrypt-2.0.6-build.patch new file mode 100644 index 000000000000..966053072d32 --- /dev/null +++ b/app-crypt/bestcrypt/files/bestcrypt-2.0.6-build.patch @@ -0,0 +1,341 @@ +From 4bce59bd9bc5a201caf5f2ff3e2080e7e5a01733 Mon Sep 17 00:00:00 2001 +From: Alon Bar-Lev +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 +--- + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 3cd36fd..a3fd59e 100644 +--- a/Makefile ++++ b/Makefile +@@ -98,5 +98,5 @@ TESTS_TARGET = $(TARGET_DIR)/tests/bctool-tests + + # default target builds console tool with modules +-all: Makefile helpers module console ++all: Makefile helpers console + true + +@@ -226,5 +226,5 @@ module-clean: force-look + + # install for default target +-install: module-install console-install helpers-install ++install: console-install helpers-install + true + +-- +1.8.5.5 + +From f7f71ec155385aea3dec495d46d07452943fe729 Mon Sep 17 00:00:00 2001 +From: Alon Bar-Lev +Date: Tue, 17 Mar 2015 21:05:22 +0200 +Subject: [PATCH] build: allow override programs + +Signed-off-by: Alon Bar-Lev +--- + Makefile | 11 +++++++---- + certificate/CertificateLib/Makefile | 4 +++- + disk/Makefile | 6 ++++-- + fslib/Makefile | 16 +++++++++------- + kernel/Makefile | 5 +++-- + keygens/kgghost/Makefile | 7 +++++-- + keygens/kgsha/Makefile | 7 +++++-- + mount/Makefile | 9 +++++---- + spacemap/Makefile | 6 ++++-- + tests/Makefile | 12 ++++++------ + 10 files changed, 51 insertions(+), 32 deletions(-) + +diff --git a/Makefile b/Makefile +index 6af2319..359d022 100644 +--- a/Makefile ++++ b/Makefile +@@ -56,6 +56,9 @@ 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 + ++CC = gcc ++CXX = g++ ++ + BC_EXTRA_CFLAGS= $(CFLAGS) -D_LARGE_FILES -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 + BC_EXTRA_LDFLAGS = $(LDFLAGS) + +@@ -125,7 +128,7 @@ helpers: create-dirs + console: spacemap-lib certificate-lib fs-lib kernel-lib keygen-libs $(TARGET) + true + $(TARGET): $(BCTOOL_OBJS) +- g++ $(BCTOOL_OBJS) $(BCTOOL_CFLAGS) $(BCTOOL_LDFLAGS) -o $(TARGET) ++ $(CXX) $(BCTOOL_OBJS) $(BCTOOL_CFLAGS) $(BCTOOL_LDFLAGS) -o $(TARGET) + + # GUI executable only (w/o console and helpers) + panel: certificate-lib kernel-lib keygen-libs fs-lib +@@ -339,10 +342,10 @@ module-uninstall: + bash ./scripts/remove_mods + + %.o:%.cpp +- g++ -c $(BCTOOL_CFLAGS) $< -o $@ ++ $(CXX) -c $(BCTOOL_CFLAGS) $< -o $@ + + %.o:%.cc +- g++ -c $(BCTOOL_CFLAGS) $< -o $@ ++ $(CXX) -c $(BCTOOL_CFLAGS) $< -o $@ + + %.o:%.c +- gcc -c $(BCTOOL_CFLAGS) $< -o $@ ++ $(CC) -c $(BCTOOL_CFLAGS) $< -o $@ +diff --git a/certificate/CertificateLib/Makefile b/certificate/CertificateLib/Makefile +index d28ccc7..810a30a 100644 +--- a/certificate/CertificateLib/Makefile ++++ b/certificate/CertificateLib/Makefile +@@ -1,5 +1,7 @@ + +-CP = cp ++CC = gcc ++CXX = g++ ++AR = ar + CFLAGS += -Wall -fno-strict-aliasing -O3 + #-Werror + +diff --git a/disk/Makefile b/disk/Makefile +index e3915b0..1a9ff01 100644 +--- a/disk/Makefile ++++ b/disk/Makefile +@@ -1,14 +1,16 @@ + DISKMON_OBJS = disk.o diskmon.o ++ ++CXX = g++ + CFLAGS += -Wall -I. -I../ -p -gdwarf-2 #-DBC_DEBUG + LDFLAGS += -ludev + + all:diskmon Makefile + + diskmon:$(DISKMON_OBJS) +- g++ $(DISKMON_OBJS) $(LDFLAGS) -o diskmon ++ $(CXX) $(DISKMON_OBJS) $(LDFLAGS) -o diskmon + + %.o:%.cc +- g++ $(CFLAGS) -c $< -o $@ ++ $(CXX) $(CFLAGS) -c $< -o $@ + + clean: + rm -rf diskmon *.o +diff --git a/fslib/Makefile b/fslib/Makefile +index a6f96f4..bbe6cae 100644 +--- a/fslib/Makefile ++++ b/fslib/Makefile +@@ -1,3 +1,5 @@ ++CC = gcc ++AR = ar + + FSLIB_CFLAGS = $(CFLAGS) -Wall -O0 -DFSLIB_DEBUG -g # -O3 + FSLIB_CFLAGS += -I. -D_LARGE_FILES -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 #-fvisibility=hidden +@@ -15,25 +17,25 @@ FSLIB_TOOLS = file_hfs test_hfs test_info test_free_space diskinfo + all: Makefile $(FSLIB) $(FSLIB_TOOLS) + + $(FSLIB): $(OBJS) +- ar rcs $(FSLIB) $(OBJS) ++ $(AR) rcs $(FSLIB) $(OBJS) + + test_hfs: $(FSLIB) test/test_hfs.o +- gcc test/test_hfs.o $(OBJS) $(FSLIB_LDFLAGS) -o test_hfs ++ $(CC) test/test_hfs.o $(OBJS) $(FSLIB_LDFLAGS) -o test_hfs + + file_hfs: $(FSLIB) test/file_hfs.o +- gcc test/file_hfs.o $(OBJS) $(FSLIB_LDFLAGS) -o file_hfs ++ $(CC) test/file_hfs.o $(OBJS) $(FSLIB_LDFLAGS) -o file_hfs + + test_info: $(FSLIB) test/test_info.o +- gcc test/test_info.o $(OBJS) $(FSLIB_LDFLAGS) -o test_info ++ $(CC) test/test_info.o $(OBJS) $(FSLIB_LDFLAGS) -o test_info + + test_free_space: $(FSLIB) test/test_free_space.o +- gcc test/test_free_space.o $(FSLIB_CFLAGS) $(OBJS) $(FSLIB_LDFLAGS) -o test_free_space ++ $(CC) test/test_free_space.o $(FSLIB_CFLAGS) $(OBJS) $(FSLIB_LDFLAGS) -o test_free_space + + diskinfo: $(FSLIB) test/diskinfo.o +- gcc test/diskinfo.o $(OBJS) $(FSLIB_LDFLAGS) -g -o diskinfo ++ $(CC) test/diskinfo.o $(OBJS) $(FSLIB_LDFLAGS) -g -o diskinfo + + .c.o: +- gcc $(FSLIB_CFLAGS) -c $< -o $@ ++ $(CC) $(FSLIB_CFLAGS) -c $< -o $@ + + clean: + rm -rf *~ *.o test/*.o $(OBJS) $(FSLIB) $(FSLIB_TOOLS) +diff --git a/kernel/Makefile b/kernel/Makefile +index 1a71617..4f9760d 100644 +--- a/kernel/Makefile ++++ b/kernel/Makefile +@@ -3,6 +3,7 @@ OBJECTS = $(SOURCES:.cc=.o) + TARGET_DIR = ./build/ + TARGET = $(TARGET_DIR)/libbckernel.a + BC_CFLAGS = $(BC_EXTRA_CFLAGS) -fPIC -c -Wall -ludev -L../build/ -lspacemap -I../ -fvisibility=hidden #-fvisibility-inlines-hidden ++CXX = g++ + + + ### Build ### +@@ -21,12 +22,12 @@ module: create-dirs force_look + + kernel-lib: create-dirs $(TARGET) + $(TARGET): $(OBJECTS) +- ar rcs $(TARGET) $(OBJECTS) ++ $(AR) rcs $(TARGET) $(OBJECTS) + + $(OBJECTS): Makefile $(SOURCES) BCKernel.h + set -e; \ + for i in $(SOURCES); do \ +- g++ -c $(BC_CFLAGS) $$i -o $${i%.cc}.o; \ ++ $(CXX) -c $(BC_CFLAGS) $$i -o $${i%.cc}.o; \ + done + + create-dirs: $(TARGET_DIR) +diff --git a/keygens/kgghost/Makefile b/keygens/kgghost/Makefile +index 8f6cc59..fe59ac7 100644 +--- a/keygens/kgghost/Makefile ++++ b/keygens/kgghost/Makefile +@@ -5,10 +5,13 @@ KGGHOST_OBJS = hash.o pbe.o keyblock.o datablock.o kgghost.o + KGGHOST_CFLAGS = -Wall -p -ggdb -I. -I../../ -I../../certificate -DBC_LINUX + KGGHOST_CFLAGS += $(BC_EXTRA_CFLAGS) + ++CXX = g++ ++AR = ar ++ + all: $(KGGHOST) Makefile + + $(KGGHOST):$(KGGHOST_OBJS) $(CERTIFICATE_LIB) +- ar rcs $(KGGHOST) $(KGGHOST_OBJS) ++ $(AR) rcs $(KGGHOST) $(KGGHOST_OBJS) + + $(CERTIFICATE_LIB): + make -C ../../certificate/CertificateLib +@@ -17,7 +20,7 @@ $(KERNEL_LIB): + make -C ../../kernel/build + + %.o:%.cpp +- g++ $(KGGHOST_CFLAGS) -c -o $@ $< ++ $(CXX) $(KGGHOST_CFLAGS) -c -o $@ $< + + clean: + rm -f *.o *.ver *~ $(KGGHOST) +diff --git a/keygens/kgsha/Makefile b/keygens/kgsha/Makefile +index f1a89f9..57f55ca 100644 +--- a/keygens/kgsha/Makefile ++++ b/keygens/kgsha/Makefile +@@ -10,10 +10,13 @@ KGSHA_OBJS = hash.o datablock.o kgsha.o + KGSHA_CFLAGS = -Wall -p -gdwarf-2 -I. -I../../ -I../../certificate -DBC_LINUX + KGSHA_CFLAGS += $(EXTRA_CFLAGS) + ++CXX = g++ ++AR = ar ++ + all: $(KGSHA) $(KGSHA_OBJS) Makefile hidden_sector.h defs.h datablock.h + + $(KGSHA): $(KGSHA_OBJS) $(CERTIFICATE_LIB) $(KERN_LIB) +- ar rcs $(KGSHA) $(KGSHA_OBJS) ++ $(AR) rcs $(KGSHA) $(KGSHA_OBJS) + + $(CERT_LIB): + make -C ../../certificate/CertificateLib +@@ -22,7 +25,7 @@ $(KERN_LIB): + make -C ../../kernel/ + + %.o:%.cpp +- g++ $(KGSHA_CFLAGS) -c -o $@ $< ++ $(CXX) $(KGSHA_CFLAGS) -c -o $@ $< + + clean: + rm -f *.o *.ver *~ $(KGSHA) +diff --git a/mount/Makefile b/mount/Makefile +index 7a3d66b..0e60095 100644 +--- a/mount/Makefile ++++ b/mount/Makefile +@@ -1,22 +1,23 @@ + + HELPERS = bcrrpart_helper bcmount_helper bcumount_helper + ++CC = gcc + OBJS = common.o + CFLAGS += -Wall -O3 + + all: $(HELPERS) Makefile + + bcrrpart_helper: $(OBJS) rrpart.o +- gcc $(OBJS) rrpart.o $(LDFLAGS) -o bcrrpart_helper ++ $(CC) $(OBJS) rrpart.o $(LDFLAGS) -o bcrrpart_helper + + bcmount_helper: $(OBJS) mount.o +- gcc $(OBJS) mount.o $(LDFLAGS) -o bcmount_helper ++ $(CC) $(OBJS) mount.o $(LDFLAGS) -o bcmount_helper + + bcumount_helper: $(OBJS) umount.o +- gcc $(OBJS) umount.o $(LDFLAGS) -o bcumount_helper ++ $(CC) $(OBJS) umount.o $(LDFLAGS) -o bcumount_helper + + %.o:%.c +- gcc $(CFLAGS) -c -o $@ $< ++ $(CC) $(CFLAGS) -c -o $@ $< + + clean: + rm -f *.o *.ver *~ $(HELPERS) +diff --git a/spacemap/Makefile b/spacemap/Makefile +index 6dff240..7dd2ad9 100644 +--- a/spacemap/Makefile ++++ b/spacemap/Makefile +@@ -5,17 +5,19 @@ LIB_NAME = spacemap + STATIC_TARGET = lib$(LIB_NAME).a + OBJECT_CFLAGS = -fPIC -g -c -Wall -ludev -fvisibility=hidden #-fvisibility-inlines-hidden + ++CXX = g++ ++AR = ar + + all: static + true + + static: $(OBJECTS) +- ar rcs $(STATIC_TARGET) $(OBJECTS) ++ $(AR) rcs $(STATIC_TARGET) $(OBJECTS) + + $(OBJECTS): $(SOURCES) + set -e; \ + for i in $(SOURCES); do \ +- g++ $(OBJECT_CFLAGS) $$i -o $${i%.c}.o; \ ++ $(CXX) $(OBJECT_CFLAGS) $$i -o $${i%.c}.o; \ + done + + clean: +diff --git a/tests/Makefile b/tests/Makefile +index c6d78f0..419020b 100644 +--- a/tests/Makefile ++++ b/tests/Makefile +@@ -2,8 +2,8 @@ TESTS_PWD = ../build/tests/ + TESTS_TARGET = $(TESTS_PWD)/bctool-tests + TESTS_SOURCES = tests-main.c ../container/cipher.cc ../keygens/kgsha/datablock.cpp ../keygens/kgsha/hash.cpp ../container/linux/file.cpp + TESTS_CFLAGS = -I../ -I../certificate/ -L../build/ -L../build/kernel/ -DBC_LINUX -ludev -g +-CP = gcc +-CPP = g++ ++CC = gcc ++CXX = g++ + CERT_LIB_NAME = certificate + KERN_LIB_NAME = bckernel + SPACEMAP_LIB_NAME = spacemap +@@ -15,11 +15,11 @@ all: $(TESTS_TARGET) + cp insert-modules.sh remove-modules.sh bcmod-loaded.sh $(TESTS_PWD) + + $(TESTS_TARGET): $(TESTS_SOURCES) Makefile +- $(CPP) -o $(TESTS_TARGET) $(TESTS_CFLAGS) $(TESTS_SOURCES) -l$(CERT_LIB_NAME) -l$(KERN_LIB_NAME) -l$(SPACEMAP_LIB_NAME) -lcunit -ludev ++ $(CXX) -o $(TESTS_TARGET) $(TESTS_CFLAGS) $(TESTS_SOURCES) -l$(CERT_LIB_NAME) -l$(KERN_LIB_NAME) -l$(SPACEMAP_LIB_NAME) -lcunit -ludev + cp kernel/print-struct-size.c $(TESTS_PWD) +- $(CP) -o $(TESTS_PWD)test-data-generator kernel/test-data-generator.c $(TESTS_CFLAGS) -l$(KERN_LIB_NAME) -l$(SPACEMAP_LIB_NAME) +- $(CPP) -o $(TESTS_PWD)kgsha-key-generator kgsha/kgsha-data-generator.cpp ../keygens/kgsha/datablock.cpp ../keygens/kgsha/hash.cpp ../container/cipher.cc $(TESTS_CFLAGS) -l$(KERN_LIB_NAME) -l$(CERT_LIB_NAME) -l$(SPACEMAP_LIB_NAME) +- $(CP) -o $(TESTS_PWD)/bcdevchecker bcdevchecker.c ++ $(CC) -o $(TESTS_PWD)test-data-generator kernel/test-data-generator.c $(TESTS_CFLAGS) -l$(KERN_LIB_NAME) -l$(SPACEMAP_LIB_NAME) ++ $(CXX) -o $(TESTS_PWD)kgsha-key-generator kgsha/kgsha-data-generator.cpp ../keygens/kgsha/datablock.cpp ../keygens/kgsha/hash.cpp ../container/cipher.cc $(TESTS_CFLAGS) -l$(KERN_LIB_NAME) -l$(CERT_LIB_NAME) -l$(SPACEMAP_LIB_NAME) ++ $(CC) -o $(TESTS_PWD)/bcdevchecker bcdevchecker.c + + clean: + rm -rf $(TESTS_PWD) +-- +2.0.5 + diff --git a/app-crypt/bestcrypt/metadata.xml b/app-crypt/bestcrypt/metadata.xml new file mode 100644 index 000000000000..f1c3d59fb213 --- /dev/null +++ b/app-crypt/bestcrypt/metadata.xml @@ -0,0 +1,8 @@ + + + + + crypto@gentoo.org + Crypto + + -- cgit v1.2.3