diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/config/env/net-dns/bind-tools b/sdk_container/src/third_party/coreos-overlay/coreos/config/env/net-dns/bind-tools new file mode 100644 index 0000000000..4f1c422d57 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/coreos/config/env/net-dns/bind-tools @@ -0,0 +1,2 @@ +# Work around failing OpenSSL feature detection. +EXTRA_ECONF="--without-ecdsa" diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/Manifest b/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/Manifest new file mode 100644 index 0000000000..f3f9902781 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/Manifest @@ -0,0 +1 @@ +DIST catalyst-2.0.18.tar.bz2 861398 BLAKE2B 70986d312410fb7abb5c8d7eacefa0f0150a3642e92e4f7b7e9944cf3653e7e2ba987ffb34a614b261a22ce3bb964488181c019f92bbc9c73567f89be04c0989 SHA512 5a1408ffe06ce5c06a6bca8f0e3ecd91c17cdc36e2dfa37881d843432bdfe987fd2cfd988cd5719bdf378c18c2e79ee59e281c3b4dba4ae9edfc2dd654b8ee4a diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/catalyst-2.0.18-r5.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/catalyst-2.0.18-r5.ebuild new file mode 100644 index 0000000000..e75053b0ea --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/catalyst-2.0.18-r5.ebuild @@ -0,0 +1,121 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +if [[ ${PV} == *9999* ]]; then + SRC_ECLASS="git-2" + EGIT_REPO_URI="anongit.gentoo.org/proj/catalyst.git" + EGIT_MASTER="master" + S="${WORKDIR}/${PN}" +else + SRC_URI="mirror://gentoo/${P}.tar.bz2 + https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2 + https://dev.gentoo.org/~mattst88/distfiles/${P}.tar.bz2 + https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2 + https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2" + KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" +fi + +PYTHON_COMPAT=( python2_7 ) + +inherit eutils multilib python-single-r1 ${SRC_ECLASS} + +DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux" +HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst" + +LICENSE="GPL-2" +SLOT="0" +IUSE="ccache kernel_linux" + +DEPEND=" + app-text/asciidoc + ${PYTHON_DEPS} +" +RDEPEND=" + app-arch/lbzip2 + app-crypt/shash + app-arch/tar[xattr] + sys-fs/dosfstools + virtual/cdrtools + amd64? ( >=sys-boot/syslinux-3.72 ) + x86? ( >=sys-boot/syslinux-3.72 ) + ccache? ( dev-util/ccache ) + kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 ) + ${PYTHON_DEPS} +" + +REQUIRED_USE=${PYTHON_REQUIRED_USE} + +PATCHES=( + "${FILESDIR}/catalyst-2.0.18-Do-notuntarwith--acls.patch" + "${FILESDIR}/catalyst-2.0.18-fix-quotes.patch" + "${FILESDIR}/catalyst-2.0.18-remove-machine-id.patch" + "${FILESDIR}/catalyst-2.0.18-stage1-export-ROOT.patch" + "${FILESDIR}/catalyst-2.0.18-coreos-upgrade-ncurses.patch" +) + +pkg_setup() { + if use ccache ; then + einfo "Enabling ccache support for catalyst." + else + ewarn "By default, ccache support for catalyst is disabled." + ewarn "If this is not what you intended," + ewarn "then you should add ccache to your USE." + fi + + echo + einfo "The template spec files are now installed by default. You can find" + einfo "them under /usr/share/doc/${PF}/examples" + einfo "and they are considered to be the authorative source of information" + einfo "on catalyst." + echo + + python-single-r1_pkg_setup +} + +src_prepare() { + epatch "${PATCHES[@]}" +} + +src_install() { + insinto /usr/$(get_libdir)/${PN} + exeinto /usr/$(get_libdir)/${PN} + doexe catalyst || die "copying catalyst" + + if [[ ${PV} == 3.9999* ]]; then + doins -r modules files || die "copying files" + else + doins -r arch modules livecd || die "copying files" + fi + + for x in targets/*; do + exeinto /usr/$(get_libdir)/${PN}/$x + doexe $x/* || die "copying ${x}" + done + + # Here is where we actually enable ccache + use ccache && \ + sed -i -e 's:options="autoresume kern:options="autoresume ccache kern:' \ + files/catalyst.conf + + sed -i -e "s:/usr/lib/catalyst:/usr/$(get_libdir)/catalyst:" \ + files/catalyst.conf + + make_wrapper catalyst /usr/$(get_libdir)/${PN}/catalyst + insinto /etc/catalyst + doins files/catalyst.conf files/catalystrc || die "copying configuration" + insinto /usr/share/doc/${PF}/examples + doins examples/* || die + dodoc README AUTHORS + doman files/catalyst.1 files/catalyst-spec.5 + + python_fix_shebang "${ED}usr/$(get_libdir)/catalyst/catalyst" + python_optimize "${ED}" +} + +pkg_postinst() { + einfo "You can find more information about catalyst by checking out the" + einfo "catalyst project page at:" + einfo "https://wiki.gentoo.org/wiki/Catalyst" +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/files/catalyst-2.0.18-Do-notuntarwith--acls.patch b/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/files/catalyst-2.0.18-Do-notuntarwith--acls.patch new file mode 100644 index 0000000000..f4cbcfbb7d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/files/catalyst-2.0.18-Do-notuntarwith--acls.patch @@ -0,0 +1,95 @@ +From 45286727a63d16d0688a88bf7cf68289efd26861 Mon Sep 17 00:00:00 2001 +From: "Anthony G. Basile" +Date: Sun, 18 Jan 2015 22:21:16 -0500 +Subject: [PATCH] Do not untar with --acls, fixes bug #536762 +To: gentoo-catalyst@lists.gentoo.org + +--- + modules/catalyst_support.py | 6 +++--- + modules/generic_stage_target.py | 18 +++++++++--------- + 2 files changed, 12 insertions(+), 12 deletions(-) + +diff --git a/modules/catalyst_support.py b/modules/catalyst_support.py +index 0e9faac..702887d 100644 +--- a/modules/catalyst_support.py ++++ b/modules/catalyst_support.py +@@ -108,9 +108,9 @@ contents_map={ + # 'find' is disabled because it requires the source path, which is not + # always available + #"find" :[calc_contents,"find %(path)s"], +- "tar-tv":[calc_contents,"tar --xattrs --acls tvf %(file)s"], +- "tar-tvz":[calc_contents,"tar --xattrs --acls tvzf %(file)s"], +- "tar-tvj":[calc_contents,"tar --xattrs --acls -I lbzip2 -tvf %(file)s"], ++ "tar-tv":[calc_contents,"tar --xattrs tvf %(file)s"], ++ "tar-tvz":[calc_contents,"tar --xattrs tvzf %(file)s"], ++ "tar-tvj":[calc_contents,"tar --xattrs -I lbzip2 -tvf %(file)s"], + "isoinfo-l":[calc_contents,"isoinfo -l -i %(file)s"], + # isoinfo-f should be a last resort only + "isoinfo-f":[calc_contents,"isoinfo -f -i %(file)s"], +diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py +index c7db027..cc24c63 100644 +--- a/modules/generic_stage_target.py ++++ b/modules/generic_stage_target.py +@@ -660,10 +660,10 @@ class generic_stage_target(generic_target): + self.settings["chroot_path"]+\ + " (This may take some time) ...\n" + if "bz2" == self.settings["chroot_path"][-3:]: +- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ ++ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ + self.settings["chroot_path"] + else: +- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ ++ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ + self.settings["chroot_path"] + error_msg="Tarball extraction of "+\ + self.settings["source_path"]+" to "+\ +@@ -675,10 +675,10 @@ class generic_stage_target(generic_target): + self.settings["chroot_path"]+\ + " (This may take some time) ...\n" + if "bz2" == self.settings["chroot_path"][-3:]: +- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ ++ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ + self.settings["chroot_path"] + else: +- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ ++ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ + self.settings["chroot_path"] + error_msg="Tarball extraction of "+self.settings["source_path"]+\ + " to "+self.settings["chroot_path"]+" failed." +@@ -777,9 +777,9 @@ class generic_stage_target(generic_target): + "catalyst-hash") + destdir=self.settings["snapshot_cache_path"] + if "bz2" == self.settings["chroot_path"][-3:]: +- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+destdir ++ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+destdir + else: +- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -xpf "+self.settings["snapshot_path"]+" -C "+destdir ++ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -xpf "+self.settings["snapshot_path"]+" -C "+destdir + unpack_errmsg="Error unpacking snapshot" + cleanup_msg="Cleaning up invalid snapshot cache at \n\t"+\ + self.settings["snapshot_cache_path"]+\ +@@ -796,10 +796,10 @@ class generic_stage_target(generic_target): + cleanup_msg=\ + "Cleaning up existing portage tree (This can take a long time)..." + if "bz2" == self.settings["chroot_path"][-3:]: +- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+\ ++ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+\ + self.settings["chroot_path"]+"/usr" + else: +- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -xpf "+self.settings["snapshot_path"]+" -C "+\ ++ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -xpf "+self.settings["snapshot_path"]+" -C "+\ + self.settings["chroot_path"]+"/usr" + unpack_errmsg="Error unpacking snapshot" + +@@ -1224,7 +1224,7 @@ class generic_stage_target(generic_target): + + print "Creating stage tarball..." + +- cmd("tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -cpf "+self.settings["target_path"]+" -C "+\ ++ cmd("tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -cpf "+self.settings["target_path"]+" -C "+\ + self.settings["stage_path"]+" .",\ + "Couldn't create stage tarball",env=self.env) + +-- +2.2.2 + diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/files/catalyst-2.0.18-coreos-upgrade-ncurses.patch b/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/files/catalyst-2.0.18-coreos-upgrade-ncurses.patch new file mode 100644 index 0000000000..a53604c5d8 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/files/catalyst-2.0.18-coreos-upgrade-ncurses.patch @@ -0,0 +1,11 @@ +--- targets/stage1/stage1-chroot.sh ++++ targets/stage1/stage1-chroot.sh +@@ -30,6 +30,8 @@ + if [ -n "${clst_update_seed_command}" ]; then + clst_root_path=/ run_merge "--buildpkg=n ${clst_update_seed_command}" + else ++ clst_root_path=/ run_merge "--unmerge sys-libs/ncurses-5.9-r99" ++ clst_root_path=/ run_merge " +Date: Thu, 3 Mar 2016 20:48:43 -0500 +Subject: [PATCH] targets/support/chroot-functions.sh: correct quotes to allow + expansion of $1 + +This is a backport of commit b2473eff. The single quotes prevented the proper +expansion of $1 in setup_pkgmgr(). Since this is usually called as +`setup_pkgmgr "build"` during stage1 builds, it is surprising this was +not caught earlier. +--- + targets/support/chroot-functions.sh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh +index 3b7f77b..6c1a31c 100755 +--- a/targets/support/chroot-functions.sh ++++ b/targets/support/chroot-functions.sh +@@ -172,12 +172,12 @@ setup_pkgmgr(){ + # Use --update or portage might just waste time/cycles and reinstall the same version. + # Use --newuse to make sure it rebuilds with any changed use flags. + if [ -n "$1" ];then +- echo "Adding USE='${USE} $1' to make.conf for portage build" +- [ -e /etc/portage/make.conf ] && echo 'USE="${USE} $1"' >> /etc/portage/make.conf ++ echo "Adding USE=\"${USE} $1\" to make.conf for portage build" ++ [ -e /etc/portage/make.conf ] && echo "USE=\"\${USE} $1\"" >> /etc/portage/make.conf + run_merge --oneshot --update --newuse sys-apps/portage +- sed -i '/USE="${USE} $1"/d' /etc/portage/make.conf ++ sed -i "/USE=\"\${USE} $1\"/d" /etc/portage/make.conf + else +- echo "Updating portage with USE='${USE}'" ++ echo "Updating portage with USE=\"${USE}\"" + run_merge --oneshot --update --newuse sys-apps/portage + fi + } +-- +2.4.10 + diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/files/catalyst-2.0.18-remove-machine-id.patch b/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/files/catalyst-2.0.18-remove-machine-id.patch new file mode 100644 index 0000000000..1c641fd2b9 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/files/catalyst-2.0.18-remove-machine-id.patch @@ -0,0 +1,25 @@ +From fbf94254a714c8d72840faee42cf348eb69b1a43 Mon Sep 17 00:00:00 2001 +From: "Anthony G. Basile" +Date: Fri, 8 Apr 2016 17:58:15 -0400 +Subject: [PATCH] targets/support/chroot-functions.sh: remove machine-id for + systemd stages + +--- + targets/support/chroot-functions.sh | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh +index 6c1a31c..67874a0 100755 +--- a/targets/support/chroot-functions.sh ++++ b/targets/support/chroot-functions.sh +@@ -223,6 +223,7 @@ cleanup_stages() { + stage1|stage2|stage3|system) + rm -f /var/lib/portage/world + touch /var/lib/portage/world ++ rm -f /etc/machine-id + ;; + *) + echo "Skipping removal of world file for ${clst_target}" +-- +2.7.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/files/catalyst-2.0.18-stage1-export-ROOT.patch b/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/files/catalyst-2.0.18-stage1-export-ROOT.patch new file mode 100644 index 0000000000..67fc2c631b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/files/catalyst-2.0.18-stage1-export-ROOT.patch @@ -0,0 +1,42 @@ +From 5fd2d5edd3c4c1e99687beb9acc130bab162866b Mon Sep 17 00:00:00 2001 +From: "Anthony G. Basile" +Date: Sat, 4 Jun 2016 12:43:44 -0400 +Subject: stage1-preclean-chroot.sh: export ROOT=/tmp/stage1root for + setup_gcc() + +setup_gcc() calls gcc-config to select a particular gcc profile. At stage1 this +needs to be done in the /tmp/stage1root chroot. gcc-config looks for ROOT to +choose the root directory in which to make the selection. If we don't export +ROOT, then setup_gcc is ineffective. + +X-Gentoo-Bug: 584234 +X-Gentoo-Bug-Url: https://bugs.gentoo.org/show_bug.cgi?id=584234 + +Signed-off-by: Anthony G. Basile +--- + targets/stage1/stage1-preclean-chroot.sh | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/targets/stage1/stage1-preclean-chroot.sh b/targets/stage1/stage1-preclean-chroot.sh +index a80fc92..dc67521 100755 +--- a/targets/stage1/stage1-preclean-chroot.sh ++++ b/targets/stage1/stage1-preclean-chroot.sh +@@ -1,5 +1,6 @@ + #!/bin/bash + ++export ROOT=/tmp/stage1root + export RUN_DEFAULT_FUNCS="no" + + source /tmp/chroot-functions.sh +@@ -8,8 +9,6 @@ update_env_settings + show_debug + + # Now, some finishing touches to initialize gcc-config.... +-unset ROOT +- + setup_gcc + setup_binutils + +-- +cgit v0.12 + diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/metadata.xml b/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/metadata.xml new file mode 100644 index 0000000000..6c4b9cdbcc --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/metadata.xml @@ -0,0 +1,14 @@ + + + + + catalyst@gentoo.org + + + livecd@gentoo.org + Gentoo LiveCD Project + + + Enables ccache support + + diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/etcd-wrapper-3.3.3 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/etcd-wrapper-3.3.5 similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/etcd-wrapper-3.3.3 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/etcd-wrapper-3.3.5 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/sudo-1.8.23 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/sudo-1.8.23 new file mode 100644 index 0000000000..210efe217e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/sudo-1.8.23 @@ -0,0 +1,14 @@ +DEFINED_PHASES=configure install postinst prepare +DEPEND=gcrypt? ( dev-libs/libgcrypt:= ) openssl? ( dev-libs/openssl:0= ) pam? ( virtual/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( >=net-nds/openldap-2.1.30-r1 dev-libs/cyrus-sasl ) sys-libs/zlib sys-devel/bison >=app-portage/elt-patches-20170422 +DESCRIPTION=Allows users or groups to run commands as other users +EAPI=6 +HOMEPAGE=https://www.sudo.ws/ +IUSE=gcrypt ldap nls pam offensive openssl sasl selinux +sendmail skey sssd +KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris +LICENSE=ISC BSD +RDEPEND=gcrypt? ( dev-libs/libgcrypt:= ) openssl? ( dev-libs/openssl:0= ) pam? ( virtual/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( >=net-nds/openldap-2.1.30-r1 dev-libs/cyrus-sasl ) sys-libs/zlib selinux? ( sec-policy/selinux-sudo ) pam? ( sys-auth/pambase ) >=app-misc/editor-wrapper-3 virtual/editor sendmail? ( virtual/mta ) +REQUIRED_USE=pam? ( !skey ) skey? ( !pam ) ?? ( gcrypt openssl ) +SLOT=0 +SRC_URI=https://www.sudo.ws/sudo/dist/sudo-1.8.23.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.8.23.tar.gz +_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e pam 3e788d86170dfcd5b06824d898315e18 toolchain-funcs 185a06792159ca143528e7010368e8af +_md5_=56028a79359e8e73d5e9c152ae1eaa31 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-arch/torcx-0.1.3-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-arch/torcx-0.1.3-r2 similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-arch/torcx-0.1.3-r1 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-arch/torcx-0.1.3-r2 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-18.04.0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-18.05.0 similarity index 80% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-18.04.0 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-18.05.0 index 9a0f04d3eb..dde5465b78 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-18.04.0 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-18.05.0 @@ -1,15 +1,15 @@ DEFINED_PHASES=compile install postinst setup unpack -DEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1[static-libs] ) apparmor? ( sys-libs/libapparmor ) btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) sys-kernel/coreos-kernel dev-lang/go:1.9= virtual/pkgconfig virtual/pkgconfig +DEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1[static-libs] ) apparmor? ( sys-libs/libapparmor ) btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) sys-kernel/coreos-kernel dev-lang/go:1.10= virtual/pkgconfig virtual/pkgconfig DESCRIPTION=The core functions you need to create Docker images and run Docker containers EAPI=6 HOMEPAGE=https://dockerproject.org -IUSE=apparmor aufs +btrfs +container-init +device-mapper hardened +overlay pkcs11 seccomp +journald +selinux +go_version_go1_9 +IUSE=apparmor aufs +btrfs +container-init +device-mapper hardened +overlay pkcs11 seccomp +journald +selinux +go_version_go1_10 KEYWORDS=amd64 arm64 LICENSE=Apache-2.0 -RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1[static-libs] ) apparmor? ( sys-libs/libapparmor ) >=net-firewall/iptables-1.4 sys-process/procps >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 dev-libs/libltdl =app-emulation/containerd-1.0.3 =app-emulation/docker-runc-1.0.0_rc5[apparmor?,seccomp?] =app-emulation/docker-proxy-0.8.0_p20180314 container-init? ( >=sys-process/tini-0.13.1 ) -REQUIRED_USE=go_version_go1_9 +RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1[static-libs] ) apparmor? ( sys-libs/libapparmor ) >=net-firewall/iptables-1.4 sys-process/procps >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 dev-libs/libltdl =app-emulation/containerd-1.0.3 =app-emulation/docker-runc-1.0.0_rc5[apparmor?,seccomp?] =app-emulation/docker-proxy-0.8.0_p20180411 container-init? ( >=sys-process/tini-0.13.1 ) +REQUIRED_USE=go_version_go1_10 RESTRICT=installsources strip SLOT=0 -SRC_URI=https://github.com/docker/docker-ce/archive/v18.04.0-ce.tar.gz -> docker-18.04.0.tar.gz +SRC_URI=https://github.com/docker/docker-ce/archive/v18.05.0-ce.tar.gz -> docker-18.05.0.tar.gz _eclasses_=bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 coreos-go-depend 0c1747ddda8ae24e0d2e88cdfddaa7d1 coreos-go-utils c34072f13165bb85e5106cc6e082a4e1 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af udev d91cac2c73b94629cad2daea66e0d182 user e4b567c44272a719fabf53f0f885d3f7 versionator c80ccf29e90adea7c5cae94b42eb76d0 -_md5_=89d70ced921eafd62a4f44a918ddba85 +_md5_=940a2665465c529507e052c0b69789e3 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-9999 index dba05db577..34a9ee912c 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-9999 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-9999 @@ -1,14 +1,14 @@ DEFINED_PHASES=compile install postinst setup unpack -DEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1[static-libs] ) apparmor? ( sys-libs/libapparmor ) btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) sys-kernel/coreos-kernel >=dev-vcs/git-1.8.2.1 dev-lang/go:1.9= virtual/pkgconfig virtual/pkgconfig +DEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1[static-libs] ) apparmor? ( sys-libs/libapparmor ) btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) sys-kernel/coreos-kernel >=dev-vcs/git-1.8.2.1 dev-lang/go:1.10= virtual/pkgconfig virtual/pkgconfig DESCRIPTION=The core functions you need to create Docker images and run Docker containers EAPI=6 HOMEPAGE=https://dockerproject.org -IUSE=apparmor aufs +btrfs +container-init +device-mapper hardened +overlay pkcs11 seccomp +journald +selinux +go_version_go1_9 +IUSE=apparmor aufs +btrfs +container-init +device-mapper hardened +overlay pkcs11 seccomp +journald +selinux +go_version_go1_10 KEYWORDS=~amd64 ~arm64 LICENSE=Apache-2.0 -RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1[static-libs] ) apparmor? ( sys-libs/libapparmor ) >=net-firewall/iptables-1.4 sys-process/procps >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 dev-libs/libltdl =app-emulation/containerd-1.0.3 =app-emulation/docker-runc-1.0.0_rc5[apparmor?,seccomp?] =app-emulation/docker-proxy-0.8.0_p20180314 container-init? ( >=sys-process/tini-0.13.1 ) -REQUIRED_USE=go_version_go1_9 +RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1[static-libs] ) apparmor? ( sys-libs/libapparmor ) >=net-firewall/iptables-1.4 sys-process/procps >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 dev-libs/libltdl =app-emulation/containerd-1.0.3 =app-emulation/docker-runc-1.0.0_rc5[apparmor?,seccomp?] =app-emulation/docker-proxy-0.8.0_p20180411 container-init? ( >=sys-process/tini-0.13.1 ) +REQUIRED_USE=go_version_go1_10 RESTRICT=installsources strip SLOT=0 _eclasses_=bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 coreos-go-depend 0c1747ddda8ae24e0d2e88cdfddaa7d1 coreos-go-utils c34072f13165bb85e5106cc6e082a4e1 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 git-r3 52a888802d25387c2c74cb845d1219bc linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af udev d91cac2c73b94629cad2daea66e0d182 user e4b567c44272a719fabf53f0f885d3f7 versionator c80ccf29e90adea7c5cae94b42eb76d0 -_md5_=89d70ced921eafd62a4f44a918ddba85 +_md5_=940a2665465c529507e052c0b69789e3 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc5 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc5 index 7ab9550e75..609373121b 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc5 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc5 @@ -12,4 +12,4 @@ RESTRICT=test SLOT=0 SRC_URI=https://github.com/opencontainers/runc/archive/4fc53a81fb7c994640722ac585fa9ca548971871.tar.gz -> docker-runc-1.0.0_rc5.tar.gz _eclasses_=coreos-go 43a394c18570b3dd8dd6e74fc9853493 coreos-go-depend 0c1747ddda8ae24e0d2e88cdfddaa7d1 coreos-go-utils c34072f13165bb85e5106cc6e082a4e1 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 6f5991c7101863d0b29df63990ad852e toolchain-funcs 185a06792159ca143528e7010368e8af vcs-snapshot 03289f51c769cf409d200d2d628cdd6e -_md5_=be7303cc36d373ef31187961dfaa9187 +_md5_=67ca481c56cab39fae5b5ea750e7bc12 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/wa-linux-agent-2.2.4 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/wa-linux-agent-2.2.25 similarity index 68% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/wa-linux-agent-2.2.4 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/wa-linux-agent-2.2.25 index a3fda2fb0a..2e99db5cc8 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/wa-linux-agent-2.2.4 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/wa-linux-agent-2.2.25 @@ -6,5 +6,5 @@ KEYWORDS=amd64 LICENSE=Apache-2.0 RDEPEND=dev-lang/python-oem SLOT=0 -SRC_URI=https://github.com/Azure/WALinuxAgent/archive/v2.2.4.tar.gz -> wa-linux-agent-2.2.4.tar.gz +SRC_URI=https://github.com/Azure/WALinuxAgent/archive/v2.2.25.tar.gz -> wa-linux-agent-2.2.25.tar.gz _md5_=f5ac6a191443e004a54d08d4609fa1d7 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-torcx/docker-18.04 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-torcx/docker-18.05 similarity index 55% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-torcx/docker-18.04 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-torcx/docker-18.05 index 9fbc7f671f..68e589d4cf 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-torcx/docker-18.04 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-torcx/docker-18.05 @@ -3,6 +3,6 @@ DESCRIPTION=Packages to be installed in a torcx image for Docker EAPI=2 KEYWORDS=amd64 arm64 LICENSE=GPL-2 -RDEPEND==app-emulation/docker-18.04.0 =app-emulation/containerd-1.0.3 =app-emulation/docker-proxy-0.8.0_p20180314 =app-emulation/docker-runc-1.0.0_rc5 =dev-libs/libltdl-2.4.6 =sys-process/tini-0.13.2 +RDEPEND==app-emulation/docker-18.05.0 =app-emulation/containerd-1.0.3 =app-emulation/docker-proxy-0.8.0_p20180411 =app-emulation/docker-runc-1.0.0_rc5 =dev-libs/libltdl-2.4.6 =sys-process/tini-0.13.2 SLOT=0 -_md5_=ea9a064319e05b935c66be3833ce9ffd +_md5_=ae98b21cdcd5131856a6516b488e49f0 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-init-0.0.1-r159 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-init-0.0.1-r160 similarity index 95% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-init-0.0.1-r159 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-init-0.0.1-r160 index d16cd33960..3e13dcd012 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-init-0.0.1-r159 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-init-0.0.1-r160 @@ -10,4 +10,4 @@ RDEPEND=net-misc/openssh net-nds/rpcbind !coreos-base/oem-service test? ( dev-la REQUIRED_USE=symlink-usr SLOT=0 _eclasses_=cros-workon 4ad6e6491a1010ad7c875302b3be18ba git-r3 52a888802d25387c2c74cb845d1219bc multilib 97f470f374f2e94ccab04a2fb21d811e systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af -_md5_=90d096b3ec879d9eeb8e5d370ba61655 +_md5_=3785de07b9baf3fed77456931ab95c67 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-init-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-init-9999 index fae8a6465c..b8297059f4 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-init-9999 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-init-9999 @@ -10,4 +10,4 @@ RDEPEND=net-misc/openssh net-nds/rpcbind !coreos-base/oem-service test? ( dev-la REQUIRED_USE=symlink-usr SLOT=0 _eclasses_=cros-workon 4ad6e6491a1010ad7c875302b3be18ba git-r3 52a888802d25387c2c74cb845d1219bc multilib 97f470f374f2e94ccab04a2fb21d811e systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af -_md5_=90d096b3ec879d9eeb8e5d370ba61655 +_md5_=3785de07b9baf3fed77456931ab95c67 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-azure-2.2.4-r4 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-azure-2.2.25 similarity index 76% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-azure-2.2.4-r4 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-azure-2.2.25 index 0e1de320cb..724d4f3f1a 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-azure-2.2.4-r4 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-azure-2.2.25 @@ -3,6 +3,6 @@ DESCRIPTION=OEM suite for Azure EAPI=5 KEYWORDS=amd64 LICENSE=Apache-2.0 -RDEPEND=~app-emulation/wa-linux-agent-2.2.4 +RDEPEND=~app-emulation/wa-linux-agent-2.2.25 SLOT=0 _md5_=5871aa1fe0c691c5d35c7fbd83b68af0 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/update_engine-0.4.6 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/update_engine-0.4.7 similarity index 97% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/update_engine-0.4.6 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/update_engine-0.4.7 index 181db15b8d..dcd54c2cca 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/update_engine-0.4.6 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/update_engine-0.4.7 @@ -9,4 +9,4 @@ LICENSE=BSD RDEPEND=!coreos-base/coreos-installer app-arch/bzip2 coreos-base/coreos-au-key dev-cpp/gflags dev-cpp/glog[gflags] dev-libs/dbus-glib dev-libs/glib dev-libs/libxml2 dev-libs/openssl dev-libs/protobuf:= dev-util/bsdiff net-misc/curl >=sys-apps/seismograph-2.2.0 sys-fs/e2fsprogs SLOT=0 _eclasses_=autotools dc412f38566b91012efd58b9c203e6c3 autotools-utils 5a4611dfba155b1659528663fad4cd5e cros-workon 4ad6e6491a1010ad7c875302b3be18ba epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 git-r3 52a888802d25387c2c74cb845d1219bc libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af -_md5_=a9704dbcc04701b77e94aeeb2024fcca +_md5_=381460dd08236e78ce877e7c71292b7a diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/update_engine-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/update_engine-9999 index 8646726901..04af8cbbec 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/update_engine-9999 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/update_engine-9999 @@ -9,4 +9,4 @@ LICENSE=BSD RDEPEND=!coreos-base/coreos-installer app-arch/bzip2 coreos-base/coreos-au-key dev-cpp/gflags dev-cpp/glog[gflags] dev-libs/dbus-glib dev-libs/glib dev-libs/libxml2 dev-libs/openssl dev-libs/protobuf:= dev-util/bsdiff net-misc/curl >=sys-apps/seismograph-2.2.0 sys-fs/e2fsprogs SLOT=0 _eclasses_=autotools dc412f38566b91012efd58b9c203e6c3 autotools-utils 5a4611dfba155b1659528663fad4cd5e cros-workon 4ad6e6491a1010ad7c875302b3be18ba epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 git-r3 52a888802d25387c2c74cb845d1219bc libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af -_md5_=a9704dbcc04701b77e94aeeb2024fcca +_md5_=381460dd08236e78ce877e7c71292b7a diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-db/etcdctl-3.3.3 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-db/etcdctl-3.3.5 similarity index 91% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-db/etcdctl-3.3.3 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-db/etcdctl-3.3.5 index 2c86346376..514a4883d1 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-db/etcdctl-3.3.3 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-db/etcdctl-3.3.5 @@ -8,6 +8,6 @@ KEYWORDS=amd64 arm64 LICENSE=Apache-2.0 REQUIRED_USE=go_version_go1_10 SLOT=0 -SRC_URI=https://github.com/coreos/etcd/archive/v3.3.3.tar.gz -> etcdctl-3.3.3.tar.gz +SRC_URI=https://github.com/coreos/etcd/archive/v3.3.5.tar.gz -> etcdctl-3.3.5.tar.gz _eclasses_=coreos-go 43a394c18570b3dd8dd6e74fc9853493 coreos-go-depend 0c1747ddda8ae24e0d2e88cdfddaa7d1 coreos-go-utils c34072f13165bb85e5106cc6e082a4e1 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 golang-base 51a1f13e065f1cff4507685d9cc268c7 golang-vcs-snapshot 913580335becddd3ebecefe852e47536 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 6f5991c7101863d0b29df63990ad852e toolchain-funcs 185a06792159ca143528e7010368e8af _md5_=be6ff2d151f20fd19a21c28e51a00646 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-lang/go-1.10.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-lang/go-1.10.2 similarity index 90% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-lang/go-1.10.1 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-lang/go-1.10.2 index a1dd73b707..f7ecc5631c 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-lang/go-1.10.1 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-lang/go-1.10.2 @@ -6,7 +6,7 @@ HOMEPAGE=http://www.golang.org KEYWORDS=-* amd64 arm64 LICENSE=BSD RDEPEND=app-eselect/eselect-go -SLOT=1.10/1.10.1 -SRC_URI=https://storage.googleapis.com/golang/go1.10.1.src.tar.gz +SLOT=1.10/1.10.2 +SRC_URI=https://storage.googleapis.com/golang/go1.10.2.src.tar.gz _eclasses_=coreos-go-lang 5983edbc8ebcd4ee0977c514df5904e2 coreos-go-utils c34072f13165bb85e5106cc6e082a4e1 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 _md5_=62f4876ac7b867a48fadcf7eaebfea17 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-lang/go-1.9.5 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-lang/go-1.9.6 similarity index 90% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-lang/go-1.9.5 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-lang/go-1.9.6 index e6a76aa7eb..6c60518499 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-lang/go-1.9.5 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-lang/go-1.9.6 @@ -6,7 +6,7 @@ HOMEPAGE=http://www.golang.org KEYWORDS=-* amd64 arm64 LICENSE=BSD RDEPEND=app-eselect/eselect-go -SLOT=1.9/1.9.5 -SRC_URI=https://storage.googleapis.com/golang/go1.9.5.src.tar.gz +SLOT=1.9/1.9.6 +SRC_URI=https://storage.googleapis.com/golang/go1.9.6.src.tar.gz _eclasses_=coreos-go-lang 5983edbc8ebcd4ee0977c514df5904e2 coreos-go-utils c34072f13165bb85e5106cc6e082a4e1 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 _md5_=ebb70416fc83e0a99023227fe1a52936 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/catalyst-2.0.18-r5 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/catalyst-2.0.18-r5 new file mode 100644 index 0000000000..b9ec49992a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/catalyst-2.0.18-r5 @@ -0,0 +1,14 @@ +DEFINED_PHASES=install postinst prepare setup +DEPEND=app-text/asciidoc python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] +DESCRIPTION=Release metatool used for creating releases based on Gentoo Linux +EAPI=5 +HOMEPAGE=https://wiki.gentoo.org/wiki/Catalyst +IUSE=ccache kernel_linux python_targets_python2_7 +KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd +LICENSE=GPL-2 +RDEPEND=app-arch/lbzip2 app-crypt/shash app-arch/tar[xattr] sys-fs/dosfstools virtual/cdrtools amd64? ( >=sys-boot/syslinux-3.72 ) x86? ( >=sys-boot/syslinux-3.72 ) ccache? ( dev-util/ccache ) kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] +REQUIRED_USE=python_targets_python2_7 +SLOT=0 +SRC_URI=mirror://gentoo/catalyst-2.0.18.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/catalyst-2.0.18.tar.bz2 https://dev.gentoo.org/~mattst88/distfiles/catalyst-2.0.18.tar.bz2 https://dev.gentoo.org/~zerochaos/distfiles/catalyst-2.0.18.tar.bz2 https://dev.gentoo.org/~dolsen/releases/catalyst/catalyst-2.0.18.tar.bz2 +_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af +_md5_=6dc70771ae3415c7d0e6a64e8dc8bde4 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/ntp-4.2.8_p11 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/ntp-4.2.8_p11-r1 similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/ntp-4.2.8_p11 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/ntp-4.2.8_p11-r1 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/ignition-0.24.0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/ignition-0.25.0 similarity index 95% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/ignition-0.24.0 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/ignition-0.25.0 index 61dd2ff4c5..c1b79d1669 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/ignition-0.24.0 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/ignition-0.25.0 @@ -8,6 +8,6 @@ KEYWORDS=amd64 arm64 LICENSE=Apache-2.0 RDEPEND=sys-apps/coreutils sys-apps/gptfdisk sys-apps/shadow sys-apps/systemd sys-fs/btrfs-progs sys-fs/dosfstools sys-fs/e2fsprogs sys-fs/mdadm sys-fs/xfsprogs sys-apps/util-linux REQUIRED_USE=go_version_go1_10 -SLOT=0/0.24.0 +SLOT=0/0.25.0 _eclasses_=coreos-go 43a394c18570b3dd8dd6e74fc9853493 coreos-go-depend 0c1747ddda8ae24e0d2e88cdfddaa7d1 coreos-go-utils c34072f13165bb85e5106cc6e082a4e1 cros-workon 4ad6e6491a1010ad7c875302b3be18ba epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 git-r3 52a888802d25387c2c74cb845d1219bc ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 6f5991c7101863d0b29df63990ad852e systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af udev d91cac2c73b94629cad2daea66e0d182 -_md5_=9f03b80ecc26c105960fb668883d9653 +_md5_=503bf909d796874cf1a0d05b410c4505 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/ignition-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/ignition-9999 index 3815216a9d..b23b0ff3f4 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/ignition-9999 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/ignition-9999 @@ -10,4 +10,4 @@ RDEPEND=sys-apps/coreutils sys-apps/gptfdisk sys-apps/shadow sys-apps/systemd sy REQUIRED_USE=go_version_go1_10 SLOT=0/9999 _eclasses_=coreos-go 43a394c18570b3dd8dd6e74fc9853493 coreos-go-depend 0c1747ddda8ae24e0d2e88cdfddaa7d1 coreos-go-utils c34072f13165bb85e5106cc6e082a4e1 cros-workon 4ad6e6491a1010ad7c875302b3be18ba epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 git-r3 52a888802d25387c2c74cb845d1219bc ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 6f5991c7101863d0b29df63990ad852e systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af udev d91cac2c73b94629cad2daea66e0d182 -_md5_=9f03b80ecc26c105960fb668883d9653 +_md5_=503bf909d796874cf1a0d05b410c4505 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/systemd-238 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/systemd-238-r1 similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/systemd-238 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/systemd-238-r1 index b5ec95034a..3c877351e1 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/systemd-238 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/systemd-238-r1 @@ -12,4 +12,4 @@ REQUIRED_USE=importd? ( curl gcrypt lzma ) RESTRICT=!test? ( test ) SLOT=0/2 _eclasses_=bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 cros-workon 4ad6e6491a1010ad7c875302b3be18ba epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 git-r3 52a888802d25387c2c74cb845d1219bc linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 2770eed66a9b8ef944714cd0e968182e meson 38757afcd8d9f0d1d44ba4cefc33b99d multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 multiprocessing 6f5991c7101863d0b29df63990ad852e ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 pam 3e788d86170dfcd5b06824d898315e18 python-any-r1 27d7f9da7187d283b7f3eae8390b7b09 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af udev d91cac2c73b94629cad2daea66e0d182 user e4b567c44272a719fabf53f0f885d3f7 versionator c80ccf29e90adea7c5cae94b42eb76d0 -_md5_=aa1afbc0bdd3a7ea41ec1e1c0cfa541d +_md5_=377363754e8928cefa5a5e333e4f137c 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 3b0fe3b5da..c10dc0e466 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 8e447753aaf658afa609fbf961d80ab7 cros-workon 4ad6e6491a1010ad7c875302b3be18ba epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 git-r3 52a888802d25387c2c74cb845d1219bc linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 2770eed66a9b8ef944714cd0e968182e meson 38757afcd8d9f0d1d44ba4cefc33b99d multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 multiprocessing 6f5991c7101863d0b29df63990ad852e ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 pam 3e788d86170dfcd5b06824d898315e18 python-any-r1 27d7f9da7187d283b7f3eae8390b7b09 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af udev d91cac2c73b94629cad2daea66e0d182 user e4b567c44272a719fabf53f0f885d3f7 versionator c80ccf29e90adea7c5cae94b42eb76d0 -_md5_=aa1afbc0bdd3a7ea41ec1e1c0cfa541d +_md5_=377363754e8928cefa5a5e333e4f137c diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.16.5 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.14.39-r1 similarity index 53% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.16.5 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.14.39-r1 index b93ecad275..1083ae56ce 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.16.5 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.14.39-r1 @@ -1,12 +1,12 @@ DEFINED_PHASES=compile configure install prepare pretend setup unpack -DEPEND==sys-kernel/coreos-modules-4.16.5 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.16.5 +DEPEND==sys-kernel/coreos-modules-4.14.39-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.14.39 DESCRIPTION=CoreOS Linux kernel EAPI=5 HOMEPAGE=http://www.kernel.org KEYWORDS=amd64 arm64 LICENSE=GPL-2 freedist -RDEPEND==sys-kernel/coreos-modules-4.16.5 +RDEPEND==sys-kernel/coreos-modules-4.14.39-r1 RESTRICT=binchecks strip -SLOT=0/4.16.5 +SLOT=0/4.14.39-r1 _eclasses_=coreos-kernel e8feb48b1a123c62c678f86fd8ac3067 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 _md5_=b06e416b987a33bf039f3788ebb4a943 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.14.37 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.16.7-r1 similarity index 53% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.14.37 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.16.7-r1 index 81eebfafab..442778995f 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.14.37 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.16.7-r1 @@ -1,12 +1,12 @@ DEFINED_PHASES=compile configure install prepare pretend setup unpack -DEPEND==sys-kernel/coreos-modules-4.14.37 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.37 +DEPEND==sys-kernel/coreos-modules-4.16.7-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.16.7 DESCRIPTION=CoreOS Linux kernel EAPI=5 HOMEPAGE=http://www.kernel.org KEYWORDS=amd64 arm64 LICENSE=GPL-2 freedist -RDEPEND==sys-kernel/coreos-modules-4.14.37 +RDEPEND==sys-kernel/coreos-modules-4.16.7-r1 RESTRICT=binchecks strip -SLOT=0/4.14.37 +SLOT=0/4.16.7-r1 _eclasses_=coreos-kernel e8feb48b1a123c62c678f86fd8ac3067 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 _md5_=b06e416b987a33bf039f3788ebb4a943 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.14.37 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.14.39-r1 similarity index 93% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.14.37 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.14.39-r1 index cf15381a84..5b68eb6ed0 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.14.37 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.14.39-r1 @@ -1,5 +1,5 @@ DEFINED_PHASES=compile configure install postinst prepare pretend setup unpack -DEPEND==sys-kernel/coreos-sources-4.14.37 +DEPEND==sys-kernel/coreos-sources-4.14.39 DESCRIPTION=CoreOS Linux kernel modules EAPI=5 HOMEPAGE=http://www.kernel.org @@ -8,6 +8,6 @@ KEYWORDS=amd64 arm64 LICENSE=GPL-2 freedist RDEPEND=!=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc ) RESTRICT=binchecks strip -SLOT=4.14.37 -SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.37.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz +SLOT=4.14.39 +SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.39.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz _eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 kernel-2 880361b861490d9503f47d4f16e05f2c ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e python-any-r1 27d7f9da7187d283b7f3eae8390b7b09 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 -_md5_=8913d45f82273d84614b5f9796476888 +_md5_=452a28a8a0c4b17918bd08be1a3231f3 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-sources-4.16.5 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-sources-4.16.7 similarity index 77% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-sources-4.16.5 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-sources-4.16.7 index 822864e21d..d02a237d5f 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-sources-4.16.5 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-sources-4.16.7 @@ -6,9 +6,9 @@ HOMEPAGE=http://www.kernel.org IUSE=symlink build KEYWORDS=amd64 arm64 LICENSE=GPL-2 freedist -RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc ) +RDEPEND=sys-devel/bison sys-devel/flex !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc ) RESTRICT=binchecks strip -SLOT=4.16.5 -SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.16.5.xz mirror://kernel/linux/kernel/v4.x/linux-4.16.tar.xz +SLOT=4.16.7 +SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.16.7.xz mirror://kernel/linux/kernel/v4.x/linux-4.16.tar.xz _eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 kernel-2 880361b861490d9503f47d4f16e05f2c ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e python-any-r1 27d7f9da7187d283b7f3eae8390b7b09 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 -_md5_=628fc24d6245e768910b4b8e7b80fb93 +_md5_=f02ea43a50aac3606fb7ce210d1dda8e diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/ncurses-5.9-r8 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/ncurses-5.9-r8 deleted file mode 100644 index eee49fa0ce..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/ncurses-5.9-r8 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install prepare test -DEPEND=gpm? ( sys-libs/gpm ) -DESCRIPTION=console display library -EAPI=5 -HOMEPAGE=https://www.gnu.org/software/ncurses/ http://dickey.his.com/ncurses/ -IUSE=ada +cxx debug doc gpm minimal profile static-libs symlink-usr tinfo trace unicode abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 -KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd -LICENSE=MIT -PDEPEND=gpm? ( sys-libs/gpm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) -RDEPEND=gpm? ( sys-libs/gpm ) !<=sys-libs/ncurses-5.9-r5:5 ! -Date: Sun, 13 Oct 2013 00:58:13 +0000 -Subject: [PATCH] ncurses 5.9 - patch 20131012 - compiler warnings - -+ fix a few compiler warnings in progs and test. ---- - progs/tset.c | 73 +++++++++++++++++++++++++++++++++------------------------- - test/ncurses.c | 2 +- - 2 files changed, 42 insertions(+), 33 deletions(-) - -diff --git a/progs/tset.c b/progs/tset.c -index 084e41d..8bedd14 100644 ---- a/progs/tset.c -+++ b/progs/tset.c -@@ -788,14 +788,14 @@ reset_mode(void) - mode.c_cc[VWERASE] = CHK(mode.c_cc[VWERASE], CWERASE); - #endif - -- mode.c_iflag &= ~(IGNBRK | PARMRK | INPCK | ISTRIP | INLCR | IGNCR -+ mode.c_iflag &= ~((unsigned) (IGNBRK | PARMRK | INPCK | ISTRIP | INLCR | IGNCR - #ifdef IUCLC -- | IUCLC -+ | IUCLC - #endif - #ifdef IXANY -- | IXANY -+ | IXANY - #endif -- | IXOFF); -+ | IXOFF)); - - mode.c_iflag |= (BRKINT | IGNPAR | ICRNL | IXON - #ifdef IMAXBEL -@@ -803,44 +803,44 @@ reset_mode(void) - #endif - ); - -- mode.c_oflag &= ~(0 -+ mode.c_oflag &= ~((unsigned) (0 - #ifdef OLCUC -- | OLCUC -+ | OLCUC - #endif - #ifdef OCRNL -- | OCRNL -+ | OCRNL - #endif - #ifdef ONOCR -- | ONOCR -+ | ONOCR - #endif - #ifdef ONLRET -- | ONLRET -+ | ONLRET - #endif - #ifdef OFILL -- | OFILL -+ | OFILL - #endif - #ifdef OFDEL -- | OFDEL -+ | OFDEL - #endif - #ifdef NLDLY -- | NLDLY -+ | NLDLY - #endif - #ifdef CRDLY -- | CRDLY -+ | CRDLY - #endif - #ifdef TABDLY -- | TABDLY -+ | TABDLY - #endif - #ifdef BSDLY -- | BSDLY -+ | BSDLY - #endif - #ifdef VTDLY -- | VTDLY -+ | VTDLY - #endif - #ifdef FFDLY -- | FFDLY -+ | FFDLY - #endif -- ); -+ )); - - mode.c_oflag |= (OPOST - #ifdef ONLCR -@@ -848,19 +848,19 @@ reset_mode(void) - #endif - ); - -- mode.c_cflag &= ~(CSIZE | CSTOPB | PARENB | PARODD | CLOCAL); -+ mode.c_cflag &= ~((unsigned) (CSIZE | CSTOPB | PARENB | PARODD | CLOCAL)); - mode.c_cflag |= (CS8 | CREAD); -- mode.c_lflag &= ~(ECHONL | NOFLSH -+ mode.c_lflag &= ~((unsigned) (ECHONL | NOFLSH - #ifdef TOSTOP -- | TOSTOP -+ | TOSTOP - #endif - #ifdef ECHOPTR -- | ECHOPRT -+ | ECHOPRT - #endif - #ifdef XCASE -- | XCASE -+ | XCASE - #endif -- ); -+ )); - - mode.c_lflag |= (ISIG | ICANON | ECHO | ECHOE | ECHOK - #ifdef ECHOCTL -@@ -907,14 +907,23 @@ static void - set_control_chars(void) - { - #ifdef TERMIOS -- if (DISABLED(mode.c_cc[VERASE]) || terasechar >= 0) -- mode.c_cc[VERASE] = (terasechar >= 0) ? terasechar : default_erase(); -+ if (DISABLED(mode.c_cc[VERASE]) || terasechar >= 0) { -+ mode.c_cc[VERASE] = UChar((terasechar >= 0) -+ ? terasechar -+ : default_erase()); -+ } - -- if (DISABLED(mode.c_cc[VINTR]) || intrchar >= 0) -- mode.c_cc[VINTR] = (intrchar >= 0) ? intrchar : CINTR; -+ if (DISABLED(mode.c_cc[VINTR]) || intrchar >= 0) { -+ mode.c_cc[VINTR] = UChar((intrchar >= 0) -+ ? intrchar -+ : CINTR); -+ } - -- if (DISABLED(mode.c_cc[VKILL]) || tkillchar >= 0) -- mode.c_cc[VKILL] = (tkillchar >= 0) ? tkillchar : CKILL; -+ if (DISABLED(mode.c_cc[VKILL]) || tkillchar >= 0) { -+ mode.c_cc[VKILL] = UChar((tkillchar >= 0) -+ ? tkillchar -+ : CKILL); -+ } - #endif - } - -@@ -970,9 +979,9 @@ set_conversions(void) - if (newline != (char *) 0 && newline[0] == '\n' && !newline[1]) { - /* Newline, not linefeed. */ - #ifdef ONLCR -- mode.c_oflag &= ~ONLCR; -+ mode.c_oflag &= ~((unsigned) ONLCR); - #endif -- mode.c_iflag &= ~ICRNL; -+ mode.c_iflag &= ~((unsigned) ICRNL); - } - #ifdef __OBSOLETE__ - if (tgetflag("HD")) /* Half duplex. */ -diff --git a/test/ncurses.c b/test/ncurses.c -index 5a422cf..75063a7 100644 ---- a/test/ncurses.c -+++ b/test/ncurses.c -@@ -1678,7 +1678,7 @@ wide_show_attr(int row, int skip, bool arrow, chtype attr, short pair, const cha - attr_t old_attr; - short old_pair; - -- (void) attr_get(&old_attr, &old_pair, 0); -+ (void) (attr_get)(&old_attr, &old_pair, 0); - (void) attr_set(attr, pair, 0); - addwstr(wide_attr_test_string); - (void) attr_set(old_attr, old_pair, 0); --- -2.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/files/ncurses-5.9-fix-clang-build.patch b/sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/files/ncurses-5.9-fix-clang-build.patch deleted file mode 100644 index 0c6ca7acc4..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/files/ncurses-5.9-fix-clang-build.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/ncurses-5.9/c++/cursesf.h b/ncurses-5.9/c++/cursesf.h -index 70a30c3..db38063 100644 ---- a/ncurses-5.9/c++/cursesf.h -+++ b/ncurses-5.9/c++/cursesf.h -@@ -677,7 +677,7 @@ protected: - } - - public: -- NCursesUserForm (NCursesFormField Fields[], -+ NCursesUserForm (NCursesFormField* Fields[], - const T* p_UserData = STATIC_CAST(T*)(0), - bool with_frame=FALSE, - bool autoDelete_Fields=FALSE) -@@ -686,7 +686,7 @@ public: - set_user (const_cast(p_UserData)); - }; - -- NCursesUserForm (NCursesFormField Fields[], -+ NCursesUserForm (NCursesFormField* Fields[], - int nlines, - int ncols, - int begin_y = 0, -diff --git a/ncurses-5.9/c++/cursesm.h b/ncurses-5.9/c++/cursesm.h -index d9c2273..2d5b79a 100644 ---- a/ncurses-5.9/c++/cursesm.h -+++ b/ncurses-5.9/c++/cursesm.h -@@ -635,7 +635,7 @@ protected: - } - - public: -- NCursesUserMenu (NCursesMenuItem Items[], -+ NCursesUserMenu (NCursesMenuItem* Items[], - const T* p_UserData = STATIC_CAST(T*)(0), - bool with_frame=FALSE, - bool autoDelete_Items=FALSE) -@@ -644,7 +644,7 @@ public: - set_user (const_cast(p_UserData)); - }; - -- NCursesUserMenu (NCursesMenuItem Items[], -+ NCursesUserMenu (NCursesMenuItem* Items[], - int nlines, - int ncols, - int begin_y = 0, diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/files/ncurses-5.9-no-I-usr-include.patch b/sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/files/ncurses-5.9-no-I-usr-include.patch deleted file mode 100644 index 5c968e76c3..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/files/ncurses-5.9-no-I-usr-include.patch +++ /dev/null @@ -1,45 +0,0 @@ -https://bugs.gentoo.org/522586 - -delete the -I$includedir paths that get added to CPPFLAGS. these are never -needed when building natively or cross-compiling and really get in the way -in both cases (upgrades/cross-compiling/etc...). - -extracted from the upstream change: -http://ncurses.scripts.mit.edu/?p=ncurses.git;a=commitdiff;h=9ee3995474454b7d956885e0fe5c8cac2ae25d42#patch5 - ---- a/configure -+++ b/configure -@@ -18596,33 +18596,11 @@ CPPFLAGS="$CPPFLAGS -I. -I../include" - if test "$srcdir" != "."; then - CPPFLAGS="$CPPFLAGS -I\${srcdir}/../include" - fi --if test "$GCC" != yes; then -- CPPFLAGS="$CPPFLAGS -I\${includedir}" --elif test "$includedir" != "/usr/include"; then -- if test "$includedir" = '${prefix}/include' ; then -- if test $prefix != /usr ; then -- CPPFLAGS="$CPPFLAGS -I\${includedir}" -- fi -- else -- CPPFLAGS="$CPPFLAGS -I\${includedir}" -- fi --fi - - ACPPFLAGS="-I. -I../include -I../../include $ACPPFLAGS" - if test "$srcdir" != "."; then - ACPPFLAGS="-I\${srcdir}/../../include $ACPPFLAGS" - fi --if test "$GCC" != yes; then -- ACPPFLAGS="$ACPPFLAGS -I\${includedir}" --elif test "$includedir" != "/usr/include"; then -- if test "$includedir" = '${prefix}/include' ; then -- if test $prefix != /usr ; then -- ACPPFLAGS="$ACPPFLAGS -I\${includedir}" -- fi -- else -- ACPPFLAGS="$ACPPFLAGS -I\${includedir}" -- fi --fi - - ### Build up pieces for makefile rules - echo "$as_me:18628: checking default library suffix" >&5 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/files/ncurses-5.9-pkg-config.patch b/sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/files/ncurses-5.9-pkg-config.patch deleted file mode 100644 index 7c3c04a449..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/files/ncurses-5.9-pkg-config.patch +++ /dev/null @@ -1,26 +0,0 @@ -disable the $PATH search for the PKG_CONFIG tool. it isn't needed and just -gets in the way when setting to a value that might not yet exist. - -disable the existence test for the PKG_CONFIG_LIBDIR dir. it breaks when you -cross-compile for an ABI that doesn't exist in the root dir (--build). - ---- a/configure -+++ b/configure -@@ -3582,7 +3582,7 @@ fi - esac - - test -z "$PKG_CONFIG" && PKG_CONFIG=none --if test "$PKG_CONFIG" != none ; then -+if false ; then - - if test "x$prefix" != xNONE; then - cf_path_syntax="$prefix" -@@ -3626,7 +3626,7 @@ echo $ECHO_N "checking if we should install .pc files for $PKG_CONFIG... $ECHO_C - PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG" | sed -e 's,/[^/]*/[^/]*$,,'`/lib/pkgconfig - fi - PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG_LIBDIR" | sed -e 's/^://' -e 's/:.*//'` -- if test -n "$PKG_CONFIG_LIBDIR" && test -d "$PKG_CONFIG_LIBDIR" ; then -+ if test -n "$PKG_CONFIG_LIBDIR" ; then - - # Check whether --enable-pc-files or --disable-pc-files was given. - if test "${enable_pc_files+set}" = set; then diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/files/ncurses-6.0-cppflags-cross.patch b/sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/files/ncurses-6.0-cppflags-cross.patch new file mode 100644 index 0000000000..decdc26779 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/files/ncurses-6.0-cppflags-cross.patch @@ -0,0 +1,35 @@ +https://bugs.gentoo.org/601426 +https://lists.gnu.org/archive/html/bug-ncurses/2015-02/msg00012.html + +From: John Vogel +Subject: [PATCH] c++ binding missed when cross compiling +Date: Mon, 16 Feb 2015 01:01:48 -0500 + +The configure script hard codes the include dir to the prefix'ed include dir, +when checking if c++ compiler works. This breaks the compiler's built-in search +path. I've included two patches. The first works on the configure.in file, which +requires your autoconf stuff to test and I'm not ready to meddle with at the +moment. The other works directly on the configure file. I've tested the second +one; it should mirror what the first patch tries to achieve and works for me. + +--- a/configure ++++ b/configure +@@ -2938,10 +2938,6 @@ + echo "$as_me:2938: checking if $CXX works" >&5 + echo $ECHO_N "checking if $CXX works... $ECHO_C" >&6 + +- save_CPPFLAGS="$CPPFLAGS" +- eval cf_includedir=${includedir} +- CPPFLAGS="$CPPFLAGS -I${cf_includedir}" +- + cat >conftest.$ac_ext <<_ACEOF + #line 2946 "configure" + #include "confdefs.h" +@@ -2978,7 +2974,6 @@ + cf_cxx_works=no + fi + rm -f conftest.$ac_objext conftest.$ac_ext +- CPPFLAGS="$save_CPPFLAGS" + + echo "$as_me:2983: result: $cf_cxx_works" >&5 + echo "${ECHO_T}$cf_cxx_works" >&6 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/files/ncurses-6.0-gfbsd.patch b/sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/files/ncurses-6.0-gfbsd.patch new file mode 100644 index 0000000000..1403a29c93 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/files/ncurses-6.0-gfbsd.patch @@ -0,0 +1,24 @@ +we'll hijack the freebsd* case that comes later + +--- ncurses-6.0/aclocal.m4 ++++ ncurses-6.0/aclocal.m4 +@@ -5711,7 +5711,7 @@ + fi + cf_cv_rm_so_locs=yes + ;; +- (linux*|gnu*|k*bsd*-gnu) ++ (linux*|gnu*|k*bsd*-gnu|freebsd*|dragonfly*) + if test "$DFT_LWR_MODEL" = "shared" ; then + LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)" + LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" +--- ncurses-6.0/configure ++++ ncurses-6.0/configure +@@ -6188,7 +6188,7 @@ + fi + cf_cv_rm_so_locs=yes + ;; +- (linux*|gnu*|k*bsd*-gnu) ++ (linux*|gnu*|k*bsd*-gnu|freebsd*|dragonfly*) + if test "$DFT_LWR_MODEL" = "shared" ; then + LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)" + LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/files/ncurses-6.0-pkg-config.patch b/sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/files/ncurses-6.0-pkg-config.patch new file mode 100644 index 0000000000..6808319b95 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/files/ncurses-6.0-pkg-config.patch @@ -0,0 +1,14 @@ +disable the $PATH search for the PKG_CONFIG tool. it isn't needed and just +gets in the way when setting to a value that might not yet exist. + +--- ncurses-6.0/configure ++++ ncurses-6.0/configure +@@ -3533,7 +3533,7 @@ + esac + + test -z "$PKG_CONFIG" && PKG_CONFIG=none +-if test "$PKG_CONFIG" != none ; then ++if false ; then + + if test "x$prefix" != xNONE; then + cf_path_syntax="$prefix" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/files/ncurses-5.9-rxvt-unicode-9.15.patch b/sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/files/ncurses-6.0-rxvt-unicode-9.15.patch similarity index 94% rename from sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/files/ncurses-5.9-rxvt-unicode-9.15.patch rename to sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/files/ncurses-6.0-rxvt-unicode-9.15.patch index b6d1924cbe..af3df941d6 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/files/ncurses-5.9-rxvt-unicode-9.15.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/files/ncurses-6.0-rxvt-unicode-9.15.patch @@ -10,10 +10,10 @@ which includes 256 color support and fixes Gentoo bug 383871 http://bugs.gentoo.org/show_bug.cgi?id=383871 ---- misc/terminfo.src -+++ misc/terminfo.src -@@ -4208,6 +4208,176 @@ - rxvt-16color|xterm with 16 colors like aixterm, +--- ncurses-6.0/misc/terminfo.src ++++ ncurses-6.0/misc/terminfo.src +@@ -5214,6 +5214,176 @@ + rxvt-16color|rxvt with 16 colors like aixterm, ncv#32, use=ibm+16color, use=rxvt, +# From: Thomas Dickey 04 Oct 1997 @@ -186,6 +186,6 @@ http://bugs.gentoo.org/show_bug.cgi?id=383871 + pairs#32767, + use=rxvt-unicode, + + #### MRXVT # mrxvt 0.5.4 # - # mrxvt is based on rxvt 2.7.11, but has by default XTERM_FKEYS defined, which diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/files/ncurses-6.0-ticlib.patch b/sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/files/ncurses-6.0-ticlib.patch new file mode 100644 index 0000000000..188e6adff8 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/files/ncurses-6.0-ticlib.patch @@ -0,0 +1,15 @@ +always include ticlib even when progs are disabled + +https://bugs.gentoo.org/557360 + +--- a/configure ++++ b/configure +@@ -21312,7 +21312,7 @@ echo "$as_me:21311: checking for library subsets" >&5 + echo $ECHO_N "checking for library subsets... $ECHO_C" >&6 + LIB_SUBSETS= + +-if test "x$cf_with_progs" = xyes || test "$with_ticlib" != no || test "$with_termcap" != no; then ++if true; then + LIB_SUBSETS="${LIB_SUBSETS}ticlib" + if test "$with_ticlib" != no ; then + LIB_SUBSETS="${LIB_SUBSETS} " diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/files/ncurses-6.1-st07_terminfo_typo.patch b/sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/files/ncurses-6.1-st07_terminfo_typo.patch new file mode 100644 index 0000000000..4532d648a6 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/files/ncurses-6.1-st07_terminfo_typo.patch @@ -0,0 +1,14 @@ +https://github.com/tmux/tmux/issues/1264 +https://bugs.gentoo.org/651494 + +--- ncurses-6.1/misc/terminfo.src ++++ ncurses-6.1/misc/terminfo.src +@@ -6260,7 +6260,7 @@ + %=%t3%e%p1%d%;m, + sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%| + %t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p7%t;8%;m, +- Ss=\E]52;%p1%s;%p2%s\007, kDN3=\E[1;3B, kDN5=\E[1;5B, ++ Ms=\E]52;%p1%s;%p2%s\007, kDN3=\E[1;3B, kDN5=\E[1;5B, + kLFT3=\E[1;3D, kLFT5=\E[1;5D, kNXT3=\E[6;3~, + kNXT5=\E[6;5~, kPRV3=\E[5;3~, kPRV5=\E[5;5~, + kRIT3=\E[1;3C, kRIT5=\E[1;5C, kUP3=\E[1;3A, kUP5=\E[1;5A, diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/metadata.xml b/sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/metadata.xml index 78563648f1..888a6adf66 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/metadata.xml +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/metadata.xml @@ -1,14 +1,17 @@ -base-system + + base-system@gentoo.org + Gentoo Base System + - Add bindings for the ADA programming language - + Add bindings for the ADA programming language + Build curses library (libncurses) sep from the low-level terminfo library (libtinfo) -- usually needed only for binary packages -- but it is binary compatible in either mode - Enable test trace() support in ncurses calls + Enable test trace() support in ncurses calls diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/ncurses-5.9-r8.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/ncurses-5.9-r8.ebuild deleted file mode 100644 index 407ccf08ce..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/ncurses-5.9-r8.ebuild +++ /dev/null @@ -1,242 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit eutils flag-o-matic toolchain-funcs multilib-minimal - -MY_PV=${PV:0:3} -PV_SNAP=${PV:4} -MY_P=${PN}-${MY_PV} -DESCRIPTION="console display library" -HOMEPAGE="https://www.gnu.org/software/ncurses/ http://dickey.his.com/ncurses/" -SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz" - -LICENSE="MIT" -# The subslot reflects the SONAME. -SLOT="0/5" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -IUSE="ada +cxx debug doc gpm minimal profile static-libs symlink-usr tinfo trace unicode" - -DEPEND="gpm? ( sys-libs/gpm )" -# berkdb? ( sys-libs/db )" -# Block the older ncurses that installed all files w/SLOT=5. #557472 -RDEPEND="${DEPEND} - !<=sys-libs/ncurses-5.9-r5:5 - !/dev/null) - local basedir=$(basename $(dirname "${termfile}")) - - if [[ -n ${termfile} ]] ; then - dodir /etc/terminfo/${basedir} - mv ${termfile} "${ED}"/etc/terminfo/${basedir}/ - dosym ../../../../etc/terminfo/${basedir}/${x} \ - /usr/share/terminfo/${basedir}/${x} - fi - done - - echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" > "${T}"/50ncurses - doenvd "${T}"/50ncurses - - use minimal && rm -r "${ED}"/usr/share/terminfo* - # Because ncurses5-config --terminfo returns the directory we keep it - keepdir /usr/share/terminfo #245374 - elif use minimal; then - # prune all files and symlinks not listed in MINIMAL_TERMINFO - find "${D}"/usr/share/terminfo ! -type d \ - ${MINIMAL_TERMINFO[@]/#/! -name } \ - -delete || die - find "${D}"/usr/share/terminfo -type d -empty -delete || die - fi - - cd "${S}" - dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc - use doc && dohtml -r doc/html/ -} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/ncurses-5.9-r99.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/ncurses-5.9-r99.ebuild deleted file mode 100644 index d8a8266db3..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/ncurses-5.9-r99.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -# Bridge the old SLOT=5[/5] ebuild to the new SLOT=0/5 since the slotmove -# functionality does not handle implicit subslots correctly. #558856 - -EAPI="5" - -inherit multilib-build - -DESCRIPTION="transitional package" -HOMEPAGE="https://www.gnu.org/software/ncurses/ http://dickey.his.com/ncurses/" - -LICENSE="metapackage" -SLOT="5/5" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -IUSE="ada +cxx gpm static-libs tinfo unicode" - -DEPEND="sys-libs/ncurses:0/5[ada?,cxx?,gpm?,static-libs?,tinfo?,unicode?,${MULTILIB_USEDEP}]" -RDEPEND="${DEPEND}" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/ncurses-6.1-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/ncurses-6.1-r2.ebuild new file mode 100644 index 0000000000..b2b90f6152 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/ncurses-6.1-r2.ebuild @@ -0,0 +1,309 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit flag-o-matic toolchain-funcs multilib-minimal + +MY_PV=${PV:0:3} +PV_SNAP=${PV:4} +MY_P=${PN}-${MY_PV} +DESCRIPTION="console display library" +HOMEPAGE="https://www.gnu.org/software/ncurses/ http://dickey.his.com/ncurses/" +SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz" + +LICENSE="MIT" +# The subslot reflects the SONAME. +SLOT="0/6" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd" +IUSE="ada +cxx debug doc gpm minimal profile static-libs symlink-usr test threads tinfo trace unicode" + +DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )" +# berkdb? ( sys-libs/db )" +# Block the older ncurses that installed all files w/SLOT=5. #557472 +RDEPEND="${DEPEND} + !<=sys-libs/ncurses-5.9-r4:5 + !& /dev/null \ + || lbuildflags="${dbuildflags}" + + # We can't re-use the multilib BUILD_DIR because we run outside of it. + BUILD_DIR="${WORKDIR}" \ + CHOST=${CBUILD} \ + CFLAGS=${BUILD_CFLAGS} \ + CXXFLAGS=${BUILD_CXXFLAGS} \ + CPPFLAGS=${BUILD_CPPFLAGS} \ + LDFLAGS="${BUILD_LDFLAGS} ${lbuildflags}" \ + do_configure cross --without-shared --with-normal + fi + multilib-minimal_src_configure +} + +multilib_src_configure() { + local t + for t in "${NCURSES_TARGETS[@]}" ; do + do_configure "${t}" + done +} + +do_configure() { + addwrite /dev/ptmx + + local target=$1 + shift + + mkdir "${BUILD_DIR}/${target}" + cd "${BUILD_DIR}/${target}" || die + + local conf=( + # We need the basic terminfo files in /etc, bug #37026. We will + # add '--with-terminfo-dirs' and then populate /etc/terminfo in + # src_install() ... + --with-terminfo-dirs="${EPREFIX}/etc/terminfo:${EPREFIX}/usr/share/terminfo" + + # Disabled until #245417 is sorted out. + #$(use_with berkdb hashed-db) + + # Enable installation of .pc files. + --enable-pc-files + # This path is used to control where the .pc files are installed. + --with-pkg-config-libdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig" + + # Now the rest of the various standard flags. + --with-shared + --without-hashed-db + $(use_with ada) + $(use_with cxx) + $(use_with cxx cxx-binding) + --with-cxx-shared + $(use_with debug) + $(use_with profile) + # The configure script uses ldd to parse the linked output which + # is flaky for cross-compiling/multilib/ldd versions/etc... + $(use_with gpm gpm libgpm.so.1) + # Required for building on mingw-w64, and possibly other windows + # platforms, bug #639670 + $(use_enable kernel_Winnt term-driver) + --disable-termcap + --enable-symlinks + --with-rcs-ids + --with-manpage-format=normal + --enable-const + --enable-colorfgbg + --enable-hard-tabs + --enable-echo + $(use_enable !ada warnings) + $(use_with debug assertions) + $(use_enable !debug leaks) + $(use_with debug expanded) + $(use_with !debug macros) + $(multilib_native_with progs) + $(use_with test tests) + $(use_with trace) + $(use_with tinfo termlib) + --disable-stripping + ) + + if [[ ${target} == ncurses*w ]] ; then + conf+=( --enable-widec ) + else + conf+=( --disable-widec ) + fi + if [[ ${target} == ncursest* ]] ; then + conf+=( --with-{pthread,reentrant} ) + else + conf+=( --without-{pthread,reentrant} ) + fi + # Make sure each variant goes in a unique location. + if [[ ${target} == "ncurses" ]] ; then + # "ncurses" variant goes into "${EPREFIX}"/usr/include + # It is needed on Prefix because the configure script appends + # "ncurses" to "${prefix}/include" if "${prefix}" is not /usr. + conf+=( --enable-overwrite ) + else + conf+=( --includedir="${EPREFIX}"/usr/include/${target} ) + fi + # See comments in src_configure. + if [[ ${target} != "cross" ]] ; then + local cross_path="${WORKDIR}/cross" + [[ -d ${cross_path} ]] && export TIC_PATH="${cross_path}/progs/tic" + fi + + # Force bash until upstream rebuilds the configure script with a newer + # version of autotools. #545532 + CONFIG_SHELL=${EPREFIX}/bin/bash \ + ECONF_SOURCE="${S}" \ + econf "${conf[@]}" "$@" +} + +src_compile() { + # See comments in src_configure. + if ! ROOT=/ has_version "~sys-libs/${P}:0" ; then + BUILD_DIR="${WORKDIR}" \ + do_compile cross -C progs tic + fi + + multilib-minimal_src_compile +} + +multilib_src_compile() { + local t + for t in "${NCURSES_TARGETS[@]}" ; do + do_compile "${t}" + done +} + +do_compile() { + local target=$1 + shift + + cd "${BUILD_DIR}/${target}" || die + + # A little hack to fix parallel builds ... they break when + # generating sources so if we generate the sources first (in + # non-parallel), we can then build the rest of the package + # in parallel. This is not really a perf hit since the source + # generation is quite small. + emake -j1 sources + # For some reason, sources depends on pc-files which depends on + # compiled libraries which depends on sources which ... + # Manually delete the pc-files file so the install step will + # create the .pc files we want. + rm -f misc/pc-files + emake "$@" +} + +multilib_src_install() { + local target + for target in "${NCURSES_TARGETS[@]}" ; do + emake -C "${BUILD_DIR}/${target}" DESTDIR="${D}" install + done + + # Move main libraries into /. + if multilib_is_native_abi ; then + gen_usr_ldscript -a \ + "${NCURSES_TARGETS[@]}" \ + $(use tinfo && usex unicode 'tinfow' '') \ + $(usev tinfo) + fi + if ! tc-is-static-only ; then + # Provide a link for -lcurses. + ln -sf libncurses$(get_libname) "${ED}"/usr/$(get_libdir)/libcurses$(get_libname) || die + fi + # don't delete '*.dll.a', needed for linking #631468 + if ! use static-libs; then + find "${ED}"/usr/ -name '*.a' ! -name '*.dll.a' -delete || die + fi + + # Build fails to create this ... + dosym ../share/terminfo /usr/$(get_libdir)/terminfo +} + +multilib_src_install_all() { + if ! use symlink-usr ; then + # We need the basic terminfo files in /etc, bug #37026 + einfo "Installing basic terminfo files in /etc..." + local x + for x in "${MINIMAL_TERMINFO[@]}" + do + local termfile=$(find "${ED}"/usr/share/terminfo/ -name "${x}" 2>/dev/null) + local basedir=$(basename $(dirname "${termfile}")) + + if [[ -n ${termfile} ]] ; then + dodir /etc/terminfo/${basedir} + mv ${termfile} "${ED}"/etc/terminfo/${basedir}/ + dosym ../../../../etc/terminfo/${basedir}/${x} \ + /usr/share/terminfo/${basedir}/${x} + fi + done + + echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" > "${T}"/50ncurses + doenvd "${T}"/50ncurses + + use minimal && rm -r "${ED}"/usr/share/terminfo* + # Because ncurses5-config --terminfo returns the directory we keep it + keepdir /usr/share/terminfo #245374 + elif use minimal; then + # prune all files and symlinks not listed in MINIMAL_TERMINFO + find "${D}"/usr/share/terminfo ! -type d \ + ${MINIMAL_TERMINFO[@]/#/! -name } \ + -delete || die + find "${D}"/usr/share/terminfo -type d -empty -delete || die + fi + + cd "${S}" + dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc + if use doc ; then + docinto html + dohtml -r doc/html/ + fi +} + +pkg_preinst() { + preserve_old_lib /$(get_libdir)/libncurses.so.5 + use unicode && preserve_old_lib /$(get_libdir)/libncursesw.so.5 +} + +pkg_postinst() { + preserve_old_lib_notify /$(get_libdir)/libncurses.so.5 + use unicode && preserve_old_lib_notify /$(get_libdir)/libncursesw.so.5 +}