diff options
Diffstat (limited to 'app-crypt/monkeysphere/files')
6 files changed, 0 insertions, 136 deletions
diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.36_default_shell.patch b/app-crypt/monkeysphere/files/monkeysphere-0.36_default_shell.patch deleted file mode 100644 index f979114181d1..000000000000 --- a/app-crypt/monkeysphere/files/monkeysphere-0.36_default_shell.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -r d0c02fe6a949 src/share/common ---- a/src/share/common Sun Oct 06 19:21:18 2013 +0200 -+++ b/src/share/common Sun Oct 06 19:21:49 2013 +0200 -@@ -108,7 +108,7 @@ - # if root, su command as monkeysphere user - 'root') - # requote arguments using bash builtin feature (see "help printf"): -- su "$MONKEYSPHERE_USER" -c "$(printf "%q " "$@")" -+ su -s /bin/bash "$MONKEYSPHERE_USER" -c "$(printf "%q " "$@")" - ;; - - # otherwise, fail diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.36_hd_od.patch b/app-crypt/monkeysphere/files/monkeysphere-0.36_hd_od.patch deleted file mode 100644 index 7cdaa74b5735..000000000000 --- a/app-crypt/monkeysphere/files/monkeysphere-0.36_hd_od.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -r 6150774ec7f4 tests/keytrans ---- a/tests/keytrans Sun Feb 16 20:11:02 2014 +0100 -+++ b/tests/keytrans Sun Feb 16 20:11:40 2014 +0100 -@@ -104,8 +104,8 @@ - <(gpg --list-packets < "$TEMPDIR"/converted.secret.key) - - diff -u \ -- <(hd "$TEMPDIR"/secret.key) \ -- <(hd "$TEMPDIR"/converted.secret.key) -+ <(od -xc "$TEMPDIR"/secret.key) \ -+ <(od -xc "$TEMPDIR"/converted.secret.key) - - KEYFPR=$(gpg --fingerprint --with-colons --list-keys | grep ^fpr | cut -f10 -d:) - KEYID=$(printf "%s" "$KEYFPR" | cut -b25-40) diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.36_non_default_port.patch b/app-crypt/monkeysphere/files/monkeysphere-0.36_non_default_port.patch deleted file mode 100644 index f14550280fcf..000000000000 --- a/app-crypt/monkeysphere/files/monkeysphere-0.36_non_default_port.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -r 5f7ee764ec1f src/share/common ---- a/src/share/common Mon Oct 07 19:22:36 2013 +0200 -+++ b/src/share/common Mon Oct 07 19:22:58 2013 +0200 -@@ -863,6 +863,10 @@ - ;; - ('known_hosts') - host=${userID#ssh://} -+ if [[ "${host}" == *:* ]]; then -+ IFS=':' read -a ARR <<< "${host}" -+ host="[${ARR[0]}]:${ARR[1]}" -+ fi - remove_line "$keyFile" "$host" "$sshKey" - ;; - esac diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.36_openpgp2ssh_sanity_check.patch b/app-crypt/monkeysphere/files/monkeysphere-0.36_openpgp2ssh_sanity_check.patch deleted file mode 100644 index aec90eb07661..000000000000 --- a/app-crypt/monkeysphere/files/monkeysphere-0.36_openpgp2ssh_sanity_check.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/src/monkeysphere-authentication b/src/monkeysphere-authentication -index edc7995..2711ff2 100755 ---- a/src/monkeysphere-authentication -+++ b/src/monkeysphere-authentication -@@ -84,6 +84,13 @@ gpg_sphere() { - su_monkeysphere_user gpg --fixed-list-mode --no-greeting --quiet --no-tty "$@" - } - -+check_openpgp2ssh_sanity() { -+ if [[ `su_monkeysphere_user openpgp2ssh ABC &>/dev/null || echo $?` != "255" ]]; then -+ echo "openpgp2ssh command gives unexpected return code. This can lead to a scenario where no authorized keys are populated, even though they are otherwise valid. Aborting!" -+ exit 1 -+ fi; -+} -+ - # output to stdout the core fingerprint from the gpg core secret - # keyring - core_fingerprint() { -@@ -163,6 +170,7 @@ case $COMMAND in - 'update-users'|'update-user'|'update'|'u') - source "${MASHAREDIR}/setup" - setup -+ check_openpgp2ssh_sanity - source "${MASHAREDIR}/update_users" - OUTPUT_STDOUT= update_users "$@" - ;; -@@ -171,6 +179,7 @@ case $COMMAND in - (( $# > 0 )) || failure "Must specify user." - source "${MASHAREDIR}/setup" - setup -+ check_openpgp2ssh_sanity - source "${MASHAREDIR}/update_users" - OUTPUT_STDOUT=true update_users "$1" - ;; diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.36_tests_gnupg2.patch b/app-crypt/monkeysphere/files/monkeysphere-0.36_tests_gnupg2.patch deleted file mode 100644 index 712734459054..000000000000 --- a/app-crypt/monkeysphere/files/monkeysphere-0.36_tests_gnupg2.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -r c13f4b11061e tests/keytrans ---- a/tests/keytrans Sun Feb 16 19:24:08 2014 +0100 -+++ b/tests/keytrans Sun Feb 16 19:27:42 2014 +0100 -@@ -131,9 +131,9 @@ - cat >"$TEMPDIR"/expectedout <<EOF - pub:u:1024:1:$KEYID:$timestamp:::u:::scSC: - uid:u::::$timestamp::E90EC72E68C6C2A0751DADC70F54F60D27B88C3D::monkeymonkey: --sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x: -+sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8: - uid:u::::$timestamp::8200BD0425CC70C7D698DF3FE412044EAAB83F94::testtest: --sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x: -+sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8: - EOF - - diff -u "$TEMPDIR"/expectedout <(gpg --check-sigs --with-colons | grep -v ^tru) -@@ -159,10 +159,10 @@ - cat >"$TEMPDIR"/expectedout <<EOF - pub:u:1024:1:$KEYID:$timestamp:::u:::scSC: - uid:u::::$timestamp::E90EC72E68C6C2A0751DADC70F54F60D27B88C3D::monkeymonkey: --sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x: -+sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8: - uid:r::::::8200BD0425CC70C7D698DF3FE412044EAAB83F94::testtest: --sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x: --rev:!::1:$KEYID:$revtime::::monkeymonkey:30x: -+sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8: -+rev:!::1:$KEYID:$revtime::::monkeymonkey:30x:::::8: - EOF - - -@@ -190,15 +190,15 @@ - cat >"$TEMPDIR"/expectedout <<EOF - pub:u:1024:1:$KEYID:$timestamp:::u:::scSC: - uid:u::::$timestamp::E90EC72E68C6C2A0751DADC70F54F60D27B88C3D::monkeymonkey: --sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x: -+sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8: - uid:r::::::8200BD0425CC70C7D698DF3FE412044EAAB83F94::testtest: --sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x: --rev:!::1:$KEYID:$revtime::::monkeymonkey:30x: -+sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8: -+rev:!::1:$KEYID:$revtime::::monkeymonkey:30x:::::8: - uid:u::::$timestamp::EDDC32D783E7F4C7B6982D9AE5DC4A61000648BA::baz: --sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x: -+sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8: - pub:-:1024:1:$NEWKEYID:$(($timestamp + 1)):::-:::caCA: - uid:-::::$(($timestamp + 1))::A0D708F51CC257DEFC01AEDE1E0A5F329DFD8F16::fubar: --sig:!::1:$NEWKEYID:$(($timestamp + 1))::::fubar:13x: -+sig:!::1:$NEWKEYID:$(($timestamp + 1))::::fubar:13x:::::8: - EOF - - echo "test: diff expected gpg list output" diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.36_userid_empty_line.patch b/app-crypt/monkeysphere/files/monkeysphere-0.36_userid_empty_line.patch deleted file mode 100644 index 70c7cffe7dc4..000000000000 --- a/app-crypt/monkeysphere/files/monkeysphere-0.36_userid_empty_line.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -r 2315bb7781c6 src/share/common ---- a/src/share/common Thu Oct 10 19:25:10 2013 +0200 -+++ b/src/share/common Thu Oct 10 19:25:50 2013 +0200 -@@ -917,7 +917,7 @@ - IFS=$'\n' - while read line ; do - case "$line" in -- ("#"*) -+ ("#"*|"") - continue - ;; - (" "*|$'\t'*) |