mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-19 19:59:43 +00:00
Code Issues Releases Activity

security/palisade: 1.9.1 -> 1.10.1

Browse Source 
Reported by:	portscout
This commit is contained in:
Yuri Victorovich 2020-06-26 21:36:02 +00:00
parent 79d677c82d
commit 0330edd505
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=540542
6 changed files with 36 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
security/palisade/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= palisade
DISTVERSIONPREFIX= v
DISTVERSION= 1.9.1
DISTVERSION= 1.10.1
CATEGORIES= security math
MAINTAINER= yuri@FreeBSD.org
@ -21,21 +21,24 @@ USES= cmake:noninja compiler:c++11-lang localbase
USE_GITLAB= yes
USE_GITHUB= nodefault
GL_PROJECT= palisade-development # there's also palisade-release
GL_COMMIT= bf357ec17024f64badde23af34955d0dbb63629e
GL_COMMIT= 1ae0b459b2c40a5760b0435c2df293cdffbaa10b
GH_TUPLE= \
JerryRyan:cereal:a384b101:cereal/third-party/cereal \
google:benchmark:daff5fea:benchmark/third-party/google-benchmark \
google:benchmark:d3ad0b9d:benchmark/third-party/google-benchmark \
google:googletest:8b4817e3:google_test/third-party/google-test \
gperftools:gperftools:c1d546d7:gperftools/third-party/gperftools
USE_LDCONFIG= yes
CMAKE_OFF= BUILD_UNITTESTS
CMAKE_OFF= BUILD_UNITTESTS BUILD_EXAMPLES BUILD_BENCHMARKS
CMAKE_OFF+= WITH_NTL # https://gitlab.com/palisade/palisade-development/-/issues/180
CMAKE_ARGS= -DWITH_NTL=Y
LDFLAGS+= ${LOCALBASE}/lib/libntl.so # libntl is optional in palisade but is necessary in FreeBSD because is has an equivalent of quadmath.h that is missing in FreeBSD. -DWITH_NTL should be added by users to the compiler command lines.
CXXFLAGS+= -I${WRKSRC}/third-party/google-test/googletest
BINARY_ALIAS= git=false
OPTIONS_DEFINE= OPENMP
OPTIONS_DEFAULT= OPENMP

10
security/palisade/distinfo
View File

@ -1,11 +1,11 @@
TIMESTAMP = 1585359276
TIMESTAMP = 1593198323
SHA256 (JerryRyan-cereal-a384b101_GH0.tar.gz) = 0fba03b7e2e1a150a112fc90e18bfb9274e3830393af99d0c91f9abef62e9ff3
SIZE (JerryRyan-cereal-a384b101_GH0.tar.gz) = 345431
SHA256 (google-benchmark-daff5fea_GH0.tar.gz) = 3f1d72c29de5548bd067845e822bc4fd47a06dcf2cf5cb56abd45c9d2c8e18fd
SIZE (google-benchmark-daff5fea_GH0.tar.gz) = 152877
SHA256 (google-benchmark-d3ad0b9d_GH0.tar.gz) = eb8bf051e4ded9601d51ea0836732346a9cfb9ade0733ab0ad2795e829f14b22
SIZE (google-benchmark-d3ad0b9d_GH0.tar.gz) = 157820
SHA256 (google-googletest-8b4817e3_GH0.tar.gz) = c632dd39ef6729cd198bb7c3f0b20e2efa36475cf3a082883f4809a2b26e9556
SIZE (google-googletest-8b4817e3_GH0.tar.gz) = 873457
SHA256 (gperftools-gperftools-c1d546d7_GH0.tar.gz) = cc00b738497234a131749dd96a11d47f90df29b6bec426005164597c2ff4e4c5
SIZE (gperftools-gperftools-c1d546d7_GH0.tar.gz) = 925949
SHA256 (palisade-palisade-development-bf357ec17024f64badde23af34955d0dbb63629e_GL0.tar.gz) = e8a174237f82e4aebb9ae54ce4f480853e5ad43a5c943fbf4161ed2a752eeaee
SIZE (palisade-palisade-development-bf357ec17024f64badde23af34955d0dbb63629e_GL0.tar.gz) = 4447541
SHA256 (palisade-palisade-development-1ae0b459b2c40a5760b0435c2df293cdffbaa10b_GL0.tar.gz) = 01837ac97eb84d4787b5ebc456b809065ab893eda6fc15444ba85178c9440d4c
SIZE (palisade-palisade-development-1ae0b459b2c40a5760b0435c2df293cdffbaa10b_GL0.tar.gz) = 4541724

70
security/palisade/files/patch-CMakeLists.txt
View File

@ -1,70 +0,0 @@
--- CMakeLists.txt.orig 2020-03-04 03:43:51 UTC
+++ CMakeLists.txt
@@ -202,7 +202,7 @@ set(CXXCOMPILEFLAGS "-Wall -Werror -O3 -DPALISADE_VERS
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CCOMPILEFLAGS}")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXXCOMPILEFLAGS}")
-find_package (Git REQUIRED)
+find_package (Git)
find_package (Doxygen QUIET COMPONENTS dot)
if (DOXYGEN_FOUND)
@@ -279,7 +279,7 @@ else()
set_target_properties(gmp PROPERTIES IMPORTED_LOCATION ${GMPLIBFILE})
endif()
-if("${WITH_NTL}" STREQUAL "Y")
+if(FALSE AND "${WITH_NTL}" STREQUAL "Y")
install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/third-party/lib/ DESTINATION lib
FILES_MATCHING PATTERN "libgmp.*" )
# also copies the gmp dll file
@@ -356,7 +356,7 @@ else()
set_target_properties(ntl PROPERTIES IMPORTED_LOCATION ${NTLLIBFILE})
endif()
-if("${WITH_NTL}" STREQUAL "Y")
+if(FALSE AND "${WITH_NTL}" STREQUAL "Y")
install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/third-party/lib/ DESTINATION lib
FILES_MATCHING PATTERN "libntl.*" )
# also copies the dll file
@@ -406,15 +406,15 @@ if("${WITH_TCM}" STREQUAL "Y")
endif()
if("${WITH_NTL}" STREQUAL "Y")
- set(THIRDPARTYLIBS "${THIRDPARTYLIBS}" ntl gmp )
- set(THIRDPARTYSTATICLIBS "${THIRDPARTYSTATICLIBS}" ntl gmp )
+ #set(THIRDPARTYLIBS "${THIRDPARTYLIBS}" ntl gmp )
+ #set(THIRDPARTYSTATICLIBS "${THIRDPARTYSTATICLIBS}" ntl gmp )
add_definitions(-DWITH_NTL)
else()
set(THIRDPARTYLIBS "${THIRDPARTYLIBS}" "${QUADMATHLIB}")
set(THIRDPARTYSTATICLIBS "${THIRDPARTYSTATICLIBS}" "${QUADMATHLIB}")
endif()
-if("${WITH_NTL}" STREQUAL "Y" OR "${WITH_TCM}" STREQUAL "Y")
+if("${WITH_TCM}" STREQUAL "Y")
install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/third-party/include/ DESTINATION include/palisade)
endif()
@@ -423,7 +423,7 @@ set(BINDEMODATAPATH ${CMAKE_CURRENT_BINARY_DIR}/demoDa
# copies demoData folder from the root of the repo to build/demoData if the folder does not exist
# also checks whether NTL and GMP have been installed if the user chose to use NTL by setting WITH_NTL=Y
-if("${WITH_NTL}" STREQUAL "Y")
+if(FALSE AND "${WITH_NTL}" STREQUAL "Y")
add_custom_target(third-party ALL
COMMAND [ ! -f ${GMPLIBFILE} ] && echo ***ERROR*** Be sure to run \"make gmp_unpack\" and \"make gmp_all\" || [ ! -f ${NTLLIBFILE} ] && echo ***ERROR*** Be sure to run \"make ntl_unpack\" and \"make ntl_all\" || echo "-- NTL/GMP is already installed"
COMMAND [ ! -d ${BINDEMODATAPATH} ] && cp -R ${DEMODATAPATH} ${BINDEMODATAPATH} && echo "-- Copied demoData files" || echo "-- demoData folder already exists"
@@ -455,9 +455,11 @@ endif()
set(BENCHMARK_ENABLE_TESTING OFF CACHE BOOL "Enable testing of the benchmark library." FORCE)
set(BENCHMARK_ENABLE_INSTALL OFF CACHE BOOL "Enable installation of benchmark. (Projects embedding benchmark may want to turn this OFF.)" FORCE)
set(BENCHMARK_ENABLE_GTEST_TESTS OFF CACHE BOOL "Enable building the unit tests which depend on gtest" FORCE)
-add_subdirectory(third-party/google-benchmark EXCLUDE_FROM_ALL)
+#add_subdirectory(third-party/google-benchmark EXCLUDE_FROM_ALL)
+if (BUILD_TESTING)
add_subdirectory(benchmark)
+endif()
## clobber cleans AND cleans the third-party stuff
add_custom_target( clobber DEPENDS gmp_clobber ntl_clobber

14
security/palisade/files/patch-src_core_include_utils_parallel.h
View File

@ -1,14 +0,0 @@
Backport of the patch fixing build: https://gitlab.com/palisade/palisade-development/-/commit/7a6c36e61fb060dc592357b99916a88467022325
The upstream patch doesn't apply due to other incompatible chages.
--- src/core/include/utils/parallel.h.orig 2020-04-07 23:38:54 UTC
+++ src/core/include/utils/parallel.h
@@ -56,7 +56,7 @@ namespace lbcrypto {
// @Brief returns current number of threads that are usable
// @return int # threads
int GetNumThreads() {
- int out, nthreads, tid;
+ int out = 0, nthreads = 0, tid;
// Fork a team of threads giving them their own copies of variables
//so we can see how many threads we have to work with

13
security/palisade/files/patch-third-party_google-benchmark_CMakeLists.txt
View File

@ -1,6 +1,15 @@
--- third-party/google-benchmark/CMakeLists.txt.orig 2019-12-20 21:44:46 UTC
--- third-party/google-benchmark/CMakeLists.txt.orig 2020-05-06 16:28:29 UTC
+++ third-party/google-benchmark/CMakeLists.txt
@@ -258,7 +258,7 @@ endif()
@@ -173,7 +173,7 @@ else()
endif()
# ICC17u2: overloaded virtual function "benchmark::Fixture::SetUp" is only partially overridden
# (because of deprecated overload)
- add_cxx_compiler_flag(-wd654)
+ #add_cxx_compiler_flag(-wd654)
add_cxx_compiler_flag(-Wthread-safety)
if (HAVE_CXX_FLAG_WTHREAD_SAFETY)
cxx_feature_check(THREAD_SAFETY_ATTRIBUTES)
@@ -260,7 +260,7 @@ endif()
cxx_feature_check(STEADY_CLOCK)
# Ensure we have pthreads
set(THREADS_PREFER_PTHREAD_FLAG ON)

20
security/palisade/pkg-plist
View File

@ -3,6 +3,7 @@ include/palisade/abe/abecore.h
include/palisade/abe/abeparamset.h
include/palisade/abe/cpabe.h
include/palisade/abe/ibe.h
include/palisade/binfhe/CPPLINT.cfg
include/palisade/binfhe/binfhecontext-ser.h
include/palisade/binfhe/binfhecontext.h
include/palisade/binfhe/fhew.h
@ -94,6 +95,7 @@ include/palisade/cereal/types/valarray.hpp
include/palisade/cereal/types/variant.hpp
include/palisade/cereal/types/vector.hpp
include/palisade/cereal/version.hpp
include/palisade/core/config_core.h
include/palisade/core/encoding/ckkspackedencoding.h
include/palisade/core/encoding/coefpackedencoding.h
include/palisade/core/encoding/encodingparams.h
@ -121,7 +123,6 @@ include/palisade/core/lattice/trapdoor.h
include/palisade/core/lattice/trapdoorparameters.h
include/palisade/core/math/README.md
include/palisade/core/math/SAMPLING_README.md
include/palisade/core/math/armquadmath.h
include/palisade/core/math/backend.h
include/palisade/core/math/bigintdyn/mubintvecdyn.h
include/palisade/core/math/bigintdyn/ubintdyn.h
@ -142,10 +143,10 @@ include/palisade/core/math/interface.h
include/palisade/core/math/matrix.h
include/palisade/core/math/matrixstrassen.h
include/palisade/core/math/nbtheory.h
include/palisade/core/math/quadfloat.h
include/palisade/core/math/ternaryuniformgenerator.h
include/palisade/core/math/transfrm.h
include/palisade/core/palisadecore.h
include/palisade/core/testdefs.h
include/palisade/core/utils/aesutil.h
include/palisade/core/utils/blockAllocator/blockAllocator.h
include/palisade/core/utils/blockAllocator/stl_allocator.h
@ -165,6 +166,7 @@ include/palisade/core/utils/memory.h
include/palisade/core/utils/palisadebase64.h
include/palisade/core/utils/parallel.h
include/palisade/core/utils/parmfactory.h
include/palisade/core/utils/prng/CPPLINT.cfg
include/palisade/core/utils/prng/blake2-impl.h
include/palisade/core/utils/prng/blake2.h
include/palisade/core/utils/prng/blake2engine.h
@ -184,6 +186,8 @@ include/palisade/pke/cryptocontextgen.h
include/palisade/pke/cryptocontexthelper.h
include/palisade/pke/cryptocontextparametersets.h
include/palisade/pke/cryptotiming.h
include/palisade/pke/metadata-ser.h
include/palisade/pke/metadata.h
include/palisade/pke/palisade.h
include/palisade/pke/pubkeylp-ser.h
include/palisade/pke/pubkeylp.h
@ -198,6 +202,8 @@ include/palisade/pke/scheme/bfvrnsb/bfvrnsB-ser.h
include/palisade/pke/scheme/bfvrnsb/bfvrnsB.h
include/palisade/pke/scheme/bgv/bgv-ser.h
include/palisade/pke/scheme/bgv/bgv.h
include/palisade/pke/scheme/bgvrns/bgvrns-ser.h
include/palisade/pke/scheme/bgvrns/bgvrns.h
include/palisade/pke/scheme/ckks/ckks-ser.h
include/palisade/pke/scheme/ckks/ckks.h
include/palisade/pke/scheme/null/nullscheme-ser.h
@ -214,16 +220,16 @@ lib/CMake/Palisade/PalisadeTargets-%%CMAKE_BUILD_TYPE%%.cmake
lib/CMake/Palisade/PalisadeTargets.cmake
lib/libPALISADEabe.so
lib/libPALISADEabe.so.1
lib/libPALISADEabe.so.1.9.1
lib/libPALISADEabe.so.1.10.1
lib/libPALISADEbinfhe.so
lib/libPALISADEbinfhe.so.1
lib/libPALISADEbinfhe.so.1.9.1
lib/libPALISADEbinfhe.so.1.10.1
lib/libPALISADEcore.so
lib/libPALISADEcore.so.1
lib/libPALISADEcore.so.1.9.1
lib/libPALISADEcore.so.1.10.1
lib/libPALISADEpke.so
lib/libPALISADEpke.so.1
lib/libPALISADEpke.so.1.9.1
lib/libPALISADEpke.so.1.10.1
lib/libPALISADEsignature.so
lib/libPALISADEsignature.so.1
lib/libPALISADEsignature.so.1.9.1
lib/libPALISADEsignature.so.1.10.1