From 9770c6953a00d8a718f9c8dcd54704b209dc58aa Mon Sep 17 00:00:00 2001 From: Yuri Victorovich Date: Thu, 24 Aug 2023 22:48:57 -0700 Subject: [PATCH] =?UTF-8?q?security/liboqs:=20update=200.8.0=20=E2=86=92?= =?UTF-8?q?=200.8.0-14?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- security/liboqs/Makefile | 8 ++++---- security/liboqs/distinfo | 6 +++--- .../liboqs/files/patch-.CMake_compiler__opts.cmake | 10 ---------- security/liboqs/pkg-plist | 10 +++------- 4 files changed, 10 insertions(+), 24 deletions(-) delete mode 100644 security/liboqs/files/patch-.CMake_compiler__opts.cmake diff --git a/security/liboqs/Makefile b/security/liboqs/Makefile index e22563aebd403..84f4e52977fdf 100644 --- a/security/liboqs/Makefile +++ b/security/liboqs/Makefile @@ -1,5 +1,6 @@ PORTNAME= liboqs -DISTVERSION= 0.8.0 +DISTVERSION= 0.8.0-14 +DISTVERSIONSUFFIX= -g914764c9 CATEGORIES= security MAINTAINER= yuri@FreeBSD.org @@ -13,19 +14,18 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \ bash:shells/bash -USES= cmake python:test shebangfix ssl +USES= cmake:testing python:test shebangfix ssl USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= open-quantum-safe -GH_TAGNAME= 38d3014dc2f74ec0f0c1a9e7e61aa4d2251adcc9 SHEBANG_GLOB= *.sh CMAKE_ON= BUILD_SHARED_LIBS OQS_DIST_BUILD \ OQS_PERMIT_UNSUPPORTED_ARCHITECTURE # trying to build on i386, powerpc, armv6, riscv64 -TEST_TARGET= run_tests +CMAKE_TESTING_TARGET= run_tests # tests fail to run, see https://github.com/open-quantum-safe/liboqs/issues/1534 BINARY_ALIAS= python3=${PYTHON_CMD} diff --git a/security/liboqs/distinfo b/security/liboqs/distinfo index 8e7ec2a4ca30d..b334699feae9a 100644 --- a/security/liboqs/distinfo +++ b/security/liboqs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1686286776 -SHA256 (open-quantum-safe-liboqs-0.8.0-38d3014dc2f74ec0f0c1a9e7e61aa4d2251adcc9_GH0.tar.gz) = 7faa627bc956f4c9c2b42cfc43324a07a48407ce1efd125bbf5d04f3711a7979 -SIZE (open-quantum-safe-liboqs-0.8.0-38d3014dc2f74ec0f0c1a9e7e61aa4d2251adcc9_GH0.tar.gz) = 8108855 +TIMESTAMP = 1692940056 +SHA256 (open-quantum-safe-liboqs-0.8.0-14-g914764c9_GH0.tar.gz) = 0fe23accf2fb6dbc477caac41c80c38fa1b4cd52d82f4934af3babfa923ff617 +SIZE (open-quantum-safe-liboqs-0.8.0-14-g914764c9_GH0.tar.gz) = 3066205 diff --git a/security/liboqs/files/patch-.CMake_compiler__opts.cmake b/security/liboqs/files/patch-.CMake_compiler__opts.cmake deleted file mode 100644 index 2b1086e3967e4..0000000000000 --- a/security/liboqs/files/patch-.CMake_compiler__opts.cmake +++ /dev/null @@ -1,10 +0,0 @@ ---- .CMake/compiler_opts.cmake.orig 2021-10-13 10:39:00 UTC -+++ .CMake/compiler_opts.cmake -@@ -51,7 +51,6 @@ if(CMAKE_C_COMPILER_ID MATCHES "Clang|GNU") - endif() - - if(CMAKE_C_COMPILER_ID MATCHES "Clang") -- add_compile_options(-Werror) - add_compile_options(-Wall) - add_compile_options(-Wextra) - add_compile_options(-Wpedantic) diff --git a/security/liboqs/pkg-plist b/security/liboqs/pkg-plist index c038e3589494d..c51f083db5d9d 100644 --- a/security/liboqs/pkg-plist +++ b/security/liboqs/pkg-plist @@ -6,10 +6,7 @@ include/oqs/kem_classic_mceliece.h include/oqs/kem_frodokem.h include/oqs/kem_hqc.h include/oqs/kem_kyber.h -include/oqs/kem_ntru.h include/oqs/kem_ntruprime.h -include/oqs/kem_saber.h -%%KEM_BIKE%%include/oqs/kem_sike.h include/oqs/oqs.h include/oqs/oqsconfig.h include/oqs/rand.h @@ -19,13 +16,12 @@ include/oqs/sha3x4.h include/oqs/sig.h include/oqs/sig_dilithium.h include/oqs/sig_falcon.h -include/oqs/sig_picnic.h -include/oqs/sig_rainbow.h include/oqs/sig_sphincs.h lib/cmake/liboqs/liboqsConfig.cmake lib/cmake/liboqs/liboqsConfigVersion.cmake lib/cmake/liboqs/liboqsTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/liboqs/liboqsTargets.cmake lib/liboqs.so -lib/liboqs.so.0 -lib/liboqs.so.0.7.2-dev +lib/liboqs.so.0.9.0-dev +lib/liboqs.so.4 +libdata/pkgconfig/liboqs.pc