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

Merge remote-tracking branch 'origin/f16'

Browse Source
This commit is contained in:
Jeff Law 2011-12-19 06:15:17 +00:00
commit 8cbc6b28a5
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glibc-rh767696.patch
View File

@ -69,7 +69,7 @@ index 144e20b..402389c 100644
+ if (__builtin_expect (tzspec_len < num_isstd, 0)) + if (__builtin_expect (tzspec_len < num_isstd, 0))
+ goto lose; + goto lose;
+ tzspec_len -= num_isstd; + tzspec_len -= num_isstd;
+ if (__builtin_expect (tzspec == 0 || tzspec_len - 1 < num_isgmt, 0)) + if (__builtin_expect (tzspec_len == 0 || tzspec_len - 1 < num_isgmt, 0))
+ goto lose; + goto lose;
+ tzspec_len -= num_isgmt + 1; + tzspec_len -= num_isgmt + 1;
+ if (__builtin_expect (SIZE_MAX - total_size < tzspec_len, 0)) + if (__builtin_expect (SIZE_MAX - total_size < tzspec_len, 0))

4
glibc.spec
View File

@ -28,7 +28,7 @@
Summary: The GNU libc libraries Summary: The GNU libc libraries
Name: glibc Name: glibc
Version: %{glibcversion} Version: %{glibcversion}
Release: 24%{?dist}.2 Release: 24%{?dist}.3
# 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
@ -1138,7 +1138,7 @@ rm -f *.filelist*
%endif %endif
%changelog %changelog
* Sun Dec 18 2011 Jeff Law <law@redhat.com> - 2.14.90-24.fc16.2 * Sun Dec 18 2011 Jeff Law <law@redhat.com> - 2.14.90-24.fc16.3
- Check values from TZ file header (#767696) - Check values from TZ file header (#767696)
- Handle EAGAIN from FUTEX_WAIT_REQUEUE_PI (#552960) - Handle EAGAIN from FUTEX_WAIT_REQUEUE_PI (#552960)
- Add {dist}.# - Add {dist}.#