[arch-commits] Commit in glibc/trunk (4 files)
Allan McRae
allan at archlinux.org
Tue Dec 27 10:18:41 UTC 2011
Date: Tuesday, December 27, 2011 @ 05:18:41
Author: allan
Revision: 145683
upgpkg: glibc 2.15-1
glibc-2.15 toolchain build, upstream update, remove unneed patches
Modified:
glibc/trunk/PKGBUILD
Deleted:
glibc/trunk/glibc-2.12.1-static-shared-getpagesize.patch
glibc/trunk/glibc-2.13-futex.patch
glibc/trunk/glibc-2.14.1-tzfile-overflow.patch
----------------------------------------------+
PKGBUILD | 38 +++----------
glibc-2.12.1-static-shared-getpagesize.patch | 11 ---
glibc-2.13-futex.patch | 31 ----------
glibc-2.14.1-tzfile-overflow.patch | 72 -------------------------
4 files changed, 11 insertions(+), 141 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-12-27 10:17:45 UTC (rev 145682)
+++ PKGBUILD 2011-12-27 10:18:41 UTC (rev 145683)
@@ -5,15 +5,15 @@
# NOTE: valgrind requires rebuilt with each major glibc version
pkgname=glibc
-pkgver=2.14.1
-pkgrel=4
-_glibcdate=20111025
+pkgver=2.15
+pkgrel=1
+_glibcdate=20111227
pkgdesc="GNU C Library"
arch=('i686' 'x86_64')
url="http://www.gnu.org/software/libc"
license=('GPL' 'LGPL')
groups=('base')
-depends=('linux-api-headers>=3.1' 'tzdata')
+depends=('linux-api-headers>=3.1.6' 'tzdata')
makedepends=('gcc>=4.6')
backup=(etc/gai.conf
etc/locale.gen
@@ -24,29 +24,23 @@
glibc-2.10-dont-build-timezone.patch
glibc-2.10-bz4781.patch
glibc-__i686.patch
- glibc-2.12.1-static-shared-getpagesize.patch
glibc-2.12.2-ignore-origin-of-privileged-program.patch
- glibc-2.13-futex.patch
glibc-2.14-libdl-crash.patch
glibc-2.14-revert-4768ae77.patch
glibc-2.14-reexport-rpc-interface.patch
glibc-2.14-reinstall-nis-rpc-headers.patch
- glibc-2.14.1-tzfile-overflow.patch
nscd
locale.gen.txt
locale-gen)
-md5sums=('c52a15134dfa9f2c94f2ccd4cb155cf1'
+md5sums=('6ffdf5832192b92f98bdd125317c0dfc'
'4dadb9203b69a3210d53514bb46f41c3'
'0c5540efc51c0b93996c51b57a8540ae'
'40cd342e21f71f5e49e32622b25acc52'
- 'a3ac6f318d680347bb6e2805d42b73b2'
'b042647ea7d6f22ad319e12e796bd13e'
- '7d0154b7e17ea218c9fa953599d24cc4'
'6970bcfeb3bf88913436d5112d16f588'
'7da8c554a3b591c7401d7023b1928afc'
'c5de2a946215d647c8af5432ec4b0da0'
'55febbb72139ac7b65757df085024b83'
- '178779bfaa1418c709f31c25eb3d8a3e'
'b587ee3a70c9b3713099295609afde49'
'07ac979b6ab5eeb778d55f041529d623'
'476e9113489f93b348b21e144b6a8fcf')
@@ -54,7 +48,8 @@
mksource() {
git clone git://sourceware.org/git/glibc.git
pushd glibc
- git checkout -b glibc-2.14-arch origin/release/2.14/master
+ #git checkout -b glibc-2.15-arch origin/release/2.15/master
+ git checkout -b glibc-2.15-arch origin/master
popd
tar -cvJf glibc-${pkgver}_${_glibcdate}.tar.xz glibc/*
}
@@ -72,24 +67,17 @@
# http://sourceware.org/ml/libc-alpha/2009-07/msg00072.html
patch -Np1 -i ${srcdir}/glibc-__i686.patch
- # http://sourceware.org/bugzilla/show_bug.cgi?id=11929
- # using Fedora "fix" as patch in that bug report causes breakages...
- patch -Np1 -i ${srcdir}/glibc-2.12.1-static-shared-getpagesize.patch
-
# http://www.exploit-db.com/exploits/15274/
# http://sourceware.org/git/?p=glibc.git;a=patch;h=d14e6b09 (only fedora branch...)
patch -Np1 -i ${srcdir}/glibc-2.12.2-ignore-origin-of-privileged-program.patch
- # http://sourceware.org/bugzilla/show_bug.cgi?id=12403
- patch -Np1 -i ${srcdir}/glibc-2.13-futex.patch
-
# http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=675155e9 (only fedora branch...)
# http://sourceware.org/ml/libc-alpha/2011-06/msg00006.html
patch -Np1 -i ${srcdir}/glibc-2.14-libdl-crash.patch
# Revert commit causing issues with crappy DNS servers...
# Will be removed when workaround becomes annoying to maintain - USE A BETTER DNS SERVER!
- # Note that both these patches do not fix the issue completely:
+ # Note that both these patches appear not to fix the issue completely:
# http://sourceware.org/bugzilla/show_bug.cgi?id=13013
# http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=032c0ee3 (only fedora branch...)
patch -Np1 -i ${srcdir}/glibc-2.14-revert-4768ae77.patch
@@ -100,10 +88,6 @@
# http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=bdd816a3 (only fedora branch...)
patch -Np1 -i ${srcdir}/glibc-2.14-reinstall-nis-rpc-headers.patch
- # http://sourceware.org/bugzilla/show_bug.cgi?id=13506
- # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=97ac2654
- patch -Np1 -i ${srcdir}/glibc-2.14.1-tzfile-overflow.patch
-
install -dm755 ${pkgdir}/etc
touch ${pkgdir}/etc/ld.so.conf
@@ -195,8 +179,8 @@
cd $pkgdir
strip $STRIP_BINARIES sbin/{ldconfig,sln} \
- usr/bin/{gencat,getconf,getent,iconv,locale} \
- usr/bin/{localedef,pcprofiledump,rpcgen,sprof} \
+ usr/bin/{gencat,getconf,getent,iconv,locale,localedef} \
+ usr/bin/{makedb,pcprofiledump,pldd,rpcgen,sprof} \
usr/lib/getconf/* \
usr/sbin/{iconvconfig,nscd}
[[ $CARCH = "i686" ]] && strip $STRIP_BINARIES usr/bin/lddlibc4
@@ -204,7 +188,7 @@
strip $STRIP_STATIC usr/lib/*.a
strip $STRIP_SHARED lib/{libanl,libBrokenLocale,libcidn,libcrypt}-${pkgver}.so \
- lib/libnss_{compat,dns,files,hesiod,nis,nisplus}-${pkgver}.so \
+ lib/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-${pkgver}.so \
lib/{libdl,libm,libnsl,libresolv,librt,libutil}-${pkgver}.so \
lib/{libmemusage,libpcprofile,libSegFault}.so \
usr/lib/{pt_chown,{audit,gconv}/*.so}
Deleted: glibc-2.12.1-static-shared-getpagesize.patch
===================================================================
--- glibc-2.12.1-static-shared-getpagesize.patch 2011-12-27 10:17:45 UTC (rev 145682)
+++ glibc-2.12.1-static-shared-getpagesize.patch 2011-12-27 10:18:41 UTC (rev 145683)
@@ -1,11 +0,0 @@
---- glibc-2.12-192-g7c08a05/sysdeps/unix/sysv/linux/getpagesize.c
-+++ glibc-2.12.90-17/sysdeps/unix/sysv/linux/getpagesize.c
-@@ -28,7 +28,7 @@
- int
- __getpagesize ()
- {
--#ifdef __ASSUME_AT_PAGESIZE
-+#if 0 && defined __ASSUME_AT_PAGESIZE
- assert (GLRO(dl_pagesize) != 0);
- return GLRO(dl_pagesize);
- #else
Deleted: glibc-2.13-futex.patch
===================================================================
--- glibc-2.13-futex.patch 2011-12-27 10:17:45 UTC (rev 145682)
+++ glibc-2.13-futex.patch 2011-12-27 10:18:41 UTC (rev 145683)
@@ -1,31 +0,0 @@
---- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S
-+++ a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S
-@@ -210,7 +210,7 @@ pthread_rwlock_timedrdlock:
- cfi_restore(%r12)
- retq
-
--#ifdef __ASSUME_PRIVATE_FUTEX
-+#ifdef __ASSUME_FUTEX_CLOCK_REALTIME
- cfi_adjust_cfa_offset(16)
- cfi_rel_offset(%r12, 8)
- cfi_rel_offset(%r13, 0)
---- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S
-+++ a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S
-@@ -192,7 +192,7 @@ pthread_rwlock_timedwrlock:
-
- 7: movq %rdx, %rax
-
--#ifndef __ASSUME_PRIVATE_FUTEX
-+#ifndef __ASSUME_FUTEX_CLOCK_REALTIME
- addq $16, %rsp
- cfi_adjust_cfa_offset(-16)
- popq %r14
-@@ -207,7 +207,7 @@ pthread_rwlock_timedwrlock:
- cfi_restore(%r12)
- retq
-
--#ifdef __ASSUME_PRIVATE_FUTEX
-+#ifdef __ASSUME_FUTEX_CLOCK_REALTIME
- cfi_adjust_cfa_offset(16)
- cfi_rel_offset(%r12, 8)
- cfi_rel_offset(%r13, 0)
Deleted: glibc-2.14.1-tzfile-overflow.patch
===================================================================
--- glibc-2.14.1-tzfile-overflow.patch 2011-12-27 10:17:45 UTC (rev 145682)
+++ glibc-2.14.1-tzfile-overflow.patch 2011-12-27 10:18:41 UTC (rev 145683)
@@ -1,72 +0,0 @@
-diff --git a/time/tzfile.c b/time/tzfile.c
-index 144e20b..402389c 100644
---- a/time/tzfile.c
-+++ b/time/tzfile.c
-@@ -234,23 +234,58 @@ __tzfile_read (const char *file, size_t extra, char **extrap)
- goto read_again;
- }
-
-+ if (__builtin_expect (num_transitions
-+ > ((SIZE_MAX - (__alignof__ (struct ttinfo) - 1))
-+ / (sizeof (time_t) + 1)), 0))
-+ goto lose;
- total_size = num_transitions * (sizeof (time_t) + 1);
- total_size = ((total_size + __alignof__ (struct ttinfo) - 1)
- & ~(__alignof__ (struct ttinfo) - 1));
- types_idx = total_size;
-- total_size += num_types * sizeof (struct ttinfo) + chars;
-+ if (__builtin_expect (num_types
-+ > (SIZE_MAX - total_size) / sizeof (struct ttinfo), 0))
-+ goto lose;
-+ total_size += num_types * sizeof (struct ttinfo);
-+ if (__builtin_expect (chars > SIZE_MAX - total_size, 0))
-+ goto lose;
-+ total_size += chars;
-+ if (__builtin_expect (__alignof__ (struct leap) - 1
-+ > SIZE_MAX - total_size, 0))
-+ goto lose;
- total_size = ((total_size + __alignof__ (struct leap) - 1)
- & ~(__alignof__ (struct leap) - 1));
- leaps_idx = total_size;
-+ if (__builtin_expect (num_leaps
-+ > (SIZE_MAX - total_size) / sizeof (struct leap), 0))
-+ goto lose;
- total_size += num_leaps * sizeof (struct leap);
-- tzspec_len = (sizeof (time_t) == 8 && trans_width == 8
-- ? st.st_size - (ftello (f)
-- + num_transitions * (8 + 1)
-- + num_types * 6
-- + chars
-- + num_leaps * 12
-- + num_isstd
-- + num_isgmt) - 1 : 0);
-+ tzspec_len = 0;
-+ if (sizeof (time_t) == 8 && trans_width == 8)
-+ {
-+ off_t rem = st.st_size - ftello (f);
-+ if (__builtin_expect (rem < 0
-+ || (size_t) rem < (num_transitions * (8 + 1)
-+ + num_types * 6
-+ + chars), 0))
-+ goto lose;
-+ tzspec_len = (size_t) rem - (num_transitions * (8 + 1)
-+ + num_types * 6
-+ + chars);
-+ if (__builtin_expect (num_leaps > SIZE_MAX / 12
-+ || tzspec_len < num_leaps * 12, 0))
-+ goto lose;
-+ tzspec_len -= num_leaps * 12;
-+ if (__builtin_expect (tzspec_len < num_isstd, 0))
-+ goto lose;
-+ tzspec_len -= num_isstd;
-+ if (__builtin_expect (tzspec_len == 0 || tzspec_len - 1 < num_isgmt, 0))
-+ goto lose;
-+ tzspec_len -= num_isgmt + 1;
-+ if (__builtin_expect (SIZE_MAX - total_size < tzspec_len, 0))
-+ goto lose;
-+ }
-+ if (__builtin_expect (SIZE_MAX - total_size - tzspec_len < extra, 0))
-+ goto lose;
-
- /* Allocate enough memory including the extra block requested by the
- caller. */
More information about the arch-commits
mailing list