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

Fixup 730856 bits

Browse Source
This commit is contained in:
Jeff Law 2012-02-17 11:17:21 -07:00
parent fc9b7c8869
commit 0e9bf8be6a
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glibc-rh730856.patch
View File

@ -26,7 +26,7 @@ diff -rup a/resolv/res_query.c b/resolv/res_query.c
+ if (answerp2 == NULL || *resplen2 < (int) sizeof (HEADER)) + if (answerp2 == NULL || *resplen2 < (int) sizeof (HEADER))
{ {
- /* Special case of partial answer. */ - /* Special case of partial answer. */
- assert (n == 0 || hp != hp2); - assert (hp != hp2);
- hp = hp2; - hp = hp2;
+ hp2 = hp; + hp2 = hp;
} }

7
glibc.spec
View File

@ -49,7 +49,7 @@ Patch2: %{name}-ia64-lib64.patch
Patch3: %{name}-rh757881.patch Patch3: %{name}-rh757881.patch
# From upstream. # From upstream.
Patch4: %{name}-rh740506.patch Patch4: %{name}-rh740506.patch
# Not sure of upstream status # Aurelien submitted upstream, Uli has largely ignored
Patch5: %{name}-rh730856.patch Patch5: %{name}-rh730856.patch
# Reverting an upstream patch. I don't think this has been discussed upstream yet. # Reverting an upstream patch. I don't think this has been discussed upstream yet.
# Caused a variety of problems for Fedora & Debian # Caused a variety of problems for Fedora & Debian
@ -92,10 +92,8 @@ Patch28: %{name}-rh790292.patch
Patch29: %{name}-rh790298.patch Patch29: %{name}-rh790298.patch
# Submitted upstream BZ 13698 # Submitted upstream BZ 13698
Patch30: %{name}-rh791161.patch Patch30: %{name}-rh791161.patch
# Aurelien submitted upstream, Uli has largely ignored
Patch31 : %{name}-rh730856.patch
# Submitted upstream BZ 12377 # Submitted upstream BZ 12377
Patch32 : %{name}-rh697149.patch Patch31 : %{name}-rh697149.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -346,7 +344,6 @@ rm -rf %{glibcportsdir}
%patch29 -p1 %patch29 -p1
%patch30 -p1 %patch30 -p1
%patch31 -p1 %patch31 -p1
%patch32 -p1
# A lot of programs still misuse memcpy when they have to use # A lot of programs still misuse memcpy when they have to use
# memmove. The memcpy implementation below is not tolerant at # memmove. The memcpy implementation below is not tolerant at