From 8b7d6ae496cceebce2a9c77258d77e05054441ea Mon Sep 17 00:00:00 2001 From: CentOS Buildsys Date: Jan 24 2014 19:16:20 +0000 Subject: import compat-glibc-2.12-4.el7.src.rpm --- diff --git a/SOURCES/glibc-rh1048853.patch b/SOURCES/glibc-rh1048853.patch new file mode 100644 index 0000000..b6ad0d8 --- /dev/null +++ b/SOURCES/glibc-rh1048853.patch @@ -0,0 +1,20 @@ +diff -pruN a/include/sys/uio.h b/include/sys/uio.h +--- a/include/sys/uio.h ++++ b/include/sys/uio.h +@@ -2,12 +2,12 @@ + #include + + /* Now define the internal interfaces. */ +-extern ssize_t __readv (int __fd, __const struct iovec *__vector, ++extern ssize_t __readv (int __fd, const struct iovec *__iovec, + int __count); +-extern ssize_t __libc_readv (int __fd, __const struct iovec *__vector, ++extern ssize_t __libc_readv (int __fd, const struct iovec *__iovec, + int __count); +-extern ssize_t __writev (int __fd, __const struct iovec *__vector, ++extern ssize_t __writev (int __fd, const struct iovec *__iovec, + int __count); +-extern ssize_t __libc_writev (int __fd, __const struct iovec *__vector, ++extern ssize_t __libc_writev (int __fd, const struct iovec *__iovec, + int __count); + #endif diff --git a/SPECS/compat-glibc.spec b/SPECS/compat-glibc.spec index dc93505..ef12a5d 100644 --- a/SPECS/compat-glibc.spec +++ b/SPECS/compat-glibc.spec @@ -23,7 +23,7 @@ Name: compat-glibc # XXX Should this bump? Epoch: 1 Version: %{glibcversion} -Release: 1.80.5%{?dist} +Release: 4%{?dist} # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries. # Things that are linked directly into dynamically linked programs # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional @@ -154,6 +154,9 @@ Patch10005: glibc-rh911307.patch # Newer compiler is also complaining about overflow problems Patch10006: glibc-rh883974-2.patch +# Fix namespace conflict with Altivec +Patch10007: glibc-rh1048853.patch + Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Autoreq: true Autoprov: false @@ -347,6 +350,7 @@ Red Hat Enterprise Linux 56 %patch10004 -p1 %patch10005 -p1 %patch10006 -p1 +%patch10007 -p1 find . -type f -size 0 -o -name "*.orig" -exec rm -f {} \; touch `find . -name configure` @@ -524,6 +528,15 @@ rm -rf "$RPM_BUILD_ROOT" %changelog +* Fri Jan 24 2014 Daniel Mach - 1:2.12-4 +- Mass rebuild 2014-01-24 + +* Tue Jan 7 2014 Siddhesh Poyarekar - 1:2.12-3 +- Fix namespace conflict with Altivec (#1048853). + +* Fri Dec 27 2013 Daniel Mach - 1:2.12-2 +- Mass rebuild 2013-12-27 + * Fri Jul 19 2013 Jeff Law - 1:2.12-1.80.5 - Backport timezone/zic.c change to avoid overflow in oadd (#883974)