iznogood/gnome-keyring
SHA256
1
0
Fork 0
forked from GNOME/gnome-keyring
Code Issues Pull Requests Activity

Accepting request 1249842 from GNOME:Next

Browse Source 
- Rebase gnome-keyring-bsc1039461-pam-man-page.patch.

- Update to version 48.beta:
  + secret-portal:
    - Set a label for an application key
    - Set xdg:schema for secrets
  + egg-secure-memory: Allocate enough space for the guard pointers
  + Fix several leaks found by asan
  + daemon: Randomize control directory in tests
  + meson:
    - Bump minimal meson version to 1.0
    - Bump minimal GLib version to 2.80
    - Remove dependency on gcr-ui-3
  + build: Fix several deprecations
  + Updated translations
- Replace pkgconfig(gcr-3) with pkgconfig(gcr-base-3)
  BuildRequires: following upstream changes.

- Update to version 48.alpha:
  + build: Switch from autootools to Meson
  + pam: add check for stash password
  + ssh-agent: Don't ship autostart desktop if disabled
- Add meson BuildRequires and macros following upstreams port.
- Drop autotools and libtool BuildRequires, no longer needed.
- Disable gnome-keyring-bsc1039461-pam-man-page.patch, needs rebase
  or dropping.

OBS-URL: https://build.opensuse.org/request/show/1249842
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-keyring?expand=0&rev=270
This commit is contained in:
Dominique Leuenberger
2025-03-06 13:58:55 +00:00
committed by Git OBS Bridge
parent d11b868ef8
commit 6296367b58
7 changed files with 99 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gnome-keyring.changes
+36
View File
@@ -1,3 +1,39 @@
-------------------------------------------------------------------
Mon Mar 3 15:07:59 UTC 2025 - Dominique Leuenberger <dimstar@opensuse.org>
- Rebase gnome-keyring-bsc1039461-pam-man-page.patch.
-------------------------------------------------------------------
Fri Feb 14 08:46:58 UTC 2025 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 48.beta:
+ secret-portal:
- Set a label for an application key
- Set xdg:schema for secrets
+ egg-secure-memory: Allocate enough space for the guard pointers
+ Fix several leaks found by asan
+ daemon: Randomize control directory in tests
+ meson:
- Bump minimal meson version to 1.0
- Bump minimal GLib version to 2.80
- Remove dependency on gcr-ui-3
+ build: Fix several deprecations
+ Updated translations
- Replace pkgconfig(gcr-3) with pkgconfig(gcr-base-3)
BuildRequires: following upstream changes.
-------------------------------------------------------------------
Fri Jan 10 19:10:02 UTC 2025 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 48.alpha:
+ build: Switch from autootools to Meson
+ pam: add check for stash password
+ ssh-agent: Don't ship autostart desktop if disabled
- Add meson BuildRequires and macros following upstreams port.
- Drop autotools and libtool BuildRequires, no longer needed.
- Disable gnome-keyring-bsc1039461-pam-man-page.patch, needs rebase
or dropping.
-------------------------------------------------------------------
Fri Jul 12 17:06:25 UTC 2024 - Bjørn Lie <bjorn.lie@gmail.com>
gnome-keyring.spec
+10 -15
View File
@@ -1,7 +1,7 @@
#
# spec file for package gnome-keyring
#
# Copyright (c) 2024 SUSE LLC
# Copyright (c) 2025 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: gnome-keyring
Version: 46.2
Version: 48.beta
Release: 0
Summary: GNOME Keyring
License: GPL-2.0-or-later AND LGPL-2.1-or-later
@@ -37,21 +37,20 @@ Patch1000: gnome-keyring-bsc932232-use-libgcrypt-allocators.patch
# PATCH-FIX-SLE gnome-keyring-bsc932232-use-non-fips-md5.patch bsc#932232 hpj@suse.com
Patch1001: gnome-keyring-bsc932232-use-non-fips-md5.patch
BuildRequires: automake
BuildRequires: ca-certificates
BuildRequires: desktop-file-utils
BuildRequires: fdupes
BuildRequires: gtk-doc
BuildRequires: libgcrypt-devel >= 1.2.2
BuildRequires: libselinux-devel
BuildRequires: libtool
BuildRequires: meson >= 1.0
BuildRequires: openssh
BuildRequires: pam-devel
BuildRequires: pkgconfig
BuildRequires: update-desktop-files
BuildRequires: pkgconfig(gck-1) >= 3.3.4
BuildRequires: pkgconfig(gcr-3) >= 3.27.90
BuildRequires: pkgconfig(glib-2.0) >= 2.44.0
BuildRequires: pkgconfig(gcr-base-3) >= 3.27.90
BuildRequires: pkgconfig(glib-2.0) >= 2.80.0
BuildRequires: pkgconfig(libsystemd)
BuildRequires: pkgconfig(systemd)
Requires: libgck-modules-gnome-keyring = %{version}
@@ -125,16 +124,12 @@ The PAM module can be used to unlock the keyring on login.
%endif
%build
autoreconf -fi
%configure\
--enable-pam \
--enable-ssh-agent \
--without-libcap-ng \
--with-pam-dir=%{_pam_moduledir}
%make_build
%meson \
%{nil}
%meson_build
%install
%make_install
%meson_install
find %{buildroot} -type f -name "*.la" -delete -print
# XFCE team wants gnome-keyring to work by default.
for i in %{buildroot}%{_sysconfdir}/xdg/autostart/*.desktop ; do
@@ -173,7 +168,7 @@ fi
%files
%license COPYING
%doc AUTHORS ChangeLog NEWS README
%doc NEWS README
%{_bindir}/gnome-keyring
%{_bindir}/gnome-keyring-3
%{_bindir}/gnome-keyring-daemon
_service
+1 -1
View File
@@ -3,7 +3,7 @@
<service name="obs_scm" mode="manual">
<param name="scm">git</param>
<param name="url">https://gitlab.gnome.org/GNOME/gnome-keyring.git</param>
<param name="revision">46.2</param>
<param name="revision">48.beta</param>
<param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
<param name="versionrewrite-pattern">v?(.*)\+0</param>
<param name="versionrewrite-replacement">\1</param>
gnome-keyring-46.2.obscpio
LFS
BIN
View File
Binary file not shown.
gnome-keyring-48.beta.obscpio
LFS
BIN
View File
Binary file not shown.
gnome-keyring-bsc1039461-pam-man-page.patch
+46 -22
View File
@@ -1,31 +1,55 @@
diff --git a/pam/Makefile.am b/pam/Makefile.am
index 5c83c00..9b5bcc8 100644
--- a/pam/Makefile.am
+++ b/pam/Makefile.am
@@ -72,3 +72,18 @@ test_pam_CFLAGS = $(pam_CFLAGS)
commit aca880acf4549a348ecb4fc6754ed30366b5b571
Author: Dominique Leuenberger <dimstar@opensuse.org>
Date: Mon Mar 3 16:07:34 2025 +0100
HACK: Add pam_gnome_keyring manpage
diff --git a/docs/meson.build b/docs/meson.build
index 8b2e6ab..acd2b7f 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -6,6 +6,10 @@ if get_option('manpage')
'gnome-keyring.xml',
]
check_PROGRAMS += $(pam_TESTS)
TESTS += $(pam_TESTS)
+ xml_8_manfiles = [
+ 'pam_gnome_keyring.xml',
+ ]
+
+# -----------------------------------------------------------------------------
+# Man page
xsltproc = find_program('xsltproc')
foreach xml_man : xml_manfiles
custom_target('manpage-@0@'.format(xml_man),
@@ -27,4 +31,25 @@ if get_option('manpage')
]
)
endforeach
+
+man_MANS = pam_gnome_keyring.8
+
+if ENABLE_DOC
+
+%.8: pam/%.8.xml
+ @XSLTPROC@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
+
+endif
+
+BUILT_EXTRA_DIST = $(man_MANS)
+EXTRA_DIST += pam_gnome_keyring.8.xml
diff --git a/pam/pam_gnome_keyring.8.xml b/pam/pam_gnome_keyring.8.xml
+ foreach xml_man : xml_8_manfiles
+ custom_target('manpage-@0@'.format(xml_man),
+ input: xml_man,
+ output: '@BASENAME@.8',
+ install: true,
+ install_dir: get_option('mandir') / 'man8',
+ command: [
+ xsltproc,
+ '--nonet',
+ '--stringparam', 'man.output.quietly', '1',
+ '--stringparam', 'funcsynopsis.style', 'ansi',
+ '--stringparam', 'man.th.extra1.suppress', '1',
+ '--stringparam', 'man.authors.section.enabled', '0',
+ '--stringparam', 'man.copyright.section.enabled', '0',
+ '-o', '@OUTPUT@',
+ 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl',
+ '@INPUT@'
+ ]
+ )
+ endforeach
endif
diff --git a/docs/pam_gnome_keyring.xml b/docs/pam_gnome_keyring.xml
new file mode 100644
index 0000000..d4679a4
--- /dev/null
+++ b/pam/pam_gnome_keyring.8.xml
+++ b/docs/pam_gnome_keyring.xml
@@ -0,0 +1,268 @@
+<?xml version="1.0" encoding='UTF-8'?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
gnome-keyring.obsinfo
+3 -3
View File
@@ -1,4 +1,4 @@
name: gnome-keyring
version: 46.2
mtime: 1720782108
commit: 48e1a4df5a2aae2e0c3d160e0d692c43671e26d3
version: 48.beta
mtime: 1739496575
commit: 7afa4bcec70fdd80d6fb841cb2ed7687869d78f4