[arch-commits] Commit in lib32-glibc/repos/multilib-testing-x86_64 (7 files)
Jan Steffens
heftig at archlinux.org
Sun Sep 14 08:32:26 UTC 2014
Date: Sunday, September 14, 2014 @ 10:32:26
Author: heftig
Revision: 118951
archrelease: copy trunk to multilib-testing-x86_64
Added:
lib32-glibc/repos/multilib-testing-x86_64/PKGBUILD
(from rev 118950, lib32-glibc/trunk/PKGBUILD)
lib32-glibc/repos/multilib-testing-x86_64/glibc-2.20-do_ftell_wide-memleak.patch
(from rev 118950, lib32-glibc/trunk/glibc-2.20-do_ftell_wide-memleak.patch)
lib32-glibc/repos/multilib-testing-x86_64/glibc-2.20-getifaddrs_internal-segfault.patch
(from rev 118950, lib32-glibc/trunk/glibc-2.20-getifaddrs_internal-segfault.patch)
lib32-glibc/repos/multilib-testing-x86_64/glibc-2.20-linux-3.16-additions.patch
(from rev 118950, lib32-glibc/trunk/glibc-2.20-linux-3.16-additions.patch)
lib32-glibc/repos/multilib-testing-x86_64/lib32-glibc.conf
(from rev 118950, lib32-glibc/trunk/lib32-glibc.conf)
Deleted:
lib32-glibc/repos/multilib-testing-x86_64/PKGBUILD
lib32-glibc/repos/multilib-testing-x86_64/lib32-glibc.conf
-----------------------------------------------+
PKGBUILD | 294 ++++++++++++------------
glibc-2.20-do_ftell_wide-memleak.patch | 12
glibc-2.20-getifaddrs_internal-segfault.patch | 29 ++
glibc-2.20-linux-3.16-additions.patch | 15 +
lib32-glibc.conf | 2
5 files changed, 213 insertions(+), 139 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2014-09-14 08:30:52 UTC (rev 118950)
+++ PKGBUILD 2014-09-14 08:32:26 UTC (rev 118951)
@@ -1,138 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Jan de Groot <jgc at archlinux.org>
-# Contributor: Allan McRae <allan at archlinux.org>
-
-# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
-
-_pkgbasename=glibc
-pkgname=lib32-$_pkgbasename
-pkgver=2.20
-pkgrel=1
-pkgdesc="GNU C Library (32-bit)"
-arch=('x86_64')
-url="http://www.gnu.org/software/libc"
-license=('GPL' 'LGPL')
-groups=()
-depends=()
-makedepends=('gcc-multilib>=4.9')
-backup=()
-
-
-options=('!strip' 'staticlibs' '!emptydirs')
-
-source=(http://ftp.gnu.org/gnu/libc/${_pkgbasename}-${pkgver}.tar.xz{,.sig}
- lib32-glibc.conf)
-md5sums=('948a6e06419a01bd51e97206861595b0'
- 'SKIP'
- '6e052f1cb693d5d3203f50f9d4e8c33b')
-validpgpkeys=('F37CDAB708E65EA183FD1AF625EF0A436C2A4AFF')
-
-prepare() {
- mkdir ${srcdir}/glibc-build
-}
-
-build() {
- cd ${srcdir}/glibc-build
-
- #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
-
- echo "slibdir=/usr/lib32" >> configparms
- echo "rtlddir=/usr/lib32" >> configparms
- echo "sbindir=/usr/bin" >> configparms
- echo "rootsbindir=/usr/bin" >> configparms
-
- export CC="gcc -m32"
- export CXX="g++ -m32"
-
- # remove hardening options for building libraries
- CFLAGS=${CFLAGS/-fstack-protector-strong/}
- CPPFLAGS=${CPPFLAGS/-D_FORTIFY_SOURCE=2/}
-
- ${srcdir}/${_pkgbasename}-${pkgver}/configure --prefix=/usr \
- --libdir=/usr/lib32 --libexecdir=/usr/lib32 \
- --with-headers=/usr/include \
- --with-bugurl=https://bugs.archlinux.org/ \
- --enable-add-ons \
- --enable-obsolete-rpc \
- --enable-kernel=2.6.32 \
- --enable-bind-now --disable-profile \
- --enable-stackguard-randomization \
- --enable-lock-elision \
- --enable-multi-arch i686-unknown-linux-gnu
-
- # 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
- echo "CXX += -fstack-protector-strong -D_FORTIFY_SOURCE=2" >> configparms
- make
-
- # remove harding in preparation to run test-suite
- sed -i '5,7d' configparms
-}
-
-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"
- make check || true
-}
-
-package() {
- cd ${srcdir}/glibc-build
- make install_root=${pkgdir} install
-
- rm -rf ${pkgdir}/{etc,sbin,usr/{bin,sbin,share},var}
-
- # We need one 32 bit specific header file
- find ${pkgdir}/usr/include -type f -not -name stubs-32.h -delete
-
-
- # Dynamic linker
- mkdir ${pkgdir}/usr/lib
- ln -s ../lib32/ld-linux.so.2 ${pkgdir}/usr/lib/
-
- # Add lib32 paths to the default library search path
- install -Dm644 "$srcdir/lib32-glibc.conf" "$pkgdir/etc/ld.so.conf.d/lib32-glibc.conf"
-
- # Symlink /usr/lib32/locale to /usr/lib/locale
- ln -s ../lib/locale "$pkgdir/usr/lib32/locale"
-
- # 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/lib32/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...):
- # ld-${pkgver}.so
- # libc-${pkgver}.so
- # libpthread-${pkgver}.so
- # libthread_db-1.0.so
-
- cd $pkgdir
- strip $STRIP_BINARIES \
- \
- \
- usr/lib32/getconf/*
-
-
- strip $STRIP_STATIC usr/lib32/*.a
-
- strip $STRIP_SHARED usr/lib32/{libanl,libBrokenLocale,libcidn,libcrypt}-*.so \
- usr/lib32/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-*.so \
- usr/lib32/{libdl,libm,libnsl,libresolv,librt,libutil}-*.so \
- usr/lib32/{libmemusage,libpcprofile,libSegFault}.so \
- usr/lib32/{audit,gconv}/*.so
-}
Copied: lib32-glibc/repos/multilib-testing-x86_64/PKGBUILD (from rev 118950, lib32-glibc/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2014-09-14 08:32:26 UTC (rev 118951)
@@ -0,0 +1,156 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+# Contributor: Allan McRae <allan at archlinux.org>
+
+# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
+
+_pkgbasename=glibc
+pkgname=lib32-$_pkgbasename
+pkgver=2.20
+pkgrel=2
+pkgdesc="GNU C Library (32-bit)"
+arch=('x86_64')
+url="http://www.gnu.org/software/libc"
+license=('GPL' 'LGPL')
+groups=()
+depends=()
+makedepends=('gcc-multilib>=4.9')
+backup=()
+
+
+options=('!strip' 'staticlibs' '!emptydirs')
+
+source=(http://ftp.gnu.org/gnu/libc/${_pkgbasename}-${pkgver}.tar.xz{,.sig}
+ glibc-2.20-getifaddrs_internal-segfault.patch
+ glibc-2.20-linux-3.16-additions.patch
+ glibc-2.20-do_ftell_wide-memleak.patch
+ lib32-glibc.conf)
+md5sums=('948a6e06419a01bd51e97206861595b0'
+ 'SKIP'
+ '1c5d5c2017445c75dbc5c6d0c1e45ddb'
+ '8f1059f431b842e54b12bde689620df8'
+ 'b50feeab78fa6ce0a8cfb41ee8dc1fd8'
+ '6e052f1cb693d5d3203f50f9d4e8c33b')
+validpgpkeys=('F37CDAB708E65EA183FD1AF625EF0A436C2A4AFF') # Carlos O'Donell
+
+prepare() {
+ cd ${srcdir}/glibc-${pkgver}
+
+ # fix segfault in getifaddrs_internal
+ # https://sourceware.org/ml/libc-alpha/2014-09/msg00312.html
+ patch -p1 -i $srcdir/glibc-2.20-getifaddrs_internal-segfault.patch
+
+ # linux 3.16 additions - commit 0bd72468
+ patch -p1 -i $srcdir/glibc-2.20-linux-3.16-additions.patch
+
+ # plug memory leak - commit 984c0ea9
+ patch -p1 -i $srcdir/glibc-2.20-do_ftell_wide-memleak.patch
+
+ mkdir ${srcdir}/glibc-build
+}
+
+build() {
+ cd ${srcdir}/glibc-build
+
+ #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
+
+ echo "slibdir=/usr/lib32" >> configparms
+ echo "rtlddir=/usr/lib32" >> configparms
+ echo "sbindir=/usr/bin" >> configparms
+ echo "rootsbindir=/usr/bin" >> configparms
+
+ export CC="gcc -m32"
+ export CXX="g++ -m32"
+
+ # remove hardening options for building libraries
+ CFLAGS=${CFLAGS/-fstack-protector-strong/}
+ CPPFLAGS=${CPPFLAGS/-D_FORTIFY_SOURCE=2/}
+
+ ${srcdir}/${_pkgbasename}-${pkgver}/configure --prefix=/usr \
+ --libdir=/usr/lib32 --libexecdir=/usr/lib32 \
+ --with-headers=/usr/include \
+ --with-bugurl=https://bugs.archlinux.org/ \
+ --enable-add-ons \
+ --enable-obsolete-rpc \
+ --enable-kernel=2.6.32 \
+ --enable-bind-now --disable-profile \
+ --enable-stackguard-randomization \
+ --enable-lock-elision \
+ --enable-multi-arch i686-unknown-linux-gnu
+
+ # 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
+ echo "CXX += -fstack-protector-strong -D_FORTIFY_SOURCE=2" >> configparms
+ make
+
+ # remove harding in preparation to run test-suite
+ sed -i '5,7d' configparms
+}
+
+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"
+ make check || true
+}
+
+package() {
+ cd ${srcdir}/glibc-build
+ make install_root=${pkgdir} install
+
+ rm -rf ${pkgdir}/{etc,sbin,usr/{bin,sbin,share},var}
+
+ # We need one 32 bit specific header file
+ find ${pkgdir}/usr/include -type f -not -name stubs-32.h -delete
+
+
+ # Dynamic linker
+ mkdir ${pkgdir}/usr/lib
+ ln -s ../lib32/ld-linux.so.2 ${pkgdir}/usr/lib/
+
+ # Add lib32 paths to the default library search path
+ install -Dm644 "$srcdir/lib32-glibc.conf" "$pkgdir/etc/ld.so.conf.d/lib32-glibc.conf"
+
+ # Symlink /usr/lib32/locale to /usr/lib/locale
+ ln -s ../lib/locale "$pkgdir/usr/lib32/locale"
+
+ # 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/lib32/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...):
+ # ld-${pkgver}.so
+ # libc-${pkgver}.so
+ # libpthread-${pkgver}.so
+ # libthread_db-1.0.so
+
+ cd $pkgdir
+ strip $STRIP_BINARIES \
+ \
+ \
+ usr/lib32/getconf/*
+
+
+ strip $STRIP_STATIC usr/lib32/*.a
+
+ strip $STRIP_SHARED usr/lib32/{libanl,libBrokenLocale,libcidn,libcrypt}-*.so \
+ usr/lib32/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-*.so \
+ usr/lib32/{libdl,libm,libnsl,libresolv,librt,libutil}-*.so \
+ usr/lib32/{libmemusage,libpcprofile,libSegFault}.so \
+ usr/lib32/{audit,gconv}/*.so
+}
Copied: lib32-glibc/repos/multilib-testing-x86_64/glibc-2.20-do_ftell_wide-memleak.patch (from rev 118950, lib32-glibc/trunk/glibc-2.20-do_ftell_wide-memleak.patch)
===================================================================
--- glibc-2.20-do_ftell_wide-memleak.patch (rev 0)
+++ glibc-2.20-do_ftell_wide-memleak.patch 2014-09-14 08:32:26 UTC (rev 118951)
@@ -0,0 +1,12 @@
+diff --git a/libio/wfileops.c b/libio/wfileops.c
+index f123add..ebc06e8 100644
+--- a/libio/wfileops.c
++++ b/libio/wfileops.c
+@@ -711,6 +711,7 @@ do_ftell_wide (_IO_FILE *fp)
+ return WEOF;
+
+ offset += outstop - out;
++ free (out);
+ }
+
+ /* We don't trust _IO_read_end to represent the current file offset
Copied: lib32-glibc/repos/multilib-testing-x86_64/glibc-2.20-getifaddrs_internal-segfault.patch (from rev 118950, lib32-glibc/trunk/glibc-2.20-getifaddrs_internal-segfault.patch)
===================================================================
--- glibc-2.20-getifaddrs_internal-segfault.patch (rev 0)
+++ glibc-2.20-getifaddrs_internal-segfault.patch 2014-09-14 08:32:26 UTC (rev 118951)
@@ -0,0 +1,29 @@
+diff --git a/sysdeps/unix/sysv/linux/ifaddrs.c b/sysdeps/unix/sysv/linux/ifaddrs.c
+index 2c04e17..a47b2ed 100644
+--- a/sysdeps/unix/sysv/linux/ifaddrs.c
++++ b/sysdeps/unix/sysv/linux/ifaddrs.c
+@@ -770,20 +770,17 @@ getifaddrs_internal (struct ifaddrs **ifap)
+
+ if (cp != NULL)
+ {
+- char c;
+ unsigned int preflen;
+
+- if ((max_prefixlen > 0) &&
+- (ifam->ifa_prefixlen > max_prefixlen))
++ if (ifam->ifa_prefixlen > max_prefixlen)
+ preflen = max_prefixlen;
+ else
+ preflen = ifam->ifa_prefixlen;
+
+- for (i = 0; i < ((preflen - 1) / 8); i++)
++ for (i = 0; i < preflen / 8; i++)
+ *cp++ = 0xff;
+- c = 0xff;
+- c <<= ((128 - preflen) % 8);
+- *cp = c;
++ if (preflen % 8)
++ *cp = 0xff << (8 - preflen % 8);
+ }
+ }
+ }
Copied: lib32-glibc/repos/multilib-testing-x86_64/glibc-2.20-linux-3.16-additions.patch (from rev 118950, lib32-glibc/trunk/glibc-2.20-linux-3.16-additions.patch)
===================================================================
--- glibc-2.20-linux-3.16-additions.patch (rev 0)
+++ glibc-2.20-linux-3.16-additions.patch 2014-09-14 08:32:26 UTC (rev 118951)
@@ -0,0 +1,15 @@
+diff --git a/sysdeps/gnu/netinet/udp.h b/sysdeps/gnu/netinet/udp.h
+index 32159cd..8cc1c60 100644
+--- a/sysdeps/gnu/netinet/udp.h
++++ b/sysdeps/gnu/netinet/udp.h
+@@ -78,6 +78,10 @@ struct udphdr
+ #define UDP_CORK 1 /* Never send partially complete segments. */
+ #define UDP_ENCAP 100 /* Set the socket to accept
+ encapsulated packets. */
++#define UDP_NO_CHECK6_TX 101 /* Disable sending checksum for UDP
++ over IPv6. */
++#define UDP_NO_CHECK6_RX 102 /* Disable accepting checksum for UDP
++ over IPv6. */
+
+ /* UDP encapsulation types */
+ #define UDP_ENCAP_ESPINUDP_NON_IKE 1 /* draft-ietf-ipsec-nat-t-ike-00/01 */
Deleted: lib32-glibc.conf
===================================================================
--- lib32-glibc.conf 2014-09-14 08:30:52 UTC (rev 118950)
+++ lib32-glibc.conf 2014-09-14 08:32:26 UTC (rev 118951)
@@ -1 +0,0 @@
-/usr/lib32
Copied: lib32-glibc/repos/multilib-testing-x86_64/lib32-glibc.conf (from rev 118950, lib32-glibc/trunk/lib32-glibc.conf)
===================================================================
--- lib32-glibc.conf (rev 0)
+++ lib32-glibc.conf 2014-09-14 08:32:26 UTC (rev 118951)
@@ -0,0 +1 @@
+/usr/lib32
More information about the arch-commits
mailing list