From b7b97785ebbb2f11d24d14dab8b81ed274f4ce6a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 19 Mar 2019 11:37:34 +0000 Subject: gentoo resync : 19.03.2019 --- sys-libs/glibc/Manifest | 10 +++++----- sys-libs/glibc/glibc-2.28-r5.ebuild | 6 +++--- sys-libs/glibc/glibc-2.29.ebuild | 4 ++-- sys-libs/glibc/glibc-9999.ebuild | 13 +++++++++---- sys-libs/glibc/metadata.xml | 3 ++- 5 files changed, 21 insertions(+), 15 deletions(-) (limited to 'sys-libs/glibc') diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest index 68a1847810b9..6fb1103b585f 100644 --- a/sys-libs/glibc/Manifest +++ b/sys-libs/glibc/Manifest @@ -35,7 +35,7 @@ DIST glibc-2.28-patches-8.tar.xz 97384 BLAKE2B 036ab39103aa30be61fcbb46a7103cf83 DIST glibc-2.28.tar.xz 16484344 BLAKE2B 9aa8cbd5a145c2a6fde3a60b3d0a14b12b46ed79333ad1ca3e73464adcfe700277a17a9e7fd0ca36e355a0c5b0b27decfa091da320ba802741ad75cc955bbcc8 SHA512 521f820953ff07c69ece4c2186f59fc061a7f9747932cd70ef2995c2b2deee76eeb6de700d85071cdca5949179aa8ccee75eda7feca1394121ec7b821ad0a3f3 DIST glibc-2.29-patches-1.tar.xz 17768 BLAKE2B d835c62552ff8650c81156cfff6962fbb3a31c1b9498b0e9fd0a2f0847c99d6127c1662d3fe46a77d5bce8f4a4c850047b99c4567c74bef96b410bbd53d3b65a SHA512 9231e1067298e5c044ed8f6eaff1b117ebaa3eeb05adecb85ed31e927ec6805e7109b6d137b31def4d07f389fcdb5102c9ef705772f4d2ccb2eee8a73f6e3ce3 DIST glibc-2.29.tar.xz 16515488 BLAKE2B b754e6825176538a2b8ca03fce014f0d87d333dc4d038bf0cda5ee8a2f484cd3ce93ad78ec126737e093ab64b55ceedf04cd08aecb4f8041daaa329e99717afa SHA512 146bc0769fe853d9edbf93cea7f74c5b3d84d69cb7614c62588e7acdecd1ec789a9d8949f3e8b99f8f36f2ccac740a003bed94f32b07817baf780b06cfeb6ed0 -DIST glibc-9999-patches-10.tar.xz 17544 BLAKE2B 1cd4fa14b2168e371c769c06a29f36d6dbd3beccb796788470b63282cb8e5c3c497e4eb3800e4bc86c07d3b82935d71dc96dc3155178d52b68873ea38a271a70 SHA512 bbd376ad87fb71de7a6a4eb28030aa1550f7cca57e521d2a326cab63a66e2dc784b93319190f8bb1b24b335acc604d0523c3ea8335a4424373796ebeb79f273b +DIST glibc-9999-patches-11.tar.xz 17804 BLAKE2B cb4ef9fbaf0da3e2307c468d2a6731ff2475f6ebc490f0ca43d375b59aa669bec1ad0580775306adb95e249e9641bed910310185e5dced66a491c1491b99a747 SHA512 d2fced779807c7f492c17958cf4f95273d1bdcfe062bd71546f2360f3d4742a696ec8d04d984ec560c0fcccea332446834ae2c9d28cfd9009ffd091c1084edc9 EBUILD glibc-2.19-r2.ebuild 40484 BLAKE2B 9e78b3fcbf40c7c32fd9a7ba0f4c9d31277aa0d5465342b5af1a8115d4dbb9bc34e4dd0be6fe6abca2497306ef84018b62969ff2a2d28eeb092e204a60972714 SHA512 6ee461bd816a33b5eb37e3d7c107e09ebb912ce9cb26620e7bedadf31a5a874c822148859973d4e60931a46b668ce743b7ff04fa3df99f0089251ae653021750 EBUILD glibc-2.21-r2.ebuild 4899 BLAKE2B 4097f29160b437edb96e6f731c797cba43bfb65fe164c1ffc3af0025d52c18a286b9a75d56d3e371e33e87f99a71a2115ba2eba7cb174dd2787a9b6a6d84b674 SHA512 68cc49c310ff816b2433b4f9e389e992d64f623809d4a4c3391dcce7ee4c385365ef4278de79bf4b6b9a4ed969e10b94bebabe86e560295bd1c0a9652aec12ec EBUILD glibc-2.22-r4.ebuild 4950 BLAKE2B 8d048dafaf8eec034d2ed2f3a8f400b3f4aedab39d7fe11795376a135ed9a42843f9cc6888e721ef242f78bc4230188d53cdccaf7686186d43201101519cc60b SHA512 64387259f921dc26d91d5d4e86bbbbfd740bb4b2e1337c121f799370abc9c6298745f9686e6aa501b10c05150ac1129ef8bd37d140e9c83c41ac3c0f54ee052f @@ -44,7 +44,7 @@ EBUILD glibc-2.24-r4.ebuild 4988 BLAKE2B 8e08345c96e176984b73a073efca21f771d41af EBUILD glibc-2.25-r11.ebuild 4975 BLAKE2B cef32f5d160644845e7cf45a9dd4c8cef1dcff8fca6b64c083c3e05d07533e445a6139939710b9284f7587bbf3977ca556caeb964e73ac21a382d942423d886a SHA512 f26645acc02f16209ec068641a800ef0a4ad2a422c9473e14a273fdece9b53074b837907d635a8585cf9dbb1acea14178166a4a3410aa4c70a745b89a764b6f1 EBUILD glibc-2.26-r7.ebuild 25496 BLAKE2B 3edbb2f56d81869f86bd357772c27eb9516a1a0fbbda024412c8588df0b7938c77afc46430ea8b01bfe012eb5097f58b989411d4953d09d9202c33eeea562708 SHA512 e28a2cf8f692e6526fcbee2d9317dbb4cb8a4c249e4b60ed5b3522dc8c4627248b4a4bad0c32192adf0f650f3f002b8e25ebc7038fe0daf959f0dcde0bfe1bc4 EBUILD glibc-2.27-r6.ebuild 41551 BLAKE2B 9b55701da5b61f4b095108f0042181961fc67a9b8a40d7ed70ca5effd8114a9d1769f2e9ed178fcf49069cb63c0ad9bdc53cf6f4526f98c3a7d41609d9e7574c SHA512 1d06a20e0a2dc7deee567a0e2545cea87cfbdf5f0d1037b85e2a6afa829b5106880d3b44f44adb7e790820eaa873aac442208f77f1e5c48411af8c1c94a16ce9 -EBUILD glibc-2.28-r5.ebuild 41309 BLAKE2B 63e3bb3425476023129366376cda83af382a83aa949c3f8129e938d9a8c577b89b73c78b802c1e8466454b98e7d1e81e0e596a36b2e5236098eeb0f7fedd92c4 SHA512 7aa692a9b05931183a94e6bafa24bc7c03a32d1abacf905b7dd391022881016eb5050aa4893155a0c2d9faafe99de07cec847a5b79a3173b42f515f738e15882 -EBUILD glibc-2.29.ebuild 41321 BLAKE2B 6993d082ed48c25b0056d03b0fe95aabc2228c7b74702058dac64a02e5af44b9083942fcaf614e9d5e3fbf948111850b7cc795757ad4cb099b29d18360e54e20 SHA512 e87e1074087da25e2f9981a7460472476497d830e30934950b7c8fcebe191122dc9ce2ad27307466aea2886c6e573d3232ed88ba49852f3329683bf9a5871984 -EBUILD glibc-9999.ebuild 41173 BLAKE2B 4b495da61fd6be969af746cf6aab7c52e118101e4769c9ccbaccbdb7f4fa9e54b30512fd0978e75293ee3de7e697f6d10eaf43148f91c15b2e2188d5310007f9 SHA512 225a182b465b5f12bcd7e576338cdf067cf90f1601ea3240590ccd93e697e6a5b810464b40af7581aad91503c64cbcc3dec48b56741600c355e706281a57864e -MISC metadata.xml 1265 BLAKE2B 0d494de7b6fda57a4f401eace7b8c02c4ea78a65a1a41a4a1c33b48ff0960f5e240ffbacbc3191bc0d463bcf3ef9e6b374c7b3d7482c5ca1b3d8d2b9b88cef88 SHA512 f92825278b07ef97cc8aa50ad342c1433e02bcbf6911bc8d6a890fa30e7f225fdee036c74db26d656023ba0d79aa828455b754b66775b0d7b2a290bfedce50f0 +EBUILD glibc-2.28-r5.ebuild 41326 BLAKE2B e1408c9032d171b8b52e2f2b7ddc94fba0385ed1c09094a1dccbfb2e6c7ac29605ef1f8abb5a097f380fab8dbc192dcc9f6b0c81d48ceeaa0816a8741acbb5b0 SHA512 1a9bbc66fc60c6f56db46ee97988697b11fef87a2911db0027d891f8a62196c62bdbb3c7c1ed1e86eeb2e132c3d08cbc27659654e7b96f1f9fbfc95047746f82 +EBUILD glibc-2.29.ebuild 41341 BLAKE2B 65f87ad2d2a03b482b2ee4efcf99d9a10391d1ca4eb41ffbc36377cedccc54471426ada1dc00538bc6b0def3aa20e621327ca73207173131e83913f001d9c5bd SHA512 93b97ec1036f06a615c64d38cd28bf807522e645c111ed2ee823e79c3193bad3841401701925c2262370fb181af0e341d1d4be9db5a1148bdc5d2df15ca28363 +EBUILD glibc-9999.ebuild 41339 BLAKE2B 7b3ebaf84743763589f1d4e356902b2b4220fd354c6cc0ca2e4b62697b99e66793e392c7e3f5c6d25aba63b64bb4221f4002dbb093397bb7b221f88bb6007ae8 SHA512 a73bfb370b8cc6eb3d2c890ea4998320814f129c43880f5b53cd0c22af515f1546532649e642724e83b667feea53b8d7499ad47a15fa37d7ba2c592957b4e690 +MISC metadata.xml 1323 BLAKE2B 6a19ccbf9f068c6c3d3b945d3011dce3d7712dd74a2daeaa8244eef73fd86723b275ce018ec5557862278c23883fabfb27e91e0b88ff62c34fffdadd4b024411 SHA512 848adbf531103d69b8b0e7017c25de730daecccae220e337e475ba8dbcaa95c6d5e440330be56367974607050dfa1964026ed90bc699ab5f12fef35c88d67505 diff --git a/sys-libs/glibc/glibc-2.28-r5.ebuild b/sys-libs/glibc/glibc-2.28-r5.ebuild index 9087d26caafa..e10a6d48b735 100644 --- a/sys-libs/glibc/glibc-2.28-r5.ebuild +++ b/sys-libs/glibc/glibc-2.28-r5.ebuild @@ -18,7 +18,7 @@ if [[ ${PV} == 9999* ]]; then EGIT_REPO_URI="https://sourceware.org/git/glibc.git" inherit git-r3 else - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" + KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh sparc ~x86" SRC_URI="mirror://gnu/glibc/${P}.tar.xz" fi @@ -32,7 +32,7 @@ PATCH_VER=8 SRC_URI+=" https://dev.gentoo.org/~dilfridge/distfiles/${P}-patches-${PATCH_VER}.tar.xz" SRC_URI+=" multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz )" -IUSE="audit caps cet compile-locales doc gd headers-only +multiarch multilib nscd profile selinux suid systemtap test vanilla" +IUSE="audit caps cet compile-locales doc gd headers-only +multiarch multilib nscd profile selinux +ssp suid systemtap test vanilla" # Minimum kernel version that glibc requires MIN_KERN_VER="3.2.0" @@ -813,7 +813,7 @@ glibc_do_configure() { myconf+=( --enable-stack-protector=no ) ;; *) - myconf+=( --enable-stack-protector=all ) + myconf+=( --enable-stack-protector=$(usex ssp all no) ) ;; esac myconf+=( --enable-stackguard-randomization ) diff --git a/sys-libs/glibc/glibc-2.29.ebuild b/sys-libs/glibc/glibc-2.29.ebuild index 4ac98457b485..98113f0210bf 100644 --- a/sys-libs/glibc/glibc-2.29.ebuild +++ b/sys-libs/glibc/glibc-2.29.ebuild @@ -35,7 +35,7 @@ PATCH_VER=1 SRC_URI+=" https://dev.gentoo.org/~dilfridge/distfiles/${P}-patches-${PATCH_VER}.tar.xz" SRC_URI+=" multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz )" -IUSE="audit caps cet compile-locales doc gd headers-only +multiarch multilib nscd profile selinux suid systemtap test vanilla" +IUSE="audit caps cet compile-locales doc gd headers-only +multiarch multilib nscd profile selinux +ssp suid systemtap test vanilla" # Minimum kernel version that glibc requires MIN_KERN_VER="3.2.0" @@ -814,7 +814,7 @@ glibc_do_configure() { myconf+=( --enable-stack-protector=no ) ;; *) - myconf+=( --enable-stack-protector=all ) + myconf+=( --enable-stack-protector=$(usex ssp all no) ) ;; esac myconf+=( --enable-stackguard-randomization ) diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild index 1dcf217a492e..417b38d30088 100644 --- a/sys-libs/glibc/glibc-9999.ebuild +++ b/sys-libs/glibc/glibc-9999.ebuild @@ -30,12 +30,12 @@ RELEASE_VER=${PV} GCC_BOOTSTRAP_VER=20180511 # Gentoo patchset -PATCH_VER=10 +PATCH_VER=11 -SRC_URI+=" https://dev.gentoo.org/~dilfridge/distfiles/${P}-patches-${PATCH_VER}.tar.xz" +SRC_URI+=" https://dev.gentoo.org/~slyfox/distfiles/${P}-patches-${PATCH_VER}.tar.xz" SRC_URI+=" multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz )" -IUSE="audit caps cet compile-locales doc gd headers-only +multiarch multilib nscd profile selinux suid systemtap test vanilla" +IUSE="audit caps cet compile-locales doc gd headers-only +multiarch multilib nscd profile selinux +ssp suid systemtap test vanilla" # Minimum kernel version that glibc requires MIN_KERN_VER="3.2.0" @@ -800,6 +800,11 @@ glibc_do_configure() { local myconf=() case ${CTARGET} in + m68k*) + # setjmp() is not compatible with stack protection: + # https://sourceware.org/PR24202 + myconf+=( --enable-stack-protector=no ) + ;; powerpc-*) # Currently gcc on powerpc32 generates invalid code for # __builtin_return_address(0) calls. Normally programs @@ -809,7 +814,7 @@ glibc_do_configure() { myconf+=( --enable-stack-protector=no ) ;; *) - myconf+=( --enable-stack-protector=all ) + myconf+=( --enable-stack-protector=$(usex ssp all no) ) ;; esac myconf+=( --enable-stackguard-randomization ) diff --git a/sys-libs/glibc/metadata.xml b/sys-libs/glibc/metadata.xml index be2851b82155..58d861be0305 100644 --- a/sys-libs/glibc/metadata.xml +++ b/sys-libs/glibc/metadata.xml @@ -6,15 +6,16 @@ Gentoo Toolchain Project + Enable Intel Control-flow Enforcement Technology (needs binutils 2.29 and gcc 8) build *all* locales in src_install; this is generally meant for stage building only as it ignores /etc/locale.gen file and can be pretty slow When USE=hardened, allow fortify/stack violations to dump core (SIGABRT) and not kill self (SIGKILL) build memusage and memusagestat tools enable optimizations for multiple CPU architectures (detected at runtime) Build, and enable support for, the Name Service Cache Daemon Enable obsolete RPC/NIS layers + protect stack of glibc internals Make internal pt_chown helper setuid -- not needed if using Linux and have /dev/pts mounted with gid=5 enable systemtap static probe points - Enable Intel Control-flow Enforcement Technology (needs binutils 2.29 and gcc 8) cpe:/a:gnu:glibc -- cgit v1.2.3