Version bump to 3.7; also fixed the readline patch sourcing issues. Closes bugs #39543 and #32941.

5 files changed, 76 insertions, 17 deletions

diff --git a/app-shells/sash/ChangeLog b/app-shells/sash/ChangeLog
index 73cc36ffb2ea..770896687a6b 100644
--- a/app-shells/sash/ChangeLog
+++ b/app-shells/sash/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-shells/sash
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/sash/ChangeLog,v 1.17 2004/02/10 22:22:46 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/sash/ChangeLog,v 1.18 2004/02/14 22:23:05 plasmaroo Exp $
+
+  14 Feb 2004; <plasmaroo@gentoo.org> files/sash-3.6-readline.patch:
+  Fixed an upstream bug in the readline patch, this should solve
+  issues when sourcing scripts and closes bug #32941. Also updated
+  to 3.7; closes bug #39543.
 
   06 Feb 2004; <gustavoz@gentoo.org> sash-3.6.ebuild:
   Marked stable on sparc.
diff --git a/app-shells/sash/Manifest b/app-shells/sash/Manifest
index df7b442f19ec..0a8b806b7aaa 100644
--- a/app-shells/sash/Manifest
+++ b/app-shells/sash/Manifest
@@ -1,12 +1,14 @@
-MD5 107cb1be38960be12098093dbe5ae628 ChangeLog 2118
+MD5 b7a4f202461d1a97f82b9a8763cb5e70 ChangeLog 2349
 MD5 b8756d24ec5ec79045b44722df7c319a sash-3.4-r3.ebuild 1263
-MD5 d8c0485b62ffd11da00c0aadbe43bd65 sash-3.4-r4.ebuild 1190
 MD5 36dbacd7e69f70b41a94f1b397ef44e2 sash-3.4-r5.ebuild 1183
 MD5 e00f1f6d696d0a3e9be170cf4d8c1e66 sash-3.6.ebuild 975
-MD5 c0a4b54f51097cb6d1e76b0f0df2d938 files/digest-sash-3.6 59
+MD5 fd4e8a87626d7efb420525c80acb4f4f sash-3.7.ebuild 932
+MD5 d8c0485b62ffd11da00c0aadbe43bd65 sash-3.4-r4.ebuild 1190
 MD5 6fe20649cd07eb0aa8884df7a1749e47 files/digest-sash-3.4-r3 127
+MD5 c0a4b54f51097cb6d1e76b0f0df2d938 files/digest-sash-3.6 59
 MD5 6fe20649cd07eb0aa8884df7a1749e47 files/digest-sash-3.4-r4 127
 MD5 6fe20649cd07eb0aa8884df7a1749e47 files/digest-sash-3.4-r5 127
+MD5 ed10e67a2e293993478c999f67c612b8 files/digest-sash-3.7 59
 MD5 570237f86f81b58c68835104a03da8dc files/sash-3.4-gentoo.diff 7087
 MD5 e8758a0d35504ea0420262b58acc5a62 files/sash-3.6-fix-includes.patch 334
-MD5 e81cdff30c351f90b7a295d849dda189 files/sash-3.6-readline.patch 7282
+MD5 d33602f9d3d89db4b3ea2adad619fdf2 files/sash-3.6-readline.patch 7507
diff --git a/app-shells/sash/files/digest-sash-3.7 b/app-shells/sash/files/digest-sash-3.7
new file mode 100644
index 000000000000..927cceb6610b
--- /dev/null
+++ b/app-shells/sash/files/digest-sash-3.7
@@ -0,0 +1 @@
+MD5 ee7c7ed5aad76599974d016a6f201ef4 sash-3.7.tar.gz 50337
diff --git a/app-shells/sash/files/sash-3.6-readline.patch b/app-shells/sash/files/sash-3.6-readline.patch
index 2bd7e29d82d3..c30fcb59e4d5 100644
--- a/app-shells/sash/files/sash-3.6-readline.patch
+++ b/app-shells/sash/files/sash-3.6-readline.patch
@@ -260,11 +260,32 @@ diff -ruN sash-3.6/sash.c sash-3.6.readline/sash.c
  		if (intFlag && !ttyFlag && (fp != stdin))
  		{
  			fclose(fp);
-@@ -596,6 +804,19 @@
- 
+@@ -805,17 +805,34 @@
  			return;
  		}
+ 	
+-		if (fgets(buf, CMD_LEN - 1, fp) == NULL)
++#ifdef HAVE_READLINE
++		if (name != NULL)
+ 		{
+-			if (ferror(fp) && (errno == EINTR))
++#endif
++			if (fgets(buf, CMD_LEN - 1, fp) == NULL)
+ 			{
+-				clearerr(fp);
++				if (ferror(fp) && (errno == EINTR))
++				{
++					clearerr(fp);
++					continue;
++				}
+ 
+-				continue;
++				break;
+ 			}
+-
+-			break;
 +#ifdef HAVE_READLINE
+ 		}
 +		if (name == NULL)
 +		   {
 +		       input_line = readline(prompt ? prompt : "$ ");
@@ -276,16 +297,7 @@ diff -ruN sash-3.6/sash.c sash-3.6.readline/sash.c
 +			   }
 +		       free(input_line);
 +		    }   
-+#else
- 	
- 		if (fgets(buf, CMD_LEN - 1, fp) == NULL)
- 		{
-@@ -608,7 +829,7 @@
++#endif
  
- 			break;
- 		}
--
-+#endif		    
  		cc = strlen(buf);
  
- 		if (buf[cc - 1] == '\n')
diff --git a/app-shells/sash/sash-3.7.ebuild b/app-shells/sash/sash-3.7.ebuild
new file mode 100644
index 000000000000..7f5bcd8902d4
--- /dev/null
+++ b/app-shells/sash/sash-3.7.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/sash/sash-3.7.ebuild,v 1.1 2004/02/14 22:23:05 plasmaroo Exp $
+
+inherit eutils
+
+DESCRIPTION="A small static UNIX Shell with readline support"
+HOMEPAGE="http://www.canb.auug.org.au/~dbell/ http://dimavb.st.simbirsk.su/vlk/"
+SRC_URI="http://www.canb.auug.org.au/~dbell/programs/${P}.tar.gz"
+
+LICENSE="freedist"
+SLOT="0"
+IUSE="readline"
+KEYWORDS="~x86"
+
+DEPEND="virtual/glibc
+	>=sys-libs/zlib-1.1.4
+	readline? ( >=sys-libs/readline-4.1 >=sys-libs/ncurses-5.2 )"
+RDEPEND=""
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd ${S}
+
+	epatch ${FILESDIR}/sash-3.6-fix-includes.patch
+	[ `use readline` ] && epatch ${FILESDIR}/sash-3.6-readline.patch
+	sed -e "s:-O3:${CFLAGS}:" -i Makefile
+}
+
+src_compile() {
+	make || die
+}
+
+src_install() {
+	into /
+	dobin sash
+	doman sash.1
+	dodoc README
+}