SPECS/libkcapi.spec

@@ -104,7 +104,7 @@
 %{__arch_install_post}                                           \
 %{__os_install_post}                                             \
 bin_path=%{buildroot}%{_bindir}                                  \
-lib_path=%{buildroot}%{_libdir}                                  \
+lib_path=%{buildroot}/%{_lib}                                    \
 for app in %{apps_hmaccalc}; do                                  \
   test -e "$bin_path"/$app || continue                           \
   { %sha512hmac "$bin_path"/$app || exit 1; }                    \\\
@@ -114,13 +114,14 @@ for app in %{apps_fipscheck}; do                                 \
   test -e "$bin_path"/$app || continue                           \
   %fipshmac -d "$lib_path"/fipscheck "$bin_path"/$app || exit 1  \
 done                                                             \
-%{_bindir}/hardlink -cfv %{buildroot}%{_bindir}                  \
+%{_sbindir}/hardlink -cfv %{buildroot}%{_bindir}                 \
 %fipshmac -d "$lib_path"/fipscheck                               \\\
   "$lib_path"/libkcapi.so.%{version} || exit 1                   \
 %{__ln_s} libkcapi.so.%{version}.hmac                            \\\
   "$lib_path"/fipscheck/libkcapi.so.%{vmajor}.hmac               \
 %{nil}
 
+
 Name:           libkcapi
 Version:        %{vmajor}.%{vminor}.%{vpatch}
 Release:        2%{?dist}
@@ -192,11 +193,7 @@ Header files for applications that use %{name}.
 %if %{with doc}
 %package        doc
 Summary:        User documentation for the %{name} package
-BuildArch:      noarch
+Requires:       %{name}%{?_isa} == %{version}-%{release}
-# Depend on one of the base packages because they have the license files
-# We cannot just bundle them into doc because they might conflict with an
-# older or newer version of the base package.
-Requires:       %{name} == %{version}-%{release}
 
 %description    doc
 User documentation for %{name}.
@@ -333,7 +330,7 @@ EOF
 
 %build
 %configure               \
-  --libdir=%{_libdir}  \
+  --libdir=/%{_lib}      \
   --disable-silent-rules \
   --enable-kcapi-encapp  \
   --enable-kcapi-dgstapp \
@@ -344,7 +341,7 @@ EOF
   --enable-shared        \
   --enable-static        \
   --enable-sum-prefix=   \
-  --enable-sum-dir=%{_libdir} \
+  --enable-sum-dir=/%{_lib} \
   --with-pkgconfigdir=%{_libdir}/pkgconfig
 %if %{with doc}
 %make_build all doc
@@ -412,7 +409,7 @@ EOF
 
 # Possibly save some space by hardlinking.
 for d in %{_mandir} %{_pkgdocdir}; do
-  %{_bindir}/hardlink -cfv %{buildroot}$d
+  %{_sbindir}/hardlink -cfv %{buildroot}$d
 done
 
 
@@ -452,10 +449,10 @@ popd
 %doc %dir %{_pkgdocdir}
 %doc %{_pkgdocdir}/README.md
 %license COPYING*
-%{_libdir}/%{name}.so.%{vmajor}
+/%{_lib}/%{name}.so.%{vmajor}
-%{_libdir}/%{name}.so.%{version}
+/%{_lib}/%{name}.so.%{version}
-%{_libdir}/fipscheck/%{name}.so.%{vmajor}.hmac
+/%{_lib}/fipscheck/%{name}.so.%{vmajor}.hmac
-%{_libdir}/fipscheck/%{name}.so.%{version}.hmac
+/%{_lib}/fipscheck/%{name}.so.%{version}.hmac
 %if %{with_sysctl_tweak}
 %doc %{_pkgdocdir}/README.%{distroname_ext}
 %{_sysctldir}/%{sysctl_prio}-%{name}-optmem_max.conf
@@ -467,7 +464,7 @@ popd
 %doc %{_pkgdocdir}/TODO
 %{_includedir}/kcapi.h
 %{_mandir}/man3/kcapi_*.3.*
-%{_libdir}/%{name}.so
+/%{_lib}/%{name}.so
 %{_libdir}/pkgconfig/%{name}.pc
 
 
@@ -484,28 +481,28 @@ popd
 %{_bindir}/md5sum
 %{_bindir}/sha*sum
 %{_bindir}/sm*sum
-%{_libdir}/fipscheck/md5sum.hmac
+/%{_lib}/fipscheck/md5sum.hmac
-%{_libdir}/fipscheck/sha*sum.hmac
+/%{_lib}/fipscheck/sha*sum.hmac
-%{_libdir}/fipscheck/sm*sum.hmac
+/%{_lib}/fipscheck/sm*sum.hmac
 %endif
 
 %if %{with replace_fipscheck}
 %files          fipscheck
 %{_bindir}/fips*
-%{_libdir}/fipscheck/fips*.hmac
+/%{_lib}/fipscheck/fips*.hmac
 %endif
 
 %if %{with replace_hmaccalc}
 %files          hmaccalc
 %{_bindir}/sha*hmac
 %{_bindir}/sm*hmac
-%{_libdir}/hmaccalc/sha*hmac.hmac
+/%{_lib}/hmaccalc/sha*hmac.hmac
-%{_libdir}/hmaccalc/sm*hmac.hmac
+/%{_lib}/hmaccalc/sm*hmac.hmac
 %endif
 
 
 %files          static
-%{_libdir}/%{name}.a
+/%{_lib}/%{name}.a
 
 
 %files          tools
@@ -522,134 +519,87 @@ popd
 %changelog
 * Fri Dec 01 2023 Zoltan Fridrich <zfridric@redhat.com> - 1.4.0-2
 - Backport fixes for kcapi-hasher target option
-  Related: RHEL-15298
+  Related: RHEL-15300
 - Fix kcapi tests in FIPS mode
-  Resolves: RHEL-2405
+  Resolves: RHEL-2406
 
 * Wed Nov 01 2023 Zoltan Fridrich <zfridric@redhat.com> - 1.4.0-1
 - Update to new upstream release 1.4.0
-  Resolves: RHEL-5367
+  Resolves: RHEL-5366
 - Add a patch to fix auxiliary tests in FIPS mode
-  Resolves: RHEL-2405
+  Resolves: RHEL-2406
 - Add a patch to zeroize kcapi-hasher for FIPS 140-3
-  Resolves: RHEL-15112
+  Resolves: RHEL-15290
 - Add a patch to allow overriding target file in kcapi-hasher
-  Resolves: RHEL-15298
+  Resolves: RHEL-15300
 
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.3.1-3
+* Tue May 26 2020 Sahana Prasad <sahana@redhat.com> - 1.2.0-2
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Fix double free issue in hasher()
-  Related: rhbz#1991688
 
-* Thu Jul 15 2021 Simo Sorce <simo@redhat.com> - 1.3.1-2
+* Mon May 25 2020 Sahana Prasad <sahana@redhat.com> - 1.2.0-1
-- Bring back usage of %{_libdir} instead of /%{_lib}
+- [RHEL] Update to upstream version 1.2.0
-- Resolves: rhbz#1982620
 
-* Wed Jul 14 2021 Simo Sorce <simo@redhat.com> - 1.3.1-1
+* Thu Apr 30 2020 Sahana Prasad <sahana@redhat.com> - 1.1.5-3
-- Update to new upstream release 1.3.1
+- Enables building on old kernels [sync fix in Fedora from omosnance].
-- This fixes ABI issues and incorporates previous patches
+- This is required for covscans as they run on RHEL7 machines.
 
-* Mon Jul 12 2021 Simo Sorce <simo@redhat.com> - 1.3.0-1
+* Wed Apr 29 2020 Sahana Prasad <sahana@redhat.com> - 1.1.5-2
-- Update to new upstream release 1.3.0
+- Drop the license from the doc subpackage to avoid conflicts
 
-* Tue Jun 22 2021 Mohan Boddu <mboddu@redhat.com> - 1.2.1-3
+* Mon Apr 27 2020 Sahana Prasad <sahana@redhat.com> - 1.1.5-1
-- Rebuilt for RHEL 9 BETA for openssl 3.0
+- [RHEL] Update to upstream version 1.1.5
-  Related: rhbz#1971065
+- [RHEL] Sync with Fedora branch
 
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.2.1-2
+* Thu Aug 09 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.1-16_1
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+- [RHEL] Apply 'Add missing dependencies to the tests package'
-
+- [RHEL] Apply 'Update patch from upstream'
-* Mon Mar 15 2021 Sahana Prasad <sahana@redhat.com> - 1.2.1-1
-- Update to upstream version 1.2.1
-- Remove patch fix MSG_MORE uasge as it is added upstream
-- Remove cppcheck dependency for rhel bz#1931518
-- Add a patch to fix fuzz tests
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Fri Aug 14 2020 Ondrej Mosnáček <omosnace@redhat.com> - 1.2.0-3
-- Require perl-interpreter instead of full perl
-- Backport fix for 5.9 kernels
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon May 25 2020 Sahana Prasad <omosnace@redhat.com> - 1.2.0-1
-- Update to upstream version 1.2.0 tracked by BZ 1839592.
-- Enable kcapi-enc tests as libkcapi BZ 1826022 is fixed.
-- Remove 110-fipshmac-compat.patch as the changes are merged upstream.
-- Remove 100-workaround-cppcheck-bug.patch as the changes are merged upstream.
-
-* Tue May 05 2020 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.5-5
-- Fix the CI test failures
-- Enable building on old kernels
-- Avoid conflicts between different versions of packages
-
-* Thu Apr 23 2020 Tomáš Mráz <tmraz@redhat.com> - 1.1.5-4
-- Add . prefix to files created by fipshmac if -d option is not specified
-
-* Wed Apr 22 2020 Sahana Prasad <sahana@redhat.com> - 1.1.5-3
-- Disables kcapi-enc tests until the kernel bug bz 1826022 is fixed.
-- Produce also the fipscheck replacement package
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.5-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Tue Aug 13 2019 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.5-1
-- Update to upstream version 1.1.5
-
-* Sat Jul 27 2019 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.4-6
-- Backport patch to fix test failure on aarch64
-- Remove no longer needed ppc64 workaround
-
-* Sat Jul 27 2019 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.4-5
-- Backport patch to fix tests
-
-* Thu Jul 25 2019 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.4-4
-- Work around cppcheck issue
-- Enable gating
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.4-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Mon May 27 2019 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.4-2
-- Fix FTBFS: hardlink is now in bindir
-
-* Sat Feb 02 2019 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.4-1
-- Update to upstream version 1.1.4
-
-* Fri Feb 01 2019 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.3-3
-- Fix build with new GCC
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Thu Aug 23 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.3-1
-- Update to upstream version 1.1.3
 
 * Thu Aug 09 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.1-16
 - Add missing dependencies to the tests package
 - Update patch from upstream
 
+* Thu Aug 09 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.1-15_1
+- [RHEL] Apply 'Build and tests require perl'
+
 * Thu Aug 09 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.1-15
 - Build and tests require perl
 
+* Thu Aug 09 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.1-14_2
+- [RHEL] Re-enable AEAD tests and ignore test result
+- [RHEL] Drop the ppc64 ignore-failures workaround
+
+* Thu Aug 09 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.1-14_1
+- [RHEL] Apply 'Add missing script to the 'tests' package'
+
 * Thu Aug 09 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.1-14
 - Add missing script to the 'tests' package
 
+* Wed Aug 08 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.1-13_1
+- [RHEL] Sync with the Fedora branch
+
 * Wed Aug 08 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.1-13
 - Add missing requires to the 'tests' subpackage
 
+* Wed Aug 08 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.1-12_1
+- [RHEL] Sync with the Fedora branch
+
 * Tue Aug 07 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.1-12
 - Produce a subpackage with test scripts
 - Build the 'tests' subpackage conditionally
 
+* Wed Aug 01 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.1-11_1
+- [RHEL] Sync with the Fedora branch
+
 * Wed Aug 01 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.1-11
 - Add patch to fix unwanted closing of FD 0
 
 * Tue Jul 31 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.1-10
 - Remove the kernel headers workaround
 
+* Mon Jul 30 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.1-9_1
+- [RHEL] Sync with the Fedora branch
+- [RHEL] Rebase the disable-AEAD-tests patch
+
 * Fri Jul 27 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.1.1-9
 - Rebuild for new binutils
 
@@ -658,10 +608,18 @@ popd
 - Add patch to fix AEAD fuzz test for BE arches
 - Fixup specfile
 
+* Mon Jul 23 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.1-7_1
+- [RHEL] Sync with the Fedora branch
+- [RHEL] Fixup specfile
+- [RHEL] Rebase the disable-AEAD-tests patch
+
 * Mon Jul 23 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.1-7
 - Add various fixes from upstream
 - Drop the Requires on kernel package
 
+* Wed Jul 18 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.1-3_2
+- [RHEL] Temporarily disable AEAD tests
+
 * Mon Jul 16 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.1-6
 - Put .hmac files into a separate directory
 
@@ -671,12 +629,28 @@ popd
 * Thu Jul 12 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.1-4
 - Add patch to work around FTBFS on rawhide
 
+* Wed Jul 11 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.1-3_1
+- [RHEL] Sync with the Fedora branch
+
 * Wed Jul 11 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.1-3
 - Fix off-by-one error in checkfile parsing
 
+* Wed Jul 11 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.1-2_2
+- [RHEL] Disable fuzz test
+
+* Wed Jul 11 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.1-2_1
+- [RHEL] Sync with the Fedora branch
+
 * Wed Jul 11 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.1-2
 - Fix command-line parsing in libkcapi-hmaccalc
 
+* Tue Jul 10 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.1-1_2
+- [RHEL] Work around build failure with new kernel headers
+
+* Mon Jun 18 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.1-1_1
+- [RHEL] Skip CLang static analysis
+- [RHEL] Remove the dependency on kernel package
+
 * Mon Jun 18 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.1-1
 - Update to upstream version 1.1.1