From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Mon, 23 Mar 2009 00:11:56 +0000 (-0400)
Subject: Merge commit 'web/master'
X-Git-Tag: monkeysphere_0.25~32^2~6
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=a2761ab6c74d9794eb1650c8249ba8bcfc6f439a;hp=501f12cbf5e16ac521a27a32541d852fda4be682;p=monkeysphere.git

Merge commit 'web/master'
---

diff --git a/packaging/macports/Portfile b/packaging/macports/Portfile
index f9cf7a5..99d0d69 100644
--- a/packaging/macports/Portfile
+++ b/packaging/macports/Portfile
@@ -20,7 +20,7 @@ long_description    SSH key-based authentication is tried-and-true, \
                     users.
 
 homepage            http://web.monkeysphere.info/
-master_sites        ???
+master_sites        http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/
 distname            ${name}_${version}
 worksrcdir          ${name}-${version}
 checksums           md5 8590532f4702fa44027a6a583657c9ef
diff --git a/src/share/ma/add_certifier b/src/share/ma/add_certifier
index 544a3f0..402da08 100644
--- a/src/share/ma/add_certifier
+++ b/src/share/ma/add_certifier
@@ -153,16 +153,14 @@ gpg_sphere "--export 0x${fingerprint}!" | gpg_core --import
 
 # edit-key script to ltsign key
 # NOTE: *all* user IDs will be ltsigned
-ltsignCommand=$(cat <<EOF
-ltsign
+ltsignCommand="ltsign
 y
 $trustval
 $depth
 $domain
 y
-save
-EOF
-    )
+save"
+# end script
 
 # core ltsigns the newly imported certifier key
 log debug "executing core ltsign script..."
diff --git a/src/share/mh/add_hostname b/src/share/mh/add_hostname
index b08d688..36f174d 100644
--- a/src/share/mh/add_hostname
+++ b/src/share/mh/add_hostname
@@ -43,14 +43,12 @@ else
 fi
 
 # edit-key script command to add user ID
-adduidCommand=$(cat <<EOF
-adduid
+adduidCommand="adduid
 $userID
 
 
-save
-EOF
-)
+save"
+# end script
 
 # execute edit-key script
 if echo "$adduidCommand" | gpg_host_edit ; then
diff --git a/src/share/mh/add_revoker b/src/share/mh/add_revoker
index 03ae56f..077b0d0 100644
--- a/src/share/mh/add_revoker
+++ b/src/share/mh/add_revoker
@@ -106,14 +106,12 @@ of the host key? (Y/n) " OK; OK=${OK:-Y}
 fi
 
 # edit-key script to add revoker
-addrevokerCommand=$(cat <<EOF
-addrevoker
+addrevokerCommand="addrevoker
 $fingerprint
 y
 save
-
-EOF
-    )
+"
+# end script
 
 # core ltsigns the newly imported revoker key
 log debug "executing add revoker script..."
diff --git a/src/share/mh/revoke_hostname b/src/share/mh/revoke_hostname
index 2142af7..5dc327f 100644
--- a/src/share/mh/revoke_hostname
+++ b/src/share/mh/revoke_hostname
@@ -54,17 +54,15 @@ else
 fi
 
 # edit-key script command to revoke user ID
-revuidCommand=$(cat <<EOF
-$uidIndex
+revuidCommand="$uidIndex
 revuid
 y
 4
 Hostname removed by monkeysphere-host: $DATE
 
 y
-save
-EOF
-    )	
+save"
+# end script
 
 # execute edit-key script
 if echo "$revuidCommand" | gpg_host_edit ; then