updating my branches

9 files changed, 571 insertions, 0 deletions

diff --git a/libre/xtensa-unknown-elf-glibc/PKGBUILD b/libre/xtensa-unknown-elf-glibc/PKGBUILD
new file mode 100644
index 000000000..0a459b10b
--- /dev/null
+++ b/libre/xtensa-unknown-elf-glibc/PKGBUILD
@@ -0,0 +1,155 @@
+# $Id: PKGBUILD 186623 2013-05-30 07:47:03Z allan $
+# Maintainer: Allan McRae <allan@archlinux.org>
+
+# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
+# NOTE: valgrind requires rebuilt with each major glibc version
+
+_pkgname=glibc
+_target="xtensa-unknown-elf"
+_sysroot="usr/$CHOST/${_target}"
+
+pkgname=${_target}-glibc
+pkgver=2.17
+pkgrel=6
+pkgdesc="GNU C Library for Xtensa processors"
+arch=('i686' 'x86_64')
+url="http://www.gnu.org/software/libc"
+license=('GPL' 'LGPL')
+groups=('base')
+depends=("${_target}-linux-api-headers>=3.7" 'tzdata' 'filesystem>=2013.01')
+makedepends=('gcc>=4.7')
+backup=(etc/gai.conf
+        etc/locale.gen
+        etc/nscd.conf)
+options=('!strip')
+install=${_target}-glibc.install
+source=(http://ftp.gnu.org/gnu/libc/${_pkgname}-${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
+        nscd.service
+        nscd.tmpfiles
+        locale.gen.txt
+        locale-gen)
+md5sums=('87bf675c8ee523ebda4803e8e1cec638'
+         'SKIP'
+         'fb99380d94598cc76d793deebf630022'
+         '56d5f2c09503a348281a20ae404b7de3'
+         '200acc05961b084ee00dde919e64f82d'
+         'c1e07c0bec0fe89791bfd9d13fc85edf'
+         'bccbe5619e75cf1d97312ec3681c605c'
+         '07ac979b6ab5eeb778d55f041529d623'
+         '476e9113489f93b348b21e144b6a8fcf')
+
+
+build() {
+  cd ${srcdir}/${_pkgname}-${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
+
+  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/}
+  CPPFLAGS=${CPPFLAGS/-D_FORTIFY_SOURCE=2/}
+
+  ${srcdir}/${_pkgname}-${pkgver}/configure --prefix=/usr \
+      --libdir=/usr/lib --libexecdir=/usr/lib \
+      --build=$CHOST --host=$_target \
+      --with-headers=/${_sysroot}/include \
+      --with-bugurl=https://labs.parabola.nu/ \
+      --enable-add-ons=nptl,libidn \
+      --enable-obsolete-rpc \
+      --enable-kernel=2.6.32 \
+      --enable-bind-now --disable-profile \
+      --enable-stackguard-randomization \
+      --enable-multi-arch
+
+  # 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 '4,6d' 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
+
+  install -dm755 ${pkgdir}/etc
+  touch ${pkgdir}/etc/ld.so.conf
+
+  make install_root=${pkgdir} install
+
+  rm -f ${pkgdir}/etc/ld.so.{cache,conf}
+
+  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}/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
+  sed -e '1,3d' -e 's|/| |g' -e 's|\\| |g' -e 's|^|#|g' \
+    ${srcdir}/glibc-${pkgver}/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
+
+  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/*
+  [[ $CARCH = "i686" ]] && strip $STRIP_BINARIES usr/bin/lddlibc4
+
+  strip $STRIP_STATIC usr/lib/*.a
+
+  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}
+}
diff --git a/libre/xtensa-unknown-elf-glibc/glibc-2.17-getaddrinfo-stack-overflow.patch b/libre/xtensa-unknown-elf-glibc/glibc-2.17-getaddrinfo-stack-overflow.patch
new file mode 100644
index 000000000..aa916ac2c
--- /dev/null
+++ b/libre/xtensa-unknown-elf-glibc/glibc-2.17-getaddrinfo-stack-overflow.patch
@@ -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
+
diff --git a/libre/xtensa-unknown-elf-glibc/glibc-2.17-regexp-matcher-overrun.patch b/libre/xtensa-unknown-elf-glibc/glibc-2.17-regexp-matcher-overrun.patch
new file mode 100644
index 000000000..b108f9d42
--- /dev/null
+++ b/libre/xtensa-unknown-elf-glibc/glibc-2.17-regexp-matcher-overrun.patch
@@ -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
+
diff --git a/libre/xtensa-unknown-elf-glibc/glibc-2.17-sync-with-linux37.patch b/libre/xtensa-unknown-elf-glibc/glibc-2.17-sync-with-linux37.patch
new file mode 100644
index 000000000..24b25c997
--- /dev/null
+++ b/libre/xtensa-unknown-elf-glibc/glibc-2.17-sync-with-linux37.patch
@@ -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
diff --git a/libre/xtensa-unknown-elf-glibc/locale-gen b/libre/xtensa-unknown-elf-glibc/locale-gen
new file mode 100644
index 000000000..5aff344c4
--- /dev/null
+++ b/libre/xtensa-unknown-elf-glibc/locale-gen
@@ -0,0 +1,42 @@
+#!/bin/sh
+
+set -e
+
+LOCALEGEN=/etc/locale.gen
+LOCALES=/usr/share/i18n/locales
+if [ -n "$POSIXLY_CORRECT" ]; then
+  unset POSIXLY_CORRECT
+fi
+
+
+[ -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/* || true
+
+umask 022
+
+is_entry_ok() {
+  if [ -n "$locale" -a -n "$charset" ] ; then
+    true
+  else
+    echo "error: Bad entry '$locale $charset'"
+    false
+  fi
+}
+
+echo "Generating locales..."
+while read locale charset; do \
+	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
+echo "Generation complete."
diff --git a/libre/xtensa-unknown-elf-glibc/locale.gen.txt b/libre/xtensa-unknown-elf-glibc/locale.gen.txt
new file mode 100644
index 000000000..ccdd81734
--- /dev/null
+++ b/libre/xtensa-unknown-elf-glibc/locale.gen.txt
@@ -0,0 +1,23 @@
+# Configuration file for locale-gen
+#
+# lists of locales that are to be generated by the locale-gen command.
+#
+# Each line is of the form:
+#
+#     <locale> <charset>
+#
+#  where <locale> is one of the locales given in /usr/share/i18n/locales
+#  and <charset> is one of the character sets listed in /usr/share/i18n/charmaps
+#
+#  Examples:
+#  en_US ISO-8859-1
+#  en_US.UTF-8 UTF-8
+#  de_DE ISO-8859-1
+#  de_DE@euro ISO-8859-15
+#
+#  The locale-gen command will generate all the locales,
+#  placing them in /usr/lib/locale.
+#
+#  A list of supported locales is included in this file.
+#  Uncomment the ones you need.
+#
diff --git a/libre/xtensa-unknown-elf-glibc/nscd.service b/libre/xtensa-unknown-elf-glibc/nscd.service
new file mode 100644
index 000000000..bc80a0730
--- /dev/null
+++ b/libre/xtensa-unknown-elf-glibc/nscd.service
@@ -0,0 +1,17 @@
+[Unit]
+Description=Name Service Cache Daemon
+After=syslog.target
+ 
+[Service]
+Type=forking
+ExecStart=/usr/sbin/nscd
+ExecStop=/usr/sbin/nscd --shutdown
+ExecReload=/usr/sbin/nscd -i passwd
+ExecReload=/usr/sbin/nscd -i group
+ExecReload=/usr/sbin/nscd -i hosts
+ExecReload=/usr/sbin/nscd -i services
+Restart=always
+PIDFile=/run/nscd/nscd.pid
+ 
+[Install]
+WantedBy=multi-user.target
diff --git a/libre/xtensa-unknown-elf-glibc/nscd.tmpfiles b/libre/xtensa-unknown-elf-glibc/nscd.tmpfiles
new file mode 100644
index 000000000..8a24a785e
--- /dev/null
+++ b/libre/xtensa-unknown-elf-glibc/nscd.tmpfiles
@@ -0,0 +1 @@
+d /run/nscd 0755 root root
diff --git a/libre/xtensa-unknown-elf-glibc/xtensa-unknown-elf-glibc.install b/libre/xtensa-unknown-elf-glibc/xtensa-unknown-elf-glibc.install
new file mode 100644
index 000000000..f8147a6cf
--- /dev/null
+++ b/libre/xtensa-unknown-elf-glibc/xtensa-unknown-elf-glibc.install
@@ -0,0 +1,19 @@
+infodir=usr/share/info
+filelist=(libc.info{,-1,-2,-3,-4,-5,-6,-7,-8,-9,-10,-11})
+
+post_upgrade() {
+  ldconfig -r .
+  locale-gen
+  
+  [[ -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
+}