Bug#988088: unblock: libica/3.2.0-4

[Jochen Sprickerhof <jspricke@debian.org>]

Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package libica

[ Reason ]
The package fails to build with GCC 10 due to multiple definitions of
variables in the test suite (#987614).

[ Impact ]
libica is a transitive build dependency of simple-tpm-pk11 on s390x.

[ Tests ]
I successfully tested the build and test suite on zelenka.

[ Risks ]
As the changes are only in the test suite and rather simple I don't see
a risk.

[ Checklist ]
  [X] all changes are documented in the d/changelog
  [X] I reviewed all changes and I approve them
  [X] attach debdiff against the package in testing

[ Other info ]
The upstream website moved to Github, so I updated the homepage filed,
hope that's fine.

unblock libica/3.2.0-4

diff -Nru libica-3.2.0/debian/changelog libica-3.2.0/debian/changelog
--- libica-3.2.0/debian/changelog	2019-03-12 05:04:53.000000000 +0100
+++ libica-3.2.0/debian/changelog	2021-05-05 09:27:48.000000000 +0200
@@ -1,3 +1,11 @@
+libica (3.2.0-4) unstable; urgency=medium
+
+  * QA upload.
+  * Add multiple_defines.patch, fixes a FTBFS with gcc 10 (Closes: 987614).
+  * Update homepage field.
+
+ -- Jochen Sprickerhof <jspricke@debian.org>  Wed, 05 May 2021 09:27:48 +0200
+
 libica (3.2.0-3) unstable; urgency=medium
 
   * QA upload.
diff -Nru libica-3.2.0/debian/control libica-3.2.0/debian/control
--- libica-3.2.0/debian/control	2019-03-12 05:04:50.000000000 +0100
+++ libica-3.2.0/debian/control	2021-05-05 09:27:48.000000000 +0200
@@ -4,7 +4,7 @@
 Build-Depends: debhelper (>= 10), dh-autoreconf, libssl-dev, autoconf-archive
 Standards-Version: 4.1.0
 Section: libs
-Homepage: http://sourceforge.net/projects/opencryptoki/files/libica/
+Homepage: https://github.com/opencryptoki/libica
 
 Package: libica-dev
 Section: libdevel
diff -Nru libica-3.2.0/debian/patches/multiple_defines.patch libica-3.2.0/debian/patches/multiple_defines.patch
--- libica-3.2.0/debian/patches/multiple_defines.patch	1970-01-01 01:00:00.000000000 +0100
+++ libica-3.2.0/debian/patches/multiple_defines.patch	2021-05-05 09:27:48.000000000 +0200
@@ -0,0 +1,29 @@
+Description: Remove multiple definitions in the test suite
+ Fixes the build with gcc 10.
+Author: Jochen Sprickerhof <jspricke@debian.org>
+Bug-Debian: https://bugs.debian.org/987614
+Forwarded: not-needed
+Last-Update: 2021-05-05
+
+--- libica-3.2.0.orig/src/tests/libica_sha_test/include/sha_tests.h
++++ libica-3.2.0/src/tests/libica_sha_test/include/sha_tests.h
+@@ -23,5 +23,4 @@ int sha3_256_api_test(test_t * test);
+ int sha3_384_api_test(test_t * test);
+ int sha3_512_api_test(test_t * test);
+ 
+-int silent;
+ #endif
+--- libica-3.2.0.orig/src/tests/libica_sha_test/sha_tests.c
++++ libica-3.2.0/src/tests/libica_sha_test/sha_tests.c
+@@ -8,9 +8,9 @@
+ #include "queue_t.h"
+ #include "sha_tests.h"
+ #include "critical_error.h"
+-#define VERBOSE_EXTERN
++#define VERBOSITY_EXTERN
+ #include "../testcase.h"
+-#undef VERBOSE_EXTERN
++#undef VERBOSITY_EXTERN
+ 
+ #define SHA1_BLOCK_SIZE		(512 / 8)
+ #define SHA224_BLOCK_SIZE	(512 / 8)
diff -Nru libica-3.2.0/debian/patches/series libica-3.2.0/debian/patches/series
--- libica-3.2.0/debian/patches/series	2017-10-04 11:28:19.000000000 +0200
+++ libica-3.2.0/debian/patches/series	2021-05-05 09:27:48.000000000 +0200
@@ -1 +1,2 @@
 test-suite.patch
+multiple_defines.patch