summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <lars.wirzenius@codethink.co.uk>2014-04-10 13:29:48 (GMT)
committerLars Wirzenius <lars.wirzenius@codethink.co.uk>2014-04-10 13:29:48 (GMT)
commit6985089c8e8afb07fbe87764f37a6d5779b06024 (patch)
treee932f927b70f349761a3213d8f68d9a1ce60ade1
parent91e525061004f6237bba2663d1620c791b99ebee (diff)
parent24afec8ef38dc5de770a49dd9d5832a1e9bcf749 (diff)
downloaddefinitions-6985089c8e8afb07fbe87764f37a6d5779b06024.tar.gz
Merge remote-tracking branch 'origin/baserock/markdoffman/openssl-new-update'
Reviewed-by: Lars Wirzenius Reviewed-by: Daniel Silverstone
-rw-r--r--core.morph4
1 files changed, 2 insertions, 2 deletions
diff --git a/core.morph b/core.morph
index 67d3cca..e5a8094 100644
--- a/core.morph
+++ b/core.morph
@@ -91,8 +91,8 @@ chunks:
- m4
- name: openssl-new
repo: upstream:openssl-new
- ref: 2bee25a915c2ba40e58229788aabc97765426016
- unpetrify-ref: baserock/morph
+ ref: e691010325922fe85950e3fd29484ca11ec83f44
+ unpetrify-ref: baserock/OpenSSL_1_0_2-stable
build-depends:
- perl
- name: bzip2