[arch-commits] Commit in glibc/trunk (PKGBUILD bz23497.patch)

2018-10-11 Thread Bartłomiej Piotrowski via arch-commits
Date: Thursday, October 11, 2018 @ 09:02:57
  Author: bpiotrowski
Revision: 336169

2.28-5: use latest commit from release/2.28/master branch

Modified:
  glibc/trunk/PKGBUILD
Deleted:
  glibc/trunk/bz23497.patch

---+
 PKGBUILD  |   13 +-
 bz23497.patch |  262 
 2 files changed, 5 insertions(+), 270 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-10-11 08:31:34 UTC (rev 336168)
+++ PKGBUILD2018-10-11 09:02:57 UTC (rev 336169)
@@ -7,29 +7,26 @@
 pkgbase=glibc
 pkgname=(glibc lib32-glibc)
 pkgver=2.28
-pkgrel=4
+pkgrel=5
 arch=(x86_64)
 url='http://www.gnu.org/software/libc'
 license=(GPL LGPL)
 makedepends=(git gd lib32-gcc-libs)
 options=(!strip staticlibs)
-#_commit=23158b08a0908f381459f273a984c6fd328363cb
-#source=(git+https://sourceware.org/git/glibc.git#commit=$_commit
-source=(https://ftp.gnu.org/gnu/glibc/glibc-$pkgver.tar.xz{,.sig}
+#source=(https://ftp.gnu.org/gnu/glibc/glibc-$pkgver.tar.xz{,.sig}
+_commit=5a74abda201907cafbdabd1debf98890313ff71e
+source=(git+https://sourceware.org/git/glibc.git#commit=$_commit
 locale.gen.txt
 locale-gen
 lib32-glibc.conf
 bz20338.patch
-bz23497.patch
 0001-Revert-elf-Correct-absolute-SHN_ABS-symbol-run-time-.patch)
 validpgpkeys=(7273542B39962DF7B299931416792B4EA25340F8) # Carlos O'Donell
-md5sums=('c81d2388896379997bc359d4f2084239'
- 'SKIP'
+md5sums=('SKIP'
  '07ac979b6ab5eeb778d55f041529d623'
  '476e9113489f93b348b21e144b6a8fcf'
  '6e052f1cb693d5d3203f50f9d4e8c33b'
  'dc0d3ad59aeaaf591b085a77de6e03e9'
- '11bca140697b1bdb656742e2a12c2982'
  '58ffe75a9c5a1b22c535a5c2e725db22')
 
 prepare() {

Deleted: bz23497.patch
===
--- bz23497.patch   2018-10-11 08:31:34 UTC (rev 336168)
+++ bz23497.patch   2018-10-11 09:02:57 UTC (rev 336169)
@@ -1,262 +0,0 @@
-From 4b25485f03158959cff45379eecc1d73c7dcdd11 Mon Sep 17 00:00:00 2001
-From: Florian Weimer 
-Date: Fri, 10 Aug 2018 11:19:26 +0200
-Subject: [PATCH] Linux: Rewrite __old_getdents64 [BZ #23497]
-
-Commit 298d0e3129c0b5137f4989275b13fe30d0733c4d ("Consolidate Linux
-getdents{64} implementation") broke the implementation because it does
-not take into account struct offset differences.
-
-The new implementation is close to the old one, before the
-consolidation, but has been cleaned up slightly.
-
-(cherry picked from commit 690652882b499defb3d950dfeff8fe421d13cab5)

- sysdeps/unix/sysv/linux/Makefile   |   1 +
- sysdeps/unix/sysv/linux/getdents64.c   |  89 ++--
- sysdeps/unix/sysv/linux/tst-readdir64-compat.c | 111 +
- 3 files changed, 176 insertions(+), 25 deletions(-)
- create mode 100644 sysdeps/unix/sysv/linux/tst-readdir64-compat.c
-
-diff --git a/sysdeps/unix/sysv/linux/Makefile 
b/sysdeps/unix/sysv/linux/Makefile
-index f71cc39..773aaea 100644
 a/sysdeps/unix/sysv/linux/Makefile
-+++ b/sysdeps/unix/sysv/linux/Makefile
-@@ -161,6 +161,7 @@ inhibit-glue = yes
- 
- ifeq ($(subdir),dirent)
- sysdep_routines += getdirentries getdirentries64
-+tests-internal += tst-readdir64-compat
- endif
- 
- ifeq ($(subdir),nis)
-diff --git a/sysdeps/unix/sysv/linux/getdents64.c 
b/sysdeps/unix/sysv/linux/getdents64.c
-index 3bde0cf..bc140b5 100644
 a/sysdeps/unix/sysv/linux/getdents64.c
-+++ b/sysdeps/unix/sysv/linux/getdents64.c
-@@ -33,41 +33,80 @@ strong_alias (__getdents64, __getdents)
- # include 
- 
- # if SHLIB_COMPAT(libc, GLIBC_2_1, GLIBC_2_2)
--# include 
-+#  include 
-+#  include 
- 
--/* kernel definition of as of 3.2.  */
--struct compat_linux_dirent
-+static ssize_t
-+handle_overflow (int fd, __off64_t offset, ssize_t count)
- {
--  /* Both d_ino and d_off are compat_ulong_t which are defined in all
-- architectures as 'u32'.  */
--  uint32_td_ino;
--  uint32_td_off;
--  unsigned short  d_reclen;
--  chard_name[1];
--};
-+  /* If this is the first entry in the buffer, we can report the
-+ error.  */
-+  if (count == 0)
-+{
-+  __set_errno (EOVERFLOW);
-+  return -1;
-+}
-+
-+  /* Otherwise, seek to the overflowing entry, so that the next call
-+ will report the error, and return the data read so far..  */
-+  if (__lseek64 (fd, offset, SEEK_SET) != 0)
-+return -1;
-+  return count;
-+}
- 
- ssize_t
- __old_getdents64 (int fd, char *buf, size_t nbytes)
- {
--  ssize_t retval = INLINE_SYSCALL_CALL (getdents, fd, buf, nbytes);
-+  /* We do not move the individual directory entries.  This is only
-+ possible if the target type (struct __old_dirent64) is smaller
-+ than the source type.  */
-+  _Static_assert (offsetof (struct __old_dirent64, d_name)
-+<= offsetof (struct dirent64, d_name),
-+"__old_dirent64 is larger than 

[arch-commits] Commit in glibc/trunk (PKGBUILD bz20338.patch)

2018-08-10 Thread Bartłomiej Piotrowski via arch-commits
Date: Friday, August 10, 2018 @ 22:14:15
  Author: bpiotrowski
Revision: 331367

2.28-4: restore mistakenly removed fix for BZ#20338

Added:
  glibc/trunk/bz20338.patch
Modified:
  glibc/trunk/PKGBUILD

---+
 PKGBUILD  |4 +
 bz20338.patch |  114 
 2 files changed, 117 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-08-10 21:59:53 UTC (rev 331366)
+++ PKGBUILD2018-08-10 22:14:15 UTC (rev 331367)
@@ -8,7 +8,7 @@
 pkgbase=glibc
 pkgname=(glibc lib32-glibc)
 pkgver=2.28
-pkgrel=3
+pkgrel=4
 arch=(x86_64)
 url='http://www.gnu.org/software/libc'
 license=(GPL LGPL)
@@ -20,6 +20,7 @@
 locale.gen.txt
 locale-gen
 lib32-glibc.conf
+bz20338.patch
 bz23497.patch
 0001-Revert-elf-Correct-absolute-SHN_ABS-symbol-run-time-.patch)
 validpgpkeys=(7273542B39962DF7B299931416792B4EA25340F8) # Carlos O'Donell
@@ -28,6 +29,7 @@
  '07ac979b6ab5eeb778d55f041529d623'
  '476e9113489f93b348b21e144b6a8fcf'
  '6e052f1cb693d5d3203f50f9d4e8c33b'
+ 'dc0d3ad59aeaaf591b085a77de6e03e9'
  '11bca140697b1bdb656742e2a12c2982'
  '58ffe75a9c5a1b22c535a5c2e725db22')
 

Added: bz20338.patch
===
--- bz20338.patch   (rev 0)
+++ bz20338.patch   2018-08-10 22:14:15 UTC (rev 331367)
@@ -0,0 +1,114 @@
+From 74250a7cdf106d4ca7d9506e6d5dc7c448dc3434 Mon Sep 17 00:00:00 2001
+From: David Michael 
+Date: Thu, 15 Dec 2016 15:22:57 -0800
+Subject: [PATCH] gshadow: Sync fgetsgent_r.c with grp/fgetgrent_r.c
+
+   [BZ #20338]
+   * gshadow/fgetsgent_r.c: Include .
+   (flockfile): New macro.
+   (funlockfile): Likewise.
+   (__fgetsgent_r): Sync with __fgetgrent_r.
+   * nss/nss_files/files-sgrp.c: Fix "fgetsgent_r.c" typo.
+---
+ gshadow/fgetsgent_r.c  | 35 ---
+ nss/nss_files/files-sgrp.c |  2 +-
+ 2 files changed, 25 insertions(+), 12 deletions(-)
+
+diff --git a/gshadow/fgetsgent_r.c b/gshadow/fgetsgent_r.c
+index b70f6fa..02cd33a 100644
+--- a/gshadow/fgetsgent_r.c
 b/gshadow/fgetsgent_r.c
+@@ -20,39 +20,44 @@
+ #include 
+ #include 
+ 
++#include 
++#define flockfile(s) _IO_flockfile (s)
++#define funlockfile(s) _IO_funlockfile (s)
++
+ /* Define a line parsing function using the common code
+used in the nss_files module.  */
+ 
+ #define STRUCTURE sgrp
+ #define ENTNAME   sgent
+-#define   EXTERN_PARSER   1
++#define EXTERN_PARSER 1
+ struct sgent_data {};
+ 
+ #include 
+ 
+ 
+-/* Read one shadow entry from the given stream.  */
++/* Read one entry from the given stream.  */
+ int
+ __fgetsgent_r (FILE *stream, struct sgrp *resbuf, char *buffer, size_t buflen,
+  struct sgrp **result)
+ {
+   char *p;
++  int parse_result;
+ 
+-  _IO_flockfile (stream);
++  flockfile (stream);
+   do
+ {
+   buffer[buflen - 1] = '\xff';
+   p = fgets_unlocked (buffer, buflen, stream);
+-  if (p == NULL && feof_unlocked (stream))
++  if (__builtin_expect (p == NULL, 0) && feof_unlocked (stream))
+   {
+-_IO_funlockfile (stream);
++funlockfile (stream);
+ *result = NULL;
+ __set_errno (ENOENT);
+ return errno;
+   }
+-  if (p == NULL || buffer[buflen - 1] != '\xff')
++  if (__builtin_expect (p == NULL, 0) || buffer[buflen - 1] != '\xff')
+   {
+-_IO_funlockfile (stream);
++funlockfile (stream);
+ *result = NULL;
+ __set_errno (ERANGE);
+ return errno;
+@@ -61,13 +66,21 @@ __fgetsgent_r (FILE *stream, struct sgrp *resbuf, char 
*buffer, size_t buflen,
+   /* Skip leading blanks.  */
+   while (isspace (*p))
+   ++p;
+-} while (*p == '\0' || *p == '#' ||   /* Ignore empty and comment 
lines.  */
++} while (*p == '\0' || *p == '#'  /* Ignore empty and comment lines.  */
+/* Parse the line.  If it is invalid, loop to
+   get the next line of the file to parse.  */
+-   ! parse_line (buffer, (void *) resbuf, (void *) buffer, buflen,
+- ));
++   || ! (parse_result = parse_line (p, resbuf,
++(void *) buffer, buflen,
++)));
++
++  funlockfile (stream);
+ 
+-  _IO_funlockfile (stream);
++  if (__builtin_expect (parse_result, 0) == -1)
++{
++  /* The parser ran out of space.  */
++  *result = NULL;
++  return errno;
++}
+ 
+   *result = resbuf;
+   return 0;
+diff --git a/nss/nss_files/files-sgrp.c b/nss/nss_files/files-sgrp.c
+index 15dc659..05c3805 100644
+--- a/nss/nss_files/files-sgrp.c
 b/nss/nss_files/files-sgrp.c
+@@ -23,7 +23,7 @@
+ #define DATABASE  "gshadow"
+ struct sgent_data {};
+ 
+-/* Our 

[arch-commits] Commit in glibc/trunk (PKGBUILD)

2018-08-10 Thread Bartłomiej Piotrowski via arch-commits
Date: Friday, August 10, 2018 @ 17:53:38
  Author: bpiotrowski
Revision: 331356

2.28-3: remove tzselect, zdump, zic in favor of core/tzdata

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-08-10 17:02:31 UTC (rev 331355)
+++ PKGBUILD2018-08-10 17:53:38 UTC (rev 331356)
@@ -8,7 +8,7 @@
 pkgbase=glibc
 pkgname=(glibc lib32-glibc)
 pkgver=2.28
-pkgrel=2
+pkgrel=3
 arch=(x86_64)
 url='http://www.gnu.org/software/libc'
 license=(GPL LGPL)
@@ -149,6 +149,9 @@
   make -C glibc-build install_root="$pkgdir" install
   rm -f "$pkgdir"/etc/ld.so.{cache,conf}
 
+  # Shipped in tzdata
+  rm -f "$pkgdir"/usr/bin/{tzselect,zdump,zic}
+
   cd glibc
 
   install -dm755 "$pkgdir"/usr/lib/{locale,systemd/system,tmpfiles.d}


[arch-commits] Commit in glibc/trunk (PKGBUILD)

2018-08-02 Thread Bartłomiej Piotrowski via arch-commits
Date: Thursday, August 2, 2018 @ 06:31:05
  Author: bpiotrowski
Revision: 330461

2.28-1

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-08-02 06:30:42 UTC (rev 330460)
+++ PKGBUILD2018-08-02 06:31:05 UTC (rev 330461)
@@ -7,8 +7,8 @@
 
 pkgbase=glibc
 pkgname=(glibc lib32-glibc)
-pkgver=2.27
-pkgrel=3
+pkgver=2.28
+pkgrel=1
 arch=(x86_64)
 url='http://www.gnu.org/software/libc'
 license=(GPL LGPL)
@@ -22,7 +22,7 @@
 lib32-glibc.conf
 bz20338.patch)
 validpgpkeys=(7273542B39962DF7B299931416792B4EA25340F8) # Carlos O'Donell
-md5sums=('898cd5656519ffbc3a03fe811dd89e82'
+md5sums=('c81d2388896379997bc359d4f2084239'
  'SKIP'
  '07ac979b6ab5eeb778d55f041529d623'
  '476e9113489f93b348b21e144b6a8fcf'
@@ -74,6 +74,7 @@
   "$srcdir/glibc/configure" \
   --libdir=/usr/lib \
   --libexecdir=/usr/lib \
+  --enable-cet \
   ${_configure_flags[@]}
 
   # build libraries with fortify disabled


[arch-commits] Commit in glibc/trunk (PKGBUILD)

2018-05-02 Thread Bartłomiej Piotrowski via arch-commits
Date: Wednesday, May 2, 2018 @ 20:39:35
  Author: bpiotrowski
Revision: 323305

2.27-3: rebuild against gcc 8.1.0 and enable static PIE

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-05-02 20:37:50 UTC (rev 323304)
+++ PKGBUILD2018-05-02 20:39:35 UTC (rev 323305)
@@ -8,7 +8,7 @@
 pkgbase=glibc
 pkgname=(glibc lib32-glibc)
 pkgver=2.27
-pkgrel=2
+pkgrel=3
 arch=(x86_64)
 url='http://www.gnu.org/software/libc'
 license=(GPL LGPL)
@@ -56,6 +56,7 @@
   --enable-multi-arch
   --enable-stack-protector=strong
   --enable-stackguard-randomization
+  --enable-static-pie
   --disable-profile
   --disable-werror
   )


[arch-commits] Commit in glibc/trunk (PKGBUILD)

2018-04-10 Thread Bartłomiej Piotrowski via arch-commits
Date: Tuesday, April 10, 2018 @ 21:38:35
  Author: bpiotrowski
Revision: 321515

2.27-2: disable static PIE

It actially requires GCC 8 to be useful.

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-04-10 19:58:32 UTC (rev 321514)
+++ PKGBUILD2018-04-10 21:38:35 UTC (rev 321515)
@@ -8,7 +8,7 @@
 pkgbase=glibc
 pkgname=(glibc lib32-glibc)
 pkgver=2.27
-pkgrel=1
+pkgrel=2
 arch=(x86_64)
 url='http://www.gnu.org/software/libc'
 license=(GPL LGPL)
@@ -56,7 +56,6 @@
   --enable-multi-arch
   --enable-stack-protector=strong
   --enable-stackguard-randomization
-  --enable-static-pie
   --disable-profile
   --disable-werror
   )


[arch-commits] Commit in glibc/trunk (PKGBUILD)

2018-04-10 Thread Bartłomiej Piotrowski via arch-commits
Date: Tuesday, April 10, 2018 @ 19:34:29
  Author: bpiotrowski
Revision: 321497

2.27-1

Disable deprecated nsl and rpc libraries, enable static PIE.

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |   67 -
 1 file changed, 27 insertions(+), 40 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-04-10 18:50:52 UTC (rev 321496)
+++ PKGBUILD2018-04-10 19:34:29 UTC (rev 321497)
@@ -7,20 +7,23 @@
 
 pkgbase=glibc
 pkgname=(glibc lib32-glibc)
-pkgver=2.26
-pkgrel=11
+pkgver=2.27
+pkgrel=1
 arch=(x86_64)
 url='http://www.gnu.org/software/libc'
 license=(GPL LGPL)
 makedepends=(git gd lib32-gcc-libs)
 options=(!strip staticlibs)
-_commit=de51f431ed6226ec68ca76e578f2cbd55b6262cb
-source=(git+https://sourceware.org/git/glibc.git#commit=${_commit}
+_commit=23158b08a0908f381459f273a984c6fd328363cb
+#source=(git+https://sourceware.org/git/glibc.git#commit=$_commit
+source=(https://ftp.gnu.org/gnu/glibc/glibc-$pkgver.tar.xz{,.sig}
 locale.gen.txt
 locale-gen
 lib32-glibc.conf
 bz20338.patch)
-md5sums=('SKIP'
+validpgpkeys=(7273542B39962DF7B299931416792B4EA25340F8) # Carlos O'Donell
+md5sums=('898cd5656519ffbc3a03fe811dd89e82'
+ 'SKIP'
  '07ac979b6ab5eeb778d55f041529d623'
  '476e9113489f93b348b21e144b6a8fcf'
  '6e052f1cb693d5d3203f50f9d4e8c33b'
@@ -29,6 +32,7 @@
 prepare() {
   mkdir -p glibc-build lib32-glibc-build
 
+  [[ -d glibc-$pkgver ]] && ln -s glibc-$pkgver glibc 
   cd glibc
 
   local i; for i in ${source[@]}; do
@@ -50,10 +54,9 @@
   --enable-bind-now
   --enable-lock-elision
   --enable-multi-arch
-  --enable-obsolete-nsl
-  --enable-obsolete-rpc
   --enable-stack-protector=strong
   --enable-stackguard-randomization
+  --enable-static-pie
   --disable-profile
   --disable-werror
   )
@@ -155,35 +158,22 @@
 
   install -m755 "$srcdir/locale-gen" "$pkgdir/usr/bin"
 
-  # create /etc/locale.gen
+  # Create /etc/locale.gen
   install -m644 "$srcdir/locale.gen.txt" "$pkgdir/etc/locale.gen"
   sed -e '1,3d' -e 's|/| |g' -e 's|\\| |g' -e 's|^|#|g' \
 "$srcdir/glibc/localedata/SUPPORTED" >> "$pkgdir/etc/locale.gen"
 
-  # Do not strip the following files for improved debugging support
-  # ("improved" as in not breaking gdb and valgrind...):
-  #   ld-${pkgver}.so
-  #   libc-${pkgver}.so
-  #   libpthread-${pkgver}.so
-  #   libthread_db-1.0.so
-
   if check_option 'debug' n; then
-cd "$pkgdir"
-strip $STRIP_BINARIES usr/bin/{gencat,getconf,getent,iconv,iconvconfig} \
-  usr/bin/{ldconfig,locale,localedef,nscd,makedb} \
-  usr/bin/{pcprofiledump,pldd,rpcgen,sln,sprof} \
-  usr/lib/getconf/*
+find "$pkgdir"/usr/bin -type f -executable -exec strip $STRIP_BINARIES {} 
+ 2> /dev/null || true
+find "$pkgdir"/usr/lib -name '*.a' -type f -exec strip $STRIP_STATIC {} + 
2> /dev/null || true
 
-strip $STRIP_STATIC usr/lib/lib{anl,BrokenLocale,c{,_nonshared},crypt}.a \
-
usr/lib/lib{dl,g,ieee,mcheck,nsl,pthread{,_nonshared}}.a \
-usr/lib/lib{resolv,rpcsvc,rt,util}.a \
-usr/lib/lib{m-${pkgver},mvec{,_nonshared}}.a
-
-strip $STRIP_SHARED usr/lib/lib{anl,BrokenLocale,cidn,crypt}-${pkgver}.so \
-
usr/lib/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-*.so \
-usr/lib/lib{dl,m,nsl,resolv,rt,util}-${pkgver}.so \
-usr/lib/lib{memusage,pcprofile,SegFault}.so \
-usr/lib/{audit,gconv}/*.so usr/lib/libmvec-*.so || true
+# Do not strip these for gdb and valgrind functionality, but strip the rest
+find "$pkgdir"/usr/lib \
+  -not -name 'ld-*.so' \
+  -not -name 'libc-*.so' \
+  -not -name 'libpthread-*.so' \
+  -not -name 'libthread_db-*.so' \
+  -name '*-*.so' -type f -exec strip $STRIP_SHARED {} + 2> /dev/null || 
true
   fi
 }
 
@@ -210,15 +200,12 @@
   ln -s ../lib/locale "$pkgdir/usr/lib32/locale"
 
   if check_option 'debug' n; then
-cd $pkgdir
-strip $STRIP_BINARIES usr/lib32/getconf/*
-strip $STRIP_STATIC usr/lib32/lib{anl,BrokenLocale,c{,_nonshared},crypt}.a 
\
-
usr/lib32/lib{dl,g,ieee,mcheck,nsl,pthread{,_nonshared}}.a \
-usr/lib32/lib{resolv,rpcsvc,rt,util,m}.a
-strip $STRIP_SHARED 
usr/lib32/lib{anl,BrokenLocale,cidn,crypt}-${pkgver}.so \
-
usr/lib32/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-*.so \
-usr/lib32/lib{dl,m,nsl,resolv,rt,util}-${pkgver}.so \
-usr/lib32/lib{memusage,pcprofile,SegFault}.so \
-usr/lib32/{audit,gconv}/*.so || true
+find "$pkgdir"/usr/lib32 -name '*.a' -type f -exec strip $STRIP_STATIC {} 
+ 2> 

[arch-commits] Commit in glibc/trunk (PKGBUILD)

2017-12-27 Thread Bartłomiej Piotrowski via arch-commits
Date: Wednesday, December 27, 2017 @ 09:04:07
  Author: bpiotrowski
Revision: 313683

2.26-10: rebuild against linux-api-headers 4.14.8

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-12-27 08:57:46 UTC (rev 313682)
+++ PKGBUILD2017-12-27 09:04:07 UTC (rev 313683)
@@ -8,7 +8,7 @@
 pkgbase=glibc
 pkgname=(glibc lib32-glibc)
 pkgver=2.26
-pkgrel=9
+pkgrel=10
 arch=(x86_64)
 url='http://www.gnu.org/software/libc'
 license=(GPL LGPL)


[arch-commits] Commit in glibc/trunk (PKGBUILD)

2017-12-16 Thread Bartłomiej Piotrowski via arch-commits
Date: Saturday, December 16, 2017 @ 13:17:52
  Author: bpiotrowski
Revision: 312963

...but don't enable debug by default

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-12-16 13:17:10 UTC (rev 312962)
+++ PKGBUILD2017-12-16 13:17:52 UTC (rev 312963)
@@ -13,7 +13,7 @@
 url='http://www.gnu.org/software/libc'
 license=(GPL LGPL)
 makedepends=(git gd)
-options=(!strip staticlibs debug)
+options=(!strip staticlibs)
 _commit=71170eba2af41e08d51cf9d7b1ded5fd4b0b5c9c  # release/2.26/master
 source=(git+https://sourceware.org/git/glibc.git#commit=${_commit}
 locale.gen.txt


[arch-commits] Commit in glibc/trunk (PKGBUILD)

2017-12-16 Thread Bartłomiej Piotrowski via arch-commits
Date: Saturday, December 16, 2017 @ 13:17:10
  Author: bpiotrowski
Revision: 312962

Make it easier to build with debug enabled

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |   54 +-
 1 file changed, 29 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-12-16 11:22:02 UTC (rev 312961)
+++ PKGBUILD2017-12-16 13:17:10 UTC (rev 312962)
@@ -13,7 +13,7 @@
 url='http://www.gnu.org/software/libc'
 license=(GPL LGPL)
 makedepends=(git gd)
-options=(!strip staticlibs)
+options=(!strip staticlibs debug)
 _commit=71170eba2af41e08d51cf9d7b1ded5fd4b0b5c9c  # release/2.26/master
 source=(git+https://sourceware.org/git/glibc.git#commit=${_commit}
 locale.gen.txt
@@ -154,22 +154,24 @@
   #   libpthread-${pkgver}.so
   #   libthread_db-1.0.so
 
-  cd "$pkgdir"
-  strip $STRIP_BINARIES usr/bin/{gencat,getconf,getent,iconv,iconvconfig} \
-usr/bin/{ldconfig,locale,localedef,nscd,makedb} \
-usr/bin/{pcprofiledump,pldd,rpcgen,sln,sprof} \
-usr/lib/getconf/*
+  if check_option 'debug' n; then
+cd "$pkgdir"
+strip $STRIP_BINARIES usr/bin/{gencat,getconf,getent,iconv,iconvconfig} \
+  usr/bin/{ldconfig,locale,localedef,nscd,makedb} \
+  usr/bin/{pcprofiledump,pldd,rpcgen,sln,sprof} \
+  usr/lib/getconf/*
 
-  strip $STRIP_STATIC usr/lib/lib{anl,BrokenLocale,c{,_nonshared},crypt}.a \
-  usr/lib/lib{dl,g,ieee,mcheck,nsl,pthread{,_nonshared}}.a 
\
-  usr/lib/lib{resolv,rpcsvc,rt,util}.a \
-  usr/lib/lib{m-${pkgver},mvec{,_nonshared}}.a
+strip $STRIP_STATIC usr/lib/lib{anl,BrokenLocale,c{,_nonshared},crypt}.a \
+
usr/lib/lib{dl,g,ieee,mcheck,nsl,pthread{,_nonshared}}.a \
+usr/lib/lib{resolv,rpcsvc,rt,util}.a \
+usr/lib/lib{m-${pkgver},mvec{,_nonshared}}.a
 
-  strip $STRIP_SHARED usr/lib/lib{anl,BrokenLocale,cidn,crypt}-${pkgver}.so \
-  
usr/lib/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-*.so \
-  usr/lib/lib{dl,m,nsl,resolv,rt,util}-${pkgver}.so \
-  usr/lib/lib{memusage,pcprofile,SegFault}.so \
-  usr/lib/{audit,gconv}/*.so usr/lib/libmvec-*.so || true
+strip $STRIP_SHARED usr/lib/lib{anl,BrokenLocale,cidn,crypt}-${pkgver}.so \
+
usr/lib/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-*.so \
+usr/lib/lib{dl,m,nsl,resolv,rt,util}-${pkgver}.so \
+usr/lib/lib{memusage,pcprofile,SegFault}.so \
+usr/lib/{audit,gconv}/*.so usr/lib/libmvec-*.so || true
+  fi
 }
 
 package_lib32-glibc() {
@@ -194,14 +196,16 @@
   # Symlink /usr/lib32/locale to /usr/lib/locale
   ln -s ../lib/locale "$pkgdir/usr/lib32/locale"
 
-  cd $pkgdir
-  strip $STRIP_BINARIES usr/lib32/getconf/*
-  strip $STRIP_STATIC usr/lib32/lib{anl,BrokenLocale,c{,_nonshared},crypt}.a \
-  
usr/lib32/lib{dl,g,ieee,mcheck,nsl,pthread{,_nonshared}}.a \
-  usr/lib32/lib{resolv,rpcsvc,rt,util,m}.a
-  strip $STRIP_SHARED usr/lib32/lib{anl,BrokenLocale,cidn,crypt}-${pkgver}.so \
-  
usr/lib32/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-*.so \
-  usr/lib32/lib{dl,m,nsl,resolv,rt,util}-${pkgver}.so \
-  usr/lib32/lib{memusage,pcprofile,SegFault}.so \
-  usr/lib32/{audit,gconv}/*.so || true
+  if check_option 'debug' n; then
+cd $pkgdir
+strip $STRIP_BINARIES usr/lib32/getconf/*
+strip $STRIP_STATIC usr/lib32/lib{anl,BrokenLocale,c{,_nonshared},crypt}.a 
\
+
usr/lib32/lib{dl,g,ieee,mcheck,nsl,pthread{,_nonshared}}.a \
+usr/lib32/lib{resolv,rpcsvc,rt,util,m}.a
+strip $STRIP_SHARED 
usr/lib32/lib{anl,BrokenLocale,cidn,crypt}-${pkgver}.so \
+
usr/lib32/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-*.so \
+usr/lib32/lib{dl,m,nsl,resolv,rt,util}-${pkgver}.so \
+usr/lib32/lib{memusage,pcprofile,SegFault}.so \
+usr/lib32/{audit,gconv}/*.so || true
+  fi
 }


[arch-commits] Commit in glibc/trunk (PKGBUILD)

2017-11-28 Thread Bartłomiej Piotrowski via arch-commits
Date: Tuesday, November 28, 2017 @ 16:29:34
  Author: bpiotrowski
Revision: 35

2.26-8: restore emptydirs

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-11-28 16:24:29 UTC (rev 34)
+++ PKGBUILD2017-11-28 16:29:34 UTC (rev 35)
@@ -8,12 +8,12 @@
 pkgbase=glibc
 pkgname=(glibc lib32-glibc)
 pkgver=2.26
-pkgrel=7
+pkgrel=8
 arch=(x86_64)
 url='http://www.gnu.org/software/libc'
 license=(GPL LGPL)
 makedepends=(git gd)
-options=(!strip staticlibs !emptydirs)
+options=(!strip staticlibs)
 _commit=71170eba2af41e08d51cf9d7b1ded5fd4b0b5c9c  # release/2.26/master
 source=(git+https://sourceware.org/git/glibc.git#commit=${_commit}
 locale.gen.txt


[arch-commits] Commit in glibc/trunk (PKGBUILD)

2017-10-30 Thread Bartłomiej Piotrowski
Date: Monday, October 30, 2017 @ 07:19:14
  Author: bpiotrowski
Revision: 308618

2.26-6: bump to latest commit from release/2.26/master

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |   11 ---
 1 file changed, 4 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-10-29 22:32:14 UTC (rev 308617)
+++ PKGBUILD2017-10-30 07:19:14 UTC (rev 308618)
@@ -7,7 +7,7 @@
 
 pkgname=glibc
 pkgver=2.26
-pkgrel=5
+pkgrel=6
 pkgdesc='GNU C Library'
 arch=(i686 x86_64)
 url='http://www.gnu.org/software/libc'
@@ -21,17 +21,15 @@
 etc/nscd.conf)
 options=(!strip staticlibs)
 install=glibc.install
-_commit=d5c6dea2d5b4b5c64625c5386f6baec7bf2d89b3
+_commit=4b692dffb95ac4812b161eb6a16113d7e824982e  # release/2.26/master
 source=(git+https://sourceware.org/git/glibc.git#commit=${_commit}
 locale.gen.txt
 locale-gen
-0001-Don-t-use-IFUNC-resolver-for-longjmp-or-system-in-li.patch
-0002-x86-Add-x86_64-to-x86-64-HWCAP-BZ-22093.patch)
+0001-Don-t-use-IFUNC-resolver-for-longjmp-or-system-in-li.patch)
 md5sums=('SKIP'
  '07ac979b6ab5eeb778d55f041529d623'
  '476e9113489f93b348b21e144b6a8fcf'
- 'cbc073315c00b03898b7fc614274d6b3'
- 'bd9b13f3294b6357baa809e4416b9f44')
+ 'cbc073315c00b03898b7fc614274d6b3')
 
 # pkgver() {
 #   cd glibc
@@ -43,7 +41,6 @@
 
   cd glibc
   patch -p1 -i 
"$srcdir/0001-Don-t-use-IFUNC-resolver-for-longjmp-or-system-in-li.patch"
-  patch -p1 -i "$srcdir/0002-x86-Add-x86_64-to-x86-64-HWCAP-BZ-22093.patch"
 }
 
 build() {


[arch-commits] Commit in glibc/trunk (PKGBUILD)

2017-10-10 Thread Bartłomiej Piotrowski
Date: Tuesday, October 10, 2017 @ 06:30:46
  Author: bpiotrowski
Revision: 307239

2.26-5: bump to latest commit from release/2.26/master

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-10-10 06:21:52 UTC (rev 307238)
+++ PKGBUILD2017-10-10 06:30:46 UTC (rev 307239)
@@ -7,7 +7,7 @@
 
 pkgname=glibc
 pkgver=2.26
-pkgrel=4
+pkgrel=5
 pkgdesc='GNU C Library'
 arch=(i686 x86_64)
 url='http://www.gnu.org/software/libc'
@@ -21,7 +21,7 @@
 etc/nscd.conf)
 options=(!strip staticlibs)
 install=glibc.install
-_commit=58270c0049404ef2f878fdd45df55f17f0b8c1f7
+_commit=d5c6dea2d5b4b5c64625c5386f6baec7bf2d89b3
 source=(git+https://sourceware.org/git/glibc.git#commit=${_commit}
 locale.gen.txt
 locale-gen


[arch-commits] Commit in glibc/trunk (PKGBUILD)

2017-09-04 Thread Bartłomiej Piotrowski
Date: Monday, September 4, 2017 @ 08:52:53
  Author: bpiotrowski
Revision: 304645

2.26-2: bump to latest commit from release/2.26/master

Fixes FS#55218. Also drop --enable-kernel as the default already is newer
than what we had set.

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-09-04 08:49:17 UTC (rev 304644)
+++ PKGBUILD2017-09-04 08:52:53 UTC (rev 304645)
@@ -7,8 +7,7 @@
 
 pkgname=glibc
 pkgver=2.26
-pkgrel=1
-_commit=1c9a5c270d8b66f30dcfaf1cb2d6cf39d3e18369
+pkgrel=2
 pkgdesc='GNU C Library'
 arch=(i686 x86_64)
 url='http://www.gnu.org/software/libc'
@@ -22,6 +21,7 @@
 etc/nscd.conf)
 options=(!strip staticlibs)
 install=glibc.install
+_commit=58270c0049404ef2f878fdd45df55f17f0b8c1f7
 source=(git+https://sourceware.org/git/glibc.git#commit=${_commit}
 locale.gen.txt
 locale-gen)
@@ -29,6 +29,11 @@
  '07ac979b6ab5eeb778d55f041529d623'
  '476e9113489f93b348b21e144b6a8fcf')
 
+# pkgver() {
+#   cd glibc
+#   git describe --tags | sed 's/^glibc-//;s/-/+/g'
+# }
+
 prepare() {
   mkdir -p glibc-build
 }
@@ -57,7 +62,6 @@
   --with-bugurl=https://bugs.archlinux.org/ \
   --enable-add-ons \
   --enable-bind-now \
-  --enable-kernel=2.6.32 \
   --enable-lock-elision \
   --enable-multi-arch \
   --enable-obsolete-nsl \


[arch-commits] Commit in glibc/trunk (PKGBUILD)

2017-08-17 Thread Bartłomiej Piotrowski
Date: Thursday, August 17, 2017 @ 10:51:24
  Author: bpiotrowski
Revision: 302336

2.26-1: new upstream release

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |   66 +
 1 file changed, 32 insertions(+), 34 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-08-17 10:47:33 UTC (rev 302335)
+++ PKGBUILD2017-08-17 10:51:24 UTC (rev 302336)
@@ -1,13 +1,14 @@
 # $Id$
-# Maintainer: Allan McRae 
+# Maintainer:  Bartłomiej Piotrowski 
+# Contributor: Allan McRae 
 
 # toolchain build order: 
linux-api-headers->glibc->binutils->gcc->binutils->glibc
 # NOTE: valgrind requires rebuilt with each major glibc version
 
 pkgname=glibc
-pkgver=2.25
-pkgrel=7
-_commit=adc7e06fb412a2a1ee52f8cb788caf436335b9f3  # release/2.25/master
+pkgver=2.26
+pkgrel=1
+_commit=1c9a5c270d8b66f30dcfaf1cb2d6cf39d3e18369
 pkgdesc='GNU C Library'
 arch=(i686 x86_64)
 url='http://www.gnu.org/software/libc'
@@ -14,7 +15,7 @@
 license=(GPL LGPL)
 groups=(base)
 depends=('linux-api-headers>=4.10' tzdata filesystem)
-makedepends=('gcc>=6' git gd)
+makedepends=(git gd)
 optdepends=('gd: for memusagestat')
 backup=(etc/gai.conf
 etc/locale.gen
@@ -29,8 +30,7 @@
  '476e9113489f93b348b21e144b6a8fcf')
 
 prepare() {
-  mkdir glibc-build
-  cd ${pkgname}
+  mkdir -p glibc-build
 }
 
 build() {
@@ -38,7 +38,7 @@
 
   if [[ ${CARCH} = "i686" ]]; then
 # Hack to fix NPTL issues with Xen, only required on 32bit platforms
-export CFLAGS="${CFLAGS} -mno-tls-direct-seg-refs"
+export CFLAGS="$CFLAGS -mno-tls-direct-seg-refs"
   fi
 
   echo "slibdir=/usr/lib" >> configparms
@@ -49,7 +49,7 @@
   # remove fortify for building libraries
   CPPFLAGS=${CPPFLAGS/-D_FORTIFY_SOURCE=2/}
 
-  ../${pkgname}/configure \
+  "$srcdir/glibc/configure" \
   --prefix=/usr \
   --libdir=/usr/lib \
   --libexecdir=/usr/lib \
@@ -56,14 +56,15 @@
   --with-headers=/usr/include \
   --with-bugurl=https://bugs.archlinux.org/ \
   --enable-add-ons \
-  --enable-obsolete-rpc \
+  --enable-bind-now \
   --enable-kernel=2.6.32 \
-  --enable-bind-now \
-  --disable-profile \
-  --enable-stackguard-randomization \
-  --enable-stack-protector=strong \
   --enable-lock-elision \
   --enable-multi-arch \
+  --enable-obsolete-nsl \
+  --enable-obsolete-rpc \
+  --enable-stack-protector=strong \
+  --enable-stackguard-randomization \
+  --disable-profile \
   --disable-werror
 
   # build libraries with fortify disabled
@@ -89,29 +90,28 @@
 }
 
 package() {
-  cd glibc-build
+  install -dm755 "$pkgdir/etc"
+  touch "$pkgdir/etc/ld.so.conf"
 
-  install -dm755 ${pkgdir}/etc
-  touch ${pkgdir}/etc/ld.so.conf
+  make -C glibc-build install_root="$pkgdir" install
+  rm -f "$pkgdir"/etc/ld.so.{cache,conf}
 
-  make install_root=${pkgdir} install
+  cd glibc
 
-  rm -f ${pkgdir}/etc/ld.so.{cache,conf}
+  install -dm755 "$pkgdir"/usr/lib/{locale,systemd/system,tmpfiles.d}
+  install -m644 nscd/nscd.conf "$pkgdir/etc/nscd.conf"
+  install -m644 nscd/nscd.service "$pkgdir/usr/lib/systemd/system"
+  install -m644 nscd/nscd.tmpfiles "$pkgdir/usr/lib/tmpfiles.d/nscd.conf"
+  install -dm755 "$pkgdir/var/db/nscd"
 
-  install -dm755 ${pkgdir}/usr/lib/{locale,systemd/system,tmpfiles.d}
+  install -m644 posix/gai.conf "$pkgdir"/etc/gai.conf
 
-  install -m644 ${srcdir}/${pkgname}/nscd/nscd.conf ${pkgdir}/etc/nscd.conf
-  install -m644 ${srcdir}/${pkgname}/nscd/nscd.service 
${pkgdir}/usr/lib/systemd/system
-  install -m644 ${srcdir}/${pkgname}/nscd/nscd.tmpfiles 
${pkgdir}/usr/lib/tmpfiles.d/nscd.conf
+  install -m755 "$srcdir/locale-gen" "$pkgdir/usr/bin"
 
-  install -m644 ${srcdir}/${pkgname}/posix/gai.conf ${pkgdir}/etc/gai.conf
-
-  install -m755 ${srcdir}/locale-gen ${pkgdir}/usr/bin
-
   # create /etc/locale.gen
-  install -m644 ${srcdir}/locale.gen.txt ${pkgdir}/etc/locale.gen
+  install -m644 "$srcdir/locale.gen.txt" "$pkgdir/etc/locale.gen"
   sed -e '1,3d' -e 's|/| |g' -e 's|\\| |g' -e 's|^|#|g' \
-${srcdir}/glibc/localedata/SUPPORTED >> ${pkgdir}/etc/locale.gen
+"$srcdir/glibc/localedata/SUPPORTED" >> "$pkgdir/etc/locale.gen"
 
   # Do not strip the following files for improved debugging support
   # ("improved" as in not breaking gdb and valgrind...):
@@ -120,14 +120,11 @@
   #   libpthread-${pkgver}.so
   #   libthread_db-1.0.so
 
-  cd $pkgdir
+  cd "$pkgdir"
   strip $STRIP_BINARIES usr/bin/{gencat,getconf,getent,iconv,iconvconfig} \
 usr/bin/{ldconfig,locale,localedef,nscd,makedb} \
 usr/bin/{pcprofiledump,pldd,rpcgen,sln,sprof} \
 usr/lib/getconf/*
-  if [[ $CARCH = "i686" ]]; then
-strip $STRIP_BINARIES usr/bin/lddlibc4
-  fi
 
   strip $STRIP_STATIC 

[arch-commits] Commit in glibc/trunk (PKGBUILD)

2017-07-10 Thread Bartłomiej Piotrowski
Date: Monday, July 10, 2017 @ 17:59:08
  Author: bpiotrowski
Revision: 300037

2.25-7: rebuild using testing/devtools for full RELRO

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-07-10 17:22:08 UTC (rev 300036)
+++ PKGBUILD2017-07-10 17:59:08 UTC (rev 300037)
@@ -6,7 +6,7 @@
 
 pkgname=glibc
 pkgver=2.25
-pkgrel=6
+pkgrel=7
 _commit=adc7e06fb412a2a1ee52f8cb788caf436335b9f3  # release/2.25/master
 pkgdesc='GNU C Library'
 arch=(i686 x86_64)


[arch-commits] Commit in glibc/trunk (PKGBUILD)

2017-07-10 Thread Bartłomiej Piotrowski
Date: Monday, July 10, 2017 @ 11:32:08
  Author: bpiotrowski
Revision: 300017

upgpkg: glibc 2.25-6

rebuild against [testing]

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-07-10 09:45:28 UTC (rev 300016)
+++ PKGBUILD2017-07-10 11:32:08 UTC (rev 300017)
@@ -6,7 +6,7 @@
 
 pkgname=glibc
 pkgver=2.25
-pkgrel=5
+pkgrel=6
 _commit=adc7e06fb412a2a1ee52f8cb788caf436335b9f3  # release/2.25/master
 pkgdesc='GNU C Library'
 arch=(i686 x86_64)


[arch-commits] Commit in glibc/trunk (PKGBUILD)

2017-06-06 Thread Bartłomiej Piotrowski
Date: Tuesday, June 6, 2017 @ 10:25:08
  Author: bpiotrowski
Revision: 298024

2.25-3: enable memusage and memusagestat (FS#53690)

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |   19 ++-
 1 file changed, 10 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-06-06 10:18:12 UTC (rev 298023)
+++ PKGBUILD2017-06-06 10:25:08 UTC (rev 298024)
@@ -6,19 +6,20 @@
 
 pkgname=glibc
 pkgver=2.25
-pkgrel=2
+pkgrel=3
 _commit=ccb4fd7a657b0fbc4890c98f4586d58a135fc583
-pkgdesc="GNU C Library"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/libc;
-license=('GPL' 'LGPL')
-groups=('base')
-depends=('linux-api-headers>=4.10' 'tzdata' 'filesystem')
-makedepends=('gcc>=6' 'git')
+pkgdesc='GNU C Library'
+arch=(i686 x86_64)
+url='http://www.gnu.org/software/libc'
+license=(GPL LGPL)
+groups=(base)
+depends=('linux-api-headers>=4.10' tzdata filesystem)
+makedepends=('gcc>=6' git gd)
+optdepends=('gd: for memusagestat')
 backup=(etc/gai.conf
 etc/locale.gen
 etc/nscd.conf)
-options=('!strip' 'staticlibs')
+options=(!strip staticlibs)
 install=glibc.install
 source=(git+https://sourceware.org/git/glibc.git#commit=${_commit}
 locale.gen.txt


[arch-commits] Commit in glibc/trunk (PKGBUILD)

2017-03-05 Thread Allan McRae
Date: Monday, March 6, 2017 @ 06:38:36
  Author: allan
Revision: 290042

fix stripping

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |   14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-03-06 06:28:04 UTC (rev 290041)
+++ PKGBUILD2017-03-06 06:38:36 UTC (rev 290042)
@@ -135,15 +135,21 @@
   fi
 
   strip $STRIP_STATIC usr/lib/lib{anl,BrokenLocale,c{,_nonshared},crypt}.a \
-  
usr/lib/lib{dl,g,ieee,m-${pkgver},mcheck,mvec{,_nonshared}}.a \
-  
usr/lib/lib{nsl,pthread{,_nonshared},resolv,rpcsvc,rt,util}.a
+  usr/lib/lib{dl,g,ieee,mcheck,nsl,pthread{,_nonshared}}.a 
\
+  usr/lib/lib{resolv,rpcsvc,rt,util}.a
 
-  strip $STRIP_SHARED usr/lib/lib{anl,BrokenLocale,cidn,crypt}-*.so \
+  strip $STRIP_SHARED usr/lib/lib{anl,BrokenLocale,cidn,crypt}-${pkgver}.so \
   
usr/lib/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-*.so \
-  usr/lib/lib{dl,m,nsl,resolv,rt,util}-*.so \
+  usr/lib/lib{dl,m,nsl,resolv,rt,util}-${pkgver}.so \
   usr/lib/lib{memusage,pcprofile,SegFault}.so \
   usr/lib/{audit,gconv}/*.so || true
+
   if [[ $CARCH = "x86_64" ]]; then
+strip $STRIP_STATIC usr/lib/lib{m-${pkgver},mvec{,_nonshared}}.a
 strip $STRIP_SHARED usr/lib/libmvec-*.so
   fi
+  
+  if [[ $CARCH = "i686" ]]; then
+strip $STRIP_STATIC usr/lib/libm.a
+  fi
 }


[arch-commits] Commit in glibc/trunk (PKGBUILD)

2017-03-05 Thread Allan McRae
Date: Monday, March 6, 2017 @ 06:28:04
  Author: allan
Revision: 290041

this better work...

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-03-06 06:20:06 UTC (rev 290040)
+++ PKGBUILD2017-03-06 06:28:04 UTC (rev 290041)
@@ -32,7 +32,10 @@
   
   cd glibc
   # avoid crashes on i686 memchr-sse2.S
-  git revert 23d27709a423aec32821e9a5198a10267107bae2 --no-edit
+  # https://sourceware.org/bugzilla/show_bug.cgi?id=21182
+  _revert_commit="23d27709a423aec32821e9a5198a10267107bae2"
+  _revert_file="sysdeps/i386/i686/multiarch/memchr-sse2.S"
+  git show ${_revert_commit} -- ${_revert_file} | git apply -R
 }
 
 build() {


[arch-commits] Commit in glibc/trunk (PKGBUILD)

2017-03-05 Thread Allan McRae
Date: Monday, March 6, 2017 @ 06:20:06
  Author: allan
Revision: 290040

no-edit

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-03-06 05:55:55 UTC (rev 290039)
+++ PKGBUILD2017-03-06 06:20:06 UTC (rev 290040)
@@ -32,7 +32,7 @@
   
   cd glibc
   # avoid crashes on i686 memchr-sse2.S
-  git revert 23d27709a423aec32821e9a5198a10267107bae2
+  git revert 23d27709a423aec32821e9a5198a10267107bae2 --no-edit
 }
 
 build() {


[arch-commits] Commit in glibc/trunk (PKGBUILD)

2017-03-05 Thread Allan McRae
Date: Monday, March 6, 2017 @ 05:41:01
  Author: allan
Revision: 290035

prepare update

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-03-06 05:39:59 UTC (rev 290034)
+++ PKGBUILD2017-03-06 05:41:01 UTC (rev 290035)
@@ -13,7 +13,7 @@
 url="http://www.gnu.org/software/libc;
 license=('GPL' 'LGPL')
 groups=('base')
-depends=('linux-api-headers>=4.7' 'tzdata' 'filesystem')
+depends=('linux-api-headers>=4.10' 'tzdata' 'filesystem')
 makedepends=('gcc>=6' 'git')
 backup=(etc/gai.conf
 etc/locale.gen


[arch-commits] Commit in glibc/trunk (PKGBUILD)

2017-03-05 Thread Allan McRae
Date: Monday, March 6, 2017 @ 05:39:59
  Author: allan
Revision: 290034

prepare update

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-03-06 05:39:20 UTC (rev 290033)
+++ PKGBUILD2017-03-06 05:39:59 UTC (rev 290034)
@@ -7,7 +7,7 @@
 pkgname=glibc
 pkgver=2.25
 pkgrel=1
-_commit=58520986c38e34db60e07260c64c563e3efcf353
+_commit=69e0a87cc4c570e3b7218392fc3e743b5bddcce2
 pkgdesc="GNU C Library"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/libc;
@@ -29,6 +29,10 @@
 
 prepare() {
   mkdir glibc-build
+  
+  cd glibc
+  # avoid crashes on i686 memchr-sse2.S
+  git revert 23d27709a423aec32821e9a5198a10267107bae2
 }
 
 build() {
@@ -36,7 +40,6 @@
 
   if [[ ${CARCH} = "i686" ]]; then
 # Hack to fix NPTL issues with Xen, only required on 32bit platforms
-# TODO: make separate glibc-xen package for i686
 export CFLAGS="${CFLAGS} -mno-tls-direct-seg-refs"
   fi
 


[arch-commits] Commit in glibc/trunk (PKGBUILD)

2017-02-16 Thread Allan McRae
Date: Thursday, February 16, 2017 @ 10:51:23
  Author: allan
Revision: 289048

update

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |   39 ---
 1 file changed, 16 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-02-16 10:50:57 UTC (rev 289047)
+++ PKGBUILD2017-02-16 10:51:23 UTC (rev 289048)
@@ -5,9 +5,9 @@
 # NOTE: valgrind requires rebuilt with each major glibc version
 
 pkgname=glibc
-pkgver=2.24
-pkgrel=2.91
-_commit=fdfc9260
+pkgver=2.25
+pkgrel=1
+_commit=58520986c38e34db60e07260c64c563e3efcf353
 pkgdesc="GNU C Library"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/libc;
@@ -20,22 +20,15 @@
 etc/nscd.conf)
 options=('!strip' 'staticlibs')
 install=glibc.install
-source=(git://sourceware.org/git/glibc.git#commit=${_commit}
+source=(git+https://sourceware.org/git/glibc.git#commit=${_commit}
 locale.gen.txt
-locale-gen
-0001-Revert-Avoid-an-extra-branch-to-PLT-for-z-now.patch)
+locale-gen)
 md5sums=('SKIP'
  '07ac979b6ab5eeb778d55f041529d623'
- '476e9113489f93b348b21e144b6a8fcf'
- 'aa0c0742ea5de00c25dfae8868c1bc9b')
+ '476e9113489f93b348b21e144b6a8fcf')
 
 prepare() {
   mkdir glibc-build
-  
-  cd glibc
-  # build fails with PIE enabled toolchain
-  # https://sourceware.org/bugzilla/show_bug.cgi?id=20621
-  patch -p1 -i $srcdir/0001-Revert-Avoid-an-extra-branch-to-PLT-for-z-now.patch
 }
 
 build() {
@@ -52,11 +45,8 @@
   echo "sbindir=/usr/bin" >> configparms
   echo "rootsbindir=/usr/bin" >> configparms
 
-  # remove hardening options for building libraries
+  # remove fortify for building libraries
   CPPFLAGS=${CPPFLAGS/-D_FORTIFY_SOURCE=2/}
-  CFLAGS=${CFLAGS/-fstack-protector-strong/}
-  # this is handled properly by --enable-bind-now
-  LDFLAGS=${LDFLAGS/,-z,now/}
 
   ../${pkgname}/configure \
   --prefix=/usr \
@@ -70,19 +60,20 @@
   --enable-bind-now \
   --disable-profile \
   --enable-stackguard-randomization \
+  --enable-stack-protector=strong \
   --enable-lock-elision \
   --enable-multi-arch \
   --disable-werror
 
-  # build libraries with hardening disabled
+  # build libraries with fortify disabled
   echo "build-programs=no" >> configparms
   make
 
-  # re-enable hardening for programs
+  # re-enable fortify for programs
   sed -i "/build-programs=/s#no#yes#" configparms
 
-  echo "CC += -fstack-protector-strong -D_FORTIFY_SOURCE=2" >> configparms
-  echo "CXX += -fstack-protector-strong -D_FORTIFY_SOURCE=2" >> configparms
+  echo "CC += -D_FORTIFY_SOURCE=2" >> configparms
+  echo "CXX += -D_FORTIFY_SOURCE=2" >> configparms
   make
 }
 
@@ -89,7 +80,7 @@
 check() {
   cd glibc-build
 
-  # remove harding in preparation to run test-suite
+  # remove fortify in preparation to run test-suite
   sed -i '/FORTIFY/d' configparms
 
   # some failures are "expected"
@@ -137,7 +128,9 @@
 strip $STRIP_BINARIES usr/bin/lddlibc4
   fi
 
-  strip $STRIP_STATIC usr/lib/*.a
+  strip $STRIP_STATIC usr/lib/lib{anl,BrokenLocale,c{,_nonshared},crypt}.a \
+  
usr/lib/lib{dl,g,ieee,m-${pkgver},mcheck,mvec{,_nonshared}}.a \
+  
usr/lib/lib{nsl,pthread{,_nonshared},resolv,rpcsvc,rt,util}.a
 
   strip $STRIP_SHARED usr/lib/lib{anl,BrokenLocale,cidn,crypt}-*.so \
   
usr/lib/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-*.so \


[arch-commits] Commit in glibc/trunk (PKGBUILD)

2016-11-01 Thread Allan McRae
Date: Tuesday, November 1, 2016 @ 06:06:35
  Author: allan
Revision: 279551

prepare for LDFLAGS+=-z,now

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-10-31 21:53:55 UTC (rev 279550)
+++ PKGBUILD2016-11-01 06:06:35 UTC (rev 279551)
@@ -6,7 +6,7 @@
 
 pkgname=glibc
 pkgver=2.24
-pkgrel=2.90
+pkgrel=2.91
 _commit=fdfc9260
 pkgdesc="GNU C Library"
 arch=('i686' 'x86_64')
@@ -55,6 +55,8 @@
   # remove hardening options for building libraries
   CPPFLAGS=${CPPFLAGS/-D_FORTIFY_SOURCE=2/}
   CFLAGS=${CFLAGS/-fstack-protector-strong/}
+  # this is handled properly by --enable-bind-now
+  LDFLAGS=${LDFLAGS/,-z,now/}
 
   ../${pkgname}/configure \
   --prefix=/usr \


[arch-commits] Commit in glibc/trunk (PKGBUILD)

2016-08-06 Thread Allan McRae
Date: Saturday, August 6, 2016 @ 12:49:14
  Author: allan
Revision: 273399

upgpkg: glibc 2.24-2

binutils-2.27 toolchain rebuild

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-08-06 12:47:06 UTC (rev 273398)
+++ PKGBUILD2016-08-06 12:49:14 UTC (rev 273399)
@@ -6,7 +6,7 @@
 
 pkgname=glibc
 pkgver=2.24
-pkgrel=1
+pkgrel=2
 _commit=fdfc9260
 pkgdesc="GNU C Library"
 arch=('i686' 'x86_64')


[arch-commits] Commit in glibc/trunk (PKGBUILD)

2016-08-01 Thread Allan McRae
Date: Tuesday, August 2, 2016 @ 05:14:41
  Author: allan
Revision: 272798

prepare glibc-2.24 toolchain rebuild

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-08-02 00:36:49 UTC (rev 272797)
+++ PKGBUILD2016-08-02 05:14:41 UTC (rev 272798)
@@ -5,16 +5,16 @@
 # NOTE: valgrind requires rebuilt with each major glibc version
 
 pkgname=glibc
-pkgver=2.23
-pkgrel=5
-_commit=1915d6d1
+pkgver=2.24
+pkgrel=1
+_commit=fdfc9260
 pkgdesc="GNU C Library"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/libc;
 license=('GPL' 'LGPL')
 groups=('base')
-depends=('linux-api-headers>=4.1' 'tzdata' 'filesystem')
-makedepends=('gcc>=5.2' 'git')
+depends=('linux-api-headers>=4.7' 'tzdata' 'filesystem')
+makedepends=('gcc>=6' 'git')
 backup=(etc/gai.conf
 etc/locale.gen
 etc/nscd.conf)


[arch-commits] Commit in glibc/trunk (PKGBUILD)

2016-06-02 Thread Allan McRae
Date: Friday, June 3, 2016 @ 02:47:54
  Author: allan
Revision: 268856

upgpkg: glibc 2.23-5

CVE-2016-4429

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-06-02 16:43:50 UTC (rev 268855)
+++ PKGBUILD2016-06-03 00:47:54 UTC (rev 268856)
@@ -6,8 +6,8 @@
 
 pkgname=glibc
 pkgver=2.23
-pkgrel=4
-_commit=a37d61a6
+pkgrel=5
+_commit=1915d6d1
 pkgdesc="GNU C Library"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/libc;


[arch-commits] Commit in glibc/trunk (PKGBUILD)

2016-05-11 Thread Allan McRae
Date: Wednesday, May 11, 2016 @ 14:55:16
  Author: allan
Revision: 267799

CVE-2016-3706, revert dlsym/dlvsym lookup errors patch

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-05-11 12:47:28 UTC (rev 267798)
+++ PKGBUILD2016-05-11 12:55:16 UTC (rev 267799)
@@ -6,8 +6,8 @@
 
 pkgname=glibc
 pkgver=2.23
-pkgrel=3
-_commit=bbea74b2
+pkgrel=4
+_commit=a37d61a6
 pkgdesc="GNU C Library"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/libc;


[arch-commits] Commit in glibc/trunk (PKGBUILD)

2016-05-09 Thread Allan McRae
Date: Monday, May 9, 2016 @ 15:47:20
  Author: allan
Revision: 267257

upgpkg: glibc 2.23-3

CVE-2016-1234

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-05-09 11:56:32 UTC (rev 267256)
+++ PKGBUILD2016-05-09 13:47:20 UTC (rev 267257)
@@ -6,8 +6,8 @@
 
 pkgname=glibc
 pkgver=2.23
-pkgrel=2
-_commit=5769d5d1
+pkgrel=3
+_commit=bbea74b2
 pkgdesc="GNU C Library"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/libc;


[arch-commits] Commit in glibc/trunk (PKGBUILD glibc.install)

2016-05-01 Thread Allan McRae
Date: Monday, May 2, 2016 @ 04:23:43
  Author: allan
Revision: 266742

gcc-6 build, remove install file handling of info pages, bump to latest git 
commit

Modified:
  glibc/trunk/PKGBUILD
  glibc/trunk/glibc.install

---+
 PKGBUILD  |4 ++--
 glibc.install |   15 ---
 2 files changed, 2 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-05-02 02:22:54 UTC (rev 266741)
+++ PKGBUILD2016-05-02 02:23:43 UTC (rev 266742)
@@ -6,8 +6,8 @@
 
 pkgname=glibc
 pkgver=2.23
-pkgrel=1
-_commit=e742928c
+pkgrel=2
+_commit=5769d5d1
 pkgdesc="GNU C Library"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/libc;

Modified: glibc.install
===
--- glibc.install   2016-05-02 02:22:54 UTC (rev 266741)
+++ glibc.install   2016-05-02 02:23:43 UTC (rev 266742)
@@ -1,20 +1,5 @@
-infodir=usr/share/info
-filelist=(libc.info{,-1,-2,-3,-4,-5,-6,-7,-8,-9,-10,-11})
-
 post_upgrade() {
   locale-gen
 
   ldconfig -r .
-  
-  [[ -x usr/bin/install-info ]] || return 0
-  for file in ${filelist[@]}; do
-install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
 }
-
-pre_remove() {
-  [[ -x usr/bin/install-info ]] || return 0
-  for file in ${filelist[@]}; do
-install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}


[arch-commits] Commit in glibc/trunk (PKGBUILD glibc.install)

2016-02-19 Thread Allan McRae
Date: Saturday, February 20, 2016 @ 01:54:28
  Author: allan
Revision: 260027

upgpkg: glibc 2.23-1

glibc-2.23 + binutils-2.26 rebuild

Modified:
  glibc/trunk/PKGBUILD
  glibc/trunk/glibc.install

---+
 PKGBUILD  |   59 
 glibc.install |4 ---
 2 files changed, 18 insertions(+), 45 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-02-19 23:31:11 UTC (rev 260026)
+++ PKGBUILD2016-02-20 00:54:28 UTC (rev 260027)
@@ -4,11 +4,10 @@
 # toolchain build order: 
linux-api-headers->glibc->binutils->gcc->binutils->glibc
 # NOTE: valgrind requires rebuilt with each major glibc version
 
-# NOTE: adjust version in install script when locale files are updated
-
 pkgname=glibc
-pkgver=2.22
-pkgrel=4
+pkgver=2.23
+pkgrel=1
+_commit=e742928c
 pkgdesc="GNU C Library"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/libc;
@@ -15,41 +14,25 @@
 license=('GPL' 'LGPL')
 groups=('base')
 depends=('linux-api-headers>=4.1' 'tzdata' 'filesystem')
-makedepends=('gcc>=5.2')
+makedepends=('gcc>=5.2' 'git')
 backup=(etc/gai.conf
 etc/locale.gen
 etc/nscd.conf)
 options=('!strip' 'staticlibs')
 install=glibc.install
-source=(http://ftp.gnu.org/gnu/libc/${pkgname}-${pkgver}.tar.xz{,.sig}
-glibc-2.22-roundup.patch
-glibc-2.22-CVE-2015-7547.patch
+source=(git://sourceware.org/git/glibc.git#commit=${_commit}
 locale.gen.txt
 locale-gen)
-md5sums=('e51e02bf552a0a1fbbdc948fb2f5e83c'
- 'SKIP'
- 'd4b9754a2d5e8f113d47c67386f75e7b'
- 'db053da46e40f25a0fc988936725080b'
+md5sums=('SKIP'
  '07ac979b6ab5eeb778d55f041529d623'
  '476e9113489f93b348b21e144b6a8fcf')
-validpgpkeys=('F37CDAB708E65EA183FD1AF625EF0A436C2A4AFF')  # Carlos O'Donell
 
 prepare() {
-  cd ${srcdir}/glibc-${pkgver}
-
-  # glibc-2.22..287de30e
-  # 060f8dbd (and 13ff0739) is reverted as it breaks the testsuite on x86_64
-  # TODO: figure out why...
-  patch -p1 -i $srcdir/glibc-2.22-roundup.patch
-
-  # CVE-2015-7547 - patch from upstream
-  patch -p1 -i $srcdir/glibc-2.22-CVE-2015-7547.patch
-
-  mkdir ${srcdir}/glibc-build
+  mkdir glibc-build
 }
 
 build() {
-  cd ${srcdir}/glibc-build
+  cd glibc-build
 
   if [[ ${CARCH} = "i686" ]]; then
 # Hack to fix NPTL issues with Xen, only required on 32bit platforms
@@ -66,7 +49,7 @@
   CFLAGS=${CFLAGS/-fstack-protector-strong/}
   CPPFLAGS=${CPPFLAGS/-D_FORTIFY_SOURCE=2/}
 
-  ${srcdir}/${pkgname}-${pkgver}/configure --prefix=/usr \
+  ../${pkgname}/configure --prefix=/usr \
   --libdir=/usr/lib --libexecdir=/usr/lib \
   --with-headers=/usr/include \
   --with-bugurl=https://bugs.archlinux.org/ \
@@ -90,11 +73,11 @@
   make
 
   # remove harding in preparation to run test-suite
-  sed -i '5,7d' configparms
+  sed -i '/FORTIFY/d' configparms
 }
 
 check() {
-  cd ${srcdir}/glibc-build
+  cd glibc-build
 
   # some failures are "expected"
   make check || true
@@ -101,7 +84,7 @@
 }
 
 package() {
-  cd ${srcdir}/glibc-build
+  cd glibc-build
 
   install -dm755 ${pkgdir}/etc
   touch ${pkgdir}/etc/ld.so.conf
@@ -112,11 +95,11 @@
 
   install -dm755 ${pkgdir}/usr/lib/{locale,systemd/system,tmpfiles.d}
 
-  install -m644 ${srcdir}/${pkgname}-${pkgver}/nscd/nscd.conf 
${pkgdir}/etc/nscd.conf
-  install -m644 ${srcdir}/${pkgname}-${pkgver}/nscd/nscd.service 
${pkgdir}/usr/lib/systemd/system
-  install -m644 ${srcdir}/${pkgname}-${pkgver}/nscd/nscd.tmpfiles 
${pkgdir}/usr/lib/tmpfiles.d/nscd.conf
+  install -m644 ${srcdir}/${pkgname}/nscd/nscd.conf ${pkgdir}/etc/nscd.conf
+  install -m644 ${srcdir}/${pkgname}/nscd/nscd.service 
${pkgdir}/usr/lib/systemd/system
+  install -m644 ${srcdir}/${pkgname}/nscd/nscd.tmpfiles 
${pkgdir}/usr/lib/tmpfiles.d/nscd.conf
 
-  install -m644 ${srcdir}/${pkgname}-${pkgver}/posix/gai.conf 
${pkgdir}/etc/gai.conf
+  install -m644 ${srcdir}/${pkgname}/posix/gai.conf ${pkgdir}/etc/gai.conf
 
   install -m755 ${srcdir}/locale-gen ${pkgdir}/usr/bin
 
@@ -123,16 +106,8 @@
   # create /etc/locale.gen
   install -m644 ${srcdir}/locale.gen.txt ${pkgdir}/etc/locale.gen
   sed -e '1,3d' -e 's|/| |g' -e 's|\\| |g' -e 's|^|#|g' \
-${srcdir}/glibc-${pkgver}/localedata/SUPPORTED >> ${pkgdir}/etc/locale.gen
+${srcdir}/glibc/localedata/SUPPORTED >> ${pkgdir}/etc/locale.gen
 
-  # remove the static libraries that have a shared counterpart
-  # libc, libdl, libm and libpthread are required for toolchain testsuites
-  # in addition libcrypt appears widely required
-  rm $pkgdir/usr/lib/lib{anl,BrokenLocale,nsl,resolv,rt,util}.a
-  if [[ $CARCH = "x86_64" ]]; then
-rm $pkgdir/usr/lib/libmvec.a
-  fi
-
   # Do not strip the following files for improved debugging support
   # ("improved" as in not breaking gdb and valgrind...):
   #   ld-${pkgver}.so

Modified: glibc.install
===
--- 

[arch-commits] Commit in glibc/trunk (PKGBUILD glibc-2.22-roundup.patch)

2016-02-16 Thread Allan McRae
Date: Wednesday, February 17, 2016 @ 05:51:29
  Author: allan
Revision: 259874

upgpkg: glibc 2.22-4

fix CVE-2015-7547 CVE-2015-8776 CVE-2015-8777 CVE-2015-8778 CVE-2015-8779

Modified:
  glibc/trunk/PKGBUILD
  glibc/trunk/glibc-2.22-roundup.patch

--+
 PKGBUILD |4 -
 glibc-2.22-roundup.patch |  158 +
 2 files changed, 7 insertions(+), 155 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-02-17 00:57:50 UTC (rev 259873)
+++ PKGBUILD2016-02-17 04:51:29 UTC (rev 259874)
@@ -28,7 +28,7 @@
 locale-gen)
 md5sums=('e51e02bf552a0a1fbbdc948fb2f5e83c'
  'SKIP'
- '176ca8230b2c1d2e9a904c3527ebed24'
+ 'd4b9754a2d5e8f113d47c67386f75e7b'
  'db053da46e40f25a0fc988936725080b'
  '07ac979b6ab5eeb778d55f041529d623'
  '476e9113489f93b348b21e144b6a8fcf')
@@ -38,6 +38,8 @@
   cd ${srcdir}/glibc-${pkgver}
 
   # glibc-2.22..287de30e
+  # 060f8dbd (and 13ff0739) is reverted as it breaks the testsuite on x86_64
+  # TODO: figure out why...
   patch -p1 -i $srcdir/glibc-2.22-roundup.patch
 
   # CVE-2015-7547 - patch from upstream

Modified: glibc-2.22-roundup.patch
===
--- glibc-2.22-roundup.patch2016-02-17 00:57:50 UTC (rev 259873)
+++ glibc-2.22-roundup.patch2016-02-17 04:51:29 UTC (rev 259874)
@@ -1,8 +1,8 @@
 diff --git a/ChangeLog b/ChangeLog
-index cb9124e..58df7c8 100644
+index cb9124e..376355f 100644
 --- a/ChangeLog
 +++ b/ChangeLog
-@@ -1,3 +1,317 @@
+@@ -1,3 +1,300 @@
 +2016-02-12  Florian Weimer  
 +
 +  * misc/bug18240.c (do_test): Set RLIMIT_AS.
@@ -80,23 +80,6 @@
 +  (__lll_lock_elision): Likewise, and respect a value of
 +  try_tbegin <= 0.
 +
-+2015-12-03  Andrew Senkevich  
-+
-+  * math/Makefile ($(inst_libdir)/libm.so): Corrected path to
-+  libmvec_nonshared.a
-+
-+2015-11-27  Andrew Senkevich  
-+
-+  [BZ #19058]
-+  * math/Makefile ($(inst_libdir)/libm.so): Added libmvec_nonshared.a to
-+  AS_NEEDED.
-+  * sysdeps/x86/fpu/bits/math-vector.h: Removed code with asm aliases
-+  workaround.
-+  * sysdeps/x86_64/fpu/Makefile (libmvec-support,
-+  libmvec-static-only-routines): Added new file.
-+  * sysdeps/x86_64/fpu/svml_finite_alias.S: New file.
-+  * NEWS: Mention this fix.
-+
 +2015-11-20  Roland McGrath  
 +
 +  * sysdeps/nacl/dl-map-segments.h (_dl_map_segments): Use
@@ -321,7 +304,7 @@
  
* version.h (RELEASE): Set to "stable".
 diff --git a/NEWS b/NEWS
-index 4c31de7..d1daf9b 100644
+index 4c31de7..7c4fbc6 100644
 --- a/NEWS
 +++ b/NEWS
 @@ -5,6 +5,16 @@ See the end for copying conditions.
@@ -333,7 +316,7 @@
 +* The following bugs are resolved with this release:
 +
 +  17905, 18420, 18421, 18480, 18589, 18743, 18778, 18781, 18787, 18796,
-+  18870, 18887, 18921, 18928, 18969, 18985, 19018, 19058, 19174, 19178.
++  18870, 18887, 18921, 18928, 18969, 18985, 19018, 19174, 19178.
 +
 +* The LD_POINTER_GUARD environment variable can no longer be used to
 +  disable the pointer guard feature.  It is always enabled.
@@ -1266,19 +1249,6 @@
write_locale_data (output_path, LC_COLLATE, "LC_COLLATE", );
  
obstack_free (, NULL);
-diff --git a/math/Makefile b/math/Makefile
-index 6388bae..2c9d72d 100644
 a/math/Makefile
-+++ b/math/Makefile
-@@ -98,7 +98,7 @@ $(inst_libdir)/libm.so: $(common-objpfx)format.lds \
-   (echo '/* GNU ld script'; echo '*/';\
-cat $<; \
-echo 'GROUP ( $(slibdir)/libm.so$(libm.so-version) ' \
--'AS_NEEDED ( $(slibdir)/libmvec.so$(libmvec.so-version) ) )' \
-+'AS_NEEDED ( $(libdir)/libmvec_nonshared.a 
$(slibdir)/libmvec.so$(libmvec.so-version) ) )' \
-   ) > $@
- endif
- 
 diff --git a/misc/Makefile b/misc/Makefile
 index aecb0da..12055ce 100644
 --- a/misc/Makefile
@@ -2645,126 +2615,6 @@
  use_lock:
return LLL_LOCK ((*lock), pshared);
  }
-diff --git a/sysdeps/x86/fpu/bits/math-vector.h 
b/sysdeps/x86/fpu/bits/math-vector.h
-index f9e798b..f3bfb86 100644
 a/sysdeps/x86/fpu/bits/math-vector.h
-+++ b/sysdeps/x86/fpu/bits/math-vector.h
-@@ -53,34 +53,5 @@
- #  undef __DECL_SIMD_powf
- #  define __DECL_SIMD_powf __DECL_SIMD_x86_64
- 
--/* Workaround to exclude unnecessary symbol aliases in libmvec
--   while GCC creates the vector names based on scalar asm name.
--   Corresponding discussion started at
--   .  */
--__asm__ ("_ZGVbN2v___log_finite = _ZGVbN2v_log");
--__asm__ ("_ZGVcN4v___log_finite = _ZGVcN4v_log");
--__asm__ ("_ZGVdN4v___log_finite = _ZGVdN4v_log");
--__asm__ ("_ZGVeN8v___log_finite = _ZGVeN8v_log");
--__asm__ ("_ZGVbN4v___logf_finite = _ZGVbN4v_logf");
--__asm__ ("_ZGVcN8v___logf_finite = _ZGVcN8v_logf");

[arch-commits] Commit in glibc/trunk (PKGBUILD)

2016-02-16 Thread Allan McRae
Date: Wednesday, February 17, 2016 @ 01:57:50
  Author: allan
Revision: 259873

remove patch included in roundup

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |2 --
 1 file changed, 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-02-17 00:55:30 UTC (rev 259872)
+++ PKGBUILD2016-02-17 00:57:50 UTC (rev 259873)
@@ -24,7 +24,6 @@
 source=(http://ftp.gnu.org/gnu/libc/${pkgname}-${pkgver}.tar.xz{,.sig}
 glibc-2.22-roundup.patch
 glibc-2.22-CVE-2015-7547.patch
-glibc-2.22-Gracefully-handle-incompatible-locale-data.patch
 locale.gen.txt
 locale-gen)
 md5sums=('e51e02bf552a0a1fbbdc948fb2f5e83c'
@@ -31,7 +30,6 @@
  'SKIP'
  '176ca8230b2c1d2e9a904c3527ebed24'
  'db053da46e40f25a0fc988936725080b'
- '462e43aa6438fb1dfce8ad605e35cc24'
  '07ac979b6ab5eeb778d55f041529d623'
  '476e9113489f93b348b21e144b6a8fcf')
 validpgpkeys=('F37CDAB708E65EA183FD1AF625EF0A436C2A4AFF')  # Carlos O'Donell


[arch-commits] Commit in glibc/trunk (PKGBUILD glibc-2.22-roundup.patch)

2015-10-11 Thread Allan McRae
Date: Monday, October 12, 2015 @ 01:14:59
  Author: allan
Revision: 248901

upgpkg: glibc 2.22-4

pull upstream patchset

Modified:
  glibc/trunk/PKGBUILD
  glibc/trunk/glibc-2.22-roundup.patch

--+
 PKGBUILD |6 
 glibc-2.22-roundup.patch |  439 -
 2 files changed, 438 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-10-11 23:07:53 UTC (rev 248900)
+++ PKGBUILD2015-10-11 23:14:59 UTC (rev 248901)
@@ -8,7 +8,7 @@
 
 pkgname=glibc
 pkgver=2.22
-pkgrel=3
+pkgrel=4
 pkgdesc="GNU C Library"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/libc;
@@ -27,7 +27,7 @@
 locale-gen)
 md5sums=('e51e02bf552a0a1fbbdc948fb2f5e83c'
  'SKIP'
- 'b6b7a0e8d6e6520e40e3164ae773631d'
+ '8476d7f2bceaacde30ea2b9d4afb4bd1'
  '07ac979b6ab5eeb778d55f041529d623'
  '476e9113489f93b348b21e144b6a8fcf')
 validpgpkeys=('F37CDAB708E65EA183FD1AF625EF0A436C2A4AFF')  # Carlos O'Donell
@@ -35,7 +35,7 @@
 prepare() {
   cd ${srcdir}/glibc-${pkgver}
 
-  # glibc-2.21..01b07c70
+  # glibc-2.21..g2b529a8
   patch -p1 -i $srcdir/glibc-2.22-roundup.patch
 
   mkdir ${srcdir}/glibc-build

Modified: glibc-2.22-roundup.patch
===
--- glibc-2.22-roundup.patch2015-10-11 23:07:53 UTC (rev 248900)
+++ glibc-2.22-roundup.patch2015-10-11 23:14:59 UTC (rev 248901)
@@ -1,8 +1,64 @@
 diff --git a/ChangeLog b/ChangeLog
-index cb9124e..d0d2cbd 100644
+index cb9124e..491d5c7 100644
 --- a/ChangeLog
 +++ b/ChangeLog
-@@ -1,3 +1,74 @@
+@@ -1,3 +1,130 @@
++2015-10-09  Carlos O'Donell  
++
++  [BZ #18589]
++  * string/bug-strcoll2.c: Adjust copyright, and remove contributed by.
++  * string/Makefile ($(objpfx)bug-strcoll2.out): Depend on
++  $(gen-locales).
++
++2015-10-08  Carlos O'Donell  
++
++  [BZ #18589]
++  * string/Makefile (tests): Add bug-strcoll2.
++  (LOCALES): Add cs_CZ.UTF-8.
++
++2015-09-28  Martin Sebor  
++
++  [BZ #18969]
++  * string/Makefile (LOCALES): Define.
++  (gen-locales.mk): Include.
++  (test-strcasecmp.out, test-strncasecmp.out, tst-strxfrm.out)
++  (tst-strxfrm2.out): Add deppendency on $(gen-locales).
++  * string/tst-strxfrm2.c (do_test): Print the name of the locale
++  on setlocale failure.
++
++2015-10-08  Carlos O'Donell  
++
++  [BZ #18589]
++  * string/bug-strcoll2.c: New file.
++  * locale/categories.def: Revert commit
++  f13c2a8dff2329c6692a80176262ceaaf8a6f74e.
++  * locale/langinfo.h: Likewise.
++  * locale/localeinfo.h: Likewise.
++  * locale/C-collate.c: Likewise.
++  * programs/ld-collate.c (collate_output): Likewise.
++  * string/strcoll_l.c (STRDIFF): Likewise.
++  (STRCOLL): Likewise.
++  * wcsmbs/wcscoll_l.c: Likewise.
++
++2015-09-15  Roland McGrath  
++
++  * misc/sys/param.h [!MAXHOSTNAMELEN && HOST_NAME_MAX]
++  (MAXHOSTNAMELEN): Define it to HOST_NAME_MAX.
++
++2015-09-11  Roland McGrath  
++
++  * sysdeps/nacl/Makefile [$(subdir) = misc] (sysdep_headers):
++  Use 'override' keyword to freeze the value here, preventing
++  the addition of sys/mtio.h by sysdeps/gnu/Makefile.
++
++2015-09-04  Roland McGrath  
++
++  [BZ #18921]
++  * sysdeps/posix/opendir.c (need_isdir_precheck) [O_DIRECTORY]:
++  Fix inverted sense of test of 'o_directory_works' value.
++  Reported by Pádraig Brady , diagnosed by
++  Bernhard Voelker .
++
 +2015-08-31  Brett Neumeier 
 +
 +  [BZ #18870]
@@ -78,7 +134,7 @@
  
* version.h (RELEASE): Set to "stable".
 diff --git a/NEWS b/NEWS
-index 4c31de7..ce0255a 100644
+index 4c31de7..9b10bff 100644
 --- a/NEWS
 +++ b/NEWS
 @@ -5,6 +5,12 @@ See the end for copying conditions.
@@ -89,7 +145,7 @@
 +
 +* The following bugs are resolved with this release:
 +
-+  18778, 18781, 18787, 18796, 18870, 18887.
++  18589, 18778, 18781, 18787, 18796, 18870, 18887, 18921, 18969.
 +
  Version 2.22
  
@@ -286,6 +342,97 @@
test_ftello ();
  
return 0;
+diff --git a/locale/C-collate.c b/locale/C-collate.c
+index d7f3c55..06dfdfa 100644
+--- a/locale/C-collate.c
 b/locale/C-collate.c
+@@ -144,8 +144,6 @@ const struct __locale_data _nl_C_LC_COLLATE 
attribute_hidden =
+ /* _NL_COLLATE_COLLSEQWC */
+ { .string = (const char *) collseqwc },
+ /* _NL_COLLATE_CODESET */
+-{ .string = _nl_C_codeset },
+-/* _NL_COLLATE_ENCODING_TYPE */
+-{ .word = __cet_8bit }
++{ .string = _nl_C_codeset }
+   }
+ };
+diff --git a/locale/categories.def b/locale/categories.def
+index 045489d..a8dda53 100644
+--- a/locale/categories.def
 

[arch-commits] Commit in glibc/trunk (PKGBUILD)

2015-09-01 Thread Jan Steffens
Date: Tuesday, September 1, 2015 @ 21:14:13
  Author: heftig
Revision: 245178

Actually apply the patch

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-09-01 15:11:56 UTC (rev 245177)
+++ PKGBUILD2015-09-01 19:14:13 UTC (rev 245178)
@@ -8,7 +8,7 @@
 
 pkgname=glibc
 pkgver=2.22
-pkgrel=2
+pkgrel=3
 pkgdesc="GNU C Library"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/libc;
@@ -22,7 +22,7 @@
 options=('!strip' 'staticlibs')
 install=glibc.install
 source=(http://ftp.gnu.org/gnu/libc/${pkgname}-${pkgver}.tar.xz{,.sig}
-   glibc-2.22-roundup.patch
+glibc-2.22-roundup.patch
 locale.gen.txt
 locale-gen)
 md5sums=('e51e02bf552a0a1fbbdc948fb2f5e83c'
@@ -36,7 +36,7 @@
   cd ${srcdir}/glibc-${pkgver}
 
   # glibc-2.21..01b07c70
-  #patch -p1 -i $srcdir/glibc-2.22-roundup.patch
+  patch -p1 -i $srcdir/glibc-2.22-roundup.patch
 
   mkdir ${srcdir}/glibc-build
 }


[arch-commits] Commit in glibc/trunk (PKGBUILD glibc-2.22-roundup.patch)

2015-09-01 Thread Allan McRae
Date: Tuesday, September 1, 2015 @ 10:22:08
  Author: allan
Revision: 245129

pull upstream patchset

Added:
  glibc/trunk/glibc-2.22-roundup.patch
Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |6 
 glibc-2.22-roundup.patch |  666 +
 2 files changed, 670 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-09-01 08:15:53 UTC (rev 245128)
+++ PKGBUILD2015-09-01 08:22:08 UTC (rev 245129)
@@ -8,7 +8,7 @@
 
 pkgname=glibc
 pkgver=2.22
-pkgrel=1
+pkgrel=2
 pkgdesc="GNU C Library"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/libc;
@@ -22,10 +22,12 @@
 options=('!strip' 'staticlibs')
 install=glibc.install
 source=(http://ftp.gnu.org/gnu/libc/${pkgname}-${pkgver}.tar.xz{,.sig}
+   glibc-2.22-roundup.patch
 locale.gen.txt
 locale-gen)
 md5sums=('e51e02bf552a0a1fbbdc948fb2f5e83c'
  'SKIP'
+ 'b6b7a0e8d6e6520e40e3164ae773631d'
  '07ac979b6ab5eeb778d55f041529d623'
  '476e9113489f93b348b21e144b6a8fcf')
 validpgpkeys=('F37CDAB708E65EA183FD1AF625EF0A436C2A4AFF')  # Carlos O'Donell
@@ -34,7 +36,7 @@
   cd ${srcdir}/glibc-${pkgver}
 
   # glibc-2.21..01b07c70
-  #patch -p1 -i $srcdir/glibc-2.21-roundup.patch
+  #patch -p1 -i $srcdir/glibc-2.22-roundup.patch
 
   mkdir ${srcdir}/glibc-build
 }

Added: glibc-2.22-roundup.patch
===
--- glibc-2.22-roundup.patch(rev 0)
+++ glibc-2.22-roundup.patch2015-09-01 08:22:08 UTC (rev 245129)
@@ -0,0 +1,666 @@
+diff --git a/ChangeLog b/ChangeLog
+index cb9124e..d0d2cbd 100644
+--- a/ChangeLog
 b/ChangeLog
+@@ -1,3 +1,74 @@
++2015-08-31  Brett Neumeier 
++
++  [BZ #18870]
++  * sysdeps/sparc/sparc32/sem_open.c: Add missing #include
++
++2015-08-28  Mike Frysinger  
++
++  [BZ #18887]
++  * misc/Makefile (tests): Add tst-mntent-blank-corrupt and
++  tst-mntent-blank-passno.
++  * misc/mntent_r.c (__getmntent_r): Do not read past buffer[0].
++  * misc/tst-mntent-blank-corrupt.c: New test.
++  * misc/tst-mntent-blank-passno.c: New test ripped from ...
++  * misc/tst-mntent.c (do_test): ... here.
++
++2015-08-25  Roland McGrath  
++
++  * sysdeps/nacl/start.c (_start): Call __nacl_main instead of main
++  if the weak reference is not null.
++
++2015-08-19  Andrew Senkevich  
++
++  [BZ #18796]
++  * scripts/test-installation.pl: Don't add -lmvec to build options
++  if libmvec wasn't built.
++  * NEWS: Mention this fix.
++
++2015-08-10  Maxim Ostapenko  
++
++  [BZ #18778]
++  * elf/Makefile (tests): Add Add tst-nodelete2.
++  (modules-names): Add tst-nodelete2mod.
++  (tst-nodelete2mod.so-no-z-defs): New.
++  ($(objpfx)tst-nodelete2): Likewise.
++  ($(objpfx)tst-nodelete2.out): Likewise.
++  (LDFLAGS-tst-nodelete2): Likewise.
++  * elf/dl-close.c (_dl_close_worker): Move DF_1_NODELETE clearing
++  out of loop through all loaded libraries.
++  * elf/tst-nodelete2.c: New file.
++  * elf/tst-nodelete2mod.c: Likewise.
++
++2015-08-10  Andreas Schwab  
++
++  [BZ #18781]
++  * sysdeps/unix/sysv/linux/openat.c (__OPENAT) [MORE_OFLAGS]: Add
++  MORE_OFLAGS to oflag.
++  * io/test-lfs.c (do_test): Test openat64.
++
++2015-08-08  John David Anglin  
++
++  [BZ #18787]
++  * sysdeps/unix/sysv/linux/hppa/bits/atomic.h (_LWS_CLOBBER): Revise
++  clobber registers.
++  (atomic_compare_and_exchange_val_acq): Use register asms to assign
++  operand registers.  Use register %r20 for EAGAIN and EDEADLOCK checks.
++  Cast return to __typeof (oldval).
++
++2015-08-08  Mike Frysinger  
++
++  * sysdeps/unix/sysv/linux/microblaze/sysdep.h: Wrap the whole file
++  in _LINUX_MICROBLAZE_SYSDEP_H defines.  Include sysdeps/unix/sysdep.h
++  and delete sys/syscall.h include.
++
++2015-08-07  Mike Frysinger  
++
++  * sysdeps/hppa/dl-symaddr.c (_dl_symbol_address): Add rtld_hidden_def.
++
++2015-08-05  Zack Weinberg  
++
++  * misc/regexp.h: Update comments.
++
+ 2015-08-05  Carlos O'Donell  
+ 
+   * version.h (RELEASE): Set to "stable".
+diff --git a/NEWS b/NEWS
+index 4c31de7..ce0255a 100644
+--- a/NEWS
 b/NEWS
+@@ -5,6 +5,12 @@ See the end for copying conditions.
+ Please send GNU C library bug reports via 
+ using `glibc' in the "product" field.
+ 
++Version 2.22.1
++
++* The following bugs are resolved with this release:
++
++  18778, 18781, 18787, 18796, 18870, 18887.
++
+ Version 2.22
+ 
+ * The following bugs are resolved with 

[arch-commits] Commit in glibc/trunk (PKGBUILD)

2015-08-12 Thread Allan McRae
Date: Wednesday, August 12, 2015 @ 11:36:26
  Author: allan
Revision: 243286

fix x86_64 build

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-08-12 09:34:06 UTC (rev 243285)
+++ PKGBUILD2015-08-12 09:36:26 UTC (rev 243286)
@@ -148,6 +148,6 @@
   usr/lib/lib{memusage,pcprofile,SegFault}.so \
   usr/lib/{audit,gconv}/*.so || true
   if [[ $CARCH = x86_64 ]]; then
-strip STRIP_SHARED usr/lib/libmvec-*.so
+strip $STRIP_SHARED usr/lib/libmvec-*.so
   fi
 }


[arch-commits] Commit in glibc/trunk (PKGBUILD glibc.install)

2015-08-05 Thread Allan McRae
Date: Thursday, August 6, 2015 @ 06:46:55
  Author: allan
Revision: 243065

upgpkg: glibc 2.22-1

upstream update

Modified:
  glibc/trunk/PKGBUILD
  glibc/trunk/glibc.install

---+
 PKGBUILD  |   37 -
 glibc.install |2 +-
 2 files changed, 21 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-08-06 04:29:58 UTC (rev 243064)
+++ PKGBUILD2015-08-06 04:46:55 UTC (rev 243065)
@@ -7,15 +7,15 @@
 # NOTE: adjust version in install script when locale files are updated
 
 pkgname=glibc
-pkgver=2.21
-pkgrel=4
+pkgver=2.22
+pkgrel=1
 pkgdesc=GNU C Library
 arch=('i686' 'x86_64')
 url=http://www.gnu.org/software/libc;
 license=('GPL' 'LGPL')
 groups=('base')
-depends=('linux-api-headers=4.0' 'tzdata' 'filesystem')
-makedepends=('gcc=4.9')
+depends=('linux-api-headers=4.1' 'tzdata' 'filesystem')
+makedepends=('gcc=5.2')
 backup=(etc/gai.conf
 etc/locale.gen
 etc/nscd.conf)
@@ -22,12 +22,10 @@
 options=('!strip' 'staticlibs')
 install=glibc.install
 source=(http://ftp.gnu.org/gnu/libc/${pkgname}-${pkgver}.tar.xz{,.sig}
-glibc-2.21-roundup.patch
 locale.gen.txt
 locale-gen)
-md5sums=('9cb398828e8f84f57d1f7d5588cf40cd'
+md5sums=('e51e02bf552a0a1fbbdc948fb2f5e83c'
  'SKIP'
- 'feb826d5f4965e9892ee6e851fec43a9'
  '07ac979b6ab5eeb778d55f041529d623'
  '476e9113489f93b348b21e144b6a8fcf')
 validpgpkeys=('F37CDAB708E65EA183FD1AF625EF0A436C2A4AFF')  # Carlos O'Donell
@@ -36,7 +34,7 @@
   cd ${srcdir}/glibc-${pkgver}
 
   # glibc-2.21..01b07c70
-  patch -p1 -i $srcdir/glibc-2.21-roundup.patch
+  #patch -p1 -i $srcdir/glibc-2.21-roundup.patch
 
   mkdir ${srcdir}/glibc-build
 }
@@ -87,12 +85,9 @@
 }
 
 check() {
-  # the linker commands need to be reordered - fixed in 2.19
-  LDFLAGS=${LDFLAGS/--as-needed,/}
-
   cd ${srcdir}/glibc-build
 
-  # tst-cleanupx4 failure on i686 is expected
+  # some failures are expected
   make check || true
 }
 
@@ -125,6 +120,9 @@
   # libc, libdl, libm and libpthread are required for toolchain testsuites
   # in addition libcrypt appears widely required
   rm $pkgdir/usr/lib/lib{anl,BrokenLocale,nsl,resolv,rt,util}.a
+  if [[ $CARCH = x86_64 ]]; then
+rm $pkgdir/usr/lib/libmvec.a
+  fi
 
   # Do not strip the following files for improved debugging support
   # (improved as in not breaking gdb and valgrind...):
@@ -138,13 +136,18 @@
 usr/bin/{ldconfig,locale,localedef,nscd,makedb} \
 usr/bin/{pcprofiledump,pldd,rpcgen,sln,sprof} \
 usr/lib/getconf/*
-  [[ $CARCH = i686 ]]  strip $STRIP_BINARIES usr/bin/lddlibc4
+  if [[ $CARCH = i686 ]]; then
+strip $STRIP_BINARIES usr/bin/lddlibc4
+  fi
 
   strip $STRIP_STATIC usr/lib/*.a
 
-  strip $STRIP_SHARED usr/lib/{libanl,libBrokenLocale,libcidn,libcrypt}-*.so \
+  strip $STRIP_SHARED usr/lib/lib{anl,BrokenLocale,cidn,crypt}-*.so \
   
usr/lib/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-*.so \
-  usr/lib/{libdl,libm,libnsl,libresolv,librt,libutil}-*.so 
\
-  usr/lib/{libmemusage,libpcprofile,libSegFault}.so \
-  usr/lib/{audit,gconv}/*.so
+  usr/lib/lib{dl,m,nsl,resolv,rt,util}-*.so \
+  usr/lib/lib{memusage,pcprofile,SegFault}.so \
+  usr/lib/{audit,gconv}/*.so || true
+  if [[ $CARCH = x86_64 ]]; then
+strip STRIP_SHARED usr/lib/libmvec-*.so
+  fi
 }

Modified: glibc.install
===
--- glibc.install   2015-08-06 04:29:58 UTC (rev 243064)
+++ glibc.install   2015-08-06 04:46:55 UTC (rev 243065)
@@ -4,7 +4,7 @@
 post_upgrade() {
   ldconfig -r .
   
-  if [[ $(vercmp 2.21-2 $2) = 1 ]]; then
+  if [[ $(vercmp 2.22-1 $2) = 1 ]]; then
 locale-gen
   fi
   


[arch-commits] Commit in glibc/trunk (PKGBUILD)

2015-04-22 Thread Allan McRae
Date: Thursday, April 23, 2015 @ 07:29:29
  Author: allan
Revision: 237951

upgpkg: glibc 2.21-4

gcc-5.1 toolchain rebuild

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-04-23 05:28:26 UTC (rev 237950)
+++ PKGBUILD2015-04-23 05:29:29 UTC (rev 237951)
@@ -8,13 +8,13 @@
 
 pkgname=glibc
 pkgver=2.21
-pkgrel=3
+pkgrel=4
 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.18' 'tzdata' 'filesystem')
+depends=('linux-api-headers=4.0' 'tzdata' 'filesystem')
 makedepends=('gcc=4.9')
 backup=(etc/gai.conf
 etc/locale.gen


[arch-commits] Commit in glibc/trunk (PKGBUILD glibc-2.21-roundup.patch)

2015-04-22 Thread Allan McRae
Date: Wednesday, April 22, 2015 @ 13:58:30
  Author: allan
Revision: 237898

upgpkg: glibc 2.21-3

upstream patch bump, fixes CVE-2015-1781

Modified:
  glibc/trunk/PKGBUILD
  glibc/trunk/glibc-2.21-roundup.patch

--+
 PKGBUILD |8 
 glibc-2.21-roundup.patch |   41 ++---
 2 files changed, 38 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-04-22 08:27:41 UTC (rev 237897)
+++ PKGBUILD2015-04-22 11:58:30 UTC (rev 237898)
@@ -8,13 +8,13 @@
 
 pkgname=glibc
 pkgver=2.21
-pkgrel=2
+pkgrel=3
 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.16' 'tzdata' 'filesystem=2013.01')
+depends=('linux-api-headers=3.18' 'tzdata' 'filesystem')
 makedepends=('gcc=4.9')
 backup=(etc/gai.conf
 etc/locale.gen
@@ -27,7 +27,7 @@
 locale-gen)
 md5sums=('9cb398828e8f84f57d1f7d5588cf40cd'
  'SKIP'
- 'bf9d96b11c76b113606aae102da63d9d'
+ 'feb826d5f4965e9892ee6e851fec43a9'
  '07ac979b6ab5eeb778d55f041529d623'
  '476e9113489f93b348b21e144b6a8fcf')
 validpgpkeys=('F37CDAB708E65EA183FD1AF625EF0A436C2A4AFF')  # Carlos O'Donell
@@ -35,7 +35,7 @@
 prepare() {
   cd ${srcdir}/glibc-${pkgver}
 
-  # glibc-2.21..75adf430
+  # glibc-2.21..01b07c70
   patch -p1 -i $srcdir/glibc-2.21-roundup.patch
 
   mkdir ${srcdir}/glibc-build

Modified: glibc-2.21-roundup.patch
===
--- glibc-2.21-roundup.patch2015-04-22 08:27:41 UTC (rev 237897)
+++ glibc-2.21-roundup.patch2015-04-22 11:58:30 UTC (rev 237898)
@@ -1,8 +1,14 @@
 diff --git a/ChangeLog b/ChangeLog
-index dc1ed1b..45579de 100644
+index dc1ed1b..26feb07 100644
 --- a/ChangeLog
 +++ b/ChangeLog
-@@ -1,3 +1,9 @@
+@@ -1,3 +1,15 @@
++2015-04-21  Arjun Shankar  arjun...@lostca.se
++
++  [BZ #18287]
++  * resolv/nss_dns/dns-host.c (getanswer_r): Adjust buffer length
++  based on padding.  (CVE-2015-1781)
++
 +2015-02-10  Evangelos Foutras  evange...@foutrelis.com
 +
 +  [BZ #17949]
@@ -12,7 +18,7 @@
  2015-02-06  Carlos O'Donell  car...@systemhalted.org
  
* version.h (RELEASE): Set to stable.
-@@ -7,6 +13,7 @@
+@@ -7,6 +19,7 @@
* sysdeps/unix/sysv/linux/hppa/pthread.h: Sync with pthread.h.
  
  2015-02-05  Paul Pluzhnikov  ppluzhni...@google.com
@@ -21,10 +27,10 @@
[BZ #16618]
* stdio-common/tst-sscanf.c (main): Test for buffer overflow.
 diff --git a/NEWS b/NEWS
-index 617cdbb..ff79f0d 100644
+index 617cdbb..c9f6b58 100644
 --- a/NEWS
 +++ b/NEWS
-@@ -5,6 +5,12 @@ See the end for copying conditions.
+@@ -5,6 +5,19 @@ See the end for copying conditions.
  Please send GNU C library bug reports via http://sourceware.org/bugzilla/
  using `glibc' in the product field.
  
@@ -32,12 +38,19 @@
 +
 +* The following bugs are resolved with this release:
 +
-+  17949.
++  17949, 18287.
++
++* A buffer overflow in gethostbyname_r and related functions performing DNS
++  requests has been fixed.  If the NSS functions were called with a
++  misaligned buffer, the buffer length change due to pointer alignment was
++  not taken into account.  This could result in application crashes or,
++  potentially arbitrary code execution, using crafted, but syntactically
++  valid DNS responses.  (CVE-2015-1781)
 +
  Version 2.21
  
  * The following bugs are resolved with this release:
-@@ -21,10 +27,11 @@ Version 2.21
+@@ -21,10 +34,11 @@ Version 2.21
17801, 17803, 17806, 17834, 17844, 17848, 17868, 17869, 17870, 17885,
17892.
  
@@ -53,6 +66,20 @@
  
  * A new semaphore algorithm has been implemented in generic C code for all
machines. Previous custom assembly implementations of semaphore were
+diff --git a/resolv/nss_dns/dns-host.c b/resolv/nss_dns/dns-host.c
+index f715ab0..40069a7 100644
+--- a/resolv/nss_dns/dns-host.c
 b/resolv/nss_dns/dns-host.c
+@@ -615,7 +615,8 @@ getanswer_r (const querybuf *answer, int anslen, const 
char *qname, int qtype,
+   int have_to_map = 0;
+   uintptr_t pad = -(uintptr_t) buffer % __alignof__ (struct host_data);
+   buffer += pad;
+-  if (__glibc_unlikely (buflen  sizeof (struct host_data) + pad))
++  buflen = buflen  pad ? buflen - pad : 0;
++  if (__glibc_unlikely (buflen  sizeof (struct host_data)))
+ {
+   /* The buffer is too small.  */
+ too_small:
 diff --git a/sysdeps/i386/i686/multiarch/mempcpy_chk.S 
b/sysdeps/i386/i686/multiarch/mempcpy_chk.S
 index 207b648..b6fa202 100644
 --- a/sysdeps/i386/i686/multiarch/mempcpy_chk.S


[arch-commits] Commit in glibc/trunk (PKGBUILD)

2015-02-07 Thread Allan McRae
Date: Saturday, February 7, 2015 @ 10:42:50
  Author: allan
Revision: 231092

upgpkg: glibc 2.21-1

glibc-2.21 toolchain rebuild, upstream update

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |   15 +++
 1 file changed, 7 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-02-07 09:42:45 UTC (rev 231091)
+++ PKGBUILD2015-02-07 09:42:50 UTC (rev 231092)
@@ -7,8 +7,8 @@
 # NOTE: adjust version in install script when locale files are updated
 
 pkgname=glibc
-pkgver=2.20
-pkgrel=6
+pkgver=2.21
+pkgrel=1
 pkgdesc=GNU C Library
 arch=('i686' 'x86_64')
 url=http://www.gnu.org/software/libc;
@@ -22,12 +22,10 @@
 options=('!strip' 'staticlibs')
 install=glibc.install
 source=(http://ftp.gnu.org/gnu/libc/${pkgname}-${pkgver}.tar.xz{,.sig}
-glibc-2.20-roundup.patch
 locale.gen.txt
 locale-gen)
-md5sums=('948a6e06419a01bd51e97206861595b0'
+md5sums=('9cb398828e8f84f57d1f7d5588cf40cd'
  'SKIP'
- 'f7a5faf2911ae7c13f584bd60c802873'
  '07ac979b6ab5eeb778d55f041529d623'
  '476e9113489f93b348b21e144b6a8fcf')
 validpgpkeys=('F37CDAB708E65EA183FD1AF625EF0A436C2A4AFF')  # Carlos O'Donell
@@ -35,8 +33,8 @@
 prepare() {
   cd ${srcdir}/glibc-${pkgver}
 
-  # glibc-2.20..f80af766
-  patch -p1 -i $srcdir/glibc-2.20-roundup.patch
+  # glibc-2.21..
+  #patch -p1 -i $srcdir/glibc-2.21-roundup.patch
 
   mkdir ${srcdir}/glibc-build
 }
@@ -69,7 +67,8 @@
   --enable-bind-now --disable-profile \
   --enable-stackguard-randomization \
   --enable-lock-elision \
-  --enable-multi-arch
+  --enable-multi-arch \
+  --disable-werror
 
   # build libraries with hardening disabled
   echo build-programs=no  configparms


[arch-commits] Commit in glibc/trunk (PKGBUILD)

2014-12-26 Thread Allan McRae
Date: Saturday, December 27, 2014 @ 03:54:32
  Author: allan
Revision: 228067

upgpkg: glibc 2.20-6

binutils-2.25 rebuild

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-12-27 02:50:02 UTC (rev 228066)
+++ PKGBUILD2014-12-27 02:54:32 UTC (rev 228067)
@@ -8,7 +8,7 @@
 
 pkgname=glibc
 pkgver=2.20
-pkgrel=5
+pkgrel=6
 pkgdesc=GNU C Library
 arch=('i686' 'x86_64')
 url=http://www.gnu.org/software/libc;


[arch-commits] Commit in glibc/trunk (PKGBUILD glibc-2.20-roundup.patch)

2014-12-17 Thread Allan McRae
Date: Thursday, December 18, 2014 @ 02:09:18
  Author: allan
Revision: 227728

update from 2.20 branch, CVE-2012-3406, CVE-2014-9402

Modified:
  glibc/trunk/PKGBUILD
  glibc/trunk/glibc-2.20-roundup.patch

--+
 PKGBUILD |4 
 glibc-2.20-roundup.patch |  305 -
 2 files changed, 302 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-12-17 22:24:24 UTC (rev 227727)
+++ PKGBUILD2014-12-18 01:09:18 UTC (rev 227728)
@@ -8,7 +8,7 @@
 
 pkgname=glibc
 pkgver=2.20
-pkgrel=4
+pkgrel=5
 pkgdesc=GNU C Library
 arch=('i686' 'x86_64')
 url=http://www.gnu.org/software/libc;
@@ -36,7 +36,7 @@
 prepare() {
   cd ${srcdir}/glibc-${pkgver}
 
-  # glibc-2.20..d73ac1bb
+  # glibc-2.20..f80af766
   patch -p1 -i $srcdir/glibc-2.20-roundup.patch
 
   mkdir ${srcdir}/glibc-build

Modified: glibc-2.20-roundup.patch
===
--- glibc-2.20-roundup.patch2014-12-17 22:24:24 UTC (rev 227727)
+++ glibc-2.20-roundup.patch2014-12-18 01:09:18 UTC (rev 227728)
@@ -1,8 +1,23 @@
 diff --git a/ChangeLog b/ChangeLog
-index f343428..ac7d980 100644
+index f343428..e416cd0 100644
 --- a/ChangeLog
 +++ b/ChangeLog
-@@ -1,3 +1,94 @@
+@@ -1,3 +1,109 @@
++2014-12-16  Florian Weimer  fwei...@redhat.com
++
++  [BZ #17630]
++  * resolv/nss_dns/dns-network.c (getanswer_r): Iterate over alias
++  names.
++
++2014-12-15  Jeff Law  l...@redhat.com
++
++  [BZ #16617]
++  * stdio-common/vfprintf.c (vfprintf): Allocate large specs array
++  on the heap.  (CVE-2012-3406)
++  * stdio-common/bug23-2.c, stdio-common/bug23-3.c: New file.
++  * stdio-common/bug23-4.c: New file.  Test case by Joseph Myers.
++  * stdio-common/Makefile (tests): Add bug23-2, bug23-3, bug23-4.
++
 +2014-11-24  Siddhesh Poyarekar  siddh...@redhat.com
 +
 +  [BZ #17266]
@@ -98,10 +113,10 @@
  
* version.h (RELEASE): Set to stable.
 diff --git a/NEWS b/NEWS
-index 721b457..3de92cd 100644
+index 721b457..9bc835c 100644
 --- a/NEWS
 +++ b/NEWS
-@@ -5,6 +5,19 @@ See the end for copying conditions.
+@@ -5,6 +5,25 @@ See the end for copying conditions.
  Please send GNU C library bug reports via http://sourceware.org/bugzilla/
  using `glibc' in the product field.
  
@@ -109,7 +124,7 @@
 +
 +* The following bugs are resolved with this release:
 +
-+  17266, 17370, 17371, 17460, 17485, 17555, 17625.
++  16617, 17266, 17370, 17371, 17460, 17485, 17555, 17625, 17630.
 +
 +* CVE-2104-7817 The wordexp function could ignore the WRDE_NOCMD flag
 +  under certain input conditions resulting in the execution of a shell for
@@ -117,6 +132,12 @@
 +  implementation now checks WRDE_NOCMD immediately before executing the
 +  shell and returns the error WRDE_CMDSUB as expected.
 +
++* CVE-2012-3406 printf-style functions could run into a stack overflow when
++  processing format strings with a large number of format specifiers.
++
++* CVE-2014-9402 The nss_dns implementation of getnetbyname could run into an
++  infinite loopif the DNS response contained a PTR record of an unexpected
++  format.
 +
  Version 2.20
  
@@ -528,6 +549,280 @@
++words_offset;
error = parse_backtick (word, word_length, max_length, words,
words_offset, flags, pwordexp, ifs,
+diff --git a/resolv/nss_dns/dns-network.c b/resolv/nss_dns/dns-network.c
+index 0a77c8b..08cf0a6 100644
+--- a/resolv/nss_dns/dns-network.c
 b/resolv/nss_dns/dns-network.c
+@@ -398,8 +398,8 @@ getanswer_r (const querybuf *answer, int anslen, struct 
netent *result,
+ 
+   case BYNAME:
+ {
+-  char **ap = result-n_aliases++;
+-  while (*ap != NULL)
++  char **ap;
++  for (ap = result-n_aliases; *ap != NULL; ++ap)
+ {
+   /* Check each alias name for being of the forms:
+  4.3.2.1.in-addr.arpa = net 1.2.3.4
+diff --git a/stdio-common/Makefile b/stdio-common/Makefile
+index 5f8e534..e5e45b6 100644
+--- a/stdio-common/Makefile
 b/stdio-common/Makefile
+@@ -57,7 +57,7 @@ tests := tstscanf test_rdwr test-popen tstgetln test-fseek \
+bug19 bug19a tst-popen2 scanf13 scanf14 scanf15 bug20 bug21 bug22 \
+scanf16 scanf17 tst-setvbuf1 tst-grouping bug23 bug24 \
+bug-vfprintf-nargs tst-long-dbl-fphex tst-fphex-wide tst-sprintf3 \
+-   bug25 tst-printf-round bug26
++   bug25 tst-printf-round bug23-2 bug23-3 bug23-4 bug26
+ 
+ test-srcs = tst-unbputc tst-printf
+ 
+diff --git a/stdio-common/bug23-2.c b/stdio-common/bug23-2.c
+new file mode 100644
+index 000..9e0cfe6
+--- /dev/null
 b/stdio-common/bug23-2.c
+@@ -0,0 +1,70 @@
++#include stdio.h
++#include string.h
++#include stdlib.h
++
++static const char expected[] = \
++\n\
++a\n\
++abbcd55\
++\n\
++a\n\
++abbcd55\
++\n\
++a\n\
++abbcd55\
++\n\

[arch-commits] Commit in glibc/trunk (PKGBUILD)

2014-12-17 Thread Allan McRae
Date: Thursday, December 18, 2014 @ 03:36:43
  Author: allan
Revision: 227729

upgpkg: glibc 2.20-5

update from 2.20 branch, CVE-2012-3406, CVE-2014-9402

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-12-18 01:09:18 UTC (rev 227728)
+++ PKGBUILD2014-12-18 02:36:43 UTC (rev 227729)
@@ -27,10 +27,9 @@
 locale-gen)
 md5sums=('948a6e06419a01bd51e97206861595b0'
  'SKIP'
- '8cfa2a0fa2a9aad8b86a138587d6261f'
+ 'f7a5faf2911ae7c13f584bd60c802873'
  '07ac979b6ab5eeb778d55f041529d623'
  '476e9113489f93b348b21e144b6a8fcf')
-
 validpgpkeys=('F37CDAB708E65EA183FD1AF625EF0A436C2A4AFF')  # Carlos O'Donell
 
 prepare() {


[arch-commits] Commit in glibc/trunk (PKGBUILD glibc-2.20-roundup.patch)

2014-11-24 Thread Allan McRae
Date: Tuesday, November 25, 2014 @ 02:52:32
  Author: allan
Revision: 227071

upgpkg: glibc 2.20-4

2.20 patchset update, fixes clang compile issue

Modified:
  glibc/trunk/PKGBUILD
  glibc/trunk/glibc-2.20-roundup.patch

--+
 PKGBUILD |6 +++---
 glibc-2.20-roundup.patch |   26 +++---
 2 files changed, 22 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-11-25 01:08:07 UTC (rev 227070)
+++ PKGBUILD2014-11-25 01:52:32 UTC (rev 227071)
@@ -8,7 +8,7 @@
 
 pkgname=glibc
 pkgver=2.20
-pkgrel=3
+pkgrel=4
 pkgdesc=GNU C Library
 arch=('i686' 'x86_64')
 url=http://www.gnu.org/software/libc;
@@ -27,7 +27,7 @@
 locale-gen)
 md5sums=('948a6e06419a01bd51e97206861595b0'
  'SKIP'
- '7414dd9a268e93111a9ffd7e13b7fa53'
+ '8cfa2a0fa2a9aad8b86a138587d6261f'
  '07ac979b6ab5eeb778d55f041529d623'
  '476e9113489f93b348b21e144b6a8fcf')
 
@@ -36,7 +36,7 @@
 prepare() {
   cd ${srcdir}/glibc-${pkgver}
 
-  # glibc-2.20..33ceaf61
+  # glibc-2.20..d73ac1bb
   patch -p1 -i $srcdir/glibc-2.20-roundup.patch
 
   mkdir ${srcdir}/glibc-build

Modified: glibc-2.20-roundup.patch
===
--- glibc-2.20-roundup.patch2014-11-25 01:08:07 UTC (rev 227070)
+++ glibc-2.20-roundup.patch2014-11-25 01:52:32 UTC (rev 227071)
@@ -1,8 +1,14 @@
 diff --git a/ChangeLog b/ChangeLog
-index f343428..f9f3407 100644
+index f343428..ac7d980 100644
 --- a/ChangeLog
 +++ b/ChangeLog
-@@ -1,3 +1,88 @@
+@@ -1,3 +1,94 @@
++2014-11-24  Siddhesh Poyarekar  siddh...@redhat.com
++
++  [BZ #17266]
++  * misc/sys/cdefs.h: Define __extern_always_inline for clang
++  4.2 and newer.
++
 +2014-11-19  Carlos O'Donell  car...@redhat.com
 +  Florian Weimer  fwei...@redhat.com
 +  Joseph Myers  jos...@codesourcery.com
@@ -181,7 +187,7 @@
  extern double __gamma_r_finite (double, int *);
  __extern_always_inline double __NTH (tgamma (double __d))
 diff --git a/misc/sys/cdefs.h b/misc/sys/cdefs.h
-index 04db956..01e81ba 100644
+index 04db956..711ac1d 100644
 --- a/misc/sys/cdefs.h
 +++ b/misc/sys/cdefs.h
 @@ -131,7 +131,6 @@
@@ -192,7 +198,7 @@
  
  #if __GNUC_PREREQ (4,3)
  # define __warndecl(name, msg) \
-@@ -318,12 +317,13 @@
+@@ -318,12 +317,19 @@
  # define __attribute_artificial__ /* Ignore */
  #endif
  
@@ -206,13 +212,19 @@
 +   inline semantics, unless -fgnu89-inline is used.  Using 
__GNUC_STDC_INLINE__
 +   or __GNUC_GNU_INLINE is not a good enough check for gcc because gcc 
versions
 +   older than 4.3 may define these macros and still not guarantee GNU inlining
-+   semantics.  */
-+#if !defined __cplusplus || __GNUC_PREREQ (4,3)
++   semantics.
++
++   clang++ identifies itself as gcc-4.2, but has support for GNU inlining
++   semantics, that can be checked fot by using the __GNUC_STDC_INLINE_ and
++   __GNUC_GNU_INLINE__ macro definitions.  */
++#if (!defined __cplusplus || __GNUC_PREREQ (4,3) \
++ || (defined __clang__  (defined __GNUC_STDC_INLINE__ \
++ || defined __GNUC_GNU_INLINE__)))
 +# if defined __GNUC_STDC_INLINE__ || defined __cplusplus
  #  define __extern_inline extern __inline __attribute__ ((__gnu_inline__))
  #  define __extern_always_inline \
extern __always_inline __attribute__ ((__gnu_inline__))
-@@ -331,9 +331,10 @@
+@@ -331,9 +337,10 @@
  #  define __extern_inline extern __inline
  #  define __extern_always_inline extern __always_inline
  # endif


[arch-commits] Commit in glibc/trunk (PKGBUILD)

2014-09-08 Thread Allan McRae
Date: Monday, September 8, 2014 @ 13:02:22
  Author: allan
Revision: 221142

upgpkg: glibc 2.20-1

upstream update

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |   36 ++--
 1 file changed, 10 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-09-08 10:57:10 UTC (rev 221141)
+++ PKGBUILD2014-09-08 11:02:22 UTC (rev 221142)
@@ -7,15 +7,15 @@
 # NOTE: adjust version in install script when locale files are updated
 
 pkgname=glibc
-pkgver=2.19
-pkgrel=5
+pkgver=2.20
+pkgrel=1
 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.13' 'tzdata' 'filesystem=2013.01')
-makedepends=('gcc=4.8')
+depends=('linux-api-headers=3.16' 'tzdata' 'filesystem=2013.01')
+makedepends=('gcc=4.9')
 backup=(etc/gai.conf
 etc/locale.gen
 etc/nscd.conf)
@@ -22,31 +22,15 @@
 options=('!strip' 'staticlibs')
 install=glibc.install
 source=(http://ftp.gnu.org/gnu/libc/${pkgname}-${pkgver}.tar.xz{,.sig}
-glibc-2.19-xattr_header.patch
-glibc-2.19-fix-sign-in-bsloww1-input.patch
-glibc-2.19-tzselect-default.patch
 locale.gen.txt
 locale-gen)
-md5sums=('e26b8cc666b162f999404b03970f14e4'
+md5sums=('948a6e06419a01bd51e97206861595b0'
  'SKIP'
- '39a4876837789e07746f1d84cd8cb46a'
- '755a1a9d7844a5e338eddaa9a5d974cd'
- 'c772dc99ddd8032ecbf43884ae0cf42e'
  '07ac979b6ab5eeb778d55f041529d623'
  '476e9113489f93b348b21e144b6a8fcf')
+validpgpkeys=('F37CDAB708E65EA183FD1AF625EF0A436C2A4AFF')
 
 prepare() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  # fix for {linux,sys}/xattr.h incompatibility - commit fdbe8eae
-  patch -p1 -i $srcdir/glibc-2.19-xattr_header.patch
-
-  # fix issues in sin/cos slow path calculation - commit ffe768a9
-  patch -p1 -i $srcdir/glibc-2.19-fix-sign-in-bsloww1-input.patch
-
-  # fix tzselect with missing TZDIR - commit 893b4f37/c72399fb
-  patch -p1 -i $srcdir/glibc-2.19-tzselect-default.patch
-
   mkdir ${srcdir}/glibc-build
 }
 
@@ -60,6 +44,7 @@
   fi
 
   echo slibdir=/usr/lib  configparms
+  echo rtlddir=/usr/lib  configparms
   echo sbindir=/usr/bin  configparms
   echo rootsbindir=/usr/bin  configparms
 
@@ -90,7 +75,7 @@
   make
 
   # remove harding in preparation to run test-suite
-  sed -i '4,6d' configparms
+  sed -i '5,7d' configparms
 }
 
 check() {
@@ -99,9 +84,8 @@
 
   cd ${srcdir}/glibc-build
 
-  # ULP failures on i686 are all small and can be ignored
-  # tst-cleanupx4.out failure on i686 needs investigating...
-  make -k check || true
+  # tst-cleanupx4 failure on i686 is expected
+  make check || true
 }
 
 package() {



[arch-commits] Commit in glibc/trunk (PKGBUILD)

2014-07-07 Thread Allan McRae
Date: Tuesday, July 8, 2014 @ 07:15:09
  Author: allan
Revision: 216625

do not specify parameters to --enable-add-obs

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-07-08 01:25:04 UTC (rev 216624)
+++ PKGBUILD2014-07-08 05:15:09 UTC (rev 216625)
@@ -71,7 +71,7 @@
   --libdir=/usr/lib --libexecdir=/usr/lib \
   --with-headers=/usr/include \
   --with-bugurl=https://bugs.archlinux.org/ \
-  --enable-add-ons=nptl,libidn \
+  --enable-add-ons \
   --enable-obsolete-rpc \
   --enable-kernel=2.6.32 \
   --enable-bind-now --disable-profile \



[arch-commits] Commit in glibc/trunk (PKGBUILD glibc-2.19-tzselect-default.patch)

2014-05-16 Thread Allan McRae
Date: Friday, May 16, 2014 @ 12:05:40
  Author: allan
Revision: 212879

upgpkg: glibc 2.19-5

fix tzselect, adjust for -fstack-protector-strong

Added:
  glibc/trunk/glibc-2.19-tzselect-default.patch
Modified:
  glibc/trunk/PKGBUILD

---+
 PKGBUILD  |   19 ---
 glibc-2.19-tzselect-default.patch |   13 +
 2 files changed, 25 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-05-16 03:18:13 UTC (rev 212878)
+++ PKGBUILD2014-05-16 10:05:40 UTC (rev 212879)
@@ -8,7 +8,7 @@
 
 pkgname=glibc
 pkgver=2.19
-pkgrel=4
+pkgrel=5
 pkgdesc=GNU C Library
 arch=('i686' 'x86_64')
 url=http://www.gnu.org/software/libc;
@@ -24,6 +24,7 @@
 source=(http://ftp.gnu.org/gnu/libc/${pkgname}-${pkgver}.tar.xz{,.sig}
 glibc-2.19-xattr_header.patch
 glibc-2.19-fix-sign-in-bsloww1-input.patch
+glibc-2.19-tzselect-default.patch
 locale.gen.txt
 locale-gen)
 md5sums=('e26b8cc666b162f999404b03970f14e4'
@@ -30,6 +31,7 @@
  'SKIP'
  '39a4876837789e07746f1d84cd8cb46a'
  '755a1a9d7844a5e338eddaa9a5d974cd'
+ 'c772dc99ddd8032ecbf43884ae0cf42e'
  '07ac979b6ab5eeb778d55f041529d623'
  '476e9113489f93b348b21e144b6a8fcf')
 
@@ -42,6 +44,9 @@
   # fix issues in sin/cos slow path calculation - commit ffe768a9
   patch -p1 -i $srcdir/glibc-2.19-fix-sign-in-bsloww1-input.patch
 
+  # fix tzselect with missing TZDIR - commit 893b4f37/c72399fb
+  patch -p1 -i $srcdir/glibc-2.19-tzselect-default.patch
+
   mkdir ${srcdir}/glibc-build
 }
 
@@ -59,7 +64,7 @@
   echo rootsbindir=/usr/bin  configparms
 
   # remove hardening options for building libraries
-  CFLAGS=${CFLAGS/-fstack-protector/}
+  CFLAGS=${CFLAGS/-fstack-protector-strong/}
   CPPFLAGS=${CPPFLAGS/-D_FORTIFY_SOURCE=2/}
 
   ${srcdir}/${pkgname}-${pkgver}/configure --prefix=/usr \
@@ -80,8 +85,8 @@
   
   # re-enable hardening for programs
   sed -i /build-programs=/s#no#yes# configparms
-  echo CC += -fstack-protector -D_FORTIFY_SOURCE=2  configparms
-  echo CXX += -fstack-protector -D_FORTIFY_SOURCE=2  configparms
+  echo CC += -fstack-protector-strong -D_FORTIFY_SOURCE=2  configparms
+  echo CXX += -fstack-protector-strong -D_FORTIFY_SOURCE=2  configparms
   make
 
   # remove harding in preparation to run test-suite
@@ -93,9 +98,9 @@
   LDFLAGS=${LDFLAGS/--as-needed,/}
 
   cd ${srcdir}/glibc-build
-
-  # only acceptable testsuite error is some small libm ulp failures on i686 
with gcc-4.9
-  # TODO: fix upstream and provide patch
+  
+  # ULP failures on i686 are all small and can be ignored
+  # tst-cleanupx4.out failure on i686 needs investigating...
   make -k check || true
 }
 

Added: glibc-2.19-tzselect-default.patch
===
--- glibc-2.19-tzselect-default.patch   (rev 0)
+++ glibc-2.19-tzselect-default.patch   2014-05-16 10:05:40 UTC (rev 212879)
@@ -0,0 +1,13 @@
+diff --git a/timezone/Makefile b/timezone/Makefile
+index 998cd14..d5f647c 100644
+--- a/timezone/Makefile
 b/timezone/Makefile
+@@ -118,7 +118,7 @@ $(testdata)/Asia/Tokyo: asia $(zic-deps)
+ 
+ $(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make
+   sed -e 's|/bin/bash|$(KSH)|g' \
+-  -e '/TZDIR=/s|\$$(pwd)|$(zonedir)|' \
++  -e 's|TZDIR=[^}]*|TZDIR=$(zonedir)|' \
+   -e '/TZVERSION=/s|see_Makefile|$(version)|' \
+   -e '/PKGVERSION=/s|=.*|=$(PKGVERSION)|' \
+   -e '/REPORT_BUGS_TO=/s|=.*|=$(REPORT_BUGS_TO)|' \



[arch-commits] Commit in glibc/trunk (PKGBUILD)

2014-05-16 Thread Jan Steffens
Date: Friday, May 16, 2014 @ 22:52:12
  Author: heftig
Revision: 212891

whitespace

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-05-16 17:15:43 UTC (rev 212890)
+++ PKGBUILD2014-05-16 20:52:12 UTC (rev 212891)
@@ -37,7 +37,7 @@
 
 prepare() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  
+
   # fix for {linux,sys}/xattr.h incompatibility - commit fdbe8eae
   patch -p1 -i $srcdir/glibc-2.19-xattr_header.patch
 
@@ -82,7 +82,7 @@
   # build libraries with hardening disabled
   echo build-programs=no  configparms
   make
-  
+
   # re-enable hardening for programs
   sed -i /build-programs=/s#no#yes# configparms
   echo CC += -fstack-protector-strong -D_FORTIFY_SOURCE=2  configparms
@@ -98,7 +98,7 @@
   LDFLAGS=${LDFLAGS/--as-needed,/}
 
   cd ${srcdir}/glibc-build
-  
+
   # ULP failures on i686 are all small and can be ignored
   # tst-cleanupx4.out failure on i686 needs investigating...
   make -k check || true



[arch-commits] Commit in glibc/trunk (PKGBUILD glibc.install locale-gen)

2014-02-13 Thread Allan McRae
Date: Friday, February 14, 2014 @ 03:41:59
  Author: allan
Revision: 205914

upgpkg: glibc 2.19-2

revert parallel locale generation - this can create corrupt locale-archive files

Modified:
  glibc/trunk/PKGBUILD
  glibc/trunk/glibc.install
  glibc/trunk/locale-gen

---+
 PKGBUILD  |4 +--
 glibc.install |2 -
 locale-gen|   60 +---
 3 files changed, 26 insertions(+), 40 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-02-14 00:28:13 UTC (rev 205913)
+++ PKGBUILD2014-02-14 02:41:59 UTC (rev 205914)
@@ -8,7 +8,7 @@
 
 pkgname=glibc
 pkgver=2.19
-pkgrel=1
+pkgrel=2
 pkgdesc=GNU C Library
 arch=('i686' 'x86_64')
 url=http://www.gnu.org/software/libc;
@@ -29,7 +29,7 @@
  'SKIP'
  '7ca96c68a37f2a4ab91792bfa0160a24'
  '07ac979b6ab5eeb778d55f041529d623'
- 'b5fd017036fb91199ee76f670da8c15b')
+ '476e9113489f93b348b21e144b6a8fcf')
 
 prepare() {
   cd ${srcdir}/${pkgname}-${pkgver}

Modified: glibc.install
===
--- glibc.install   2014-02-14 00:28:13 UTC (rev 205913)
+++ glibc.install   2014-02-14 02:41:59 UTC (rev 205914)
@@ -4,7 +4,7 @@
 post_upgrade() {
   ldconfig -r .
   
-  if [[ $(vercmp 2.19 $2) = 1 ]]; then
+  if [[ $(vercmp 2.19-2 $2) = 1 ]]; then
 locale-gen
   fi
   

Modified: locale-gen
===
--- locale-gen  2014-02-14 00:28:13 UTC (rev 205913)
+++ locale-gen  2014-02-14 02:41:59 UTC (rev 205914)
@@ -4,53 +4,39 @@
 
 LOCALEGEN=/etc/locale.gen
 LOCALES=/usr/share/i18n/locales
-unset POSIXLY_CORRECT
+if [ -n $POSIXLY_CORRECT ]; then
+  unset POSIXLY_CORRECT
+fi
 
-[ -s $LOCALEGEN ] || exit 0
 
+[ -f $LOCALEGEN -a -s $LOCALEGEN ] || exit 0;
+
 # Remove all old locale dir and locale-archive before generating new
 # locale data.
-rm -rf /usr/lib/locale/*
+rm -rf /usr/lib/locale/* || true
 
 umask 022
 
-gen() {
-   local locale=$1
-   local charset=$2
-   local input=
-
-   if [ -z $locale ] || [ -z $charset ]; then
-   echo error: Bad entry '$locale $charset'
-   return
-   fi
-
-   printf '  %s.%s\n' $(echo $locale | sed 's/\([^.\@]*\).*/\1/') 
$charset
-
-   if [ -f $LOCALES/$locale ]; then
-   input=$locale
-   else
-   input=$(echo $locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/')
-   fi
-
-   localedef -i $input -c -f $charset -A 
/usr/share/locale/locale.alias $locale
+is_entry_ok() {
+  if [ -n $locale -a -n $charset ] ; then
+true
+  else
+echo error: Bad entry '$locale $charset'
+false
+  fi
 }
 
-maxjobs=$(grep -c processor /proc/cpuinfo 2/dev/null || echo 1)
 echo Generating locales...
 while read locale charset; do \
-   case $locale in
-   \#*|'')
-   continue
-   ;;
-   esac
-   gen $locale $charset 
-
-   # keep no more than $maxjobs jobs in flight
-   while [ $(jobs | wc -l) -ge $maxjobs ]; do
-   sleep 0.25
-   jobs /dev/null
-   done
+   case $locale in \#*) continue;; ) continue;; esac; \
+   is_entry_ok || continue
+   echo -n   `echo $locale | sed 's/\([^.\@]*\).*/\1/'`; \
+   echo -n .$charset; \
+   echo -n `echo $locale | sed 's/\([^\@]*\)\(\@.*\)*/\2/'`; \
+   echo -n '...'; \
+if [ -f $LOCALES/$locale ]; then input=$locale; else \
+input=`echo $locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; fi; \
+   localedef -i $input -c -f $charset -A /usr/share/locale/locale.alias 
$locale; \
+   echo ' done'; \
 done  $LOCALEGEN
-wait
-
 echo Generation complete.



[arch-commits] Commit in glibc/trunk (PKGBUILD glibc.install)

2014-02-07 Thread Allan McRae
Date: Saturday, February 8, 2014 @ 00:26:58
  Author: allan
Revision: 205576

upgpkg: glibc 2.19-1

upstream update

Modified:
  glibc/trunk/PKGBUILD
  glibc/trunk/glibc.install

---+
 PKGBUILD  |   63 ++--
 glibc.install |2 -
 2 files changed, 8 insertions(+), 57 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-02-07 22:52:11 UTC (rev 205575)
+++ PKGBUILD2014-02-07 23:26:58 UTC (rev 205576)
@@ -7,15 +7,15 @@
 # NOTE: adjust version in install script when locale files are updated
 
 pkgname=glibc
-pkgver=2.18
-pkgrel=12
+pkgver=2.19
+pkgrel=1
 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.7' 'tzdata' 'filesystem=2013.01')
-makedepends=('gcc=4.7')
+depends=('linux-api-headers=3.13' 'tzdata' 'filesystem=2013.01')
+makedepends=('gcc=4.8')
 backup=(etc/gai.conf
 etc/locale.gen
 etc/nscd.conf)
@@ -22,66 +22,17 @@
 options=('!strip' 'staticlibs')
 install=glibc.install
 source=(http://ftp.gnu.org/gnu/libc/${pkgname}-${pkgver}.tar.xz{,.sig}
-glibc-2.18-make-4.patch
-glibc-2.18-readdir_r-CVE-2013-4237.patch
-glibc-2.18-malloc-corrupt-CVE-2013-4332.patch
-glibc-2.18-strcoll-CVE-2012-4412+4424.patch
-glibc-2.18-ptr-mangle-CVE-2013-4788.patch
-glibc-2.18-getaddrinfo-CVE-2013-4458.patch
-glibc-2.18-getaddrinfo-assertion.patch
-glibc-2.18-scanf-parse-0e-0.patch
-glibc-2.18-strstr-hackfix.patch
 glibc-2.18-xattr-compat-hack.patch
-nscd.service
-nscd.tmpfiles
 locale.gen.txt
 locale-gen)
-md5sums=('88fbbceafee809e82efd52efa1e3c58f'
+md5sums=('e26b8cc666b162f999404b03970f14e4'
  'SKIP'
- 'e1883c2d1b01ff73650db5f5bb5a5a52'
- '154da6bf5a5248f42a7bf5bf08e01a47'
- 'b79561ab9dce900e9bbeaf0d49927c2b'
- 'c7264b99d0f7e51922a4d3126182c40a'
- '9749ba386b08a8fe53e7ecede9bf2dfb'
- '71329fccb8eb583fb0d67b55f1e8df68'
- 'd4d86add33f22125777e0ecff06bc9bb'
- '01d19fe9b2aea489cf5651530e0369f2'
- '4441f6dfe7d75ced1fa75e54dd21d36e'
  '7ca96c68a37f2a4ab91792bfa0160a24'
- 'd5fab2cd3abea65aa5ae696ea4a47d6b'
- 'da662ca76e7c8d7efbc7986ab7acea2d'
  '07ac979b6ab5eeb778d55f041529d623'
  'b5fd017036fb91199ee76f670da8c15b')
 
 prepare() {
   cd ${srcdir}/${pkgname}-${pkgver}
-
-  # compatibility with make-4.0 (submitted upstream)
-  patch -p1 -i $srcdir/glibc-2.18-make-4.patch
-
-  # upstream commit 91ce4085
-  patch -p1 -i $srcdir/glibc-2.18-readdir_r-CVE-2013-4237.patch
-
-  # upstream commits 1159a193, 55e17aad and b73ed247
-  patch -p1 -i $srcdir/glibc-2.18-malloc-corrupt-CVE-2013-4332.patch
-
-  # upstream commits 1326ba1a, 141f3a77 and 303e567a
-  patch -p1 -i $srcdir/glibc-2.18-strcoll-CVE-2012-4412+4424.patch
-
-  # upstream commits c61b4d41 and 0b1f8e35
-  patch -p1 -i $srcdir/glibc-2.18-ptr-mangle-CVE-2013-4788.patch
-
-  # upstream commit 7cbcdb36
-  patch -p1 -i $srcdir/glibc-2.18-getaddrinfo-CVE-2013-4458.patch
-
-  # upstream commit 894f3f10
-  patch -p1 -i $srcdir/glibc-2.18-getaddrinfo-assertion.patch
-
-  # upstream commit a4966c61
-  patch -p1 -i $srcdir/glibc-2.18-scanf-parse-0e-0.patch
-
-  # hack fix for strstr issues on x86
-  patch -p1 -i $srcdir/glibc-2.18-strstr-hackfix.patch
   
   # hack fix for {linux,sys}/xattr.h incompatibility
   patch -p1 -i $srcdir/glibc-2.18-xattr-compat-hack.patch
@@ -153,8 +104,8 @@
   install -dm755 ${pkgdir}/usr/lib/{locale,systemd/system,tmpfiles.d}
 
   install -m644 ${srcdir}/${pkgname}-${pkgver}/nscd/nscd.conf 
${pkgdir}/etc/nscd.conf
-  install -m644 ${srcdir}/nscd.service ${pkgdir}/usr/lib/systemd/system
-  install -m644 ${srcdir}/nscd.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/nscd.conf
+  install -m644 ${srcdir}/${pkgname}-${pkgver}/nscd/nscd.service 
${pkgdir}/usr/lib/systemd/system
+  install -m644 ${srcdir}/${pkgname}-${pkgver}/nscd/nscd.tmpfiles 
${pkgdir}/usr/lib/tmpfiles.d/nscd.conf
 
   install -m644 ${srcdir}/${pkgname}-${pkgver}/posix/gai.conf 
${pkgdir}/etc/gai.conf
 

Modified: glibc.install
===
--- glibc.install   2014-02-07 22:52:11 UTC (rev 205575)
+++ glibc.install   2014-02-07 23:26:58 UTC (rev 205576)
@@ -4,7 +4,7 @@
 post_upgrade() {
   ldconfig -r .
   
-  if [[ $(vercmp 2.18 $2) = 1 ]]; then
+  if [[ $(vercmp 2.19 $2) = 1 ]]; then
 locale-gen
   fi
   



[arch-commits] Commit in glibc/trunk (PKGBUILD glibc-2.18-xattr-compat-hack.patch)

2014-01-06 Thread Allan McRae
Date: Tuesday, January 7, 2014 @ 08:09:38
  Author: allan
Revision: 203269

upgpkg: glibc 2.18-12

hack fix for xattr.h header issues, keep libcrpyt.a due to popular demand

Added:
  glibc/trunk/glibc-2.18-xattr-compat-hack.patch
Modified:
  glibc/trunk/PKGBUILD

+
 PKGBUILD   |   12 +---
 glibc-2.18-xattr-compat-hack.patch |   19 +++
 2 files changed, 28 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-01-07 04:40:11 UTC (rev 203268)
+++ PKGBUILD2014-01-07 07:09:38 UTC (rev 203269)
@@ -8,7 +8,7 @@
 
 pkgname=glibc
 pkgver=2.18
-pkgrel=11
+pkgrel=12
 pkgdesc=GNU C Library
 arch=('i686' 'x86_64')
 url=http://www.gnu.org/software/libc;
@@ -31,6 +31,7 @@
 glibc-2.18-getaddrinfo-assertion.patch
 glibc-2.18-scanf-parse-0e-0.patch
 glibc-2.18-strstr-hackfix.patch
+glibc-2.18-xattr-compat-hack.patch
 nscd.service
 nscd.tmpfiles
 locale.gen.txt
@@ -46,6 +47,7 @@
  'd4d86add33f22125777e0ecff06bc9bb'
  '01d19fe9b2aea489cf5651530e0369f2'
  '4441f6dfe7d75ced1fa75e54dd21d36e'
+ '7ca96c68a37f2a4ab91792bfa0160a24'
  'd5fab2cd3abea65aa5ae696ea4a47d6b'
  'da662ca76e7c8d7efbc7986ab7acea2d'
  '07ac979b6ab5eeb778d55f041529d623'
@@ -80,6 +82,9 @@
 
   # hack fix for strstr issues on x86
   patch -p1 -i $srcdir/glibc-2.18-strstr-hackfix.patch
+  
+  # hack fix for {linux,sys}/xattr.h incompatibility
+  patch -p1 -i $srcdir/glibc-2.18-xattr-compat-hack.patch
 
   mkdir ${srcdir}/glibc-build
 }
@@ -161,8 +166,9 @@
 ${srcdir}/glibc-${pkgver}/localedata/SUPPORTED  ${pkgdir}/etc/locale.gen
 
   # remove the static libraries that have a shared counterpart
-  # note: keep libc, libdl, libm, libpthread for binutils testsuite
-  rm $pkgdir/usr/lib/lib{anl,BrokenLocale,crypt,nsl,resolv,rt,util}.a
+  # libc, libdl, libm and libpthread are required for toolchain testsuites
+  # in addition libcrypt appears widely required
+  rm $pkgdir/usr/lib/lib{anl,BrokenLocale,nsl,resolv,rt,util}.a
 
   # Do not strip the following files for improved debugging support
   # (improved as in not breaking gdb and valgrind...):

Added: glibc-2.18-xattr-compat-hack.patch
===
--- glibc-2.18-xattr-compat-hack.patch  (rev 0)
+++ glibc-2.18-xattr-compat-hack.patch  2014-01-07 07:09:38 UTC (rev 203269)
@@ -0,0 +1,19 @@
+diff -Naur glibc-2.18-orig/misc/sys/xattr.h glibc-2.18/misc/sys/xattr.h
+--- glibc-2.18-orig/misc/sys/xattr.h   2013-08-11 08:52:55.0 +1000
 glibc-2.18/misc/sys/xattr.h2014-01-07 15:45:50.533969040 +1000
+@@ -26,13 +26,8 @@
+ 
+ /* The following constants should be used for the fifth parameter of
+`*setxattr'.  */
+-enum
+-{
+-  XATTR_CREATE = 1,   /* set value, fail if attr already exists.  */
+-#define XATTR_CREATE  XATTR_CREATE
+-  XATTR_REPLACE = 2   /* set value, fail if attr does not exist.  */
+-#define XATTR_REPLACE XATTR_REPLACE
+-};
++#define XATTR_CREATE  1
++#define XATTR_REPLACE 2
+ 
+ /* Set the attribute NAME of the file pointed to by PATH to VALUE (which
+is SIZE bytes long).  Return 0 on success, -1 for errors.  */



[arch-commits] Commit in glibc/trunk (PKGBUILD)

2013-12-11 Thread Allan McRae
Date: Wednesday, December 11, 2013 @ 15:59:53
  Author: allan
Revision: 201431

upgpkg: glibc 2.18-11

binutils-2.24 toolchain build

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-12-11 14:15:51 UTC (rev 201430)
+++ PKGBUILD2013-12-11 14:59:53 UTC (rev 201431)
@@ -8,7 +8,7 @@
 
 pkgname=glibc
 pkgver=2.18
-pkgrel=10
+pkgrel=11
 pkgdesc=GNU C Library
 arch=('i686' 'x86_64')
 url=http://www.gnu.org/software/libc;



[arch-commits] Commit in glibc/trunk (PKGBUILD glibc-2.18-scanf-parse-0e-0.patch)

2013-11-08 Thread Allan McRae
Date: Saturday, November 9, 2013 @ 03:19:22
  Author: allan
Revision: 199269

upgpkg: glibc 2.18-10

scanf parsing 0e-0 fix

Added:
  glibc/trunk/glibc-2.18-scanf-parse-0e-0.patch
Modified:
  glibc/trunk/PKGBUILD

---+
 PKGBUILD  |7 +++
 glibc-2.18-scanf-parse-0e-0.patch |   67 
 2 files changed, 73 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-11-09 01:00:16 UTC (rev 199268)
+++ PKGBUILD2013-11-09 02:19:22 UTC (rev 199269)
@@ -8,7 +8,7 @@
 
 pkgname=glibc
 pkgver=2.18
-pkgrel=9
+pkgrel=10
 pkgdesc=GNU C Library
 arch=('i686' 'x86_64')
 url=http://www.gnu.org/software/libc;
@@ -29,6 +29,7 @@
 glibc-2.18-ptr-mangle-CVE-2013-4788.patch
 glibc-2.18-getaddrinfo-CVE-2013-4458.patch
 glibc-2.18-getaddrinfo-assertion.patch
+glibc-2.18-scanf-parse-0e-0.patch
 glibc-2.18-strstr-hackfix.patch
 nscd.service
 nscd.tmpfiles
@@ -43,6 +44,7 @@
  '9749ba386b08a8fe53e7ecede9bf2dfb'
  '71329fccb8eb583fb0d67b55f1e8df68'
  'd4d86add33f22125777e0ecff06bc9bb'
+ '01d19fe9b2aea489cf5651530e0369f2'
  '4441f6dfe7d75ced1fa75e54dd21d36e'
  'd5fab2cd3abea65aa5ae696ea4a47d6b'
  'da662ca76e7c8d7efbc7986ab7acea2d'
@@ -73,6 +75,9 @@
   # upstream commit 894f3f10
   patch -p1 -i $srcdir/glibc-2.18-getaddrinfo-assertion.patch
 
+  # upstream commit a4966c61
+  patch -p1 -i $srcdir/glibc-2.18-scanf-parse-0e-0.patch
+
   # hack fix for strstr issues on x86
   patch -p1 -i $srcdir/glibc-2.18-strstr-hackfix.patch
 

Added: glibc-2.18-scanf-parse-0e-0.patch
===
--- glibc-2.18-scanf-parse-0e-0.patch   (rev 0)
+++ glibc-2.18-scanf-parse-0e-0.patch   2013-11-09 02:19:22 UTC (rev 199269)
@@ -0,0 +1,67 @@
+diff --git a/stdio-common/tst-sscanf.c b/stdio-common/tst-sscanf.c
+index 1edb227..3c34f58 100644
+--- a/stdio-common/tst-sscanf.c
 b/stdio-common/tst-sscanf.c
+@@ -109,6 +109,19 @@ struct test double_tests[] =
+   { L(-inf), L(%g), 1 }
+ };
+ 
++struct test2
++{
++  const CHAR *str;
++  const CHAR *fmt;
++  int retval;
++  char residual;
++} double_tests2[] =
++{
++  { L(0e+0), L(%g%c), 1, 0 },
++  { L(0xe+0), L(%g%c), 2, '+' },
++  { L(0x.e+0), L(%g%c), 2, '+' },
++};
++
+ int
+ main (void)
+ {
+@@ -196,5 +209,26 @@ main (void)
+   }
+ }
+ 
++  for (i = 0; i  sizeof (double_tests2) / sizeof (double_tests2[0]); ++i)
++{
++  double dummy;
++  int ret;
++  char c = 0;
++
++  if ((ret = SSCANF (double_tests2[i].str, double_tests2[i].fmt,
++   dummy, c)) != double_tests2[i].retval)
++  {
++printf (double_tests2[%d] returned %d != %d\n,
++i, ret, double_tests2[i].retval);
++result = 1;
++  }
++  else if (ret == 2  c != double_tests2[i].residual)
++  {
++printf (double_tests2[%d] stopped at '%c' != '%c'\n,
++i, c, double_tests2[i].residual);
++result = 1;
++  }
++}
++
+   return result;
+ }
+diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c
+index 78dc2fc..e6fa8f3 100644
+--- a/stdio-common/vfscanf.c
 b/stdio-common/vfscanf.c
+@@ -1966,6 +1966,8 @@ _IO_vfscanf_internal (_IO_FILE *s, const char *format, 
_IO_va_list argptr,
+ if (width  0)
+   --width;
+   }
++else
++  got_digit = 1;
+   }
+ 
+ while (1)
+-- 
+1.8.4.2
+



[arch-commits] Commit in glibc/trunk (PKGBUILD locale-gen)

2013-10-21 Thread Allan McRae
Date: Monday, October 21, 2013 @ 14:47:16
  Author: allan
Revision: 197010

upgpkg: glibc 2.18-7

fix locale-gen, keep some more static libraries

Modified:
  glibc/trunk/PKGBUILD
  glibc/trunk/locale-gen

+
 PKGBUILD   |7 ---
 locale-gen |2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-10-21 12:41:49 UTC (rev 197009)
+++ PKGBUILD2013-10-21 12:47:16 UTC (rev 197010)
@@ -8,7 +8,7 @@
 
 pkgname=glibc
 pkgver=2.18
-pkgrel=6
+pkgrel=7
 pkgdesc=GNU C Library
 arch=('i686' 'x86_64')
 url=http://www.gnu.org/software/libc;
@@ -43,7 +43,7 @@
  'd5fab2cd3abea65aa5ae696ea4a47d6b'
  'da662ca76e7c8d7efbc7986ab7acea2d'
  '07ac979b6ab5eeb778d55f041529d623'
- '3d46e93c8d2771a22502d5a9603e5c49')
+ 'b5fd017036fb91199ee76f670da8c15b')
 
 prepare() {
   cd ${srcdir}/${pkgname}-${pkgver}
@@ -149,7 +149,8 @@
 
   # remove the static libraries that have a shared counterpart
   cd $pkgdir/usr/lib
-  rm lib{anl,BrokenLocale,c,crypt,dl,m,nsl,pthread,resolv,rt,util}.a
+  # note: keep libc, libdl, libm for binutils testsuite
+  rm lib{anl,BrokenLocale,crypt,nsl,pthread,resolv,rt,util}.a
 
   # Do not strip the following files for improved debugging support
   # (improved as in not breaking gdb and valgrind...):

Modified: locale-gen
===
--- locale-gen  2013-10-21 12:41:49 UTC (rev 197009)
+++ locale-gen  2013-10-21 12:47:16 UTC (rev 197010)
@@ -35,7 +35,7 @@
localedef -i $input -c -f $charset -A 
/usr/share/locale/locale.alias $locale
 }
 
-maxjobs=$(grep -qc processor /proc/cpuinfo 2/dev/null || echo 1)
+maxjobs=$(grep -c processor /proc/cpuinfo 2/dev/null || echo 1)
 echo Generating locales...
 while read locale charset; do \
case $locale in



[arch-commits] Commit in glibc/trunk (PKGBUILD)

2013-10-21 Thread Allan McRae
Date: Monday, October 21, 2013 @ 15:29:45
  Author: allan
Revision: 197016

upgpkg: glibc 2.18-8

one more static library needed...

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-10-21 13:05:46 UTC (rev 197015)
+++ PKGBUILD2013-10-21 13:29:45 UTC (rev 197016)
@@ -8,7 +8,7 @@
 
 pkgname=glibc
 pkgver=2.18
-pkgrel=7
+pkgrel=8
 pkgdesc=GNU C Library
 arch=('i686' 'x86_64')
 url=http://www.gnu.org/software/libc;
@@ -149,8 +149,8 @@
 
   # remove the static libraries that have a shared counterpart
   cd $pkgdir/usr/lib
-  # note: keep libc, libdl, libm for binutils testsuite
-  rm lib{anl,BrokenLocale,crypt,nsl,pthread,resolv,rt,util}.a
+  # note: keep libc, libdl, libm, libpthread for binutils testsuite
+  rm lib{anl,BrokenLocale,crypt,nsl,resolv,rt,util}.a
 
   # Do not strip the following files for improved debugging support
   # (improved as in not breaking gdb and valgrind...):



[arch-commits] Commit in glibc/trunk (PKGBUILD glibc-2.18-make-4.patch)

2013-10-20 Thread Allan McRae
Date: Monday, October 21, 2013 @ 03:41:08
  Author: allan
Revision: 196894

upgpkg: glibc 2.18-6

manually remove unneeded static libraries, add patch to build with make-4

Added:
  glibc/trunk/glibc-2.18-make-4.patch
Modified:
  glibc/trunk/PKGBUILD

-+
 PKGBUILD|   25 +
 glibc-2.18-make-4.patch |   45 +
 2 files changed, 62 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-10-20 21:59:03 UTC (rev 196893)
+++ PKGBUILD2013-10-21 01:41:08 UTC (rev 196894)
@@ -8,7 +8,7 @@
 
 pkgname=glibc
 pkgver=2.18
-pkgrel=5
+pkgrel=6
 pkgdesc=GNU C Library
 arch=('i686' 'x86_64')
 url=http://www.gnu.org/software/libc;
@@ -19,13 +19,14 @@
 backup=(etc/gai.conf
 etc/locale.gen
 etc/nscd.conf)
-options=('!strip')
+options=('!strip' 'staticlibs')
 install=glibc.install
 source=(http://ftp.gnu.org/gnu/libc/${pkgname}-${pkgver}.tar.xz{,.sig}
+glibc-2.18-make-4.patch
 glibc-2.18-readdir_r-CVE-2013-4237.patch
-   glibc-2.18-malloc-corrupt-CVE-2013-4332.patch
-   glibc-2.18-strcoll-CVE-2012-4412+4424.patch
-   glibc-2.18-ptr-mangle-CVE-2013-4788.patch
+glibc-2.18-malloc-corrupt-CVE-2013-4332.patch
+glibc-2.18-strcoll-CVE-2012-4412+4424.patch
+glibc-2.18-ptr-mangle-CVE-2013-4788.patch
 glibc-2.18-strstr-hackfix.patch
 nscd.service
 nscd.tmpfiles
@@ -33,6 +34,7 @@
 locale-gen)
 md5sums=('88fbbceafee809e82efd52efa1e3c58f'
  'SKIP'
+ 'e1883c2d1b01ff73650db5f5bb5a5a52'
  '154da6bf5a5248f42a7bf5bf08e01a47'
  'b79561ab9dce900e9bbeaf0d49927c2b'
  'c7264b99d0f7e51922a4d3126182c40a'
@@ -41,11 +43,14 @@
  'd5fab2cd3abea65aa5ae696ea4a47d6b'
  'da662ca76e7c8d7efbc7986ab7acea2d'
  '07ac979b6ab5eeb778d55f041529d623'
- '476e9113489f93b348b21e144b6a8fcf')
+ '3d46e93c8d2771a22502d5a9603e5c49')
 
 prepare() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  
+
+  # compatibility with make-4.0 (submitted upstream)
+  patch -p1 -i $srcdir/glibc-2.18-make-4.patch
+
   # upstream commit 91ce4085
   patch -p1 -i $srcdir/glibc-2.18-readdir_r-CVE-2013-4237.patch
 
@@ -110,7 +115,7 @@
 }
 
 check() {
-  # bug to file - the linker commands need to be reordered
+  # the linker commands need to be reordered - fixed in 2.19
   LDFLAGS=${LDFLAGS/--as-needed,/}
 
   cd ${srcdir}/glibc-build
@@ -142,6 +147,10 @@
   sed -e '1,3d' -e 's|/| |g' -e 's|\\| |g' -e 's|^|#|g' \
 ${srcdir}/glibc-${pkgver}/localedata/SUPPORTED  ${pkgdir}/etc/locale.gen
 
+  # remove the static libraries that have a shared counterpart
+  cd $pkgdir/usr/lib
+  rm lib{anl,BrokenLocale,c,crypt,dl,m,nsl,pthread,resolv,rt,util}.a
+
   # Do not strip the following files for improved debugging support
   # (improved as in not breaking gdb and valgrind...):
   #   ld-${pkgver}.so

Added: glibc-2.18-make-4.patch
===
--- glibc-2.18-make-4.patch (rev 0)
+++ glibc-2.18-make-4.patch 2013-10-21 01:41:08 UTC (rev 196894)
@@ -0,0 +1,45 @@
+From dc76f0c32dae689a08aa21a1d206d4cd62adb278 Mon Sep 17 00:00:00 2001
+From: Marc-Antoine Perennou marc-anto...@perennou.com
+Date: Thu, 10 Oct 2013 14:26:12 +0900
+Subject: [PATCH] configure: allow building with GNU Make 4
+
+Currently, configure errors telling make 4 is too old
+since it does not match our regexp.
+
+configure.in: allow GNU Make 4.*
+
+Signed-off-by: Marc-Antoine Perennou marc-anto...@perennou.com
+---
+ configure| 2 +-
+ configure.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index 5e2f4d0..e139bf0 100755
+--- a/configure
 b/configure
+@@ -4761,7 +4761,7 @@ $as_echo_n checking version of $MAKE...  6; }
+   ac_prog_version=`$MAKE --version 21 | sed -n 's/^.*GNU 
Make[^0-9]*\([0-9][0-9.]*\).*$/\1/p'`
+   case $ac_prog_version in
+ '') ac_prog_version=v. ?.??, bad; ac_verc_fail=yes;;
+-3.79* | 3.[89]*)
++3.79* | 3.[89]* | 4.*)
+ac_prog_version=$ac_prog_version, ok; ac_verc_fail=no;;
+ *) ac_prog_version=$ac_prog_version, bad; ac_verc_fail=yes;;
+ 
+diff --git a/configure.in b/configure.in
+index a7f9881..95c36b6 100644
+--- a/configure.in
 b/configure.in
+@@ -984,7 +984,7 @@ AC_CHECK_PROG_VER(CC, ${ac_tool_prefix}gcc 
${ac_tool_prefix}cc, -v,
+   critic_missing=$critic_missing gcc)
+ AC_CHECK_PROG_VER(MAKE, gnumake gmake make, --version,
+   [GNU Make[^0-9]*\([0-9][0-9.]*\)],
+-  [3.79* | 3.[89]*], critic_missing=$critic_missing make)
++  [3.79* | 3.[89]* | 4.*], critic_missing=$critic_missing make)
+ 
+ AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsgfmt msgfmt, --version,
+   [GNU gettext.* \([0-9]*\.[0-9.]*\)],
+-- 
+1.8.4.1
+



[arch-commits] Commit in glibc/trunk (PKGBUILD glibc.install)

2013-10-13 Thread Allan McRae
Date: Monday, October 14, 2013 @ 07:21:25
  Author: allan
Revision: 196451

only regenerate locales when (possibly) needed

Modified:
  glibc/trunk/PKGBUILD
  glibc/trunk/glibc.install

---+
 PKGBUILD  |2 ++
 glibc.install |5 -
 2 files changed, 6 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-10-14 05:14:39 UTC (rev 196450)
+++ PKGBUILD2013-10-14 05:21:25 UTC (rev 196451)
@@ -4,6 +4,8 @@
 # toolchain build order: 
linux-api-headers-glibc-binutils-gcc-binutils-glibc
 # NOTE: valgrind requires rebuilt with each major glibc version
 
+# NOTE: adjust version in install script when locale files are updated
+
 pkgname=glibc
 pkgver=2.18
 pkgrel=5

Modified: glibc.install
===
--- glibc.install   2013-10-14 05:14:39 UTC (rev 196450)
+++ glibc.install   2013-10-14 05:21:25 UTC (rev 196451)
@@ -3,8 +3,11 @@
 
 post_upgrade() {
   ldconfig -r .
-  locale-gen
   
+  if [[ $(vercmp 2.18 $2) = 1 ]]; then
+locale-gen
+  fi
+  
   [[ -x usr/bin/install-info ]] || return 0
   for file in ${filelist[@]}; do
 install-info $infodir/$file.gz $infodir/dir 2 /dev/null



[arch-commits] Commit in glibc/trunk (PKGBUILD)

2013-08-24 Thread Allan McRae
Date: Sunday, August 25, 2013 @ 05:48:04
  Author: allan
Revision: 193596

upgpkg: glibc 2.18-3

enable lock elision

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-08-24 22:19:33 UTC (rev 193595)
+++ PKGBUILD2013-08-25 03:48:04 UTC (rev 193596)
@@ -6,7 +6,7 @@
 
 pkgname=glibc
 pkgver=2.18
-pkgrel=2
+pkgrel=3
 pkgdesc=GNU C Library
 arch=('i686' 'x86_64')
 url=http://www.gnu.org/software/libc;
@@ -74,6 +74,7 @@
   --enable-kernel=2.6.32 \
   --enable-bind-now --disable-profile \
   --enable-stackguard-randomization \
+  --enable-lock-elision \
   --enable-multi-arch
 
   # build libraries with hardening disabled



[arch-commits] Commit in glibc/trunk (PKGBUILD)

2013-05-30 Thread Allan McRae
Date: Thursday, May 30, 2013 @ 09:47:03
  Author: allan
Revision: 186623

upgpkg: glibc 2.17-6

/usr move

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |   18 --
 1 file changed, 8 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-05-30 05:56:36 UTC (rev 186622)
+++ PKGBUILD2013-05-30 07:47:03 UTC (rev 186623)
@@ -6,7 +6,7 @@
 
 pkgname=glibc
 pkgver=2.17
-pkgrel=5
+pkgrel=6
 pkgdesc=GNU C Library
 arch=('i686' 'x86_64')
 url=http://www.gnu.org/software/libc;
@@ -61,6 +61,8 @@
   fi
 
   echo slibdir=/usr/lib  configparms
+  echo sbindir=/usr/bin  configparms
+  echo rootsbindir=/usr/bin  configparms
 
   # remove hardening options for building libraries
   CFLAGS=${CFLAGS/-fstack-protector/}
@@ -88,7 +90,7 @@
   make
 
   # remove harding in preparation to run test-suite
-  sed -i '2,4d' configparms
+  sed -i '4,6d' configparms
 }
 
 check() {
@@ -119,9 +121,6 @@
 
   install -m755 ${srcdir}/locale-gen ${pkgdir}/usr/bin
 
-  # temporary symlink
-  ln -s ../../sbin/ldconfig ${pkgdir}/usr/bin/ldconfig
-
   # create /etc/locale.gen
   install -m644 ${srcdir}/locale.gen.txt ${pkgdir}/etc/locale.gen
   sed -e '1,3d' -e 's|/| |g' -e 's|\\| |g' -e 's|^|#|g' \
@@ -135,11 +134,10 @@
   #   libthread_db-1.0.so
 
   cd $pkgdir
-  strip $STRIP_BINARIES sbin/{ldconfig,sln} \
-usr/bin/{gencat,getconf,getent,iconv,locale,localedef} 
\
-usr/bin/{makedb,pcprofiledump,pldd,rpcgen,sprof} \
-usr/lib/getconf/* \
-usr/sbin/{iconvconfig,nscd}
+  strip $STRIP_BINARIES usr/bin/{gencat,getconf,getent,iconv,iconvconfig} \
+usr/bin/{ldconfig,locale,localedef,nscd,makedb} \
+usr/bin/{pcprofiledump,pldd,rpcgen,sln,sprof} \
+usr/lib/getconf/*
   [[ $CARCH = i686 ]]  strip $STRIP_BINARIES usr/bin/lddlibc4
 
   strip $STRIP_STATIC usr/lib/*.a



[arch-commits] Commit in glibc/trunk (PKGBUILD)

2013-03-27 Thread Allan McRae
Date: Wednesday, March 27, 2013 @ 12:12:12
  Author: allan
Revision: 180858

gcc-4.8 rebuild

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-03-27 11:11:40 UTC (rev 180857)
+++ PKGBUILD2013-03-27 11:12:12 UTC (rev 180858)
@@ -6,7 +6,7 @@
 
 pkgname=glibc
 pkgver=2.17
-pkgrel=3
+pkgrel=4
 pkgdesc=GNU C Library
 arch=('i686' 'x86_64')
 url=http://www.gnu.org/software/libc;



[arch-commits] Commit in glibc/trunk (PKGBUILD)

2013-01-26 Thread Allan McRae
Date: Sunday, January 27, 2013 @ 08:11:19
  Author: allan
Revision: 176060

upgpkg: glibc 2.17-3

add filesystem dep

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-01-27 06:52:07 UTC (rev 176059)
+++ PKGBUILD2013-01-27 07:11:19 UTC (rev 176060)
@@ -6,13 +6,13 @@
 
 pkgname=glibc
 pkgver=2.17
-pkgrel=2
+pkgrel=3
 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.7' 'tzdata')
+depends=('linux-api-headers=3.7' 'tzdata' 'filesystem=2013.01')
 makedepends=('gcc=4.7')
 backup=(etc/gai.conf
 etc/locale.gen



[arch-commits] Commit in glibc/trunk (PKGBUILD glibc-2.17-sync-with-linux37.patch)

2013-01-21 Thread allan
Date: Monday, January 21, 2013 @ 16:12:06
  Author: allan
Revision: 175766

upgpkg: glibc 2.17-2

sync with linux-3.7, remove unnecessary adjustments to ldconfig, move /lib 
symlinks to filesystem package, add temporary ldconfig symlink to help with 
future /sbin merge, ldd adjustment should no longer be needed

Added:
  glibc/trunk/glibc-2.17-sync-with-linux37.patch
Modified:
  glibc/trunk/PKGBUILD

+
 PKGBUILD   |   24 ++
 glibc-2.17-sync-with-linux37.patch |  130 +++
 2 files changed, 140 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-01-21 13:44:43 UTC (rev 175765)
+++ PKGBUILD2013-01-21 15:12:06 UTC (rev 175766)
@@ -6,7 +6,7 @@
 
 pkgname=glibc
 pkgver=2.17
-pkgrel=1
+pkgrel=2
 pkgdesc=GNU C Library
 arch=('i686' 'x86_64')
 url=http://www.gnu.org/software/libc;
@@ -20,12 +20,14 @@
 options=('!strip')
 install=glibc.install
 source=(http://ftp.gnu.org/gnu/libc/${pkgname}-${pkgver}.tar.xz{,.sig}
+glibc-2.17-sync-with-linux37.patch
 nscd.service
 nscd.tmpfiles
 locale.gen.txt
 locale-gen)
 md5sums=('87bf675c8ee523ebda4803e8e1cec638'
  '6db4d1661cf34282755dc90330465f6d'
+ 'fb99380d94598cc76d793deebf630022'
  'c1e07c0bec0fe89791bfd9d13fc85edf'
  'bccbe5619e75cf1d97312ec3681c605c'
  '07ac979b6ab5eeb778d55f041529d623'
@@ -35,8 +37,8 @@
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
-  # ldconfig does not need to look in /usr/lib64 or /usr/libx32 on Arch Linux
-  sed -i s#add_system_dir#do_not_add_system_dir# 
sysdeps/unix/sysv/linux/x86_64/dl-cache.h
+  # combination of upstream commits 318cd0b, b540704 and fc1abbe
+  patch -p1 -i ${srcdir}/glibc-2.17-sync-with-linux37.patch
 
   cd ${srcdir}
   mkdir glibc-build
@@ -97,30 +99,24 @@
 
   rm -f ${pkgdir}/etc/ld.so.{cache,conf}
 
-  # eventually this will move to the filesystem package
-  ln -s usr/lib ${pkgdir}/lib
+  install -dm755 ${pkgdir}/usr/lib/{locale,systemd/system,tmpfiles.d}
 
-  install -dm755 
${pkgdir}/{etc/rc.d,usr/{sbin,lib/{,locale,systemd/system,tmpfiles.d}}}
-
   install -m644 ${srcdir}/${pkgname}-${pkgver}/nscd/nscd.conf 
${pkgdir}/etc/nscd.conf
   install -m644 ${srcdir}/nscd.service ${pkgdir}/usr/lib/systemd/system
   install -m644 ${srcdir}/nscd.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/nscd.conf
 
   install -m644 ${srcdir}/${pkgname}-${pkgver}/posix/gai.conf 
${pkgdir}/etc/gai.conf
 
-  install -m755 ${srcdir}/locale-gen ${pkgdir}/usr/sbin
+  install -m755 ${srcdir}/locale-gen ${pkgdir}/usr/bin
 
+  # temporary symlink
+  ln -s ../../sbin/ldconfig ${pkgdir}/usr/bin/ldconfig
+
   # create /etc/locale.gen
   install -m644 ${srcdir}/locale.gen.txt ${pkgdir}/etc/locale.gen
   sed -e '1,3d' -e 's|/| |g' -e 's|\\| |g' -e 's|^|#|g' \
 ${srcdir}/glibc-${pkgver}/localedata/SUPPORTED  ${pkgdir}/etc/locale.gen
 
-  if [[ ${CARCH} = x86_64 ]]; then
-# fix paths and compliance with binary blobs...
-sed -i '/RTLDLIST/s%lib64%lib%' ${pkgdir}/usr/bin/ldd
-ln -s usr/lib ${pkgdir}/lib64
-  fi
-
   # Do not strip the following files for improved debugging support
   # (improved as in not breaking gdb and valgrind...):
   #   ld-${pkgver}.so

Added: glibc-2.17-sync-with-linux37.patch
===
--- glibc-2.17-sync-with-linux37.patch  (rev 0)
+++ glibc-2.17-sync-with-linux37.patch  2013-01-21 15:12:06 UTC (rev 175766)
@@ -0,0 +1,130 @@
+diff --git a/sysdeps/gnu/netinet/tcp.h b/sysdeps/gnu/netinet/tcp.h
+index 06e8414..b62a696 100644
+--- a/sysdeps/gnu/netinet/tcp.h
 b/sysdeps/gnu/netinet/tcp.h
+@@ -37,20 +37,29 @@
+ /*
+  * User-settable options (used with setsockopt).
+  */
+-#define   TCP_NODELAY  1  /* Don't delay send to coalesce packets 
 */
+-#define   TCP_MAXSEG   2  /* Set maximum segment size  */
+-#define TCP_CORK   3  /* Control sending of partial frames  */
+-#define TCP_KEEPIDLE   4  /* Start keeplives after this period */
+-#define TCP_KEEPINTVL  5  /* Interval between keepalives */
+-#define TCP_KEEPCNT6  /* Number of keepalives before death */
+-#define TCP_SYNCNT 7  /* Number of SYN retransmits */
+-#define TCP_LINGER28  /* Life time of orphaned FIN-WAIT-2 state */
+-#define TCP_DEFER_ACCEPT 9/* Wake up listener only when data arrive */
+-#define TCP_WINDOW_CLAMP 10   /* Bound advertised window */
+-#define TCP_INFO   11 /* Information about this connection. */
+-#define   TCP_QUICKACK 12 /* Bock/reenable quick ACKs.  */
+-#define TCP_CONGESTION 13 /* Congestion control algorithm.  */
+-#define TCP_MD5SIG 14 /* TCP MD5 Signature (RFC2385) */
++#define   TCP_NODELAY  1  /* Don't delay send to coalesce 
packets  */
++#define   TCP_MAXSEG 

[arch-commits] Commit in glibc/trunk (PKGBUILD)

2012-12-27 Thread Allan McRae
Date: Thursday, December 27, 2012 @ 19:19:53
  Author: allan
Revision: 173911

add bugurl

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |1 +
 1 file changed, 1 insertion(+)

Modified: PKGBUILD
===
--- PKGBUILD2012-12-27 21:38:45 UTC (rev 173910)
+++ PKGBUILD2012-12-28 00:19:53 UTC (rev 173911)
@@ -57,6 +57,7 @@
   ${srcdir}/${pkgname}-${pkgver}/configure --prefix=/usr \
   --libdir=/usr/lib --libexecdir=/usr/lib \
   --with-headers=/usr/include \
+  --with-bugurl=https://bugs.archlinux.org/ \
   --enable-add-ons=nptl,libidn \
   --enable-obsolete-rpc \
   --enable-kernel=2.6.32 \



[arch-commits] Commit in glibc/trunk (PKGBUILD)

2012-10-24 Thread Allan McRae
Date: Wednesday, October 24, 2012 @ 17:18:34
  Author: allan
Revision: 169623

update md5sum

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-10-24 19:19:13 UTC (rev 169622)
+++ PKGBUILD2012-10-24 21:18:34 UTC (rev 169623)
@@ -42,7 +42,7 @@
  '2426f593bc43f5499c41d21b57ee0e30'
  'a441353901992feda4b15a11a20140a1'
  '589d79041aa767a5179eaa4e2737dd3f'
- 'ad8a9af15ab7eeaa23dc7ee85024af9f'
+ 'c1e07c0bec0fe89791bfd9d13fc85edf'
  'bccbe5619e75cf1d97312ec3681c605c'
  '07ac979b6ab5eeb778d55f041529d623'
  '476e9113489f93b348b21e144b6a8fcf')



[arch-commits] Commit in glibc/trunk (PKGBUILD)

2012-09-19 Thread Allan McRae
Date: Wednesday, September 19, 2012 @ 23:26:30
  Author: allan
Revision: 166857

no errors are acceptable in the test-suite

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-09-19 22:53:47 UTC (rev 166856)
+++ PKGBUILD2012-09-20 03:26:30 UTC (rev 166857)
@@ -111,7 +111,7 @@
 
 check() {
   cd ${srcdir}/glibc-build
-  make -k check
+  make check
 }
 
 package() {



[arch-commits] Commit in glibc/trunk (PKGBUILD glibc-2.16-rpcgen-cpp-path.patch)

2012-08-11 Thread Allan McRae
Date: Saturday, August 11, 2012 @ 04:25:30
  Author: allan
Revision: 165121

upgpkg: glibc 2.16.0-3

linux-api-header-3.5 toolchain rebuild, have rpcgen fall back to system cpp

Added:
  glibc/trunk/glibc-2.16-rpcgen-cpp-path.patch
Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |   10 -
 glibc-2.16-rpcgen-cpp-path.patch |   68 +
 2 files changed, 76 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-08-11 08:23:19 UTC (rev 165120)
+++ PKGBUILD2012-08-11 08:25:30 UTC (rev 165121)
@@ -6,13 +6,13 @@
 
 pkgname=glibc
 pkgver=2.16.0
-pkgrel=2
+pkgrel=3
 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.4' 'tzdata')
+depends=('linux-api-headers=3.5' 'tzdata')
 makedepends=('gcc=4.7')
 backup=(etc/gai.conf
 etc/locale.gen
@@ -22,6 +22,7 @@
 source=(http://ftp.gnu.org/gnu/libc/${pkgname}-${pkgver}.tar.xz{,.sig}
 glibc-2.15-fix-res_query-assert.patch
 glibc-2.15-revert-c5a0802a.patch
+glibc-2.16-rpcgen-cpp-path.patch
 nscd.rcd
 nscd.service
 nscd.tmpfiles
@@ -31,6 +32,7 @@
  '2a1221a15575820751c325ef4d2fbb90'
  '31f415b41197d85d3bbee3d1eecd06a3'
  '0a0383d50d63f1c02919fe9943b82014'
+ 'ea6a43915474e8276e9361eed6a01280'
  '589d79041aa767a5179eaa4e2737dd3f'
  'ad8a9af15ab7eeaa23dc7ee85024af9f'
  'bccbe5619e75cf1d97312ec3681c605c'
@@ -48,6 +50,10 @@
   # https://bugzilla.redhat.com/show_bug.cgi?id=552960
   patch -p1 -i ${srcdir}/glibc-2.15-revert-c5a0802a.patch
 
+  # prevent need for /lib/cpp symlink
+  # http://sourceware.org/git/?p=glibc.git;a=commit;h=bf9b740a
+  patch -p1 -i ${srcdir}/glibc-2.16-rpcgen-cpp-path.patch
+
   cd ${srcdir}
   mkdir glibc-build
   cd glibc-build

Added: glibc-2.16-rpcgen-cpp-path.patch
===
--- glibc-2.16-rpcgen-cpp-path.patch(rev 0)
+++ glibc-2.16-rpcgen-cpp-path.patch2012-08-11 08:25:30 UTC (rev 165121)
@@ -0,0 +1,68 @@
+diff --git a/sunrpc/rpc_main.c b/sunrpc/rpc_main.c
+index 06d951a..2103b10 100644
+--- a/sunrpc/rpc_main.c
 b/sunrpc/rpc_main.c
+@@ -75,12 +75,9 @@ struct commandline
+ 
+ static const char *cmdname;
+ 
+-#define SVR4_CPP /usr/ccs/lib/cpp
+-#define SUNOS_CPP /lib/cpp
+-
+ static const char *svcclosetime = 120;
+ static int cppDefined;/* explicit path for C preprocessor */
+-static const char *CPP = SUNOS_CPP;
++static const char *CPP = /lib/cpp;
+ static const char CPPFLAGS[] = -C;
+ static char *pathbuf;
+ static int cpp_pid;
+@@ -327,23 +324,17 @@ find_cpp (void)
+ {
+   struct stat buf;
+ 
+-  if (stat (CPP, buf)  0)
+-{ /* /lib/cpp or explicit cpp does not exist */
+-  if (cppDefined)
+-  {
+-fprintf (stderr, _ (cannot find C preprocessor: %s \n), CPP);
+-crash ();
+-  }
+-  else
+-  {   /* try the other one */
+-CPP = SVR4_CPP;
+-if (stat (CPP, buf)  0)
+-  {   /* can't find any cpp */
+-fputs (_ (cannot find any C preprocessor (cpp)\n), stdout);
+-crash ();
+-  }
+-  }
++  if (stat (CPP, buf) == 0)
++return;
++
++  if (cppDefined) /* user specified cpp but it does not exist */
++{
++  fprintf (stderr, _ (cannot find C preprocessor: %s\n), CPP);
++  crash ();
+ }
++
++  /* fall back to system CPP */
++  CPP = cpp;
+ }
+ 
+ /*
+@@ -374,8 +365,13 @@ open_input (const char *infile, const char *define)
+   close (1);
+   dup2 (pd[1], 1);
+   close (pd[0]);
+-  execv (arglist[0], (char **) arglist);
+-  perror (execv);
++  execvp (arglist[0], (char **) arglist);
++  if (errno == ENOENT)
++{
++  fprintf (stderr, _ (cannot find C preprocessor: %s\n), CPP);
++  exit (1);
++}
++  perror (execvp);
+   exit (1);
+ case -1:
+   perror (fork);



[arch-commits] Commit in glibc/trunk (PKGBUILD)

2012-08-11 Thread Allan McRae
Date: Saturday, August 11, 2012 @ 05:34:03
  Author: allan
Revision: 165133

fix default linker search paths

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-08-11 09:27:55 UTC (rev 165132)
+++ PKGBUILD2012-08-11 09:34:03 UTC (rev 165133)
@@ -54,6 +54,9 @@
   # http://sourceware.org/git/?p=glibc.git;a=commit;h=bf9b740a
   patch -p1 -i ${srcdir}/glibc-2.16-rpcgen-cpp-path.patch
 
+  # ldconfig does not need to look in /usr/lib64 or /usr/libx32 on Arch Linux
+  sed -i s#add_system_dir#do_not_add_system_dir# 
sysdeps/unix/sysv/linux/x86_64/dl-cache.h
+
   cd ${srcdir}
   mkdir glibc-build
   cd glibc-build
@@ -64,7 +67,7 @@
 export CFLAGS=${CFLAGS} -mno-tls-direct-seg-refs
   fi
 
-  echo slibdir=/lib  configparms
+  echo slibdir=/usr/lib  configparms
 
   # remove hardening options from CFLAGS for building libraries
   CFLAGS=${CFLAGS/-fstack-protector/}
@@ -102,8 +105,6 @@
 package() {
   cd ${srcdir}/glibc-build
 
-  ln -s usr/lib ${pkgdir}/lib
-
   install -dm755 ${pkgdir}/etc
   touch ${pkgdir}/etc/ld.so.conf
 
@@ -111,6 +112,9 @@
 
   rm -f ${pkgdir}/etc/ld.so.{cache,conf}
 
+  # eventually this will move to the filesystem package
+  ln -s usr/lib ${pkgdir}/lib
+
   install -dm755 
${pkgdir}/{etc/rc.d,usr/{sbin,lib/{,locale,systemd/system,tmpfiles.d}}}
 
   install -m644 ${srcdir}/${pkgname}-${pkgver}/nscd/nscd.conf 
${pkgdir}/etc/nscd.conf



[arch-commits] Commit in glibc/trunk (PKGBUILD)

2012-07-07 Thread Allan McRae
Date: Saturday, July 7, 2012 @ 07:29:47
  Author: allan
Revision: 163114

upgpkg: glibc 2.16.0-2

final /lib - /usr/lib move

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |   14 --
 1 file changed, 8 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-07-07 10:34:53 UTC (rev 163113)
+++ PKGBUILD2012-07-07 11:29:47 UTC (rev 163114)
@@ -6,7 +6,7 @@
 
 pkgname=glibc
 pkgver=2.16.0
-pkgrel=1
+pkgrel=2
 pkgdesc=GNU C Library
 arch=('i686' 'x86_64')
 url=http://www.gnu.org/software/libc;
@@ -96,6 +96,8 @@
 package() {
   cd ${srcdir}/glibc-build
 
+  ln -s usr/lib ${pkgdir}/lib
+
   install -dm755 ${pkgdir}/etc
   touch ${pkgdir}/etc/ld.so.conf
 
@@ -123,7 +125,7 @@
   if [[ ${CARCH} = x86_64 ]]; then
 # fix paths and compliance with binary blobs...
 sed -i '/RTLDLIST/s%lib64%lib%' ${pkgdir}/usr/bin/ldd
-ln -s /lib ${pkgdir}/lib64
+ln -s usr/lib ${pkgdir}/lib64
   fi
 
   # Do not strip the following files for improved debugging support
@@ -143,9 +145,9 @@
 
   strip $STRIP_STATIC usr/lib/*.a
 
-  strip $STRIP_SHARED lib/{libanl,libBrokenLocale,libcidn,libcrypt}-*.so \
-  lib/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-*.so 
\
-  lib/{libdl,libm,libnsl,libresolv,librt,libutil}-*.so \
-  lib/{libmemusage,libpcprofile,libSegFault}.so \
+  strip $STRIP_SHARED usr/lib/{libanl,libBrokenLocale,libcidn,libcrypt}-*.so \
+  
usr/lib/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-*.so \
+  usr/lib/{libdl,libm,libnsl,libresolv,librt,libutil}-*.so 
\
+  usr/lib/{libmemusage,libpcprofile,libSegFault}.so \
   usr/lib/{pt_chown,{audit,gconv}/*.so}
 }



[arch-commits] Commit in glibc/trunk (PKGBUILD)

2012-07-02 Thread Allan McRae
Date: Monday, July 2, 2012 @ 18:54:56
  Author: allan
Revision: 162891

upgpkg: glibc 2.16.0-1

upstream update

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |   18 ++
 1 file changed, 6 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-07-02 22:06:36 UTC (rev 162890)
+++ PKGBUILD2012-07-02 22:54:56 UTC (rev 162891)
@@ -13,7 +13,7 @@
 license=('GPL' 'LGPL')
 groups=('base')
 depends=('linux-api-headers=3.4' 'tzdata')
-makedepends=('gcc=4.6')
+makedepends=('gcc=4.7')
 backup=(etc/gai.conf
 etc/locale.gen
 etc/nscd.conf)
@@ -30,7 +30,7 @@
 md5sums=('80b181b02ab249524ec92822c0174cf7'
  '2a1221a15575820751c325ef4d2fbb90'
  '31f415b41197d85d3bbee3d1eecd06a3'
- '7ae3e426251ae33e73dbad71f9c91378'
+ '0a0383d50d63f1c02919fe9943b82014'
  '589d79041aa767a5179eaa4e2737dd3f'
  'ad8a9af15ab7eeaa23dc7ee85024af9f'
  'bccbe5619e75cf1d97312ec3681c605c'
@@ -117,19 +117,13 @@
 
   # create /etc/locale.gen
   install -m644 ${srcdir}/locale.gen.txt ${pkgdir}/etc/locale.gen
-  sed -i s|/| |g ${srcdir}/${pkgname}-${pkgver}/localedata/SUPPORTED
-  sed -i 's|\\| |g' ${srcdir}/${pkgname}-${pkgver}/localedata/SUPPORTED
-  sed -i s|SUPPORTED-LOCALES=|| 
${srcdir}/${pkgname}-${pkgver}/localedata/SUPPORTED
-  cat ${srcdir}/${pkgname}-${pkgver}/localedata/SUPPORTED  
${pkgdir}/etc/locale.gen
-  sed -i s|^|#|g ${pkgdir}/etc/locale.gen
+  sed -e '1,3d' -e 's|/| |g' -e 's|\\| |g' -e 's|^|#|g' \
+${srcdir}/glibc-2.16.0/localedata/SUPPORTED  ${pkgdir}/etc/locale.gen
 
   if [[ ${CARCH} = x86_64 ]]; then
-# fix for the linker
+# fix paths and compliance with binary blobs...
 sed -i '/RTLDLIST/s%lib64%lib%' ${pkgdir}/usr/bin/ldd
-# Comply with multilib binaries, they look for the linker in /lib64
-mkdir ${pkgdir}/lib64
-cd ${pkgdir}/lib64
-ln -v -s ../lib/ld* .
+ln -s /lib ${pkgdir}/lib64
   fi
 
   # Do not strip the following files for improved debugging support



[arch-commits] Commit in glibc/trunk (PKGBUILD)

2012-06-30 Thread Allan McRae
Date: Saturday, June 30, 2012 @ 23:49:33
  Author: allan
Revision: 162816

more update prep

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |   16 
 1 file changed, 8 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-07-01 01:13:42 UTC (rev 162815)
+++ PKGBUILD2012-07-01 03:49:33 UTC (rev 162816)
@@ -38,7 +38,7 @@
  '476e9113489f93b348b21e144b6a8fcf')
 
 build() {
-  cd ${srcdir}/glibc
+  cd ${srcdir}/${pkgname}-${pkgver}
 
   # fix res_query assertion
   # http://sourceware.org/bugzilla/show_bug.cgi?id=13013
@@ -64,7 +64,7 @@
   CFLAGS=${CFLAGS/-fstack-protector/}
   CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/}
 
-  ${srcdir}/glibc/configure --prefix=/usr \
+  ${srcdir}/${pkgname}-${pkgver}/configure --prefix=/usr \
   --libdir=/usr/lib --libexecdir=/usr/lib \
   --with-headers=/usr/include \
   --enable-add-ons=nptl,libidn \
@@ -105,22 +105,22 @@
 
   install -dm755 
${pkgdir}/{etc/rc.d,usr/{sbin,lib/{,locale,systemd/system,tmpfiles.d}}}
 
-  install -m644 ${srcdir}/glibc/nscd/nscd.conf ${pkgdir}/etc/nscd.conf
+  install -m644 ${srcdir}/${pkgname}-${pkgver}/nscd/nscd.conf 
${pkgdir}/etc/nscd.conf
   sed -i -e 's/^\tserver-user/#\tserver-user/' ${pkgdir}/etc/nscd.conf
   install -m755 ${srcdir}/nscd.rcd ${pkgdir}/etc/rc.d/nscd
   install -m644 ${srcdir}/nscd.service ${pkgdir}/usr/lib/systemd/system
   install -m644 ${srcdir}/nscd.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/nscd.conf
 
-  install -m644 ${srcdir}/glibc/posix/gai.conf ${pkgdir}/etc/gai.conf
+  install -m644 ${srcdir}/${pkgname}-${pkgver}/posix/gai.conf 
${pkgdir}/etc/gai.conf
 
   install -m755 ${srcdir}/locale-gen ${pkgdir}/usr/sbin
 
   # create /etc/locale.gen
   install -m644 ${srcdir}/locale.gen.txt ${pkgdir}/etc/locale.gen
-  sed -i s|/| |g ${srcdir}/glibc/localedata/SUPPORTED
-  sed -i 's|\\| |g' ${srcdir}/glibc/localedata/SUPPORTED
-  sed -i s|SUPPORTED-LOCALES=|| ${srcdir}/glibc/localedata/SUPPORTED
-  cat ${srcdir}/glibc/localedata/SUPPORTED  ${pkgdir}/etc/locale.gen
+  sed -i s|/| |g ${srcdir}/${pkgname}-${pkgver}/localedata/SUPPORTED
+  sed -i 's|\\| |g' ${srcdir}/${pkgname}-${pkgver}/localedata/SUPPORTED
+  sed -i s|SUPPORTED-LOCALES=|| 
${srcdir}/${pkgname}-${pkgver}/localedata/SUPPORTED
+  cat ${srcdir}/${pkgname}-${pkgver}/localedata/SUPPORTED  
${pkgdir}/etc/locale.gen
   sed -i s|^|#|g ${pkgdir}/etc/locale.gen
 
   if [[ ${CARCH} = x86_64 ]]; then



[arch-commits] Commit in glibc/trunk (PKGBUILD glibc-2.15-confstr-strdup.patch)

2012-03-24 Thread Allan McRae
Date: Saturday, March 24, 2012 @ 22:42:21
  Author: allan
Revision: 154259

upgpkg: glibc 2.15-9

fix getconf output (and file names created using it)

Added:
  glibc/trunk/glibc-2.15-confstr-strdup.patch
Modified:
  glibc/trunk/PKGBUILD

-+
 PKGBUILD|7 ++-
 glibc-2.15-confstr-strdup.patch |   31 +++
 2 files changed, 37 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-03-25 02:41:53 UTC (rev 154258)
+++ PKGBUILD2012-03-25 02:42:21 UTC (rev 154259)
@@ -6,7 +6,7 @@
 
 pkgname=glibc
 pkgver=2.15
-pkgrel=8
+pkgrel=9
 _glibcdate=20111227
 pkgdesc=GNU C Library
 arch=('i686' 'x86_64')
@@ -49,6 +49,7 @@
 glibc-2.15-non-signalling-comparisons.patch
 glibc-2.15-rintf-rounding.patch
 glibc-2.15-nearbyintf-rounding.patch
+glibc-2.15-confstr-strdup.patch
 nscd
 locale.gen.txt
 locale-gen)
@@ -81,6 +82,7 @@
  'c483504cf404ed0b44480af627813a97'
  '1419d61fd1dbc6cdc48bb59da86fa66f'
  '7ff501435078b1a2622124fbeaafc921'
+ '41f94da2f8db856b091a2d670d68eee3'
  'b587ee3a70c9b3713099295609afde49'
  '07ac979b6ab5eeb778d55f041529d623'
  '476e9113489f93b348b21e144b6a8fcf')
@@ -212,6 +214,9 @@
   # http://sourceware.org/git/?p=glibc.git;a=commit;h=6cbeae47
   patch -p1 -i ${srcdir}/glibc-2.15-nearbyintf-rounding.patch
 
+  # fix varaible scope issue exposed with gcc-4.7 and -O2
+  patch -p1 -i ${srcdir}/glibc-2.15-confstr-strdup.patch
+
   install -dm755 ${pkgdir}/etc
   touch ${pkgdir}/etc/ld.so.conf
 

Added: glibc-2.15-confstr-strdup.patch
===
--- glibc-2.15-confstr-strdup.patch (rev 0)
+++ glibc-2.15-confstr-strdup.patch 2012-03-25 02:42:21 UTC (rev 154259)
@@ -0,0 +1,31 @@
+diff --git a/posix/confstr.c b/posix/confstr.c
+index 3c9566d..3ba9e5a 100644
+--- a/posix/confstr.c
 b/posix/confstr.c
+@@ -104,7 +104,7 @@ confstr (name, buf, len)
+ }
+ #endif
+   restenvs[string_len++] = '\0';
+-  string = restenvs;
++  string = strdup(restenvs);
+   }
+   break;
+ 
+@@ -167,7 +167,7 @@ confstr (name, buf, len)
+ }
+ #endif
+   restenvs[string_len++] = '\0';
+-  string = restenvs;
++  string = strdup(restenvs);
+   }
+   break;
+ 
+@@ -230,7 +230,7 @@ confstr (name, buf, len)
+ }
+ #endif
+   restenvs[string_len++] = '\0';
+-  string = restenvs;
++  string = strdup(restenvs);
+   }
+   break;
+ 



[arch-commits] Commit in glibc/trunk (PKGBUILD)

2012-01-25 Thread Allan McRae
Date: Wednesday, January 25, 2012 @ 19:23:05
  Author: allan
Revision: 147652

kill whitespace

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-26 00:13:54 UTC (rev 147651)
+++ PKGBUILD2012-01-26 00:23:05 UTC (rev 147652)
@@ -142,7 +142,7 @@
   --with-tls --with-__thread \
   --enable-bind-now --without-gd \
   --without-cvs --disable-profile \
-  --enable-multi-arch  
+  --enable-multi-arch
 
   # build libraries with hardening disabled
   echo build-programs=no  configparms



[arch-commits] Commit in glibc/trunk (PKGBUILD glibc-2.15-math64crash.patch)

2011-12-30 Thread Allan McRae
Date: Friday, December 30, 2011 @ 03:02:02
  Author: allan
Revision: 145762

upgpkg: glibc 2.15-3

deal with some crashes in x86_64 math...

Added:
  glibc/trunk/glibc-2.15-math64crash.patch
Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |8 +
 glibc-2.15-math64crash.patch |  184 +
 2 files changed, 191 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-12-30 06:09:32 UTC (rev 145761)
+++ PKGBUILD2011-12-30 08:02:02 UTC (rev 145762)
@@ -6,7 +6,7 @@
 
 pkgname=glibc
 pkgver=2.15
-pkgrel=2
+pkgrel=3
 _glibcdate=20111227
 pkgdesc=GNU C Library
 arch=('i686' 'x86_64')
@@ -31,6 +31,7 @@
 glibc-2.14-reinstall-nis-rpc-headers.patch
 glibc-2.15-lddebug-scopes.patch
 glibc-2.15-revert-c5a0802a.patch
+glibc-2.15-math64crash.patch
 nscd
 locale.gen.txt
 locale-gen)
@@ -45,6 +46,7 @@
  '55febbb72139ac7b65757df085024b83'
  '3c219ddfb619b6df903cac4cc42c611d'
  '7ae3e426251ae33e73dbad71f9c91378'
+ 'dc7550e659ddd685bd78a930d15a01f2'
  'b587ee3a70c9b3713099295609afde49'
  '07ac979b6ab5eeb778d55f041529d623'
  '476e9113489f93b348b21e144b6a8fcf')
@@ -100,6 +102,10 @@
   # https://bugzilla.redhat.com/show_bug.cgi?id=769421
   patch -Np1 -i ${srcdir}/glibc-2.15-revert-c5a0802a.patch
 
+  # revert optimized math routines that can cause crashes (FS#27736, FS#27743)
+  # obviously not a real fix...
+  patch -Np1 -i ${srcdir}/glibc-2.15-math64crash.patch
+
   install -dm755 ${pkgdir}/etc
   touch ${pkgdir}/etc/ld.so.conf
 

Added: glibc-2.15-math64crash.patch
===
--- glibc-2.15-math64crash.patch(rev 0)
+++ glibc-2.15-math64crash.patch2011-12-30 08:02:02 UTC (rev 145762)
@@ -0,0 +1,184 @@
+diff --git a/sysdeps/x86_64/fpu/multiarch/Makefile 
b/sysdeps/x86_64/fpu/multiarch/Makefile
+index be68903..a032da8 100644
+--- a/sysdeps/x86_64/fpu/multiarch/Makefile
 b/sysdeps/x86_64/fpu/multiarch/Makefile
+@@ -1,5 +1,5 @@
+ ifeq ($(subdir),math)
+-libm-sysdep_routines += s_floor-c s_ceil-c s_floorf-c s_ceilf-c \
++libm-sysdep_routines += s_floorf-c s_ceilf-c \
+   s_rint-c s_rintf-c s_nearbyint-c s_nearbyintf-c
+ 
+ ifeq ($(have-mfma4),yes)
+diff --git a/sysdeps/x86_64/fpu/multiarch/s_ceil-c.c 
b/sysdeps/x86_64/fpu/multiarch/s_ceil-c.c
+deleted file mode 100644
+index 6a5ea3f..000
+--- a/sysdeps/x86_64/fpu/multiarch/s_ceil-c.c
 /dev/null
+@@ -1,2 +0,0 @@
+-#define __ceil __ceil_c
+-#include sysdeps/ieee754/dbl-64/wordsize-64/s_ceil.c
+diff --git a/sysdeps/x86_64/fpu/multiarch/s_ceil.S 
b/sysdeps/x86_64/fpu/multiarch/s_ceil.S
+deleted file mode 100644
+index d0f8da3..000
+--- a/sysdeps/x86_64/fpu/multiarch/s_ceil.S
 /dev/null
+@@ -1,40 +0,0 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
+-   This file is part of the GNU C Library.
+-   Contributed by Ulrich Drepper drep...@gmail.come, 2011.
+-
+-   The GNU C Library is free software; you can redistribute it and/or
+-   modify it under the terms of the GNU Lesser General Public
+-   License as published by the Free Software Foundation; either
+-   version 2.1 of the License, or (at your option) any later version.
+-
+-   The GNU C Library is distributed in the hope that it will be useful,
+-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+-   Lesser General Public License for more details.
+-
+-   You should have received a copy of the GNU Lesser General Public
+-   License along with the GNU C Library; if not, write to the Free
+-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+-   02111-1307 USA.  */
+-
+-#include machine/asm.h
+-#include init-arch.h
+-
+-
+-ENTRY(__ceil)
+-  .type   __ceil, @gnu_indirect_function
+-  call__get_cpu_features@plt
+-  movq%rax, %rdx
+-  leaq__ceil_sse41(%rip), %rax
+-  testl   $bit_SSE4_1, CPUID_OFFSET+index_SSE4_1(%rdx)
+-  jnz 2f
+-  leaq__ceil_c(%rip), %rax
+-2:ret
+-END(__ceil)
+-weak_alias (__ceil, ceil)
+-
+-
+-ENTRY(__ceil_sse41)
+-  roundsd $2, %xmm0, %xmm0
+-  ret
+-END(__ceil_sse41)
+diff --git a/sysdeps/x86_64/fpu/multiarch/s_floor-c.c 
b/sysdeps/x86_64/fpu/multiarch/s_floor-c.c
+deleted file mode 100644
+index 68733b6..000
+--- a/sysdeps/x86_64/fpu/multiarch/s_floor-c.c
 /dev/null
+@@ -1,3 +0,0 @@
+-#undef __floor
+-#define __floor __floor_c
+-#include sysdeps/ieee754/dbl-64/wordsize-64/s_floor.c
+diff --git a/sysdeps/x86_64/fpu/multiarch/s_floor.S 
b/sysdeps/x86_64/fpu/multiarch/s_floor.S
+deleted file mode 100644
+index 514ea95..000
+--- a/sysdeps/x86_64/fpu/multiarch/s_floor.S
 /dev/null
+@@ -1,40 +0,0 @@
+-/* Copyright 

[arch-commits] Commit in glibc/trunk (PKGBUILD glibc-2.14.1-tzfile-overflow.patch)

2011-12-18 Thread Allan McRae
Date: Sunday, December 18, 2011 @ 05:45:07
  Author: allan
Revision: 145158

upgpkg: glibc 2.14.1-4

fix typo in upstream patch which causes timezone issues

Modified:
  glibc/trunk/PKGBUILD
  glibc/trunk/glibc-2.14.1-tzfile-overflow.patch

+
 PKGBUILD   |4 ++--
 glibc-2.14.1-tzfile-overflow.patch |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-12-18 10:42:24 UTC (rev 145157)
+++ PKGBUILD2011-12-18 10:45:07 UTC (rev 145158)
@@ -6,7 +6,7 @@
 
 pkgname=glibc
 pkgver=2.14.1
-pkgrel=3
+pkgrel=4
 _glibcdate=20111025
 pkgdesc=GNU C Library
 arch=('i686' 'x86_64')
@@ -46,7 +46,7 @@
  '7da8c554a3b591c7401d7023b1928afc'
  'c5de2a946215d647c8af5432ec4b0da0'
  '55febbb72139ac7b65757df085024b83'
- '1c5fe2ad0120a40432d429f958d18965'
+ '178779bfaa1418c709f31c25eb3d8a3e'
  'b587ee3a70c9b3713099295609afde49'
  '07ac979b6ab5eeb778d55f041529d623'
  '476e9113489f93b348b21e144b6a8fcf')

Modified: glibc-2.14.1-tzfile-overflow.patch
===
--- glibc-2.14.1-tzfile-overflow.patch  2011-12-18 10:42:24 UTC (rev 145157)
+++ glibc-2.14.1-tzfile-overflow.patch  2011-12-18 10:45:07 UTC (rev 145158)
@@ -59,7 +59,7 @@
 +  if (__builtin_expect (tzspec_len  num_isstd, 0))
 +  goto lose;
 +  tzspec_len -= num_isstd;
-+  if (__builtin_expect (tzspec == 0 || tzspec_len - 1  num_isgmt, 0))
++  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))



[arch-commits] Commit in glibc/trunk (PKGBUILD glibc-2.14.1-tzfile-overflow.patch)

2011-12-17 Thread Allan McRae
Date: Saturday, December 17, 2011 @ 21:28:16
  Author: allan
Revision: 145147

upgpkg: glibc 2.14.1-3

fix potential heap overflow vulnerability, do less stripping to fix valgrind 
issues

Added:
  glibc/trunk/glibc-2.14.1-tzfile-overflow.patch
Modified:
  glibc/trunk/PKGBUILD

+
 PKGBUILD   |   23 +++
 glibc-2.14.1-tzfile-overflow.patch |   72 +++
 2 files changed, 87 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-12-18 00:41:44 UTC (rev 145146)
+++ PKGBUILD2011-12-18 02:28:16 UTC (rev 145147)
@@ -6,7 +6,7 @@
 
 pkgname=glibc
 pkgver=2.14.1
-pkgrel=2
+pkgrel=3
 _glibcdate=20111025
 pkgdesc=GNU C Library
 arch=('i686' 'x86_64')
@@ -31,6 +31,7 @@
 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)
@@ -45,11 +46,11 @@
  '7da8c554a3b591c7401d7023b1928afc'
  'c5de2a946215d647c8af5432ec4b0da0'
  '55febbb72139ac7b65757df085024b83'
+ '1c5fe2ad0120a40432d429f958d18965'
  'b587ee3a70c9b3713099295609afde49'
  '07ac979b6ab5eeb778d55f041529d623'
  '476e9113489f93b348b21e144b6a8fcf')
 
-
 mksource() {
   git clone git://sourceware.org/git/glibc.git
   pushd glibc
@@ -99,6 +100,10 @@
   # 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
 
@@ -181,9 +186,12 @@
 ln -v -s ../lib/ld* .
   fi
   
-  # manually strip files as stripping libpthread-*.so and libthread_db.so
-  # with the default $STRIP_SHARED breaks gdb and stripping ld-*.so breaks
-  # valgrind on x86_64
+  # Do not strip the following files for improved debugging support
+  # (improved as in not breaking gdb and valgrind...):
+  #   ld-${pkgver}.so
+  #   libc-${pkgver}.so
+  #   libpthread-${pkgver}.so
+  #   libthread_db-1.0.so
 
   cd $pkgdir
   strip $STRIP_BINARIES sbin/{ldconfig,sln} \
@@ -193,10 +201,9 @@
 usr/sbin/{iconvconfig,nscd}
   [[ $CARCH = i686 ]]  strip $STRIP_BINARIES usr/bin/lddlibc4
 
-  strip $STRIP_STATIC usr/lib/*.a \
-  lib/{{ld,libpthread}-${pkgver},libthread_db-1.0}.so
+  strip $STRIP_STATIC usr/lib/*.a
 
-  strip $STRIP_SHARED 
lib/{libanl,libBrokenLocale,libc,libcidn,libcrypt}-${pkgver}.so \
+  strip $STRIP_SHARED 
lib/{libanl,libBrokenLocale,libcidn,libcrypt}-${pkgver}.so \
   
lib/libnss_{compat,dns,files,hesiod,nis,nisplus}-${pkgver}.so \
   
lib/{libdl,libm,libnsl,libresolv,librt,libutil}-${pkgver}.so \
   lib/{libmemusage,libpcprofile,libSegFault}.so \

Added: glibc-2.14.1-tzfile-overflow.patch
===
--- glibc-2.14.1-tzfile-overflow.patch  (rev 0)
+++ glibc-2.14.1-tzfile-overflow.patch  2011-12-18 02:28:16 UTC (rev 145147)
@@ -0,0 +1,72 @@
+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 - 

[arch-commits] Commit in glibc/trunk (PKGBUILD)

2011-12-02 Thread Allan McRae
Date: Friday, December 2, 2011 @ 16:29:24
  Author: allan
Revision: 144072

upgpkg: glibc 2.14.1-2

binutils-2.22 toolchain rebuild

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-12-02 21:13:00 UTC (rev 144071)
+++ PKGBUILD2011-12-02 21:29:24 UTC (rev 144072)
@@ -6,14 +6,14 @@
 
 pkgname=glibc
 pkgver=2.14.1
-pkgrel=1
+pkgrel=2
 _glibcdate=20111025
 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.0' 'tzdata')
+depends=('linux-api-headers=3.1' 'tzdata')
 makedepends=('gcc=4.6')
 backup=(etc/gai.conf
 etc/locale.gen



[arch-commits] Commit in glibc/trunk (PKGBUILD)

2011-09-01 Thread Allan McRae
Date: Thursday, September 1, 2011 @ 02:55:02
  Author: allan
Revision: 136751

add gai.conf to backup array

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-09-01 06:26:56 UTC (rev 136750)
+++ PKGBUILD2011-09-01 06:55:02 UTC (rev 136751)
@@ -15,7 +15,8 @@
 groups=('base')
 depends=('linux-api-headers=3.0' 'tzdata')
 makedepends=('gcc=4.6')
-backup=(etc/locale.gen
+backup=(etc/gai.conf
+etc/locale.gen
 etc/nscd.conf)
 options=('!strip')
 install=glibc.install



[arch-commits] Commit in glibc/trunk (PKGBUILD)

2011-08-14 Thread Allan McRae
Date: Sunday, August 14, 2011 @ 06:10:38
  Author: allan
Revision: 135502

upgpkg: glibc 2.14-5

complete toolchain with dependencies rebuild with new CFLAGS/LDFLAGS, only 
build programs with hardening flags, libraries enable it as needed

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |   23 +++
 1 file changed, 19 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-08-14 10:07:19 UTC (rev 135501)
+++ PKGBUILD2011-08-14 10:10:38 UTC (rev 135502)
@@ -6,15 +6,15 @@
 
 pkgname=glibc
 pkgver=2.14
-pkgrel=4
+pkgrel=5
 _glibcdate=20110617
 pkgdesc=GNU C Library
 arch=('i686' 'x86_64')
 url=http://www.gnu.org/software/libc;
 license=('GPL' 'LGPL')
 groups=('base')
-depends=('linux-api-headers=2.6.39' 'tzdata')
-makedepends=('gcc=4.4')
+depends=('linux-api-headers=3.0' 'tzdata')
+makedepends=('gcc=4.6')
 backup=(etc/locale.gen
 etc/nscd.conf)
 options=('!strip')
@@ -112,6 +112,10 @@
 
   echo slibdir=/lib  configparms
 
+  # remove hardening options from CFLAGS for building libraries
+  CFLAGS=${CFLAGS/-fstack-protector/}
+  CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/}
+
   ${srcdir}/glibc/configure --prefix=/usr \
   --libdir=/usr/lib --libexecdir=/usr/lib \
   --with-headers=/usr/include \
@@ -121,8 +125,19 @@
   --enable-bind-now --without-gd \
   --without-cvs --disable-profile \
   --disable-multi-arch
-
+
+  # build libraries with hardening disabled
+  echo build-programs=no  configparms
   make
+  
+  # re-enable hardening for programs
+  sed -i s#=no#=yes# configparms
+  echo CC += -fstack-protector -D_FORTIFY_SOURCE=2  configparms
+  echo CXX += -fstack-protector -D_FORTIFY_SOURCE=2  configparms
+  make
+
+  # remove harding in preparation to run test-suite
+  sed -i '2,4d' configparms
 }
 
 check() {



[arch-commits] Commit in glibc/trunk (PKGBUILD glibc-2.14-revert-4462fad3.patch)

2011-06-25 Thread Allan McRae
Date: Saturday, June 25, 2011 @ 07:56:19
  Author: allan
Revision: 128661

upgpkg: glibc 2.14-4
re-revert problem commit (FS#24615)

Added:
  glibc/trunk/glibc-2.14-revert-4462fad3.patch
Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |   14 +-
 glibc-2.14-revert-4462fad3.patch |   37 +
 2 files changed, 46 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-06-25 11:40:13 UTC (rev 128660)
+++ PKGBUILD2011-06-25 11:56:19 UTC (rev 128661)
@@ -6,7 +6,7 @@
 
 pkgname=glibc
 pkgver=2.14
-pkgrel=3
+pkgrel=4
 _glibcdate=20110617
 pkgdesc=GNU C Library
 arch=('i686' 'x86_64')
@@ -27,7 +27,8 @@
 glibc-2.12.2-ignore-origin-of-privileged-program.patch
 glibc-2.13-futex.patch
 glibc-2.14-libdl-crash.patch
-glibc-2.14-fix-resolver-crash-typo.patch
+#glibc-2.14-fix-resolver-crash-typo.patch
+glibc-2.14-revert-4462fad3.patch
 glibc-2.14-reexport-rpc-interface.patch
 glibc-2.14-reinstall-nis-rpc-headers.patch
 nscd
@@ -41,7 +42,7 @@
  'b042647ea7d6f22ad319e12e796bd13e'
  '7d0154b7e17ea218c9fa953599d24cc4'
  'cea62cc6b903d222c5f26e05a3c0e0e6'
- '73bfaafe25b93f357cf6a3b5eeb70e1b'
+ '46e56492cccb1c9172ed3a235cf43c6c'
  'c5de2a946215d647c8af5432ec4b0da0'
  '55febbb72139ac7b65757df085024b83'
  'b587ee3a70c9b3713099295609afde49'
@@ -85,8 +86,11 @@
   # http://sourceware.org/ml/libc-alpha/2011-06/msg6.html
   patch -Np1 -i ${srcdir}/glibc-2.14-libdl-crash.patch
 
-  # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=57912a71 (FS#24615)
-  patch -Np1 -i ${srcdir}/glibc-2.14-fix-resolver-crash-typo.patch
+  # This fixes the main segfault but not the assert fail (FS#24615)
+  # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=57912a71 
+  #patch -Np1 -i ${srcdir}/glibc-2.14-fix-resolver-crash-typo.patch
+  # resort to reverting the bad commit completely for the moment
+  patch -Np1 -i ${srcdir}/glibc-2.14-revert-4462fad3.patch
 
   # re-export RPC interface until libtirpc is ready as a replacement
   # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=acee4873 (only 
fedora branch...)

Added: glibc-2.14-revert-4462fad3.patch
===
--- glibc-2.14-revert-4462fad3.patch(rev 0)
+++ glibc-2.14-revert-4462fad3.patch2011-06-25 11:56:19 UTC (rev 128661)
@@ -0,0 +1,37 @@
+diff -Naur glibc-orig//resolv/res_send.c glibc/resolv/res_send.c
+--- glibc-orig//resolv/res_send.c  2011-06-10 18:59:03.041436996 +1000
 glibc/resolv/res_send.c2011-06-10 19:08:09.379309323 +1000
+@@ -549,7 +549,7 @@
+   ns, ansp, ansp2, nansp2, resplen2);
+   if (n  0)
+   return (-1);
+-  if (n == 0  (buf2 == NULL || resplen2 == 0))
++  if (n == 0)
+   goto next_ns;
+   } else {
+   /* Use datagrams. */
+@@ -559,7 +559,7 @@
+   ansp2, nansp2, resplen2);
+   if (n  0)
+   return (-1);
+-  if (n == 0  (buf2 == NULL || resplen2 == 0))
++  if (n == 0)
+   goto next_ns;
+   if (v_circuit)
+ // XXX Check whether both requests failed or
+@@ -1275,14 +1275,10 @@
+   (*thisresplenp  *thisanssizp)
+   ? *thisanssizp : *thisresplenp);
+ 
+-  if (recvresp1 || (buf2 != NULL  recvresp2)) {
+-*resplen2 = 0;
++  if (recvresp1 || (buf2 != NULL  recvresp2))
+ return resplen;
+-  }
+   if (buf2 != NULL)
+ {
+-  /* No data from the first reply.  */
+-  resplen = 0;
+   /* We are waiting for a possible second reply.  */
+   if (hp-id == anhp-id)
+ recvresp1 = 1;



[arch-commits] Commit in glibc/trunk (PKGBUILD glibc-2.14-revert-4462fad3.patch)

2011-06-11 Thread Allan McRae
Date: Saturday, June 11, 2011 @ 04:46:22
  Author: allan
Revision: 127202

upgpkg: glibc 2.14-2
fix crash - FS#24615

Added:
  glibc/trunk/glibc-2.14-revert-4462fad3.patch
Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |   13 -
 glibc-2.14-revert-4462fad3.patch |   37 +
 2 files changed, 45 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-06-11 08:34:09 UTC (rev 127201)
+++ PKGBUILD2011-06-11 08:46:22 UTC (rev 127202)
@@ -6,7 +6,7 @@
 
 pkgname=glibc
 pkgver=2.14
-pkgrel=1
+pkgrel=2
 _glibcdate=20110605
 pkgdesc=GNU C Library
 arch=('i686' 'x86_64')
@@ -27,6 +27,7 @@
 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-4462fad3.patch
 nscd
 locale.gen.txt
 locale-gen)
@@ -38,6 +39,7 @@
  'b042647ea7d6f22ad319e12e796bd13e'
  '7d0154b7e17ea218c9fa953599d24cc4'
  'cea62cc6b903d222c5f26e05a3c0e0e6'
+ '46e56492cccb1c9172ed3a235cf43c6c'
  'b587ee3a70c9b3713099295609afde49'
  '07ac979b6ab5eeb778d55f041529d623'
  '476e9113489f93b348b21e144b6a8fcf')
@@ -79,6 +81,10 @@
   # http://sourceware.org/ml/libc-alpha/2011-06/msg6.html
   patch -Np1 -i ${srcdir}/glibc-2.14-libdl-crash.patch
 
+  # revert fix for http://sourceware.org/bugzilla/show_bug.cgi?id=12684
+  # as it causes crashes  (FS#24615)
+  patch -Np1 -i ${srcdir}/glibc-2.14-revert-4462fad3.patch
+
   install -dm755 ${pkgdir}/etc
   touch ${pkgdir}/etc/ld.so.conf
 
@@ -165,8 +171,5 @@
   
lib/libnss_{compat,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,gconv/*.so}
-
-# add usr/lib/audit/sotruss-lib.so, usr/bin/sotruss
-
+  usr/lib/{pt_chown,{audit,gconv}/*.so}
 }

Added: glibc-2.14-revert-4462fad3.patch
===
--- glibc-2.14-revert-4462fad3.patch(rev 0)
+++ glibc-2.14-revert-4462fad3.patch2011-06-11 08:46:22 UTC (rev 127202)
@@ -0,0 +1,37 @@
+diff -Naur glibc-orig//resolv/res_send.c glibc/resolv/res_send.c
+--- glibc-orig//resolv/res_send.c  2011-06-10 18:59:03.041436996 +1000
 glibc/resolv/res_send.c2011-06-10 19:08:09.379309323 +1000
+@@ -549,7 +549,7 @@
+   ns, ansp, ansp2, nansp2, resplen2);
+   if (n  0)
+   return (-1);
+-  if (n == 0  (buf2 == NULL || resplen2 == 0))
++  if (n == 0)
+   goto next_ns;
+   } else {
+   /* Use datagrams. */
+@@ -559,7 +559,7 @@
+   ansp2, nansp2, resplen2);
+   if (n  0)
+   return (-1);
+-  if (n == 0  (buf2 == NULL || resplen2 == 0))
++  if (n == 0)
+   goto next_ns;
+   if (v_circuit)
+ // XXX Check whether both requests failed or
+@@ -1275,14 +1275,10 @@
+   (*thisresplenp  *thisanssizp)
+   ? *thisanssizp : *thisresplenp);
+ 
+-  if (recvresp1 || (buf2 != NULL  recvresp2)) {
+-*resplen2 = 0;
++  if (recvresp1 || (buf2 != NULL  recvresp2))
+ return resplen;
+-  }
+   if (buf2 != NULL)
+ {
+-  /* No data from the first reply.  */
+-  resplen = 0;
+   /* We are waiting for a possible second reply.  */
+   if (hp-id == anhp-id)
+ recvresp1 = 1;



[arch-commits] Commit in glibc/trunk (PKGBUILD)

2011-06-07 Thread Allan McRae
Date: Tuesday, June 7, 2011 @ 06:57:24
  Author: allan
Revision: 126794

fix patch name

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-06-07 10:47:37 UTC (rev 126793)
+++ PKGBUILD2011-06-07 10:57:24 UTC (rev 126794)
@@ -77,7 +77,7 @@
 
   # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=675155e9 (only 
fedora branch...)
   # http://sourceware.org/ml/libc-alpha/2011-06/msg6.html
-  patch -Np1 -i ${srcdir}/glibc-2.14-fix-memory-leak.patch
+  patch -Np1 -i ${srcdir}/glibc-2.14-libdl-crash.patch
 
   install -dm755 ${pkgdir}/etc
   touch ${pkgdir}/etc/ld.so.conf



[arch-commits] Commit in glibc/trunk (PKGBUILD glibc-2.13-futex.patch)

2011-03-27 Thread Allan McRae
Date: Sunday, March 27, 2011 @ 02:35:25
  Author: allan
Revision: 116984

upgpkg: glibc 2.13-5
gcc-4.6 toolchain rebuild, patch to fix futex issue rather than disabling it

Added:
  glibc/trunk/glibc-2.13-futex.patch
Modified:
  glibc/trunk/PKGBUILD

+
 PKGBUILD   |   12 
 glibc-2.13-futex.patch |   31 +++
 2 files changed, 39 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-03-27 06:34:44 UTC (rev 116983)
+++ PKGBUILD2011-03-27 06:35:25 UTC (rev 116984)
@@ -6,7 +6,7 @@
 
 pkgname=glibc
 pkgver=2.13
-pkgrel=4
+pkgrel=5
 _glibcdate=20110117
 pkgdesc=GNU C Library
 arch=('i686' 'x86_64')
@@ -26,6 +26,7 @@
 glibc-2.12.1-static-shared-getpagesize.patch
 glibc-2.12.2-ignore-origin-of-privileged-program.patch
 glibc-2.13-prelink.patch
+glibc-2.13-futex.patch
 nscd
 locale.gen.txt
 locale-gen)
@@ -36,6 +37,7 @@
  'a3ac6f318d680347bb6e2805d42b73b2'
  'b042647ea7d6f22ad319e12e796bd13e'
  '24dfab6fd244f3773523412588ecc52c'
+ '7d0154b7e17ea218c9fa953599d24cc4'
  'b587ee3a70c9b3713099295609afde49'
  '07ac979b6ab5eeb778d55f041529d623'
  '476e9113489f93b348b21e144b6a8fcf')
@@ -74,9 +76,7 @@
   patch -Np1 -i ${srcdir}/glibc-2.13-prelink.patch
 
   # http://sourceware.org/bugzilla/show_bug.cgi?id=12403
-  if [[ $CARCH == x86_64 ]]; then
-sed -i '/__ASSUME_PRIVATE_FUTEX/d'  
$srcdir/glibc/sysdeps/unix/sysv/linux/kernel-features.h
-  fi
+  patch -Np1 -i ${srcdir}/glibc-2.13-futex.patch
 
   install -dm755 ${pkgdir}/etc
   touch ${pkgdir}/etc/ld.so.conf
@@ -103,7 +103,11 @@
   --disable-multi-arch
 
   make
+}
 
+check() {
+  cd ${srcdir}/glibc-build
+
   # some errors are expected - manually check log files
   make -k check || true
 }

Added: glibc-2.13-futex.patch
===
--- glibc-2.13-futex.patch  (rev 0)
+++ glibc-2.13-futex.patch  2011-03-27 06:35:25 UTC (rev 116984)
@@ -0,0 +1,31 @@
+--- 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)



[arch-commits] Commit in glibc/trunk (PKGBUILD glibc-2.13-prelink.patch)

2011-02-17 Thread Allan McRae
Date: Thursday, February 17, 2011 @ 23:46:54
  Author: allan
Revision: 110236

upgpkg: glibc 2.13-4
fix prelink issue (FS#22656)

Added:
  glibc/trunk/glibc-2.13-prelink.patch
Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |8 +++-
 glibc-2.13-prelink.patch |   26 ++
 2 files changed, 33 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-02-17 23:32:13 UTC (rev 110235)
+++ PKGBUILD2011-02-18 04:46:54 UTC (rev 110236)
@@ -6,7 +6,7 @@
 
 pkgname=glibc
 pkgver=2.13
-pkgrel=3
+pkgrel=4
 _glibcdate=20110117
 pkgdesc=GNU C Library
 arch=('i686' 'x86_64')
@@ -25,6 +25,7 @@
 glibc-__i686.patch
 glibc-2.12.1-static-shared-getpagesize.patch
 glibc-2.12.2-ignore-origin-of-privileged-program.patch
+glibc-2.13-prelink.patch
 nscd
 locale.gen.txt
 locale-gen)
@@ -34,6 +35,7 @@
  '40cd342e21f71f5e49e32622b25acc52'
  'a3ac6f318d680347bb6e2805d42b73b2'
  'b042647ea7d6f22ad319e12e796bd13e'
+ '24dfab6fd244f3773523412588ecc52c'
  'b587ee3a70c9b3713099295609afde49'
  '07ac979b6ab5eeb778d55f041529d623'
  '476e9113489f93b348b21e144b6a8fcf')
@@ -67,6 +69,10 @@
   # 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=12489
+  # http://sourceware.org/git/?p=glibc.git;a=commit;h=25b3aada (only fedora 
branch...)
+  patch -Np1 -i ${srcdir}/glibc-2.13-prelink.patch
+
   # http://sourceware.org/bugzilla/show_bug.cgi?id=12403
   if [[ $CARCH == x86_64 ]]; then
 sed -i '/__ASSUME_PRIVATE_FUTEX/d'  
$srcdir/glibc/sysdeps/unix/sysv/linux/kernel-features.h

Added: glibc-2.13-prelink.patch
===
--- glibc-2.13-prelink.patch(rev 0)
+++ glibc-2.13-prelink.patch2011-02-18 04:46:54 UTC (rev 110236)
@@ -0,0 +1,26 @@
+diff --git a/elf/rtld.c b/elf/rtld.c
+index 9a560b3..201c9cf 100644
+--- a/elf/rtld.c
 b/elf/rtld.c
+@@ -2168,6 +2168,10 @@ ERROR: ld.so: object '%s' cannot be loaded as audit 
interface: %s; ignored.\n,
+  we need it in the memory handling later.  */
+   GLRO(dl_initial_searchlist) = *GL(dl_ns)[LM_ID_BASE]._ns_main_searchlist;
+ 
++  /* Remember the last search directory added at startup, now that
++ malloc will no longer be the one from dl-minimal.c.  */
++  GLRO(dl_init_all_dirs) = GL(dl_all_dirs);
++
+   if (prelinked)
+ {
+   if (main_map-l_info [ADDRIDX (DT_GNU_CONFLICT)] != NULL)
+@@ -2288,10 +2292,6 @@ ERROR: ld.so: object '%s' cannot be loaded as audit 
interface: %s; ignored.\n,
+ lossage);
+ }
+ 
+-  /* Remember the last search directory added at startup, now that
+- malloc will no longer be the one from dl-minimal.c.  */
+-  GLRO(dl_init_all_dirs) = GL(dl_all_dirs);
+-
+   if (! prelinked  rtld_multiple_ref)
+ {
+   /* There was an explicit ref to the dynamic linker as a shared lib.



[arch-commits] Commit in glibc/trunk (PKGBUILD)

2011-02-09 Thread Allan McRae
Date: Wednesday, February 9, 2011 @ 03:59:18
  Author: allan
Revision: 109381

upgpkg: glibc 2.13-3
rebuild to remove nopl instructions on i686

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-02-09 08:58:30 UTC (rev 109380)
+++ PKGBUILD2011-02-09 08:59:18 UTC (rev 109381)
@@ -6,8 +6,8 @@
 
 pkgname=glibc
 pkgver=2.13
-pkgrel=2
-_glibcdate=20110203
+pkgrel=3
+_glibcdate=20110117
 pkgdesc=GNU C Library
 arch=('i686' 'x86_64')
 url=http://www.gnu.org/software/libc;
@@ -28,7 +28,7 @@
 nscd
 locale.gen.txt
 locale-gen)
-md5sums=('b023a3e46fe7fb38dc47eae7c3d87226'
+md5sums=('b7b17d9c6b5b71b5e5322e04ca63c190'
  '4dadb9203b69a3210d53514bb46f41c3'
  '0c5540efc51c0b93996c51b57a8540ae'
  '40cd342e21f71f5e49e32622b25acc52'



[arch-commits] Commit in glibc/trunk (PKGBUILD)

2011-02-04 Thread Allan McRae
Date: Friday, February 4, 2011 @ 21:05:02
  Author: allan
Revision: 108941

upgpkg: glibc 2.13-2
new upstream snapshot

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |   10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-02-04 23:29:51 UTC (rev 108940)
+++ PKGBUILD2011-02-05 02:05:02 UTC (rev 108941)
@@ -6,8 +6,8 @@
 
 pkgname=glibc
 pkgver=2.13
-pkgrel=1
-_glibcdate=20110117
+pkgrel=2
+_glibcdate=20110203
 pkgdesc=GNU C Library
 arch=('i686' 'x86_64')
 url=http://www.gnu.org/software/libc;
@@ -28,7 +28,7 @@
 nscd
 locale.gen.txt
 locale-gen)
-md5sums=('b7b17d9c6b5b71b5e5322e04ca63c190'
+md5sums=('b023a3e46fe7fb38dc47eae7c3d87226'
  '4dadb9203b69a3210d53514bb46f41c3'
  '0c5540efc51c0b93996c51b57a8540ae'
  '40cd342e21f71f5e49e32622b25acc52'
@@ -41,9 +41,7 @@
 mksource() {
   git clone git://sourceware.org/git/glibc.git
   pushd glibc
-  # glibc-2.13 has been tagged but not branched yet
-  git checkout -b glibc-2.13-arch origin/master || return 1
-  #git checkout -b glibc-2.13-arch origin/release/2.13/master || return 1
+  git checkout -b glibc-2.13-arch origin/release/2.13/master
   popd
   tar -cvJf glibc-${pkgver}_${_glibcdate}.tar.xz glibc/*
 }



[arch-commits] Commit in glibc/trunk (PKGBUILD)

2011-01-18 Thread Allan McRae
Date: Tuesday, January 18, 2011 @ 19:37:38
  Author: allan
Revision: 106764

upgpkg: glibc 2.13-1
upstream update

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |   14 --
 1 file changed, 8 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-01-19 00:37:11 UTC (rev 106763)
+++ PKGBUILD2011-01-19 00:37:38 UTC (rev 106764)
@@ -5,15 +5,15 @@
 # NOTE: valgrind requires rebuilt with each new glibc version
 
 pkgname=glibc
-pkgver=2.12.2
-pkgrel=2
-_glibcdate=20101214
+pkgver=2.13
+pkgrel=1
+_glibcdate=20110117
 pkgdesc=GNU C Library
 arch=('i686' 'x86_64')
 url=http://www.gnu.org/software/libc;
 license=('GPL' 'LGPL')
 groups=('base')
-depends=('linux-api-headers=2.6.36.2' 'tzdata')
+depends=('linux-api-headers=2.6.37' 'tzdata')
 makedepends=('gcc=4.4')
 backup=(etc/locale.gen
 etc/nscd.conf)
@@ -28,7 +28,7 @@
 nscd
 locale.gen.txt
 locale-gen)
-md5sums=('e2d03fb95c9f838177284192dea063dc'
+md5sums=('b7b17d9c6b5b71b5e5322e04ca63c190'
  '4dadb9203b69a3210d53514bb46f41c3'
  '0c5540efc51c0b93996c51b57a8540ae'
  '40cd342e21f71f5e49e32622b25acc52'
@@ -41,7 +41,9 @@
 mksource() {
   git clone git://sourceware.org/git/glibc.git
   pushd glibc
-  git checkout -b glibc-2.12-arch origin/release/2.12/master || return 1
+  # glibc-2.13 has been tagged but not branched yet
+  git checkout -b glibc-2.13-arch origin/master || return 1
+  #git checkout -b glibc-2.13-arch origin/release/2.13/master || return 1
   popd
   tar -cvJf glibc-${pkgver}_${_glibcdate}.tar.xz glibc/*
 }



[arch-commits] Commit in glibc/trunk (PKGBUILD)

2011-01-16 Thread Allan McRae
Date: Sunday, January 16, 2011 @ 06:02:49
  Author: allan
Revision: 106270

fix futex bug on x86_64

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-01-16 10:35:05 UTC (rev 106269)
+++ PKGBUILD2011-01-16 11:02:49 UTC (rev 106270)
@@ -6,7 +6,7 @@
 
 pkgname=glibc
 pkgver=2.12.2
-pkgrel=1
+pkgrel=2
 _glibcdate=20101214
 pkgdesc=GNU C Library
 arch=('i686' 'x86_64')
@@ -67,6 +67,11 @@
   # 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
+  if [[ $CARCH == x86_64 ]]; then
+sed -i '/__ASSUME_PRIVATE_FUTEX/d'  
$srcdir/glibc/sysdeps/unix/sysv/linux/kernel-features.h
+  fi
+
   install -dm755 ${pkgdir}/etc
   touch ${pkgdir}/etc/ld.so.conf
 



[arch-commits] Commit in glibc/trunk (PKGBUILD)

2010-12-31 Thread Allan McRae
Date: Friday, December 31, 2010 @ 10:42:48
  Author: allan
Revision: 104322

fix permissions of gai.conf

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-12-31 10:32:21 UTC (rev 104321)
+++ PKGBUILD2010-12-31 15:42:48 UTC (rev 104322)
@@ -109,7 +109,7 @@
   install -m644 ${srcdir}/glibc/nscd/nscd.conf ${pkgdir}/etc/nscd.conf
   install -m755 ${srcdir}/nscd ${pkgdir}/etc/rc.d/nscd
   install -m755 ${srcdir}/locale-gen ${pkgdir}/usr/sbin
-  install -m755 ${srcdir}/glibc/posix/gai.conf ${pkgdir}/etc/gai.conf
+  install -m644 ${srcdir}/glibc/posix/gai.conf ${pkgdir}/etc/gai.conf
 
   sed -i -e 's/^\tserver-user/#\tserver-user/' ${pkgdir}/etc/nscd.conf
 



[arch-commits] Commit in glibc/trunk (PKGBUILD)

2010-12-16 Thread Allan McRae
Date: Thursday, December 16, 2010 @ 20:26:33
  Author: allan
Revision: 103264

fix typo

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-12-17 01:00:09 UTC (rev 103263)
+++ PKGBUILD2010-12-17 01:26:33 UTC (rev 103264)
@@ -65,7 +65,7 @@
 
   # 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-privileded-program.patch
+  patch -Np1 -i 
${srcdir}/glibc-2.12.2-ignore-origin-of-privileged-program.patch
 
   install -dm755 ${pkgdir}/etc
   touch ${pkgdir}/etc/ld.so.conf



[arch-commits] Commit in glibc/trunk (PKGBUILD)

2010-11-25 Thread Allan McRae
Date: Thursday, November 25, 2010 @ 21:14:15
  Author: allan
Revision: 100862

run test suite

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |3 +++
 1 file changed, 3 insertions(+)

Modified: PKGBUILD
===
--- PKGBUILD2010-11-26 02:08:28 UTC (rev 100861)
+++ PKGBUILD2010-11-26 02:14:15 UTC (rev 100862)
@@ -112,6 +112,9 @@
   --libdir=/usr/lib --without-gd --disable-multi-arch
 
   make
+
+  # some errors are expected - manually check log files
+  make -k check || true
 }
 
 package() {



[arch-commits] Commit in glibc/trunk (PKGBUILD)

2010-08-10 Thread Allan McRae
Date: Tuesday, August 10, 2010 @ 20:55:29
  Author: allan
Revision: 87193

upgpkg: glibc 2.12.1-1
upstream update

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |   20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-08-10 22:47:23 UTC (rev 87192)
+++ PKGBUILD2010-08-11 00:55:29 UTC (rev 87193)
@@ -6,9 +6,9 @@
 # NOTE: valgrind requires rebuilt with each new glibc version
 
 pkgname=glibc
-pkgver=2.12
-pkgrel=4
-_glibcdate=20100620
+pkgver=2.12.1
+pkgrel=1
+_glibcdate=20100811
 pkgdesc=GNU C Library
 arch=('i686' 'x86_64')
 url=http://www.gnu.org/software/libc;
@@ -21,14 +21,14 @@
 etc/nscd.conf)
 options=('!strip')
 install=glibc.install
-source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.tar.bz2
+source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.tar.xz
 glibc-2.10-dont-build-timezone.patch
 glibc-2.10-bz4781.patch
 glibc-__i686.patch
 nscd
 locale.gen.txt
 locale-gen)
-md5sums=('8857bfae3e0a659452ddd8f9d2606490'
+md5sums=('3f0d64de5a9fc5614d8acc0f1d5846ed'
  '4dadb9203b69a3210d53514bb46f41c3'
  '0c5540efc51c0b93996c51b57a8540ae'
  '40cd342e21f71f5e49e32622b25acc52'
@@ -41,7 +41,7 @@
   pushd glibc
   git checkout -b glibc-2.12-arch origin/release/2.12/master
   popd
-  tar -cvjf glibc-${pkgver}_${_glibcdate}.tar.bz2 glibc/*
+  tar -cvJf glibc-${pkgver}_${_glibcdate}.tar.xz glibc/*
 }
 
 build() {
@@ -128,11 +128,11 @@
   [[ $CARCH = i686 ]]  strip $STRIP_BINARIES usr/bin/lddlibc4
 
   strip $STRIP_STATIC usr/lib/*.a \
-  lib/{{ld,libpthread}-2.12,libthread_db-1.0}.so
+  lib/{{ld,libpthread}-${pkgver},libthread_db-1.0}.so
 
-  strip $STRIP_SHARED 
lib/{libanl,libBrokenLocale,libc,libcidn,libcrypt}-2.12.so \
-  lib/libnss_{compat,dns,files,hesiod,nis,nisplus}-2.12.so 
\
-  lib/{libdl,libm,libnsl,libresolv,librt,libutil}-2.12.so \
+  strip $STRIP_SHARED 
lib/{libanl,libBrokenLocale,libc,libcidn,libcrypt}-${pkgver}.so \
+  
lib/libnss_{compat,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,gconv/*.so}
 }



[arch-commits] Commit in glibc/trunk (PKGBUILD)

2010-06-20 Thread Allan McRae
Date: Sunday, June 20, 2010 @ 02:16:44
  Author: allan
Revision: 82976

upgpkg: glibc 2.12-3
pull in last 2.12 branch, manually strip files to prevent gdb breakage

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |   33 +++--
 1 file changed, 27 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-06-20 06:16:31 UTC (rev 82975)
+++ PKGBUILD2010-06-20 06:16:44 UTC (rev 82976)
@@ -7,8 +7,8 @@
 
 pkgname=glibc
 pkgver=2.12
-pkgrel=2
-_glibcdate=20100521
+pkgrel=3
+_glibcdate=20100620
 pkgdesc=GNU C Library
 arch=('i686' 'x86_64')
 url=http://www.gnu.org/software/libc;
@@ -19,6 +19,7 @@
 replaces=('glibc-xen')
 backup=(etc/locale.gen
 etc/nscd.conf)
+options=('!strip')
 install=glibc.install
 
source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.tar.bz2
 glibc-2.10-dont-build-timezone.patch
@@ -27,7 +28,7 @@
 nscd
 locale.gen.txt
 locale-gen)
-md5sums=('5c0e450103c1e2d008c34ac208910b99'
+md5sums=('8857bfae3e0a659452ddd8f9d2606490'
  '4dadb9203b69a3210d53514bb46f41c3'
  '0c5540efc51c0b93996c51b57a8540ae'
  '40cd342e21f71f5e49e32622b25acc52'
@@ -62,7 +63,7 @@
   mkdir glibc-build
   cd glibc-build
 
-  if [ ${CARCH} = i686 ]; then
+  if [[ ${CARCH} = i686 ]]; then
 # Hack to fix NPTL issues with Xen, only required on 32bit platforms
 export CFLAGS=${CFLAGS} -mno-tls-direct-seg-refs
   fi
@@ -76,7 +77,7 @@
   --enable-bind-now --with-tls --with-__thread \
   --libdir=/usr/lib --without-gd --disable-multi-arch
 
-  make || return 1
+  make
 }
 
 package() {
@@ -105,7 +106,7 @@
   cat ${srcdir}/glibc/localedata/SUPPORTED  ${pkgdir}/etc/locale.gen
   sed -i s|^|#|g ${pkgdir}/etc/locale.gen
 
-  if [ ${CARCH} = x86_64 ]; then
+  if [[ ${CARCH} = x86_64 ]]; then
 # fix for the linker
 sed -i '/RTLDLIST/s%/ld-linux.so.2 /lib64%%' ${pkgdir}/usr/bin/ldd
 #Comply with multilib binaries, they look for the linker in /lib64
@@ -113,4 +114,24 @@
 cd ${pkgdir}/lib64
 ln -v -s ../lib/ld* .
   fi
+  
+  # manually strip files as stripping libpthread and libthread_db with
+  # the default $STRIP_SHARED breaks gdb
+
+  cd $pkgdir
+  strip $STRIP_BINARIES sbin/{ldconfig,sln} \
+usr/bin/{gencat,getconf,getent,iconv,locale} \
+usr/bin/{localedef,pcprofiledump,rpcgen,sprof} \
+usr/lib/getconf/* \
+usr/sbin/{iconvconfig,nscd,rpcinfo}
+  [[ $CARCH = i686 ]]  strip $STRIP_BINARIES usr/bin/lddlibc4
+
+  strip $STRIP_STATIC usr/lib/*.a \
+  lib/{libpthread-2.12,libthread_db-1.0}.so
+
+  strip $STRIP_SHARED 
lib/{ld,libanl,libBrokenLocale,libc,libcidn,libcrypt}-2.12.so \
+  lib/libnss_{compat,dns,files,hesiod,nis,nisplus}-2.12.so 
\
+  lib/{libdl,libm,libnsl,libresolv,librt,libutil}-2.12.so \
+  lib/{libmemusage,libpcprofile,libSegFault}.so \
+  usr/lib/{pt_chown,gconv/*.so}
 }



[arch-commits] Commit in glibc/trunk (PKGBUILD)

2010-05-29 Thread Allan McRae
Date: Saturday, May 29, 2010 @ 09:34:40
  Author: allan
Revision: 81378

upgpkg: glibc 2.12-2
disable multi-arch, fixes issues on x86_64

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-05-29 12:31:17 UTC (rev 81377)
+++ PKGBUILD2010-05-29 13:34:40 UTC (rev 81378)
@@ -7,7 +7,7 @@
 
 pkgname=glibc
 pkgver=2.12
-pkgrel=1
+pkgrel=2
 _glibcdate=20100521
 pkgdesc=GNU C Library
 arch=('i686' 'x86_64')
@@ -74,7 +74,7 @@
   --enable-kernel=2.6.18 --disable-profile \
   --with-headers=/usr/include --libexecdir=/usr/lib \
   --enable-bind-now --with-tls --with-__thread \
-  --libdir=/usr/lib --without-gd
+  --libdir=/usr/lib --without-gd --disable-multi-arch
 
   make || return 1
 }



[arch-commits] Commit in glibc/trunk (PKGBUILD glibc.install)

2010-05-22 Thread Allan McRae
Date: Saturday, May 22, 2010 @ 03:58:24
  Author: allan
Revision: 80781

upgpkg: glibc 2.12-1
glibc-2.12 toolchain build, upstream update, clean up old install stuff

Modified:
  glibc/trunk/PKGBUILD
  glibc/trunk/glibc.install

---+
 PKGBUILD  |   26 +---
 glibc.install |  118 +---
 2 files changed, 16 insertions(+), 128 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-05-22 07:56:47 UTC (rev 80780)
+++ PKGBUILD2010-05-22 07:58:24 UTC (rev 80781)
@@ -6,15 +6,15 @@
 # NOTE: valgrind requires rebuilt with each new glibc version
 
 pkgname=glibc
-pkgver=2.11.1
-pkgrel=3
-_glibcdate=20100318
+pkgver=2.12
+pkgrel=1
+_glibcdate=20100521
 pkgdesc=GNU C Library
 arch=('i686' 'x86_64')
 url=http://www.gnu.org/software/libc;
 license=('GPL' 'LGPL')
 groups=('base')
-depends=('linux-api-headers=2.6.33' 'tzdata')
+depends=('linux-api-headers=2.6.34' 'tzdata')
 makedepends=('gcc=4.4')
 replaces=('glibc-xen')
 backup=(etc/locale.gen
@@ -27,7 +27,7 @@
 nscd
 locale.gen.txt
 locale-gen)
-md5sums=('4b7f8ed5a0ea946bd40318855449b570'
+md5sums=('5c0e450103c1e2d008c34ac208910b99'
  '4dadb9203b69a3210d53514bb46f41c3'
  '0c5540efc51c0b93996c51b57a8540ae'
  '40cd342e21f71f5e49e32622b25acc52'
@@ -36,11 +36,9 @@
  '476e9113489f93b348b21e144b6a8fcf')
 
 mksource() {
-  mkdir glibc-${pkgver}_${_glibcdate}
-  cd glibc-${pkgver}_${_glibcdate}
   git clone git://sourceware.org/git/glibc.git
   pushd glibc
-  git checkout -b glibc-2.11-arch origin/release/2.11/master
+  git checkout -b glibc-2.12-arch origin/release/2.12/master
   popd
   tar -cvjf glibc-${pkgver}_${_glibcdate}.tar.bz2 glibc/*
 }
@@ -49,14 +47,14 @@
   cd ${srcdir}/glibc
 
   # timezone data is in separate package (tzdata)
-  patch -Np1 -i ${srcdir}/glibc-2.10-dont-build-timezone.patch || return 1
+  patch -Np1 -i ${srcdir}/glibc-2.10-dont-build-timezone.patch
 
   # http://sources.redhat.com/bugzilla/show_bug.cgi?id=4781
-  patch -Np1 -i ${srcdir}/glibc-2.10-bz4781.patch || return 1
+  patch -Np1 -i ${srcdir}/glibc-2.10-bz4781.patch
 
   # http://sources.redhat.com/bugzilla/show_bug.cgi?id=411
   # http://sourceware.org/ml/libc-alpha/2009-07/msg00072.html
-  patch -Np1 -i ${srcdir}/glibc-__i686.patch || return 1
+  patch -Np1 -i ${srcdir}/glibc-__i686.patch
 
   install -dm755 ${pkgdir}/etc
   touch ${pkgdir}/etc/ld.so.conf
@@ -83,12 +81,12 @@
 
 package() {
   cd ${srcdir}/glibc/glibc-build
-  make install_root=${pkgdir} install || return 1
+  make install_root=${pkgdir} install
 
   # provided by kernel-headers
   rm ${pkgdir}/usr/include/scsi/scsi.h
 
-  rm ${pkgdir}/etc/ld.so.cache ${pkgdir}/etc/ld.so.conf
+  rm ${pkgdir}/etc/ld.so.conf
 
   install -dm755 ${pkgdir}/etc/rc.d
   install -dm755 ${pkgdir}/usr/sbin
@@ -97,7 +95,7 @@
   install -m755 ${srcdir}/nscd ${pkgdir}/etc/rc.d/nscd
   install -m755 ${srcdir}/locale-gen ${pkgdir}/usr/sbin
 
-  sed -i -e 's/^\tserver-user/#\tserver-user/' ${pkgdir}/etc/nscd.conf || 
return 1
+  sed -i -e 's/^\tserver-user/#\tserver-user/' ${pkgdir}/etc/nscd.conf
 
   # create /etc/locale.gen
   install -m644 ${srcdir}/locale.gen.txt ${pkgdir}/etc/locale.gen

Modified: glibc.install
===
--- glibc.install   2010-05-22 07:56:47 UTC (rev 80780)
+++ glibc.install   2010-05-22 07:58:24 UTC (rev 80781)
@@ -2,125 +2,15 @@
 filelist=(libc.info libc.info-1 libc.info-2 libc.info-3 libc.info-4 
libc.info-5 libc.info-6 libc.info-7 
   libc.info-8 libc.info-9 libc.info-10 libc.info-11)
 
-pre_upgrade() {
-if [ `uname -m` = x86_64 ]; then
- if [ `vercmp $2 2.4` -lt 0 ]; then
-   cat  _EOF
-  == glibc oldpkgver  2.4 detected!
-  == 
-  == ATTENTION x86_64 USERS:
-  ==
-  == We now switch from the former lib-linking to pure /lib support. To get 
rid
-  == of all lib64 directories we have removed the link /lib - /lib64 and
-  == /usr/lib - /usr/lib64.
-  == 
-  == We have also rebuilt all packages we know that still used lib64 
directories.
-  == Now all should go to /lib directories.
-  == 
-  == Internally we have removed the link and then mv /lib64 /lib. Same to 
/usr/lib64.
-  == /lib64 and /usr/lib64 shouldn't exist anymore. If any package still 
installs to
-  == /lib64 or /usr/lib64 let us know.
-  ==
-_EOF
-
-# now the moving
-rm -rf /lib/tls  echo /lib/tls removed
-ldconfig -r .
-rm -f /usr/lib
-mv /usr/lib64 /usr/lib  echo /usr/lib64 moved
-rm -f /lib
-mv /lib64 /lib  echo /lib64 moved
-
- fi
-fi
-}
-
 post_upgrade() {
   ldconfig -r .
   [ -x /sbin/init ]  init u
-
-  if [ `vercmp $2 2.3.6` -lt 0 ]; then
-cat  _EOF
-  == ATTENTION INTERNATIONAL USERS:
-  ==
-  == Locales are no longer included in the glibc package.
-  == They are generated by /usr/sbin/locale-gen depending on the contents
-  == of /etc/locale.gen.
-  == glibc will try to 

[arch-commits] Commit in glibc/trunk (PKGBUILD glibc-__i686.patch)

2010-04-16 Thread Allan McRae
Date: Friday, April 16, 2010 @ 08:02:10
  Author: allan
Revision: 77605

upgpkg: glibc 2.11.1-3
gcc-4.5 toolchain rebuild, patch to fix define clash with gcc-4.5

Added:
  glibc/trunk/glibc-__i686.patch
Modified:
  glibc/trunk/PKGBUILD

+
 PKGBUILD   |   14 --
 glibc-__i686.patch |   13 +
 2 files changed, 25 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-04-16 12:00:15 UTC (rev 77604)
+++ PKGBUILD2010-04-16 12:02:10 UTC (rev 77605)
@@ -7,7 +7,7 @@
 
 pkgname=glibc
 pkgver=2.11.1
-pkgrel=2
+pkgrel=3
 _glibcdate=20100318
 pkgdesc=GNU C Library
 arch=('i686' 'x86_64')
@@ -23,12 +23,14 @@
 
source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.tar.bz2
 glibc-2.10-dont-build-timezone.patch
 glibc-2.10-bz4781.patch
+glibc-__i686.patch
 nscd
 locale.gen.txt
 locale-gen)
 md5sums=('4b7f8ed5a0ea946bd40318855449b570'
  '4dadb9203b69a3210d53514bb46f41c3'
  '0c5540efc51c0b93996c51b57a8540ae'
+ '40cd342e21f71f5e49e32622b25acc52'
  'b587ee3a70c9b3713099295609afde49'
  '07ac979b6ab5eeb778d55f041529d623'
  '476e9113489f93b348b21e144b6a8fcf')
@@ -52,6 +54,10 @@
   # http://sources.redhat.com/bugzilla/show_bug.cgi?id=4781
   patch -Np1 -i ${srcdir}/glibc-2.10-bz4781.patch || return 1
 
+  # http://sources.redhat.com/bugzilla/show_bug.cgi?id=411
+  # http://sourceware.org/ml/libc-alpha/2009-07/msg00072.html
+  patch -Np1 -i ${srcdir}/glibc-__i686.patch || return 1
+
   install -dm755 ${pkgdir}/etc
   touch ${pkgdir}/etc/ld.so.conf
 
@@ -73,12 +79,16 @@
   --libdir=/usr/lib --without-gd
 
   make || return 1
+}
+
+package() {
+  cd ${srcdir}/glibc/glibc-build
   make install_root=${pkgdir} install || return 1
 
   # provided by kernel-headers
   rm ${pkgdir}/usr/include/scsi/scsi.h
 
-  rm ${pkgdir}/etc/ld.so.cache ${pkgdir}/etc/ld.so.conf ${pkgdir}/etc/localtime
+  rm ${pkgdir}/etc/ld.so.cache ${pkgdir}/etc/ld.so.conf
 
   install -dm755 ${pkgdir}/etc/rc.d
   install -dm755 ${pkgdir}/usr/sbin

Added: glibc-__i686.patch
===
--- glibc-__i686.patch  (rev 0)
+++ glibc-__i686.patch  2010-04-16 12:02:10 UTC (rev 77605)
@@ -0,0 +1,13 @@
+diff -Naur glibc-old//sysdeps/i386/Makefile glibc//sysdeps/i386/Makefile
+--- glibc-old//sysdeps/i386/Makefile   2010-03-18 11:52:30.0 +1000
 glibc//sysdeps/i386/Makefile   2010-04-16 15:05:50.0 +1000
+@@ -1,6 +1,7 @@
+ # The mpn functions need a #define for asm syntax flavor.
+-# Every i386 port in use uses gas syntax (I think).
+-asm-CPPFLAGS += -DGAS_SYNTAX
++# Every i386 port in use uses gas syntax (I think).  Don't replace
++# __i686 in __i686.get_pc_thunk.bx.
++asm-CPPFLAGS += -DGAS_SYNTAX  -U __i686
+ 
+ # The i386 `long double' is a distinct type we support.
+ long-double-fcts = yes



[arch-commits] Commit in glibc/trunk (PKGBUILD)

2010-03-18 Thread Allan McRae
Date: Thursday, March 18, 2010 @ 23:22:17
  Author: allan
Revision: 72658

upgpkg: glibc 2.11.1-2
linux-api-headers rebuild, new git snapshot

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-03-19 03:20:50 UTC (rev 72657)
+++ PKGBUILD2010-03-19 03:22:17 UTC (rev 72658)
@@ -2,19 +2,19 @@
 # Maintainer: Jan de Groot j...@archlinux.org
 # Maintainer: Allan McRae al...@archlinux.org
 
-# toolchain build order: kernel-headers-glibc-binutils-gcc-binutils-glibc
+# toolchain build order: 
linux-api-headers-glibc-binutils-gcc-binutils-glibc
 # NOTE: valgrind requires rebuilt with each new glibc version
 
 pkgname=glibc
 pkgver=2.11.1
-pkgrel=1
-_glibcdate=20091212
+pkgrel=2
+_glibcdate=20100318
 pkgdesc=GNU C Library
 arch=('i686' 'x86_64')
 url=http://www.gnu.org/software/libc;
 license=('GPL' 'LGPL')
 groups=('base')
-depends=('kernel-headers=2.6.32' 'tzdata')
+depends=('linux-api-headers=2.6.33' 'tzdata')
 makedepends=('gcc=4.4')
 replaces=('glibc-xen')
 backup=(etc/locale.gen
@@ -26,7 +26,7 @@
 nscd
 locale.gen.txt
 locale-gen)
-md5sums=('a3e7414c1eedb7a56cf095d1bb06250e'
+md5sums=('4b7f8ed5a0ea946bd40318855449b570'
  '4dadb9203b69a3210d53514bb46f41c3'
  '0c5540efc51c0b93996c51b57a8540ae'
  'b587ee3a70c9b3713099295609afde49'



[arch-commits] Commit in glibc/trunk (PKGBUILD)

2009-12-11 Thread Allan McRae
Date: Saturday, December 12, 2009 @ 02:59:35
  Author: allan
Revision: 61104

upgpkg: glibc 2.11.1-1
upstream update

Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |   15 +++
 1 file changed, 7 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2009-12-12 07:43:25 UTC (rev 61103)
+++ PKGBUILD2009-12-12 07:59:35 UTC (rev 61104)
@@ -6,15 +6,15 @@
 # NOTE: valgrind requires rebuilt with each new glibc version
 
 pkgname=glibc
-pkgver=2.11
+pkgver=2.11.1
 pkgrel=1
-_glibcdate=20091101
+_glibcdate=20091212
 pkgdesc=GNU C Library
 arch=('i686' 'x86_64')
 url=http://www.gnu.org/software/libc;
 license=('GPL' 'LGPL')
 groups=('base')
-depends=('kernel-headers=2.6.31.5' 'tzdata')
+depends=('kernel-headers=2.6.32' 'tzdata')
 makedepends=('gcc=4.4')
 replaces=('glibc-xen')
 backup=(etc/locale.gen
@@ -25,8 +25,8 @@
 glibc-2.10-bz4781.patch
 nscd
 locale.gen.txt
-locale-gen)
-md5sums=('de56eefcb4070c0cbe4336652ead854e'
+locale-gen)
+md5sums=('a3e7414c1eedb7a56cf095d1bb06250e'
  '4dadb9203b69a3210d53514bb46f41c3'
  '0c5540efc51c0b93996c51b57a8540ae'
  'b587ee3a70c9b3713099295609afde49'
@@ -35,11 +35,10 @@
 
 mksource() {
   mkdir glibc-${pkgver}_${_glibcdate}
-  cd $glibc-${pkgver}_${_glibcdate}
+  cd glibc-${pkgver}_${_glibcdate}
   git clone git://sourceware.org/git/glibc.git
   pushd glibc
-  #git checkout -b glibc-2.11-arch origin/cvs/glibc-2_11-branch
-  git checkout -b glibc-2.11-arch glibc-2.11
+  git checkout -b glibc-2.11-arch origin/release/2.11/master
   popd
   tar -cvjf glibc-${pkgver}_${_glibcdate}.tar.bz2 glibc/*
 }