Date: Wednesday, May 25, 2022 @ 23:55:18
Author: heftig
Revision: 446538
archrelease: copy trunk to extra-x86_64
Added:
gnome-keyring/repos/extra-x86_64/0001-build-Use-p11_module_configs-as-default-pkcs11-confi.patch
(from rev 446537,
gnome-keyring/trunk/0001-build-Use-p11_module_configs-as-default-pkcs11-confi.patch)
gnome-keyring/repos/extra-x86_64/0002-daemon-Add-Cinnamon-to-autostart-files.patch
(from rev 446537,
gnome-keyring/trunk/0002-daemon-Add-Cinnamon-to-autostart-files.patch)
gnome-keyring/repos/extra-x86_64/PKGBUILD
(from rev 446537, gnome-keyring/trunk/PKGBUILD)
gnome-keyring/repos/extra-x86_64/gnome-keyring.install
(from rev 446537, gnome-keyring/trunk/gnome-keyring.install)
Deleted:
gnome-keyring/repos/extra-x86_64/0001-build-Use-p11_module_configs-as-default-pkcs11-confi.patch
gnome-keyring/repos/extra-x86_64/0002-daemon-Add-Cinnamon-to-autostart-files.patch
gnome-keyring/repos/extra-x86_64/PKGBUILD
gnome-keyring/repos/extra-x86_64/gnome-keyring.install
-----------------------------------------------------------------+
0001-build-Use-p11_module_configs-as-default-pkcs11-confi.patch | 112 ++++----
0002-daemon-Add-Cinnamon-to-autostart-files.patch | 102 +++----
PKGBUILD | 130
+++++-----
gnome-keyring.install | 36 +-
4 files changed, 190 insertions(+), 190 deletions(-)
Deleted: 0001-build-Use-p11_module_configs-as-default-pkcs11-confi.patch
===================================================================
--- 0001-build-Use-p11_module_configs-as-default-pkcs11-confi.patch
2022-05-25 23:54:54 UTC (rev 446537)
+++ 0001-build-Use-p11_module_configs-as-default-pkcs11-confi.patch
2022-05-25 23:55:18 UTC (rev 446538)
@@ -1,56 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <hef...@archlinux.org>
-Date: Sat, 21 May 2022 18:42:21 +0000
-Subject: [PATCH] build: Use p11_module_configs as default pkcs11-config dir
-
-When building p11-kit with meson, `p11_system_config_modules` points at
-the dir for system config in `/etc. This is its proper meaning.
-
-When building p11-kit with autotools, `p11_system_config_modules` is a
-copy of `p11_module_configs` "for compatibility", and points to the dir
-for packaged configs in `/usr/share`.
-
-We want the dir for packaged configs, so use the right variable.
----
- configure.ac | 10 +++++-----
- pkcs11/rpc-layer/Makefile.am | 2 +-
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 1bf7c14c8ccc..98d8c01018fb 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -294,15 +294,15 @@ AC_ARG_WITH(pkcs11-config, [
- [directory to install PKCS#11 config])
- ])
- if test -z "$with_pkcs11_config" ; then
-- P11_SYSTEM_CONFIG_MODULES=$($PKG_CONFIG p11-kit-1
--variable=p11_system_config_modules)
-+ P11_MODULE_CONFIGS=$($PKG_CONFIG p11-kit-1
--variable=p11_module_configs)
- else
-- P11_SYSTEM_CONFIG_MODULES="$with_pkcs11_config"
-+ P11_MODULE_CONFIGS="$with_pkcs11_config"
- fi
--if test "$P11_SYSTEM_CONFIG_MODULES" = ""; then
-+if test "$P11_MODULE_CONFIGS" = ""; then
- AC_MSG_ERROR([Could not find location for pkcs11 module config])
- fi
--AC_MSG_RESULT($P11_SYSTEM_CONFIG_MODULES)
--AC_SUBST(P11_SYSTEM_CONFIG_MODULES)
-+AC_MSG_RESULT($P11_MODULE_CONFIGS)
-+AC_SUBST(P11_MODULE_CONFIGS)
-
- AC_MSG_CHECKING([module path to install pkcs11 modules])
- AC_ARG_WITH(pkcs11-modules, [
-diff --git a/pkcs11/rpc-layer/Makefile.am b/pkcs11/rpc-layer/Makefile.am
-index ccdff9191ad4..d3a3b57bbc6e 100644
---- a/pkcs11/rpc-layer/Makefile.am
-+++ b/pkcs11/rpc-layer/Makefile.am
-@@ -46,7 +46,7 @@ gnome_keyring_pkcs11_la_LDFLAGS = \
- -no-undefined -export-symbols-regex 'C_GetFunctionList'
-
- # This is the configuration file that p11-kit uses to load the module
--pkcs11configdir = $(P11_SYSTEM_CONFIG_MODULES)
-+pkcs11configdir = $(P11_MODULE_CONFIGS)
- pkcs11config_DATA = \
- pkcs11/rpc-layer/gnome-keyring.module
-
Copied:
gnome-keyring/repos/extra-x86_64/0001-build-Use-p11_module_configs-as-default-pkcs11-confi.patch
(from rev 446537,
gnome-keyring/trunk/0001-build-Use-p11_module_configs-as-default-pkcs11-confi.patch)
===================================================================
--- 0001-build-Use-p11_module_configs-as-default-pkcs11-confi.patch
(rev 0)
+++ 0001-build-Use-p11_module_configs-as-default-pkcs11-confi.patch
2022-05-25 23:55:18 UTC (rev 446538)
@@ -0,0 +1,56 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <hef...@archlinux.org>
+Date: Sat, 21 May 2022 18:42:21 +0000
+Subject: [PATCH] build: Use p11_module_configs as default pkcs11-config dir
+
+When building p11-kit with meson, `p11_system_config_modules` points at
+the dir for system config in `/etc. This is its proper meaning.
+
+When building p11-kit with autotools, `p11_system_config_modules` is a
+copy of `p11_module_configs` "for compatibility", and points to the dir
+for packaged configs in `/usr/share`.
+
+We want the dir for packaged configs, so use the right variable.
+---
+ configure.ac | 10 +++++-----
+ pkcs11/rpc-layer/Makefile.am | 2 +-
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 1bf7c14c8ccc..98d8c01018fb 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -294,15 +294,15 @@ AC_ARG_WITH(pkcs11-config, [
+ [directory to install PKCS#11 config])
+ ])
+ if test -z "$with_pkcs11_config" ; then
+- P11_SYSTEM_CONFIG_MODULES=$($PKG_CONFIG p11-kit-1
--variable=p11_system_config_modules)
++ P11_MODULE_CONFIGS=$($PKG_CONFIG p11-kit-1
--variable=p11_module_configs)
+ else
+- P11_SYSTEM_CONFIG_MODULES="$with_pkcs11_config"
++ P11_MODULE_CONFIGS="$with_pkcs11_config"
+ fi
+-if test "$P11_SYSTEM_CONFIG_MODULES" = ""; then
++if test "$P11_MODULE_CONFIGS" = ""; then
+ AC_MSG_ERROR([Could not find location for pkcs11 module config])
+ fi
+-AC_MSG_RESULT($P11_SYSTEM_CONFIG_MODULES)
+-AC_SUBST(P11_SYSTEM_CONFIG_MODULES)
++AC_MSG_RESULT($P11_MODULE_CONFIGS)
++AC_SUBST(P11_MODULE_CONFIGS)
+
+ AC_MSG_CHECKING([module path to install pkcs11 modules])
+ AC_ARG_WITH(pkcs11-modules, [
+diff --git a/pkcs11/rpc-layer/Makefile.am b/pkcs11/rpc-layer/Makefile.am
+index ccdff9191ad4..d3a3b57bbc6e 100644
+--- a/pkcs11/rpc-layer/Makefile.am
++++ b/pkcs11/rpc-layer/Makefile.am
+@@ -46,7 +46,7 @@ gnome_keyring_pkcs11_la_LDFLAGS = \
+ -no-undefined -export-symbols-regex 'C_GetFunctionList'
+
+ # This is the configuration file that p11-kit uses to load the module
+-pkcs11configdir = $(P11_SYSTEM_CONFIG_MODULES)
++pkcs11configdir = $(P11_MODULE_CONFIGS)
+ pkcs11config_DATA = \
+ pkcs11/rpc-layer/gnome-keyring.module
+
Deleted: 0002-daemon-Add-Cinnamon-to-autostart-files.patch
===================================================================
--- 0002-daemon-Add-Cinnamon-to-autostart-files.patch 2022-05-25 23:54:54 UTC
(rev 446537)
+++ 0002-daemon-Add-Cinnamon-to-autostart-files.patch 2022-05-25 23:55:18 UTC
(rev 446538)
@@ -1,51 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <hef...@archlinux.org>
-Date: Sat, 21 May 2022 18:47:23 +0000
-Subject: [PATCH] daemon: Add Cinnamon to autostart files
-
-Cinnamon also wants to use gnome-keyring-daemon.
----
- daemon/gnome-keyring-pkcs11.desktop.in.in | 2 +-
- daemon/gnome-keyring-secrets.desktop.in.in | 2 +-
- daemon/gnome-keyring-ssh.desktop.in.in | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/daemon/gnome-keyring-pkcs11.desktop.in.in
b/daemon/gnome-keyring-pkcs11.desktop.in.in
-index b43e1e9db241..80434cbd9ad8 100644
---- a/daemon/gnome-keyring-pkcs11.desktop.in.in
-+++ b/daemon/gnome-keyring-pkcs11.desktop.in.in
-@@ -3,7 +3,7 @@ Type=Application
- Name=Certificate and Key Storage
- Comment=GNOME Keyring: PKCS#11 Component
- Exec=@bindir@/gnome-keyring-daemon --start --components=pkcs11
--OnlyShowIn=GNOME;Unity;MATE;
-+OnlyShowIn=GNOME;Unity;MATE;Cinnamon;
- NoDisplay=true
- X-GNOME-Autostart-Phase=PreDisplayServer
- X-GNOME-AutoRestart=false
-diff --git a/daemon/gnome-keyring-secrets.desktop.in.in
b/daemon/gnome-keyring-secrets.desktop.in.in
-index dd9deec773c1..b6d7b2d05dbd 100644
---- a/daemon/gnome-keyring-secrets.desktop.in.in
-+++ b/daemon/gnome-keyring-secrets.desktop.in.in
-@@ -3,7 +3,7 @@ Type=Application
- Name=Secret Storage Service
- Comment=GNOME Keyring: Secret Service
- Exec=@bindir@/gnome-keyring-daemon --start --components=secrets
--OnlyShowIn=GNOME;Unity;MATE;
-+OnlyShowIn=GNOME;Unity;MATE;Cinnamon;
- NoDisplay=true
- X-GNOME-Autostart-Phase=PreDisplayServer
- X-GNOME-AutoRestart=false
-diff --git a/daemon/gnome-keyring-ssh.desktop.in.in
b/daemon/gnome-keyring-ssh.desktop.in.in
-index 38aa24cbf387..163ff5545bfd 100644
---- a/daemon/gnome-keyring-ssh.desktop.in.in
-+++ b/daemon/gnome-keyring-ssh.desktop.in.in
-@@ -3,7 +3,7 @@ Type=Application
- Name=SSH Key Agent
- Comment=GNOME Keyring: SSH Agent
- Exec=@bindir@/gnome-keyring-daemon --start --components=ssh
--OnlyShowIn=GNOME;Unity;MATE;
-+OnlyShowIn=GNOME;Unity;MATE;Cinnamon;
- X-GNOME-Autostart-Phase=PreDisplayServer
- X-GNOME-AutoRestart=false
- X-GNOME-Autostart-Notify=true
Copied:
gnome-keyring/repos/extra-x86_64/0002-daemon-Add-Cinnamon-to-autostart-files.patch
(from rev 446537,
gnome-keyring/trunk/0002-daemon-Add-Cinnamon-to-autostart-files.patch)
===================================================================
--- 0002-daemon-Add-Cinnamon-to-autostart-files.patch
(rev 0)
+++ 0002-daemon-Add-Cinnamon-to-autostart-files.patch 2022-05-25 23:55:18 UTC
(rev 446538)
@@ -0,0 +1,51 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <hef...@archlinux.org>
+Date: Sat, 21 May 2022 18:47:23 +0000
+Subject: [PATCH] daemon: Add Cinnamon to autostart files
+
+Cinnamon also wants to use gnome-keyring-daemon.
+---
+ daemon/gnome-keyring-pkcs11.desktop.in.in | 2 +-
+ daemon/gnome-keyring-secrets.desktop.in.in | 2 +-
+ daemon/gnome-keyring-ssh.desktop.in.in | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/daemon/gnome-keyring-pkcs11.desktop.in.in
b/daemon/gnome-keyring-pkcs11.desktop.in.in
+index b43e1e9db241..80434cbd9ad8 100644
+--- a/daemon/gnome-keyring-pkcs11.desktop.in.in
++++ b/daemon/gnome-keyring-pkcs11.desktop.in.in
+@@ -3,7 +3,7 @@ Type=Application
+ Name=Certificate and Key Storage
+ Comment=GNOME Keyring: PKCS#11 Component
+ Exec=@bindir@/gnome-keyring-daemon --start --components=pkcs11
+-OnlyShowIn=GNOME;Unity;MATE;
++OnlyShowIn=GNOME;Unity;MATE;Cinnamon;
+ NoDisplay=true
+ X-GNOME-Autostart-Phase=PreDisplayServer
+ X-GNOME-AutoRestart=false
+diff --git a/daemon/gnome-keyring-secrets.desktop.in.in
b/daemon/gnome-keyring-secrets.desktop.in.in
+index dd9deec773c1..b6d7b2d05dbd 100644
+--- a/daemon/gnome-keyring-secrets.desktop.in.in
++++ b/daemon/gnome-keyring-secrets.desktop.in.in
+@@ -3,7 +3,7 @@ Type=Application
+ Name=Secret Storage Service
+ Comment=GNOME Keyring: Secret Service
+ Exec=@bindir@/gnome-keyring-daemon --start --components=secrets
+-OnlyShowIn=GNOME;Unity;MATE;
++OnlyShowIn=GNOME;Unity;MATE;Cinnamon;
+ NoDisplay=true
+ X-GNOME-Autostart-Phase=PreDisplayServer
+ X-GNOME-AutoRestart=false
+diff --git a/daemon/gnome-keyring-ssh.desktop.in.in
b/daemon/gnome-keyring-ssh.desktop.in.in
+index 38aa24cbf387..163ff5545bfd 100644
+--- a/daemon/gnome-keyring-ssh.desktop.in.in
++++ b/daemon/gnome-keyring-ssh.desktop.in.in
+@@ -3,7 +3,7 @@ Type=Application
+ Name=SSH Key Agent
+ Comment=GNOME Keyring: SSH Agent
+ Exec=@bindir@/gnome-keyring-daemon --start --components=ssh
+-OnlyShowIn=GNOME;Unity;MATE;
++OnlyShowIn=GNOME;Unity;MATE;Cinnamon;
+ X-GNOME-Autostart-Phase=PreDisplayServer
+ X-GNOME-AutoRestart=false
+ X-GNOME-Autostart-Notify=true
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-05-25 23:54:54 UTC (rev 446537)
+++ PKGBUILD 2022-05-25 23:55:18 UTC (rev 446538)
@@ -1,65 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <hef...@archlinux.org>
-# Contributor: Jan De Groot <j...@archlinux.org>
-
-pkgname=gnome-keyring
-pkgver=42.0
-pkgrel=1
-epoch=1
-pkgdesc="Stores passwords and encryption keys"
-url="https://wiki.gnome.org/Projects/GnomeKeyring";
-arch=(x86_64)
-license=(GPL LGPL)
-depends=(gcr libcap-ng pam openssh)
-makedepends=(git docbook-xsl python p11-kit)
-provides=(org.freedesktop.secrets)
-groups=(gnome)
-install=gnome-keyring.install
-options=(debug)
-_commit=c5645bdcbae05c06895979ee89fb83ef2ec90a1e # tags/42.0^0
-source=("git+https://gitlab.gnome.org/GNOME/gnome-keyring.git#commit=$_commit";
- 0001-build-Use-p11_module_configs-as-default-pkcs11-confi.patch
- 0002-daemon-Add-Cinnamon-to-autostart-files.patch)
-sha256sums=('SKIP'
- '6985e3f7c60aa8dad794b1a9466f69737f3e9b5b7176e3888252c8c56647736a'
- '91538221b304ef951a7d6d7441f8609a2787f725e55d60788b51e81f38c9012f')
-
-pkgver() {
- cd $pkgname
- git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
-}
-
-prepare() {
- cd $pkgname
-
- # Fix pkcs11 config dir
- git apply -3
../0001-build-Use-p11_module_configs-as-default-pkcs11-confi.patch
-
- # Autolaunch in Cinnamon
- git apply -3 ../0002-daemon-Add-Cinnamon-to-autostart-files.patch
-
- NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
- cd $pkgname
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --libexecdir=/usr/lib \
- --with-pam-dir=/usr/lib/security \
- --disable-static \
- --disable-schemas-compile
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
- make
-}
-
-check() {
- cd $pkgname
- # Secure memory tests fail
- dbus-run-session make -k check || :
-}
-
-package() {
- cd $pkgname
- make DESTDIR="$pkgdir" install
-}
Copied: gnome-keyring/repos/extra-x86_64/PKGBUILD (from rev 446537,
gnome-keyring/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-05-25 23:55:18 UTC (rev 446538)
@@ -0,0 +1,65 @@
+# Maintainer: Jan Alexander Steffens (heftig) <hef...@archlinux.org>
+# Contributor: Jan De Groot <j...@archlinux.org>
+
+pkgname=gnome-keyring
+pkgver=42.1
+pkgrel=1
+epoch=1
+pkgdesc="Stores passwords and encryption keys"
+url="https://wiki.gnome.org/Projects/GnomeKeyring";
+arch=(x86_64)
+license=(GPL LGPL)
+depends=(gcr libcap-ng pam openssh)
+makedepends=(git docbook-xsl python p11-kit)
+provides=(org.freedesktop.secrets)
+groups=(gnome)
+install=gnome-keyring.install
+options=(debug)
+_commit=9d562e1e359e3ce01b61f0f52c75d38b96dece7b # tags/42.1^0
+source=("git+https://gitlab.gnome.org/GNOME/gnome-keyring.git#commit=$_commit";
+ 0001-build-Use-p11_module_configs-as-default-pkcs11-confi.patch
+ 0002-daemon-Add-Cinnamon-to-autostart-files.patch)
+sha256sums=('SKIP'
+ '6985e3f7c60aa8dad794b1a9466f69737f3e9b5b7176e3888252c8c56647736a'
+ '91538221b304ef951a7d6d7441f8609a2787f725e55d60788b51e81f38c9012f')
+
+pkgver() {
+ cd $pkgname
+ git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
+}
+
+prepare() {
+ cd $pkgname
+
+ # Fix pkcs11 config dir
+ git apply -3
../0001-build-Use-p11_module_configs-as-default-pkcs11-confi.patch
+
+ # Autolaunch in Cinnamon
+ git apply -3 ../0002-daemon-Add-Cinnamon-to-autostart-files.patch
+
+ NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+ cd $pkgname
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --libexecdir=/usr/lib \
+ --with-pam-dir=/usr/lib/security \
+ --disable-static \
+ --disable-schemas-compile
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+ make
+}
+
+check() {
+ cd $pkgname
+ # Secure memory tests fail
+ dbus-run-session make -k check || :
+}
+
+package() {
+ cd $pkgname
+ make DESTDIR="$pkgdir" install
+}
Deleted: gnome-keyring.install
===================================================================
--- gnome-keyring.install 2022-05-25 23:54:54 UTC (rev 446537)
+++ gnome-keyring.install 2022-05-25 23:55:18 UTC (rev 446538)
@@ -1,18 +0,0 @@
-post_install() {
- setcap cap_ipc_lock+ep usr/bin/gnome-keyring-daemon
-
- # Enable socket by default
- systemctl --global enable gnome-keyring-daemon.socket
-}
-
-post_upgrade() {
- setcap cap_ipc_lock+ep usr/bin/gnome-keyring-daemon
-
- if (( $(vercmp $2 1:42.0-1) < 0)); then
- systemctl --global enable gnome-keyring-daemon.socket
- fi
-}
-
-pre_remove() {
- systemctl --global disable gnome-keyring-daemon.socket
-}
Copied: gnome-keyring/repos/extra-x86_64/gnome-keyring.install (from rev
446537, gnome-keyring/trunk/gnome-keyring.install)
===================================================================
--- gnome-keyring.install (rev 0)
+++ gnome-keyring.install 2022-05-25 23:55:18 UTC (rev 446538)
@@ -0,0 +1,18 @@
+post_install() {
+ setcap cap_ipc_lock+ep usr/bin/gnome-keyring-daemon
+
+ # Enable socket by default
+ systemctl --global enable gnome-keyring-daemon.socket
+}
+
+post_upgrade() {
+ setcap cap_ipc_lock+ep usr/bin/gnome-keyring-daemon
+
+ if (( $(vercmp $2 1:42.0-1) < 0)); then
+ systemctl --global enable gnome-keyring-daemon.socket
+ fi
+}
+
+pre_remove() {
+ systemctl --global disable gnome-keyring-daemon.socket
+}
