metalefty/glibc
1
0
Fork 0
forked from rpms/glibc
Code Pull Requests Activity

Resync with upstream master

Browse Source
This commit is contained in:
Siddhesh Poyarekar 2013-07-09 23:15:48 +05:30
parent 5e06266896
commit 9d560ee089
4 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glibc-fedora-__libc_multiple_libcs.patch
View File

@ -42,8 +42,8 @@ Subject: [PATCH] Properly set __libc_multiple_libcs
--- a/elf/dl-support.c --- a/elf/dl-support.c
+++ b/elf/dl-support.c +++ b/elf/dl-support.c
@@ -81,10 +81,8 @@ unsigned long long _dl_load_adds; @@ -81,10 +81,8 @@ unsigned long long _dl_load_adds;
create a fake scope containing nothing. */ .r_nlist = 1,
struct r_scope_elem _dl_initial_searchlist; };
-#ifndef HAVE_INLINED_SYSCALLS -#ifndef HAVE_INLINED_SYSCALLS
/* Nonzero during startup. */ /* Nonzero during startup. */

11
glibc-fedora-elf-ORIGIN.patch
View File

@ -57,7 +57,7 @@ index 18a83d2..6e16a9a 100644
++cnt; ++cnt;
name = strchr (name + len, '$'); name = strchr (name + len, '$');
@@ -338,9 +328,16 @@ _dl_dst_substitute (struct link_map *l, const char *name, char *result, @@ -338,10 +328,18 @@ _dl_dst_substitute (struct link_map *l, const char *name, char *result,
size_t len; size_t len;
++name; ++name;
@ -65,6 +65,7 @@ index 18a83d2..6e16a9a 100644
- INTUSE(__libc_enable_secure))) != 0) - INTUSE(__libc_enable_secure))) != 0)
+ if ((len = is_dst (start, name, "ORIGIN", is_path)) != 0) + if ((len = is_dst (start, name, "ORIGIN", is_path)) != 0)
{ {
- repl = l->l_origin;
+ /* For SUID/GUID programs $ORIGIN must always appear + /* For SUID/GUID programs $ORIGIN must always appear
+ first in a path element. */ + first in a path element. */
+ if (__builtin_expect (INTUSE(__libc_enable_secure), 0) + if (__builtin_expect (INTUSE(__libc_enable_secure), 0)
@ -73,9 +74,11 @@ index 18a83d2..6e16a9a 100644
+ || (name != start + 1 && (!is_path || name[-2] != ':')))) + || (name != start + 1 && (!is_path || name[-2] != ':'))))
+ repl = (const char *) -1; + repl = (const char *) -1;
+ else + else
#ifndef SHARED + repl = l->l_origin;
if (l == NULL) +
repl = _dl_get_origin (); check_for_trusted = (INTUSE(__libc_enable_secure)
&& l->l_type == lt_executable);
}
@@ -351,9 +348,9 @@ _dl_dst_substitute (struct link_map *l, const char *name, char *result, @@ -351,9 +348,9 @@ _dl_dst_substitute (struct link_map *l, const char *name, char *result,
check_for_trusted = (INTUSE(__libc_enable_secure) check_for_trusted = (INTUSE(__libc_enable_secure)
&& l->l_type == lt_executable); && l->l_type == lt_executable);

7
glibc.spec
View File

@ -1,4 +1,4 @@
%define glibcsrcdir glibc-2.17-830-g19c73bc %define glibcsrcdir glibc-2.17-906-g8ab0740
%define glibcversion 2.17.90 %define glibcversion 2.17.90
### glibc.spec.in follows: ### glibc.spec.in follows:
%define run_glibc_tests 1 %define run_glibc_tests 1
@ -27,7 +27,7 @@
Summary: The GNU libc libraries Summary: The GNU libc libraries
Name: glibc Name: glibc
Version: %{glibcversion} Version: %{glibcversion}
Release: 3%{?dist} Release: 4%{?dist}
# GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries. # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
# Things that are linked directly into dynamically linked programs # Things that are linked directly into dynamically linked programs
# and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@ -1197,6 +1197,9 @@ rm -f *.filelist*
%endif %endif
%changelog %changelog
* Tue Jul 9 2013 Siddhesh Poyarekar <siddhesh@redhat.com> - 2.17.90-4
- Resync with upstream master.
* Thu Jun 20 2013 Siddhesh Poyarekar <siddhesh@redhat.com> - 2.17.90-3 * Thu Jun 20 2013 Siddhesh Poyarekar <siddhesh@redhat.com> - 2.17.90-3
- Resync with upstream master. - Resync with upstream master.

4
sources
View File

@ -1,2 +1,2 @@
d627fa08bfd7d85b9eb433d97f1a8028 glibc-2.17-830-g19c73bc.tar.gz 7ab78f7212d498feb2d84579811e8b3a glibc-2.17-906-g8ab0740.tar.gz
db7000215c8d4144ac14d8463ff4c701 glibc-2.17-830-g19c73bc-releng.tar.gz 6fa96904270799413fc50a1faa0df8c5 glibc-2.17-906-g8ab0740-releng.tar.gz