* [gentoo-commits] gentoo-x86 commit in sys-libs/glibc/files/eblits: pkg_setup.eblit
@ 2014-06-14 22:19 Mike Frysinger (vapier)
0 siblings, 0 replies; 7+ messages in thread
From: Mike Frysinger (vapier) @ 2014-06-14 22:19 UTC (permalink / raw
To: gentoo-commits
vapier 14/06/14 22:19:10
Modified: pkg_setup.eblit
Log:
Check MERGE_TYPE when doing downgrade check #255109 by Phil White.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path
1.12 sys-libs/glibc/files/eblits/pkg_setup.eblit
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit?r1=1.11&r2=1.12
Index: pkg_setup.eblit
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- pkg_setup.eblit 29 Jun 2013 03:22:32 -0000 1.11
+++ pkg_setup.eblit 14 Jun 2014 22:19:10 -0000 1.12
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit,v 1.11 2013/06/29 03:22:32 heroxbd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit,v 1.12 2014/06/14 22:19:10 vapier Exp $
glibc_compile_test() {
local ret save_cflags=${CFLAGS}
@@ -48,7 +48,10 @@
eblit-glibc-pkg_setup() {
# prevent native builds from downgrading ... maybe update to allow people
# to change between diff -r versions ? (2.3.6-r4 -> 2.3.6-r2)
- if [[ ${ROOT} == "/" ]] && [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
+ if [[ ${MERGE_TYPE} != "buildonly" ]] && \
+ [[ ${ROOT} == "/" ]] && \
+ [[ ${CBUILD} == ${CHOST} ]] && \
+ [[ ${CHOST} == ${CTARGET} ]] ; then
if has_version '>'${CATEGORY}/${PF} ; then
eerror "Sanity check to keep you from breaking your system:"
eerror " Downgrading glibc is not supported and a sure way to destruction"
^ permalink raw reply [flat|nested] 7+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-libs/glibc/files/eblits: pkg_setup.eblit
@ 2011-12-14 16:42 Mike Frysinger (vapier)
0 siblings, 0 replies; 7+ messages in thread
From: Mike Frysinger (vapier) @ 2011-12-14 16:42 UTC (permalink / raw
To: gentoo-commits
vapier 11/12/14 16:42:46
Modified: pkg_setup.eblit
Log:
Also filter out glibc binaries when looking for __guard #394453#5 by Michael Haubenwallner.
(Portage version: 2.2.0_alpha79/cvs/Linux x86_64)
Revision Changes Path
1.10 sys-libs/glibc/files/eblits/pkg_setup.eblit
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit?r1=1.9&r2=1.10
Index: pkg_setup.eblit
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- pkg_setup.eblit 12 Dec 2011 23:22:33 -0000 1.9
+++ pkg_setup.eblit 14 Dec 2011 16:42:46 -0000 1.10
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit,v 1.9 2011/12/12 23:22:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit,v 1.10 2011/12/14 16:42:46 vapier Exp $
glibc_compile_test() {
local ret save_cflags=${CFLAGS}
@@ -107,9 +107,9 @@
"${ROOT}"/lib* \
"${ROOT}"/usr/*bin/ \
"${ROOT}"/usr/lib* | \
- grep -v \
- -e "^${ROOT}/lib.*/libc-2.*.so$" \
- -e "^${ROOT}/lib.*/ld-2.*.so$"
+ egrep -v \
+ -e "^${ROOT}/lib.*/(libc|ld)-2.*.so$" \
+ -e "^${ROOT}/sbin/(ldconfig|sln)$"
)
[[ -z ${files} ]]
if ! eend $? ; then
^ permalink raw reply [flat|nested] 7+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-libs/glibc/files/eblits: pkg_setup.eblit
@ 2011-12-12 23:22 Mike Frysinger (vapier)
0 siblings, 0 replies; 7+ messages in thread
From: Mike Frysinger (vapier) @ 2011-12-12 23:22 UTC (permalink / raw
To: gentoo-commits
vapier 11/12/12 23:22:33
Modified: pkg_setup.eblit
Log:
Reduce the scope of the __guard checking, and filter out more files w/ROOT #394453#3 by Andrea Zuccherelli.
(Portage version: 2.2.0_alpha79/cvs/Linux x86_64)
Revision Changes Path
1.9 sys-libs/glibc/files/eblits/pkg_setup.eblit
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit?r1=1.8&r2=1.9
Index: pkg_setup.eblit
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- pkg_setup.eblit 12 Dec 2011 17:47:28 -0000 1.8
+++ pkg_setup.eblit 12 Dec 2011 23:22:33 -0000 1.9
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit,v 1.8 2011/12/12 17:47:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit,v 1.9 2011/12/12 23:22:33 vapier Exp $
glibc_compile_test() {
local ret save_cflags=${CFLAGS}
@@ -97,7 +97,9 @@
ewarn "PIE hardening not applied, as your compiler doesn't default to PIE"
# Make sure host system is up to date #394453
- if has_version '<sys-libs/glibc-2.15' ; then
+ if has_version '<sys-libs/glibc-2.13' && \
+ [[ -n $(scanelf -qys__guard -F'#s%F' "${ROOT}"/lib*/l*-*.so) ]]
+ then
ebegin "Scanning system for __guard to see if you need to rebuild first ..."
local files=$(
scanelf -qys__guard -F'#s%F' \
@@ -105,7 +107,9 @@
"${ROOT}"/lib* \
"${ROOT}"/usr/*bin/ \
"${ROOT}"/usr/lib* | \
- grep -v '^/lib.*/libc-2.*.so$'
+ grep -v \
+ -e "^${ROOT}/lib.*/libc-2.*.so$" \
+ -e "^${ROOT}/lib.*/ld-2.*.so$"
)
[[ -z ${files} ]]
if ! eend $? ; then
^ permalink raw reply [flat|nested] 7+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-libs/glibc/files/eblits: pkg_setup.eblit
@ 2011-03-09 8:02 Mike Frysinger (vapier)
0 siblings, 0 replies; 7+ messages in thread
From: Mike Frysinger (vapier) @ 2011-03-09 8:02 UTC (permalink / raw
To: gentoo-commits
vapier 11/03/09 08:02:57
Modified: pkg_setup.eblit
Log:
Do not bail out of sanity compile tests when building from a binary package #324685 by Diego Elio Pettenò.
Revision Changes Path
1.5 sys-libs/glibc/files/eblits/pkg_setup.eblit
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit?r1=1.4&r2=1.5
Index: pkg_setup.eblit
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pkg_setup.eblit 21 Aug 2009 05:46:04 -0000 1.4
+++ pkg_setup.eblit 9 Mar 2011 08:02:57 -0000 1.5
@@ -1,6 +1,32 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit,v 1.4 2009/08/21 05:46:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit,v 1.5 2011/03/09 08:02:57 vapier Exp $
+
+glibc_run_test() {
+ local ret
+
+ pushd "${T}" >/dev/null
+
+ printf '%b' "$*" > glibc-test.c
+
+ if [[ ${EMERGE_FROM} == "binary" ]] ; then
+ # ignore build failures when installing a binary package #324685
+ emake -s glibc-test 2>/dev/null || return 0
+ else
+ if ! emake glibc-test ; then
+ ewarn "Simple build failed ... assuming this is desired #324685"
+ return 0
+ fi
+ fi
+
+ ./glibc-test
+ ret=$?
+ rm -f glibc-test*
+
+ popd >/dev/null
+
+ return $ret
+}
eblit-glibc-pkg_setup() {
# prevent native builds from downgrading ... maybe update to allow people
@@ -12,22 +38,17 @@
die "aborting to save your system"
fi
- # Check for broken kernels #262698
- cd "${T}"
- printf '#include <pwd.h>\nint main(){return getpwuid(0)==0;}\n' > kern-clo-test.c
- emake kern-clo-test || die
- if ! ./kern-clo-test ; then
+ if ! glibc_run_test '#include <pwd.h>\nint main(){return getpwuid(0)==0;}\n'
+ then
eerror "Your patched vendor kernel is broken. You need to get an"
eerror "update from whoever is providing the kernel to you."
eerror "http://sourceware.org/bugzilla/show_bug.cgi?id=5227"
+ eerror "http://bugs.gentoo.org/262698"
die "keeping your system alive, say thank you"
fi
- # Check for broken kernels #279260
- cd "${T}"
- printf '#include <unistd.h>\n#include <sys/syscall.h>\nint main(){return syscall(1000)!=-1;}\n' > kern-enosys-test.c
- emake kern-enosys-test || die
- if ! ./kern-enosys-test ; then
+ if ! glibc_run_test '#include <unistd.h>\n#include <sys/syscall.h>\nint main(){return syscall(1000)!=-1;}\n'
+ then
eerror "Your old kernel is broken. You need to update it to"
eerror "a newer version as syscall(<bignum>) will break."
eerror "http://bugs.gentoo.org/279260"
^ permalink raw reply [flat|nested] 7+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-libs/glibc/files/eblits: pkg_setup.eblit
@ 2009-08-21 5:46 Mike Frysinger (vapier)
0 siblings, 0 replies; 7+ messages in thread
From: Mike Frysinger (vapier) @ 2009-08-21 5:46 UTC (permalink / raw
To: gentoo-commits
vapier 09/08/21 05:46:05
Modified: pkg_setup.eblit
Log:
Add check for broken syscall() on x86 #279260 by Andrew Gaffney.
(Portage version: 2.2_rc38/cvs/Linux x86_64)
Revision Changes Path
1.4 sys-libs/glibc/files/eblits/pkg_setup.eblit
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit?r1=1.3&r2=1.4
Index: pkg_setup.eblit
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pkg_setup.eblit 23 Mar 2009 18:48:48 -0000 1.3
+++ pkg_setup.eblit 21 Aug 2009 05:46:04 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit,v 1.3 2009/03/23 18:48:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit,v 1.4 2009/08/21 05:46:04 vapier Exp $
eblit-glibc-pkg_setup() {
# prevent native builds from downgrading ... maybe update to allow people
@@ -22,6 +22,17 @@
eerror "http://sourceware.org/bugzilla/show_bug.cgi?id=5227"
die "keeping your system alive, say thank you"
fi
+
+ # Check for broken kernels #279260
+ cd "${T}"
+ printf '#include <unistd.h>\n#include <sys/syscall.h>\nint main(){return syscall(1000)!=-1;}\n' > kern-enosys-test.c
+ emake kern-enosys-test || die
+ if ! ./kern-enosys-test ; then
+ eerror "Your old kernel is broken. You need to update it to"
+ eerror "a newer version as syscall(<bignum>) will break."
+ eerror "http://bugs.gentoo.org/279260"
+ die "keeping your system alive, say thank you"
+ fi
fi
# users have had a chance to phase themselves, time to give em the boot
^ permalink raw reply [flat|nested] 7+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-libs/glibc/files/eblits: pkg_setup.eblit
@ 2009-03-23 18:48 Mike Frysinger (vapier)
0 siblings, 0 replies; 7+ messages in thread
From: Mike Frysinger (vapier) @ 2009-03-23 18:48 UTC (permalink / raw
To: gentoo-commits
vapier 09/03/23 18:48:48
Modified: pkg_setup.eblit
Log:
Tweak xen warning a bit #263434 by Jeremy Olexa.
(Portage version: 2.2_rc26/cvs/Linux x86_64)
Revision Changes Path
1.3 sys-libs/glibc/files/eblits/pkg_setup.eblit
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit?r1=1.2&r2=1.3
Index: pkg_setup.eblit
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pkg_setup.eblit 19 Mar 2009 09:38:31 -0000 1.2
+++ pkg_setup.eblit 23 Mar 2009 18:48:48 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit,v 1.2 2009/03/19 09:38:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit,v 1.3 2009/03/23 18:48:48 vapier Exp $
eblit-glibc-pkg_setup() {
# prevent native builds from downgrading ... maybe update to allow people
@@ -47,7 +47,8 @@
if [[ -e /proc/xen ]] && [[ $(tc-arch) == "x86" ]] && ! is-flag -mno-tls-direct-seg-refs ; then
ewarn "You are using Xen but don't have -mno-tls-direct-seg-refs in your CFLAGS."
- ewarn "This will result in a 50% performance penalty, which is probably not what you want."
+ ewarn "This will result in a 50% performance penalty when running with a 32bit"
+ ewarn "hypervisor, which is probably not what you want."
fi
use hardened && ! gcc-specs-pie && \
^ permalink raw reply [flat|nested] 7+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-libs/glibc/files/eblits: pkg_setup.eblit
@ 2009-03-19 9:38 Mike Frysinger (vapier)
0 siblings, 0 replies; 7+ messages in thread
From: Mike Frysinger (vapier) @ 2009-03-19 9:38 UTC (permalink / raw
To: gentoo-commits
vapier 09/03/19 09:38:32
Modified: pkg_setup.eblit
Log:
Abort install if people have a broken kernel running #262698.
(Portage version: 2.2_rc26/cvs/Linux x86_64)
Revision Changes Path
1.2 sys-libs/glibc/files/eblits/pkg_setup.eblit
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit?r1=1.1&r2=1.2
Index: pkg_setup.eblit
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pkg_setup.eblit 1 Mar 2009 21:06:22 -0000 1.1
+++ pkg_setup.eblit 19 Mar 2009 09:38:31 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit,v 1.1 2009/03/01 21:06:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit,v 1.2 2009/03/19 09:38:31 vapier Exp $
eblit-glibc-pkg_setup() {
# prevent native builds from downgrading ... maybe update to allow people
@@ -11,6 +11,17 @@
eerror " Downgrading glibc is not supported and a sure way to destruction"
die "aborting to save your system"
fi
+
+ # Check for broken kernels #262698
+ cd "${T}"
+ printf '#include <pwd.h>\nint main(){return getpwuid(0)==0;}\n' > kern-clo-test.c
+ emake kern-clo-test || die
+ if ! ./kern-clo-test ; then
+ eerror "Your patched vendor kernel is broken. You need to get an"
+ eerror "update from whoever is providing the kernel to you."
+ eerror "http://sourceware.org/bugzilla/show_bug.cgi?id=5227"
+ die "keeping your system alive, say thank you"
+ fi
fi
# users have had a chance to phase themselves, time to give em the boot
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2014-06-14 22:19 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-06-14 22:19 [gentoo-commits] gentoo-x86 commit in sys-libs/glibc/files/eblits: pkg_setup.eblit Mike Frysinger (vapier)
-- strict thread matches above, loose matches on Subject: below --
2011-12-14 16:42 Mike Frysinger (vapier)
2011-12-12 23:22 Mike Frysinger (vapier)
2011-03-09 8:02 Mike Frysinger (vapier)
2009-08-21 5:46 Mike Frysinger (vapier)
2009-03-23 18:48 Mike Frysinger (vapier)
2009-03-19 9:38 Mike Frysinger (vapier)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox