From fdbf9ec661da1fa828dcece87b9fd1f2fef93a2e Mon Sep 17 00:00:00 2001 From: David King Date: Feb 19 2024 11:55:44 +0000 Subject: Update to 46.1 --- diff --git a/.gitignore b/.gitignore index f69bb5f..ffc9bff 100644 --- a/.gitignore +++ b/.gitignore @@ -79,3 +79,4 @@ gnome-keyring-2.31.4.tar.bz2 /gnome-keyring-40.0.tar.xz /gnome-keyring-42.0.tar.xz /gnome-keyring-42.1.tar.xz +/gnome-keyring-46.1.tar.xz diff --git a/gnome-keyring-42.0-fix-strncpy.patch b/gnome-keyring-42.0-fix-strncpy.patch deleted file mode 100644 index 1e2a3f1..0000000 --- a/gnome-keyring-42.0-fix-strncpy.patch +++ /dev/null @@ -1,78 +0,0 @@ -From f532e3de2bd77465c976abc913e3f0a5cd09a5d2 Mon Sep 17 00:00:00 2001 -From: Matt Turner -Date: Sun, 22 May 2022 13:00:46 -0400 -Subject: [PATCH] pkcs11: Don't use strncpy when copying paths -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Using strncpy produces the following warning, which indicates that the -destination string could be left unterminated. - - CC daemon/control/gkd-control-server.lo - CCLD libgkd-control.la - CC pkcs11/rpc-layer/libgkm_rpc_layer_la-gkm-rpc-dispatch.lo -In file included from /usr/include/string.h:519, - from /usr/include/glib-2.0/glib/galloca.h:33, - from /usr/include/glib-2.0/glib.h:30, - from ./egg/egg-error.h:24, - from pkcs11/rpc-layer/gkm-rpc-dispatch.c:31: -In function ‘strncpy’, - inlined from ‘gkm_rpc_layer_startup’ at pkcs11/rpc-layer/gkm-rpc-dispatch.c:2382:2: -/usr/include/bits/string_fortified.h:95:10: warning: ‘__builtin_strncpy’ specified bound 108 equals destination size [-Wstringop-truncation] - 95 | return __builtin___strncpy_chk (__dest, __src, __len, - | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - 96 | __glibc_objsize (__dest)); - | ~~~~~~~~~~~~~~~~~~~~~~~~~ ---- - pkcs11/rpc-layer/gkm-rpc-dispatch.c | 4 +++- - pkcs11/rpc-layer/gkm-rpc-module.c | 4 +++- - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/pkcs11/rpc-layer/gkm-rpc-dispatch.c b/pkcs11/rpc-layer/gkm-rpc-dispatch.c -index 72d2ced1..dbedb355 100644 ---- a/pkcs11/rpc-layer/gkm-rpc-dispatch.c -+++ b/pkcs11/rpc-layer/gkm-rpc-dispatch.c -@@ -31,6 +31,8 @@ - #include "egg/egg-error.h" - #include "egg/egg-unix-credentials.h" - -+#include -+ - #include - #include - #include -@@ -2379,7 +2381,7 @@ gkm_rpc_layer_startup (const char *prefix) - memset(&addr, 0, sizeof(addr)); - addr.sun_family = AF_UNIX; - unlink (pkcs11_socket_path); -- strncpy (addr.sun_path, pkcs11_socket_path, sizeof (addr.sun_path)); -+ g_strlcpy (addr.sun_path, pkcs11_socket_path, sizeof (addr.sun_path)); - if (bind (sock, (struct sockaddr*)&addr, sizeof (addr)) < 0) { - gkm_rpc_warn ("couldn't bind to pkcs11 socket: %s: %s", - pkcs11_socket_path, strerror (errno)); -diff --git a/pkcs11/rpc-layer/gkm-rpc-module.c b/pkcs11/rpc-layer/gkm-rpc-module.c -index 24457ce1..515b18a4 100644 ---- a/pkcs11/rpc-layer/gkm-rpc-module.c -+++ b/pkcs11/rpc-layer/gkm-rpc-module.c -@@ -29,6 +29,8 @@ - - #include "egg/egg-unix-credentials.h" - -+#include -+ - #include - #include - #include -@@ -233,7 +235,7 @@ call_connect (CallState *cs) - debug (("connecting to: %s", pkcs11_socket_path)); - - addr.sun_family = AF_UNIX; -- strncpy (addr.sun_path, pkcs11_socket_path, sizeof (addr.sun_path)); -+ g_strlcpy (addr.sun_path, pkcs11_socket_path, sizeof (addr.sun_path)); - - sock = socket (AF_UNIX, SOCK_STREAM, 0); - if (sock < 0) { --- -GitLab - diff --git a/gnome-keyring-c89.patch b/gnome-keyring-c89.patch deleted file mode 100644 index d24cb6c..0000000 --- a/gnome-keyring-c89.patch +++ /dev/null @@ -1,21 +0,0 @@ -S-expressions test: Call gkm_crypto_sign_xsa with correct size type - -The underlying type for gsize can be unsigned int, which is a distinct -type from unsigned long (the type behind CK_ULONG). The mismatch -results in compilation failures with GCC 14. - -Submitted upstream: - -diff --git a/pkcs11/gkm/test-sexp.c b/pkcs11/gkm/test-sexp.c -index ba104a0e5b776669..fccf672353ddf42f 100644 ---- a/pkcs11/gkm/test-sexp.c -+++ b/pkcs11/gkm/test-sexp.c -@@ -224,7 +224,7 @@ test_sign_verify (Test *test, gconstpointer unused) - guchar data[] = TEST_DATA; - guchar data_size = TEST_DATA_SIZE; - guchar signature[128]; -- gsize signature_size = 128; -+ CK_ULONG signature_size = 128; - - /* RSA */ - /* sign some data */ diff --git a/gnome-keyring.spec b/gnome-keyring.spec index a716e18..73daede 100644 --- a/gnome-keyring.spec +++ b/gnome-keyring.spec @@ -5,7 +5,7 @@ %bcond_without ssh_agent Name: gnome-keyring -Version: 42.1 +Version: 46.1 Release: %autorelease Summary: Framework for managing passwords and other secrets @@ -13,10 +13,7 @@ Summary: Framework for managing passwords and other secrets # pkcs11/ is MPL-1.1 OR GPL-2.0-or-later OR LGPL-2.1-or-later License: GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND ((GPL-2.0-or-later OR LGPL-3.0-or-later) OR BSD-3-Clause) AND (MPL-1.1 OR GPL-2.0-or-later OR LGPL-2.1-or-later) URL: https://wiki.gnome.org/Projects/GnomeKeyring -Source0: https://download.gnome.org/sources/%{name}/42/%{name}-%{version}.tar.xz -# https://gitlab.gnome.org/GNOME/gnome-keyring/-/merge_requests/52 -Patch0: gnome-keyring-42.0-fix-strncpy.patch -Patch1: gnome-keyring-c89.patch +Source0: https://download.gnome.org/sources/%{name}/46/%{name}-%{version}.tar.xz BuildRequires: pkgconfig(gcr-3) >= %{gcr_version} BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version} diff --git a/sources b/sources index 7c3137d..d97937d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-keyring-42.1.tar.xz) = 560dc409c21768dcbdf42151986a5bbbfb9a092d2c36295cf76bd603cdf9650fa80670631c7fb8b3e1822bed6a1f55c34b2170a1419ce45fbe8ca08c7eaf3a57 +SHA512 (gnome-keyring-46.1.tar.xz) = 82d9685a87b43c6aa1f377114af389675836df4b5c26d43d6843f1dfac6ae0eb771a4ac67f71e5a2f5b88cbdbb5300d63bfcfd8087ee60463a9579d242c6b884