Compare commits
19 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
157aa5a73a | ||
|
658abffaac | ||
|
2570ab951a | ||
|
a1aff4e992 | ||
|
e8e79b7036 | ||
|
e4be4e4a04 | ||
|
e75eb6447a | ||
|
84071064fd | ||
|
3949a3b1a1 | ||
|
657c90b7b5 | ||
|
27b574eb7b | ||
|
a8bef74dd7 | ||
|
f592fdc2b8 | ||
|
fd2331f9ce | ||
|
7bb82aa723 | ||
|
a96d4914ea | ||
|
78e727ade5 | ||
|
62a19e5893 | ||
|
4a7a05916f |
6
.gitignore
vendored
6
.gitignore
vendored
@ -73,3 +73,9 @@ gnome-keyring-2.31.4.tar.bz2
|
|||||||
/gnome-keyring-3.31.90.tar.xz
|
/gnome-keyring-3.31.90.tar.xz
|
||||||
/gnome-keyring-3.31.91.tar.xz
|
/gnome-keyring-3.31.91.tar.xz
|
||||||
/gnome-keyring-3.34.0.tar.xz
|
/gnome-keyring-3.34.0.tar.xz
|
||||||
|
/gnome-keyring-3.35.1.tar.xz
|
||||||
|
/gnome-keyring-3.35.90.tar.xz
|
||||||
|
/gnome-keyring-3.36.0.tar.xz
|
||||||
|
/gnome-keyring-40.0.tar.xz
|
||||||
|
/gnome-keyring-42.0.tar.xz
|
||||||
|
/gnome-keyring-42.1.tar.xz
|
||||||
|
78
gnome-keyring-42.0-fix-strncpy.patch
Normal file
78
gnome-keyring-42.0-fix-strncpy.patch
Normal file
@ -0,0 +1,78 @@
|
|||||||
|
From f532e3de2bd77465c976abc913e3f0a5cd09a5d2 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Matt Turner <mattst88@gmail.com>
|
||||||
|
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 <glib.h>
|
||||||
|
+
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <sys/param.h>
|
||||||
|
#include <sys/socket.h>
|
||||||
|
@@ -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 <glib.h>
|
||||||
|
+
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <sys/param.h>
|
||||||
|
#include <sys/socket.h>
|
||||||
|
@@ -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
|
||||||
|
|
@ -2,27 +2,31 @@
|
|||||||
%global gcr_version 3.27.90
|
%global gcr_version 3.27.90
|
||||||
%global gcrypt_version 1.2.2
|
%global gcrypt_version 1.2.2
|
||||||
|
|
||||||
Name: gnome-keyring
|
Name: gnome-keyring
|
||||||
Version: 3.34.0
|
Version: 42.1
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
Summary: Framework for managing passwords and other secrets
|
Summary: Framework for managing passwords and other secrets
|
||||||
|
|
||||||
License: GPLv2+ and LGPLv2+
|
License: GPLv2+ and LGPLv2+
|
||||||
URL: https://wiki.gnome.org/Projects/GnomeKeyring
|
URL: https://wiki.gnome.org/Projects/GnomeKeyring
|
||||||
Source0: https://download.gnome.org/sources/%{name}/3.34/%{name}-%{version}.tar.xz
|
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
|
||||||
|
|
||||||
BuildRequires: gcc
|
|
||||||
BuildRequires: pkgconfig(gcr-3) >= %{gcr_version}
|
BuildRequires: pkgconfig(gcr-3) >= %{gcr_version}
|
||||||
BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version}
|
BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version}
|
||||||
|
BuildRequires: pkgconfig(libsystemd)
|
||||||
BuildRequires: pkgconfig(p11-kit-1)
|
BuildRequires: pkgconfig(p11-kit-1)
|
||||||
BuildRequires: docbook-dtds
|
BuildRequires: docbook-dtds
|
||||||
BuildRequires: docbook-style-xsl
|
BuildRequires: docbook-style-xsl
|
||||||
|
BuildRequires: gcc
|
||||||
BuildRequires: gettext
|
BuildRequires: gettext
|
||||||
BuildRequires: intltool
|
BuildRequires: intltool
|
||||||
BuildRequires: libcap-ng-devel
|
|
||||||
BuildRequires: libgcrypt-devel >= %{gcrypt_version}
|
BuildRequires: libgcrypt-devel >= %{gcrypt_version}
|
||||||
BuildRequires: libselinux-devel
|
BuildRequires: libselinux-devel
|
||||||
|
BuildRequires: make
|
||||||
BuildRequires: pam-devel
|
BuildRequires: pam-devel
|
||||||
|
BuildRequires: systemd-rpm-macros
|
||||||
BuildRequires: /usr/bin/ssh-add
|
BuildRequires: /usr/bin/ssh-add
|
||||||
BuildRequires: /usr/bin/ssh-agent
|
BuildRequires: /usr/bin/ssh-agent
|
||||||
BuildRequires: /usr/bin/xsltproc
|
BuildRequires: /usr/bin/xsltproc
|
||||||
@ -56,12 +60,15 @@ automatically unlock the "login" keyring when the user logs in.
|
|||||||
%build
|
%build
|
||||||
%configure \
|
%configure \
|
||||||
--with-pam-dir=%{_libdir}/security \
|
--with-pam-dir=%{_libdir}/security \
|
||||||
--enable-pam
|
--enable-pam \
|
||||||
|
--with-systemd \
|
||||||
|
--without-libcap-ng \
|
||||||
|
--with-pkcs11-config=%{_datadir}/p11-kit/modules
|
||||||
|
|
||||||
# avoid unneeded direct dependencies
|
# avoid unneeded direct dependencies
|
||||||
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool
|
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool
|
||||||
|
|
||||||
make %{?_smp_mflags}
|
%make_build
|
||||||
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
@ -73,6 +80,11 @@ rm $RPM_BUILD_ROOT%{_libdir}/gnome-keyring/devel/*.la
|
|||||||
|
|
||||||
%find_lang gnome-keyring
|
%find_lang gnome-keyring
|
||||||
|
|
||||||
|
%post
|
||||||
|
%systemd_user_post gnome-keyring-daemon.service
|
||||||
|
|
||||||
|
%preun
|
||||||
|
%systemd_user_preun gnome-keyring-daemon.service
|
||||||
|
|
||||||
%files -f gnome-keyring.lang
|
%files -f gnome-keyring.lang
|
||||||
%doc AUTHORS NEWS README
|
%doc AUTHORS NEWS README
|
||||||
@ -84,7 +96,7 @@ rm $RPM_BUILD_ROOT%{_libdir}/gnome-keyring/devel/*.la
|
|||||||
%dir %{_libdir}/pkcs11
|
%dir %{_libdir}/pkcs11
|
||||||
%{_libdir}/pkcs11/*.so
|
%{_libdir}/pkcs11/*.so
|
||||||
# GPL
|
# GPL
|
||||||
%attr(0755,root,root) %caps(cap_ipc_lock=ep) %{_bindir}/gnome-keyring-daemon
|
%{_bindir}/gnome-keyring-daemon
|
||||||
%{_bindir}/gnome-keyring
|
%{_bindir}/gnome-keyring
|
||||||
%{_bindir}/gnome-keyring-3
|
%{_bindir}/gnome-keyring-3
|
||||||
%{_datadir}/dbus-1/services/*.service
|
%{_datadir}/dbus-1/services/*.service
|
||||||
@ -92,15 +104,70 @@ rm $RPM_BUILD_ROOT%{_libdir}/gnome-keyring/devel/*.la
|
|||||||
%{_datadir}/GConf/gsettings/*.convert
|
%{_datadir}/GConf/gsettings/*.convert
|
||||||
%{_datadir}/glib-2.0/schemas/*.gschema.xml
|
%{_datadir}/glib-2.0/schemas/*.gschema.xml
|
||||||
%{_datadir}/p11-kit/modules/gnome-keyring.module
|
%{_datadir}/p11-kit/modules/gnome-keyring.module
|
||||||
|
%dir %{_datadir}/xdg-desktop-portal
|
||||||
|
%dir %{_datadir}/xdg-desktop-portal/portals
|
||||||
|
%{_datadir}/xdg-desktop-portal/portals/gnome-keyring.portal
|
||||||
%{_mandir}/man1/gnome-keyring.1*
|
%{_mandir}/man1/gnome-keyring.1*
|
||||||
%{_mandir}/man1/gnome-keyring-3.1*
|
%{_mandir}/man1/gnome-keyring-3.1*
|
||||||
%{_mandir}/man1/gnome-keyring-daemon.1*
|
%{_mandir}/man1/gnome-keyring-daemon.1*
|
||||||
|
%{_userunitdir}/gnome-keyring-daemon.service
|
||||||
|
%{_userunitdir}/gnome-keyring-daemon.socket
|
||||||
|
|
||||||
%files pam
|
%files pam
|
||||||
%{_libdir}/security/*.so
|
%{_libdir}/security/*.so
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 42.1-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon May 23 2022 David King <amigadave@amigadave.com> - 42.1-1
|
||||||
|
- Update to 42.1
|
||||||
|
|
||||||
|
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 40.0-4
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||||
|
- Update the path of the PKCS#11 module
|
||||||
|
|
||||||
|
* Tue Sep 21 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 40.0-3
|
||||||
|
- Drop dependency on libcapng
|
||||||
|
- Drop cap_ipc_lock to unbreak the D-Bus service
|
||||||
|
- Fixes #2005625
|
||||||
|
|
||||||
|
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 40.0-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Mar 26 2021 Kalev Lember <klember@redhat.com> - 40.0-1
|
||||||
|
- Update to 40.0
|
||||||
|
|
||||||
|
* Fri Mar 05 2021 David King <amigadave@amigadave.com> - 3.36.0-6
|
||||||
|
- Apply upstream patch to fix capng usage (#1888978)
|
||||||
|
|
||||||
|
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.36.0-5
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.36.0-4
|
||||||
|
- Second attempt - Rebuilt for
|
||||||
|
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.36.0-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Jul 13 2020 Tom Stellard <tstellar@redhat.com> - 3.36.0-2
|
||||||
|
- Use make macros
|
||||||
|
- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
|
||||||
|
|
||||||
|
* Wed Mar 11 2020 Kalev Lember <klember@redhat.com> - 3.36.0-1
|
||||||
|
- Update to 3.36.0
|
||||||
|
|
||||||
|
* Mon Feb 17 2020 Kalev Lember <klember@redhat.com> - 3.35.90-1
|
||||||
|
- Update to 3.35.90
|
||||||
|
|
||||||
|
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.35.1-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Jan 16 2020 Kalev Lember <klember@redhat.com> - 3.35.1-1
|
||||||
|
- Update to 3.35.1
|
||||||
|
|
||||||
* Mon Sep 30 2019 Kalev Lember <klember@redhat.com> - 3.34.0-1
|
* Mon Sep 30 2019 Kalev Lember <klember@redhat.com> - 3.34.0-1
|
||||||
- Update to 3.34.0
|
- Update to 3.34.0
|
||||||
|
|
||||||
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (gnome-keyring-3.34.0.tar.xz) = 09f84bdf5ea415a55baf6a57dba2889cdf592005d273335029107ea3f83152447b3263cd190810930aae41af22dd508e765e649da3c8a9afa127db1d298bb72a
|
SHA512 (gnome-keyring-42.1.tar.xz) = 560dc409c21768dcbdf42151986a5bbbfb9a092d2c36295cf76bd603cdf9650fa80670631c7fb8b3e1822bed6a1f55c34b2170a1419ce45fbe8ca08c7eaf3a57
|
||||||
|
Loading…
Reference in New Issue
Block a user