1 |
vapier 12/12/25 21:48:13 |
2 |
|
3 |
Modified: glibc-9999.ebuild ChangeLog |
4 |
Added: glibc-2.17.ebuild |
5 |
Log: |
6 |
Version bump. |
7 |
|
8 |
(Portage version: 2.2.0_alpha144/cvs/Linux x86_64, signed Manifest commit with key FB7C4156) |
9 |
|
10 |
Revision Changes Path |
11 |
1.17 sys-libs/glibc/glibc-9999.ebuild |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/glibc-9999.ebuild?rev=1.17&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/glibc-9999.ebuild?rev=1.17&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/glibc-9999.ebuild?r1=1.16&r2=1.17 |
16 |
|
17 |
Index: glibc-9999.ebuild |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-9999.ebuild,v |
20 |
retrieving revision 1.16 |
21 |
retrieving revision 1.17 |
22 |
diff -u -r1.16 -r1.17 |
23 |
--- glibc-9999.ebuild 2 Nov 2012 18:25:11 -0000 1.16 |
24 |
+++ glibc-9999.ebuild 25 Dec 2012 21:48:13 -0000 1.17 |
25 |
@@ -1,6 +1,6 @@ |
26 |
# Copyright 1999-2012 Gentoo Foundation |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-9999.ebuild,v 1.16 2012/11/02 18:25:11 vapier Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-9999.ebuild,v 1.17 2012/12/25 21:48:13 vapier Exp $ |
30 |
|
31 |
inherit eutils versionator toolchain-funcs flag-o-matic gnuconfig multilib unpacker multiprocessing |
32 |
|
33 |
@@ -8,7 +8,7 @@ |
34 |
HOMEPAGE="http://www.gnu.org/software/libc/libc.html" |
35 |
|
36 |
LICENSE="LGPL-2" |
37 |
-#KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" |
38 |
+#KEYWORDS="~alpha ~amd64 ~arm -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" |
39 |
RESTRICT="strip" # strip ourself #46186 |
40 |
EMULTILIB_PKG="true" |
41 |
|
42 |
@@ -155,7 +155,7 @@ |
43 |
if use hardened ; then |
44 |
cd "${S}" |
45 |
einfo "Patching to get working PIE binaries on PIE (hardened) platforms" |
46 |
- gcc-specs-pie && epatch "${FILESDIR}"/2.12/glibc-2.12-hardened-pie.patch |
47 |
+ gcc-specs-pie && epatch "${FILESDIR}"/2.16/glibc-2.16-hardened-pie.patch |
48 |
epatch "${FILESDIR}"/2.10/glibc-2.10-hardened-configure-picdefault.patch |
49 |
epatch "${FILESDIR}"/2.10/glibc-2.10-hardened-inittls-nosysenter.patch |
50 |
|
51 |
|
52 |
|
53 |
|
54 |
1.910 sys-libs/glibc/ChangeLog |
55 |
|
56 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/ChangeLog?rev=1.910&view=markup |
57 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/ChangeLog?rev=1.910&content-type=text/plain |
58 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/ChangeLog?r1=1.909&r2=1.910 |
59 |
|
60 |
Index: ChangeLog |
61 |
=================================================================== |
62 |
RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v |
63 |
retrieving revision 1.909 |
64 |
retrieving revision 1.910 |
65 |
diff -u -r1.909 -r1.910 |
66 |
--- ChangeLog 25 Dec 2012 20:08:40 -0000 1.909 |
67 |
+++ ChangeLog 25 Dec 2012 21:48:13 -0000 1.910 |
68 |
@@ -1,5 +1,11 @@ |
69 |
# ChangeLog for sys-libs/glibc |
70 |
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.909 2012/12/25 20:08:40 vapier Exp $ |
71 |
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.910 2012/12/25 21:48:13 vapier Exp $ |
72 |
+ |
73 |
+*glibc-2.17 (25 Dec 2012) |
74 |
+ |
75 |
+ 25 Dec 2012; Mike Frysinger <vapier@g.o> +glibc-2.17.ebuild, |
76 |
+ glibc-9999.ebuild: |
77 |
+ Version bump. |
78 |
|
79 |
25 Dec 2012; Mike Frysinger <vapier@g.o> |
80 |
files/eblits/src_compile.eblit: |
81 |
|
82 |
|
83 |
|
84 |
1.1 sys-libs/glibc/glibc-2.17.ebuild |
85 |
|
86 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/glibc-2.17.ebuild?rev=1.1&view=markup |
87 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/glibc-2.17.ebuild?rev=1.1&content-type=text/plain |
88 |
|
89 |
Index: glibc-2.17.ebuild |
90 |
=================================================================== |
91 |
# Copyright 1999-2012 Gentoo Foundation |
92 |
# Distributed under the terms of the GNU General Public License v2 |
93 |
# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.17.ebuild,v 1.1 2012/12/25 21:48:13 vapier Exp $ |
94 |
|
95 |
inherit eutils versionator toolchain-funcs flag-o-matic gnuconfig multilib unpacker multiprocessing |
96 |
|
97 |
DESCRIPTION="GNU libc6 (also called glibc2) C library" |
98 |
HOMEPAGE="http://www.gnu.org/software/libc/libc.html" |
99 |
|
100 |
LICENSE="LGPL-2" |
101 |
#KEYWORDS="~alpha ~amd64 ~arm -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" |
102 |
RESTRICT="strip" # strip ourself #46186 |
103 |
EMULTILIB_PKG="true" |
104 |
|
105 |
# Configuration variables |
106 |
RELEASE_VER="" |
107 |
case ${PV} in |
108 |
9999*) |
109 |
EGIT_REPO_URIS="git://sourceware.org/git/glibc.git" |
110 |
EGIT_SOURCEDIRS="${S}" |
111 |
inherit git-2 |
112 |
;; |
113 |
*) |
114 |
RELEASE_VER=${PV} |
115 |
;; |
116 |
esac |
117 |
PATCH_VER="1" # Gentoo patchset |
118 |
NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.16"} # min kernel version nptl requires |
119 |
|
120 |
IUSE="debug gd hardened multilib selinux systemtap profile vanilla crosscompile_opts_headers-only" |
121 |
|
122 |
# Here's how the cross-compile logic breaks down ... |
123 |
# CTARGET - machine that will target the binaries |
124 |
# CHOST - machine that will host the binaries |
125 |
# CBUILD - machine that will build the binaries |
126 |
# If CTARGET != CHOST, it means you want a libc for cross-compiling. |
127 |
# If CHOST != CBUILD, it means you want to cross-compile the libc. |
128 |
# CBUILD = CHOST = CTARGET - native build/install |
129 |
# CBUILD != (CHOST = CTARGET) - cross-compile a native build |
130 |
# (CBUILD = CHOST) != CTARGET - libc for cross-compiler |
131 |
# CBUILD != CHOST != CTARGET - cross-compile a libc for a cross-compiler |
132 |
# For install paths: |
133 |
# CHOST = CTARGET - install into / |
134 |
# CHOST != CTARGET - install into /usr/CTARGET/ |
135 |
|
136 |
export CBUILD=${CBUILD:-${CHOST}} |
137 |
export CTARGET=${CTARGET:-${CHOST}} |
138 |
if [[ ${CTARGET} == ${CHOST} ]] ; then |
139 |
if [[ ${CATEGORY} == cross-* ]] ; then |
140 |
export CTARGET=${CATEGORY#cross-} |
141 |
fi |
142 |
fi |
143 |
|
144 |
[[ ${CTARGET} == hppa* ]] && NPTL_KERN_VER=${NPTL_KERN_VER/2.6.16/2.6.20} |
145 |
|
146 |
is_crosscompile() { |
147 |
[[ ${CHOST} != ${CTARGET} ]] |
148 |
} |
149 |
|
150 |
# Why SLOT 2.2 you ask yourself while sippin your tea ? |
151 |
# Everyone knows 2.2 > 0, duh. |
152 |
SLOT="2.2" |
153 |
|
154 |
# General: We need a new-enough binutils/gcc to match upstream baseline. |
155 |
# arch: we need to make sure our binutils/gcc supports TLS. |
156 |
DEPEND=">=app-misc/pax-utils-0.1.10 |
157 |
!<sys-apps/sandbox-1.6 |
158 |
!<sys-apps/portage-2.1.2 |
159 |
selinux? ( sys-libs/libselinux )" |
160 |
RDEPEND="!sys-kernel/ps3-sources |
161 |
selinux? ( sys-libs/libselinux ) |
162 |
!sys-libs/nss-db" |
163 |
|
164 |
if [[ ${CATEGORY} == cross-* ]] ; then |
165 |
DEPEND+=" !crosscompile_opts_headers-only? ( |
166 |
>=${CATEGORY}/binutils-2.20 |
167 |
>=${CATEGORY}/gcc-4.3 |
168 |
)" |
169 |
[[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers" |
170 |
else |
171 |
DEPEND+=" |
172 |
>=sys-devel/binutils-2.20 |
173 |
>=sys-devel/gcc-4.3 |
174 |
virtual/os-headers |
175 |
!vanilla? ( >=sys-libs/timezone-data-2012c )" |
176 |
RDEPEND+=" |
177 |
vanilla? ( !sys-libs/timezone-data ) |
178 |
!vanilla? ( sys-libs/timezone-data )" |
179 |
fi |
180 |
|
181 |
SRC_URI=$( |
182 |
upstream_uris() { |
183 |
echo mirror://gnu/glibc/$1 ftp://sources.redhat.com/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1 |
184 |
} |
185 |
gentoo_uris() { |
186 |
local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI" |
187 |
devspace=${devspace//HTTP/http://dev.gentoo.org/} |
188 |
echo mirror://gentoo/$1 ${devspace//URI/$1} |
189 |
} |
190 |
|
191 |
[[ -z ${EGIT_REPO_URIS} ]] && upstream_uris ${P}.tar.xz |
192 |
[[ -n ${PATCH_VER} ]] && gentoo_uris ${P}-patches-${PATCH_VER}.tar.bz2 |
193 |
) |
194 |
|
195 |
# eblit-include [--skip] <function> [version] |
196 |
eblit-include() { |
197 |
local skipable=false |
198 |
[[ $1 == "--skip" ]] && skipable=true && shift |
199 |
[[ $1 == pkg_* ]] && skipable=true |
200 |
|
201 |
local e v func=$1 ver=$2 |
202 |
[[ -z ${func} ]] && die "Usage: eblit-include <function> [version]" |
203 |
for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do |
204 |
e="${FILESDIR}/eblits/${func}${v}.eblit" |
205 |
if [[ -e ${e} ]] ; then |
206 |
source "${e}" |
207 |
return 0 |
208 |
fi |
209 |
done |
210 |
${skipable} && return 0 |
211 |
die "Could not locate requested eblit '${func}' in ${FILESDIR}/eblits/" |
212 |
} |
213 |
|
214 |
# eblit-run-maybe <function> |
215 |
# run the specified function if it is defined |
216 |
eblit-run-maybe() { |
217 |
[[ $(type -t "$@") == "function" ]] && "$@" |
218 |
} |
219 |
|
220 |
# eblit-run <function> [version] |
221 |
# aka: src_unpack() { eblit-run src_unpack ; } |
222 |
eblit-run() { |
223 |
eblit-include --skip common "${*:2}" |
224 |
eblit-include "$@" |
225 |
eblit-run-maybe eblit-$1-pre |
226 |
eblit-${PN}-$1 |
227 |
eblit-run-maybe eblit-$1-post |
228 |
} |
229 |
|
230 |
src_unpack() { eblit-run src_unpack ; } |
231 |
src_compile() { eblit-run src_compile ; } |
232 |
src_test() { eblit-run src_test ; } |
233 |
src_install() { eblit-run src_install ; } |
234 |
|
235 |
# FILESDIR might not be available during binpkg install |
236 |
for x in setup {pre,post}inst ; do |
237 |
e="${FILESDIR}/eblits/pkg_${x}.eblit" |
238 |
if [[ -e ${e} ]] ; then |
239 |
. "${e}" |
240 |
eval "pkg_${x}() { eblit-run pkg_${x} ; }" |
241 |
fi |
242 |
done |
243 |
|
244 |
eblit-src_unpack-post() { |
245 |
if use hardened ; then |
246 |
cd "${S}" |
247 |
einfo "Patching to get working PIE binaries on PIE (hardened) platforms" |
248 |
gcc-specs-pie && epatch "${FILESDIR}"/2.16/glibc-2.16-hardened-pie.patch |
249 |
epatch "${FILESDIR}"/2.10/glibc-2.10-hardened-configure-picdefault.patch |
250 |
epatch "${FILESDIR}"/2.10/glibc-2.10-hardened-inittls-nosysenter.patch |
251 |
|
252 |
einfo "Installing Hardened Gentoo SSP and FORTIFY_SOURCE handler" |
253 |
cp -f "${FILESDIR}"/2.6/glibc-2.6-gentoo-stack_chk_fail.c \ |
254 |
debug/stack_chk_fail.c || die |
255 |
cp -f "${FILESDIR}"/2.10/glibc-2.10-gentoo-chk_fail.c \ |
256 |
debug/chk_fail.c || die |
257 |
|
258 |
if use debug ; then |
259 |
# When using Hardened Gentoo stack handler, have smashes dump core for |
260 |
# analysis - debug only, as core could be an information leak |
261 |
# (paranoia). |
262 |
sed -i \ |
263 |
-e '/^CFLAGS-backtrace.c/ iCFLAGS-stack_chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \ |
264 |
debug/Makefile \ |
265 |
|| die "Failed to modify debug/Makefile for debug stack handler" |
266 |
sed -i \ |
267 |
-e '/^CFLAGS-backtrace.c/ iCFLAGS-chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \ |
268 |
debug/Makefile \ |
269 |
|| die "Failed to modify debug/Makefile for debug fortify handler" |
270 |
fi |
271 |
|
272 |
# Build nscd with ssp-all |
273 |
sed -i \ |
274 |
-e 's:-fstack-protector$:-fstack-protector-all:' \ |
275 |
nscd/Makefile \ |
276 |
|| die "Failed to ensure nscd builds with ssp-all" |
277 |
fi |
278 |
} |
279 |
|
280 |
eblit-pkg_preinst-post() { |
281 |
if [[ ${CTARGET} == arm* ]] ; then |
282 |
# Backwards compat support for renaming hardfp ldsos #417287 |
283 |
local oldso='/lib/ld-linux.so.3' |
284 |
local nldso='/lib/ld-linux-armhf.so.3' |
285 |
if [[ -e ${D}${nldso} ]] ; then |
286 |
if scanelf -qRyi "${ROOT}$(alt_prefix)"/*bin/ | grep -s "^${oldso}" ; then |
287 |
ewarn "Symlinking old ldso (${oldso}) to new ldso (${nldso})." |
288 |
ewarn "Please rebuild all packages using this old ldso as compat" |
289 |
ewarn "support will be dropped in the future." |
290 |
ln -s "${nldso##*/}" "${D}$(alt_prefix)${oldso}" |
291 |
fi |
292 |
fi |
293 |
fi |
294 |
} |