commit:     280e225b50f7ab21e84d112087784c5424ba00be
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 12 16:57:33 2017 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Aug 12 16:59:06 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=280e225b

sys-libs/glibc: update patchset, bug #627338, bug #592300

Two changes in the patchset:
- #627338: add 'files' fallback to nsswitch.conf entries
  as glibc-2.26 is deprecating 'compat' entries.
- #592300: make locale-get parallel by Tobias Klausmann

Bug: https://bugs.gentoo.org/627338
Bug: https://bugs.gentoo.org/592300
Package-Manager: Portage-2.3.6, Repoman-2.3.3

 sys-libs/glibc/Manifest                                 |  4 +++-
 .../glibc/{glibc-9999.ebuild => glibc-2.24-r4.ebuild}   | 17 ++++++++++++-----
 .../glibc/{glibc-9999.ebuild => glibc-2.25-r3.ebuild}   | 10 ++++++----
 sys-libs/glibc/glibc-9999.ebuild                        |  2 +-
 4 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index b40109725f4..36c8522f75e 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -15,7 +15,9 @@ DIST glibc-2.23-patches-7.tar.bz2 315221 SHA256 
97ef9e370ce9b09d8e9b9f6239f7ef94
 DIST glibc-2.23-patches-8.tar.bz2 304199 SHA256 
6110777176abfb8d287d82804d98e007c255db6040a1beca589a212772c90482 SHA512 
470814bbbd9d4ee5fa2dd7570a2e14b0229723e373e801472856fd6c2f089499eddc300f69b49af8ba0edbdca583ee3ca521fdb5c642509717cafea0ad925fd2
 WHIRLPOOL 
1ef9a431d67d7669f34f7db21185d50ddd6dc82c549a9ff274f0b98454417f4098ee771bfe10073be12d3c153ee46ff36e40b46ecb31844ab09791ae29b49074
 DIST glibc-2.23.tar.xz 13455260 SHA256 
94efeb00e4603c8546209cefb3e1a50a5315c86fa9b078b6fad758e187ce13e9 SHA512 
b82953388cd028e174cb08f082557bbce0dad8b67b17d31b29f90102fd52a51e03d591448ecb64882a1c1d5303afffc7f6ede85cee4c784a9284fbc9b4ad26cf
 WHIRLPOOL 
7c7e3bf55a89a04bac917b9ca5a1cbb1613f22c427d2766f114b5a36f9635856005b823852ef5d3b73462b577fe4e5865e68e7b64633d48a95fa1e5eaa831a71
 DIST glibc-2.24-patches-8.tar.bz2 71769 SHA256 
0a21549ed196c5c03efc37273fb991e199c585140d954dca61140c3d0c227af9 SHA512 
897c9d158f898edb355ee6478a7e0372a29e6c9d0b98cd80ccaa3ed4f0aab35e3b038217735f2a3b6007ff0cf27c7d6b27a84daaceca9361dce04bc5b2124ada
 WHIRLPOOL 
222b375249c5a3e53fd0116fadf9612c5e5479cd845dc3fcebb496dfe38d70d0e2c84517b79258c73afe2c1f5d15ecec768d33659c10fb15ae59b9061072987d
+DIST glibc-2.24-patches-9.tar.bz2 72888 SHA256 
7777196b584a282d8c64d6ba46e7729786cb3fc446c037421c03ae2dc79202dc SHA512 
1e9efae34e8f1da264e54a1217ab015e94b1f4a99b5bc5a2a15d645c68383d0b97f80b7b45d9aa9e48dfc31f9ad474af3226f7dad66b25a457ca4df2df17cee9
 WHIRLPOOL 
954798ee80821b71ebff709ae6ef1714bdcf5b15b7bbb512ca587e86167b88c6a683636c8c1e7244a6e21f8257487a1393e4f3f4041f2461c6e387cf2796a465
 DIST glibc-2.24.tar.xz 13554048 SHA256 
99d4a3e8efd144d71488e478f62587578c0f4e1fa0b4eed47ee3d4975ebeb5d3 SHA512 
a4cb28a2c51a0cc029ed69da7cba11931a615ba897235590b4f7fad2eaabec9042f8250eaac2a5860997437a69ab13304f10a634000e52c0336b5593b7969adb
 WHIRLPOOL 
be82b47fc73f7e780e8e73a5f58b313d8e861d5ea8c4320f95ef0d8c1e125ff011d61dcfc0380be0e83868bd8c3299de1ea662da7fc8d709050e89b2c126e3eb
 DIST glibc-2.25-patches-5.tar.bz2 44356 SHA256 
d9ea3908c8c4d561d22697d9830b4032cbbba46822613d5a3509d3b7e579c016 SHA512 
ad3acf760e6cd714fe5d6833b53d8759e09c74ca60fbfd173e87dbb2d1062a5006427ca17db0b6ce695dae03e2ace7dc30992ae9b08e94ae4350b19ea03acdcc
 WHIRLPOOL 
1fa660852f9e42fda956b4924351a532efdca88691cb2855c458e8bb9af1fc3cbdf2eb9c8ce93a7c57fa2d6a7e20b1c1a5c17d29b0d07f8e44e0ed8fdb7db8bc
+DIST glibc-2.25-patches-6.tar.bz2 45450 SHA256 
e0087cc67f48189a61370c4490ef2e7cee688cba41bd1881bec48b9c5107542a SHA512 
434bcc1f38ee27bfc849d6ed4f3bfa6b59644951e02688f9ad865b534f1033f16f70134d16687341743c15b5f701405e0fb1133c245e56e5e4927771c786bd25
 WHIRLPOOL 
f3f634a4a26cc283ed62feee0fe62fbc7b573a833e6920adc804874b8a69fcf6a1430e6f3c5a1ac5ea0ab4117e1cf061ff1c001ac041d99d0e3bee56c40cff77
 DIST glibc-2.25.tar.xz 13873900 SHA256 
067bd9bb3390e79aa45911537d13c3721f1d9d3769931a30c2681bfee66f23a0 SHA512 
5b7a2418d5b8a1b6a907c6c7fb6477ee2a473151cb45e03d0d4cdd9a33497c90b1ee39e2e7e885e2b25743dcd3747336ef114b4a73eb001da1fd79f29e0f9a6e
 WHIRLPOOL 
dc2fafaa4a0e5581268338453838a03ed0c5e7a2af844e8fb7086ab8d3ae48efbdbe6f25db1d089ae669cd2f8b0412f690d965506753d86f8525da2df59b7953
-DIST glibc-9999-patches-2.tar.bz2 19716 SHA256 
c146925e78244533fad6f0d65ec46201d688510847e217f4e6a57a8e9dba956a SHA512 
f701add79924e44621d926d484bb8cbf1d02a7556e3c92ee7dc0dffa4b19d5036c8acbe342e705d4bd140d20375e697c595ec69f4ff01a40f5891f22ddc1948a
 WHIRLPOOL 
23b794b53c274e7c384f267b2c808d330159f8f8354d438d69ebaa32a06b49f89504ca90927c3934179c7bc6ccba95fcac812be6bcf9b5c1092cb713d9b44517
+DIST glibc-9999-patches-3.tar.bz2 19892 SHA256 
97f60ed6debd495610b123d7a27227e75942bea1a0fb1e5f78833a6f3bbe6c64 SHA512 
75084b86a83d447d3a4b3959fa2a93d849e304ba9473ebec5570ca4fb5e2f8dfb38548faf3abc9fbd29b529f2c608b52eb2ef2e6e9a2ad5bea9a9298a19ef596
 WHIRLPOOL 
04a5c30aabf72530fa96fa3a8eadf8207d85d3a2a948ba5f4b72c0deeeae24e7eb71b99875f0e9b1018051fabb4a23630b41873fa4ff0d6ba9778ca6051212bf

diff --git a/sys-libs/glibc/glibc-9999.ebuild 
b/sys-libs/glibc/glibc-2.24-r4.ebuild
similarity index 89%
copy from sys-libs/glibc/glibc-9999.ebuild
copy to sys-libs/glibc/glibc-2.24-r4.ebuild
index 22438818e12..71ca5a1652c 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-2.24-r4.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="GNU libc6 (also called glibc2) C library"
 HOMEPAGE="https://www.gnu.org/software/libc/libc.html";
 
 LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
-#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"
 RESTRICT="strip" # strip ourself #46186
 EMULTILIB_PKG="true"
 
@@ -22,12 +22,12 @@ case ${PV} in
        inherit git-2
        ;;
 *)
+       RELEASE_VER=${PV}
        ;;
 esac
-RELEASE_VER=${PV}
 GCC_BOOTSTRAP_VER="4.7.3-r1"
 # patches live at 
https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo/src/patchsets/glibc/
-PATCH_VER="2"                                  # Gentoo patchset
+PATCH_VER="9"                                  # Gentoo patchset
 : ${NPTL_KERN_VER:="2.6.32"}                   # min kernel version nptl 
requires
 
 IUSE="audit caps debug gd hardened multilib nscd +rpc selinux systemtap 
profile suid vanilla crosscompile_opts_headers-only"
@@ -100,7 +100,7 @@ upstream_uris() {
        echo mirror://gnu/glibc/$1 
ftp://sourceware.org/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1
 }
 gentoo_uris() {
-       local devspace="HTTP~vapier/dist/URI HTTP~tamiko/distfiles/URI 
HTTP~dilfridge/distfiles/URI HTTP~slyfox/distfiles/URI"
+       local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI 
HTTP~tamiko/distfiles/URI HTTP~slyfox/distfiles/URI"
        devspace=${devspace//HTTP/https://dev.gentoo.org/}
        echo mirror://gentoo/$1 ${devspace//URI/$1}
 }
@@ -121,13 +121,15 @@ src_prepare() {
 
        cd "${S}"
 
+       epatch "${FILESDIR}"/2.19/${PN}-2.19-ia64-gcc-4.8-reloc-hack.patch 
#503838
+
        if use hardened ; then
                # We don't enable these for non-hardened as the output is very 
terse --
                # it only states that a crash happened.  The default upstream 
behavior
                # includes backtraces and symbols.
                einfo "Installing Hardened Gentoo SSP and FORTIFY_SOURCE 
handler"
                cp "${FILESDIR}"/2.20/glibc-2.20-gentoo-stack_chk_fail.c 
debug/stack_chk_fail.c || die
-               cp "${FILESDIR}"/2.25/glibc-2.25-gentoo-chk_fail.c 
debug/chk_fail.c || die
+               cp "${FILESDIR}"/2.20/glibc-2.20-gentoo-chk_fail.c 
debug/chk_fail.c || die
 
                if use debug ; then
                        # Allow SIGABRT to dump core on non-hardened systems, 
or when debug is requested.
@@ -136,6 +138,11 @@ src_prepare() {
                                -e '/^CFLAGS-backtrace.c/ iCPPFLAGS-chk_fail.c 
= -DSSP_SMASH_DUMPS_CORE' \
                                debug/Makefile || die
                fi
+
+               # Build various bits with ssp-all
+               sed -i \
+                       -e 's:-fstack-protector$:-fstack-protector-all:' \
+                       */Makefile || die
        fi
 
        case $(gcc-fullversion) in

diff --git a/sys-libs/glibc/glibc-9999.ebuild 
b/sys-libs/glibc/glibc-2.25-r3.ebuild
similarity index 92%
copy from sys-libs/glibc/glibc-9999.ebuild
copy to sys-libs/glibc/glibc-2.25-r3.ebuild
index 22438818e12..dc2fbd57eeb 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-2.25-r3.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="GNU libc6 (also called glibc2) C library"
 HOMEPAGE="https://www.gnu.org/software/libc/libc.html";
 
 LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
-#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"
 RESTRICT="strip" # strip ourself #46186
 EMULTILIB_PKG="true"
 
@@ -22,12 +22,12 @@ case ${PV} in
        inherit git-2
        ;;
 *)
+       RELEASE_VER=${PV}
        ;;
 esac
-RELEASE_VER=${PV}
 GCC_BOOTSTRAP_VER="4.7.3-r1"
 # patches live at 
https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo/src/patchsets/glibc/
-PATCH_VER="2"                                  # Gentoo patchset
+PATCH_VER="6"                                  # Gentoo patchset
 : ${NPTL_KERN_VER:="2.6.32"}                   # min kernel version nptl 
requires
 
 IUSE="audit caps debug gd hardened multilib nscd +rpc selinux systemtap 
profile suid vanilla crosscompile_opts_headers-only"
@@ -100,7 +100,7 @@ upstream_uris() {
        echo mirror://gnu/glibc/$1 
ftp://sourceware.org/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1
 }
 gentoo_uris() {
-       local devspace="HTTP~vapier/dist/URI HTTP~tamiko/distfiles/URI 
HTTP~dilfridge/distfiles/URI HTTP~slyfox/distfiles/URI"
+       local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI 
HTTP~tamiko/distfiles/URI HTTP~slyfox/distfiles/URI"
        devspace=${devspace//HTTP/https://dev.gentoo.org/}
        echo mirror://gentoo/$1 ${devspace//URI/$1}
 }
@@ -121,6 +121,8 @@ src_prepare() {
 
        cd "${S}"
 
+       epatch "${FILESDIR}"/2.19/${PN}-2.19-ia64-gcc-4.8-reloc-hack.patch 
#503838
+
        if use hardened ; then
                # We don't enable these for non-hardened as the output is very 
terse --
                # it only states that a crash happened.  The default upstream 
behavior

diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index 22438818e12..d6755ad94b2 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -27,7 +27,7 @@ esac
 RELEASE_VER=${PV}
 GCC_BOOTSTRAP_VER="4.7.3-r1"
 # patches live at 
https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo/src/patchsets/glibc/
-PATCH_VER="2"                                  # Gentoo patchset
+PATCH_VER="3"                                  # Gentoo patchset
 : ${NPTL_KERN_VER:="2.6.32"}                   # min kernel version nptl 
requires
 
 IUSE="audit caps debug gd hardened multilib nscd +rpc selinux systemtap 
profile suid vanilla crosscompile_opts_headers-only"

Reply via email to