[arch-commits] Commit in lib32-glibc/repos/multilib-x86_64 (8 files)
Jan Steffens
heftig at nymeria.archlinux.org
Wed Apr 10 19:27:24 UTC 2013
Date: Wednesday, April 10, 2013 @ 21:27:24
Author: heftig
Revision: 88067
archrelease: copy trunk to multilib-x86_64
Added:
lib32-glibc/repos/multilib-x86_64/PKGBUILD
(from rev 88066, lib32-glibc/trunk/PKGBUILD)
lib32-glibc/repos/multilib-x86_64/glibc-2.17-getaddrinfo-stack-overflow.patch
(from rev 88066, lib32-glibc/trunk/glibc-2.17-getaddrinfo-stack-overflow.patch)
lib32-glibc/repos/multilib-x86_64/glibc-2.17-regexp-matcher-overrun.patch
(from rev 88066, lib32-glibc/trunk/glibc-2.17-regexp-matcher-overrun.patch)
lib32-glibc/repos/multilib-x86_64/glibc-2.17-sync-with-linux37.patch
(from rev 88066, lib32-glibc/trunk/glibc-2.17-sync-with-linux37.patch)
lib32-glibc/repos/multilib-x86_64/lib32-glibc.conf
(from rev 88066, lib32-glibc/trunk/lib32-glibc.conf)
Deleted:
lib32-glibc/repos/multilib-x86_64/PKGBUILD
lib32-glibc/repos/multilib-x86_64/glibc-2.17-sync-with-linux37.patch
lib32-glibc/repos/multilib-x86_64/lib32-glibc.conf
---------------------------------------------+
PKGBUILD | 250 +++++++++++++------------
glibc-2.17-getaddrinfo-stack-overflow.patch | 47 ++++
glibc-2.17-regexp-matcher-overrun.patch | 137 +++++++++++++
glibc-2.17-sync-with-linux37.patch | 260 +++++++++++++-------------
lib32-glibc.conf | 2
5 files changed, 445 insertions(+), 251 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2013-04-10 19:26:47 UTC (rev 88066)
+++ PKGBUILD 2013-04-10 19:27:24 UTC (rev 88067)
@@ -1,120 +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
-# NOTE: valgrind requires rebuilt with each major glibc version
-
-_pkgbasename=glibc
-pkgname=lib32-$_pkgbasename
-pkgver=2.17
-pkgrel=4
-pkgdesc="GNU C Library for multilib"
-arch=('x86_64')
-url="http://www.gnu.org/software/libc"
-license=('GPL' 'LGPL')
-makedepends=('gcc-multilib>=4.7')
-options=('!strip' '!emptydirs')
-source=(http://ftp.gnu.org/gnu/libc/${_pkgbasename}-${pkgver}.tar.xz{,.sig}
- glibc-2.17-sync-with-linux37.patch
- lib32-glibc.conf)
-md5sums=('87bf675c8ee523ebda4803e8e1cec638'
- '6db4d1661cf34282755dc90330465f6d'
- 'fb99380d94598cc76d793deebf630022'
- '6e052f1cb693d5d3203f50f9d4e8c33b')
-
-build() {
- cd ${srcdir}/${_pkgbasename}-${pkgver}
-
- # combination of upstream commits 318cd0b, b540704 and fc1abbe
- patch -p1 -i ${srcdir}/glibc-2.17-sync-with-linux37.patch
-
- cd ${srcdir}
- mkdir glibc-build
- cd 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
-
- export CC="gcc -m32"
- export CXX="g++ -m32"
- echo "slibdir=/usr/lib32" >> configparms
-
- # remove hardening options from CFLAGS for building libraries
- CFLAGS=${CFLAGS/-fstack-protector/}
- CFLAGS=${CFLAGS/-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=nptl,libidn \
- --enable-obsolete-rpc \
- --enable-kernel=2.6.32 \
- --enable-bind-now --disable-profile \
- --enable-stackguard-randomization \
- --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 -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() {
- # bug to file - the linker commands need to be reordered
- LDFLAGS=${LDFLAGS/--as-needed,/}
-
- cd ${srcdir}/glibc-build
- make check
-}
-
-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
-
- # 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/{pt_chown,{audit,gconv}/*.so}
-
- # 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"
-}
Copied: lib32-glibc/repos/multilib-x86_64/PKGBUILD (from rev 88066, lib32-glibc/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2013-04-10 19:27:24 UTC (rev 88067)
@@ -0,0 +1,130 @@
+# $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
+# NOTE: valgrind requires rebuilt with each major glibc version
+
+_pkgbasename=glibc
+pkgname=lib32-$_pkgbasename
+pkgver=2.17
+pkgrel=5
+pkgdesc="GNU C Library for multilib"
+arch=('x86_64')
+url="http://www.gnu.org/software/libc"
+license=('GPL' 'LGPL')
+makedepends=('gcc-multilib>=4.7')
+options=('!strip' '!emptydirs')
+source=(http://ftp.gnu.org/gnu/libc/${_pkgbasename}-${pkgver}.tar.xz{,.sig}
+ glibc-2.17-sync-with-linux37.patch
+ glibc-2.17-getaddrinfo-stack-overflow.patch
+ glibc-2.17-regexp-matcher-overrun.patch
+ lib32-glibc.conf)
+md5sums=('87bf675c8ee523ebda4803e8e1cec638'
+ 'SKIP'
+ 'fb99380d94598cc76d793deebf630022'
+ '56d5f2c09503a348281a20ae404b7de3'
+ '200acc05961b084ee00dde919e64f82d'
+ '6e052f1cb693d5d3203f50f9d4e8c33b')
+
+build() {
+ cd ${srcdir}/${_pkgbasename}-${pkgver}
+
+ # combination of upstream commits 318cd0b, b540704 and fc1abbe
+ patch -p1 -i ${srcdir}/glibc-2.17-sync-with-linux37.patch
+
+ # CVE-2013-1914 - upstream commit 1cef1b19
+ patch -p1 -i ${srcdir}/glibc-2.17-getaddrinfo-stack-overflow.patch
+
+ # CVE-2013-0242 - upstream commit a445af0b
+ patch -p1 -i ${srcdir}/glibc-2.17-regexp-matcher-overrun.patch
+
+ cd ${srcdir}
+ mkdir glibc-build
+ cd 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
+
+ export CC="gcc -m32"
+ export CXX="g++ -m32"
+ echo "slibdir=/usr/lib32" >> configparms
+
+ # remove hardening options for building libraries
+ CFLAGS=${CFLAGS/-fstack-protector/}
+ 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=nptl,libidn \
+ --enable-obsolete-rpc \
+ --enable-kernel=2.6.32 \
+ --enable-bind-now --disable-profile \
+ --enable-stackguard-randomization \
+ --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 -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() {
+ # bug to file - the linker commands need to be reordered
+ LDFLAGS=${LDFLAGS/--as-needed,/}
+
+ cd ${srcdir}/glibc-build
+ make check
+}
+
+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
+
+ # 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/{pt_chown,{audit,gconv}/*.so}
+
+ # 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"
+}
Copied: lib32-glibc/repos/multilib-x86_64/glibc-2.17-getaddrinfo-stack-overflow.patch (from rev 88066, lib32-glibc/trunk/glibc-2.17-getaddrinfo-stack-overflow.patch)
===================================================================
--- glibc-2.17-getaddrinfo-stack-overflow.patch (rev 0)
+++ glibc-2.17-getaddrinfo-stack-overflow.patch 2013-04-10 19:27:24 UTC (rev 88067)
@@ -0,0 +1,47 @@
+diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
+index d95c2d1..2309281 100644
+--- a/sysdeps/posix/getaddrinfo.c
++++ b/sysdeps/posix/getaddrinfo.c
+@@ -2489,11 +2489,27 @@ getaddrinfo (const char *name, const char *service,
+ __typeof (once) old_once = once;
+ __libc_once (once, gaiconf_init);
+ /* Sort results according to RFC 3484. */
+- struct sort_result results[nresults];
+- size_t order[nresults];
++ struct sort_result *results;
++ size_t *order;
+ struct addrinfo *q;
+ struct addrinfo *last = NULL;
+ char *canonname = NULL;
++ bool malloc_results;
++
++ malloc_results
++ = !__libc_use_alloca (nresults * (sizeof (*results) + sizeof (size_t)));
++ if (malloc_results)
++ {
++ results = malloc (nresults * (sizeof (*results) + sizeof (size_t)));
++ if (results == NULL)
++ {
++ __free_in6ai (in6ai);
++ return EAI_MEMORY;
++ }
++ }
++ else
++ results = alloca (nresults * (sizeof (*results) + sizeof (size_t)));
++ order = (size_t *) (results + nresults);
+
+ /* Now we definitely need the interface information. */
+ if (! check_pf_called)
+@@ -2664,6 +2680,9 @@ getaddrinfo (const char *name, const char *service,
+
+ /* Fill in the canonical name into the new first entry. */
+ p->ai_canonname = canonname;
++
++ if (malloc_results)
++ free (results);
+ }
+
+ __free_in6ai (in6ai);
+--
+1.7.1
+
Copied: lib32-glibc/repos/multilib-x86_64/glibc-2.17-regexp-matcher-overrun.patch (from rev 88066, lib32-glibc/trunk/glibc-2.17-regexp-matcher-overrun.patch)
===================================================================
--- glibc-2.17-regexp-matcher-overrun.patch (rev 0)
+++ glibc-2.17-regexp-matcher-overrun.patch 2013-04-10 19:27:24 UTC (rev 88067)
@@ -0,0 +1,137 @@
+diff --git a/posix/Makefile b/posix/Makefile
+index 88d409f..2cacd21 100644
+--- a/posix/Makefile
++++ b/posix/Makefile
+@@ -86,7 +86,7 @@ tests := tstgetopt testfnm runtests runptests \
+ tst-rfc3484-3 \
+ tst-getaddrinfo3 tst-fnmatch2 tst-cpucount tst-cpuset \
+ bug-getopt1 bug-getopt2 bug-getopt3 bug-getopt4 \
+- bug-getopt5 tst-getopt_long1
++ bug-getopt5 tst-getopt_long1 bug-regex34
+ xtests := bug-ga2
+ ifeq (yes,$(build-shared))
+ test-srcs := globtest
+@@ -199,5 +199,6 @@ bug-regex26-ENV = LOCPATH=$(common-objpfx)localedata
+ bug-regex30-ENV = LOCPATH=$(common-objpfx)localedata
+ bug-regex32-ENV = LOCPATH=$(common-objpfx)localedata
+ bug-regex33-ENV = LOCPATH=$(common-objpfx)localedata
++bug-regex34-ENV = LOCPATH=$(common-objpfx)localedata
+ tst-rxspencer-ARGS = --utf8 rxspencer/tests
+ tst-rxspencer-ENV = LOCPATH=$(common-objpfx)localedata
+diff --git a/posix/bug-regex34.c b/posix/bug-regex34.c
+new file mode 100644
+index 0000000..bb3b613
+--- /dev/null
++++ b/posix/bug-regex34.c
+@@ -0,0 +1,46 @@
++/* Test re_search with multi-byte characters in UTF-8.
++ Copyright (C) 2013 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ 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, see
++ <http://www.gnu.org/licenses/>. */
++
++#define _GNU_SOURCE 1
++#include <stdio.h>
++#include <string.h>
++#include <locale.h>
++#include <regex.h>
++
++static int
++do_test (void)
++{
++ struct re_pattern_buffer r;
++ /* ကျွန်ုပ်x */
++ const char *s = "\xe1\x80\x80\xe1\x80\xbb\xe1\x80\xbd\xe1\x80\x94\xe1\x80\xba\xe1\x80\xaf\xe1\x80\x95\xe1\x80\xbax";
++
++ if (setlocale (LC_ALL, "en_US.UTF-8") == NULL)
++ {
++ puts ("setlocale failed");
++ return 1;
++ }
++ memset (&r, 0, sizeof (r));
++
++ re_compile_pattern ("[^x]x", 5, &r);
++ /* This was triggering a buffer overflow. */
++ re_search (&r, s, strlen (s), 0, strlen (s), 0);
++ return 0;
++}
++
++#define TEST_FUNCTION do_test ()
++#include "../test-skeleton.c"
+diff --git a/posix/regexec.c b/posix/regexec.c
+index 7f2de85..5ca2bf6 100644
+--- a/posix/regexec.c
++++ b/posix/regexec.c
+@@ -197,7 +197,7 @@ static int group_nodes_into_DFAstates (const re_dfa_t *dfa,
+ static int check_node_accept (const re_match_context_t *mctx,
+ const re_token_t *node, int idx)
+ internal_function;
+-static reg_errcode_t extend_buffers (re_match_context_t *mctx)
++static reg_errcode_t extend_buffers (re_match_context_t *mctx, int min_len)
+ internal_function;
+
+ /* Entry point for POSIX code. */
+@@ -1160,7 +1160,7 @@ check_matching (re_match_context_t *mctx, int fl_longest_match,
+ || (BE (next_char_idx >= mctx->input.valid_len, 0)
+ && mctx->input.valid_len < mctx->input.len))
+ {
+- err = extend_buffers (mctx);
++ err = extend_buffers (mctx, next_char_idx + 1);
+ if (BE (err != REG_NOERROR, 0))
+ {
+ assert (err == REG_ESPACE);
+@@ -1738,7 +1738,7 @@ clean_state_log_if_needed (re_match_context_t *mctx, int next_state_log_idx)
+ && mctx->input.valid_len < mctx->input.len))
+ {
+ reg_errcode_t err;
+- err = extend_buffers (mctx);
++ err = extend_buffers (mctx, next_state_log_idx + 1);
+ if (BE (err != REG_NOERROR, 0))
+ return err;
+ }
+@@ -2792,7 +2792,7 @@ get_subexp (re_match_context_t *mctx, int bkref_node, int bkref_str_idx)
+ if (bkref_str_off >= mctx->input.len)
+ break;
+
+- err = extend_buffers (mctx);
++ err = extend_buffers (mctx, bkref_str_off + 1);
+ if (BE (err != REG_NOERROR, 0))
+ return err;
+
+@@ -4102,7 +4102,7 @@ check_node_accept (const re_match_context_t *mctx, const re_token_t *node,
+
+ static reg_errcode_t
+ internal_function __attribute_warn_unused_result__
+-extend_buffers (re_match_context_t *mctx)
++extend_buffers (re_match_context_t *mctx, int min_len)
+ {
+ reg_errcode_t ret;
+ re_string_t *pstr = &mctx->input;
+@@ -4111,8 +4111,10 @@ extend_buffers (re_match_context_t *mctx)
+ if (BE (INT_MAX / 2 / sizeof (re_dfastate_t *) <= pstr->bufs_len, 0))
+ return REG_ESPACE;
+
+- /* Double the lengthes of the buffers. */
+- ret = re_string_realloc_buffers (pstr, MIN (pstr->len, pstr->bufs_len * 2));
++ /* Double the lengthes of the buffers, but allocate at least MIN_LEN. */
++ ret = re_string_realloc_buffers (pstr,
++ MAX (min_len,
++ MIN (pstr->len, pstr->bufs_len * 2)));
+ if (BE (ret != REG_NOERROR, 0))
+ return ret;
+
+--
+1.7.1
+
Deleted: glibc-2.17-sync-with-linux37.patch
===================================================================
--- glibc-2.17-sync-with-linux37.patch 2013-04-10 19:26:47 UTC (rev 88066)
+++ glibc-2.17-sync-with-linux37.patch 2013-04-10 19:27:24 UTC (rev 88067)
@@ -1,130 +0,0 @@
-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_KEEPCNT 6 /* Number of keepalives before death */
--#define TCP_SYNCNT 7 /* Number of SYN retransmits */
--#define TCP_LINGER2 8 /* 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 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_KEEPCNT 6 /* Number of keepalives before death */
-+#define TCP_SYNCNT 7 /* Number of SYN retransmits */
-+#define TCP_LINGER2 8 /* 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_COOKIE_TRANSACTIONS 15 /* TCP Cookie Transactions */
-+#define TCP_THIN_LINEAR_TIMEOUTS 16 /* Use linear timeouts for thin streams*/
-+#define TCP_THIN_DUPACK 17 /* Fast retrans. after 1 dupack */
-+#define TCP_USER_TIMEOUT 18 /* How long for loss retry before timeout */
-+#define TCP_REPAIR 19 /* TCP sock is under repair right now */
-+#define TCP_REPAIR_QUEUE 20 /* Set TCP queue to repair */
-+#define TCP_QUEUE_SEQ 21 /* Set sequence number of repaired queue. */
-+#define TCP_REPAIR_OPTIONS 22 /* Repair TCP connection options */
-+#define TCP_FASTOPEN 23 /* Enable FastOpen on listeners */
-
- #ifdef __USE_MISC
- # include <sys/types.h>
-@@ -173,7 +182,9 @@ enum
- # define TCPI_OPT_TIMESTAMPS 1
- # define TCPI_OPT_SACK 2
- # define TCPI_OPT_WSCALE 4
--# define TCPI_OPT_ECN 8
-+# define TCPI_OPT_ECN 8 /* ECN was negociated at TCP session init */
-+# define TCPI_OPT_ECN_SEEN 16 /* we received at least one packet with ECT */
-+# define TCPI_OPT_SYN_DATA 32 /* SYN-ACK acked data in SYN sent or rcvd */
-
- /* Values for tcpi_state. */
- enum tcp_ca_state
-@@ -241,6 +252,49 @@ struct tcp_md5sig
- u_int8_t tcpm_key[TCP_MD5SIG_MAXKEYLEN]; /* Key (binary). */
- };
-
-+/* For socket repair options. */
-+struct tcp_repair_opt
-+{
-+ u_int32_t opt_code;
-+ u_int32_t opt_val;
-+};
-+
-+/* Queue to repair, for TCP_REPAIR_QUEUE. */
-+enum
-+{
-+ TCP_NO_QUEUE,
-+ TCP_RECV_QUEUE,
-+ TCP_SEND_QUEUE,
-+ TCP_QUEUES_NR,
-+};
-+
-+/* For cookie transactions socket options. */
-+#define TCP_COOKIE_MIN 8 /* 64-bits */
-+#define TCP_COOKIE_MAX 16 /* 128-bits */
-+#define TCP_COOKIE_PAIR_SIZE (2*TCP_COOKIE_MAX)
-+
-+/* Flags for both getsockopt and setsockopt */
-+#define TCP_COOKIE_IN_ALWAYS (1 << 0) /* Discard SYN without cookie */
-+#define TCP_COOKIE_OUT_NEVER (1 << 1) /* Prohibit outgoing cookies,
-+ * supercedes everything. */
-+
-+/* Flags for getsockopt */
-+#define TCP_S_DATA_IN (1 << 2) /* Was data received? */
-+#define TCP_S_DATA_OUT (1 << 3) /* Was data sent? */
-+
-+#define TCP_MSS_DEFAULT 536U /* IPv4 (RFC1122, RFC2581) */
-+#define TCP_MSS_DESIRED 1220U /* IPv6 (tunneled), EDNS0 (RFC3226) */
-+
-+struct tcp_cookie_transactions
-+{
-+ u_int16_t tcpct_flags;
-+ u_int8_t __tcpct_pad1;
-+ u_int8_t tcpct_cookie_desired;
-+ u_int16_t tcpct_s_data_desired;
-+ u_int16_t tcpct_used;
-+ u_int8_t tcpct_value[TCP_MSS_DEFAULT];
-+};
-+
- #endif /* Misc. */
-
- #endif /* netinet/tcp.h */
-diff --git a/sysdeps/unix/sysv/linux/bits/socket.h b/sysdeps/unix/sysv/linux/bits/socket.h
-index df8f167..eadd7d9 100644
---- a/sysdeps/unix/sysv/linux/bits/socket.h
-+++ b/sysdeps/unix/sysv/linux/bits/socket.h
-@@ -1,6 +1,5 @@
- /* System-specific socket constants and types. Linux version.
-- Copyright (C) 1991, 1992, 1994-2001, 2004, 2006-2010, 2011, 2012
-- Free Software Foundation, Inc.
-+ Copyright (C) 1991-2013 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
-@@ -208,6 +207,8 @@ enum
- #define MSG_MORE MSG_MORE
- MSG_WAITFORONE = 0x10000, /* Wait for at least one packet to return.*/
- #define MSG_WAITFORONE MSG_WAITFORONE
-+ MSG_FASTOPEN = 0x20000000, /* Send data in TCP SYN. */
-+#define MSG_FASTOPEN MSG_FASTOPEN
-
- MSG_CMSG_CLOEXEC = 0x40000000 /* Set close_on_exit for file
- descriptor received through
Copied: lib32-glibc/repos/multilib-x86_64/glibc-2.17-sync-with-linux37.patch (from rev 88066, lib32-glibc/trunk/glibc-2.17-sync-with-linux37.patch)
===================================================================
--- glibc-2.17-sync-with-linux37.patch (rev 0)
+++ glibc-2.17-sync-with-linux37.patch 2013-04-10 19:27:24 UTC (rev 88067)
@@ -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_KEEPCNT 6 /* Number of keepalives before death */
+-#define TCP_SYNCNT 7 /* Number of SYN retransmits */
+-#define TCP_LINGER2 8 /* 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 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_KEEPCNT 6 /* Number of keepalives before death */
++#define TCP_SYNCNT 7 /* Number of SYN retransmits */
++#define TCP_LINGER2 8 /* 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_COOKIE_TRANSACTIONS 15 /* TCP Cookie Transactions */
++#define TCP_THIN_LINEAR_TIMEOUTS 16 /* Use linear timeouts for thin streams*/
++#define TCP_THIN_DUPACK 17 /* Fast retrans. after 1 dupack */
++#define TCP_USER_TIMEOUT 18 /* How long for loss retry before timeout */
++#define TCP_REPAIR 19 /* TCP sock is under repair right now */
++#define TCP_REPAIR_QUEUE 20 /* Set TCP queue to repair */
++#define TCP_QUEUE_SEQ 21 /* Set sequence number of repaired queue. */
++#define TCP_REPAIR_OPTIONS 22 /* Repair TCP connection options */
++#define TCP_FASTOPEN 23 /* Enable FastOpen on listeners */
+
+ #ifdef __USE_MISC
+ # include <sys/types.h>
+@@ -173,7 +182,9 @@ enum
+ # define TCPI_OPT_TIMESTAMPS 1
+ # define TCPI_OPT_SACK 2
+ # define TCPI_OPT_WSCALE 4
+-# define TCPI_OPT_ECN 8
++# define TCPI_OPT_ECN 8 /* ECN was negociated at TCP session init */
++# define TCPI_OPT_ECN_SEEN 16 /* we received at least one packet with ECT */
++# define TCPI_OPT_SYN_DATA 32 /* SYN-ACK acked data in SYN sent or rcvd */
+
+ /* Values for tcpi_state. */
+ enum tcp_ca_state
+@@ -241,6 +252,49 @@ struct tcp_md5sig
+ u_int8_t tcpm_key[TCP_MD5SIG_MAXKEYLEN]; /* Key (binary). */
+ };
+
++/* For socket repair options. */
++struct tcp_repair_opt
++{
++ u_int32_t opt_code;
++ u_int32_t opt_val;
++};
++
++/* Queue to repair, for TCP_REPAIR_QUEUE. */
++enum
++{
++ TCP_NO_QUEUE,
++ TCP_RECV_QUEUE,
++ TCP_SEND_QUEUE,
++ TCP_QUEUES_NR,
++};
++
++/* For cookie transactions socket options. */
++#define TCP_COOKIE_MIN 8 /* 64-bits */
++#define TCP_COOKIE_MAX 16 /* 128-bits */
++#define TCP_COOKIE_PAIR_SIZE (2*TCP_COOKIE_MAX)
++
++/* Flags for both getsockopt and setsockopt */
++#define TCP_COOKIE_IN_ALWAYS (1 << 0) /* Discard SYN without cookie */
++#define TCP_COOKIE_OUT_NEVER (1 << 1) /* Prohibit outgoing cookies,
++ * supercedes everything. */
++
++/* Flags for getsockopt */
++#define TCP_S_DATA_IN (1 << 2) /* Was data received? */
++#define TCP_S_DATA_OUT (1 << 3) /* Was data sent? */
++
++#define TCP_MSS_DEFAULT 536U /* IPv4 (RFC1122, RFC2581) */
++#define TCP_MSS_DESIRED 1220U /* IPv6 (tunneled), EDNS0 (RFC3226) */
++
++struct tcp_cookie_transactions
++{
++ u_int16_t tcpct_flags;
++ u_int8_t __tcpct_pad1;
++ u_int8_t tcpct_cookie_desired;
++ u_int16_t tcpct_s_data_desired;
++ u_int16_t tcpct_used;
++ u_int8_t tcpct_value[TCP_MSS_DEFAULT];
++};
++
+ #endif /* Misc. */
+
+ #endif /* netinet/tcp.h */
+diff --git a/sysdeps/unix/sysv/linux/bits/socket.h b/sysdeps/unix/sysv/linux/bits/socket.h
+index df8f167..eadd7d9 100644
+--- a/sysdeps/unix/sysv/linux/bits/socket.h
++++ b/sysdeps/unix/sysv/linux/bits/socket.h
+@@ -1,6 +1,5 @@
+ /* System-specific socket constants and types. Linux version.
+- Copyright (C) 1991, 1992, 1994-2001, 2004, 2006-2010, 2011, 2012
+- Free Software Foundation, Inc.
++ Copyright (C) 1991-2013 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+@@ -208,6 +207,8 @@ enum
+ #define MSG_MORE MSG_MORE
+ MSG_WAITFORONE = 0x10000, /* Wait for at least one packet to return.*/
+ #define MSG_WAITFORONE MSG_WAITFORONE
++ MSG_FASTOPEN = 0x20000000, /* Send data in TCP SYN. */
++#define MSG_FASTOPEN MSG_FASTOPEN
+
+ MSG_CMSG_CLOEXEC = 0x40000000 /* Set close_on_exit for file
+ descriptor received through
Deleted: lib32-glibc.conf
===================================================================
--- lib32-glibc.conf 2013-04-10 19:26:47 UTC (rev 88066)
+++ lib32-glibc.conf 2013-04-10 19:27:24 UTC (rev 88067)
@@ -1 +0,0 @@
-/usr/lib32
Copied: lib32-glibc/repos/multilib-x86_64/lib32-glibc.conf (from rev 88066, lib32-glibc/trunk/lib32-glibc.conf)
===================================================================
--- lib32-glibc.conf (rev 0)
+++ lib32-glibc.conf 2013-04-10 19:27:24 UTC (rev 88067)
@@ -0,0 +1 @@
+/usr/lib32
More information about the arch-commits
mailing list