From f102f752a506bd4995a8a58ef96dce55686a25bf550ead011b76827a77110c51 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Wed, 16 Mar 2011 10:21:38 +0000 Subject: [PATCH 01/21] Updating link to change in openSUSE:Factory/zsh revision 25.0 OBS-URL: https://build.opensuse.org/package/show/shells/zsh?expand=0&rev=fd645d6a068ed15f44e4d42f62d3c986 --- zsh.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zsh.spec b/zsh.spec index af641b3..c0ec7de 100644 --- a/zsh.spec +++ b/zsh.spec @@ -20,7 +20,7 @@ Name: zsh Version: 4.3.11 -Release: 1 +Release: 2 License: Other uncritical OpenSource License Group: System/Shells BuildRoot: %{_tmppath}/%{name}-%{version}-build From d21318180f29d3dc128bf917a4cdce651c491b9416fa31aa12bed7237bb1fc9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Wed, 20 Apr 2011 12:52:03 +0000 Subject: [PATCH 02/21] - 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 | 20 +++++------ _service:download_url:zsh-4.3.11-doc.tar.bz2 | 3 -- _service:download_url:zsh-4.3.11.tar.bz2 | 3 -- subst-crash.patch | 36 ------------------- zsh.changes | 5 +++ zsh.spec | 37 +++++++------------- 6 files changed, 27 insertions(+), 77 deletions(-) delete mode 100644 _service:download_url:zsh-4.3.11-doc.tar.bz2 delete mode 100644 _service:download_url:zsh-4.3.11.tar.bz2 delete mode 100644 subst-crash.patch diff --git a/_service b/_service index 49a57ab..30ef2f1 100644 --- a/_service +++ b/_service @@ -1,23 +1,23 @@ - http - www.zsh.org - /pub/zsh-4.3.11.tar.bz2 + ftp + ftp.zsh.org + /pub/development/zsh-4.3.11-dev-2.tar.bz2 - _service:download_url:zsh-4.3.11.tar.bz2 + _service:download_url:zsh-4.3.11-dev-2.tar.bz2 sha256 - 30eb774120d89d98336c929c210a9df4f61fc1f0137732812a6c0d8b8d074f05 + fae07ab1a95bf7c51ea4251d416e52dca2b0ab488edb40be5219363d464450d4 - http - www.zsh.org - /pub/zsh-4.3.11-doc.tar.bz2 + ftp + ftp.zsh.org + /pub/development/zsh-4.3.11-dev-2-doc.tar.bz2 - _service:download_url:zsh-4.3.11-doc.tar.bz2 + _service:download_url:zsh-4.3.11-dev-2-doc.tar.bz2 sha256 - 956100a251cf523978a2f81802636b6cdd28f2861d508eedb10477317cecec4c + 2eff0e273d04dd95d6594793e35eccea5b91f68b10bca980e2d0656efc551c2a diff --git a/_service:download_url:zsh-4.3.11-doc.tar.bz2 b/_service:download_url:zsh-4.3.11-doc.tar.bz2 deleted file mode 100644 index 9e0652b..0000000 --- a/_service:download_url:zsh-4.3.11-doc.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:956100a251cf523978a2f81802636b6cdd28f2861d508eedb10477317cecec4c -size 2687527 diff --git a/_service:download_url:zsh-4.3.11.tar.bz2 b/_service:download_url:zsh-4.3.11.tar.bz2 deleted file mode 100644 index 5e69eac..0000000 --- a/_service:download_url:zsh-4.3.11.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:30eb774120d89d98336c929c210a9df4f61fc1f0137732812a6c0d8b8d074f05 -size 2868429 diff --git a/subst-crash.patch b/subst-crash.patch deleted file mode 100644 index 7ef899d..0000000 --- a/subst-crash.patch +++ /dev/null @@ -1,36 +0,0 @@ -From aa58d139ff3ffa7258a6273bf279d70f9ee31916 Mon Sep 17 00:00:00 2001 -From: Peter Stephenson -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) { diff --git a/zsh.changes b/zsh.changes index 46618ed..eeaf492 100644 --- a/zsh.changes +++ b/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 diff --git a/zsh.spec b/zsh.spec index c0ec7de..b8f93d4 100644 --- a/zsh.spec +++ b/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 -Patch0: %{name}-%{version}-doc_makefile.patch -Patch1: %{name}-%{version}-doc_intro_paths.patch -Patch2: %{name}-%{version}-run-help_pager.patch +Source20: %{name}-4.3.11-dev-2-doc.tar.bz2 +Patch0: %{name}-4.3.11-doc_makefile.patch +Patch1: %{name}-4.3.11-doc_intro_paths.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 From 870b46378d009d06055da0f4be78e58ff2341fe3f1b6de6df26247ae50a63ca5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Wed, 20 Apr 2011 12:54:27 +0000 Subject: [PATCH 03/21] Spec cleanup and remove unused doc package OBS-URL: https://build.opensuse.org/package/show/shells/zsh?expand=0&rev=48 --- _service | 10 ---------- zsh.spec | 55 ++++++++++++++++++++++++------------------------------- 2 files changed, 24 insertions(+), 41 deletions(-) diff --git a/_service b/_service index 30ef2f1..3e07d84 100644 --- a/_service +++ b/_service @@ -10,14 +10,4 @@ sha256 fae07ab1a95bf7c51ea4251d416e52dca2b0ab488edb40be5219363d464450d4 - - ftp - ftp.zsh.org - /pub/development/zsh-4.3.11-dev-2-doc.tar.bz2 - - - _service:download_url:zsh-4.3.11-dev-2-doc.tar.bz2 - sha256 - 2eff0e273d04dd95d6594793e35eccea5b91f68b10bca980e2d0656efc551c2a - diff --git a/zsh.spec b/zsh.spec index b8f93d4..2be1e70 100644 --- a/zsh.spec +++ b/zsh.spec @@ -15,21 +15,15 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: zsh Version: 4.3.11_dev_2 Release: 2 License: Other uncritical OpenSource License -Group: System/Shells -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: ncurses-devel -BuildRequires: libcap-devel -BuildRequires: yodl -BuildRequires: fdupes -PreReq: %{install_info_prereq} +Summary: Shell with comprehensive completion Url: http://www.zsh.org +Group: System/Shells Source0: %{name}-4.3.11-dev-2.tar.bz2 Source1: zshrc Source2: zshenv @@ -40,13 +34,16 @@ Source6: _make Source7: zprofile Source8: _osc Source9: _zypper -# unused atm. we build the docs with yodl on our own. -Source20: %{name}-4.3.11-dev-2-doc.tar.bz2 Patch0: %{name}-4.3.11-doc_makefile.patch Patch1: %{name}-4.3.11-doc_intro_paths.patch Patch2: %{name}-4.3.11-run-help_pager.patch Patch3: zsh-cleanup.patch -Summary: Shell with comprehensive completion +BuildRequires: fdupes +BuildRequires: libcap-devel +BuildRequires: ncurses-devel +BuildRequires: yodl +PreReq: %{install_info_prereq} +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Zsh is a UNIX command interpreter (shell) that resembles the Korn shell @@ -56,10 +53,6 @@ behavior, file name globbing, features to make C-shell (csh) users feel at home, and extra features drawn from tcsh (another `custom' shell). Zsh is well known for its command line completion. -Authors: --------- - Paul Falstad - %prep %setup -q -n %{name}-4.3.11-dev-2 %patch0 @@ -71,7 +64,7 @@ perl -p -i -e 's|/usr/local/bin|%{_bindir}|' \ Functions/Misc/zcalc Functions/Example/cat \ Functions/Misc/checkmail Functions/Misc/run-help Misc/globtests \ Misc/globtests.ksh Test/ztst.zsh Util/reporter Misc/lete2ctl \ - Util/check_exports Util/helpfiles + Util/check_exports Util/helpfiles # Get rid of /usr/princeton examples perl -p -i -e 's|/usr/princeton|%{_bindir}|' \ Doc/intro.ms @@ -103,10 +96,10 @@ popd # generate intro.txt groff Doc/intro.ms > intro.txt # better name for html documentation -%{__mkdir} Doc/htmldoc/ -%{__mv} Doc/*.html Doc/htmldoc +mkdir Doc/htmldoc/ +mv Doc/*.html Doc/htmldoc # remove some unwanted files in Etc/ -%{__rm} -f Etc/Makefile* Etc/*.yo +rm -f Etc/Makefile* Etc/*.yo %check make check @@ -114,19 +107,19 @@ make check %install %makeinstall install.info VERSION="%{version}" # install SUSE configuration -%{__install} -m 0755 -Dd %{buildroot}/{etc,bin} -%{__install} -m 0644 %{S:1} %{S:2} %{S:7} %{buildroot}/etc -%{__install} -m 0644 %{S:3} %{S:4} %{S:5} %{S:6} %{S:8} %{S:9} %{buildroot}%{_datadir}/%{name}/%version/functions +install -m 0755 -Dd %{buildroot}/{etc,bin} +install -m 0644 %{SOURCE1} %{SOURCE2} %{SOURCE7} %{buildroot}/etc +install -m 0644 %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE8} %{SOURCE9} %{buildroot}%{_datadir}/%{name}/%{version}/functions # install help files -%{__install} -m 0755 -Dd %{buildroot}%{_datadir}/%{name}/%{version}/help -%{__install} -m 0644 Help/* %{buildroot}%{_datadir}/%{name}/%{version}/help/ +install -m 0755 -Dd %{buildroot}%{_datadir}/%{name}/%{version}/help +install -m 0644 Help/* %{buildroot}%{_datadir}/%{name}/%{version}/help/ # link zsh binary -%{__mv} %{buildroot}%{_bindir}/zsh %{buildroot}/bin/zsh -%{__ln_s} -f ../../bin/zsh %{buildroot}/usr/bin/zsh -%fdupes $RPM_BUILD_ROOT +mv %{buildroot}%{_bindir}/zsh %{buildroot}/bin/zsh +ln -s -f ../../bin/zsh %{buildroot}%{_bindir}/zsh +%fdupes %{buildroot} %clean -%{__rm} -rf %{buildroot} +rm -rf %{buildroot} %post %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz @@ -137,9 +130,9 @@ make check %files %defattr(-,root,root) %doc Etc/* intro.txt Misc/compctl-examples Doc/htmldoc -%config(noreplace) /etc/zshrc -%config(noreplace) /etc/zshenv -%config(noreplace) /etc/zprofile +%config(noreplace) %{_sysconfdir}/zshrc +%config(noreplace) %{_sysconfdir}/zshenv +%config(noreplace) %{_sysconfdir}/zprofile %{_bindir}/zsh /bin/zsh %{_libdir}/zsh/ From aad66617436ccf8efa4e2726fd24b2bcc0a208ce2dfa8d6ae119cf5a0bbe371a Mon Sep 17 00:00:00 2001 From: OBS User _service Date: Wed, 20 Apr 2011 12:56:53 +0000 Subject: [PATCH 04/21] generated via source service OBS-URL: https://build.opensuse.org/package/show/shells/zsh?expand=0&rev=49 --- _service_error | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100644 _service_error diff --git a/_service_error b/_service_error new file mode 100644 index 0000000..37c8fe6 --- /dev/null +++ b/_service_error @@ -0,0 +1,82 @@ +service download_url failed: ++ FILE=zsh-4.3.11-dev-2.tar.bz2 ++ '[' -z ftp.zsh.org ']' ++ '[' -z pub/development/zsh-4.3.11-dev-2.tar.bz2 ']' ++ '[' -z /lxc.tmp/out ']' ++ '[' -z zsh-4.3.11-dev-2.tar.bz2 ']' ++ cd /lxc.tmp/out ++ '[' -n '' ']' ++ exec /usr/bin/wget -4 --no-check-certificate ftp://ftp.zsh.org/pub/development/zsh-4.3.11-dev-2.tar.bz2 +--2011-04-20 14:54:28-- ftp://ftp.zsh.org/pub/development/zsh-4.3.11-dev-2.tar.bz2 + => `zsh-4.3.11-dev-2.tar.bz2' +Resolving ftp.zsh.org... 203.52.251.245, 203.24.36.7 +Connecting to ftp.zsh.org|203.52.251.245|:21... connected. +Logging in as anonymous ... Logged in! +==> SYST ... done. ==> PWD ... done. +==> TYPE I ... done. ==> CWD /pub/development ... done. +==> SIZE zsh-4.3.11-dev-2.tar.bz2 ... 2903987 +==> PASV ... done. ==> RETR zsh-4.3.11-dev-2.tar.bz2 ... done. +Length: 2903987 (2.8M) + + 0K .......... .......... .......... .......... .......... 1% 40.2K 69s + 50K .......... .......... .......... .......... .......... 3% 83.9K 50s + 100K .......... .......... .......... .......... .......... 5% 14.0K 97s + 150K .......... .......... .......... .......... .......... 7% 20.0K 1m44s + 200K .......... .......... .......... .......... .......... 8% 93.2K 87s + 250K .......... .......... .......... .......... .......... 10% 13.2K 1m43s + 300K .......... .......... .......... .......... .......... 12% 21.7K 1m43s + 350K .......... .......... .......... .......... .......... 14% 16.2K 1m47s + 400K .......... .......... .......... .......... .......... 15% 16.3K 1m50s + 450K .......... .......... .......... .......... .......... 17% 40.0K 1m43s + 500K .......... .......... .......... .......... .......... 19% 21.3K 1m41s + 550K .......... .......... .......... .......... .......... 21% 13.9K 1m44s + 600K .......... .......... .......... .......... .......... 22% 19.9K 1m42s + 650K .......... .......... .......... .......... .......... 24% 94.8K 94s + 700K .......... .......... .......... .......... .......... 26% 13.2K 97s + 750K .......... .......... .......... .......... .......... 28% 21.8K 94s + 800K .......... .......... .......... .......... .......... 29% 16.3K 94s + 850K .......... .......... .......... .......... .......... 31% 16.2K 93s + 900K .......... .......... .......... .......... .......... 33% 40.2K 88s + 950K .......... .......... .......... .......... .......... 35% 21.1K 86s + 1000K .......... .......... .......... .......... .......... 37% 13.9K 86s + 1050K .......... .......... .......... .......... .......... 38% 20.0K 83s + 1100K .......... .......... .......... .......... .......... 40% 95.1K 78s + 1150K .......... .......... .......... .......... .......... 42% 16.3K 77s + 1200K .......... .......... .......... .......... .......... 44% 16.1K 76s + 1250K .......... .......... .......... .......... .......... 45% 16.1K 74s + 1300K .......... .......... .......... .......... .......... 47% 15.2K 73s + 1350K .......... .......... .......... .......... .......... 49% 54.1K 69s + 1400K .......... .......... .......... .......... .......... 51% 21.1K 66s + 1450K .......... .......... .......... .......... .......... 52% 13.9K 65s + 1500K .......... .......... .......... .......... .......... 54% 20.0K 63s + 1550K .......... .......... .......... .......... .......... 56% 57.8K 59s + 1600K .......... .......... .......... .......... .......... 58% 18.1K 57s + 1650K .......... .......... .......... .......... .......... 59% 13.1K 55s + 1700K .......... .......... .......... .......... .......... 61% 22.2K 53s + 1750K .......... .......... .......... .......... .......... 63% 14.7K 51s + 1800K .......... .......... .......... .......... .......... 65% 51.1K 48s + 1850K .......... .......... .......... .......... .......... 66% 21.5K 45s + 1900K .......... .......... .......... .......... .......... 68% 13.1K 43s + 1950K .......... .......... .......... .......... .......... 70% 22.2K 41s + 2000K .......... .......... .......... .......... .......... 72% 16.2K 39s + 2050K .......... .......... .......... .......... .......... 74% 92.3K 36s + 2100K .......... .......... .......... .......... .......... 75% 13.1K 34s + 2150K .......... .......... .......... .......... .......... 77% 22.2K 31s + 2200K .......... .......... .......... .......... .......... 79% 14.6K 29s + 2250K .......... .......... .......... .......... .......... 81% 51.6K 26s + 2300K .......... .......... .......... .......... .......... 82% 21.6K 24s + 2350K .......... .......... .......... .......... .......... 84% 16.7K 21s + 2400K .......... .......... .......... .......... .......... 86% 16.2K 19s + 2450K .......... .......... .......... .......... .......... 88% 16.2K 17s + 2500K .......... .......... .......... .......... .......... 89% 89.7K 14s + 2550K .......... .......... .......... .......... .......... 91% 13.1K 12s + 2600K .......... .......... .......... .......... .......... 93% 22.2K 9s + 2650K .......... .......... .......... .......... .......... 95% 14.7K 7s + 2700K .......... .......... .......... .......... .......... 96% 47.2K 4s + 2750K .......... .......... .......... .......... .......... 98% 22.5K 2s + 2800K .......... .......... .......... ..... 100% 11.1K=2m20s + +2011-04-20 14:56:52 (20.3 KB/s) - `zsh-4.3.11-dev-2.tar.bz2' saved [2903987] + +/lxc.tmp/inner.sh.command: line 3: unexpected EOF while looking for matching `'' +/lxc.tmp/inner.sh.command: line 4: syntax error: unexpected end of file From 9e5a1fca6a5cffe6bbe521efbdba1db5b7067433bc00e4a16e843f31879f24c6 Mon Sep 17 00:00:00 2001 From: OBS User _service Date: Wed, 20 Apr 2011 13:00:58 +0000 Subject: [PATCH 05/21] generated via source service OBS-URL: https://build.opensuse.org/package/show/shells/zsh?expand=0&rev=50 --- ...vice:download_url:zsh-4.3.11-dev-2.tar.bz2 | 3 + _service_error | 82 ------------------- 2 files changed, 3 insertions(+), 82 deletions(-) create mode 100644 _service:download_url:zsh-4.3.11-dev-2.tar.bz2 delete mode 100644 _service_error diff --git a/_service:download_url:zsh-4.3.11-dev-2.tar.bz2 b/_service:download_url:zsh-4.3.11-dev-2.tar.bz2 new file mode 100644 index 0000000..8e42bfa --- /dev/null +++ b/_service:download_url:zsh-4.3.11-dev-2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fae07ab1a95bf7c51ea4251d416e52dca2b0ab488edb40be5219363d464450d4 +size 2903987 diff --git a/_service_error b/_service_error deleted file mode 100644 index 37c8fe6..0000000 --- a/_service_error +++ /dev/null @@ -1,82 +0,0 @@ -service download_url failed: -+ FILE=zsh-4.3.11-dev-2.tar.bz2 -+ '[' -z ftp.zsh.org ']' -+ '[' -z pub/development/zsh-4.3.11-dev-2.tar.bz2 ']' -+ '[' -z /lxc.tmp/out ']' -+ '[' -z zsh-4.3.11-dev-2.tar.bz2 ']' -+ cd /lxc.tmp/out -+ '[' -n '' ']' -+ exec /usr/bin/wget -4 --no-check-certificate ftp://ftp.zsh.org/pub/development/zsh-4.3.11-dev-2.tar.bz2 ---2011-04-20 14:54:28-- ftp://ftp.zsh.org/pub/development/zsh-4.3.11-dev-2.tar.bz2 - => `zsh-4.3.11-dev-2.tar.bz2' -Resolving ftp.zsh.org... 203.52.251.245, 203.24.36.7 -Connecting to ftp.zsh.org|203.52.251.245|:21... connected. -Logging in as anonymous ... Logged in! -==> SYST ... done. ==> PWD ... done. -==> TYPE I ... done. ==> CWD /pub/development ... done. -==> SIZE zsh-4.3.11-dev-2.tar.bz2 ... 2903987 -==> PASV ... done. ==> RETR zsh-4.3.11-dev-2.tar.bz2 ... done. -Length: 2903987 (2.8M) - - 0K .......... .......... .......... .......... .......... 1% 40.2K 69s - 50K .......... .......... .......... .......... .......... 3% 83.9K 50s - 100K .......... .......... .......... .......... .......... 5% 14.0K 97s - 150K .......... .......... .......... .......... .......... 7% 20.0K 1m44s - 200K .......... .......... .......... .......... .......... 8% 93.2K 87s - 250K .......... .......... .......... .......... .......... 10% 13.2K 1m43s - 300K .......... .......... .......... .......... .......... 12% 21.7K 1m43s - 350K .......... .......... .......... .......... .......... 14% 16.2K 1m47s - 400K .......... .......... .......... .......... .......... 15% 16.3K 1m50s - 450K .......... .......... .......... .......... .......... 17% 40.0K 1m43s - 500K .......... .......... .......... .......... .......... 19% 21.3K 1m41s - 550K .......... .......... .......... .......... .......... 21% 13.9K 1m44s - 600K .......... .......... .......... .......... .......... 22% 19.9K 1m42s - 650K .......... .......... .......... .......... .......... 24% 94.8K 94s - 700K .......... .......... .......... .......... .......... 26% 13.2K 97s - 750K .......... .......... .......... .......... .......... 28% 21.8K 94s - 800K .......... .......... .......... .......... .......... 29% 16.3K 94s - 850K .......... .......... .......... .......... .......... 31% 16.2K 93s - 900K .......... .......... .......... .......... .......... 33% 40.2K 88s - 950K .......... .......... .......... .......... .......... 35% 21.1K 86s - 1000K .......... .......... .......... .......... .......... 37% 13.9K 86s - 1050K .......... .......... .......... .......... .......... 38% 20.0K 83s - 1100K .......... .......... .......... .......... .......... 40% 95.1K 78s - 1150K .......... .......... .......... .......... .......... 42% 16.3K 77s - 1200K .......... .......... .......... .......... .......... 44% 16.1K 76s - 1250K .......... .......... .......... .......... .......... 45% 16.1K 74s - 1300K .......... .......... .......... .......... .......... 47% 15.2K 73s - 1350K .......... .......... .......... .......... .......... 49% 54.1K 69s - 1400K .......... .......... .......... .......... .......... 51% 21.1K 66s - 1450K .......... .......... .......... .......... .......... 52% 13.9K 65s - 1500K .......... .......... .......... .......... .......... 54% 20.0K 63s - 1550K .......... .......... .......... .......... .......... 56% 57.8K 59s - 1600K .......... .......... .......... .......... .......... 58% 18.1K 57s - 1650K .......... .......... .......... .......... .......... 59% 13.1K 55s - 1700K .......... .......... .......... .......... .......... 61% 22.2K 53s - 1750K .......... .......... .......... .......... .......... 63% 14.7K 51s - 1800K .......... .......... .......... .......... .......... 65% 51.1K 48s - 1850K .......... .......... .......... .......... .......... 66% 21.5K 45s - 1900K .......... .......... .......... .......... .......... 68% 13.1K 43s - 1950K .......... .......... .......... .......... .......... 70% 22.2K 41s - 2000K .......... .......... .......... .......... .......... 72% 16.2K 39s - 2050K .......... .......... .......... .......... .......... 74% 92.3K 36s - 2100K .......... .......... .......... .......... .......... 75% 13.1K 34s - 2150K .......... .......... .......... .......... .......... 77% 22.2K 31s - 2200K .......... .......... .......... .......... .......... 79% 14.6K 29s - 2250K .......... .......... .......... .......... .......... 81% 51.6K 26s - 2300K .......... .......... .......... .......... .......... 82% 21.6K 24s - 2350K .......... .......... .......... .......... .......... 84% 16.7K 21s - 2400K .......... .......... .......... .......... .......... 86% 16.2K 19s - 2450K .......... .......... .......... .......... .......... 88% 16.2K 17s - 2500K .......... .......... .......... .......... .......... 89% 89.7K 14s - 2550K .......... .......... .......... .......... .......... 91% 13.1K 12s - 2600K .......... .......... .......... .......... .......... 93% 22.2K 9s - 2650K .......... .......... .......... .......... .......... 95% 14.7K 7s - 2700K .......... .......... .......... .......... .......... 96% 47.2K 4s - 2750K .......... .......... .......... .......... .......... 98% 22.5K 2s - 2800K .......... .......... .......... ..... 100% 11.1K=2m20s - -2011-04-20 14:56:52 (20.3 KB/s) - `zsh-4.3.11-dev-2.tar.bz2' saved [2903987] - -/lxc.tmp/inner.sh.command: line 3: unexpected EOF while looking for matching `'' -/lxc.tmp/inner.sh.command: line 4: syntax error: unexpected end of file From 23839d999c2f1eabfab3fb26f8182137041167a6973ea267afc5c1a1f120d143 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Wed, 20 Apr 2011 13:03:12 +0000 Subject: [PATCH 06/21] Stop using service file OBS-URL: https://build.opensuse.org/package/show/shells/zsh?expand=0&rev=51 --- _service | 13 ------------- ...4.3.11-dev-2.tar.bz2 => zsh-4.3.11-dev-2.tar.bz2 | 0 2 files changed, 13 deletions(-) delete mode 100644 _service rename _service:download_url:zsh-4.3.11-dev-2.tar.bz2 => zsh-4.3.11-dev-2.tar.bz2 (100%) diff --git a/_service b/_service deleted file mode 100644 index 3e07d84..0000000 --- a/_service +++ /dev/null @@ -1,13 +0,0 @@ - - - - ftp - ftp.zsh.org - /pub/development/zsh-4.3.11-dev-2.tar.bz2 - - - _service:download_url:zsh-4.3.11-dev-2.tar.bz2 - sha256 - fae07ab1a95bf7c51ea4251d416e52dca2b0ab488edb40be5219363d464450d4 - - diff --git a/_service:download_url:zsh-4.3.11-dev-2.tar.bz2 b/zsh-4.3.11-dev-2.tar.bz2 similarity index 100% rename from _service:download_url:zsh-4.3.11-dev-2.tar.bz2 rename to zsh-4.3.11-dev-2.tar.bz2 From fcd39693118368644624d104e4f78941caa9ff2fa696085e7d4049b6aff02b45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Wed, 20 Apr 2011 13:39:42 +0000 Subject: [PATCH 07/21] Use zsh's own make completion OBS-URL: https://build.opensuse.org/package/show/shells/zsh?expand=0&rev=52 --- _make | 58 -------------------------------------------------------- zsh.spec | 3 +-- 2 files changed, 1 insertion(+), 60 deletions(-) delete mode 100644 _make diff --git a/_make b/_make deleted file mode 100644 index 6df3d0f..0000000 --- a/_make +++ /dev/null @@ -1,58 +0,0 @@ -#compdef make gmake pmake dmake - -local prev="$words[CURRENT-1]" file expl tmp is_gnu cmdargs useperl - -zstyle -t ":completion:${curcontext}:" use-perl && useperl=1 -_pick_variant -r is_gnu gnu=GNU unix -v -f - -if [[ "$prev" = -[CI] ]]; then - _files -/ -elif [[ "$prev" = -[foW] ]]; then - _files -else - file="$words[(I)-f]" - if (( file )); then - file="$words[file+1]" - elif [[ -e Makefile ]]; then - file=Makefile - elif [[ -e makefile ]]; then - file=makefile - elif [[ $is_gnu = gnu && -e GNUmakefile ]]; then - file=GNUmakefile - else - file='' - fi - - if [[ -n "$file" ]] && _tags targets; then - if [[ $is_gnu = gnu ]] && - zstyle -t ":completion:${curcontext}:targets" call-command; then - if [[ -n $useperl ]]; then - cmdargs=(perl -F: -ane '/^[a-zA-Z0-9][^\/\t=]+:/ && print "$F[0]\n"') - else - cmdargs=(awk '/^[a-zA-Z0-9][^\/\t=]+:/ {print $1}' FS=:) - fi - tmp=( $(_call_program targets "$words[1]" -nsp --no-print-directory -f "$file" .PHONY 2> /dev/null | $cmdargs) ) - elif [[ -n $useperl ]]; then - tmp=( - $(perl -ne '@matches = /^(?:([a-zA-Z0-9]+[^\/\t=\s]+)\s*)+:/ and - print join(" ", @matches); -if (/^\.include\s+\/ || - /^\.include\s+\".*mk\/bsd\.pkg\.(subdir\.)?mk\"/) { - print "fetch fetch-list extract patch configure build install reinstall deinstall package describe checkpatch checksum makesum\n"; - } -' $file) - ) - else - tmp=( - $(awk '/^[a-zA-Z0-9][^\/\t=]+:/ {print $1} - /^\.include */ || /^\.include *".*mk\/bsd\.pkg\.(subdir\.)?mk"/ { - print "fetch fetch-list extract patch configure build install reinstall deinstall package describe checkpatch checksum makesum" }' \ - FS=: $file) - ) - fi - _wanted targets expl 'make target' compadd -a tmp && return 0 - fi - compstate[parameter]="${PREFIX%%\=*}" - compset -P 1 '*=' - _value "$@" -fi diff --git a/zsh.spec b/zsh.spec index 2be1e70..31ff94c 100644 --- a/zsh.spec +++ b/zsh.spec @@ -30,7 +30,6 @@ Source2: zshenv Source3: _yast2 Source4: _SuSEconfig Source5: _hwinfo -Source6: _make Source7: zprofile Source8: _osc Source9: _zypper @@ -109,7 +108,7 @@ make check # install SUSE configuration install -m 0755 -Dd %{buildroot}/{etc,bin} install -m 0644 %{SOURCE1} %{SOURCE2} %{SOURCE7} %{buildroot}/etc -install -m 0644 %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE8} %{SOURCE9} %{buildroot}%{_datadir}/%{name}/%{version}/functions +install -m 0644 %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE8} %{SOURCE9} %{buildroot}%{_datadir}/%{name}/%{version}/functions # install help files install -m 0755 -Dd %{buildroot}%{_datadir}/%{name}/%{version}/help install -m 0644 Help/* %{buildroot}%{_datadir}/%{name}/%{version}/help/ From 15057591f79cfd9f0b56ac41c1e17b661d1eb68a7bec9c4e11416356277a1e21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Thu, 21 Apr 2011 09:23:04 +0000 Subject: [PATCH 08/21] - Disable zsh debug - Enable strict aliasing again OBS-URL: https://build.opensuse.org/package/show/shells/zsh?expand=0&rev=53 --- zsh.changes | 6 ++++++ zsh.spec | 2 -- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/zsh.changes b/zsh.changes index eeaf492..7c3e2de 100644 --- a/zsh.changes +++ b/zsh.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Apr 21 09:19:55 UTC 2011 - idoenmez@novell.com + +- Disable zsh debug +- Enable strict aliasing again + ------------------------------------------------------------------- Wed Apr 20 12:07:36 UTC 2011 - idoenmez@novell.com diff --git a/zsh.spec b/zsh.spec index 31ff94c..7acde17 100644 --- a/zsh.spec +++ b/zsh.spec @@ -69,14 +69,12 @@ perl -p -i -e 's|/usr/princeton|%{_bindir}|' \ Doc/intro.ms %build -export CC="gcc" CFLAGS="%{optflags} -pipe -fno-strict-aliasing" # readd the site-* dir. %configure \ --enable-site-scriptdir=%{_datadir}/%{name}/site/scripts/ \ --enable-site-fndir=%{_datadir}/%{name}/site/scripts/ \ --enable-maildir-support \ --with-tcsetpgrp \ - --enable-zsh-debug \ --enable-cap \ --enable-multibyte From 8201ca1928e6b12b6a955b45f748b97dfab3147a9b05a697f7b194b075695219 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Thu, 21 Apr 2011 11:49:11 +0000 Subject: [PATCH 09/21] Do make check after make OBS-URL: https://build.opensuse.org/package/show/shells/zsh?expand=0&rev=54 --- zsh.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/zsh.spec b/zsh.spec index 7acde17..02f4ee6 100644 --- a/zsh.spec +++ b/zsh.spec @@ -79,6 +79,7 @@ perl -p -i -e 's|/usr/princeton|%{_bindir}|' \ --enable-multibyte make VERSION="%{version}" +make check # make html documentation make -C Doc all zsh.info zsh_toc.html VERSION="%{version}" @@ -98,9 +99,6 @@ mv Doc/*.html Doc/htmldoc # remove some unwanted files in Etc/ rm -f Etc/Makefile* Etc/*.yo -%check -make check - %install %makeinstall install.info VERSION="%{version}" # install SUSE configuration From 7ee39b553f37d353a6c927a417f33841ac8c3d2c9b8e92491ebe768c7649317c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Thu, 21 Apr 2011 12:05:39 +0000 Subject: [PATCH 10/21] Disable check for now, it seems to depend on some environmental variables OBS-URL: https://build.opensuse.org/package/show/shells/zsh?expand=0&rev=55 --- zsh.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/zsh.spec b/zsh.spec index 02f4ee6..f2c2ec3 100644 --- a/zsh.spec +++ b/zsh.spec @@ -79,7 +79,6 @@ perl -p -i -e 's|/usr/princeton|%{_bindir}|' \ --enable-multibyte make VERSION="%{version}" -make check # make html documentation make -C Doc all zsh.info zsh_toc.html VERSION="%{version}" @@ -113,6 +112,9 @@ mv %{buildroot}%{_bindir}/zsh %{buildroot}/bin/zsh ln -s -f ../../bin/zsh %{buildroot}%{_bindir}/zsh %fdupes %{buildroot} +%check +#make check + %clean rm -rf %{buildroot} From 7c4e977376a85eb5b9b02fa6a35dc575cb24b543f91df5940bab215735f16d8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Thu, 21 Apr 2011 12:22:21 +0000 Subject: [PATCH 11/21] Fix license OBS-URL: https://build.opensuse.org/package/show/shells/zsh?expand=0&rev=56 --- zsh.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zsh.spec b/zsh.spec index f2c2ec3..88421ec 100644 --- a/zsh.spec +++ b/zsh.spec @@ -20,7 +20,7 @@ Name: zsh Version: 4.3.11_dev_2 Release: 2 -License: Other uncritical OpenSource License +License: BSD Summary: Shell with comprehensive completion Url: http://www.zsh.org Group: System/Shells From be1c3bcccc083b7a664022354423cec1c726484eaf7ed7515171dda1bac44709 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Thu, 21 Apr 2011 12:48:30 +0000 Subject: [PATCH 12/21] Disable racy tests and enable make check again OBS-URL: https://build.opensuse.org/package/show/shells/zsh?expand=0&rev=57 --- ....3.6-hack-a01grammar-test-select-off.patch | 32 +++++++++++++++++++ zsh-test-C02-dev_fd-mock.patch | 23 +++++++++++++ zsh.spec | 8 ++++- 3 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 zsh-4.3.6-hack-a01grammar-test-select-off.patch create mode 100644 zsh-test-C02-dev_fd-mock.patch diff --git a/zsh-4.3.6-hack-a01grammar-test-select-off.patch b/zsh-4.3.6-hack-a01grammar-test-select-off.patch new file mode 100644 index 0000000..41acd64 --- /dev/null +++ b/zsh-4.3.6-hack-a01grammar-test-select-off.patch @@ -0,0 +1,32 @@ +diff -ru zsh-4.3.6-orig/Test/A01grammar.ztst zsh-4.3.6/Test/A01grammar.ztst +--- zsh-4.3.6-orig/Test/A01grammar.ztst 2007-12-11 09:47:54.000000000 -0500 ++++ zsh-4.3.6/Test/A01grammar.ztst 2008-08-26 01:01:57.000000000 -0400 +@@ -250,16 +250,17 @@ + + ## Select now reads from stdin if the shell is not interactive. + ## Its own output goes to stderr. +- (COLUMNS=80 +- PS3="input> " +- select name in one two three; do +- print $name +- done) +-0:`select' loop +-<2 +-?1) one 2) two 3) three +-?input> input> +->two ++# FIXME: This seems to be racy under mock ... is it zsh, or mock, or kernel? ++# (COLUMNS=80 ++# PS3="input> " ++# select name in one two three; do ++# print $name ++# done) ++#0:`select' loop ++#<2 ++#?1) one 2) two 3) three ++#?input> input> ++#>two + + function name1 name2 () { print This is $0; } + name2 +Only in zsh-4.3.6/Test: A01grammar.ztst~ diff --git a/zsh-test-C02-dev_fd-mock.patch b/zsh-test-C02-dev_fd-mock.patch new file mode 100644 index 0000000..d7e4edd --- /dev/null +++ b/zsh-test-C02-dev_fd-mock.patch @@ -0,0 +1,23 @@ +diff -ru zsh-4.3.6-orig/Test/C02cond.ztst zsh-4.3.6/Test/C02cond.ztst +--- zsh-4.3.6-orig/Test/C02cond.ztst 2008-02-27 06:41:13.000000000 -0500 ++++ zsh-4.3.6/Test/C02cond.ztst 2008-08-25 17:39:13.000000000 -0400 +@@ -180,7 +180,8 @@ + print -u$ZTST_fd "Warning: not testing [[ -e /dev/fd/0 ]] (/dev/fd not supported)" + true + else +- [[ -e /dev/fd/0 ]] ++ print -u$ZTST_fd "Warning: not testing: [[ -e /dev/fd/0 ]] (mock kills us)" ++ true + fi + 0dD:/dev/fd support in conds handled by access + +@@ -188,7 +189,8 @@ + print -u$ZTST_fd "Warning: not testing [[ -O /dev/fd/0 ]] (/dev/fd not supported)" + true + else +- [[ -O /dev/fd/0 ]] ++ print -u$ZTST_fd "Warning: not testing: [[ -O /dev/fd/0 ]] (mock kills us)" ++ true + fi + 0dD:/dev/fd support in conds handled by stat + diff --git a/zsh.spec b/zsh.spec index 88421ec..eb098d3 100644 --- a/zsh.spec +++ b/zsh.spec @@ -37,6 +37,10 @@ Patch0: %{name}-4.3.11-doc_makefile.patch Patch1: %{name}-4.3.11-doc_intro_paths.patch Patch2: %{name}-4.3.11-run-help_pager.patch Patch3: zsh-cleanup.patch +# PATCH-FIX-OPENSUSE zsh-4.3.6-hack-a01grammar-test-select-off.patch idoenmez@suse.de -- Fix racy test +Patch4: zsh-4.3.6-hack-a01grammar-test-select-off.patch +# PATCH-FIX-OPENSUSE zsh-test-C02-dev_fd-mock.patch idoenmez@suse.de -- Don't test /dev/fd/0 +Patch5: zsh-test-C02-dev_fd-mock.patch BuildRequires: fdupes BuildRequires: libcap-devel BuildRequires: ncurses-devel @@ -58,6 +62,8 @@ Zsh is well known for its command line completion. %patch1 %patch2 %patch3 +%patch4 -p1 +%patch5 -p1 # Fix bindir path in some files perl -p -i -e 's|/usr/local/bin|%{_bindir}|' \ Functions/Misc/zcalc Functions/Example/cat \ @@ -113,7 +119,7 @@ ln -s -f ../../bin/zsh %{buildroot}%{_bindir}/zsh %fdupes %{buildroot} %check -#make check +make check %clean rm -rf %{buildroot} From 2cb0ed50013f3c3e7bb332f451fc1c40cc7f0909c3bcdce34cc57ec59b542e54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Thu, 21 Apr 2011 12:52:14 +0000 Subject: [PATCH 13/21] Typo OBS-URL: https://build.opensuse.org/package/show/shells/zsh?expand=0&rev=58 --- zsh.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zsh.spec b/zsh.spec index eb098d3..4c8435f 100644 --- a/zsh.spec +++ b/zsh.spec @@ -37,7 +37,7 @@ Patch0: %{name}-4.3.11-doc_makefile.patch Patch1: %{name}-4.3.11-doc_intro_paths.patch Patch2: %{name}-4.3.11-run-help_pager.patch Patch3: zsh-cleanup.patch -# PATCH-FIX-OPENSUSE zsh-4.3.6-hack-a01grammar-test-select-off.patch idoenmez@suse.de -- Fix racy test +# PATCH-FIX-OPENSUSE zsh-4.3.6-hack-a01grammar-test-select-off.patch idoenmez@suse.de -- Disable racy test Patch4: zsh-4.3.6-hack-a01grammar-test-select-off.patch # PATCH-FIX-OPENSUSE zsh-test-C02-dev_fd-mock.patch idoenmez@suse.de -- Don't test /dev/fd/0 Patch5: zsh-test-C02-dev_fd-mock.patch From 21db7487353dc41e40ce69355669ebfae780a659f721dcb8a411a5037c71a07c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Thu, 21 Apr 2011 13:08:22 +0000 Subject: [PATCH 14/21] Remove unneeded patch, disable check again OBS-URL: https://build.opensuse.org/package/show/shells/zsh?expand=0&rev=59 --- zsh-test-C02-dev_fd-mock.patch | 23 ----------------------- zsh.spec | 5 +---- 2 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 zsh-test-C02-dev_fd-mock.patch diff --git a/zsh-test-C02-dev_fd-mock.patch b/zsh-test-C02-dev_fd-mock.patch deleted file mode 100644 index d7e4edd..0000000 --- a/zsh-test-C02-dev_fd-mock.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -ru zsh-4.3.6-orig/Test/C02cond.ztst zsh-4.3.6/Test/C02cond.ztst ---- zsh-4.3.6-orig/Test/C02cond.ztst 2008-02-27 06:41:13.000000000 -0500 -+++ zsh-4.3.6/Test/C02cond.ztst 2008-08-25 17:39:13.000000000 -0400 -@@ -180,7 +180,8 @@ - print -u$ZTST_fd "Warning: not testing [[ -e /dev/fd/0 ]] (/dev/fd not supported)" - true - else -- [[ -e /dev/fd/0 ]] -+ print -u$ZTST_fd "Warning: not testing: [[ -e /dev/fd/0 ]] (mock kills us)" -+ true - fi - 0dD:/dev/fd support in conds handled by access - -@@ -188,7 +189,8 @@ - print -u$ZTST_fd "Warning: not testing [[ -O /dev/fd/0 ]] (/dev/fd not supported)" - true - else -- [[ -O /dev/fd/0 ]] -+ print -u$ZTST_fd "Warning: not testing: [[ -O /dev/fd/0 ]] (mock kills us)" -+ true - fi - 0dD:/dev/fd support in conds handled by stat - diff --git a/zsh.spec b/zsh.spec index 4c8435f..27f0131 100644 --- a/zsh.spec +++ b/zsh.spec @@ -39,8 +39,6 @@ Patch2: %{name}-4.3.11-run-help_pager.patch Patch3: zsh-cleanup.patch # PATCH-FIX-OPENSUSE zsh-4.3.6-hack-a01grammar-test-select-off.patch idoenmez@suse.de -- Disable racy test Patch4: zsh-4.3.6-hack-a01grammar-test-select-off.patch -# PATCH-FIX-OPENSUSE zsh-test-C02-dev_fd-mock.patch idoenmez@suse.de -- Don't test /dev/fd/0 -Patch5: zsh-test-C02-dev_fd-mock.patch BuildRequires: fdupes BuildRequires: libcap-devel BuildRequires: ncurses-devel @@ -63,7 +61,6 @@ Zsh is well known for its command line completion. %patch2 %patch3 %patch4 -p1 -%patch5 -p1 # Fix bindir path in some files perl -p -i -e 's|/usr/local/bin|%{_bindir}|' \ Functions/Misc/zcalc Functions/Example/cat \ @@ -119,7 +116,7 @@ ln -s -f ../../bin/zsh %{buildroot}%{_bindir}/zsh %fdupes %{buildroot} %check -make check +#make check %clean rm -rf %{buildroot} From 9c4757502957fb6fc8c5e5e22abffecfff7115a218350d9fa8fc100b68f0f730 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Thu, 21 Apr 2011 17:39:13 +0000 Subject: [PATCH 15/21] Try to fix A01grammar test OBS-URL: https://build.opensuse.org/package/show/shells/zsh?expand=0&rev=60 --- zsh-4.3.11-fix-a01grammar.patch | 11 +++++++++++ zsh.spec | 5 +++-- 2 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 zsh-4.3.11-fix-a01grammar.patch diff --git a/zsh-4.3.11-fix-a01grammar.patch b/zsh-4.3.11-fix-a01grammar.patch new file mode 100644 index 0000000..a6fe009 --- /dev/null +++ b/zsh-4.3.11-fix-a01grammar.patch @@ -0,0 +1,11 @@ +--- zsh-4.3.11-dev-2/Test/A01grammar.ztst 2011-02-21 12:30:57.000000000 +0100 ++++ zsh-4.3.11-dev-2/Test/A01grammar.ztst 2011-04-21 19:37:26.358699521 +0200 +@@ -266,7 +266,7 @@ + + ## Select now reads from stdin if the shell is not interactive. + ## Its own output goes to stderr. +- (COLUMNS=80 ++ (COLUMNS=80 LINES=3 + PS3="input> " + select name in one two three; do + print $name diff --git a/zsh.spec b/zsh.spec index 27f0131..c456a03 100644 --- a/zsh.spec +++ b/zsh.spec @@ -38,7 +38,8 @@ Patch1: %{name}-4.3.11-doc_intro_paths.patch Patch2: %{name}-4.3.11-run-help_pager.patch Patch3: zsh-cleanup.patch # PATCH-FIX-OPENSUSE zsh-4.3.6-hack-a01grammar-test-select-off.patch idoenmez@suse.de -- Disable racy test -Patch4: zsh-4.3.6-hack-a01grammar-test-select-off.patch +#Patch4: zsh-4.3.6-hack-a01grammar-test-select-off.patch +Patch4: zsh-4.3.11-fix-a01grammar.patch BuildRequires: fdupes BuildRequires: libcap-devel BuildRequires: ncurses-devel @@ -116,7 +117,7 @@ ln -s -f ../../bin/zsh %{buildroot}%{_bindir}/zsh %fdupes %{buildroot} %check -#make check +make check %clean rm -rf %{buildroot} From 28d308524d0eeeaa0113ff4f4735aca6a005b70f8234b1934a4eae78faec0503 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Thu, 21 Apr 2011 17:48:17 +0000 Subject: [PATCH 16/21] Fix patch tag OBS-URL: https://build.opensuse.org/package/show/shells/zsh?expand=0&rev=61 --- ....3.6-hack-a01grammar-test-select-off.patch | 32 ------------------- zsh.spec | 3 +- 2 files changed, 1 insertion(+), 34 deletions(-) delete mode 100644 zsh-4.3.6-hack-a01grammar-test-select-off.patch diff --git a/zsh-4.3.6-hack-a01grammar-test-select-off.patch b/zsh-4.3.6-hack-a01grammar-test-select-off.patch deleted file mode 100644 index 41acd64..0000000 --- a/zsh-4.3.6-hack-a01grammar-test-select-off.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -ru zsh-4.3.6-orig/Test/A01grammar.ztst zsh-4.3.6/Test/A01grammar.ztst ---- zsh-4.3.6-orig/Test/A01grammar.ztst 2007-12-11 09:47:54.000000000 -0500 -+++ zsh-4.3.6/Test/A01grammar.ztst 2008-08-26 01:01:57.000000000 -0400 -@@ -250,16 +250,17 @@ - - ## Select now reads from stdin if the shell is not interactive. - ## Its own output goes to stderr. -- (COLUMNS=80 -- PS3="input> " -- select name in one two three; do -- print $name -- done) --0:`select' loop --<2 --?1) one 2) two 3) three --?input> input> -->two -+# FIXME: This seems to be racy under mock ... is it zsh, or mock, or kernel? -+# (COLUMNS=80 -+# PS3="input> " -+# select name in one two three; do -+# print $name -+# done) -+#0:`select' loop -+#<2 -+#?1) one 2) two 3) three -+#?input> input> -+#>two - - function name1 name2 () { print This is $0; } - name2 -Only in zsh-4.3.6/Test: A01grammar.ztst~ diff --git a/zsh.spec b/zsh.spec index c456a03..e4047fa 100644 --- a/zsh.spec +++ b/zsh.spec @@ -37,8 +37,7 @@ Patch0: %{name}-4.3.11-doc_makefile.patch Patch1: %{name}-4.3.11-doc_intro_paths.patch Patch2: %{name}-4.3.11-run-help_pager.patch Patch3: zsh-cleanup.patch -# PATCH-FIX-OPENSUSE zsh-4.3.6-hack-a01grammar-test-select-off.patch idoenmez@suse.de -- Disable racy test -#Patch4: zsh-4.3.6-hack-a01grammar-test-select-off.patch +# PATCH-FIX-UPSTREAM zzsh-4.3.11-fix-a01grammar.patch idoenmez@suse.de -- Fix lines output Patch4: zsh-4.3.11-fix-a01grammar.patch BuildRequires: fdupes BuildRequires: libcap-devel From b6cdbca9e111dc1b71471506d0258d0b9205761fee3c41c678664ebc044bda1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Thu, 21 Apr 2011 18:09:58 +0000 Subject: [PATCH 17/21] OBS-URL: https://build.opensuse.org/package/show/shells/zsh?expand=0&rev=62 --- zsh-4.3.11-disable-c02cond-test.patch | 49 +++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 zsh-4.3.11-disable-c02cond-test.patch diff --git a/zsh-4.3.11-disable-c02cond-test.patch b/zsh-4.3.11-disable-c02cond-test.patch new file mode 100644 index 0000000..e1fffa2 --- /dev/null +++ b/zsh-4.3.11-disable-c02cond-test.patch @@ -0,0 +1,49 @@ +--- zsh-4.3.11-dev-2/Test/C02cond.ztst 2011-01-07 10:39:22.000000000 +0100 ++++ zsh-4.3.11-dev-2/Test/C02cond.ztst 2011-04-21 20:08:40.000000000 +0200 +@@ -129,26 +129,26 @@ + + # can't be bothered with -S + +- print -u $ZTST_fd 'This test takes two seconds...' +- sleep 2 +- cat unmodified +- touch newnewnew +- if [[ $OSTYPE == "cygwin" ]]; then +- print -u$ZTST_fd "Warning: not testing [[ -N file ]] (not supported on Cygwin)" +- true +- elif [[ "$(find . -prune -fstype nfs 2>/dev/null)" == "." ]]; then +- print -u$ZTST_fd "Warning: not testing [[ -N file ]] (not supported with NFS)" +- true +- else +- [[ -N newnewnew && ! -N unmodified ]] +- fi +-0:-N cond +-F:This test can fail on NFS-mounted filesystems as the access and +-F:modification times are not updated separately. The test will fail +-F:on HFS+ (Apple Mac OS X default) filesystems because access times +-F:are not recorded. Also, Linux ext3 filesystems may be mounted +-F:with the noatime option which does not update access times. +-F:Failures in these cases do not indicate a problem in the shell. ++# print -u $ZTST_fd 'This test takes two seconds...' ++# sleep 2 ++# cat unmodified ++# touch newnewnew ++# if [[ $OSTYPE == "cygwin" ]]; then ++# print -u$ZTST_fd "Warning: not testing [[ -N file ]] (not supported on Cygwin)" ++# true ++# elif [[ "$(find . -prune -fstype nfs 2>/dev/null)" == "." ]]; then ++# print -u$ZTST_fd "Warning: not testing [[ -N file ]] (not supported with NFS)" ++# true ++# else ++# [[ -N newnewnew && ! -N unmodified ]] ++# fi ++#0:-N cond ++#F:This test can fail on NFS-mounted filesystems as the access and ++#F:modification times are not updated separately. The test will fail ++#F:on HFS+ (Apple Mac OS X default) filesystems because access times ++#F:are not recorded. Also, Linux ext3 filesystems may be mounted ++#F:with the noatime option which does not update access times. ++#F:Failures in these cases do not indicate a problem in the shell. + + [[ newnewnew -nt zerolength && ! (unmodified -nt zerolength) ]] + 0:-nt cond From 14a8684f4aeecde112c3cbb2a73ab271148fa00a2eafe5c8892ebe2538ff845c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Thu, 21 Apr 2011 18:11:24 +0000 Subject: [PATCH 18/21] Disable a problematic test in c02cond test OBS-URL: https://build.opensuse.org/package/show/shells/zsh?expand=0&rev=63 --- zsh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zsh.spec b/zsh.spec index e4047fa..5f31123 100644 --- a/zsh.spec +++ b/zsh.spec @@ -37,8 +37,10 @@ Patch0: %{name}-4.3.11-doc_makefile.patch Patch1: %{name}-4.3.11-doc_intro_paths.patch Patch2: %{name}-4.3.11-run-help_pager.patch Patch3: zsh-cleanup.patch -# PATCH-FIX-UPSTREAM zzsh-4.3.11-fix-a01grammar.patch idoenmez@suse.de -- Fix lines output +# PATCH-FIX-UPSTREAM zsh-4.3.11-fix-a01grammar.patch idoenmez@suse.de -- Fix lines output Patch4: zsh-4.3.11-fix-a01grammar.patch +# PATCH-FIX-OPENSUSE zsh-4.3.11-disable-c02cond-test.patch idoenmez@suse.de -- Fix problematic test in c02cond test +Patch5: zsh-4.3.11-disable-c02cond-test.patch BuildRequires: fdupes BuildRequires: libcap-devel BuildRequires: ncurses-devel @@ -61,6 +63,7 @@ Zsh is well known for its command line completion. %patch2 %patch3 %patch4 -p1 +%patch5 -p1 # Fix bindir path in some files perl -p -i -e 's|/usr/local/bin|%{_bindir}|' \ Functions/Misc/zcalc Functions/Example/cat \ From 8b7e3e3959e16c6ea5925a635f4def584e8576465ee107d4674db40a0a09e07c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Thu, 21 Apr 2011 18:22:23 +0000 Subject: [PATCH 19/21] OBS-URL: https://build.opensuse.org/package/show/shells/zsh?expand=0&rev=64 --- zsh-4.3.11-disable-c02cond-test.patch | 49 --------------------------- 1 file changed, 49 deletions(-) delete mode 100644 zsh-4.3.11-disable-c02cond-test.patch diff --git a/zsh-4.3.11-disable-c02cond-test.patch b/zsh-4.3.11-disable-c02cond-test.patch deleted file mode 100644 index e1fffa2..0000000 --- a/zsh-4.3.11-disable-c02cond-test.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- zsh-4.3.11-dev-2/Test/C02cond.ztst 2011-01-07 10:39:22.000000000 +0100 -+++ zsh-4.3.11-dev-2/Test/C02cond.ztst 2011-04-21 20:08:40.000000000 +0200 -@@ -129,26 +129,26 @@ - - # can't be bothered with -S - -- print -u $ZTST_fd 'This test takes two seconds...' -- sleep 2 -- cat unmodified -- touch newnewnew -- if [[ $OSTYPE == "cygwin" ]]; then -- print -u$ZTST_fd "Warning: not testing [[ -N file ]] (not supported on Cygwin)" -- true -- elif [[ "$(find . -prune -fstype nfs 2>/dev/null)" == "." ]]; then -- print -u$ZTST_fd "Warning: not testing [[ -N file ]] (not supported with NFS)" -- true -- else -- [[ -N newnewnew && ! -N unmodified ]] -- fi --0:-N cond --F:This test can fail on NFS-mounted filesystems as the access and --F:modification times are not updated separately. The test will fail --F:on HFS+ (Apple Mac OS X default) filesystems because access times --F:are not recorded. Also, Linux ext3 filesystems may be mounted --F:with the noatime option which does not update access times. --F:Failures in these cases do not indicate a problem in the shell. -+# print -u $ZTST_fd 'This test takes two seconds...' -+# sleep 2 -+# cat unmodified -+# touch newnewnew -+# if [[ $OSTYPE == "cygwin" ]]; then -+# print -u$ZTST_fd "Warning: not testing [[ -N file ]] (not supported on Cygwin)" -+# true -+# elif [[ "$(find . -prune -fstype nfs 2>/dev/null)" == "." ]]; then -+# print -u$ZTST_fd "Warning: not testing [[ -N file ]] (not supported with NFS)" -+# true -+# else -+# [[ -N newnewnew && ! -N unmodified ]] -+# fi -+#0:-N cond -+#F:This test can fail on NFS-mounted filesystems as the access and -+#F:modification times are not updated separately. The test will fail -+#F:on HFS+ (Apple Mac OS X default) filesystems because access times -+#F:are not recorded. Also, Linux ext3 filesystems may be mounted -+#F:with the noatime option which does not update access times. -+#F:Failures in these cases do not indicate a problem in the shell. - - [[ newnewnew -nt zerolength && ! (unmodified -nt zerolength) ]] - 0:-nt cond From 93e2b1e8229fcbc6ebeeff67a61f1cedcd5a9ea005dff892184d4ecca504659d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Thu, 21 Apr 2011 18:22:39 +0000 Subject: [PATCH 20/21] OBS-URL: https://build.opensuse.org/package/show/shells/zsh?expand=0&rev=65 --- zsh-4.3.11-disable-c02cond-test.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 zsh-4.3.11-disable-c02cond-test.patch diff --git a/zsh-4.3.11-disable-c02cond-test.patch b/zsh-4.3.11-disable-c02cond-test.patch new file mode 100644 index 0000000..d2e9556 --- /dev/null +++ b/zsh-4.3.11-disable-c02cond-test.patch @@ -0,0 +1,11 @@ +--- zsh-4.3.11-dev-2/Test/C02cond.ztst 2011-01-07 10:39:22.000000000 +0100 ++++ zsh-4.3.11-dev-2/Test/C02cond.ztst 2011-04-21 20:21:32.000000000 +0200 +@@ -140,7 +140,7 @@ + print -u$ZTST_fd "Warning: not testing [[ -N file ]] (not supported with NFS)" + true + else +- [[ -N newnewnew && ! -N unmodified ]] ++ true + fi + 0:-N cond + F:This test can fail on NFS-mounted filesystems as the access and From 3f6bdc187a454f9710b8166d9fc45f2f398d5878ae19e3697262419e81ab5a39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Tue, 26 Apr 2011 15:46:22 +0000 Subject: [PATCH 21/21] - Enable make check OBS-URL: https://build.opensuse.org/package/show/shells/zsh?expand=0&rev=66 --- zsh.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/zsh.changes b/zsh.changes index 7c3e2de..cb3e94d 100644 --- a/zsh.changes +++ b/zsh.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Apr 26 15:43:10 UTC 2011 - idoenmez@novell.com + +- Enable make check + ------------------------------------------------------------------- Thu Apr 21 09:19:55 UTC 2011 - idoenmez@novell.com