summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <lars.wirzenius@codethink.co.uk>2014-04-16 16:37:03 +0000
committerLars Wirzenius <lars.wirzenius@codethink.co.uk>2014-04-16 16:37:03 +0000
commit1cf577ebd00e87a31cfab51654dee2fbb215f56b (patch)
treeed6dce51091d728b9fbc9950d40e3ef315396ce9
parentc7d99886de3fb8497d21b8191863a55d2b5b8a5e (diff)
parent686e9060493aad79c0e631db1c3b1b3c531cc65d (diff)
downloaddefinitions-1cf577ebd00e87a31cfab51654dee2fbb215f56b.tar.gz
Merge remote-tracking branch 'origin/baserock/markdoffman/openssl-new-update'
Reviewed-by: Richard Ipsum
-rw-r--r--core.morph4
1 files changed, 2 insertions, 2 deletions
diff --git a/core.morph b/core.morph
index 014bec12..f8faf1f4 100644
--- a/core.morph
+++ b/core.morph
@@ -91,8 +91,8 @@ chunks:
- m4
- name: openssl-new
repo: upstream:openssl-new
- ref: e691010325922fe85950e3fd29484ca11ec83f44
- unpetrify-ref: baserock/OpenSSL_1_0_2-stable
+ ref: ed9938171f80c7534f6eb52f75c2538bca462807
+ unpetrify-ref: baserock/OpenSSL_1_0_1g
build-depends:
- perl
- name: bzip2