From 1a003033df34cebd91e3402e4ec110bbebfc7622 Mon Sep 17 00:00:00 2001
From: Richard Maw <richard.maw@codethink.co.uk>
Date: Wed, 7 Aug 2013 14:47:37 +0000
Subject: morphology: convert to YAML

---
 openssh.morph | 49 +++++++++++++++++++++++++++----------------------
 1 file changed, 27 insertions(+), 22 deletions(-)

diff --git a/openssh.morph b/openssh.morph
index ac9d99b5..881653e9 100644
--- a/openssh.morph
+++ b/openssh.morph
@@ -1,22 +1,27 @@
-{
-    "name": "openssh",
-    "kind": "chunk",
-    "configure-commands": [
-        "autoreconf -if",
-        "OPENSSL_SEEDS_ITSELF=yes ./configure --prefix=\"$PREFIX\" --sysconfdir=/etc/ssh --datadir=\"$PREFIX/share/sshd\" --libexecdir=\"$PREFIX/lib/openssh\" --with-privsep-path=/var/lib/sshd"
-    ],
-    "build-commands": [
-        "make",
-        "sed -e \"s|@prefix@|$PREFIX|g\" -e \"s|@STARTUP_SCRIPT_SHELL@|/bin/sh|g\" -e 's|@sysconfdir@|/etc/ssh|g' -e 's|@COMMENT_OUT_ECC@||g' sshd-keygen.in >sshd-keygen",
-        "sed -e \"s|@prefix@|$PREFIX|g\" opensshd.service.in >opensshd.service"
-    ],
-    "install-commands": [
-        "make DESTDIR=\"$DESTDIR\" install",
-        "mkdir -p \"$DESTDIR/$PREFIX/sbin\"",
-        "chmod go= \"$DESTDIR\"/var/lib/sshd",
-        "install -m 744 sshd-keygen \"$DESTDIR/$PREFIX/sbin/sshd-keygen\"",
-        "mkdir -p \"$DESTDIR/lib/systemd/system/multi-user.target.wants\"",
-        "install -m 644 opensshd.service \"$DESTDIR/lib/systemd/system/opensshd.service\"",
-        "ln -s ../opensshd.service \"$DESTDIR/lib/systemd/system/multi-user.target.wants/opensshd.service\""
-    ]
-}
+name: openssh
+kind: chunk
+configure-commands:
+- autoreconf -if
+- |
+  OPENSSL_SEEDS_ITSELF=yes ./configure \
+      --prefix="$PREFIX" --sysconfdir=/etc/ssh \
+      --datadir="$PREFIX/share/sshd" \
+      --libexecdir="$PREFIX/lib/openssh" \
+      --with-privsep-path=/var/lib/sshd
+build-commands:
+- make
+- |
+  sed -e 's|@prefix@|$PREFIX|g' \
+      -e 's|@STARTUP_SCRIPT_SHELL@|/bin/sh|g' \
+      -e 's|@sysconfdir@|/etc/ssh|g' \
+      -e 's|@COMMENT_OUT_ECC@||g' \
+      sshd-keygen.in >sshd-keygen
+- sed -e 's|@prefix@|$PREFIX|g' opensshd.service.in >opensshd.service
+install-commands:
+- make DESTDIR="$DESTDIR" install
+- mkdir -p "$DESTDIR/$PREFIX/sbin"
+- chmod go= "$DESTDIR"/var/lib/sshd
+- install -m 744 sshd-keygen "$DESTDIR/$PREFIX/sbin/sshd-keygen"
+- mkdir -p "$DESTDIR/lib/systemd/system/multi-user.target.wants"
+- install -m 644 opensshd.service "$DESTDIR/lib/systemd/system/opensshd.service"
+- ln -s ../opensshd.service "$DESTDIR/lib/systemd/system/multi-user.target.wants/opensshd.service"
-- 
cgit v1.2.1


From b30cdffc8cd4d62639f8b9ab1caa9f82c5493ac1 Mon Sep 17 00:00:00 2001
From: Richard Maw <richard.maw@codethink.co.uk>
Date: Wed, 7 Aug 2013 14:52:08 +0000
Subject: morphology: install ssh-copy-id

---
 openssh.morph | 1 +
 1 file changed, 1 insertion(+)

diff --git a/openssh.morph b/openssh.morph
index 881653e9..085c6dfa 100644
--- a/openssh.morph
+++ b/openssh.morph
@@ -22,6 +22,7 @@ install-commands:
 - mkdir -p "$DESTDIR/$PREFIX/sbin"
 - chmod go= "$DESTDIR"/var/lib/sshd
 - install -m 744 sshd-keygen "$DESTDIR/$PREFIX/sbin/sshd-keygen"
+- install -m 755 contrib/ssh-copy-id "$DESTDIR/$PREFIX/bin/ssh-copy-id"
 - mkdir -p "$DESTDIR/lib/systemd/system/multi-user.target.wants"
 - install -m 644 opensshd.service "$DESTDIR/lib/systemd/system/opensshd.service"
 - ln -s ../opensshd.service "$DESTDIR/lib/systemd/system/multi-user.target.wants/opensshd.service"
-- 
cgit v1.2.1