CVS commit: pkgsrc/shells/tcsh

["Leonardo Taccari" <leot%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   leot
Date:           Wed May 15 09:18:01 UTC 2019

Modified Files:
        pkgsrc/shells/tcsh: distinfo
Added Files:
        pkgsrc/shells/tcsh/patches: patch-tests_subst.at
            patch-tests_variables.at

Log Message:
tcsh: Add upstream patch to address filename expansion test failures

When $HOME environment variable is set, e.g. in pkgrsc where a fake
homedir is injected, ~ is expanded to $HOME while ~user is expanded
to the passwd(5) home_dir field leading to inconsistency in the test.

No PKGREVISION bump since that change only affects tests.


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 pkgsrc/shells/tcsh/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/shells/tcsh/patches/patch-tests_subst.at \
    pkgsrc/shells/tcsh/patches/patch-tests_variables.at

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/shells/tcsh/distinfo
diff -u pkgsrc/shells/tcsh/distinfo:1.41 pkgsrc/shells/tcsh/distinfo:1.42
--- pkgsrc/shells/tcsh/distinfo:1.41    Thu May  9 11:46:21 2019
+++ pkgsrc/shells/tcsh/distinfo Wed May 15 09:18:01 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.41 2019/05/09 11:46:21 leot Exp $
+$NetBSD: distinfo,v 1.42 2019/05/15 09:18:01 leot Exp $
 
 SHA1 (tcsh-6.21.00.tar.gz) = aeb43ee952d47bdf33cc29fdecd170cfedbe8481
 RMD160 (tcsh-6.21.00.tar.gz) = 665d522ded31e3fa23b71a5726d2d52e1c60e085
@@ -9,3 +9,5 @@ SHA1 (patch-ab) = 8cf26988778b5331360eb1
 SHA1 (patch-configure) = 6970c041a66910325d1fb53ebf8ab3627d764778
 SHA1 (patch-nls_Makefile.in) = 58d859e8a50e6436b9bc6514497eb876426d92d7
 SHA1 (patch-sh.h) = ac6211ddd5e552e9baec2d35aed5e7e573cab04e
+SHA1 (patch-tests_subst.at) = 3be0ec07237e12653805644f1d545122842e97c9
+SHA1 (patch-tests_variables.at) = 809c7c006f59581bdae8280eabc7a43ce93a697d

Added files:

Index: pkgsrc/shells/tcsh/patches/patch-tests_subst.at
diff -u /dev/null pkgsrc/shells/tcsh/patches/patch-tests_subst.at:1.1
--- /dev/null   Wed May 15 09:18:01 2019
+++ pkgsrc/shells/tcsh/patches/patch-tests_subst.at     Wed May 15 09:18:01 2019
@@ -0,0 +1,22 @@
+$NetBSD: patch-tests_subst.at,v 1.1 2019/05/15 09:18:01 leot Exp $
+
+Reset $HOME before tests that need $HOME.
+
+From upstream commit cb71f67782b2829ca66b341daba70e501d028eee.
+
+--- tests/subst.at.orig        2019-05-08 18:39:28.000000000 +0000
++++ tests/subst.at
+@@ -50,11 +50,11 @@ nothing*
+ foo* ab{c,d} ^fo*
+ ])
+ 
+-AT_CHECK([echo 'echo ~; echo "$HOME"' | tcsh -f | uniq | wc -l | tr -d ' \t'],
++AT_CHECK([export HOME=$(getent passwd $(id -un) | awk -F: '{ print $(NF - 1) }'); echo 'echo ~; echo "$HOME"' | tcsh -f | uniq | wc -l | tr -d ' \t'],
+ , [1
+ ])
+ 
+-AT_CHECK([echo "echo ~$(id -un)/foo; echo \"$HOME/foo\"" | tcsh -f | uniq dnl
++AT_CHECK([export HOME=$(getent passwd $(id -un) | awk -F: '{ print $(NF - 1) }'); echo "echo ~$(id -un)/foo; echo \"\$HOME/foo\"" | tcsh -f | uniq dnl
+         | wc -l | tr -d ' \t'], , [1
+ ])
+ 
Index: pkgsrc/shells/tcsh/patches/patch-tests_variables.at
diff -u /dev/null pkgsrc/shells/tcsh/patches/patch-tests_variables.at:1.1
--- /dev/null   Wed May 15 09:18:01 2019
+++ pkgsrc/shells/tcsh/patches/patch-tests_variables.at Wed May 15 09:18:01 2019
@@ -0,0 +1,26 @@
+$NetBSD: patch-tests_variables.at,v 1.1 2019/05/15 09:18:01 leot Exp $
+
+Reset $HOME before tests that need $HOME.
+
+From upstream commit cb71f67782b2829ca66b341daba70e501d028eee.
+
+--- tests/variables.at.orig    2019-05-08 18:39:28.000000000 +0000
++++ tests/variables.at
+@@ -588,7 +588,7 @@ printenv HOME
+ setenv HOME /bar
+ echo $home
+ ]])
+-AT_CHECK([tcsh -f home.csh], ,
++AT_CHECK([export HOME=$(getent passwd $(id -nu) | awk -F: '{ print $(NF - 1) }'); tcsh -f home.csh], ,
+ [1
+ 1
+ /foo
+@@ -705,7 +705,7 @@ AT_CLEANUP
+ 
+ 
+ AT_SETUP([$ cdtohome])
+-AT_CHECK([tcsh -f -c 'cd'], 0)
++AT_CHECK([export HOME=$(getent passwd $(id -nu) | awk -F: '{ print $(NF - 1) }'); tcsh -f -c 'cd'], 0)
+ AT_CLEANUP
+ AT_SETUP([$ noimplicithome])
+ AT_CHECK([tcsh -f -c 'unset cdtohome; cd'], 1, , [cd: Too few arguments.