From c8ee56e1933e1b50fc5c0033d819b609db8c70c82b99bd0f268307ce126c5719 Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Sun, 13 Jun 2010 22:27:32 +0000
Subject: [PATCH] Accepting request 41363 from shells

Copy from shells/tcsh based on submit request 41363 from user WernerFink

OBS-URL: https://build.opensuse.org/request/show/41363
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tcsh?expand=0&rev=29
---
 tcsh-6.17.00.dif | 18 ++++++++++++++++++
 tcsh.changes     |  5 +++++
 tcsh.spec        |  2 +-
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/tcsh-6.17.00.dif b/tcsh-6.17.00.dif
index daf276f..62da9bc 100644
--- a/tcsh-6.17.00.dif
+++ b/tcsh-6.17.00.dif
@@ -25,6 +25,15 @@
  install.man: tcsh.man
 --- config_f.h
 +++ config_f.h	2007-07-13 10:47:29.673240000 +0000
+@@ -37,7 +37,7 @@
+  */
+ #ifndef _h_config_f
+ #define _h_config_f
+-
++#include <features.h>
+ /*
+  * SHORT_STRINGS Use at least 16 bit characters instead of 8 bit chars
+  * 	         This fixes up quoting problems and eases implementation
 @@ -63,12 +63,19 @@
   */
  #if defined (NLS) && defined (HAVE_CATGETS)
@@ -46,6 +55,15 @@
  
  /*
   * VIDEFAULT    Make the VI mode editor the default
+@@ -150,7 +150,7 @@
+  *		This can be much slower and no memory statistics will be
+  *		provided.
+  */
+-#if defined(__MACHTEN__) || defined(PURIFY) || defined(MALLOC_TRACE) || defined(_OSD_POSIX) || defined(__MVS__)
++#if defined(__MACHTEN__) || defined(PURIFY) || defined(MALLOC_TRACE) || defined(_OSD_POSIX) || defined(__MVS__) || defined(__GLIBC__)
+ # define SYSMALLOC
+ #else
+ # undef SYSMALLOC
 @@ -162,7 +169,7 @@
   *		successful, set $REMOTEHOST to the name or address of the
   *		host
diff --git a/tcsh.changes b/tcsh.changes
index 7c33638..19bda79 100644
--- a/tcsh.changes
+++ b/tcsh.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jun 11 16:41:34 CEST 2010 - werner@suse.de
+
+- Avoid crash due own malloc due buggy nss implementation of glibc
+
 -------------------------------------------------------------------
 Wed Mar 17 12:58:44 CET 2010 - werner@suse.de
 
diff --git a/tcsh.spec b/tcsh.spec
index 645b613..0cf9cca 100644
--- a/tcsh.spec
+++ b/tcsh.spec
@@ -26,7 +26,7 @@ Group:          System/Shells
 Requires:       gawk textutils
 AutoReqProv:    on
 Version:        6.17.00
-Release:        3
+Release:        4
 Summary:        The C SHell
 Source:         ftp.astron.com:/pub/tcsh/tcsh-6.17.00.tar.bz2
 Source1:        nls-iconv