jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

New package: chroot-glibc-2.14.1.

Browse source
This commit is contained in:
Juan RP 2012-02-28 18:14:17 +01:00
parent ca887bd824
commit 783c42f016
10 changed files with 391 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
srcpkgs/chroot-glibc/patches/disable_timezone.diff Normal file
View file

@ -0,0 +1,11 @@
--- Makeconfig.orig 2009-06-07 06:17:04.561863100 +0200
+++ Makeconfig 2009-06-07 06:17:43.384890260 +0200
@@ -918,7 +918,7 @@ all-subdirs = csu assert ctype locale in
stdlib stdio-common libio malloc string wcsmbs time dirent \
grp pwd posix io termios resource misc socket sysvipc gmon \
gnulib iconv iconvdata wctype manual shadow gshadow po argp \
- crypt nss localedata timezone rt conform debug \
+ crypt nss localedata rt conform debug \
$(add-on-subdirs) $(dlfcn) $(binfmt-subdir)
ifndef avoid-generated

11
srcpkgs/chroot-glibc/patches/glibc-2.12.1-static-shared-getpagesize.patch Normal file
View file

@ -0,0 +1,11 @@
--- sysdeps/unix/sysv/linux/getpagesize.c
+++ sysdeps/unix/sysv/linux/getpagesize.c
@@ -28,7 +28,7 @@
int
__getpagesize ()
{
-#ifdef __ASSUME_AT_PAGESIZE
+#if 0 && defined __ASSUME_AT_PAGESIZE
assert (GLRO(dl_pagesize) != 0);
return GLRO(dl_pagesize);
#else

26
srcpkgs/chroot-glibc/patches/glibc-2.12.2-ignore-origin-of-privileged-program.patch Normal file
View file

@ -0,0 +1,26 @@
From d14e6b09d60d52cc12f0396c3106b14e1bd0fe8f Mon Sep 17 00:00:00 2001
From: Andreas Schwab <schwab@redhat.com>
Date: Thu, 9 Dec 2010 15:00:59 +0100
Subject: [PATCH 1/1] Ignore origin of privileged program
---
ChangeLog | 5 +++++
elf/dl-object.c | 3 +++
2 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/elf/dl-object.c b/elf/dl-object.c
index 22a1635..7674d49 100644
--- elf/dl-object.c.orig
+++ elf/dl-object.c
@@ -214,6 +214,9 @@ _dl_new_object (char *realname, const char *libname, int type,
out:
new->l_origin = origin;
}
+ else if (INTUSE(__libc_enable_secure) && type == lt_executable)
+ /* The origin of a privileged program cannot be trusted. */
+ new->l_origin = (char *) -1;
return new;
}
--
1.7.2

33
srcpkgs/chroot-glibc/patches/glibc-2.13-futex.patch Normal file
View file

@ -0,0 +1,33 @@
http://sourceware.org/bugzilla/show_bug.cgi?id=12403
--- nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S
+++ nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S
@@ -210,7 +210,7 @@ pthread_rwlock_timedrdlock:
cfi_restore(%r12)
retq
-#ifdef __ASSUME_PRIVATE_FUTEX
+#ifdef __ASSUME_FUTEX_CLOCK_REALTIME
cfi_adjust_cfa_offset(16)
cfi_rel_offset(%r12, 8)
cfi_rel_offset(%r13, 0)
--- nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S
+++ nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S
@@ -192,7 +192,7 @@ pthread_rwlock_timedwrlock:
7: movq %rdx, %rax
-#ifndef __ASSUME_PRIVATE_FUTEX
+#ifndef __ASSUME_FUTEX_CLOCK_REALTIME
addq $16, %rsp
cfi_adjust_cfa_offset(-16)
popq %r14
@@ -207,7 +207,7 @@ pthread_rwlock_timedwrlock:
cfi_restore(%r12)
retq
-#ifdef __ASSUME_PRIVATE_FUTEX
+#ifdef __ASSUME_FUTEX_CLOCK_REALTIME
cfi_adjust_cfa_offset(16)
cfi_rel_offset(%r12, 8)
cfi_rel_offset(%r13, 0)

26
srcpkgs/chroot-glibc/patches/glibc-2.14-reexport-rpc-interface.patch Normal file
View file

@ -0,0 +1,26 @@
diff --git a/include/libc-symbols.h b/include/libc-symbols.h
index 67e1ca2..5e7cca5 100644
--- include/libc-symbols.h
+++ include/libc-symbols.h
@@ -635,7 +635,7 @@ for linking")
# define libc_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
# define libc_hidden_def(name) hidden_def (name)
# define libc_hidden_weak(name) hidden_weak (name)
-# define libc_hidden_nolink(name, version) hidden_nolink (name, libc, version)
+# define libc_hidden_nolink(name, version) hidden_def (name)
# define libc_hidden_ver(local, name) hidden_ver (local, name)
# define libc_hidden_data_def(name) hidden_data_def (name)
# define libc_hidden_data_weak(name) hidden_data_weak (name)
diff --git a/sunrpc/Makefile b/sunrpc/Makefile
index 5134ce9..40c73d1 100644
--- sunrpc/Makefile
+++ sunrpc/Makefile
@@ -53,7 +53,7 @@ headers-in-tirpc = $(addprefix rpc/,auth.h auth_unix.h clnt.h pmap_clnt.h \
des_crypt.h)
headers-not-in-tirpc = $(addprefix rpc/,key_prot.h rpc_des.h) \
$(rpcsvc:%=rpcsvc/%) rpcsvc/bootparam.h
-headers = rpc/netdb.h
+headers = rpc/netdb.h $(headers-in-tirpc) $(headers-not-in-tirpc)
install-others = $(inst_sysconfdir)/rpc
generated = $(rpcsvc:%.x=rpcsvc/%.h) $(rpcsvc:%.x=x%.c) $(rpcsvc:%.x=x%.stmp) \
$(rpcsvc:%.x=rpcsvc/%.stmp) rpcgen

28
srcpkgs/chroot-glibc/patches/glibc-2.14-reinstall-nis-rpc-headers.patch Normal file
View file

@ -0,0 +1,28 @@
From bdd816a366c4e5bba5de7157d948e0c0737fb4fb Mon Sep 17 00:00:00 2001
From: Andreas Schwab <schwab@redhat.com>
Date: Tue, 17 May 2011 17:42:30 +0200
Subject: [PATCH] Reinstall NIS RPC headers
---
nis/Makefile | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/nis/Makefile b/nis/Makefile
index b5c9609..d2934d9 100644
--- nis/Makefile
+++ nis/Makefile
@@ -23,9 +23,9 @@ subdir := nis
aux := nis_hash
+headers := $(wildcard rpcsvc/*.[hx])
distribute := nss-nis.h nss-nisplus.h nis_intern.h Banner \
- nisplus-parser.h nis_xdr.h nss \
- $(wildcard rpcsvc/*.[hx])
+ nisplus-parser.h nis_xdr.h nss
# These are the databases available for the nis (and perhaps later nisplus)
# service. This must be a superset of the services in nss.
--
1.7.5.4

153
srcpkgs/chroot-glibc/patches/glibc-2.14.1-fixes-1.patch Normal file
View file

@ -0,0 +1,153 @@
Submitted By: Matt Burgess <matthew_at_linuxfromscratch_dot_org>
Date: 2011-10-07
Initial Package Version: 2.14.1
Upstream Status: From upstream
Origin: Matt Burgess
Description: Fixes Firefox crashes and a bug when programs link to
SDL.
--- elf/dl-close.c 2011-10-07 09:48:55.000000000 +0000
+++ elf/dl-close.c 2011-10-07 19:43:10.346411120 +0000
@@ -119,17 +119,8 @@
if (map->l_direct_opencount > 0 || map->l_type != lt_loaded
|| dl_close_state != not_pending)
{
- if (map->l_direct_opencount == 0)
- {
- if (map->l_type == lt_loaded)
- dl_close_state = rerun;
- else if (map->l_type == lt_library)
- {
- struct link_map **oldp = map->l_initfini;
- map->l_initfini = map->l_orig_initfini;
- _dl_scope_free (oldp);
- }
- }
+ if (map->l_direct_opencount == 0 && map->l_type == lt_loaded)
+ dl_close_state = rerun;
/* There are still references to this object. Do nothing more. */
if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0))
--- elf/dl-deps.c 2011-10-07 09:48:55.000000000 +0000
+++ elf/dl-deps.c 2011-10-07 19:43:10.348432639 +0000
@@ -478,6 +478,7 @@
nneeded * sizeof needed[0]);
atomic_write_barrier ();
l->l_initfini = l_initfini;
+ l->l_free_initfini = 1;
}
/* If we have no auxiliary objects just go on to the next map. */
@@ -678,6 +679,7 @@
l_initfini[nlist] = NULL;
atomic_write_barrier ();
map->l_initfini = l_initfini;
+ map->l_free_initfini = 1;
if (l_reldeps != NULL)
{
atomic_write_barrier ();
@@ -686,7 +688,7 @@
_dl_scope_free (old_l_reldeps);
}
if (old_l_initfini != NULL)
- map->l_orig_initfini = old_l_initfini;
+ _dl_scope_free (old_l_initfini);
if (errno_reason)
_dl_signal_error (errno_reason == -1 ? 0 : errno_reason, objname,
--- elf/dl-libc.c 2011-10-07 09:48:55.000000000 +0000
+++ elf/dl-libc.c 2011-10-07 19:43:10.352411141 +0000
@@ -279,6 +279,10 @@
if (! old->dont_free)
free (old);
}
+
+ /* Free the initfini dependency list. */
+ if (l->l_free_initfini)
+ free (l->l_initfini);
}
if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0
--- elf/rtld.c 2011-10-07 09:48:55.000000000 +0000
+++ elf/rtld.c 2011-10-07 19:43:10.355406263 +0000
@@ -2263,6 +2263,7 @@
lnp->dont_free = 1;
lnp = lnp->next;
}
+ l->l_free_initfini = 0;
if (l != &GL(dl_rtld_map))
_dl_relocate_object (l, l->l_scope, GLRO(dl_lazy) ? RTLD_LAZY : 0,
--- include/link.h 2011-10-07 09:48:55.000000000 +0000
+++ include/link.h 2011-10-07 19:43:10.357462703 +0000
@@ -192,6 +192,9 @@
during LD_TRACE_PRELINKING=1
contains any DT_SYMBOLIC
libraries. */
+ unsigned int l_free_initfini:1; /* Nonzero if l_initfini can be
+ freed, ie. not allocated with
+ the dummy malloc in ld.so. */
/* Collected information about own RPATH directories. */
struct r_search_path_struct l_rpath_dirs;
@@ -240,9 +243,6 @@
/* List of object in order of the init and fini calls. */
struct link_map **l_initfini;
- /* The init and fini list generated at startup, saved when the
- object is also loaded dynamically. */
- struct link_map **l_orig_initfini;
/* List of the dependencies introduced through symbol binding. */
struct link_map_reldeps
--- resolv/res_query.c 2011-10-07 09:48:55.000000000 +0000
+++ resolv/res_query.c 2011-10-07 19:43:10.361412711 +0000
@@ -122,6 +122,7 @@
int *resplen2)
{
HEADER *hp = (HEADER *) answer;
+ HEADER *hp2;
int n, use_malloc = 0;
u_int oflags = statp->_flags;
@@ -239,26 +240,25 @@
/* __libc_res_nsend might have reallocated the buffer. */
hp = (HEADER *) *answerp;
- /* We simplify the following tests by assigning HP to HP2. It
- is easy to verify that this is the same as ignoring all
- tests of HP2. */
- HEADER *hp2 = answerp2 ? (HEADER *) *answerp2 : hp;
-
- if (n < (int) sizeof (HEADER) && answerp2 != NULL
- && *resplen2 > (int) sizeof (HEADER))
+ /* We simplify the following tests by assigning HP to HP2 or
+ vice versa. It is easy to verify that this is the same as
+ ignoring all tests of HP or HP2. */
+ if (answerp2 == NULL || *resplen2 < (int) sizeof (HEADER))
{
- /* Special case of partial answer. */
- assert (hp != hp2);
- hp = hp2;
+ hp2 = hp;
}
- else if (answerp2 != NULL && *resplen2 < (int) sizeof (HEADER)
- && n > (int) sizeof (HEADER))
+ else
{
- /* Special case of partial answer. */
- assert (hp != hp2);
- hp2 = hp;
+ hp2 = (HEADER *) *answerp2;
+ if (n < (int) sizeof (HEADER))
+ {
+ hp = hp2;
+ }
}
+ /* Make sure both hp and hp2 are defined */
+ assert((hp != NULL) && (hp2 != NULL));
+
if ((hp->rcode != NOERROR || ntohs(hp->ancount) == 0)
&& (hp2->rcode != NOERROR || ntohs(hp2->ancount) == 0)) {
#ifdef DEBUG

13
srcpkgs/chroot-glibc/patches/glibc-__i686.patch Normal file
View file

@ -0,0 +1,13 @@
diff -Naur glibc-old//sysdeps/i386/Makefile glibc//sysdeps/i386/Makefile
--- sysdeps/i386/Makefile.orig 2010-03-18 11:52:30.000000000 +1000
+++ sysdeps/i386/Makefile 2010-04-16 15:05:50.000000000 +1000
@@ -1,6 +1,7 @@
# The mpn functions need a #define for asm syntax flavor.
-# Every i386 port in use uses gas syntax (I think).
-asm-CPPFLAGS += -DGAS_SYNTAX
+# Every i386 port in use uses gas syntax (I think). Don't replace
+# __i686 in __i686.get_pc_thunk.bx.
+asm-CPPFLAGS += -DGAS_SYNTAX -U __i686
# The i386 `long double' is a distinct type we support.
long-double-fcts = yes

12
srcpkgs/chroot-glibc/patches/xattr.h-dupdefs.diff Normal file
View file

@ -0,0 +1,12 @@
--- misc/sys/xattr.h.orig 2009-04-24 15:56:12.517504626 +0200
+++ misc/sys/xattr.h 2009-04-24 15:56:27.825593128 +0200
@@ -30,9 +30,7 @@ __BEGIN_DECLS
enum
{
XATTR_CREATE = 1, /* set value, fail if attr already exists. */
-#define XATTR_CREATE XATTR_CREATE
XATTR_REPLACE = 2 /* set value, fail if attr does not exist. */
-#define XATTR_REPLACE XATTR_REPLACE
};
/* Set the attribute NAME of the file pointed to by PATH to VALUE (which

78
srcpkgs/chroot-glibc/template Normal file
View file

@ -0,0 +1,78 @@
# Template file for 'chroot-glibc'
pkgname=chroot-glibc
version=2.14.1
wrksrc="glibc-${version}"
distfiles="http://ftp.gnu.org/gnu/glibc/glibc-${version}.tar.bz2"
short_desc="The GNU C library -- for xbps-src use"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnu.org/software/libc"
license="GPL-2, LGPL-2.1, BSD"
checksum=6e85a2fa3ebe6b28103361f09d27eeda37a021f24dab73f34064456d5a715b3b
long_desc="
The GNU C Library is the standard system C library for all GNU systems,
and is an important part of what makes up a GNU system. It provides the
system API for all programs written in C and C-compatible languages such
as C++ and Objective C; the runtime facilities of other programming
languages use the C library to access the underlying operating system."
noverifyrdeps=yes
bootstrap=yes
nostrip_files="
ld-${version}.so libc-${version}.so libpthread-${version}.so libthread_db-1.0.so"
provides="glibc-${version} glibc-devel-${version}"
conflicts="glibc>=0 glibc-devel>=0"
do_configure() {
local cflags
mkdir build && cd build
echo "slibdir=/lib" > configparms
# Build with -mno-tls-direct-seg-refs to avoid performance problems
# with Xen on x86 32bit.
if [ "${XBPS_MACHINE}" = "i686" ]; then
cflags="-mno-tls-direct-seg-refs -O2 -march=${XBPS_MACHINE%%-*}"
echo "CFLAGS=$cflags" >> configparms
fi
SHELL=/bin/bash ../configure \
${CONFIGURE_SHARED_ARGS} --with-tls \
--enable-add-ons=nptl,libidn \
--enable-multi-arch --with-__thread \
--enable-bind-now --enable-kernel=2.6.27 \
--enable-stack-guard-randomization --disable-profile \
--without-cvs --without-gd --libexecdir=/usr/lib \
--libdir=/usr/lib --with-headers=${XBPS_MASTERDIR}/usr/include
}
do_build() {
cd build && make ${makejobs}
}
do_install() {
# Create DESTDIR/etc/ld.so.conf
mkdir -p ${DESTDIR}/etc
echo "include /etc/ld.so.conf.d/*.conf" > ${DESTDIR}/etc/ld.so.conf
cd ${wrksrc}/build
make SHELL=/bin/bash install_root=${DESTDIR} install
# ldd is a bash script, so make it run as such.
. $XBPS_HELPERSDIR/replace-interpreter.sh
replace_interpreter bash ${DESTDIR}/usr/bin/ldd
# On x86_64, add dynamic linker's 32bit version to ldd.
if [ "$XBPS_MACHINE" = "x86_64" ]; then
rtldlist="/lib/ld-linux.so.2 /lib/ld-linux-x86-64.so.2"
sed -i "s|^RTLDLIST.*$|RTLDLIST=\"$rtldlist\"|" \
${DESTDIR}/usr/bin/ldd
fi
vmkdir etc/ld.so.conf.d
echo "/usr/local/lib" > ${DESTDIR}/etc/ld.so.conf.d/usr_local.conf
chmod 644 ${DESTDIR}/etc/ld.so.conf.d/usr_local.conf
rm -f ${DESTDIR}/etc/ld.so.cache
# Remove unused stuff.
rm -rf ${DESTDIR}/usr/share
}