- Update to 4.3.11-dev-2, many crash fixes

OBS-URL: https://build.opensuse.org/package/show/shells/zsh?expand=0&rev=47

_service

@@ -1,23 +1,23 @@
 <?xml version="1.0" ?>
 <services>
   <service name="download_url">
-    <param name="protocol">http</param>
+    <param name="protocol">ftp</param>
-    <param name="host">www.zsh.org</param>
+    <param name="host">ftp.zsh.org</param>
-    <param name="path">/pub/zsh-4.3.11.tar.bz2</param>
+    <param name="path">/pub/development/zsh-4.3.11-dev-2.tar.bz2</param>
   </service>
   <service name="verify_file">
-    <param name="file">_service:download_url:zsh-4.3.11.tar.bz2</param>
+    <param name="file">_service:download_url:zsh-4.3.11-dev-2.tar.bz2</param>
     <param name="verifier">sha256</param>
-    <param name="checksum">30eb774120d89d98336c929c210a9df4f61fc1f0137732812a6c0d8b8d074f05</param>
+    <param name="checksum">fae07ab1a95bf7c51ea4251d416e52dca2b0ab488edb40be5219363d464450d4</param>
   </service>
   <service name="download_url">
-    <param name="protocol">http</param>
+    <param name="protocol">ftp</param>
-    <param name="host">www.zsh.org</param>
+    <param name="host">ftp.zsh.org</param>
-    <param name="path">/pub/zsh-4.3.11-doc.tar.bz2</param>
+    <param name="path">/pub/development/zsh-4.3.11-dev-2-doc.tar.bz2</param>
   </service>
   <service name="verify_file">
-    <param name="file">_service:download_url:zsh-4.3.11-doc.tar.bz2</param>
+    <param name="file">_service:download_url:zsh-4.3.11-dev-2-doc.tar.bz2</param>
     <param name="verifier">sha256</param>
-    <param name="checksum">956100a251cf523978a2f81802636b6cdd28f2861d508eedb10477317cecec4c</param>
+    <param name="checksum">2eff0e273d04dd95d6594793e35eccea5b91f68b10bca980e2d0656efc551c2a</param>
   </service>
 </services>

_service:download_url:zsh-4.3.11-doc.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:956100a251cf523978a2f81802636b6cdd28f2861d508eedb10477317cecec4c
-size 2687527

_service:download_url:zsh-4.3.11.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:30eb774120d89d98336c929c210a9df4f61fc1f0137732812a6c0d8b8d074f05
-size 2868429

subst-crash.patch

@@ -1,36 +0,0 @@
-From aa58d139ff3ffa7258a6273bf279d70f9ee31916 Mon Sep 17 00:00:00 2001
-From: Peter Stephenson <pws@users.sourceforge.net>
-Date: Tue, 18 Jan 2011 10:29:58 +0000
-Subject: [PATCH] Mikael: 28637: ${foo:0:} caused crash
-
----
- ChangeLog              |    6 +++++-
- Src/subst.c            |   14 ++++++++------
- Test/D04parameter.ztst |    5 +++++
- 3 files changed, 18 insertions(+), 7 deletions(-)
-
-diff --git a/Src/subst.c b/Src/subst.c
-index 24d515d..37d63ca 100644
---- a/Src/subst.c
-+++ b/Src/subst.c
-@@ -2814,12 +2814,14 @@ paramsubst(LinkList l, LinkNode n, char **str, int qt, int ssub)
- 			zerr("invalid length: %s", check_offset);
- 			return NULL;
- 		    }
--		    length = mathevali(check_offset);
--		    if (errflag)
--			return NULL;
--		    if (length < (zlong)0) {
--			zerr("invalid length: %s", check_offset);
--			return NULL;
-+                    if (check_offset) {
-+			length = mathevali(check_offset);
-+			if (errflag)
-+			    return NULL;
-+			if (length < (zlong)0) {
-+			    zerr("invalid length: %s", check_offset);
-+			    return NULL;
-+			}
- 		    }
- 		}
- 		if (horrible_offset_hack) {

zsh.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Apr 20 12:07:36 UTC 2011 - idoenmez@novell.com
+
+- Update to 4.3.11-dev-2, many crash fixes 
+
 -------------------------------------------------------------------
 Tue Mar 15 13:40:24 UTC 2011 - ismail@namtrac.org
 

zsh.spec

@@ -19,7 +19,7 @@
 
 
 Name:           zsh
-Version:        4.3.11
+Version:        4.3.11_dev_2
 Release:        2
 License:        Other uncritical OpenSource License
 Group:          System/Shells
@@ -30,7 +30,7 @@ BuildRequires:  yodl
 BuildRequires:  fdupes
 PreReq:         %{install_info_prereq}
 Url:            http://www.zsh.org
-Source0:        %{name}-%{version}.tar.bz2
+Source0:        %{name}-4.3.11-dev-2.tar.bz2
 Source1:        zshrc
 Source2:        zshenv
 Source3:        _yast2
@@ -41,14 +41,12 @@ Source7:        zprofile
 Source8:        _osc
 Source9:        _zypper
 # unused atm. we build the docs with yodl on our own.
-Source20:       %{name}-%{version}-doc.tar.bz2
+Source20:       %{name}-4.3.11-dev-2-doc.tar.bz2
-Patch0:         %{name}-%{version}-doc_makefile.patch
+Patch0:         %{name}-4.3.11-doc_makefile.patch
-Patch1:         %{name}-%{version}-doc_intro_paths.patch
+Patch1:         %{name}-4.3.11-doc_intro_paths.patch
-Patch2:         %{name}-%{version}-run-help_pager.patch
+Patch2:         %{name}-4.3.11-run-help_pager.patch
 Patch3:         zsh-cleanup.patch
-Patch4:         subst-crash.patch
 Summary:        Shell with comprehensive completion
-%define do_profiling 0
 
 %description
 Zsh is a UNIX command interpreter (shell) that resembles the Korn shell
@@ -63,12 +61,11 @@ Authors:
     Paul Falstad
 
 %prep
-%setup -q
+%setup -q -n %{name}-4.3.11-dev-2
 %patch0
 %patch1
 %patch2
 %patch3
-%patch4 -p1
 # Fix bindir path in some files
 perl -p -i -e 's|/usr/local/bin|%{_bindir}|' \
     Functions/Misc/zcalc Functions/Example/cat \
@@ -90,22 +87,9 @@ export CC="gcc" CFLAGS="%{optflags} -pipe -fno-strict-aliasing"
     --enable-zsh-debug \
     --enable-cap \
     --enable-multibyte
-# compiling with profiling data is default.
+
-%if %do_profiling
-# compile with profiling data writing enabled
-make VERSION="%{version}" CFLAGS="$CFLAGS "%cflags_profile_generate \
-     DLCFLAGS="-fPIC -fno-profile-arcs" LDFLAGS="-fprofile-arcs"
-# this is needed to create the profiling data files *.gcda
-make check
-make clean
-# compile with profiling data reading enabled and writing disabled
-make VERSION="%{version}" CFLAGS="$CFLAGS "%cflags_profile_feedback \
-     DLCFLAGS="-fPIC -fno-branch-probabilities" LDFLAGS="-fprofile-arcs"
-make check
-make clean
-%else
 make VERSION="%{version}"
-%endif
+
 # make html documentation
 make -C Doc all zsh.info zsh_toc.html VERSION="%{version}"
 # make help text files
@@ -124,6 +108,9 @@ groff Doc/intro.ms > intro.txt
 # remove some unwanted files in Etc/
 %{__rm} -f Etc/Makefile* Etc/*.yo
 
+%check
+make check
+
 %install
 %makeinstall install.info VERSION="%{version}"
 # install SUSE configuration