security/palisade: Update 1.11.3 -> 1.11.4

Also * replace do-test with cmake:testing * not force specific clang version
freebsd · Aug 26, 2021 · 9766859 · 9766859
1 parent da84766
commit 9766859
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 23 deletions.
diff --git a/security/palisade/Makefile b/security/palisade/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	palisade
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.11.3
+DISTVERSION=	1.11.4
 CATEGORIES=	security math
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -14,11 +14,11 @@ BROKEN_powerpc64=	fails to build: math/native_int/binint.h:510:11: error: Archit
 
 BUILD_DEPENDS=	autoconf:devel/autoconf # possibly a mistake in the project
 
-USES=		cmake:noninja localbase # compiler:c++11-lang
+USES=		cmake:noninja,testing localbase # compiler:c++11-lang
 USE_GITLAB=	yes
 USE_GITHUB=	nodefault
 GL_PROJECT=	palisade-release # there's also palisade-development
-GL_COMMIT=	1a66eb80233b2adef8c67c71d9ca4652ea188f7d
+GL_COMMIT=	e4136d91b79224d4d38e55839b985f0e5b086418
 GH_TUPLE=	\
 		JerryRyan:cereal:a384b101:cereal/third-party/cereal \
 		google:benchmark:d3ad0b9d:benchmark/third-party/google-benchmark \
@@ -28,18 +28,13 @@ USE_LDCONFIG=	yes
 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 # libntl.so will be discontinued in 1.11, see https://gitlab.com/palisade/palisade-development/-/issues/180
+CMAKE_TESTING_ON=	BUILD_UNITTESTS
+CMAKE_TESTING_TARGET=	testall
 
 CXXFLAGS+=	-I${WRKSRC}/third-party/google-test/googletest
 
-BINARY_ALIAS=	git=false
 
-# clang-8 fails: error: use of undeclared identifier '__builtin_FILE'
-LLVM_VERSION=	10 # ${LLVM_DEFAULT}
-BUILD_DEPENDS+=	clang${LLVM_VERSION}:devel/llvm${LLVM_VERSION}
-RUN_DEPENDS+=	clang${LLVM_VERSION}:devel/llvm${LLVM_VERSION}
-CPP=		clang-cpp${LLVM_VERSION}
-CC=		clang${LLVM_VERSION}
-CXX=		clang++${LLVM_VERSION}
+BINARY_ALIAS=	git=false
 
 LDFLAGS+=	-pthread # only for tests: see https://gitlab.com/palisade/palisade-release/-/issues/23
 
@@ -48,10 +43,4 @@ OPTIONS_DEFAULT=	OPENMP
 
 OPENMP_CMAKE_BOOL=	USE_OpenMP
 
-do-test:
-	@cd ${BUILD_WRKSRC} && \
-		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_UNITTESTS:BOOL=ON ${CMAKE_SOURCE_PATH} && \
-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} testall
-
 .include <bsd.port.mk>
diff --git a/security/palisade/distinfo b/security/palisade/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1622569464
+TIMESTAMP = 1629935615
 SHA256 (JerryRyan-cereal-a384b101_GH0.tar.gz) = 0fba03b7e2e1a150a112fc90e18bfb9274e3830393af99d0c91f9abef62e9ff3
 SIZE (JerryRyan-cereal-a384b101_GH0.tar.gz) = 345431
 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 (palisade-palisade-release-1a66eb80233b2adef8c67c71d9ca4652ea188f7d_GL0.tar.gz) = de313f1b123dcae1ee4cbef56d2dceafa9ea351ba8cdf8b1b31375a5aa5d67da
-SIZE (palisade-palisade-release-1a66eb80233b2adef8c67c71d9ca4652ea188f7d_GL0.tar.gz) = 1207125
+SHA256 (palisade-palisade-release-e4136d91b79224d4d38e55839b985f0e5b086418_GL0.tar.gz) = cd45fd1bbe38927cdb0fe3cd82f593491f6ad584338aa2b0a1e98dabeca7bf41
+SIZE (palisade-palisade-release-e4136d91b79224d4d38e55839b985f0e5b086418_GL0.tar.gz) = 1210292
diff --git a/security/palisade/pkg-plist b/security/palisade/pkg-plist
@@ -151,6 +151,7 @@ include/palisade/core/utils/blockAllocator/xstring.h
 include/palisade/core/utils/blockAllocator/xvector.h
 include/palisade/core/utils/caller_info.h
 include/palisade/core/utils/debug.h
+include/palisade/core/utils/defines.h
 include/palisade/core/utils/exception.h
 include/palisade/core/utils/hashutil.h
 include/palisade/core/utils/inttypes.h
@@ -203,10 +204,10 @@ lib/Palisade/PalisadeTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/Palisade/PalisadeTargets.cmake
 lib/libPALISADEbinfhe.so
 lib/libPALISADEbinfhe.so.1
-lib/libPALISADEbinfhe.so.1.11.3
+lib/libPALISADEbinfhe.so.1.11.4
 lib/libPALISADEcore.so
 lib/libPALISADEcore.so.1
-lib/libPALISADEcore.so.1.11.3
+lib/libPALISADEcore.so.1.11.4
 lib/libPALISADEpke.so
 lib/libPALISADEpke.so.1
-lib/libPALISADEpke.so.1.11.3
+lib/libPALISADEpke.so.1.11.4