gnome-keyring: 42.1 -> 46.1
This commit is contained in:
parent
395c798e1b
commit
af68cf52e3
GPG Key ID:
42F8B4E30B673606
|
|
@ -1,3 +1,9 @@
|
|||
drwxr-xr-x root/root etc/
|
||||
drwxr-xr-x root/root etc/xdg/
|
||||
drwxr-xr-x root/root etc/xdg/autostart/
|
||||
-rw-r--r-- root/root etc/xdg/autostart/gnome-keyring-pkcs11.desktop
|
||||
-rw-r--r-- root/root etc/xdg/autostart/gnome-keyring-secrets.desktop
|
||||
-rw-r--r-- root/root etc/xdg/autostart/gnome-keyring-ssh.desktop
|
||||
drwxr-xr-x root/root lib/
|
||||
drwxr-xr-x root/root lib/security/
|
||||
-rwxr-xr-x root/root lib/security/pam_gnome_keyring.la
|
||||
|
|
@ -7,12 +13,6 @@ drwxr-xr-x root/root usr/bin/
|
|||
lrwxrwxrwx root/root usr/bin/gnome-keyring -> gnome-keyring-3
|
||||
-rwxr-xr-x root/root usr/bin/gnome-keyring-3
|
||||
-rwxr-xr-x root/root usr/bin/gnome-keyring-daemon
|
||||
drwxr-xr-x root/root usr/etc/
|
||||
drwxr-xr-x root/root usr/etc/xdg/
|
||||
drwxr-xr-x root/root usr/etc/xdg/autostart/
|
||||
-rw-r--r-- root/root usr/etc/xdg/autostart/gnome-keyring-pkcs11.desktop
|
||||
-rw-r--r-- root/root usr/etc/xdg/autostart/gnome-keyring-secrets.desktop
|
||||
-rw-r--r-- root/root usr/etc/xdg/autostart/gnome-keyring-ssh.desktop
|
||||
drwxr-xr-x root/root usr/lib/
|
||||
drwxr-xr-x root/root usr/lib/gnome-keyring/
|
||||
drwxr-xr-x root/root usr/lib/gnome-keyring/devel/
|
||||
|
|
@ -39,11 +39,6 @@ drwxr-xr-x root/root usr/share/dbus-1/services/
|
|||
drwxr-xr-x root/root usr/share/glib-2.0/
|
||||
drwxr-xr-x root/root usr/share/glib-2.0/schemas/
|
||||
-rw-r--r-- root/root usr/share/glib-2.0/schemas/org.gnome.crypto.cache.gschema.xml
|
||||
drwxr-xr-x root/root usr/share/man/
|
||||
drwxr-xr-x root/root usr/share/man/man1/
|
||||
-rw-r--r-- root/root usr/share/man/man1/gnome-keyring-3.1.gz
|
||||
-rw-r--r-- root/root usr/share/man/man1/gnome-keyring-daemon.1.gz
|
||||
-rw-r--r-- root/root usr/share/man/man1/gnome-keyring.1.gz
|
||||
drwxr-xr-x root/root usr/share/p11-kit/
|
||||
drwxr-xr-x root/root usr/share/p11-kit/modules/
|
||||
-rw-r--r-- root/root usr/share/p11-kit/modules/gnome-keyring.module
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
untrusted comment: verify with /etc/ports/contrib.pub
|
||||
RWSagIOpLGJF3/qgi2BapKgJS83zn6NjROf84UyVsUWQhndkI3ToGgOrfoRj8+QPY2ap3QKTX9uRiPAs8MEQEIGsFHOaqcyabQY=
|
||||
SHA256 (Pkgfile) = 6b2ee751ec1977b828359ebf2cdf91a5a7254948094dc04df6449388c22dfa50
|
||||
SHA256 (.footprint) = f78b559ce9fb7ea778ce79f074ac70bcfac5adf7a3262e66b3d313d438d06bda
|
||||
SHA256 (gnome-keyring-42.1.tar.gz) = 0fbadc355f7af19103c03b062ba32777bc6137cf24764c4486fbe2d10181becb
|
||||
SHA256 (0001-build-Use-p11_module_configs-as-default-pkcs11-confi.patch) = 6985e3f7c60aa8dad794b1a9466f69737f3e9b5b7176e3888252c8c56647736a
|
||||
RWSagIOpLGJF3xv17GaBsq+oiIIYuhIDFmR9ibKsh4vFKaS9fynxpvEcnZFFHSQd6watEGUmph47ptd/L7UwVoSgAqkrUl/W/go=
|
||||
SHA256 (Pkgfile) = 93eebf2551f55e5348bb750d47b6c0f95a087d4557b977525370241eb68f8dbb
|
||||
SHA256 (.footprint) = d42043b2651fe1cc623d3c2742c35247f8552c6d862123a7243941c400d8fe5a
|
||||
SHA256 (gnome-keyring-46.1.tar.gz) = 06eee96b5ff5a62b3890927fa61971ca5f066d210aef7b45aed4effdd02483e3
|
||||
|
|
|
|||
|
|
@ -1,56 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: "Jan Alexander Steffens (heftig)" <heftig@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
|
||||
|
||||
|
|
@ -1,21 +1,22 @@
|
|||
# Description: GNOME Keyring is a collection of components in GNOME that store secrets, passwords, keys, certificates and make them available to applications.
|
||||
# URL: https://gnome.org
|
||||
# Maintainer: Tim Biermann, tbier at posteo dot de
|
||||
# Depends on: desktop-file-utils docbook-xsl gcr3 gnome-common
|
||||
# Depends on: desktop-file-utils gcr3 gnome-common
|
||||
# Optional: docbook-xsl
|
||||
|
||||
name=gnome-keyring
|
||||
version=42.1
|
||||
release=2
|
||||
source=(https://github.com/GNOME/gnome-keyring/archive/$version/$name-$version.tar.gz
|
||||
0001-build-Use-p11_module_configs-as-default-pkcs11-confi.patch)
|
||||
version=46.1
|
||||
release=1
|
||||
source=(https://github.com/GNOME/gnome-keyring/archive/$version/$name-$version.tar.gz)
|
||||
|
||||
build() {
|
||||
cd $name-$version
|
||||
|
||||
patch -Np1 -i $SRC/0001-build-Use-p11_module_configs-as-default-pkcs11-confi.patch
|
||||
prt-get isinst docbook-xsl || PKGMK_GKR+=' --disable-doc'
|
||||
|
||||
NOCONFIGURE=1 ./autogen.sh
|
||||
./configure --prefix=/usr \
|
||||
./configure --prefix=/usr $PKGMK_GKR \
|
||||
--sysconfdir=/etc \
|
||||
--with-pam-dir=/lib/security \
|
||||
--with-root-certs=/etc/ssl/certs \
|
||||
--disable-static \
|
||||
|
|
|
|||
Loading…
Reference in New Issue