diff options
| -rw-r--r-- | packaging/debian/70monkeysphere_use_validation_agent | 30 | ||||
| -rw-r--r-- | packaging/debian/changelog | 5 | ||||
| -rw-r--r-- | packaging/debian/control | 1 |
3 files changed, 35 insertions, 1 deletions
diff --git a/packaging/debian/70monkeysphere_use_validation_agent b/packaging/debian/70monkeysphere_use_validation_agent new file mode 100644 index 0000000..1390859 --- /dev/null +++ b/packaging/debian/70monkeysphere_use_validation_agent @@ -0,0 +1,30 @@ +# /etc/X11/Xsession.d/70monkeysphere_use_validation_agent + +# This is a script to be sourced by Xsession. It wraps the session +# startup argument with a monkeysphere-validation-agent nested +# process, if available and none already exist. + +# Enable this system-wide by adding a line to +# /etc/X11/Xsession.options that reads: +# use-monkeysphere-validation-agent + +# Note that there is some weird interaction between this and +# dbus-session at the moment: dbus-launch can start the msva just +# fine, but if msva tries to start dbus-launch, dbus-launch fails +# with: + +# Failed to waitpid() for babysitter intermediate process: No child processes + +# So this is placed at position 70 -- *before* the dbus Xsession +# startup script, which is at 75 as of 2010-03-12, when i wrote this. + +# Author: Daniel Kahn Gillmor <dkg@fifthhorseman.net> + +STARTMSVA= +MSVAGENT=/usr/bin/monkeysphere-validation-agent + +if grep -qs ^use-monkeysphere-validation-agent "$OPTIONFILE"; then + if [ -x "$MSVAGENT" ] && [ -z "$MONKEYSPHERE_VALIDATION_AGENT_SOCKET" ]; then + STARTUP="$MSVAGENT $STARTUP" + fi +fi diff --git a/packaging/debian/changelog b/packaging/debian/changelog index 10429fe..6152a6e 100644 --- a/packaging/debian/changelog +++ b/packaging/debian/changelog @@ -6,8 +6,11 @@ monkeysphere (0.29~pre1-1) UNRELEASED; urgency=low [ Daniel Kahn Gillmor ] * bumped Standards-Version to 3.8.4 (no changes needed) * indicated bash dependency on version 3.2 or later (see MS #1687) + * including /etc/Xsession.d/70monkeysphere_use_validation_agent so that + administrators can start up a validation agent by default for each X + session by adding a single line to /etc/X11/Xsession.options. - -- Daniel Kahn Gillmor <dkg@fifthhorseman.net> Thu, 18 Feb 2010 12:40:56 -0500 + -- Daniel Kahn Gillmor <dkg@fifthhorseman.net> Fri, 12 Mar 2010 01:57:39 -0500 monkeysphere (0.28-1) unstable; urgency=low diff --git a/packaging/debian/control b/packaging/debian/control index 9a32642..6cd0143 100644 --- a/packaging/debian/control +++ b/packaging/debian/control @@ -28,6 +28,7 @@ Depends: openssh-client, adduser, ${misc:Depends} Recommends: netcat | socat, ssh-askpass, cron +Suggests: monkeysphere-validation-agent Enhances: openssh-client, openssh-server Description: leverage the OpenPGP web of trust for SSH and TLS authentication SSH key-based authentication is tried-and-true, but it lacks a true |