[arch-commits] Commit in kdebase-workspace/trunk (3 files)
Pierre Schmitz
pierre at archlinux.org
Tue Aug 5 17:06:00 UTC 2008
Date: Tuesday, August 5, 2008 @ 13:05:59
Author: pierre
Revision: 7989
added support for gpg/ssh agents
Added:
kdebase-workspace/trunk/agent-shutdown.sh
kdebase-workspace/trunk/agent-startup.sh
Modified:
kdebase-workspace/trunk/PKGBUILD
-------------------+
PKGBUILD | 12 +++++++++---
agent-shutdown.sh | 13 +++++++++++++
agent-startup.sh | 19 +++++++++++++++++++
3 files changed, 41 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2008-08-05 16:18:52 UTC (rev 7988)
+++ PKGBUILD 2008-08-05 17:05:59 UTC (rev 7989)
@@ -3,7 +3,7 @@
pkgname=kdebase-workspace
pkgver=4.1.0
-pkgrel=4
+pkgrel=5
pkgdesc="KDE Base Workspace"
arch=('i686' 'x86_64')
url='http://www.kde.org'
@@ -18,13 +18,16 @@
options=('docs')
backup=('usr/share/config/kdm/kdmrc')
source=("ftp://ftp.archlinux.org/other/kde/${pkgname}-${pkgver}.tar.bz2"
- 'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam')
+ 'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam'
+ 'agent-startup.sh' 'agent-shutdown.sh')
md5sums=('d8dbe16f5807536a429bbf9fd33e82a5'
'40f5556820d52a14e9d9722a5a8a491e'
'5d80164932e0d44d8b802d3929a004ab'
'10a490653b002e6f9e7476ff9d37c011'
'552337fd9a3982d809ea16c7f0033d42'
- '367a3538f54db71f108b34cfa31088ac')
+ '367a3538f54db71f108b34cfa31088ac'
+ 'c963ef6e37c9051119972a58c67f05fb'
+ '18e8d01124b19f7df2937c06e177bf7f')
build() {
cd $srcdir/${pkgname}-${pkgver}
@@ -45,4 +48,7 @@
install -D -m644 ${srcdir}/kscreensaver.pam ${pkgdir}/etc/pam.d/kscreensaver
install -d -m755 ${pkgdir}/etc/X11/sessions/
ln -sf /usr/share/apps/kdm/sessions/kde{,-safe}.desktop ${pkgdir}/etc/X11/sessions/
+
+ install -m755 -D ${srcdir}/agent-startup.sh ${pkgdir}/usr/env/agent-startup.sh
+ install -m755 -D ${srcdir}/agent-shutdown.sh ${pkgdir}/usr/shutdown/agent-shutdown.sh
}
Added: agent-shutdown.sh
===================================================================
--- agent-shutdown.sh (rev 0)
+++ agent-shutdown.sh 2008-08-05 17:05:59 UTC (rev 7989)
@@ -0,0 +1,13 @@
+#!/bin/sh
+#
+# This file is executed at kde shutdown.
+# Uncomment the following lines to kill the agents
+# that were started at session startup.
+
+if [ "${GPG_AGENT_INFO}" ]; then
+ kill $(echo ${GPG_AGENT_INFO} | cut -d':' -f 2) >/dev/null 2>&1
+fi
+#
+if [ "${SSH_AGENT_PID}" ]; then
+ ssh-agent -k
+fi
Added: agent-startup.sh
===================================================================
--- agent-startup.sh (rev 0)
+++ agent-startup.sh 2008-08-05 17:05:59 UTC (rev 7989)
@@ -0,0 +1,19 @@
+# Agents startup file
+#
+# This file is sourced at kde startup, so that
+# the environment variables set here are available
+# throughout the session.
+
+# Uncomment the following lines to start gpg-agent
+# and/or ssh-agent at kde startup.
+# If you do so, do not forget to uncomment the respective
+# lines in KDEDIR/shutdown/agent-shutdown.sh to
+# properly kill the agents when the session ends.
+
+if [ -x /usr/bin/gpg-agent ]; then
+ eval "$(/usr/bin/gpg-agent --daemon)"
+fi
+#
+if [ -x /usr/bin/ssh-agent ]; then
+ eval "$(/usr/bin/ssh-agent -s)"
+fi
More information about the arch-commits
mailing list