Fix for bug #104763: now scripts from /etc/profile.d are not being sourced for non-interactive shells. Moved unused legacy scripts to example dir instead of installing them and polluting the filesystem.

(Portage version: 2.0.51.22-r3)

5 files changed, 157 insertions, 1 deletions

diff --git a/app-shells/tcsh/ChangeLog b/app-shells/tcsh/ChangeLog
index a8d1678fad45..ddee713f073a 100644
--- a/app-shells/tcsh/ChangeLog
+++ b/app-shells/tcsh/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-shells/tcsh
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/ChangeLog,v 1.43 2005/11/02 21:48:01 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/ChangeLog,v 1.44 2005/11/20 17:06:54 grobian Exp $
+
+*tcsh-6.14-r2 (20 Nov 2005)
+
+  20 Nov 2005; Fabian Groffen <grobian@gentoo.org>
+  +files/tcsh-6.14-r2.patch, +tcsh-6.14-r2.ebuild:
+  Fix for bug #104763: now scripts from /etc/profile.d are not being sourced
+  for non-interactive shells.  Moved unused legacy scripts to example dir
+  instead of installing them and polluting the filesystem.
 
   02 Nov 2005; Fabian Groffen <grobian@gentoo.org> tcsh-6.14-r1.ebuild:
   Only add csh symlink if csh is not yet there for bug #26196
diff --git a/app-shells/tcsh/Manifest b/app-shells/tcsh/Manifest
index e3a038fa140f..ddb966ee8800 100644
--- a/app-shells/tcsh/Manifest
+++ b/app-shells/tcsh/Manifest
@@ -1,5 +1,6 @@
 MD5 1b865e9c0349146f352678370c667127 tcsh-6.13-r1.ebuild 1889
 MD5 c250d0af9e636acf93f75180f66ed639 tcsh-6.14.ebuild 1234
+MD5 3260bc63a96874e56e80dfb04c552ae8 tcsh-6.14-r2.ebuild 2338
 MD5 89674d2fb5c06a3b4b5310a3212c81a2 tcsh-6.12-r3.ebuild 1382
 MD5 40885229543eeb01a6a91b426c29e29d tcsh-6.13.ebuild 1249
 MD5 2076c4be609061fe61b9e961b3abc6f1 tcsh-6.14-r1.ebuild 2542
@@ -16,10 +17,12 @@ MD5 d612d75d8d811c7932e5c214946cb7ba files/tcsh-6.13.00-dspmbyte.patch 2312
 MD5 36f0897401e2ff873f97e8eac302169d files/digest-tcsh-6.13 121
 MD5 8adf2e3c68136062a1023af2832b3c7a files/digest-tcsh-6.14 121
 MD5 c2ca2472d2e81e30f23492c306c03ada files/tcsh-6.13.00-iconv.patch 11230
+MD5 dc3f6395569049b5f3a1547364be0260 files/tcsh-6.14-r2.patch 2057
 MD5 fb2384289b070107607f18091513ec74 files/tcsh-6.13.00-cstr.patch 396
 MD5 968abc8b96dbc3821d09bc3ee58c41a7 files/digest-tcsh-6.12-r3 121
 MD5 36f0897401e2ff873f97e8eac302169d files/digest-tcsh-6.13-r1 121
 MD5 64585b7284837bece8d5ba281d3bda0c files/digest-tcsh-6.14-r1 135
+MD5 64585b7284837bece8d5ba281d3bda0c files/digest-tcsh-6.14-r2 135
 MD5 6bd69d3c815412ada4579ac8f8cc9c45 files/tcsh.config 1466
 MD5 0c7590ddc33afe8fa448f51871ad677c files/tcsh-6.12-tc.os.h-gentoo.diff 363
 MD5 299cd79eb3cbc2a3caeac1c3a0309556 files/csh.cshrc_new 2810
diff --git a/app-shells/tcsh/files/digest-tcsh-6.14-r2 b/app-shells/tcsh/files/digest-tcsh-6.14-r2
new file mode 100644
index 000000000000..077052c4f630
--- /dev/null
+++ b/app-shells/tcsh/files/digest-tcsh-6.14-r2
@@ -0,0 +1,2 @@
+MD5 353d1bb7d2741bf8de602c7b6f0efd79 tcsh-6.14.00.tar.gz 859780
+MD5 06d9a00fa7e034394bf1152f0fc3e950 tcsh-6.14-conffiles.tar.bz2 20200
diff --git a/app-shells/tcsh/files/tcsh-6.14-r2.patch b/app-shells/tcsh/files/tcsh-6.14-r2.patch
new file mode 100644
index 000000000000..c1dc772dac15
--- /dev/null
+++ b/app-shells/tcsh/files/tcsh-6.14-r2.patch
@@ -0,0 +1,59 @@
+--- gentoo/csh.cshrc
++++ gentoo/csh.cshrc
+@@ -1,6 +1,9 @@
+ ## Gentoo csh.cshrc
+ ##
+-## 2005-09-29 -- Fabian Groffen (grobian@gentoo.org)
++## 2005-11-10 -- Fabian Groffen (grobian@gentoo.org)
++##   * Disabled sourcing environment defaults and additional settings
++##     when having a non-interactive shell.  Bug #104763
++## 2005-09-29 -- Fabian Groffen
+ ##   * Initial version of a complete redo of this file to fix many bugs
+ ##     and resolve many annoyances experienced by numerous users
+ ##
+@@ -8,7 +11,7 @@
+ ##
+ ## Load the environment defaults.
+ ##
+-if ( -r /etc/csh.env ) then
++if ( $?prompt && -r /etc/csh.env ) then
+     source /etc/csh.env
+ endif
+ 
+@@ -55,7 +58,7 @@
+ ##
+ ## Source extensions
+ ##
+-if ( -d /etc/profile.d ) then
++if ( $?prompt && -d /etc/profile.d ) then
+ 	set nonomatch
+ 	foreach i ( /etc/profile.d/*.csh )
+ 		if ( -r $i ) then
+--- gentoo/tcsh-complete
++++ gentoo/tcsh-complete
+@@ -3,8 +3,11 @@
+ ## Based on the TCSH complete.tcsh script, with changed from the TCSHRC
+ ## package (http://tcshrc.sourceforge.net)
+ ##
+-## Please do not change this file!  Place your personal customizations in
+-## ~/.tcshrc and system-wide customizations in /etc/profiles.d/local.csh
++## Please note that the tcsh-complete file is a large set of examples
++## that is not meant to be used in its exact form, as it defines an
++## excessive -- sometimes conflicting -- amount of completion scripts.
++## It is highly encouraged to copy over the desired auto completion
++## scripts to the personal ~/.tcshrc file.
+ ##
+ ## 2005-09-27  --  Fabian Groffen (grobian@gentoo.org)
+ ##     fixed some bugs reported by users and cleaned it a bit
+--- gentoo/tcsh-gentoo_legacy
++++ gentoo/tcsh-gentoo_legacy
+@@ -4,6 +4,9 @@
+ ## by gentoo ebuilds prior to 6.14-r1.  If you wonder what it does, you
+ ## probably don't want this at all, so stay away from it.
+ ##
++## Remember that you have to copy over these files into their
++## appropriate places, such as /etc/profile.d and /etc/skel.
++##
+ 
+ ##
+ ## Start by unsetting all our variables.  This is needed to prevent
diff --git a/app-shells/tcsh/tcsh-6.14-r2.ebuild b/app-shells/tcsh/tcsh-6.14-r2.ebuild
new file mode 100644
index 000000000000..d9d1d2f79e5d
--- /dev/null
+++ b/app-shells/tcsh/tcsh-6.14-r2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/tcsh-6.14-r2.ebuild,v 1.1 2005/11/20 17:06:55 grobian Exp $
+
+inherit eutils
+
+MY_P="${P}.00"
+DESCRIPTION="Enhanced version of the Berkeley C shell (csh)"
+HOMEPAGE="http://www.tcsh.org/"
+SRC_URI="ftp://ftp.astron.com/pub/tcsh/${MY_P}.tar.gz
+	mirror://gentoo/${P}-conffiles.tar.bz2"
+# note: starting from this version the various files scattered around
+#       the place in ${FILESDIR} are now stored in a versioned tarball
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~mips"
+IUSE="perl"
+
+DEPEND="virtual/libc
+	>=sys-libs/ncurses-5.1
+	perl? ( dev-lang/perl )"
+
+S="${WORKDIR}/${MY_P}"
+
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}/${P}"-r2.patch
+}
+
+src_compile() {
+	econf --prefix=/ || die "econf failed"
+	emake || die "compile problem"
+}
+
+src_install() {
+	make DESTDIR="${D}" install install.man || die
+
+	if use perl ; then
+		perl tcsh.man2html || die
+		dohtml tcsh.html/*.html
+	fi
+
+	insinto /etc
+	doins \
+		"${WORKDIR}"/gentoo/csh.cshrc \
+		"${WORKDIR}"/gentoo/csh.login
+
+	insinto /etc/skel
+
+	insinto /etc/profile.d
+	doins \
+		"${WORKDIR}"/gentoo/tcsh-bindkey.csh \
+		"${WORKDIR}"/gentoo/tcsh-settings.csh
+
+	dodoc FAQ Fixes NewThings Ported README WishList Y2K
+
+	docinto examples
+	dodoc \
+		"${WORKDIR}"/gentoo/tcsh-aliases \
+		"${WORKDIR}"/gentoo/tcsh-complete \
+		"${WORKDIR}"/gentoo/tcsh-gentoo_legacy \
+		"${WORKDIR}"/gentoo/tcsh.config .tcsh.config
+}
+
+pkg_postinst() {
+	# add csh -> tcsh symlink only if csh is not yet there
+	[ ! -e /bin/csh ] && dosym /bin/tcsh /bin/csh
+
+	while read line; do einfo "${line}"; done <<EOF
+The default behaviour of tcsh has significantly changed starting from
+version 6.14-r1.  In contrast to previous ebuilds, the amount of
+customisation to the default shell's behaviour has been reduced to a
+bare minimum (a customised prompt).
+If you rely on the customisations provided by previous ebuilds, you will
+have to copy over the relevant (now commented out) parts to your own
+~/.tcshrc.  Please check all tcsh-* files in
+/usr/share/tcsh-6.14-r2/example and include their behaviour in your own
+configuration files.
+The tcsh-complete file is not any longer sourced by the default system
+scripts.
+EOF
+}