further lockfile debugging.

diff --git a/debian/changelog b/debian/changelog
index b034c888cb5fb494eca5b7580f1903be5e41804a..fb0788e48668cd345f320818122f7481903e31eb 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ monkeysphere (0.16~pre-1) UNRELEASED; urgency=low
   [ Daniel Kahn Gillmor ]
   * replaced "#!/bin/bash" with "#!/usr/bin/env bash" for better
     portability.
+  * fixed busted lockfile arrangement, where empty file was being locked
 
  -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>  Thu, 11 Sep 2008 23:16:31 -0400
 

diff --git a/packaging/freebsd/Makefile b/packaging/freebsd/Makefile
index 2937d6918a3ca8c6c5710a3249b0d6d1319576ab..a03c10808307ee9ece9b1953f69708cebeff82af 100644 (file)
--- a/packaging/freebsd/Makefile
+++ b/packaging/freebsd/Makefile
@@ -21,6 +21,7 @@ COMMENT=       use the OpenPGP web of trust to verify ssh connections
 LIB_DEPENDS=   gnutls.26:${PORTSDIR}/security/gnutls
 RUN_DEPENDS=    base64:${PORTSDIR}/converters/base64 \
                gpg:${PORTSDIR}/security/gnupg \
+               lockfile:${PORTSDIR}/mail/procmail \
                bash:${PORTSDIR}/shells/bash
 
 MAN1=          monkeysphere.1 openpgp2ssh.1 monkeysphere-ssh-proxycommand.1

diff --git a/src/common b/src/common
index 25f7e4efc245fa7b95cb39ca946a1e50ab8fef23..556dd5ad6b5e88ddac1ce550ef2510b567a5125c 100644 (file)
--- a/src/common
+++ b/src/common
@@ -98,7 +98,7 @@ cutline() {
 lock() {
     local use_lockfileprogs=true
     local action="$1"
-    local file="$file"
+    local file="$2"
 
     if ! ( which lockfile-create >/dev/null 2>/dev/null ) ; then
        if ! ( which lockfile >/dev/null ); then