[arch-commits] Commit in tcsh/trunk (ChangeLog PKGBUILD rs.diff)

[Eric Bélanger]

    Date: Saturday, February 7, 2009 @ 20:42:07
  Author: eric
Revision: 26442

upgpkg: tcsh 6.16.00-2
    Fixed bug with new dircolors from coreutils (close FS#12658)

Added:
  tcsh/trunk/rs.diff
Modified:
  tcsh/trunk/ChangeLog
  tcsh/trunk/PKGBUILD

-----------+
 ChangeLog |    5 +++++
 PKGBUILD  |   20 +++++++++++++-------
 rs.diff   |   15 +++++++++++++++
 3 files changed, 33 insertions(+), 7 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2009-02-08 01:36:41 UTC (rev 26441)
+++ ChangeLog	2009-02-08 01:42:07 UTC (rev 26442)
@@ -1,3 +1,8 @@
+2009-02-07  Eric Belanger  <eric at archlinux.org>
+
+	* tcsh 6.16.00-2
+	* Fixed bug with new dircolors from coreutils (close FS#12658)
+
 2009-01-03  Eric Belanger  <eric at archlinux.org>
 
 	* tcsh 6.16.00-1

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-02-08 01:36:41 UTC (rev 26441)
+++ PKGBUILD	2009-02-08 01:42:07 UTC (rev 26442)
@@ -4,7 +4,7 @@
 
 pkgname=tcsh
 pkgver=6.16.00
-pkgrel=1
+pkgrel=2
 pkgdesc="Enhanced version of the Berkeley C shell"
 arch=('i686' 'x86_64')
 url="http://www.tcsh.org/Welcome"
@@ -12,16 +12,22 @@
 depends=('ncurses')
 install=tcsh.install
 source=(ftp://ftp.astron.com/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz csh.cshrc \
-        csh.login tcsh.config.skel usr_csh.sh usr_tcsh.sh)
+        rs.diff csh.login tcsh.config.skel usr_csh.sh usr_tcsh.sh)
 md5sums=('55f1a41512250168ec4bf1db0e246db4' '299cd79eb3cbc2a3caeac1c3a0309556'\
-         '4869b9da87c79854e2cc97241f125853' '6bd69d3c815412ada4579ac8f8cc9c45'\
-         '2b672c67b5e08ab81fbb03d8588d25e3' '8758b20326f00a1057bd95a300c28355')
-sha1sums=('3d3536bbb9201abdf39b8b364b95e0a218970a5c' '8ebcee4e6c934481a46fe40c15d52a53ed5744bb'\
-          'dbbcfacc078789104f75cbf5a99640ce7251c99e' '73a0ae17f2e3dcf2d3ae871982e8591379e1800e'\
-          '7668da494d053a00199f8e2c857bf3998c74f0be' '31da3a6aaa00cd8d66a6c1fba42e19fbc99f2c7c')
+         'af778187b0de574079775d80fd53059f' '4869b9da87c79854e2cc97241f125853'\
+         '6bd69d3c815412ada4579ac8f8cc9c45' '2b672c67b5e08ab81fbb03d8588d25e3'\
+         '8758b20326f00a1057bd95a300c28355')
+sha1sums=('3d3536bbb9201abdf39b8b364b95e0a218970a5c'
+          '8ebcee4e6c934481a46fe40c15d52a53ed5744bb'
+          '98fcb9ebba5dcbd0b3210acc773ef0b386f31c27'
+          'dbbcfacc078789104f75cbf5a99640ce7251c99e'
+          '73a0ae17f2e3dcf2d3ae871982e8591379e1800e'
+          '7668da494d053a00199f8e2c857bf3998c74f0be'
+          '31da3a6aaa00cd8d66a6c1fba42e19fbc99f2c7c')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
+  patch -p0 < ../rs.diff || return 1
   ./configure --prefix=/ --sysconfdir=/etc --mandir=/usr/share/man || return 1
   make || return 1
   make DESTDIR=${pkgdir} install install.man || return 1

Added: rs.diff
===================================================================
--- rs.diff	                        (rev 0)
+++ rs.diff	2009-02-08 01:42:07 UTC (rev 26442)
@@ -0,0 +1,15 @@
+Index: tw.color.c
+===================================================================
+RCS file: /p/tcsh/cvsroot/tcsh/tw.color.c,v
+retrieving revision 1.24
+diff -u -u -r1.24 tw.color.c
+--- tw.color.c	2 Mar 2006 18:46:45 -0000	1.24
++++ tw.color.c	17 Oct 2008 19:03:56 -0000
+@@ -85,6 +85,7 @@
+     VAR(NOS, "tw", ""),		/* Sticky and other writable dir (+t,o+w) */
+     VAR(NOS, "ow", ""),		/* Other writable dir (o+w) but not sticky */
+     VAR(NOS, "st", ""),		/* Sticky dir (+t) but not other writable */
++    VAR(NOS, "rs", "0"),	/* Reset to normal color */
+ };
+ 
+ enum FileType {