From 9dcfd7fc529fbbc316a9d5d2395cc8782958dd1b Mon Sep 17 00:00:00 2001 From: David Michael Date: Wed, 18 Apr 2018 19:30:02 -0400 Subject: [PATCH 1/8] sys-libs/ncurses: Sync with Gentoo's latest stable --- .../coreos-overlay/sys-libs/ncurses/Manifest | 33 +- .../ncurses/files/ncurses-5.8-gfbsd.patch | 24 -- .../files/ncurses-5.9-compiler-warnings.patch | 177 ----------- .../files/ncurses-5.9-fix-clang-build.patch | 44 --- .../files/ncurses-5.9-no-I-usr-include.patch | 45 --- .../files/ncurses-5.9-pkg-config.patch | 26 -- .../files/ncurses-6.0-cppflags-cross.patch | 35 +++ .../ncurses/files/ncurses-6.0-gfbsd.patch | 24 ++ .../files/ncurses-6.0-pkg-config.patch | 14 + ...ch => ncurses-6.0-rxvt-unicode-9.15.patch} | 10 +- .../ncurses/files/ncurses-6.0-ticlib.patch | 15 + .../ncurses-6.1-st07_terminfo_typo.patch | 14 + .../sys-libs/ncurses/metadata.xml | 11 +- .../sys-libs/ncurses/ncurses-5.9-r8.ebuild | 242 -------------- .../sys-libs/ncurses/ncurses-5.9-r99.ebuild | 21 -- .../sys-libs/ncurses/ncurses-6.1-r2.ebuild | 296 ++++++++++++++++++ 16 files changed, 411 insertions(+), 620 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/files/ncurses-5.8-gfbsd.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/files/ncurses-5.9-compiler-warnings.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/files/ncurses-5.9-fix-clang-build.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/files/ncurses-5.9-no-I-usr-include.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/files/ncurses-5.9-pkg-config.patch create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/files/ncurses-6.0-cppflags-cross.patch create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/files/ncurses-6.0-gfbsd.patch create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/files/ncurses-6.0-pkg-config.patch rename sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/files/{ncurses-5.9-rxvt-unicode-9.15.patch => ncurses-6.0-rxvt-unicode-9.15.patch} (94%) create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/files/ncurses-6.0-ticlib.patch create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/files/ncurses-6.1-st07_terminfo_typo.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/ncurses-5.9-r8.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/ncurses-5.9-r99.ebuild create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/ncurses-6.1-r2.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/Manifest index 11e86100f8..ec49f33417 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/Manifest @@ -1,32 +1 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -AUX ncurses-5.7-nongnu.patch 361 SHA256 7efcf3daf57d73e348bea1ea7ee77071aef5338631958fd0db595a011570cec4 SHA512 818a3ac1c68c1a11f23471195a32793c5546c5b37a724989cc58f3fad50fd3c8608762efc5d72e986f3c77ccdfbb72f27224f64ef415a96d71924a9f1d3b1b5f WHIRLPOOL a93e22415092ab51f769e42586813c8fed5b502e1dd86d09844f524876ac025ca81399dde483478087bb6241214f85c29a27f8b4ccadc2aec37be99dc7d6da1b -AUX ncurses-5.8-gfbsd.patch 695 SHA256 68c405dcd1b2bbad1d4880d906ba9e02ad62691c63edfb363ad767ee01079e82 SHA512 d4c375107415b7eaf5f8e04b697ef16998855b5f1d745766a14a7e9523d12b24d0841e6559217eccf62535f54e0d240eabaa3da1571964f1bb150b0c0cd102a2 WHIRLPOOL 6c2f865bc22a3932f6f973f7b53c5a50254505c4944c656af95c2399933c31acc5d5536d59fe9fe7c59ef537ce0d39ca19c9d0558e4aaacb7122749a575cadac -AUX ncurses-5.9-fix-clang-build.patch 1291 SHA256 0ffec4dbc7dc4a2356460c2a001b6ffbd8b060ae0afbdf3551a13575c20830d0 SHA512 d911441e2e2e2a752236f1eee42955b43ffabe37e47c337a86562c3708aca1fc2650ce77fe5aa6197eb8e9a67958a4b4db8f4344d22fe15868e25b933b175bb1 WHIRLPOOL d5d363f6d7cdcc350b195066c8183609bd9351a48603acdae2f374af13afb23a7bd05cbac86b13d2162daf5bd895eb5acce4769fce2f0b4b8da2896e00d1f846 -AUX ncurses-5.9-gcc-5.patch 1367 SHA256 6d40c4841e031fbb8b1ea6691b112aabc398d23b20b4458ec0b6eb78c33af88d SHA512 200388ee1e8d8f656620d067e8993f79a50ed1a6ebee41ce8bd32b2a61cbe10c93347e2604229b58299c457640b247261a4d05afe60802dd4cce80d17bc2f10c WHIRLPOOL afe4c3854c2fe8096ffa87b5b7e0076a4814ab90ab463346386e4f3ef24295c5c44ae588b8c3147399505072d8cbbf45b9970bacbffba709500bbbdb43a77bf3 -AUX ncurses-5.9-no-I-usr-include.patch 1431 SHA256 496e5dea489d60078344df651c3c2ea06d3dd083d83add0df60dde9104197154 SHA512 a58aec17e4c2edb3f8ed3f414ec6a89afe9f5fcc7cea898774a1fd7e7e892f9b66b1c2bdc74381dd5e8c9cf6968ad922406974f9ece8b38095b29e32d3ff0805 WHIRLPOOL d390ee0439f89dacaa9b5ea5402fc4e6bcf3d48b4bc77c93ff882fcd93f611f99ebd0ae4ce91eea1bec83b4d0191e0ead3361447448a84fc59496e6295116042 -AUX ncurses-5.9-pkg-config.patch 1022 SHA256 8b32d53c4a94eeb78f39c29b1e66813bdb2fd5225f96ab7c26950f96679b58fb SHA512 a5578a4a6c2a334a77084da21d61d4a9edd7b82f027d7f54ed7be194ace5076fe86dc51ada916388feeb970255bf3bfbb09cd33072b1ef21de0dbaa5ee45fdf6 WHIRLPOOL 9056961c1b617ca3286cc4c528a5b5da821a5472da105d82b56c925034454a600e818265627d2f17dbad5184ecf78ea4d14807838bed789ca01a85f39755b656 -AUX ncurses-5.9-rxvt-unicode-9.15.patch 3804 SHA256 ae684be42600ac3bbbf6e7be61e085524f65d86c20da8c453b10c27516e30b27 SHA512 82c0a9600f6ca8f36bbdce6f11a96906983fc9efd6b5f1e17134e12283e29b16d04f5e66c10edbcb7087cc4cb8fc23ddd065f9b6c8b0bf72ca684b68383e5131 WHIRLPOOL 1e2fe441d97671b84f49388555c351b235a93704fb7fcf13c14343db569cc91f21d75b60eb635c4c1c3ad18778bcb50e5aa63d25583224ed644edff35356dd2c -DIST ncurses-5.9.tar.gz 2826473 SHA256 9046298fb440324c9d4135ecea7879ffed8546dd1b58e59430ea07a4633f563b SHA512 d7c5e54b6d4d8b9211f0006ca8786f7609d180cc1aaebf4f25e7e35e12959779cf66447359a602daed625621ca32b0d910d67aef3eb8b6fdc3c373819a88faa1 WHIRLPOOL 069e98c6392ce9aca960c72a20f1a502387d33a4b237aaeaa95548024ce4d47b129eafbe0288d21c590e725fe71aaca21cacb300f11a660b7234cb39a777672a -EBUILD ncurses-5.9-r3.ebuild 7079 SHA256 6469e2e8827f6b56e9eec89c4eeb8c27c05896458b3cb5d2e8c0178c4502362f SHA512 7881efb51872705471ba07c9a3b67c1bc2ecec34e54aaa197ee85486a638887a5f64961f824ac4c1cf9da1a18b89ccad6b99d01dd7e213acc135ddb265bec565 WHIRLPOOL 10d50400d41f67c2d8aad059553b7b6f1fc43ec97faa6fbe12d7f9d1b3002fdc466cf2fea84f523a3b70d25c771a02bfb784f93b306c4ca22d5188befbae5089 -EBUILD ncurses-5.9-r4.ebuild 7323 SHA256 3f1e36c5a38ad1009e2813a6eec91de04a1f5dea3c48f581b381001d2e074937 SHA512 1c652600c854faeda6f953be7385281a97b810747cd5a9329320068e7b13edec2c063deb180ee99a9c8360ba8c29b462dd8a59adef1de084a766ed7659ba7afb WHIRLPOOL a2db8f53975f5b2558f21b74f2d6da7df346244993d0c5940c4eebe10088475bdd18a1a569c1af6ec1853c145bb588d6e1a8877a4b78ab32a9640ac1dfbefd3f -MISC ChangeLog 34227 SHA256 c270819f5451e01fb6cf955db5572216a7ff623276e8c2a637c85211301b2fc9 SHA512 276e5b0a59cc7e28d230728a4b6db5e1761893ce68b54e693e37d9f6a0d7e364840648079f7ae862869a25315d90f5ba62dcf575212d008c32273c8a3af02a8c WHIRLPOOL d34b60dc0d336349e0240c6ef01e6258def63970fe2e2ee6efb62a889dfa40c46c6e8b38195f4cf742def6fffe877ba8af110d5569c10aa26a08d9a63e72e507 -MISC metadata.xml 530 SHA256 3a0f1bf7ab8ec067416e6535c3270113b53716b12aac504a581acf5b27f8114f SHA512 27d968272c8d184804d9764bb2ec8fb86eb5826bfe14e7f445c7c5f0b89cc7fe4271546a6994d830cb1270fa93f187ded1c96b4f4f1fe1b5c417c78a2082dfd3 WHIRLPOOL 54ff921a2a89b19d6d75830033b7d18c0f7643af248bea029b1a7ebe201eded0eff54dde04858be08903cb6607e7cbcb8ca100712d4992324dbb757184150d44 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQIcBAEBCAAGBQJVIuhWAAoJEPGu1DbS6WIA1qcP+gK/XlRLEnGeq50Rb3vdZ8zW -4uEPSYesfkeTeau4CFjp8TomGGLSLECabbQEbB0yc2M/Ws4exN3r0PFxoOCl5Kd+ -CCsVf1AdyvPb7X7XgHc/L563oGEPGjAAr0JrHZTNV+hezvHorlH8hHWo3xISJmz/ -I82ebE8VoNrQobtxC27xTb0iDl8ayzzu50Qq18s0pyQO6SKLI495L2vYJcDZW8ys -LlD5bHun1bMf0Zwg3ZguzpJ1TWpdUqBdUfc5x8B29CwgB4AdsiOes5oEiiEQ1hDZ -ij/kqD3UKkL+khnKuvPLtdnZGjNYBDGwOUUj6uLSFLAdKvgjNXoSdd/6aWxB2SJ1 -aQy6+b2VGnPlmBb/4DgEaBZfiLVY69o64YAelkHZD7bA+c1q3os0qgk/frQrWM+D -gu/mq4ghbrqJyL7MFqc85pGJhlP9c+gnYJxqEygQQQ9RJXFNh4vJCWNJhOU/1haD -H9Br1m2gZl1tbZl6IvRIWBQju/LiZSDTIDnWSa9EhJe22zXth7ZrJK3mlMqFWDjo -ZGIw8JH0pNEx5vDhZdzoDTON2HEAdSrlnD2NyH32ixjqfz/i7uOWjzTc3Gu71lFF -+u4wVAp0Du0iaTPfMrO7NHghGykCOz4KvJ3Jl1pT4Xz2YUvcHPR5srCcPR4s/eKA -tZdf8rmbrW1pfYbYLMMw -=zCx5 ------END PGP SIGNATURE----- +DIST ncurses-6.1.tar.gz 3365395 SHA256 aa057eeeb4a14d470101eff4597d5833dcef5965331be3528c08d99cebaa0d17 SHA512 e308af43f8b7e01e98a55f4f6c4ee4d1c39ce09d95399fa555b3f0cdf5fd0db0f4c4d820b4af78a63f6cf6d8627587114a40af48cfc066134b600520808a77ee WHIRLPOOL ae1af38f8085fd9c80d1695243e2f8f21771db07d3ffe8ecf8c45945481fbac6d597459a86eaeee7d413154d05c2be8baa95077856124fd3584d30f78f26aab3 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/files/ncurses-5.8-gfbsd.patch b/sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/files/ncurses-5.8-gfbsd.patch deleted file mode 100644 index 0200a14462..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/files/ncurses-5.8-gfbsd.patch +++ /dev/null @@ -1,24 +0,0 @@ -we'll hijack the freebsd* case that comes later - ---- ncurses-5.6/aclocal.m4 -+++ ncurses-5.6/aclocal.m4 -@@ -3806,7 +3806,7 @@ - fi - cf_cv_rm_so_locs=yes - ;; -- linux*|gnu*|k*bsd*-gnu) #(vi -+ linux*|gnu*|k*bsd*-gnu|freebsd*|dragonfly*) #(vi - if test "$DFT_LWR_MODEL" = "shared" ; then - LOCAL_LDFLAGS="-Wl,-rpath,\$(LOCAL_LIBDIR)" - LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" ---- ncurses-5.6/configure -+++ ncurses-5.6/configure -@@ -3806,7 +3806,7 @@ - fi - cf_cv_rm_so_locs=yes - ;; -- linux*|gnu*|k*bsd*-gnu) #(vi -+ linux*|gnu*|k*bsd*-gnu|freebsd*|dragonfly*) #(vi - if test "$DFT_LWR_MODEL" = "shared" ; then - LOCAL_LDFLAGS="-Wl,-rpath,\$(LOCAL_LIBDIR)" - LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/files/ncurses-5.9-compiler-warnings.patch b/sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/files/ncurses-5.9-compiler-warnings.patch deleted file mode 100644 index d74d431595..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/files/ncurses-5.9-compiler-warnings.patch +++ /dev/null @@ -1,177 +0,0 @@ -From fed65dd4e3fddb3c8f568a77b66c8b97c6757ad0 Mon Sep 17 00:00:00 2001 -From: "Thomas E. Dickey" -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..a13f47d42f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/ncurses-6.1-r2.ebuild @@ -0,0 +1,296 @@ +# 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 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() { + 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 berkdb ; then + # We need the basic terminfo files in /etc, bug #37026 + einfo "Installing basic terminfo files in /etc..." + local x + for x in ansi console dumb linux rxvt rxvt-unicode screen{,-256color} vt{52,100,102,200,220} \ + xterm xterm-{,256}color + 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 +# fi + + 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 + + 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 +} From 89ff6feaf2145cdc94a6c6da9c0b8a7831a898ae Mon Sep 17 00:00:00 2001 From: David Michael Date: Fri, 20 Apr 2018 13:26:06 -0400 Subject: [PATCH 2/8] sys-libs/ncurses: Apply CoreOS changes Add a symlink-usr USE flag for keeping a minimal set of terminfo files in /usr/share/terminfo. Also allow writes to /dev/ptmx, which sometimes causes the sandbox to fail Jenkins builds. --- .../sys-libs/ncurses/ncurses-6.1-r2.ebuild | 33 +++++++++++++------ 1 file changed, 23 insertions(+), 10 deletions(-) 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 index a13f47d42f..b2b90f6152 100644 --- 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 @@ -16,7 +16,7 @@ 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 test threads tinfo trace unicode" +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 )" @@ -30,6 +30,12 @@ RDEPEND="${DEPEND} S=${WORKDIR}/${MY_P} +MINIMAL_TERMINFO=( + ansi console dumb linux rxvt rxvt-256color rxvt-unicode rxvt-unicode-256color + screen screen-16color screen-256color sun vt{52,100,102,200,220} + xterm xterm-color xterm-256color xterm-xfree86 +) + PATCHES=( "${FILESDIR}/${PN}-6.0-gfbsd.patch" "${FILESDIR}/${PN}-5.7-nongnu.patch" @@ -100,6 +106,8 @@ multilib_src_configure() { } do_configure() { + addwrite /dev/ptmx + local target=$1 shift @@ -251,12 +259,11 @@ multilib_src_install() { } multilib_src_install_all() { -# if ! use berkdb ; then + 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 ansi console dumb linux rxvt rxvt-unicode screen{,-256color} vt{52,100,102,200,220} \ - xterm xterm-{,256}color + for x in "${MINIMAL_TERMINFO[@]}" do local termfile=$(find "${ED}"/usr/share/terminfo/ -name "${x}" 2>/dev/null) local basedir=$(basename $(dirname "${termfile}")) @@ -268,14 +275,20 @@ multilib_src_install_all() { /usr/share/terminfo/${basedir}/${x} fi done -# fi - echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" > "${T}"/50ncurses - doenvd "${T}"/50ncurses + 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 + 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 From 4996e5cfd591cf22c51415f7a12c527caf08fe17 Mon Sep 17 00:00:00 2001 From: David Michael Date: Fri, 11 May 2018 18:43:31 -0400 Subject: [PATCH 3/8] profiles: Don't install any MTA packages --- .../coreos-overlay/profiles/coreos/base/package.provided | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.provided diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.provided b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.provided new file mode 100644 index 0000000000..b537b2d65f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.provided @@ -0,0 +1,2 @@ +# Skip MTA dependencies. +virtual/mta-1 From b3b795d1e4160112388345485d7bb0bcb80c2a24 Mon Sep 17 00:00:00 2001 From: David Michael Date: Wed, 16 May 2018 15:30:00 -0400 Subject: [PATCH 4/8] sys-apps/systemd: Bump for util-linux 2.32 build fix --- .../systemd/{systemd-238.ebuild => systemd-238-r1.ebuild} | 0 .../coreos-overlay/sys-apps/systemd/systemd-9999.ebuild | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/{systemd-238.ebuild => systemd-238-r1.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-238.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-238-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-238.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-238-r1.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 bc60fe748d..5cb2f35cb4 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="dd42d3d148eef87f65666199c85905308a95bc53" # v238-coreos + CROS_WORKON_COMMIT="b4807ffc5ddd52242404194001d182597a5f118b" # v238-coreos KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" fi From e75337cdc4bf8a5f521247ff898d821d30c1bd9f Mon Sep 17 00:00:00 2001 From: David Michael Date: Wed, 16 May 2018 15:35:51 -0400 Subject: [PATCH 5/8] profiles: Sync versions with portage-stable bumps --- .../coreos-overlay/coreos/config/env/net-dns/bind-tools | 2 ++ .../profiles/coreos/arm64/package.accept_keywords | 8 ++++---- .../coreos-overlay/profiles/coreos/arm64/package.provided | 2 +- .../profiles/coreos/base/package.accept_keywords | 5 +++++ .../profiles/coreos/targets/generic/package.provided | 4 ++-- 5 files changed, 14 insertions(+), 7 deletions(-) create mode 100644 sdk_container/src/third_party/coreos-overlay/coreos/config/env/net-dns/bind-tools 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/profiles/coreos/arm64/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords index 2e9b3670ec..0ce7a18013 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords @@ -16,10 +16,9 @@ =dev-libs/liblinear-210-r1 ~arm64 =dev-libs/libnl-3.2.27 ~arm64 =dev-libs/libpcre-8.41 ~arm64 -=dev-libs/libusb-1.0.21 ~arm64 -=dev-libs/libxml2-2.9.4-r3 ~arm64 -=dev-libs/nss-3.29.5 ~arm64 =dev-libs/libpcre2-10.30 ~arm64 +=dev-libs/libusb-1.0.21 ~arm64 +=dev-libs/nss-3.29.5 ~arm64 =dev-libs/userspace-rcu-0.9.1 ** =dev-perl/libintl-perl-1.240.0-r2 ~arm64 =dev-perl/Text-Unidecode-1.270.0 ~arm64 @@ -30,6 +29,7 @@ =net-analyzer/nmap-7.40 ~arm64 =net-analyzer/tcpdump-4.9.2 ~arm64 =net-dialup/minicom-2.7.1 ~arm64 +=net-dns/bind-tools-9.11.2_p1 ~arm64 =net-dns/dnsmasq-2.78 ~arm64 =net-firewall/ebtables-2.0.10.4-r1 ~arm64 =net-firewall/ipset-6.29 ~arm64 @@ -41,7 +41,6 @@ =net-misc/socat-1.7.3.2 ~arm64 =net-nds/openldap-2.4.44 ~arm64 =perl-core/File-Path-2.130.0 ~arm64 -=sys-apps/gptfdisk-1.0.1 ~arm64 =sys-apps/i2c-tools-3.1.1-r1 ~arm64 =sys-apps/lshw-02.17b-r2 ** =sys-apps/man-db-2.7.6.1-r2 ~arm64 @@ -59,6 +58,7 @@ =sys-fs/quota-4.02 ** =sys-libs/binutils-libs-2.29.1-r1 ~arm64 =sys-libs/libcap-ng-0.7.8 ~arm64 +=virtual/krb5-0-r1 ~arm64 =virtual/libudev-232 ~arm64 =virtual/libusb-1-r2 ~arm64 =virtual/perl-File-Path-2.130.0 ~arm64 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.provided b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.provided index 05e864cb2f..2fdc03a5c7 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.provided +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.provided @@ -3,4 +3,4 @@ dev-libs/gobject-introspection-1.40.0-r1 # build errors -net-dns/bind-tools-9.10.1_p1 +net-dns/bind-tools-9.11.2_p1 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords index ebe5d30135..9dce4a429a 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords @@ -65,3 +65,8 @@ dev-util/checkbashisms =sys-devel/gcc-7.3.0 =cross-aarch64-cros-linux-gnu/gcc-7.3.0 ~arm64 =cross-x86_64-cros-linux-gnu/gcc-7.3.0 ~amd64 + +# Force upgrades to work around catalyst problems while upgrading ncurses. +=app-crypt/gnupg-2.2.7 ~amd64 ~arm64 +=sys-apps/gptfdisk-1.0.3 ~amd64 ~arm64 +=sys-apps/util-linux-2.32 ~amd64 ~arm64 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.provided b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.provided index c848732293..eebf292ec4 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.provided +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.provided @@ -5,7 +5,7 @@ # disable them and we have no need/use for them in prod images. # pulled in by app-crypt/pinentry -app-eselect/eselect-pinentry-0.4 +app-eselect/eselect-pinentry-0.7 # pulled in by app-editors/vim app-admin/eselect-vi-1.1.5 @@ -21,4 +21,4 @@ net-mail/mailbase-1.1 app-arch/xz-utils-0 # doesn't cross-compile, but required for glog, gflags, etc. -dev-util/cmake-3.7.2 +dev-util/cmake-3.9.6 From df2d0a03345bc6882e4ae084236f85d19f7aa940 Mon Sep 17 00:00:00 2001 From: David Michael Date: Wed, 16 May 2018 16:55:58 -0400 Subject: [PATCH 6/8] dev-util/catalyst: Import from portage-stable --- .../coreos-overlay/dev-util/catalyst/Manifest | 1 + .../catalyst/catalyst-2.0.18-r4.ebuild | 120 ++++++++++++++++++ ...atalyst-2.0.18-Do-notuntarwith--acls.patch | 95 ++++++++++++++ .../files/catalyst-2.0.18-fix-quotes.patch | 38 ++++++ .../catalyst-2.0.18-remove-machine-id.patch | 25 ++++ .../catalyst-2.0.18-stage1-export-ROOT.patch | 42 ++++++ .../dev-util/catalyst/metadata.xml | 14 ++ 7 files changed, 335 insertions(+) create mode 100644 sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/Manifest create mode 100644 sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/catalyst-2.0.18-r4.ebuild create mode 100644 sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/files/catalyst-2.0.18-Do-notuntarwith--acls.patch create mode 100644 sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/files/catalyst-2.0.18-fix-quotes.patch create mode 100644 sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/files/catalyst-2.0.18-remove-machine-id.patch create mode 100644 sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/files/catalyst-2.0.18-stage1-export-ROOT.patch create mode 100644 sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/metadata.xml 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-r4.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/catalyst-2.0.18-r4.ebuild new file mode 100644 index 0000000000..98e502b926 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/catalyst-2.0.18-r4.ebuild @@ -0,0 +1,120 @@ +# 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" +) + +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-fix-quotes.patch b/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/files/catalyst-2.0.18-fix-quotes.patch new file mode 100644 index 0000000000..ccaffbe6b0 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/files/catalyst-2.0.18-fix-quotes.patch @@ -0,0 +1,38 @@ +From 1eabce3a9c15c5caf022e71c1959e8c8f4819fad Mon Sep 17 00:00:00 2001 +From: "Anthony G. Basile" +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 + + From b01a77041979e51e99c4e704981eeaa9ef67973c Mon Sep 17 00:00:00 2001 From: David Michael Date: Wed, 16 May 2018 17:04:11 -0400 Subject: [PATCH 7/8] dev-util/catalyst: Hack the stage1 script to upgrade ncurses Add a patch to forcefully rebuild everything that depends on the old ncurses slot. This patch should be dropped as soon as the next SDK is built and used in the manifest repo. --- ...yst-2.0.18-r4.ebuild => catalyst-2.0.18-r5.ebuild} | 1 + .../catalyst-2.0.18-coreos-upgrade-ncurses.patch | 11 +++++++++++ 2 files changed, 12 insertions(+) rename sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/{catalyst-2.0.18-r4.ebuild => catalyst-2.0.18-r5.ebuild} (98%) create mode 100644 sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/files/catalyst-2.0.18-coreos-upgrade-ncurses.patch diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/catalyst-2.0.18-r4.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/catalyst-2.0.18-r5.ebuild similarity index 98% rename from sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/catalyst-2.0.18-r4.ebuild rename to sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/catalyst-2.0.18-r5.ebuild index 98e502b926..e75053b0ea 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/catalyst-2.0.18-r4.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/catalyst-2.0.18-r5.ebuild @@ -52,6 +52,7 @@ PATCHES=( "${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() { 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: Fri, 18 May 2018 23:37:36 +0000 Subject: [PATCH 8/8] chore(metadata): Regenerate cache --- .../{etcd-wrapper-3.3.3 => etcd-wrapper-3.3.5} | 0 .../metadata/md5-cache/app-admin/sudo-1.8.23 | 14 ++++++++++++++ .../app-arch/{torcx-0.1.3-r1 => torcx-0.1.3-r2} | 0 .../{docker-18.04.0 => docker-18.05.0} | 12 ++++++------ .../metadata/md5-cache/app-emulation/docker-9999 | 10 +++++----- .../md5-cache/app-emulation/docker-runc-1.0.0_rc5 | 2 +- ...{wa-linux-agent-2.2.4 => wa-linux-agent-2.2.25} | 2 +- .../app-torcx/{docker-18.04 => docker-18.05} | 4 ++-- ...reos-init-0.0.1-r159 => coreos-init-0.0.1-r160} | 2 +- .../md5-cache/coreos-base/coreos-init-9999 | 2 +- .../{oem-azure-2.2.4-r4 => oem-azure-2.2.25} | 2 +- .../{update_engine-0.4.6 => update_engine-0.4.7} | 2 +- .../md5-cache/coreos-base/update_engine-9999 | 2 +- .../dev-db/{etcdctl-3.3.3 => etcdctl-3.3.5} | 2 +- .../md5-cache/dev-lang/{go-1.10.1 => go-1.10.2} | 4 ++-- .../md5-cache/dev-lang/{go-1.9.5 => go-1.9.6} | 4 ++-- .../metadata/md5-cache/dev-util/catalyst-2.0.18-r5 | 14 ++++++++++++++ .../net-misc/{ntp-4.2.8_p11 => ntp-4.2.8_p11-r1} | 0 .../sys-apps/{ignition-0.24.0 => ignition-0.25.0} | 4 ++-- .../metadata/md5-cache/sys-apps/ignition-9999 | 2 +- .../sys-apps/{systemd-238 => systemd-238-r1} | 2 +- .../metadata/md5-cache/sys-apps/systemd-9999 | 2 +- ...reos-kernel-4.16.5 => coreos-kernel-4.14.39-r1} | 6 +++--- ...reos-kernel-4.14.37 => coreos-kernel-4.16.7-r1} | 6 +++--- ...s-modules-4.14.37 => coreos-modules-4.14.39-r1} | 4 ++-- ...eos-modules-4.16.5 => coreos-modules-4.16.7-r1} | 4 ++-- ...reos-sources-4.14.37 => coreos-sources-4.14.39} | 6 +++--- ...coreos-sources-4.16.5 => coreos-sources-4.16.7} | 8 ++++---- .../metadata/md5-cache/sys-libs/ncurses-5.9-r8 | 14 -------------- .../metadata/md5-cache/sys-libs/ncurses-5.9-r99 | 12 ------------ .../metadata/md5-cache/sys-libs/ncurses-6.1-r2 | 13 +++++++++++++ 31 files changed, 88 insertions(+), 73 deletions(-) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/{etcd-wrapper-3.3.3 => etcd-wrapper-3.3.5} (100%) create mode 100644 sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/sudo-1.8.23 rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-arch/{torcx-0.1.3-r1 => torcx-0.1.3-r2} (100%) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/{docker-18.04.0 => docker-18.05.0} (80%) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/{wa-linux-agent-2.2.4 => wa-linux-agent-2.2.25} (68%) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-torcx/{docker-18.04 => docker-18.05} (55%) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/{coreos-init-0.0.1-r159 => coreos-init-0.0.1-r160} (95%) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/{oem-azure-2.2.4-r4 => oem-azure-2.2.25} (76%) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/{update_engine-0.4.6 => update_engine-0.4.7} (97%) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-db/{etcdctl-3.3.3 => etcdctl-3.3.5} (91%) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-lang/{go-1.10.1 => go-1.10.2} (90%) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-lang/{go-1.9.5 => go-1.9.6} (90%) create mode 100644 sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/catalyst-2.0.18-r5 rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/{ntp-4.2.8_p11 => ntp-4.2.8_p11-r1} (100%) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/{ignition-0.24.0 => ignition-0.25.0} (95%) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/{systemd-238 => systemd-238-r1} (99%) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/{coreos-kernel-4.16.5 => coreos-kernel-4.14.39-r1} (53%) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/{coreos-kernel-4.14.37 => coreos-kernel-4.16.7-r1} (53%) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/{coreos-modules-4.14.37 => coreos-modules-4.14.39-r1} (93%) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/{coreos-modules-4.16.5 => coreos-modules-4.16.7-r1} (93%) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/{coreos-sources-4.14.37 => coreos-sources-4.14.39} (88%) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/{coreos-sources-4.16.5 => coreos-sources-4.16.7} (77%) delete mode 100644 sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/ncurses-5.9-r8 delete mode 100644 sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/ncurses-5.9-r99 create mode 100644 sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/ncurses-6.1-r2 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 !