From: Alon Bar-Lev Date: Tue, 17 Mar 2015 19:11:00 +0000 (+0000) Subject: Version bump X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=5f5ef7da48cb127de4d7aa0372e1bcb1f6abbfa4;p=gentoo.git Version bump Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0xBF20DC51 --- diff --git a/app-crypt/bestcrypt/ChangeLog b/app-crypt/bestcrypt/ChangeLog index 48f80d0a58cf..64d56e45c548 100644 --- a/app-crypt/bestcrypt/ChangeLog +++ b/app-crypt/bestcrypt/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-crypt/bestcrypt -# 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 $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/ChangeLog,v 1.77 2015/03/17 19:10:50 alonbl Exp $ + +*bestcrypt-2.0.6 (17 Mar 2015) + + 17 Mar 2015; Alon Bar-Lev +bestcrypt-2.0.6.ebuild, + +files/bestcrypt-2.0.6-build.patch: + Version bump *bestcrypt-2.0.4 (06 Jul 2014) diff --git a/app-crypt/bestcrypt/Manifest b/app-crypt/bestcrypt/Manifest index 826c509db37e..7fe1f33b0517 100644 --- a/app-crypt/bestcrypt/Manifest +++ b/app-crypt/bestcrypt/Manifest @@ -4,16 +4,19 @@ Hash: SHA256 AUX bcrypt3 3246 SHA256 83296e7fb84845ee0a177b9bc2d88caddb66440b38c3505fc91061873b2a45b3 SHA512 b342af16a46fd2e5c52f6c1b0351d7ec8dd7687534f21e5f83dd5781df919dd863ee63f8768df5e0774c8e24862574ceb3a22f4c7624710d539d643493f55fb1 WHIRLPOOL 6a68ae39aa3597b5d591b6a24f0359e2f4c7388fca9d692c366beba24f9a4c4e7fe9463ff38f2ef331a34c56baec9c10cd1a19ca3a8fc3386ba6e2304001867b AUX bestcrypt-2.0.0-build.patch 2325 SHA256 47a6f046468fe64549a93480c0c2c62ca8a8fda775b4618986b2fda4064eba81 SHA512 b8942fdd111f247c626feb3e944bfb3a7953a97b9b7265d55df2f9af4d5244a0b8e0bcc35ecb0b54d56456ccb37c4f075d721733dd390069571873d9a3b270be WHIRLPOOL 465820553b784f31db81292fd781e853c91ad4e3826f4eb3001dc60ff20aba2695ed5146f43fc3602c3379746f6171a43444e2da97c920404a4be96ba0804b3c AUX bestcrypt-2.0.4-build.patch 3589 SHA256 9bcca37c45c93dd0394ebc14f38f3bebc290e6cbf7353e953d3c8c209b9fe77f SHA512 720c8396ba8b007884c425f48f660c1cd0f1ff1375f88070608e0fe8ee7a12e48e3b8f31f701cb8238e9d66d9fdff8686fb0498f5b4d68fdb6619ce49ec93db4 WHIRLPOOL a78766b55500cb10543f0c6dc2372fc854c22154e7ff7a8f3329ed9347db7f60e37a2807c7d8a88324a21799cd76e0def4796f88bd7d6983086f8fd0c5ff821d +AUX bestcrypt-2.0.6-build.patch 10878 SHA256 8d9bced77a0be44d627900a23d72043bd99365f2e5f2488c9d5e7259f66653b9 SHA512 34e150087fadfcdba5c05c0a4e1d2bfadbc448fe3214663c86ef3a692ec924da011ba11da3fb8f26692c2a52a6ce8c5edd8f20549de42c8dedf965cf3b74d530 WHIRLPOOL dd4968ec04f10bb0c5ce45d1ccd4f77a8c1b6841e0e4682250c2569c956b8b587bd8977b00902945f67fa8ce1a35594fe0b31b8bb35e6d90f555f56bbaf1f586 DIST BestCrypt-2.0-0.tar.gz 1999791 SHA256 53007d398d137426cb7e24a98d32a8227d5ad20bca623ba9a9ac125f34971df7 SHA512 ccd0b6d91947808cc5396355d3c1e62260b537cd7e4f236017e009a7ecc64c9a7fdf53a937538c9e02c1e303c0b962c9d5debbb37cd8b24ead34aaf33fb6b9e5 WHIRLPOOL 74e04c297664cb3080ec83d1c9791bca61ce72e065462ca0f7f77a69b0c5828814598f9778a6d4c9669f09c431ba365e8d00defa674f4f172fc90677815ff984 DIST BestCrypt-2.0-4.tar.gz 2024711 SHA256 041b3c3766c921583b8e89a9437b7486653b68fc20517a11fca18468ff203335 SHA512 62d2c6204ad0cc0b0b081cfdae082ae0b54ed958a9bb5d81f4ff7c3b0882d64169d179ed8b421f19976eb76ea40b6da97b8ada798a0ea3360847c113f908d019 WHIRLPOOL b4dc6a0c39ce5e8ac41b9cd24a1ddb92718769c81cd2ce1c8ed6cf1fb1408c01b76f425fab9ca25808690fe7cae8df7d5d50a3efc2f4d9bc32374794f2cbf05b +DIST BestCrypt-2.0.6.tar.gz 2060735 SHA256 e0286b7dfc662a480340845648a3afdcf9b2f2e38d9b327bc8adf7efa50fc4e0 SHA512 392fc8067099ae046b54ef695b49c9722a30e0a0c66953da51aa0881a306fe2a9e10e1bc6084b20e904a7830eb998c4f44da5813b9951c74e1cd3893689457d3 WHIRLPOOL d2c4e764f2e2b4b7f15c777ac3b84771e29a7a79cd4d6a8b19f6c3c7cd15c11f5a5ec6969d5194d655e9f90a08d7f2826d7e478ba333b5835bb8068fa89bf8d9 EBUILD bestcrypt-2.0.0.ebuild 1850 SHA256 1778d49c1924360e6ab2a7a0552627e66284acae63c5094802147d73127bec03 SHA512 b7a2a78c2346460fbe66306d8e61870d38b5b5d6717f11ff2f9aea49f9583319696ecd7087b1ab13c7fa4073d0af5117b71ff5e1f9821ecdf7bf02590742e926 WHIRLPOOL eab9793357e6ac520dd67ce1e8aec25125c42d65fd9b294e6b023414a66560299814da0f3b3955c13fcf8ee0c21093348ce1ecbc36b4faf053819e58c024d28d EBUILD bestcrypt-2.0.4.ebuild 1857 SHA256 be0f751ebe4c744cf25a6c2ae9e9612809e86d81ba60878a16ba56668fce9326 SHA512 d65ad4f917bd722ed49c5958ad6400a12d3dfe13df063eff15f9a38eafa26a6aff548da034f4b5f81824a70e0078e25b50ce52f68535e28ab048a30598ed969b WHIRLPOOL 0e979352621190c035bbf8292c1b56b0c6c26b0a0c7e95825e20d0c0607c2f21f55bd90ea680c1339269c55903c3e65ff483cd659810bbe1f083c77e88bd8aa5 -MISC ChangeLog 13688 SHA256 25adc973cb6489a5998979146469ca2416ae6e67b9457fc0b808832e006c4108 SHA512 a681a87960452002d4e149115c3a1bd2884112bbeed99203ccd7cfc889f3df09c6f9b6ef3bd7249ae023c78655711af844aeba16827e6057866f3b65fb65ce9b WHIRLPOOL ad641964069b2c1947bfa9164908d106a1cb3b98b9599e578f5cb08b78e86a599ed2673dd4eee9d2311cb3d400acee27981f02d9ed6b03777ace1115217cec13 +EBUILD bestcrypt-2.0.6.ebuild 1917 SHA256 7c990154d4833dc2abce909d39535bdff8162a1974967fd5cae7acecf83d5389 SHA512 64f03243ff8a2befdbd10d4f9ecd67eeaa8240352dae28e478d0744b50d7afdf17d9cf225c89540224b47a70dbcadecd6dcfe75308802082ee29261a102b7ff8 WHIRLPOOL 2d605759a619a010962ae4d34ca7cd9868cb21798d1a0d80d389cb38204b0f72c8ada6b0c3a5bdfa5390751700e303505b0922eee6fc97fe75a30636892c542f +MISC ChangeLog 13847 SHA256 bbfb6c9c42995a16414f5f73449109358ba146eb0b5cb1a01672964b932dfa4e SHA512 79263905cbe32e97a299cfef7b76690a172c8db8ab3d13f201675d86089470d22b4a2f19ac9f5ef12d3ca66a21997b5178699d29f5f762f58164064adb4ae2fa WHIRLPOOL fa01dc3b0d56d1994dd41a9ffaec5f0da89984d360119382d741eea787b48bd947ab54b2a4b44d1915a2f5687077af053e379eb53d63a61c3813446fa00321c9 MISC metadata.xml 159 SHA256 fabd15e2740a2a68e0bda738d0cd4300b133ff11239802afe7e60aa3862c9c03 SHA512 96a1f7f082adc57e52a1a32666e1206e68f8ff03c728fdb7666ff98c255905977491fc4dfc37bc8bdf5da0eb50cdc408adec357bbd75bd980bc90659cc157194 WHIRLPOOL 82fca1c4b75b090abdb0a4233c8e49fc43535ca6e470f725c1872653ea922b6693e9646bc3ee1fd6f1293ebedad661642cec13b2817fb5315268300f7675a751 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iF4EAREIAAYFAlO5noMACgkQXYk9GL8g3FEi/AEAlL2NrLWIpENkgFUgxQ3T3tsT -sPaV0XF83hLpY0tf8o4BAKeJVnYfud7FdrI2qBnJcc6LkrgvAju+NahCE9UFuqV7 -=Alkr +iF4EAREIAAYFAlUIfD4ACgkQXYk9GL8g3FGhugEAio/y0T5cwdo+L6AK3BHrbrXJ +XC3N4E/geNhPsDjxwoMA/jeIu+LZKrzCzqU629uqUQ/DaNEBoFyzATN8wODo1+w/ +=basv -----END PGP SIGNATURE----- diff --git a/app-crypt/bestcrypt/bestcrypt-2.0.6.ebuild b/app-crypt/bestcrypt/bestcrypt-2.0.6.ebuild new file mode 100644 index 000000000000..0a0e82fa5f46 --- /dev/null +++ b/app-crypt/bestcrypt/bestcrypt-2.0.6.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/bestcrypt-2.0.6.ebuild,v 1.1 2015/03/17 19:10:50 alonbl Exp $ + +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}/${P}-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.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 +