From e60a4fde33c6d020d5cc8ef3c2f1b93ac68b7e3f Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Mon, 27 Sep 2021 22:08:58 +0200 Subject: [PATCH] gnome-keyring: remove CAP_IPC_LOCK due to hardening in glib 2.70, gnome-keyring is broken with CAP_IPC_LOCK https://gitlab.gnome.org/GNOME/gnome-keyring/-/issues/77 --- srcpkgs/gnome-keyring/INSTALL | 12 ------------ srcpkgs/gnome-keyring/template | 12 ++++++------ 2 files changed, 6 insertions(+), 18 deletions(-) delete mode 100644 srcpkgs/gnome-keyring/INSTALL diff --git a/srcpkgs/gnome-keyring/INSTALL b/srcpkgs/gnome-keyring/INSTALL deleted file mode 100644 index 405c7c8890e..00000000000 --- a/srcpkgs/gnome-keyring/INSTALL +++ /dev/null @@ -1,12 +0,0 @@ -case "${ACTION}" in -post) - # Set IPC capability, exit gracefully if we cannot set the capability - # due to invalid permissions (fakeroot install). - set +e - setcap cap_ipc_lock=ep usr/bin/gnome-keyring-daemon - if [ $? -ne 0 ]; then - echo "ERROR: failed to set ipc_lock capability on gnome-keyring-daemon." - exit 0 - fi - ;; -esac diff --git a/srcpkgs/gnome-keyring/template b/srcpkgs/gnome-keyring/template index b8defd1997d..12f1e8d2df6 100644 --- a/srcpkgs/gnome-keyring/template +++ b/srcpkgs/gnome-keyring/template @@ -1,24 +1,24 @@ # Template file for 'gnome-keyring' pkgname=gnome-keyring version=40.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-pam-dir=/usr/lib/security --disable-schemas-compile" hostmakedepends="autoconf docbook-xsl glib-devel intltool libtasn1-tools libxslt openssh pkg-config" makedepends="gcr-devel libcap-devel libcap-ng-devel libtasn1-devel pam-devel" -# For setcap(8). -depends="dconf gcr libcap-progs" +depends="dconf gcr" +checkdepends="dbus xvfb-run" short_desc="GNOME password and secret manager" maintainer="Orphaned " license="GPL-2.0-or-later, LGPL-2.1-or-later" -#changelog="https://raw.githubusercontent.com/GNOME/gnome-keyring/gnome-3-28/NEWS" homepage="https://www.gnome.org" +changelog="https://raw.githubusercontent.com/GNOME/gnome-keyring/gnome-40/NEWS" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" checksum=a3d24db08ee2fdf240fbbf0971a98c8ee295aa0e1a774537f4ea938038a3b931 +make_check=ci-skip lib32disabled=yes do_check() { - # Requires X11 server - : + xvfb-run make check }