summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--security/rnp/Makefile3
-rw-r--r--security/rnp/distinfo6
-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-plist1
6 files changed, 5 insertions, 88 deletions
diff --git a/security/rnp/Makefile b/security/rnp/Makefile
index 9d0e5329de0b..d53c9ca08b8c 100644
--- a/security/rnp/Makefile
+++ b/security/rnp/Makefile
@@ -1,7 +1,6 @@
PORTNAME= rnp
DISTVERSIONPREFIX= v
-DISTVERSION= 0.17.1
-PORTREVISION= 2
+DISTVERSION= 0.18.0
CATEGORIES= security
MAINTAINER= se@FreeBSD.org
diff --git a/security/rnp/distinfo b/security/rnp/distinfo
index 2689cd70a2ce..543f9d413201 100644
--- a/security/rnp/distinfo
+++ b/security/rnp/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1740573395
-SHA256 (rnpgp-rnp-v0.17.1_GH0.tar.gz) = ec486bb2c25abb0ddbd95973fd135e3922ea68b4e6919c7c18d992078baaf50c
-SIZE (rnpgp-rnp-v0.17.1_GH0.tar.gz) = 3515288
+TIMESTAMP = 1750584656
+SHA256 (rnpgp-rnp-v0.18.0_GH0.tar.gz) = 5c8f0bdd5770f5680cc83a76f4569a067f107b8b3eec76577faa227135c7c18e
+SIZE (rnpgp-rnp-v0.18.0_GH0.tar.gz) = 4292768
SHA256 (rnpgp-sexpp-c641a2f_GH0.tar.gz) = 43d4abdb0c131305ed11ce202d128717336782159b741931494ee8f99cf43cf4
SIZE (rnpgp-sexpp-c641a2f_GH0.tar.gz) = 71645
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..2e36e321d3d1 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
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-23 11:40:53 +0000