Accepting request 1003633 from devel:openSUSE:Factory

Updated package for jsc#PED-581, jsc#PED-621, jsc#PED-629

OBS-URL: https://build.opensuse.org/request/show/1003633
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libica?expand=0&rev=24

baselibs.conf

@@ -1 +1 @@
-libica3
+libica4

libica-3.9.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4969f9d30dbd0e81fe328161dfcbb313d6aebd79224077eaf99779e9ad895d03
-size 553295

libica-4.0.3.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fe44e8b31f0d0f09da3f86ef46d6089fea7d7c453f5d196b88cee6ab4621a385
+size 553081

libica-FIPS-make-it-possible-to-specify-fipshmac-binary.patch

@@ -32,13 +32,15 @@ diff --git a/src/Makefile.am b/src/Makefile.am
 index 4a1ef14..2be01a5 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -46,13 +46,13 @@ mp.S	: mp.pl
+@@ -47,6 +47,7 @@
  	./mp.pl mp.S
  
  if ICA_FIPS
 +FIPSHMAC ?= ${top_srcdir}/openssl-fipshmac
- hmac-file-lnk: hmac-file
+ fipsinstall:
- 	$(AM_V_GEN) cd ${top_builddir}/src/.libs && ln -sf .libica.so.$(VERSION1).hmac .libica.so.$(MAJOR).hmac
+ 	$(AM_V_GEN) openssl dgst -sha256 -mac hmac -macopt hexkey:00000000 $(DESTDIR)$(libdir)/libica.so.$(VERSION1) | sed -e 's/^.* //' > $(DESTDIR)$(libdir)/.libica.so.$(VERSION1).hmac
+ 	$(AM_V_GEN) cd $(DESTDIR)$(libdir) && ln -sf .libica.so.$(VERSION1).hmac .libica.so.$(MAJOR).hmac
+@@ -58,8 +59,7 @@
  	$(AM_V_GEN) cd ${top_builddir}/src/.libs && ln -sf .libica-cex.so.$(VERSION1).hmac .libica-cex.so.$(MAJOR).hmac
  
  hmac-file: libica.la libica-cex.la

libica-rpmlintrc

@@ -1,5 +1,3 @@
-addFilter("libica-tools.* shlib-policy-missing-lib")
+addFilter("libica-tools.* * devel-file-in-non-devel-package * /usr/lib64/libica.so")
-addFilter("libica-devel-static.* shlib-policy-missing-lib")
-addFilter("libica-tools.* devel-file-in-non-devel-package .* /usr/lib64/libica.so")
-addFilter("libica-tools.* files-duplicate /usr/share/doc/packages/libica-tools/COPYING /usr/share/doc/packages/libica-tools/LICENSE")
 addFilter("libica*.* hidden-file-or-dir /usr/lib64/.libica.so.*.hmac")
+addFilter("libica*.* hidden-file-or-dir /usr/lib64/.libica-cex.so.*.hmac")

libica-sles15sp5-FIPS-hmac-key.patch

@@ -1,6 +1,8 @@
---- libica-3.6.0/src/fips.c	2020-05-04 17:01:23.238805001 -0400
+--- libica-4.3.0/src/fips.c	2020-05-04 17:01:23.238805001 -0400
-+++ libica-3.6.0/src/fips.c	2020-05-04 16:58:51.352241763 -0400
++++ libica-4.3.0/src/fips.c	2020-05-04 16:58:51.352241763 -0400
-@@ -45,8 +45,7 @@
+@@ -65,10 +65,9 @@
+  * integrity test. The recommended key size for HMAC-SHA256 is 64 bytes.
+  * The known HMAC is supposed to be provided as hex string in a file
   * .libica.so.VERSION.hmac in the same directory as the .so module.
 - */
 + /* HMAC key is hexidecimal for: "orboDeJITITejsirpADONivirpUkvarP" */
@@ -9,5 +11,5 @@
 -	"0000000000000000000000000000000000000000000000000000000000000000";
 +	"6f72626f44654a49544954656a7369727041444f4e6976697270556b76617250";
  
- int fips;
+ #endif /* ICA_INTERNAL_TEST */
  

libica.changes

@@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Mon Sep 12 19:09:59 UTC 2022 - Mark Post <mpost@suse.com>
+
+- Upgraded to version 4.0.3 (jsc#PED-581, jsc#PED-621, jsc#PED-629)
+  v4.0.3
+   - [PATCH] Reduce the number of open file descriptors
+   - [PATCH] Various bug fixes
+  v4.0.2
+   - [PATCH] Various bug fixes
+  v4.0.1
+   - [PATCH] Various bug fixes
+   - [PATCH] Compute HMAC from installed library
+  v4.0.0
+   - [UPDATE] NO_SW_FALLBACKS is now the default for libica.so
+     [UPDATE] Removed deprecated API functions including tests
+     [UPDATE] Introduced 'const' for some API function parameters
+     [FEATURE] icastats: new parm -k to display detailed counters
+- Replaced libica-sles15sp2-FIPS-hmac-key.patch with an updated
+  version named libica-sles15sp5-FIPS-hmac-key.patch.
+- Updated the libica-rpmlintrc file to suppress warnings about the 
+  libica-cex hmac files being hidden.
+- Updated the spec file to properly both obsolete and provide two
+  older versions of the package.
+
 -------------------------------------------------------------------
 Tue Oct 19 21:20:22 UTC 2021 - Mark Post <mpost@suse.com>
 

libica.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libica
 #
-# Copyright (c) 2018-2021 SUSE LLC
+# Copyright (c) 2018-2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -22,7 +22,7 @@
 %endif
 
 Name:           libica
-Version:        3.9.0
+Version:        4.0.3
 Release:        0
 Summary:        Library interface for the IBM Cryptographic Accelerator device driver
 License:        CPL-1.0
@@ -38,7 +38,7 @@ Source5:        z90crypt.service
 Source6:        baselibs.conf
 Source7:        %{name}-rpmlintrc
 Patch01:        libica-FIPS-make-it-possible-to-specify-fipshmac-binary.patch
-Patch99:        libica-sles15sp2-FIPS-hmac-key.patch
+Patch99:        libica-sles15sp5-FIPS-hmac-key.patch
 
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -54,12 +54,12 @@ This package contains the interface library routines used by IBM
 modules to interface with the IBM eServer Cryptographic Accelerator
 (ICA).
 
-%package -n libica3
+%package -n libica4
 Summary:        Library interface for the IBM Cryptographic Accelerator
 Group:          System/Libraries
 Recommends:     libica-tools
 
-%description -n libica3
+%description -n libica4
 This package contains the interface library routines used by IBM
 modules to interface with the IBM eServer Cryptographic Accelerator
 (ICA).
@@ -68,10 +68,14 @@ modules to interface with the IBM eServer Cryptographic Accelerator
 Summary:        Utilities for the IBM Cryptographic Accelerator
 Group:          Hardware/Other
 Obsoletes:      libica < %{version}-%{release}
-Obsoletes:      libica-2_3_0
+Obsoletes:      libica-2_3_0 < %{version}-%{release}
-Obsoletes:      libica2
+Obsoletes:      libica2 < %{version}-%{release}
+Obsoletes:      libica3 < %{version}-%{release}
 Provides:       libica = %{version}-%{release}
+Provides:       libica-2_3_0 = %{version}-%{release}
 Provides:       libica-plugin = %{version}-%{release}
+Provides:       libica2 = %{version}-%{release}
+Provides:       libica3 = %{version}-%{release}
 
 %description tools
 This package contains command-line utilities to inspect the IBM
@@ -80,7 +84,7 @@ eServer Cryptographic Accelerator (ICA).
 %package        devel
 Summary:        Development files for the ICA device driver interface library
 Group:          Development/Libraries/C and C++
-Requires:       libica3 = %{version}
+Requires:       libica4 = %{version}
 Requires:       libopenssl-devel
 Obsoletes:      libica-2_1_0-devel < %{version}-%{release}
 Provides:       libica-2_1_0-devel = %{version}-%{release}
@@ -127,6 +131,7 @@ autoreconf --force --install
 
 %install
 %make_install FIPSHMAC=fipshmac
+make fipsinstall FIPSHMAC=fipshmac DESTDIR=%{buildroot}
 mkdir -p %{buildroot}%{_includedir}
 cp -p include/ica_api.h %{buildroot}%{_includedir}
 mkdir -p %{buildroot}%{_sbindir}
@@ -160,10 +165,10 @@ rmdir %{buildroot}%{_datadir}/doc/libica
 %postun tools
 %service_del_postun z90crypt.service
 
-%post   -n libica3 -p /sbin/ldconfig
+%post   -n libica4 -p /sbin/ldconfig
-%postun -n libica3 -p /sbin/ldconfig
+%postun -n libica4 -p /sbin/ldconfig
 
-%files -n libica3
+%files -n libica4
 %{_libdir}/libica.so.%{version}
 %{_libdir}/libica.so.%{major}
 %{_libdir}/.libica.so.%{version}.hmac
@@ -177,7 +182,7 @@ rmdir %{buildroot}%{_datadir}/doc/libica
 %license LICENSE
 %doc README.SUSE
 %{_sbindir}/rcz90crypt
-%{_fillupdir}/sysconfig.z90crypt
+%attr(644,root,root) %{_fillupdir}/sysconfig.z90crypt
 %{_bindir}/icainfo
 %{_bindir}/icainfo-cex
 %{_bindir}/icastats