From 2018227e9344edb9da15fc6a4a8298086cc2aa77 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 2 Jun 2019 21:45:28 +0100 Subject: gentoo resync : 02.06.2019 --- app-crypt/bestcrypt/Manifest | 5 - app-crypt/bestcrypt/bestcrypt-2.0.14.ebuild | 80 ---- app-crypt/bestcrypt/files/bcrypt3 | 104 ---- .../bestcrypt/files/bestcrypt-2.0.14-build.patch | 522 --------------------- app-crypt/bestcrypt/metadata.xml | 8 - 5 files changed, 719 deletions(-) delete mode 100644 app-crypt/bestcrypt/Manifest delete mode 100644 app-crypt/bestcrypt/bestcrypt-2.0.14.ebuild delete mode 100644 app-crypt/bestcrypt/files/bcrypt3 delete mode 100644 app-crypt/bestcrypt/files/bestcrypt-2.0.14-build.patch delete mode 100644 app-crypt/bestcrypt/metadata.xml (limited to 'app-crypt/bestcrypt') diff --git a/app-crypt/bestcrypt/Manifest b/app-crypt/bestcrypt/Manifest deleted file mode 100644 index 7b3746ebf57e..000000000000 --- a/app-crypt/bestcrypt/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -AUX bcrypt3 3197 BLAKE2B 5e9d721a5b4213fcc0e5eb4325c009685dee5bd8dd61f8b47ee1ca29e52faa12b3c6f3c9ab1bc283d7944f4f4178dc831a95348971bde439a7ae77f213df20dc SHA512 370c28c7289d86a0fbf639c85cb755fef10780f86daa4c5ce6071f32d7e36dea8e21f496e09e145c8c091042a70f3666df068611258a16a05d217d5ed355290b -AUX bestcrypt-2.0.14-build.patch 16326 BLAKE2B 233e2f896feb159807de1be4e07fad6e97889198709010c5256b93044f1a13559b0a64e59d712c3ddd632f90ea34cf6631c257eac48409c7e0323e5e14a7ad63 SHA512 3ff5d6b69844562f16c1024bb7b409fdcd6f9889e6ea5b58a4ba5f43d04174fa5c60bd73f20eddf2687fea18a01ce06672880602b4b2604e6f014344a3da2911 -DIST BestCrypt-2.0.14.tar.gz 2211286 BLAKE2B 1ff777a72528ec22ca168492c335ec54be924b653323670619049cc9dfbcd144c28702bf857517c5189c937f3712e749c47ef14006a8883c63419b866b8f48f9 SHA512 1e542f00886413f1519ca5667bb297cce25a46fb5ec90a7e1a61934df3cd34e0d680f32e0b111727865459ef7d89d2761b379b4a557ada6d7ee3e47e32bf762c -EBUILD bestcrypt-2.0.14.ebuild 1903 BLAKE2B cdff8c1095edfa9c228efa1ca54a8207c40b506b88b69ddc7493190d68b102c5fef02298834f3ec4dce95a1d1d480827457afb78397b43d76fdb044f9e60e9a2 SHA512 2bb8fbe1f726b8e369f72fce8f82f88e598bf2ad975d3f89c4e2aac5fdb1edc5506ad8765c3f7fa608efd53b7d08c307d20d3f1d0730440fb6717a1622cce9f3 -MISC metadata.xml 236 BLAKE2B a7bb92e6d53f7252ee56a885bf098930e228a76a75bca119358ca860901ceeecccc43efe5279c54250ebda58f77ae9c97d2ae540d8b399283cb3aa348111fcd2 SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08 diff --git a/app-crypt/bestcrypt/bestcrypt-2.0.14.ebuild b/app-crypt/bestcrypt/bestcrypt-2.0.14.ebuild deleted file mode 100644 index afaa12d6d91d..000000000000 --- a/app-crypt/bestcrypt/bestcrypt-2.0.14.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit linux-mod toolchain-funcs - -MY_PN="BestCrypt" -DESCRIPTION="commercially licensed transparent filesystem encryption" -HOMEPAGE="https://www.jetico.com/" -SRC_URI="https://www.jetico.com/linux/${MY_PN}-${PV}.tar.gz" - -LICENSE="bestcrypt" -SLOT="0" -KEYWORDS="~amd64 ~x86" -RESTRICT="mirror bindist" - -DEPEND="virtual/linux-sources - app-shells/bash" - -S="${WORKDIR}/${MY_PN}-${PV}" - -DOCS=( - HIDDEN_PART README -) - -PATCHES=( - "${FILESDIR}/${P}-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() { - linux-mod_pkg_postinst - - ewarn - ewarn "The BestCrypt drivers are not free - Please purchace a license from " - ewarn "http://www.jetico.com/" - ewarn - ewarn "Upstream do not support this package any more, it was patched to" - ewarn "make it built. Use at your own risk!" - ewarn -} diff --git a/app-crypt/bestcrypt/files/bcrypt3 b/app-crypt/bestcrypt/files/bcrypt3 deleted file mode 100644 index b1b6979e63e0..000000000000 --- a/app-crypt/bestcrypt/files/bcrypt3 +++ /dev/null @@ -1,104 +0,0 @@ -#!/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.14-build.patch b/app-crypt/bestcrypt/files/bestcrypt-2.0.14-build.patch deleted file mode 100644 index c4ce215e975a..000000000000 --- a/app-crypt/bestcrypt/files/bestcrypt-2.0.14-build.patch +++ /dev/null @@ -1,522 +0,0 @@ -From 71bd6e496af5990836c34e4dd2d9d0107467349a Mon Sep 17 00:00:00 2001 -From: Alon Bar-Lev -Date: Tue, 11 Sep 2018 18:49:17 +0300 -Subject: [PATCH 1/6] 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 ec0fd7e..d52f509 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 -@@ -233,7 +233,7 @@ module-clean: - # - - # install for default target --install: module-install console-install helpers-install -+install: console-install helpers-install - - # used by RPM creation script - build-install: module-put-files console-install helpers-install --- -2.16.4 - -From 42816e0a4e47e77f290b46460e35a1666748f8b0 Mon Sep 17 00:00:00 2001 -From: Alon Bar-Lev -Date: Tue, 11 Sep 2018 19:35:26 +0300 -Subject: [PATCH 2/6] build: remove useless log - -Signed-off-by: Alon Bar-Lev ---- - certificate/CertificateLib/symmetricAlgs/cAlgRIJN.cpp | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/certificate/CertificateLib/symmetricAlgs/cAlgRIJN.cpp b/certificate/CertificateLib/symmetricAlgs/cAlgRIJN.cpp -index 3c6fad8..9821073 100644 ---- a/certificate/CertificateLib/symmetricAlgs/cAlgRIJN.cpp -+++ b/certificate/CertificateLib/symmetricAlgs/cAlgRIJN.cpp -@@ -78,14 +78,12 @@ cSymAlg * cAlgRIJN::createAlg( BYTE *key, int keySize ) // keySize in bytes - return alg; - } - --#include "../../../../fs-lib/log.h" - int cAlgRIJN::encryptECB( - const BYTE *inBf, // Input plaintext buffer. - BYTE *outBf, // Output encrypted buffer - int bfSize // In/out buffers' size. - ) - { -- LIBLOG_INFO(""); - int i; - - if ((bfSize % BC_BLOCK_SIZE) != 0) return sae_invalidBlockSize; --- -2.16.4 - -From a0ffdc5a135b549b62e1421fcf75d627e0394529 Mon Sep 17 00:00:00 2001 -From: Alon Bar-Lev -Date: Tue, 11 Sep 2018 19:41:17 +0300 -Subject: [PATCH 3/6] build: do not strip binaries - ---- - Makefile | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/Makefile b/Makefile -index d52f509..a93b850 100644 ---- a/Makefile -+++ b/Makefile -@@ -243,9 +243,9 @@ uninstall: before-uninstall module-uninstall console-uninstall helpers-uninstall - - 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 -+ install -o root -m 4755 $(TARGET_DIR)/bcmount_helper $(PREFIX)/sbin -+ install -o root -m 4755 $(TARGET_DIR)/bcumount_helper $(PREFIX)/sbin -+ install -o root -m 4755 $(TARGET_DIR)/bcrrpart_helper $(PREFIX)/sbin - - helpers-uninstall: - rm -f $(PREFIX)/sbin/bcmount_helper -@@ -267,7 +267,7 @@ before-uninstall: - .PHONY: console-install - console-install: - install -o root -m 0755 -d $(PREFIX)/usr/bin -- install -o root -m 0755 -s build/bctool $(PREFIX)/usr/bin/ -+ install -o root -m 0755 build/bctool $(PREFIX)/usr/bin/ - install -o root -m 0755 -d $(PREFIX)/$(MAN_PATH)/man8 - install -m 644 bctool.8 $(PREFIX)/$(MAN_PATH)/man8/ - --- -2.16.4 - -From 7947ac3e152da1ed590364b7c8948deb602a5b50 Mon Sep 17 00:00:00 2001 -From: Alon Bar-Lev -Date: Tue, 11 Sep 2018 18:52:32 +0300 -Subject: [PATCH 4/6] 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 a93b850..d57ee79 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 06353bc..19b772c 100644 ---- a/certificate/CertificateLib/Makefile -+++ b/certificate/CertificateLib/Makefile -@@ -1,5 +1,7 @@ - --CP = cp -+CC = gcc -+CXX = g++ -+AR = ar - CFLAGS += -Wall -fPIC -fno-strict-aliasing - CXXFLAGS = -Wall -fPIC - #-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 9b99e89..0075a9f 100644 ---- a/fslib/Makefile -+++ b/fslib/Makefile -@@ -1,3 +1,5 @@ -+CC = gcc -+AR = ar - - FSLIB_CFLAGS = $(CFLAGS) -Wall -fPIC -O0 -DFSLIB_DEBUG -g # -O3 - FSLIB_CFLAGS += -I. -D_LARGE_FILES -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 #-fvisibility=hidden -@@ -17,25 +19,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 65c4bf6..a7b0af8 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 -fPIC -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 d3a33d0..9c8c688 100644 ---- a/keygens/kgsha/Makefile -+++ b/keygens/kgsha/Makefile -@@ -10,10 +10,13 @@ KGSHA_OBJS = hash.o datablock.o kgsha.o - KGSHA_CFLAGS = -Wall -fPIC -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.16.4 - -From a7e9a6048e443b0a592c56b1b48e66d20092cf76 Mon Sep 17 00:00:00 2001 -From: Alon Bar-Lev -Date: Tue, 11 Sep 2018 19:34:59 +0300 -Subject: [PATCH 5/6] build: add missing sys/sysmacros.h - -Signed-off-by: Alon Bar-Lev ---- - mount/common.c | 1 + - mount/mount.c | 1 + - mount/rrpart.c | 1 + - 3 files changed, 3 insertions(+) - -diff --git a/mount/common.c b/mount/common.c -index 0a14ea4..d88394e 100644 ---- a/mount/common.c -+++ b/mount/common.c -@@ -9,6 +9,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff --git a/mount/mount.c b/mount/mount.c -index c57594f..7c802fe 100644 ---- a/mount/mount.c -+++ b/mount/mount.c -@@ -10,6 +10,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff --git a/mount/rrpart.c b/mount/rrpart.c -index f7ce125..7ba5692 100644 ---- a/mount/rrpart.c -+++ b/mount/rrpart.c -@@ -13,6 +13,7 @@ - #include - #include - #include -+#include - #include - #include - --- -2.16.4 - -From 9cb62cc4cbe9cb929aa1fca34d3d807a4e83bcca Mon Sep 17 00:00:00 2001 -From: Alon Bar-Lev -Date: Tue, 11 Sep 2018 19:12:13 +0300 -Subject: [PATCH 6/6] modules: build for kernel-4.14 - -Signed-off-by: Alon Bar-Lev ---- - kernel/kmod/bc_dev.c | 4 +++- - kernel/kmod/bc_mem.c | 1 + - spacemap/defs.h | 1 + - 3 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/kernel/kmod/bc_dev.c b/kernel/kmod/bc_dev.c -index cddbf49..8b5657b 100644 ---- a/kernel/kmod/bc_dev.c -+++ b/kernel/kmod/bc_dev.c -@@ -86,9 +86,11 @@ static void reject_bio(struct bio *bio) - { - #if (LINUX_VERSION_CODE < KERNEL_VERSION(4,3,0)) - bio_endio(bio, -EIO); --#else -+#elif (LINUX_VERSION_CODE < KERNEL_VERSION(4,14,0)) - bio->bi_error = -EIO; - bio_endio(bio); -+#else -+ bio_io_error(bio); - #endif - } - -diff --git a/kernel/kmod/bc_mem.c b/kernel/kmod/bc_mem.c -index 0b516c8..69ec832 100644 ---- a/kernel/kmod/bc_mem.c -+++ b/kernel/kmod/bc_mem.c -@@ -6,6 +6,7 @@ - #include - #include - #include -+#include - #include - - #define BC_GET_CALLER_PTR __builtin_return_address(0) -diff --git a/spacemap/defs.h b/spacemap/defs.h -index f0c87ba..7de9052 100644 ---- a/spacemap/defs.h -+++ b/spacemap/defs.h -@@ -17,6 +17,7 @@ - #include - #include - #include -+#include - #include - - typedef int8_t bc_8; --- -2.16.4 - diff --git a/app-crypt/bestcrypt/metadata.xml b/app-crypt/bestcrypt/metadata.xml deleted file mode 100644 index f1c3d59fb213..000000000000 --- a/app-crypt/bestcrypt/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - crypto@gentoo.org - Crypto - - -- cgit v1.2.3