rpms/glibc
7
0
Fork 2
Code Issues Pull Requests Releases Activity

Sync with upstream master

Browse Source
This commit is contained in:
Siddhesh Poyarekar 2014-11-05 16:06:52 +05:30
parent b80bba4ee9
commit 5c361d9107
4 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
glibc-fedora-__libc_multiple_libcs.patch
View File

@ -29,7 +29,7 @@ Subject: [PATCH] Properly set __libc_multiple_libcs
static void static void
@@ -132,9 +130,7 @@ _dl_init (struct link_map *main_map, int argc, char **argv, char **env) @@ -132,8 +130,6 @@ _dl_init (struct link_map *main_map, int argc, char **argv, char **env)
while (i-- > 0) while (i-- > 0)
call_init (main_map->l_initfini[i], argc, argv, env); call_init (main_map->l_initfini[i], argc, argv, env);
@ -38,7 +38,6 @@ Subject: [PATCH] Properly set __libc_multiple_libcs
INTUSE(_dl_starting_up) = 0; INTUSE(_dl_starting_up) = 0;
-#endif -#endif
} }
INTDEF (_dl_init)
--- 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;

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

@ -48,7 +48,7 @@ index 18a83d2..6e16a9a 100644
- is $ORIGIN alone) and it must always appear first in path. */ - is $ORIGIN alone) and it must always appear first in path. */
++name; ++name;
- if ((len = is_dst (start, name, "ORIGIN", is_path, - if ((len = is_dst (start, name, "ORIGIN", is_path,
- INTUSE(__libc_enable_secure))) != 0 - __libc_enable_secure)) != 0
- || (len = is_dst (start, name, "PLATFORM", is_path, 0)) != 0 - || (len = is_dst (start, name, "PLATFORM", is_path, 0)) != 0
- || (len = is_dst (start, name, "LIB", is_path, 0)) != 0) - || (len = is_dst (start, name, "LIB", is_path, 0)) != 0)
+ if ((len = is_dst (start, name, "ORIGIN", is_path)) != 0 + if ((len = is_dst (start, name, "ORIGIN", is_path)) != 0
@ -62,13 +62,13 @@ index 18a83d2..6e16a9a 100644
++name; ++name;
- if ((len = is_dst (start, name, "ORIGIN", is_path, - if ((len = is_dst (start, name, "ORIGIN", is_path,
- INTUSE(__libc_enable_secure))) != 0) - __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; - 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 (__glibc_unlikely (INTUSE(__libc_enable_secure)) + if (__glibc_unlikely (__libc_enable_secure)
+ && ((name[len] != '\0' && name[len] != '/' + && ((name[len] != '\0' && name[len] != '/'
+ && (!is_path || name[len] != ':')) + && (!is_path || name[len] != ':'))
+ || (name != start + 1 && (!is_path || name[-2] != ':')))) + || (name != start + 1 && (!is_path || name[-2] != ':'))))
@ -76,11 +76,11 @@ index 18a83d2..6e16a9a 100644
+ else + else
+ repl = l->l_origin; + repl = l->l_origin;
+ +
check_for_trusted = (INTUSE(__libc_enable_secure) check_for_trusted = (__libc_enable_secure
&& l->l_type == lt_executable); && 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 = (__libc_enable_secure
&& l->l_type == lt_executable); && l->l_type == lt_executable);
} }
- else if ((len = is_dst (start, name, "PLATFORM", is_path, 0)) != 0) - else if ((len = is_dst (start, name, "PLATFORM", is_path, 0)) != 0)

9
glibc.spec
View File

@ -1,6 +1,6 @@
%define glibcsrcdir glibc-2.20-53-g754a15c %define glibcsrcdir glibc-2.20-153-g29955b5
%define glibcversion 2.20.90 %define glibcversion 2.20.90
%define glibcrelease 7%{?dist} %define glibcrelease 8%{?dist}
# Pre-release tarballs are pulled in from git using a command that is # Pre-release tarballs are pulled in from git using a command that is
# effectively: # effectively:
# #
@ -238,9 +238,6 @@ Patch2031: %{name}-rh1070416.patch
Patch2033: %{name}-aarch64-tls-fixes.patch Patch2033: %{name}-aarch64-tls-fixes.patch
Patch2034: %{name}-aarch64-workaround-nzcv-clobber-in-tlsdesc.patch Patch2034: %{name}-aarch64-workaround-nzcv-clobber-in-tlsdesc.patch
# https://sourceware.org/ml/libc-alpha/2014-10/msg00744.html
Patch2035: %{name}-fedora-use-test-skeleton.patch
############################################################################## ##############################################################################
# End of glibc patches. # End of glibc patches.
############################################################################## ##############################################################################
@ -574,7 +571,6 @@ package or when debugging this package.
%patch2034 -p1 %patch2034 -p1
%patch0050 -p1 %patch0050 -p1
%patch0052 -p1 %patch0052 -p1
%patch2035 -p1
%patch0053 -p1 %patch0053 -p1
############################################################################## ##############################################################################
@ -1731,6 +1727,7 @@ rm -f *.filelist*
%changelog %changelog
* Wed Nov 05 2014 Siddhesh Poyarekar <siddhesh@redhat.com> - 2.20.90-8 * Wed Nov 05 2014 Siddhesh Poyarekar <siddhesh@redhat.com> - 2.20.90-8
- Make getconf return only /usr/bin (#1138835). - Make getconf return only /usr/bin (#1138835).
- Sync with upstream master.
* Tue Nov 04 2014 Arjun Shankar <arjun.is@lostca.se> - 2.20.90-7 * Tue Nov 04 2014 Arjun Shankar <arjun.is@lostca.se> - 2.20.90-7
- Add patch that modifies several tests to use test-skeleton.c. - Add patch that modifies several tests to use test-skeleton.c.

2
sources
View File

@ -1 +1 @@
3a7f6a8f21a9b8ad462e7bc5fcaa283b glibc-2.20-53-g754a15c.tar.gz 7dee5d3946607d7c2267f0539f2d6bbe glibc-2.20-153-g29955b5.tar.gz