rnp: 0.17.0 -> 0.17.1 · pyrox.dev/nixpkgs@d9687d7

+3 -4

pkgs/tools/security/rnp/default.nix

··· 16 16 17 17 stdenv.mkDerivation (finalAttrs: { 18 18 pname = "rnp"; 19 - version = "0.17.0"; 19 + version = "0.17.1"; 20 20 21 21 src = fetchFromGitHub { 22 22 owner = "rnpgp"; 23 23 repo = "rnp"; 24 24 rev = "v${finalAttrs.version}"; 25 - hash = "sha256-4fB7Sl9+ATrJTRnhbNG5BoW3XLxR7IP167RK96+gxj0="; 25 + hash = "sha256-jUh7BxRnB6KePCk1jIvKzXgxSmWdKlQYmxshZZY4SBQ"; 26 26 }; 27 27 28 28 buildInputs = [ zlib bzip2 json_c botan2 sexpp ]; 29 29 30 30 patches = [ 31 - ./unbundle-sexpp.patch 32 - ./sexp_sexpp_rename.patch 33 31 ]; 34 32 35 33 cmakeFlags = [ ··· 38 36 "-DBUILD_TESTING=on" 39 37 "-DDOWNLOAD_GTEST=off" 40 38 "-DDOWNLOAD_RUBYRNP=off" 39 + "-DSYSTEM_LIBSEXPP=on" 41 40 ]; 42 41 43 42 nativeBuildInputs = [ asciidoctor cmake gnupg gtest pkg-config python3 ];

-50

pkgs/tools/security/rnp/sexp_sexpp_rename.patch

··· 1 - diff --git i/src/lib/CMakeLists.txt w/src/lib/CMakeLists.txt 2 - index 086ac57d..2ce59ca1 100755 3 - --- i/src/lib/CMakeLists.txt 4 - +++ w/src/lib/CMakeLists.txt 5 - @@ -328,7 +328,7 @@ elseif (CRYPTO_BACKEND_OPENSSL) 6 - target_link_libraries(librnp-obj PRIVATE OpenSSL::Crypto) 7 - endif() 8 - 9 - -target_link_libraries(librnp-obj PRIVATE sexp) 10 - +target_link_libraries(librnp-obj PRIVATE sexpp) 11 - 12 - set_target_properties(librnp-obj PROPERTIES CXX_VISIBILITY_PRESET hidden) 13 - if (TARGET BZip2::BZip2) 14 - @@ -384,7 +384,7 @@ foreach (prop LINK_LIBRARIES INTERFACE_LINK_LIBRARIES INCLUDE_DIRECTORIES INTERF 15 - get_target_property(val librnp-obj ${prop}) 16 - if (BUILD_SHARED_LIBS) 17 - set_property(TARGET librnp-static PROPERTY ${prop} ${val}) 18 - - list(REMOVE_ITEM val "$<LINK_ONLY:sexp>") 19 - + list(REMOVE_ITEM val "$<LINK_ONLY:sexpp>") 20 - set_property(TARGET librnp PROPERTY ${prop} ${val}) 21 - else() 22 - set_property(TARGET librnp PROPERTY ${prop} ${val}) 23 - diff --git i/src/librekey/g23_sexp.hpp w/src/librekey/g23_sexp.hpp 24 - index b888680f..b062c52f 100644 25 - --- i/src/librekey/g23_sexp.hpp 26 - +++ w/src/librekey/g23_sexp.hpp 27 - @@ -27,8 +27,8 @@ 28 - #ifndef RNP_G23_SEXP_HPP 29 - #define RNP_G23_SEXP_HPP 30 - 31 - -#include "sexp/sexp.h" 32 - -#include "sexp/ext-key-format.h" 33 - +#include "sexpp/sexp.h" 34 - +#include "sexpp/ext-key-format.h" 35 - 36 - #define SXP_MAX_DEPTH 30 37 - 38 - diff --git i/src/tests/CMakeLists.txt w/src/tests/CMakeLists.txt 39 - index 7d2a6b0c..88aeaf9f 100644 40 - --- i/src/tests/CMakeLists.txt 41 - +++ w/src/tests/CMakeLists.txt 42 - @@ -176,7 +176,7 @@ target_link_libraries(rnp_tests 43 - PRIVATE 44 - librnp-static 45 - JSON-C::JSON-C 46 - - sexp 47 - + sexpp 48 - ${GTestMain} 49 - ) 50 - if (CRYPTO_BACKEND_LOWERCASE STREQUAL "openssl")

-38

pkgs/tools/security/rnp/unbundle-sexpp.patch

··· 1 - diff --git i/CMakeLists.txt w/CMakeLists.txt 2 - index bb6d40cb..30171e7c 100644 3 - --- i/CMakeLists.txt 4 - +++ w/CMakeLists.txt 5 - @@ -176,11 +176,6 @@ if (ENABLE_FUZZERS) 6 - endif() 7 - add_subdirectory(src/common) 8 - 9 - -set(WITH_SEXP_CLI OFF) 10 - -set(WITH_SEXP_TESTS OFF) 11 - -set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME development) 12 - -add_subdirectory(src/libsexp EXCLUDE_FROM_ALL) 13 - - 14 - add_subdirectory(src/lib) 15 - add_subdirectory(src/rnp) 16 - add_subdirectory(src/rnpkeys) 17 - diff --git i/src/lib/CMakeLists.txt w/src/lib/CMakeLists.txt 18 - index 086ac57d..b219ef06 100755 19 - --- i/src/lib/CMakeLists.txt 20 - +++ w/src/lib/CMakeLists.txt 21 - @@ -433,7 +433,7 @@ install(TARGETS librnp 22 - COMPONENT development 23 - ) 24 - 25 - - install(TARGETS librnp-static sexp 26 - + install(TARGETS librnp-static 27 - EXPORT rnp-targets 28 - ARCHIVE 29 - DESTINATION "${CMAKE_INSTALL_LIBDIR}" 30 - @@ -441,7 +441,7 @@ install(TARGETS librnp 31 - ) 32 - else(BUILD_SHARED_LIBS) 33 - # static libraries only 34 - -install(TARGETS librnp sexp 35 - +install(TARGETS librnp 36 - EXPORT rnp-targets 37 - ARCHIVE 38 - DESTINATION "${CMAKE_INSTALL_LIBDIR}"