From c5b1e87288339ef0934f94ab94f63e75cb46019a Mon Sep 17 00:00:00 2001
From: Paul Sherwood <paul.sherwood@codethink.co.uk>
Date: Mon, 21 Apr 2014 05:54:07 +0000
Subject: add memcached, libgit2, libyaml, update openssl for heartbleed

---
 core.morph      |  3 ++-
 databases.morph |  7 ++++++-
 useful.morph    | 23 ++++++++++++++---------
 3 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/core.morph b/core.morph
index 6d56a8d2..2928187b 100644
--- a/core.morph
+++ b/core.morph
@@ -72,7 +72,8 @@ chunks:
   - m4
 - name: openssl-new
   repo: upstream:openssl-new
-  ref: baserock/morph
+  ref: baserock/ps/proto-web-system
+  unpetrify-ref: baserock/morph
   build-depends:
   - perl
 - name: bzip2
diff --git a/databases.morph b/databases.morph
index cd6aa473..86d1067f 100644
--- a/databases.morph
+++ b/databases.morph
@@ -3,6 +3,7 @@ kind: stratum
 description: some popular databases
 build-depends:
 - morph: tools
+- morph: nfs
 chunks:
 - name: readline
   repo: upstream:readline
@@ -17,5 +18,9 @@ chunks:
   - readline
 - name: redis
   repo: baserock:baserock/redis
-  ref: 5b468ace3a39fa4aa0ce696128cc277abb42cd6b 
+  ref: 5b468ace3a39fa4aa0ce696128cc277abb42cd6b
+  build-depends: []
+- name: memcached
+  repo: git://github.com/memcached/memcached.git
+  ref: master
   build-depends: []
diff --git a/useful.morph b/useful.morph
index a45fdfd2..79ce246e 100644
--- a/useful.morph
+++ b/useful.morph
@@ -1,12 +1,16 @@
 name: useful
 kind: stratum
-description: pip, node, ruby, rubygems, bundler
+description: pip, node, ruby - can use their package managers from here...
 build-depends:
 - morph: tools
 chunks:
+- name: libgit2
+  repo: git@github.com:libgit2/libgit2.git
+  ref: master
+  build-depends: []
 - name: tar
   repo: upstream:tar
-  ref: baserock/morph 
+  ref: baserock/morph
   build-depends: []
 - name: pip
   repo: git@github.com:pypa/pip.git
@@ -15,21 +19,22 @@ chunks:
   build-depends: []
 - name: node
   repo: git@github.com:joyent/node.git
-  ref: v0.10.26 
+  ref: v0.10.26
   build-depends: []
 - name: ruby-1.8
   repo: upstream:ruby
   ref: 7a24f1710028d568ad61d0aa49d5178260178d77
   unpetrify-ref: baserock/morph/ruby_1_8_7
   build-depends: []
-- name: ruby-1.9
-  repo: upstream:ruby
-  ref: cb3ea602294b5038b5f7ac21d3875a2b52342956
-  unpetrify-ref: baserock/morph/ruby_1_9_3
-  build-depends:
-  - ruby-1.8
 - name: libyaml
   repo: baserock:baserock/libyaml-hg
   ref: 0577078d6625a7bf06e6bc7fb26a43e27400b17e
   unpetrify-ref: master
   build-depends: []
+- name: ruby-1.9
+  repo: upstream:ruby
+  ref: baserock/ps/proto-web-system
+  unpetrify-ref: cb3ea602294b5038b5f7ac21d3875a2b52342956
+  build-depends:
+  - ruby-1.8
+  - libyaml
-- 
cgit v1.2.1