Merge branch 'master' of git://git.merproject.org/mer-core/glibc

Conflicts:
	glibc.changes

glibc.changes

 * Sat Dec 13 2014 Carsten Munk <carsten.munk@jolla.com> - 2.19
 - Disable special -march=i486 for glibc
 
+* Fri Dec 5 2014 Davide Bettio <davide.bettio@ispirata.com> - 2.19
+- Upgrade to eglibc_2.19-0ubuntu6.4 (security fixes)
+
 * Thu Mar 20 2014 Davide Bettio <davide.bettio@ispirata.com> - 2.19
 - Upgrade to 2.19
 

glibc.spec

@@ -9,7 +9,7 @@
 Summary: Embedded GLIBC (EGLIBC) is a variant of the GNU C Library (GLIBC)
 Name: glibc
 Version: 2.19
-Release: 1
+Release: 6.4
 
 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
 # Things that are linked directly into dynamically linked programs
@@ -20,7 +20,7 @@ License: LGPLv2+ and LGPLv2+ with exceptions and GPLv2+
 Group: System/Libraries
 URL: http://www.eglibc.org/
 Source0: https://launchpad.net/ubuntu/+archive/primary/+files/eglibc_2.19.orig.tar.xz
-Source1: eglibc_2.19-0ubuntu2.debian.tar.xz
+Source1: http://archive.ubuntu.com/ubuntu/pool/main/e/eglibc/eglibc_2.19-0ubuntu%{release}.debian.tar.xz
 Source11: build-locale-archive.c
 
 # glibc-arm-alignment-fix.patch: safe but probably not needed anymore