summaryrefslogtreecommitdiff
path: root/security/rnp
diff options
context:
space:
mode:
Diffstat (limited to 'security/rnp')
-rw-r--r--security/rnp/Makefile42
-rw-r--r--security/rnp/distinfo8
-rw-r--r--security/rnp/files/patch-src_lib_types.h19
-rw-r--r--security/rnp/files/patch-src_lib_utils.cpp31
-rw-r--r--security/rnp/files/patch-src_librekey_key__store__g10.cpp33
-rw-r--r--security/rnp/pkg-plist7
6 files changed, 32 insertions, 108 deletions
diff --git a/security/rnp/Makefile b/security/rnp/Makefile
index 9d0e5329de0b..c8dc94c9cdac 100644
--- a/security/rnp/Makefile
+++ b/security/rnp/Makefile
@@ -1,8 +1,8 @@
PORTNAME= rnp
DISTVERSIONPREFIX= v
-DISTVERSION= 0.17.1
-PORTREVISION= 2
+DISTVERSION= 0.18.0
CATEGORIES= security
+MASTER_SITES= https://github.com/rnpgp/${PORTNAME}/releases/download/${DISTVERSIONFULL}/
MAINTAINER= se@FreeBSD.org
COMMENT= RNP is a set of OpenPGP (RFC4880) tools
@@ -16,27 +16,35 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.md
LICENSE_PERMS_OCB_Patent= dist-mirror dist-sell pkg-mirror pkg-sell \
auto-accept
-BUILD_DEPENDS= asciidoctor:textproc/rubygem-asciidoctor
LIB_DEPENDS= libbotan-3.so:security/botan3 \
libjson-c.so:devel/json-c
-
-USES= cmake compiler:c++11-lang pkgconfig
-USE_GITHUB= yes
-GH_ACCOUNT= rnpgp
-GH_TUPLE= rnpgp:sexpp:c641a2f:sexpp/src/libsexpp
+TEST_DEPENDS= googletest>0:devel/googletest \
+ gpgme>0:security/gpgme
+
+USES= cmake:testing compiler:c++20-lang pathfix pkgconfig \
+ python:env,test shebangfix
+PATHFIX_WRKSRC= ${WRKSRC}/src/lib
+SHEBANG_FILES= src/tests/cli_perf.py \
+ src/tests/cli_tests.py \
+ src/tests/data/cli_EncryptSign/regenerate_keys
USE_LDCONFIG= yes
-CMAKE_ARGS= -DBUILD_SHARED_LIBS=on \
- -DBUILD_TESTING=off
-
PLIST_SUB= VERS=${DISTVERSION}
-pre-configure:
- ${CP} ${FILESDIR}/version.cmake ${WRKSRC}/cmake/
- ${REINPLACE_CMD} 's/%%DISTVERSION%%/${DISTVERSION}/' \
- ${WRKSRC}/cmake/version.cmake
+CMAKE_ON= BUILD_SHARED_LIBS \
+ CMAKE_DISABLE_FIND_PACKAGE_Git
+CMAKE_OFF= BUILD_TESTING \
+ DOWNLOAD_GTEST
-post-install:
- ${RM} ${STAGEDIR}${PREFIX}/lib/libsexp.a
+OPTIONS_DEFINE= MANPAGES
+OPTIONS_SUB= yes
+
+MANPAGES_BUILD_DEPENDS= asciidoctor:textproc/rubygem-asciidoctor
+MANPAGES_CMAKE_BOOL= ENABLE_DOC
+
+pre-configure:
+ ${CP} ${FILESDIR}/version.cmake ${WRKSRC}/cmake/
+ ${REINPLACE_CMD} 's/%%DISTVERSION%%/${DISTVERSION}/' \
+ ${WRKSRC}/cmake/version.cmake
.include <bsd.port.mk>
diff --git a/security/rnp/distinfo b/security/rnp/distinfo
index 2689cd70a2ce..b08cf7350d69 100644
--- a/security/rnp/distinfo
+++ b/security/rnp/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1740573395
-SHA256 (rnpgp-rnp-v0.17.1_GH0.tar.gz) = ec486bb2c25abb0ddbd95973fd135e3922ea68b4e6919c7c18d992078baaf50c
-SIZE (rnpgp-rnp-v0.17.1_GH0.tar.gz) = 3515288
-SHA256 (rnpgp-sexpp-c641a2f_GH0.tar.gz) = 43d4abdb0c131305ed11ce202d128717336782159b741931494ee8f99cf43cf4
-SIZE (rnpgp-sexpp-c641a2f_GH0.tar.gz) = 71645
+TIMESTAMP = 1750637070
+SHA256 (rnp-v0.18.0.tar.gz) = a90e3ac5b185a149665147f9284c0201a78431e81924883899244522fd3f9240
+SIZE (rnp-v0.18.0.tar.gz) = 4376397
diff --git a/security/rnp/files/patch-src_lib_types.h b/security/rnp/files/patch-src_lib_types.h
deleted file mode 100644
index 4262e8f2de42..000000000000
--- a/security/rnp/files/patch-src_lib_types.h
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/lib/types.h.orig 2024-05-03 10:03:14 UTC
-+++ src/lib/types.h
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2017-2021, [Ribose Inc](https://www.ribose.com).
-+ * Copyright (c) 2017-2024, [Ribose Inc](https://www.ribose.com).
- * Copyright (c) 2009 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
-@@ -95,9 +95,6 @@ class id_str_pair {
- static int lookup(const id_str_pair pair[],
- const std::vector<uint8_t> &bytes,
- int notfound = 0);
-- static int lookup(const id_str_pair pair[],
-- const std::basic_string<uint8_t> &bytes,
-- int notfound = 0);
- };
-
- /** pgp_fingerprint_t */
diff --git a/security/rnp/files/patch-src_lib_utils.cpp b/security/rnp/files/patch-src_lib_utils.cpp
deleted file mode 100644
index 761f5bd55c94..000000000000
--- a/security/rnp/files/patch-src_lib_utils.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
---- src/lib/utils.cpp.orig 2024-05-03 10:03:14 UTC
-+++ src/lib/utils.cpp
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2021, [Ribose Inc](https://www.ribose.com).
-+ * Copyright (c) 2021, 2024 [Ribose Inc](https://www.ribose.com).
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
-@@ -53,21 +53,6 @@ id_str_pair::lookup(const id_str_pair pair[], const st
-
- int
- id_str_pair::lookup(const id_str_pair pair[], const std::vector<uint8_t> &bytes, int notfound)
--{
-- while (pair && pair->str) {
-- if ((strlen(pair->str) == bytes.size()) &&
-- !memcmp(pair->str, bytes.data(), bytes.size())) {
-- return pair->id;
-- }
-- pair++;
-- }
-- return notfound;
--}
--
--int
--id_str_pair::lookup(const id_str_pair pair[],
-- const std::basic_string<uint8_t> &bytes,
-- int notfound)
- {
- while (pair && pair->str) {
- if ((strlen(pair->str) == bytes.size()) &&
diff --git a/security/rnp/files/patch-src_librekey_key__store__g10.cpp b/security/rnp/files/patch-src_librekey_key__store__g10.cpp
deleted file mode 100644
index 688b54c380e4..000000000000
--- a/security/rnp/files/patch-src_librekey_key__store__g10.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
---- src/librekey/key_store_g10.cpp.orig 2024-05-03 10:03:14 UTC
-+++ src/librekey/key_store_g10.cpp
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2017-2022, [Ribose Inc](https://www.ribose.com).
-+ * Copyright (c) 2017-2024, [Ribose Inc](https://www.ribose.com).
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
-@@ -312,12 +312,12 @@ read_curve(const sexp_list_t *list, const std::string
-
- const auto &bytes = data->get_string();
- pgp_curve_t curve = static_cast<pgp_curve_t>(
-- id_str_pair::lookup(g10_curve_aliases, data->get_string(), PGP_CURVE_UNKNOWN));
-+ id_str_pair::lookup(g10_curve_aliases, (const char *) bytes.data(), PGP_CURVE_UNKNOWN));
- if (curve != PGP_CURVE_UNKNOWN) {
- key.curve = curve;
- return true;
- }
-- RNP_LOG("Unknown curve: %.*s", (int) bytes.size(), (char *) bytes.data());
-+ RNP_LOG("Unknown curve: %.*s", (int) bytes.size(), (const char *) bytes.data());
- return false;
- }
-
-@@ -806,7 +806,7 @@ g23_parse_seckey(pgp_key_pkt_t &seckey,
-
- auto & alg_bt = alg_s_exp->sexp_string_at(0)->get_string();
- pgp_pubkey_alg_t alg = static_cast<pgp_pubkey_alg_t>(
-- id_str_pair::lookup(g10_alg_aliases, alg_bt.c_str(), PGP_PKA_NOTHING));
-+ id_str_pair::lookup(g10_alg_aliases, (const char *) alg_bt.data(), PGP_PKA_NOTHING));
- if (alg == PGP_PKA_NOTHING) {
- RNP_LOG(
- "Unsupported algorithm: '%.*s'", (int) alg_bt.size(), (const char *) alg_bt.data());
diff --git a/security/rnp/pkg-plist b/security/rnp/pkg-plist
index 7afb6e16fefd..b4fe6d6f28d6 100644
--- a/security/rnp/pkg-plist
+++ b/security/rnp/pkg-plist
@@ -3,6 +3,7 @@ bin/rnpkeys
include/rnp/rnp.h
include/rnp/rnp_err.h
include/rnp/rnp_export.h
+include/rnp/rnp_ver.h
lib/cmake/rnp/rnp-config-version.cmake
lib/cmake/rnp/rnp-config.cmake
lib/cmake/rnp/rnp-targets-%%CMAKE_BUILD_TYPE%%.cmake
@@ -11,6 +12,6 @@ lib/librnp.so
lib/librnp.so.0
lib/librnp.so.%%VERS%%
libdata/pkgconfig/librnp.pc
-share/man/man1/rnp.1.gz
-share/man/man1/rnpkeys.1.gz
-share/man/man3/librnp.3.gz
+%%MANPAGES%%share/man/man1/rnp.1.gz
+%%MANPAGES%%share/man/man1/rnpkeys.1.gz
+%%MANPAGES%%share/man/man3/librnp.3.gz
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-24 00:20:57 +0000