diff --git a/libkcapi-1.1.5.tar.xz b/libkcapi-1.1.5.tar.xz deleted file mode 100644 index 9720e08f3f6951a749568b351c42e35661318eb4..0000000000000000000000000000000000000000 Binary files a/libkcapi-1.1.5.tar.xz and /dev/null differ diff --git a/libkcapi-1.1.5.tar.xz.asc b/libkcapi-1.1.5.tar.xz.asc deleted file mode 100644 index 62e5d39c350cfcfdb7ec26f7dd9b7fec28228f2d..0000000000000000000000000000000000000000 --- a/libkcapi-1.1.5.tar.xz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCAAdFiEEO8xD1NLIfReEtp7kQh7pNjJqwVsFAl1BSvEACgkQQh7pNjJq -wVtOogf/UzYn7DUB4x0QQxODtaVbXrZ5FfFWDpKJxCVXWI64VK1kF6SSm+qD305h -Dj0lA7+TpIKhwKlc4kofaLjW/yeUPEoZCBjFSTeLc+A/7XP5m1Xqnz6fuH2lZwRK -o1p8ICPj9bOW9rj2K59pdHVTdXW1fj5sJOi25n9fLf5PcaPMxoawHG4l18tp7qNd -XXrqcfeSe+IF3Z4MJQee4lnsQE37wOJC8lanNDMXs7XZJ4RGUrJWfMWzVhVbh+D4 -n6Ow6H0ZaJDUksSh6faKBwAlo+c9J2CRe80+EIiAcYCKzQOH6ylnhdU1qKVD/kNK -7XMwTY3intV9FP3mhM/RPSLSOw7NLA== -=UN86 ------END PGP SIGNATURE----- diff --git a/libkcapi-1.2.0.tar.xz b/libkcapi-1.2.0.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..fe7be55dd290cd0158f1b1e0b540f8a5355274f0 Binary files /dev/null and b/libkcapi-1.2.0.tar.xz differ diff --git a/libkcapi-1.2.0.tar.xz.asc b/libkcapi-1.2.0.tar.xz.asc new file mode 100644 index 0000000000000000000000000000000000000000..9bcda7ca113d1882a07e0bb11c4d417ed1d068ed --- /dev/null +++ b/libkcapi-1.2.0.tar.xz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCAAdFiEEO8xD1NLIfReEtp7kQh7pNjJqwVsFAl7K1MMACgkQQh7pNjJq +wVueDgf/SEJfcgYYYcnND38nawuTXequkiq5TrhAb7AY/kx6LDQzXLRHlqLvjppV +QMUQyiiLypo+NF/qrsLhyGi2IwRePaieLfXTZWcE4eO/sqss9CbYsUtk7bcByFvG +YEDjTYooZU4NYx3WtpwegKF+ImBLmadDDbfkcGWcmNG5EEnh1Rtw0agg/5BxCxKy +F5aEdXWs/mU6CxgDi2EFT+8FAD2Lv80Kpn0qWAVWb03IbtzvAZ36CzP4lEywDqV2 +lZq3hZeOvBecjmGDFthMNB0CfknCHdPYvEhXuR6cSiYrmY3heUeS6Py1cPosab3A +xDePoFm3iYY4nALhCWOfp2/vPhZtgw== +=ZgIv +-----END PGP SIGNATURE----- diff --git a/libkcapi.spec b/libkcapi.spec index e814c581a182fdff3cc8741105f0f5c61a049455..408109a3302820357ab1d965be43144dc7703b40 100644 --- a/libkcapi.spec +++ b/libkcapi.spec @@ -3,8 +3,8 @@ %global distroname_ext %{_vendor} Name: libkcapi -Version: 1.1.5 -Release: 2 +Version: 1.2.0 +Release: 3 Summary: libkcapi - Linux Kernel Crypto API User Space Interface Library License: BSD or GPLv2 @@ -17,19 +17,17 @@ Patch0: libkcapi-1.1.1-lib_Fix_kcapi_handle_destroy_closing_FD_0.patch BuildRequires: clang coreutils cppcheck docbook-utils-pdf gcc git hardlink BuildRequires: libtool openssl perl systemd xmlto kernel-headers >= 4.10.0 -Requires: systemd coreutils openssl perl +Requires: systemd Provides: %{name}-tools Provides: hmaccalc == 0.9.14-10.1 Provides: hmaccalc%{?_isa} == 0.9.14-10.1 Provides: %{name}-hmaccalc -Provides: %{name}-tests Obsoletes: %{name}-replacements <= %{version}-%{release} Obsoletes: %{name}-tools Obsoletes: hmaccalc <= 0.9.14-10 Obsoletes: %{name}-hmaccalc -Obsoletes: %{name}-tests %description The Linux kernel exports a Netlink interface of type AF_ALG to allow user space to utilize the kernel crypto API. @@ -50,6 +48,18 @@ Provides: %{name}-tests %description devel Header files for applications that use %{name}. +%package tests +Summary: Testing scripts for the %{name} package +Requires: %{name}%{?_isa} == %{version}-%{release} +Requires: %{name}-tools +Requires: %{name}-hmaccalc +Requires: coreutils +Requires: openssl +Requires: perl + +%description tests +Auxiliary scripts for testing %{name}. + %package_help %prep @@ -132,7 +142,7 @@ find %{buildroot}%{_pkgdocdir} -type f -print | xargs %{__chmod} -c 0644 find %{buildroot}%{_pkgdocdir} -type d -print | xargs %{__chmod} -c 0755 for d in %{_mandir} %{_pkgdocdir}; do - %{_sbindir}/hardlink -cfv %{buildroot}$d + hardlink -cfv %{buildroot}$d done %ldconfig_scriptlets @@ -143,7 +153,7 @@ bin/kcapi-hasher -n sha512hmac %{buildroot}%{_bindir}/sha256hmac | cut -f 1 -d ' bin/kcapi-hasher -n sha512hmac %{buildroot}%{_bindir}/sha384hmac | cut -f 1 -d ' ' > %{buildroot}/%{_lib}/hmaccalc/sha384hmac.hmac bin/kcapi-hasher -n sha512hmac %{buildroot}%{_bindir}/sha512hmac | cut -f 1 -d ' ' > %{buildroot}/%{_lib}/hmaccalc/sha512hmac.hmac -%{_sbindir}/hardlink -cfv %{buildroot}%{_bindir} +hardlink -cfv %{buildroot}%{_bindir} bin/kcapi-hasher -n fipshmac -d %{buildroot}/%{_lib}/fipscheck %{buildroot}/%{_lib}/libkcapi.so.%{version} || exit 1 ln -s libkcapi.so.%{version}.hmac %{buildroot}/%{_lib}/fipscheck/libkcapi.so.1.hmac @@ -160,7 +170,6 @@ ln -s libkcapi.so.%{version}.hmac %{buildroot}/%{_lib}/fipscheck/libkcapi.so. %{_bindir}/kcapi* %{_bindir}/sha*hmac /%{_lib}/hmaccalc/sha*hmac.hmac -%{_libexecdir}/%{name}/* %files devel %doc %{_pkgdocdir}/CHANGES.md @@ -170,12 +179,33 @@ ln -s libkcapi.so.%{version}.hmac %{buildroot}/%{_lib}/fipscheck/libkcapi.so. %{_libdir}/pkgconfig/%{name}.pc /%{_lib}/%{name}.a +%files tests +%{_libexecdir}/%{name}/* + %files help %doc %{_pkgdocdir} %{_mandir}/man1/kcapi*.1.* %{_mandir}/man3/kcapi_*.3.* %changelog +* Thu Oct 22 2020 zhangxingliang - 1.2.0-3 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:Solve the failure when installing libkcapi-tests + +* Fri Oct 16 2020 zhangxingliang - 1.2.0-2 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC:Detach the sub package libkcapi-tests from libkcapi + +* Fri Jul 17 2020 yang_zhuang_zhuang - 1.2.0-1 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC:update to 1.2.0 + * Thu Nov 14 2019 openEuler Buildteam - 1.1.5-2 - Correct provides of hmaccalc diff --git a/libkcapi.yaml b/libkcapi.yaml new file mode 100644 index 0000000000000000000000000000000000000000..c1b8873c38411c8ceea56ddb64ce8cc25a66359f --- /dev/null +++ b/libkcapi.yaml @@ -0,0 +1,4 @@ +version_control: github +src_repo: smuellerDD/libkcapi +tag_prefix: ^v +seperator: .