summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Drake <michael.drake@codethink.co.uk>2014-06-09 11:22:39 (GMT)
committerMichael Drake <michael.drake@codethink.co.uk>2014-06-09 11:40:18 (GMT)
commit27ff164defae7a710ccd1694963d64637b4d8f9e (patch)
tree531cb55e2112428f2ac38a735c9fc329b6cb175d
parentb92663dd43cc19ed80ec5d4d6ef62ec1a4c9cd47 (diff)
downloaddefinitions-baserock/mikedrake/update-chunks.tar.gz
Update LibPNG, Automake and others:baserock/mikedrake/update-chunks
LibPNG has had many security fixes. Updating libpng required an update to automake. Updating automake required further changes to various software using automake. Since the new version of automake does not bundle its own copy of help2man, help2man has been moved from the foundation to the core stratum, to enable bison to build. The version updates are as follows: LibPNG 1.6.0 Curl 7.37.0 Automake 1.13.4 Has had a commit cherry-picked from upstream to for new automake: xorg-lib-libX11
-rw-r--r--core.morph17
-rw-r--r--foundation.morph5
-rw-r--r--x-common.morph8
3 files changed, 17 insertions, 13 deletions
diff --git a/core.morph b/core.morph
index 0980286..2a1d7e1 100644
--- a/core.morph
+++ b/core.morph
@@ -66,12 +66,20 @@ chunks:
- perl
- name: automake
repo: upstream:automake
- ref: 5ac84ae6760252fc60b144a7b4deb41694f95fe7
- unpetrify-ref: baserock/morph
+ ref: baserock/mikedrake/automake/v1.13.4
+ unpetrify-ref: 5ac84ae6760252fc60b144a7b4deb41694f95fe7
build-depends:
- autoconf
- perl
- texinfo-tarball
+- name: help2man
+ repo: upstream:help2man
+ ref: 0191a5f61525f8deea2ae8bdfea88190d85b6a71
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - perl
+ - autoconf
+ - automake
- name: bash
repo: upstream:bash
ref: 783c677f45354b0d6df70e552217ecad8481804f
@@ -143,8 +151,8 @@ chunks:
- xz
- name: curl
repo: upstream:curl
- ref: 3c835adc9fe20f7b34df3f0abd4db6ff8b75bc3b
- unpetrify-ref: baserock/morph
+ ref: baserock/mikedrake/curl/curl-7_37_0
+ unpetrify-ref: 3c835adc9fe20f7b34df3f0abd4db6ff8b75bc3b
build-depends:
- autoconf
- automake
@@ -190,6 +198,7 @@ chunks:
- gettext
- git
- mini-utils
+ - help2man
- name: gperf
repo: upstream:gperf
ref: 5094e4a539adf845111013f82c2c4fcaec637983
diff --git a/foundation.morph b/foundation.morph
index 4ad2b9f..feaecd6 100644
--- a/foundation.morph
+++ b/foundation.morph
@@ -99,11 +99,6 @@ chunks:
build-depends:
- glib
- systemd
-- name: help2man
- repo: upstream:help2man
- ref: 0191a5f61525f8deea2ae8bdfea88190d85b6a71
- unpetrify-ref: baserock/morph
- build-depends: []
- name: libxslt
repo: upstream:libxslt
ref: 8785a2ffd0d146df0395ab71ce4734d0a8ba0f7e
diff --git a/x-common.morph b/x-common.morph
index 77ba793..5158a51 100644
--- a/x-common.morph
+++ b/x-common.morph
@@ -10,8 +10,8 @@ chunks:
build-depends: []
- name: libpng
repo: upstream:libpng
- ref: 981560ae6094f0b0557e82c33d7ae5f7d81ca0ea
- unpetrify-ref: baserock/morph
+ ref: baserock/mikedrake/update-chunks
+ unpetrify-ref: 981560ae6094f0b0557e82c33d7ae5f7d81ca0ea
build-depends: []
- name: libjpeg
repo: upstream:libjpeg
@@ -203,8 +203,8 @@ chunks:
- xorg-util-macros
- name: xorg-lib-libX11
repo: upstream:xorg-lib-libX11
- ref: f57fd760cba92ad846917f21e94e73e9c846185f
- unpetrify-ref: baserock/morph
+ ref: baserock/mikedrake/update-chunks
+ unpetrify-ref: f57fd760cba92ad846917f21e94e73e9c846185f
build-depends:
- xcb-libxcb
- xorg-lib-libXau