Accepting request 1224837 from security:chipcard

OBS-URL: https://build.opensuse.org/request/show/1224837
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/coolkey?expand=0&rev=25
This commit is contained in:
Ana Guerrero 2024-11-18 19:02:20 +00:00 committed by Git OBS Bridge
commit 33ab597d55
3 changed files with 31 additions and 3 deletions

View File

@ -0,0 +1,19 @@
Index: coolkey-1.1.0/src/install/pk11install.c
===================================================================
--- coolkey-1.1.0.orig/src/install/pk11install.c
+++ coolkey-1.1.0/src/install/pk11install.c
@@ -200,9 +200,14 @@ installPKCS11(char *dirPath, char *dbTyp
/* don't call this if you have NSS initialized!!, use SECMOD_AddModule
* or SECMOD_AddUserModule instead */
+
+ /* Ignore this missing in the header for gcc14 */
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wimplicit-function-declaration"
rc = (char **) NSC_ModuleDBFunc(type == Install ?
SECMOD_MODULE_DB_FUNCTION_ADD :
SECMOD_MODULE_DB_FUNCTION_DEL, paramString, module);
+#pragma GCC diagnostic pop
if (verbose) {
fprintf(stderr, "Install \"%s\" in %s : %s\n", module, dirPath,
rc ? *rc : "Fail" );

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sat Nov 9 15:18:07 UTC 2024 - Angel Yankov <angel.yankov@suse.com>
- Fix build with gcc14 by ignoring some new errors
* Added coolkey-1.1.0-fix-build-gcc14.patch
-------------------------------------------------------------------
Mon Feb 26 10:48:26 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>

View File

@ -1,7 +1,7 @@
#
# spec file for package coolkey
#
# Copyright (c) 2022 SUSE LLC
# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -55,6 +55,8 @@ Patch24: coolkey-1.1.0-more-keys.patch
Patch25: coolkey-1.1.0-fail-on-bad-mechanisms.patch
Patch26: coolkey-1.1.0-max-cpu-bug.patch
Patch27: coolkey-1.1.0-rhel7-alt-cac.patch
Patch28: coolkey-1.1.0-fix-build-gcc14.patch
BuildRequires: gcc-c++
BuildRequires: libtool
BuildRequires: mozilla-nss-devel
@ -63,7 +65,7 @@ BuildRequires: mozilla-nss-tools
BuildRequires: pcsc-lite-devel
BuildRequires: pkgconfig
BuildRequires: zlib-devel
#Requires: pcsc-lite
Requires: pcsc-lite
# Requires: ifd-egate
Requires: pcsc-ccid
# 390 does not have libusb or smartCards
@ -123,10 +125,11 @@ CoolKeys are based on JavaCard 1.2.
%patch -P 25
%patch -P 26
%patch -P 27
%patch -P 28 -p1
%build
autoreconf -f -i
export CFLAGS="%{optflags} -fno-strict-aliasing"
export CFLAGS="%{optflags} -fno-strict-aliasing "
export CXXFLAGS="%{optflags} -fno-strict-aliasing"
%configure\
--with-debug\