From 73f27e281e25bcca361dba42db99dbd11a0456b2 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 5 Oct 2011 10:51:13 +0200 Subject: [PATCH] gnome-keyring: fail gracefully if setcap fails, e.g fakeroot case. --- srcpkgs/gnome-keyring/INSTALL | 8 +++++++- srcpkgs/gnome-keyring/template | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-keyring/INSTALL b/srcpkgs/gnome-keyring/INSTALL index b2da58fe4f7..405c7c8890e 100644 --- a/srcpkgs/gnome-keyring/INSTALL +++ b/srcpkgs/gnome-keyring/INSTALL @@ -1,6 +1,12 @@ case "${ACTION}" in post) - # Set IPC capability. + # 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 e0824a7e5d2..167b2757af6 100644 --- a/srcpkgs/gnome-keyring/template +++ b/srcpkgs/gnome-keyring/template @@ -1,7 +1,7 @@ # Template file for 'gnome-keyring' pkgname=gnome-keyring version=3.2.0 -revision=1 +revision=2 distfiles="${GNOME_SITE}/$pkgname/3.2/$pkgname-$version.tar.xz" build_style=gnu_configure configure_args="--localstatedir=/var --with-pam-dir=/lib/security