From 8534c9a0be349fe96be1a6d54ced171fd1a41172 Mon Sep 17 00:00:00 2001 From: David Michael Date: Tue, 30 Oct 2018 22:02:08 +0000 Subject: [PATCH 1/2] chore(metadata): Regenerate cache --- .../sys-kernel/{bootengine-0.0.37 => bootengine-0.0.38} | 4 ++-- .../metadata/md5-cache/sys-kernel/bootengine-9999 | 2 +- .../metadata/md5-cache/sys-kernel/coreos-kernel-4.14.78 | 4 ++-- .../metadata/md5-cache/sys-kernel/coreos-kernel-4.19.0-r1 | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/{bootengine-0.0.37 => bootengine-0.0.38} (93%) diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/bootengine-0.0.37 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/bootengine-0.0.38 similarity index 93% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/bootengine-0.0.37 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/bootengine-0.0.38 index fc0769478b..35abf1cb78 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/bootengine-0.0.37 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/bootengine-0.0.38 @@ -5,6 +5,6 @@ EAPI=5 IUSE=cros_workon_tree_ profiling cros-debug KEYWORDS=amd64 arm arm64 x86 LICENSE=BSD -SLOT=0/0.0.37 +SLOT=0/0.0.38 _eclasses_=cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 4ad6e6491a1010ad7c875302b3be18ba desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e git-r3 0d4635eeb5a96cd5315597a47eba25c9 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=74d2e325a449c7abafef94c968e9c8c9 +_md5_=8e3041777f2b8ccf14323a737a47965f diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/bootengine-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/bootengine-9999 index 0abf3072a6..f332e07dea 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/bootengine-9999 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/bootengine-9999 @@ -7,4 +7,4 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86 LICENSE=BSD SLOT=0/9999 _eclasses_=cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 4ad6e6491a1010ad7c875302b3be18ba desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e git-r3 0d4635eeb5a96cd5315597a47eba25c9 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=74d2e325a449c7abafef94c968e9c8c9 +_md5_=8e3041777f2b8ccf14323a737a47965f diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.14.78 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.14.78 index 83e4ddee3e..e3ab2b34f3 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.14.78 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.14.78 @@ -1,5 +1,5 @@ DEFINED_PHASES=compile configure install prepare pretend setup unpack -DEPEND==sys-kernel/coreos-modules-4.14.78 app-arch/gzip app-shells/bash sys-apps/coreutils sys-apps/findutils sys-apps/grep sys-apps/ignition:= sys-apps/less sys-apps/sed sys-apps/shadow sys-apps/systemd[cryptsetup] sys-apps/seismograph sys-apps/util-linux sys-fs/btrfs-progs sys-fs/e2fsprogs sys-fs/mdadm sys-fs/xfsprogs >=sys-kernel/coreos-firmware-20180103-r1:= >=sys-kernel/bootengine-0.0.4:= sys-kernel/dracut virtual/udev amd64? ( sys-firmware/intel-microcode:= ) =sys-kernel/coreos-sources-4.14.78 +DEPEND==sys-kernel/coreos-modules-4.14.78 app-arch/gzip app-shells/bash sys-apps/coreutils sys-apps/findutils sys-apps/grep sys-apps/ignition:= sys-apps/less sys-apps/nvme-cli sys-apps/sed sys-apps/shadow sys-apps/systemd[cryptsetup] sys-apps/seismograph sys-apps/util-linux sys-fs/btrfs-progs sys-fs/e2fsprogs sys-fs/mdadm sys-fs/xfsprogs >=sys-kernel/coreos-firmware-20180103-r1:= >=sys-kernel/bootengine-0.0.4:= sys-kernel/dracut virtual/udev amd64? ( sys-firmware/intel-microcode:= ) =sys-kernel/coreos-sources-4.14.78 DESCRIPTION=CoreOS Linux kernel EAPI=5 HOMEPAGE=http://www.kernel.org @@ -10,4 +10,4 @@ RDEPEND==sys-kernel/coreos-modules-4.14.78 RESTRICT=binchecks strip SLOT=0/4.14.78 _eclasses_=coreos-kernel 588460f26859c559935beb69c53cb5c0 eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 linux-info 953c3b1c472dcadbf62098a9301327f2 multilib b2f01ad412baf81650c23fcf0975fa33 toolchain-funcs f164325a2cdb5b3ea39311d483988861 -_md5_=8d9003850e9a0961c3daa40b252ccb37 +_md5_=6dab206f9cd5286ae76f6cfe73096848 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.19.0-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.19.0-r1 index 67a05c5620..a3a8a57daa 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.19.0-r1 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.19.0-r1 @@ -1,5 +1,5 @@ DEFINED_PHASES=compile configure install prepare pretend setup unpack -DEPEND==sys-kernel/coreos-modules-4.19.0-r1 app-arch/gzip app-shells/bash sys-apps/coreutils sys-apps/findutils sys-apps/grep sys-apps/ignition:= sys-apps/less sys-apps/sed sys-apps/shadow sys-apps/systemd[cryptsetup] sys-apps/seismograph sys-apps/util-linux sys-fs/btrfs-progs sys-fs/e2fsprogs sys-fs/mdadm sys-fs/xfsprogs >=sys-kernel/coreos-firmware-20180103-r1:= >=sys-kernel/bootengine-0.0.4:= sys-kernel/dracut virtual/udev amd64? ( sys-firmware/intel-microcode:= ) =sys-kernel/coreos-sources-4.19.0-r1 +DEPEND==sys-kernel/coreos-modules-4.19.0-r1 app-arch/gzip app-shells/bash sys-apps/coreutils sys-apps/findutils sys-apps/grep sys-apps/ignition:= sys-apps/less sys-apps/nvme-cli sys-apps/sed sys-apps/shadow sys-apps/systemd[cryptsetup] sys-apps/seismograph sys-apps/util-linux sys-fs/btrfs-progs sys-fs/e2fsprogs sys-fs/mdadm sys-fs/xfsprogs >=sys-kernel/coreos-firmware-20180103-r1:= >=sys-kernel/bootengine-0.0.4:= sys-kernel/dracut virtual/udev amd64? ( sys-firmware/intel-microcode:= ) =sys-kernel/coreos-sources-4.19.0-r1 DESCRIPTION=CoreOS Linux kernel EAPI=5 HOMEPAGE=http://www.kernel.org @@ -10,4 +10,4 @@ RDEPEND==sys-kernel/coreos-modules-4.19.0-r1 RESTRICT=binchecks strip SLOT=0/4.19.0-r1 _eclasses_=coreos-kernel 588460f26859c559935beb69c53cb5c0 eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 linux-info 953c3b1c472dcadbf62098a9301327f2 multilib b2f01ad412baf81650c23fcf0975fa33 toolchain-funcs f164325a2cdb5b3ea39311d483988861 -_md5_=ea011609514db4e5a46c562222a5d8a5 +_md5_=322faa2ab9133a163e6b48742b42f1d3 From e91cfd2559481f5f991b873c8f12b1231c9b7591 Mon Sep 17 00:00:00 2001 From: David Michael Date: Tue, 30 Oct 2018 22:04:01 +0000 Subject: [PATCH 2/2] sys-apps/systemd: Bump the commit for CVE fixes --- .../md5-cache/sys-apps/{systemd-238-r2 => systemd-238-r3} | 2 +- .../coreos-overlay/metadata/md5-cache/sys-apps/systemd-9999 | 2 +- .../systemd/{systemd-238-r2.ebuild => systemd-238-r3.ebuild} | 0 .../coreos-overlay/sys-apps/systemd/systemd-9999.ebuild | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/{systemd-238-r2 => systemd-238-r3} (99%) rename sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/{systemd-238-r2.ebuild => systemd-238-r3.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/systemd-238-r2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/systemd-238-r3 similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/systemd-238-r2 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/systemd-238-r3 index c56badd02a..b88549af54 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/systemd-238-r2 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/systemd-238-r3 @@ -12,4 +12,4 @@ REQUIRED_USE=importd? ( curl gcrypt lzma ) RESTRICT=!test? ( test ) SLOT=0/2 _eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb cros-workon 4ad6e6491a1010ad7c875302b3be18ba desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e git-r3 0d4635eeb5a96cd5315597a47eba25c9 linux-info 953c3b1c472dcadbf62098a9301327f2 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e meson 29ef682942c6ff558de2f797a61790c2 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f pam 3e788d86170dfcd5b06824d898315e18 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 4900ae970f827a22d33d41bd8b8f9ace python-utils-r1 12114a2a9aab35b93efc037a196b3234 systemd 47c677ae1d7b69031f11f630ac09f0d1 toolchain-funcs f164325a2cdb5b3ea39311d483988861 udev 7752f306eec7b286d00bdb47b763e7ac user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=ee19ff552556d270ad823ae0d1da3f47 +_md5_=c30e2f2999c44bf945c41db1da3f6b25 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/systemd-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/systemd-9999 index 7e634525f0..ddce029023 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/systemd-9999 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/systemd-9999 @@ -12,4 +12,4 @@ REQUIRED_USE=importd? ( curl gcrypt lzma ) RESTRICT=!test? ( test ) SLOT=0/2 _eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb cros-workon 4ad6e6491a1010ad7c875302b3be18ba desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e git-r3 0d4635eeb5a96cd5315597a47eba25c9 linux-info 953c3b1c472dcadbf62098a9301327f2 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e meson 29ef682942c6ff558de2f797a61790c2 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f pam 3e788d86170dfcd5b06824d898315e18 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 4900ae970f827a22d33d41bd8b8f9ace python-utils-r1 12114a2a9aab35b93efc037a196b3234 systemd 47c677ae1d7b69031f11f630ac09f0d1 toolchain-funcs f164325a2cdb5b3ea39311d483988861 udev 7752f306eec7b286d00bdb47b763e7ac user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=ee19ff552556d270ad823ae0d1da3f47 +_md5_=c30e2f2999c44bf945c41db1da3f6b25 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-238-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-238-r3.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-238-r2.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-238-r3.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild index 3ba09dab34..bfd0308de0 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then # Use ~arch instead of empty keywords for compatibility with cros-workon KEYWORDS="~amd64 ~arm64 ~arm ~x86" else - CROS_WORKON_COMMIT="fb281190d66f2050241995db71ab76a68a76ef16" # v238-coreos + CROS_WORKON_COMMIT="efb274dc4cf49fc14e56d032b3557d942c6867bb" # v238-coreos KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" fi