Compare commits
No commits in common. "rawhide" and "f23" have entirely different histories.
18
.gitignore
vendored
18
.gitignore
vendored
@ -61,21 +61,3 @@ gnome-keyring-2.31.4.tar.bz2
|
||||
/gnome-keyring-3.18.1.tar.xz
|
||||
/gnome-keyring-3.18.2.tar.xz
|
||||
/gnome-keyring-3.18.3.tar.xz
|
||||
/gnome-keyring-3.19.4.tar.xz
|
||||
/gnome-keyring-3.19.90.tar.xz
|
||||
/gnome-keyring-3.20.0.tar.xz
|
||||
/gnome-keyring-3.20.1.tar.xz
|
||||
/gnome-keyring-3.27.92.tar.xz
|
||||
/gnome-keyring-3.28.0.tar.xz
|
||||
/gnome-keyring-3.28.0.1.tar.xz
|
||||
/gnome-keyring-3.28.0.2.tar.xz
|
||||
/gnome-keyring-3.28.2.tar.xz
|
||||
/gnome-keyring-3.31.90.tar.xz
|
||||
/gnome-keyring-3.31.91.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
|
||||
|
@ -1,78 +0,0 @@
|
||||
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
|
||||
|
@ -1,49 +1,43 @@
|
||||
%global glib2_version 2.44.0
|
||||
%global gcr_version 3.27.90
|
||||
%global glib2_version 2.38.0
|
||||
%global gcr_version 3.5.3
|
||||
%global gcrypt_version 1.2.2
|
||||
|
||||
Name: gnome-keyring
|
||||
Version: 42.1
|
||||
Release: 2%{?dist}
|
||||
Summary: Framework for managing passwords and other secrets
|
||||
|
||||
Name: gnome-keyring
|
||||
Version: 3.18.3
|
||||
Release: 1%{?dist}
|
||||
License: GPLv2+ and LGPLv2+
|
||||
Group: System Environment/Libraries
|
||||
#VCS: git:git://git.gnome.org/gnome-keyring
|
||||
Source: https://download.gnome.org/sources/%{name}/3.18/%{name}-%{version}.tar.xz
|
||||
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
|
||||
|
||||
BuildRequires: pkgconfig(gcr-3) >= %{gcr_version}
|
||||
BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version}
|
||||
BuildRequires: pkgconfig(libsystemd)
|
||||
BuildRequires: pkgconfig(p11-kit-1)
|
||||
BuildRequires: docbook-dtds
|
||||
BuildRequires: docbook-style-xsl
|
||||
BuildRequires: gcc
|
||||
BuildRequires: gettext
|
||||
BuildRequires: intltool
|
||||
BuildRequires: libcap-ng-devel
|
||||
BuildRequires: libgcrypt-devel >= %{gcrypt_version}
|
||||
BuildRequires: libselinux-devel
|
||||
BuildRequires: make
|
||||
BuildRequires: pam-devel
|
||||
BuildRequires: systemd-rpm-macros
|
||||
BuildRequires: /usr/bin/ssh-add
|
||||
BuildRequires: /usr/bin/ssh-agent
|
||||
BuildRequires: /usr/bin/xsltproc
|
||||
|
||||
Requires: /usr/bin/ssh-add
|
||||
Requires: /usr/bin/ssh-agent
|
||||
Requires: /usr/libexec/gcr-ssh-askpass
|
||||
# we no longer have a devel subpackage
|
||||
Obsoletes: %{name}-devel < 3.3.0
|
||||
Provides: %{name}-devel = 3.3.0
|
||||
|
||||
%description
|
||||
The gnome-keyring session daemon manages passwords and other types of
|
||||
secrets for the user, storing them encrypted with a main password.
|
||||
Applications can use the gnome-keyring library to integrate with the keyring.
|
||||
|
||||
|
||||
%package pam
|
||||
Summary: Pam module for unlocking keyrings
|
||||
License: LGPLv2+
|
||||
Group: Development/Libraries
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
# for /lib/security
|
||||
Requires: pam%{?_isa}
|
||||
@ -54,22 +48,18 @@ automatically unlock the "login" keyring when the user logs in.
|
||||
|
||||
|
||||
%prep
|
||||
%autosetup -p1
|
||||
%setup -q -n gnome-keyring-%{version}
|
||||
|
||||
|
||||
%build
|
||||
%configure \
|
||||
--with-pam-dir=%{_libdir}/security \
|
||||
--enable-pam \
|
||||
--with-systemd \
|
||||
--without-libcap-ng \
|
||||
--with-pkcs11-config=%{_datadir}/p11-kit/modules
|
||||
--enable-pam
|
||||
|
||||
# avoid unneeded direct dependencies
|
||||
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool
|
||||
|
||||
%make_build
|
||||
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
%make_install
|
||||
@ -80,11 +70,14 @@ rm $RPM_BUILD_ROOT%{_libdir}/gnome-keyring/devel/*.la
|
||||
|
||||
%find_lang gnome-keyring
|
||||
|
||||
%post
|
||||
%systemd_user_post gnome-keyring-daemon.service
|
||||
%postun
|
||||
if [ $1 -eq 0 ]; then
|
||||
glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || :
|
||||
fi
|
||||
|
||||
%posttrans
|
||||
glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || :
|
||||
|
||||
%preun
|
||||
%systemd_user_preun gnome-keyring-daemon.service
|
||||
|
||||
%files -f gnome-keyring.lang
|
||||
%doc AUTHORS NEWS README
|
||||
@ -96,7 +89,7 @@ rm $RPM_BUILD_ROOT%{_libdir}/gnome-keyring/devel/*.la
|
||||
%dir %{_libdir}/pkcs11
|
||||
%{_libdir}/pkcs11/*.so
|
||||
# GPL
|
||||
%{_bindir}/gnome-keyring-daemon
|
||||
%attr(0755,root,root) %caps(cap_ipc_lock=ep) %{_bindir}/gnome-keyring-daemon
|
||||
%{_bindir}/gnome-keyring
|
||||
%{_bindir}/gnome-keyring-3
|
||||
%{_datadir}/dbus-1/services/*.service
|
||||
@ -104,136 +97,15 @@ rm $RPM_BUILD_ROOT%{_libdir}/gnome-keyring/devel/*.la
|
||||
%{_datadir}/GConf/gsettings/*.convert
|
||||
%{_datadir}/glib-2.0/schemas/*.gschema.xml
|
||||
%{_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-3.1*
|
||||
%{_mandir}/man1/gnome-keyring-daemon.1*
|
||||
%{_userunitdir}/gnome-keyring-daemon.service
|
||||
%{_userunitdir}/gnome-keyring-daemon.socket
|
||||
|
||||
%files pam
|
||||
%{_libdir}/security/*.so
|
||||
|
||||
|
||||
%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
|
||||
- Update to 3.34.0
|
||||
|
||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.31.91-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Sat Mar 02 2019 Kalev Lember <klember@redhat.com> - 3.31.91-1
|
||||
- Update to 3.31.91
|
||||
|
||||
* Sun Feb 10 2019 Kalev Lember <klember@redhat.com> - 3.31.90-1
|
||||
- Update to 3.31.90
|
||||
|
||||
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.28.2-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.28.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Tue May 08 2018 Kalev Lember <klember@redhat.com> - 3.28.2-1
|
||||
- Update to 3.28.2
|
||||
|
||||
* Mon Mar 26 2018 Kalev Lember <klember@redhat.com> - 3.28.0.2-1
|
||||
- Update to 3.28.0.2
|
||||
|
||||
* Tue Mar 13 2018 Kalev Lember <klember@redhat.com> - 3.28.0.1-1
|
||||
- Update to 3.28.0.1
|
||||
|
||||
* Mon Mar 12 2018 Kalev Lember <klember@redhat.com> - 3.28.0-1
|
||||
- Update to 3.28.0
|
||||
|
||||
* Mon Mar 05 2018 Kalev Lember <klember@redhat.com> - 3.27.92-1
|
||||
- Update to 3.27.92
|
||||
- Don't set group tags
|
||||
- Remove ancient obsoletes
|
||||
- Remove gsettings schema scriptlets
|
||||
|
||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.20.1-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Fri Dec 08 2017 Nikos Mavrogiannopoulos - 3.20.1-4
|
||||
- No longer register gnome-keyring as a local PKCS#11 module (#1520268)
|
||||
|
||||
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.20.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.20.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Tue Jul 04 2017 Debarshi Ray <rishi@fedoraproject.org> - 3.20.1-1
|
||||
- Update to 3.20.1
|
||||
|
||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.20.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Fri Mar 25 2016 Kalev Lember <klember@redhat.com> - 3.20.0-1
|
||||
- Update to 3.20.0
|
||||
|
||||
* Thu Feb 18 2016 Richard Hughes <rhughes@redhat.com> - 3.19.90-1
|
||||
- Update to 3.19.90
|
||||
|
||||
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.19.4-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Wed Jan 20 2016 Kalev Lember <klember@redhat.com> - 3.19.4-1
|
||||
- Update to 3.19.4
|
||||
|
||||
* Wed Oct 28 2015 Kalev Lember <klember@redhat.com> - 3.18.3-1
|
||||
- Update to 3.18.3
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user