wok diff glibc/receipt @ rev 17546

glibc: CVE-2015-0235 fix
author Pascal Bellard <pascal.bellard@slitaz.org>
date Thu Jan 29 11:14:15 2015 +0100 (2015-01-29)
parents 380ffe05937a
children 32497b637699
line diff
     1.1 --- a/glibc/receipt	Sat Aug 10 17:00:38 2013 +0000
     1.2 +++ b/glibc/receipt	Thu Jan 29 11:14:15 2015 +0100
     1.3 @@ -26,7 +26,9 @@
     1.4  	# Glibc Bug Sort Relocatable Objects Patch
     1.5  	patch -Np1 -i $stuff/glibc-2.14.1-sort-1.patch
     1.6  	# Fix a bug that prevents Glibc from building with GCC-4.6.2
     1.7 -	patch -Np1 -i stuff/glibc-2.14.1-gcc_fix-1.patch
     1.8 +	patch -Np1 -i $stuff/glibc-2.14.1-gcc_fix-1.patch
     1.9 +	# GHOST
    1.10 +	patch -Np1 -i $stuff/glibc-2.14.1-CVE-2015-0235.patch
    1.11  
    1.12  	# Build in a separate directory.
    1.13  	mkdir ../glibc-build && cd ../glibc-build
    1.14 @@ -92,6 +94,8 @@
    1.15  	patch -Np1 -i $stuff/glibc-2.14-reexport-rpc-interface.patch
    1.16  	# http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=bdd816a3 (only fedora branch...)
    1.17  	patch -Np1 -i $stuff/glibc-2.14-reinstall-nis-rpc-headers.patch
    1.18 +	# GHOST
    1.19 +	patch -Np1 -i $stuff/glibc-2.14.1-CVE-2015-0235.patch
    1.20  
    1.21  	# Fix a stack imbalance that occurs under some conditions:
    1.22  	sed -i '195,213 s/PRIVATE_FUTEX/FUTEX_CLOCK_REALTIME/' \