3 files changed, 18 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 960175e..8882c6f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 PACKAGE = setup
-VERSION = 2.7.16
+VERSION = 2.7.17
 SVNPATH = svn+ssh://svn.mandriva.com/svn/soft/$(PACKAGE)
 
 LIST =  csh.cshrc csh.login host.conf hosts.allow hosts.deny inputrc \
diff --git a/NEWS b/NEWS
index f787ece..62dabae 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,14 @@
+2009-04-11 Gustavo De Nardin <gustavodn@mandriva.com> 2.7.17
+
+	* stop csh from sourcing /etc/profile.d/* on non-interactive shells
+	  (#49407 comment 6)
+
+2009-01-09 Frederic Crozat <fcrozat@mandriva.com> 2.7.16
+
+	* add dialout group (needed by latest udev, common with Debian)
+
+2009-01-07 Pixel <pixel@mandriva.com>
+
 	* handle control + left/right arrow in gnome-terminal (#36287)
 
 2008-05-14 Guillaume Rousse <guillomovitch@mandriva.org> 2.7.12
diff --git a/csh.cshrc b/csh.cshrc
index 6010599..02c8c5c 100644
--- a/csh.cshrc
+++ b/csh.cshrc
@@ -17,6 +17,9 @@ if ($?prompt) then
   else
     set prompt=\[`id -nu`@`hostname -s`\]\$\ 
   endif
+else
+  # nothing more to do for non-interactive shell
+  goto OUT
 endif
 
 test -d /etc/profile.d
@@ -34,3 +37,6 @@ if ($status == 0) then
         end
         unset i nonomatch
 endif
+
+
+OUT: