projects
/
monkeysphere.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
45d416f
)
some more pruning of unnecessary usage of cat for the gnupg scripts.
author
Jameson Graef Rollins
<jrollins@finestructure.net>
Mon, 23 Mar 2009 00:11:16 +0000
(20:11 -0400)
committer
Jameson Graef Rollins
<jrollins@finestructure.net>
Mon, 23 Mar 2009 00:11:16 +0000
(20:11 -0400)
packaging/macports/Portfile
patch
|
blob
|
history
src/share/ma/add_certifier
patch
|
blob
|
history
src/share/mh/add_hostname
patch
|
blob
|
history
src/share/mh/add_revoker
patch
|
blob
|
history
src/share/mh/revoke_hostname
patch
|
blob
|
history
diff --git
a/packaging/macports/Portfile
b/packaging/macports/Portfile
index f9cf7a5385569bf36275e6c62cfbdd77ed3582b7..99d0d693989784384eab6048374f8374064436a5 100644
(file)
--- 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/
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
distname ${name}_${version}
worksrcdir ${name}-${version}
checksums md5 8590532f4702fa44027a6a583657c9ef
diff --git
a/src/share/ma/add_certifier
b/src/share/ma/add_certifier
index 544a3f0d18e635ad0e060a21642186d3c263d9e7..402da08e552cdccdf48329f89df4af28aca0fc12 100644
(file)
--- 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
# edit-key script to ltsign key
# NOTE: *all* user IDs will be ltsigned
-ltsignCommand=$(cat <<EOF
-ltsign
+ltsignCommand="ltsign
y
$trustval
$depth
$domain
y
y
$trustval
$depth
$domain
y
-save
-EOF
- )
+save"
+# end script
# core ltsigns the newly imported certifier key
log debug "executing core ltsign 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 b08d688a91f1230f983439259c2aaab9aabf4128..36f174de9049f433b13e068aa12d11a22a036be8 100644
(file)
--- 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
fi
# edit-key script command to add user ID
-adduidCommand=$(cat <<EOF
-adduid
+adduidCommand="adduid
$userID
$userID
-save
-EOF
-)
+save"
+# end script
# execute edit-key script
if echo "$adduidCommand" | gpg_host_edit ; then
# 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 03ae56fe5374f435f19735feaacf483ed3113e05..077b0d06b4409732f1c31febcf38b9b5e0e48333 100644
(file)
--- 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
fi
# edit-key script to add revoker
-addrevokerCommand=$(cat <<EOF
-addrevoker
+addrevokerCommand="addrevoker
$fingerprint
y
save
$fingerprint
y
save
-
-EOF
- )
+"
+# end script
# core ltsigns the newly imported revoker key
log debug "executing add revoker 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 2142af7dbeb424757b94d58516b33b6e12a927cc..5dc327f02c8a65a97e1fa4dd4dae1289bb15bc85 100644
(file)
--- 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
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
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
# execute edit-key script
if echo "$revuidCommand" | gpg_host_edit ; then