From 2e8ddcff90582a97f7d427e799ae5ad706ae54b9 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 2 Nov 2022 13:44:48 +0100 Subject: add files by license list in package sources open https://github.com/rnpgp/rnp/issues/1932 missing MIT add man pages check archive signature --- rnp-files-by-license.txt | 251 +++++++++++++++++++++++++++++++++++++++++++++++ rnp-keyring.gpg | 16 +++ rnp.spec | 30 +++++- 3 files changed, 294 insertions(+), 3 deletions(-) create mode 100644 rnp-files-by-license.txt create mode 100644 rnp-keyring.gpg diff --git a/rnp-files-by-license.txt b/rnp-files-by-license.txt new file mode 100644 index 0000000..9544ff0 --- /dev/null +++ b/rnp-files-by-license.txt @@ -0,0 +1,251 @@ + +*No copyright* Public domain +------------ + +BSD 2-Clause License +------------ +CMakeLists.txt +cmake/info.cmake +cmake/packaging.cmake +cmake/rnp-config.cmake.in +cmake/version.cmake +include/rnp.h +cmake/Modules/AdocMan.cmake +cmake/Modules/FindBotan2.cmake +cmake/Modules/FindGnuPG.cmake +cmake/Modules/FindJSON-C.cmake +cmake/Modules/FindOpenSSLFeatures.cmake +include/rekey/rnp_key_store.h +include/repgp/repgp_def.h +include/rnp/rnp.h +include/rnp/rnp_def.h +include/rnp/rnp_err.h +src/common/CMakeLists.txt +src/common/file-utils.cpp +src/common/file-utils.h +src/common/getoptwin.h +src/common/str-utils.cpp +src/common/str-utils.h +src/common/time-utils.cpp +src/common/time-utils.h +src/common/uniwin.h +src/examples/CMakeLists.txt +src/examples/decrypt.c +src/examples/dump.c +src/examples/encrypt.c +src/examples/generate.c +src/examples/sign.c +src/examples/verify.c +src/fuzzing/CMakeLists.txt +src/fuzzing/dump.c +src/fuzzing/keyimport.c +src/fuzzing/keyring.c +src/fuzzing/keyring_g10.cpp +src/fuzzing/keyring_kbx.c +src/fuzzing/sigimport.c +src/fuzzing/verify.c +src/fuzzing/verify_detached.c +src/lib/CMakeLists.txt +src/lib/config.h.in +src/lib/defaults.h +src/lib/ffi-priv-types.h +src/lib/fingerprint.cpp +src/lib/fingerprint.h +src/lib/generate-key.cpp +src/lib/json-utils.cpp +src/lib/json-utils.h +src/lib/key-provider.cpp +src/lib/key-provider.h +src/lib/logging.cpp +src/lib/logging.h +src/lib/pass-provider.cpp +src/lib/pass-provider.h +src/lib/rnp.cpp +src/lib/sec_profile.cpp +src/lib/sec_profile.hpp +src/lib/utils.cpp +src/lib/utils.h +src/lib/version.h.in +src/librekey/g10_sexp.hpp +src/librekey/kbx_blob.hpp +src/librekey/key_store_g10.cpp +src/librekey/key_store_g10.h +src/librekey/key_store_kbx.cpp +src/librekey/key_store_kbx.h +src/librekey/rnp_key_store.cpp +src/librepgp/stream-armor.cpp +src/librepgp/stream-armor.h +src/librepgp/stream-common.cpp +src/librepgp/stream-common.h +src/librepgp/stream-ctx.cpp +src/librepgp/stream-ctx.h +src/librepgp/stream-def.h +src/librepgp/stream-dump.cpp +src/librepgp/stream-dump.h +src/librepgp/stream-key.cpp +src/librepgp/stream-key.h +src/librepgp/stream-packet.cpp +src/librepgp/stream-packet.h +src/librepgp/stream-parse.cpp +src/librepgp/stream-parse.h +src/librepgp/stream-sig.cpp +src/librepgp/stream-sig.h +src/librepgp/stream-write.cpp +src/librepgp/stream-write.h +src/rnp/CMakeLists.txt +src/rnp/fficli.cpp +src/rnp/fficli.h +src/rnp/rnp.cpp +src/rnp/rnpcfg.cpp +src/rnp/rnpcfg.h +src/rnpkeys/CMakeLists.txt +src/rnpkeys/main.cpp +src/rnpkeys/rnpkeys.cpp +src/rnpkeys/tui.cpp +src/tests/CMakeLists.txt +src/tests/cipher.cpp +src/tests/cipher_cxx.cpp +src/tests/cli.cpp +src/tests/exportkey.cpp +src/tests/ffi-enc.cpp +src/tests/ffi-key-prop.cpp +src/tests/ffi-key-sig.cpp +src/tests/ffi-key.cpp +src/tests/ffi-uid.cpp +src/tests/ffi.cpp +src/tests/file-utils.cpp +src/tests/fuzz_dump.cpp +src/tests/fuzz_keyimport.cpp +src/tests/fuzz_keyring.cpp +src/tests/fuzz_keyring_g10.cpp +src/tests/fuzz_keyring_kbx.cpp +src/tests/fuzz_sigimport.cpp +src/tests/fuzz_verify.cpp +src/tests/fuzz_verify_detached.cpp +src/tests/generatekey.cpp +src/tests/kbx-nsigs-test.cpp +src/tests/key-add-userid.cpp +src/tests/key-grip.cpp +src/tests/key-prefs.cpp +src/tests/key-protect.cpp +src/tests/key-store-search.cpp +src/tests/key-unlock.cpp +src/tests/key-validate.cpp +src/tests/large-mpi.cpp +src/tests/large-packet.cpp +src/tests/load-g10.cpp +src/tests/load-pgp.cpp +src/tests/log-switch.cpp +src/tests/partial-length.cpp +src/tests/pipe.cpp +src/tests/rng-randomness.cpp +src/tests/rnp_tests.cpp +src/tests/rnp_tests.h +src/tests/s2k-iterations.cpp +src/tests/streams.cpp +src/tests/support.cpp +src/tests/support.h +src/tests/user-prefs.cpp +src/tests/utils-hex2bin.cpp +src/tests/utils-rnpcfg.cpp +src/lib/crypto/backend_version.cpp +src/lib/crypto/backend_version.h +src/lib/crypto/bn.cpp +src/lib/crypto/bn.h +src/lib/crypto/bn_ossl.cpp +src/lib/crypto/cipher.cpp +src/lib/crypto/cipher.hpp +src/lib/crypto/cipher_botan.cpp +src/lib/crypto/cipher_botan.hpp +src/lib/crypto/cipher_ossl.cpp +src/lib/crypto/cipher_ossl.hpp +src/lib/crypto/common.h +src/lib/crypto/dl_ossl.cpp +src/lib/crypto/dl_ossl.h +src/lib/crypto/dsa.h +src/lib/crypto/dsa_ossl.cpp +src/lib/crypto/ec.cpp +src/lib/crypto/ec.h +src/lib/crypto/ec_curves.cpp +src/lib/crypto/ec_ossl.cpp +src/lib/crypto/ec_ossl.h +src/lib/crypto/ecdh.cpp +src/lib/crypto/ecdh.h +src/lib/crypto/ecdh_ossl.cpp +src/lib/crypto/ecdh_utils.cpp +src/lib/crypto/ecdh_utils.h +src/lib/crypto/ecdsa.cpp +src/lib/crypto/ecdsa.h +src/lib/crypto/ecdsa_ossl.cpp +src/lib/crypto/eddsa.cpp +src/lib/crypto/eddsa.h +src/lib/crypto/eddsa_ossl.cpp +src/lib/crypto/elgamal.cpp +src/lib/crypto/elgamal.h +src/lib/crypto/elgamal_ossl.cpp +src/lib/crypto/hash.cpp +src/lib/crypto/hash.hpp +src/lib/crypto/hash_botan.hpp +src/lib/crypto/hash_common.cpp +src/lib/crypto/hash_crc24.cpp +src/lib/crypto/hash_crc24.hpp +src/lib/crypto/hash_ossl.cpp +src/lib/crypto/hash_ossl.hpp +src/lib/crypto/hash_sha1cd.cpp +src/lib/crypto/hash_sha1cd.hpp +src/lib/crypto/mem.cpp +src/lib/crypto/mem.h +src/lib/crypto/mem_ossl.cpp +src/lib/crypto/mpi.cpp +src/lib/crypto/mpi.h +src/lib/crypto/ossl_common.h +src/lib/crypto/rng.cpp +src/lib/crypto/rng.h +src/lib/crypto/rng_ossl.cpp +src/lib/crypto/rsa.h +src/lib/crypto/rsa_ossl.cpp +src/lib/crypto/s2k.cpp +src/lib/crypto/s2k.h +src/lib/crypto/s2k_ossl.cpp +src/lib/crypto/signatures.cpp +src/lib/crypto/signatures.h +src/lib/crypto/sm2.cpp +src/lib/crypto/sm2.h +src/lib/crypto/sm2_ossl.cpp +src/lib/crypto/symmetric_ossl.cpp +src/tests/issues/1030.cpp +src/tests/issues/1115.cpp +src/tests/issues/1171.cpp +src/tests/issues/oss-fuzz-25489.cpp +src/tests/data/test_key_validity/CMakeLists.txt +src/tests/data/test_key_validity/case5/CMakeLists.txt +src/tests/data/test_key_validity/case5/generate.cpp + +BSD 2-Clause License Apache License 2.0 +------------ +src/lib/crypto.cpp +src/lib/crypto.h +src/lib/pgp-key.cpp +src/lib/pgp-key.h +src/lib/types.h +src/librekey/key_store_pgp.cpp +src/librekey/key_store_pgp.h +src/lib/crypto/symmetric.cpp +src/lib/crypto/symmetric.h + +BSD 2-clause NetBSD License BSD 2-Clause License +------------ +LICENSE.md +src/lib/crypto/dsa.cpp +src/lib/crypto/rsa.cpp + +Boost Software License 1.0 +------------ +cmake/Modules/FindWindowsSDK.cmake + +MIT License +------------ +src/lib/crypto/sha1cd/sha1.c +src/lib/crypto/sha1cd/sha1.h +src/lib/crypto/sha1cd/ubc_check.c +src/lib/crypto/sha1cd/ubc_check.h diff --git a/rnp-keyring.gpg b/rnp-keyring.gpg new file mode 100644 index 0000000..0d1cf33 --- /dev/null +++ b/rnp-keyring.gpg @@ -0,0 +1,16 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mDMEYOUN0RYJKwYBBAHaRw8BAQdA3FRB/1WGnBDheAOEENZ1jnwOlzWyCGTmZi7u +d824hiW0LFJOUEdQIFJlbGVhc2UgU2lnbmluZyBLZXkgPHJucGdwQHJpYm9zZS5j +b20+iJYEExYIAD4WIQQxr1ok2GHvy3y3mhkkkAzgrvtUFwUCYOUN0QIbAQUJbeHV +gAULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRAkkAzgrvtUF42MAQDXfgjYWWqR +PkCvVhDQEjJVETNmwSgfhG/q3pMmGSlJFQD/ZJI9KhowbzGU0/qDXDERPoR2FYB5 +xx4BwotTOwketw64MwRjGxr6FgkrBgEEAdpHDwEBB0B5WpvGuJLXoMdAAIyNfOjd +Z7ittaBksxh/mfCPKcXrPoj1BBgWCAAmFiEEMa9aJNhh78t8t5oZJJAM4K77VBcF +AmMbGvoCGwIFCQPCZwAAgQkQJJAM4K77VBd2IAQZFggAHRYhBFDaWdW5E0+i2x6y +DPuCmrXQ/gF/BQJjGxr6AAoJEPuCmrXQ/gF/Zi4A/RwEZ17ZrXyn0kiY/DP6BSIt +p/6Sk9hG7KpkRqC3aaWsAQD2P6eZV6pWbhQp1C/kQYtgBbLOMUqmAg+5fMduhmaw +BDfrAP9PXS/3/h4R2UWvQ8yDv4BXztrnf61rX6re4iGpfixBZAD9FalZDJmCrdQm +toOkvaIWylfh5HgTM3lxXcO3Dz6W6QQ= +=Towq +-----END PGP PUBLIC KEY BLOCK----- diff --git a/rnp.spec b/rnp.spec index 3e23080..06c0e12 100644 --- a/rnp.spec +++ b/rnp.spec @@ -8,6 +8,7 @@ # %bcond_without tests +%bcond_with licensecheck %if 0%{?rhel} == 8 # use openssl by default as botan2 is too old @@ -24,14 +25,16 @@ Name: rnp Summary: OpenPGP (RFC4880) tools Version: 0.16.2 Release: 3%{?dist} -# From LICENSE.md -License: BSD-2-Clause AND BSD-3-Clause AND Apache-2.0 +# See rnp-files-by-license.txt +License: BSD-2-Clause AND BSD-3-Clause AND Apache-2.0 AND MIT URL: https://github.com/rnpgp/rnp Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz Source1: %{url}/releases/download/v%{version}/v%{version}.tar.gz.asc # See https://www.rnpgp.org/openpgp_keys/ Source2: %{name}-keyring.gpg +# Use --with licensecheck to generate +Source3: %{name}-files-by-license.txt BuildRequires: cmake >= 3.14 BuildRequires: gcc @@ -50,6 +53,10 @@ BuildRequires: cmake(GTest) %endif BuildRequires: python3 BuildRequires: gnupg2 +BuildRequires: rubygem-asciidoctor +%if %{with licensecheck} +BuildRequires: licensecheck +%endif Requires: %{libname}%{?_isa} = %{version}-%{release} @@ -78,6 +85,18 @@ for %{libname}. %setup -q %{?gpgverify:%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'} +%if %{with licensecheck} +LST=$(mktemp) + +licensecheck -r . | sed -e 's:^./::' >$LST +grep -v UNKNOWN $LST | sed -e 's/.*: //' | sort -u | while read lic +do + echo -e "\n$lic\n------------" + grep ": $lic\$" $LST | sed -e "s/: $lic//" +done | tee %{SOURCE3} +rm $LST +%endif + %build %cmake . \ @@ -105,6 +124,7 @@ for %{libname}. %files %{_bindir}/rnp %{_bindir}/rnpkeys +%{_mandir}/man1/rnp* %files -n %{libname} %license LICENSE* @@ -116,10 +136,14 @@ for %{libname}. %{_libdir}/%{libname}.so %{_libdir}/pkgconfig/%{libname}.pc %{_libdir}/cmake/rnp +%{_mandir}/man3/librnp* %changelog -* Fri Oct 28 2022 Remi Collet - 0.16.2-3 +* Wed Nov 2 2022 Remi Collet - 0.16.2-3 +- add files by license list in package sources +- open https://github.com/rnpgp/rnp/issues/1932 missing MIT +- add man pages - check archive signature * Fri Oct 28 2022 Remi Collet - 0.16.2-2 -- cgit