1 |
commit: be27313d300d7e9ccc87654551edc7398a474f1b |
2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Apr 28 21:23:20 2018 +0000 |
4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Apr 28 21:23:48 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be27313d |
7 |
|
8 |
sys-libs/glibc: Drop vulnerable version, bug 646492 |
9 |
|
10 |
This removes last stable on m68k, sh, s390 (we're way |
11 |
beyond any timeout there). |
12 |
|
13 |
Bug: https://bugs.gentoo.org/646492 |
14 |
Package-Manager: Portage-2.3.31, Repoman-2.3.9 |
15 |
|
16 |
sys-libs/glibc/Manifest | 1 - |
17 |
sys-libs/glibc/glibc-2.25-r10.ebuild | 153 ----------------------------------- |
18 |
2 files changed, 154 deletions(-) |
19 |
|
20 |
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest |
21 |
index b55476e954c..71fdce7bee9 100644 |
22 |
--- a/sys-libs/glibc/Manifest |
23 |
+++ b/sys-libs/glibc/Manifest |
24 |
@@ -14,7 +14,6 @@ DIST glibc-2.23-patches-8.tar.bz2 304199 BLAKE2B 693e40090dbe43f0e9c1faa0bce75e4 |
25 |
DIST glibc-2.23.tar.xz 13455260 BLAKE2B 6658e9d2d07c5cd71be94ef399bfe4d18ef462e4154e2e02aa69c34198e881cc65ac8f89abcb37b3d01c56b10e2f47c036492c20e4991a54bd03e56db703fbd2 SHA512 b82953388cd028e174cb08f082557bbce0dad8b67b17d31b29f90102fd52a51e03d591448ecb64882a1c1d5303afffc7f6ede85cee4c784a9284fbc9b4ad26cf |
26 |
DIST glibc-2.24-patches-10.tar.bz2 73586 BLAKE2B f42cc78b907e7cb5c8ba1672c845cdc0959f4d29f89ff642bd2efa795d7ac69409b514338ac1f4235ce2fbc0c9c9bb2d152f55fd14c02997517dc048a306e1c1 SHA512 fc9191a85da53a2515bbaab228648936682e04267284049468e0c82284f618ab2907b9247baca701e16edc50640199ff6d8e2a6a93ccbd5a9d3b0eb73cc484ca |
27 |
DIST glibc-2.24.tar.xz 13554048 BLAKE2B 9f93ac00f68eb88e3a2272752624163fac25dd064170e336143aa697908fba2b27ed926582f978da99c6c2489c0ce34d3eb266b5d00be69d27b36126bc2c8efb SHA512 a4cb28a2c51a0cc029ed69da7cba11931a615ba897235590b4f7fad2eaabec9042f8250eaac2a5860997437a69ab13304f10a634000e52c0336b5593b7969adb |
28 |
-DIST glibc-2.25-patches-13.tar.bz2 71481 BLAKE2B bf5691afabf03b579b8d634da30a2a967ab62d5e470a23b0946ff3354aa974b3b65821aca2f33dd30dd864a82459f4750178bf6ae01a5117ccfde62efd8f594e SHA512 7c80e4aba9edf0310e1707b03a6945f657d71267a4d0d67c24b979c841544a6a623d7c2dbb0a0d55863e25831439d717d096ecf377f936b731baeb04f21704a7 |
29 |
DIST glibc-2.25-patches-15.tar.bz2 78320 BLAKE2B 70c62cc10db13e2844de4d8a18972e0f4d01ba52fbd40db57c11d7b1c2c0d571b894f01e762bb26632fd696a77c299ef0766e2f129d2eda896f58325a754a13c SHA512 7204218ea82b677e0f278c4752ddb90aa0c08ac2349d061de81ec91dac204b0f10fe223d7b1055b9e0c21dac97c835f913a90c0168a5000d3be00dd20027c185 |
30 |
DIST glibc-2.25.tar.xz 13873900 BLAKE2B 73ef792fff059f6ad154c9af2155ea15b7869ec1b93e557b6c58129bfb50f863c06f8b49425d75fd2df537dd9c4a68bad790cff770c50a6889732d66f507d349 SHA512 5b7a2418d5b8a1b6a907c6c7fb6477ee2a473151cb45e03d0d4cdd9a33497c90b1ee39e2e7e885e2b25743dcd3747336ef114b4a73eb001da1fd79f29e0f9a6e |
31 |
DIST glibc-2.26-patches-7.tar.bz2 413976 BLAKE2B 18263201cf33abf911eb7b802ed539b217391156f897a8db50f65a69627d8f8cceded78414168986ee98eba038364a6b2f3599b23f95e7b0ad2643481c399718 SHA512 0c812a343fcc68c10d92117cb2a0cf1c255470e81f0a7a04d6db2fe35445e410ef37f15162f145c2eb772b08ab55af246f5b52f5e57c2e91038181f6f027abc3 |
32 |
|
33 |
diff --git a/sys-libs/glibc/glibc-2.25-r10.ebuild b/sys-libs/glibc/glibc-2.25-r10.ebuild |
34 |
deleted file mode 100644 |
35 |
index 0a26791252c..00000000000 |
36 |
--- a/sys-libs/glibc/glibc-2.25-r10.ebuild |
37 |
+++ /dev/null |
38 |
@@ -1,153 +0,0 @@ |
39 |
-# Copyright 1999-2018 Gentoo Foundation |
40 |
-# Distributed under the terms of the GNU General Public License v2 |
41 |
- |
42 |
-EAPI="5" |
43 |
- |
44 |
-inherit toolchain-glibc |
45 |
- |
46 |
-DESCRIPTION="GNU libc6 (also called glibc2) C library" |
47 |
-HOMEPAGE="https://www.gnu.org/software/libc/libc.html" |
48 |
- |
49 |
-LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE" |
50 |
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" |
51 |
-RESTRICT="strip" # strip ourself #46186 |
52 |
-EMULTILIB_PKG="true" |
53 |
- |
54 |
-# Configuration variables |
55 |
-RELEASE_VER="" |
56 |
-case ${PV} in |
57 |
-9999*) |
58 |
- EGIT_REPO_URIS="git://sourceware.org/git/glibc.git" |
59 |
- EGIT_SOURCEDIRS="${S}" |
60 |
- inherit git-2 |
61 |
- ;; |
62 |
-*) |
63 |
- RELEASE_VER=${PV} |
64 |
- ;; |
65 |
-esac |
66 |
-GCC_BOOTSTRAP_VER="4.7.3-r1" |
67 |
-# patches live at https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo/src/patchsets/glibc/ |
68 |
-PATCH_VER="13" # Gentoo patchset |
69 |
-: ${NPTL_KERN_VER:="2.6.32"} # min kernel version nptl requires |
70 |
- |
71 |
-GLIBC_PATCH_EXCLUDE+=" 0005_all_sys-types.h-drop-sys-sysmacros.h-include.patch" |
72 |
- |
73 |
-IUSE="audit caps debug gd hardened multilib nscd +rpc selinux systemtap profile suid vanilla headers-only" |
74 |
- |
75 |
-# Here's how the cross-compile logic breaks down ... |
76 |
-# CTARGET - machine that will target the binaries |
77 |
-# CHOST - machine that will host the binaries |
78 |
-# CBUILD - machine that will build the binaries |
79 |
-# If CTARGET != CHOST, it means you want a libc for cross-compiling. |
80 |
-# If CHOST != CBUILD, it means you want to cross-compile the libc. |
81 |
-# CBUILD = CHOST = CTARGET - native build/install |
82 |
-# CBUILD != (CHOST = CTARGET) - cross-compile a native build |
83 |
-# (CBUILD = CHOST) != CTARGET - libc for cross-compiler |
84 |
-# CBUILD != CHOST != CTARGET - cross-compile a libc for a cross-compiler |
85 |
-# For install paths: |
86 |
-# CHOST = CTARGET - install into / |
87 |
-# CHOST != CTARGET - install into /usr/CTARGET/ |
88 |
- |
89 |
-export CBUILD=${CBUILD:-${CHOST}} |
90 |
-export CTARGET=${CTARGET:-${CHOST}} |
91 |
-if [[ ${CTARGET} == ${CHOST} ]] ; then |
92 |
- if [[ ${CATEGORY} == cross-* ]] ; then |
93 |
- export CTARGET=${CATEGORY#cross-} |
94 |
- fi |
95 |
-fi |
96 |
- |
97 |
-is_crosscompile() { |
98 |
- [[ ${CHOST} != ${CTARGET} ]] |
99 |
-} |
100 |
- |
101 |
-# Why SLOT 2.2 you ask yourself while sippin your tea ? |
102 |
-# Everyone knows 2.2 > 0, duh. |
103 |
-SLOT="2.2" |
104 |
- |
105 |
-# General: We need a new-enough binutils/gcc to match upstream baseline. |
106 |
-# arch: we need to make sure our binutils/gcc supports TLS. |
107 |
-COMMON_DEPEND=" |
108 |
- nscd? ( selinux? ( |
109 |
- audit? ( sys-process/audit ) |
110 |
- caps? ( sys-libs/libcap ) |
111 |
- ) ) |
112 |
- suid? ( caps? ( sys-libs/libcap ) ) |
113 |
- selinux? ( sys-libs/libselinux ) |
114 |
- systemtap? ( dev-util/systemtap ) |
115 |
-" |
116 |
-DEPEND="${COMMON_DEPEND} |
117 |
- >=app-misc/pax-utils-0.1.10 |
118 |
- !<sys-apps/sandbox-1.6 |
119 |
- !<sys-apps/portage-2.1.2" |
120 |
-RDEPEND="${COMMON_DEPEND} |
121 |
- !sys-kernel/ps3-sources |
122 |
- sys-apps/gentoo-functions |
123 |
- !sys-libs/nss-db" |
124 |
- |
125 |
-if [[ ${CATEGORY} == cross-* ]] ; then |
126 |
- DEPEND+=" !headers-only? ( |
127 |
- >=${CATEGORY}/binutils-2.24 |
128 |
- >=${CATEGORY}/gcc-4.7 |
129 |
- )" |
130 |
- [[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers" |
131 |
-else |
132 |
- DEPEND+=" |
133 |
- >=sys-devel/binutils-2.24 |
134 |
- >=sys-devel/gcc-4.7 |
135 |
- virtual/os-headers" |
136 |
- RDEPEND+=" vanilla? ( !sys-libs/timezone-data )" |
137 |
- PDEPEND+=" !vanilla? ( sys-libs/timezone-data )" |
138 |
-fi |
139 |
- |
140 |
-upstream_uris() { |
141 |
- echo mirror://gnu/glibc/$1 ftp://sourceware.org/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1 |
142 |
-} |
143 |
-gentoo_uris() { |
144 |
- local devspace="HTTP~vapier/dist/URI HTTP~dilfridge/distfiles/URI HTTP~tamiko/distfiles/URI HTTP~slyfox/distfiles/URI" |
145 |
- devspace=${devspace//HTTP/https://dev.gentoo.org/} |
146 |
- echo mirror://gentoo/$1 ${devspace//URI/$1} |
147 |
-} |
148 |
-SRC_URI=$( |
149 |
- [[ -z ${EGIT_REPO_URIS} ]] && upstream_uris ${P}.tar.xz |
150 |
- [[ -n ${PATCH_VER} ]] && gentoo_uris ${P}-patches-${PATCH_VER}.tar.bz2 |
151 |
-) |
152 |
-SRC_URI+=" ${GCC_BOOTSTRAP_VER:+multilib? ( $(gentoo_uris gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2) )}" |
153 |
- |
154 |
-src_unpack() { |
155 |
- [[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib && unpack gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2 |
156 |
- |
157 |
- toolchain-glibc_src_unpack |
158 |
-} |
159 |
- |
160 |
-src_prepare() { |
161 |
- toolchain-glibc_src_prepare |
162 |
- |
163 |
- cd "${S}" |
164 |
- |
165 |
- epatch "${FILESDIR}"/2.19/${PN}-2.19-ia64-gcc-4.8-reloc-hack.patch #503838 |
166 |
- |
167 |
- if use hardened ; then |
168 |
- # We don't enable these for non-hardened as the output is very terse -- |
169 |
- # it only states that a crash happened. The default upstream behavior |
170 |
- # includes backtraces and symbols. |
171 |
- einfo "Installing Hardened Gentoo SSP and FORTIFY_SOURCE handler" |
172 |
- cp "${FILESDIR}"/2.20/glibc-2.20-gentoo-stack_chk_fail.c debug/stack_chk_fail.c || die |
173 |
- cp "${FILESDIR}"/2.25/glibc-2.25-gentoo-chk_fail.c debug/chk_fail.c || die |
174 |
- |
175 |
- if use debug ; then |
176 |
- # Allow SIGABRT to dump core on non-hardened systems, or when debug is requested. |
177 |
- sed -i \ |
178 |
- -e '/^CFLAGS-backtrace.c/ iCPPFLAGS-stack_chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \ |
179 |
- -e '/^CFLAGS-backtrace.c/ iCPPFLAGS-chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \ |
180 |
- debug/Makefile || die |
181 |
- fi |
182 |
- fi |
183 |
- |
184 |
- case $(gcc-fullversion) in |
185 |
- 4.8.[0-3]|4.9.0) |
186 |
- eerror "You need to switch to a newer compiler; gcc-4.8.[0-3] and gcc-4.9.0 miscompile" |
187 |
- eerror "glibc. See https://bugs.gentoo.org/547420 for details." |
188 |
- die "need to switch compilers #547420" |
189 |
- ;; |
190 |
- esac |
191 |
-} |