Request 1348 - SailfishOS Open Build Service

Overview

Request 1348 (accepted)

No description set

Created by takimata over 2 years ago
In state accepted
1 package maintainer (show who)

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Submit zsh

Submit package home:takimata / zsh (revision 8) to package sailfishos:chum:testing / zsh

[-] [+]	Added	_service:tar_git:zsh.changes
@@ -0,0 +1,3 @@ +* Wed Aug 18 2021 takimata <takimata@gmx.de> - 5.8-1 +- Initial packaging for Chum +
[-] [+]	Changed	_service:tar_git:zsh.spec ^
@@ -1,14 +1,13 @@ Name: zsh Summary: The Z shell # define own version because sometimes OBS fiddles with %%{version} -%define upstream_version 5.9 -Version: 5.9+master.20220522204759.7.gca64199 +%define upstream_version 5.8 +Version: 5.8 Release: 1 Group: Applications/System License: MIT -URL: https://zsh.sourceforge.io/ +URL: https://git.code.sf.net/p/zsh/code Source0: %{name}-%{version}.tar.bz2 -Patch0: 001-disable-failing-tests.patch BuildRequires: pkgconfig(ncursesw) BuildRequires: pkgconfig(libpcre) @@ -25,46 +24,32 @@ Provides: /bin/zsh -%define source_date_epoch_from_changelog 1 -%define clamp_mtime_to_source_date_epoch 1 -%define use_source_date_epoch_as_buildtime 1 -%define _buildhost SailfishSDK - %description Zsh is a UNIX command interpreter (shell) usable as an interactive login shell and as a shell script command processor. Of the standard shells, zsh most closely resembles the Korn shell (ksh), but includes many enhancements. Among -these features are command line editing, built-in spelling correction, -programmable command completion, shell functions (with autoloading), and a +these features are command line editing, built-in spelling correction, +programmable command completion, shell functions (with autoloading), and a history mechanism. -%if "%{?vendor}" == "chum" -PackageName: Z Shell -Type: console-application -Custom: - Repo: https://github.com/sailfishos-chum/zsh-packaging -Url: - Homepage: https://zsh.sourceforge.io -Categories: - - System - - Utility -PackagerName: takimata -Icon: https://github.com/Zsh-art/logo/raw/main/png/color_vertical_icon.png -%endif +%define source_date_epoch_from_changelog 1 +%define clamp_mtime_to_source_date_epoch 1 +%define use_source_date_epoch_as_buildtime 1 +%define _buildhost SailfishSDK %prep -%autosetup -p1 -n %{name}-%{version}/zsh +%autosetup -n %{name}-%{version}/zsh %build ./Util/preconfig -export CPPFLAGS="$CPPFLAGS -O -D_FORTIFY_SOURCE=2" +export CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2" export CFLAGS="$CFLAGS -fPIE -fstack-protector-strong -fstack-clash-protection" export LIBLDFLAGS="-z lazy" export EXELDFLAGS="-pie" %configure \ --with-tcsetpgrp \ --enable-pcre \ - --enable-site-fndir=%{_datadir}/zsh/site-functions \ + --enable-site-fndir=/usr/local/share/zsh/site-functions \ --enable-ldflags="-g -Wl,-z,relro,-z,now -Wl,--as-needed" # TODO doc fails to build because of missing dependency groff @@ -72,7 +57,12 @@ %check # Run the testsuite + +# fails on aarch64 but not on x86 due to different build env(?) +# TODO investigate, test is expected to fail, but passes +mv Test/D02glob.ztst Test/disable_D02glob_ztst make check +mv Test/disable_D02glob_ztst Test/D02glob.ztst %install rm -rf %{buildroot} @@ -87,18 +77,12 @@ make DESTDIR=%{buildroot} install.modules make DESTDIR=%{buildroot} install.fns -# avoid invalid Requires to be generated -for f in test-repo-git-rebase-{apply,merge}; do - sed -i -e 's!/usr/local/bin/zsh!%{_bindir}/zsh!' $RPM_BUILD_ROOT%{_datadir}/zsh/%{upstream_version}/functions/$f - chmod +x $RPM_BUILD_ROOT%{_datadir}/zsh/%{upstream_version}/functions/$f -done - %files %defattr(-,root,root,-) %{_bindir}/%{name} /bin/%{name} %{_libdir}/%{name}/ -%{_datadir}/%{name} +%{_datadir}/%{name}/%{upstream_version}/* %post if [ "$1" -eq 1 ]; then @@ -116,12 +100,3 @@ sed -i '\!^%{_bindir}/%{name}$!dq' %{_sysconfdir}/shells sed -i '\!^/bin/%{name}$!dq' %{_sysconfdir}/shells fi - -%changelog -* Thu May 19 2022 takimata <takimata@gmx.de> - 5.9-1 -- Stable security release with many bug fixes and several new features -* Mon Feb 14 2022 takimata <takimata@gmx.de> - 5.8.1-2 -- Security and bugfix release -- PROMPT_SUBST expansion is no longer performed on arguments to prompt expansion sequences such as %F -* Wed Aug 18 2021 takimata <takimata@gmx.de> - 5.8-1 -- Initial packaging for Chum
[-] [+]	Deleted	_service:tar_git:001-disable-failing-tests.patch ^
@@ -1,226 +0,0 @@ ---- a/Test/A05execution.ztst -+++ b/Test/A05execution.ztst -@@ -342,35 +342,6 @@ F:anonymous function, and a descriptor leak when backgrounding a pipeline - >17 - >19 - --# Test 'wait' for unknown job/process ID. -- wait 1 -- echo $? -- wait %% -- echo $? -- wait %+ -- echo $? -- wait %- -- echo $? -- wait %1 -- echo $? -- wait %foo -- echo $? -- wait %\?bar --127:'wait' exit status and warning for unknown ID -->127 -->127 -->127 -->127 -->127 -->127 --?(eval):wait:1: pid 1 is not a child of this shell --?(eval):wait:3: %%: no such job --?(eval):wait:5: %+: no such job --?(eval):wait:7: %-: no such job --?(eval):wait:9: %1: no such job --?(eval):wait:11: job not found: foo --?(eval):wait:13: job not found: ?bar -- - # Test 'wait' for unknown job/process ID (POSIX mode). - (setopt POSIX_BUILTINS - wait 1 ---- a/Test/B13whence.ztst -+++ b/Test/B13whence.ztst -@@ -15,9 +15,15 @@ - chmod +x real - prefix=$PWD - popd -+ if [[ "$USER" == "mersdk" ]]; then -+ SFDK_SKIP_SOME_TESTS="TODO: investigate failure (only in SDK)" -+ else -+ SFDK_SKIP_SOME_TESTS= -+ fi - - %test - -+ ZTST_skip=${SFDK_SKIP_SOME_TESTS} - ( - path=( ${PWD:P}/whence.tmp $path ) - whence -S step1 ---- a/Test/C02cond.ztst -+++ b/Test/C02cond.ztst -@@ -43,6 +43,14 @@ - - print 'MZ' > cmd.exe - chmod +x cmd.exe -+ -+ if [[ "$USER" == "mersdk" ]]; then -+ SFDK_SKIP_SOME_TESTS="TODO: investigate failure (only in SDK)" -+ # is possibly the same heisenbug which makes the tests (rarely) fail on OBS... -+ else -+ SFDK_SKIP_SOME_TESTS= -+ fi -+ - %test - - [[ -a zerolength && ! -a nonexistent ]] -@@ -108,6 +116,7 @@ - fi - 0dD:-p cond - -+ ZTST_skip=${SFDK_SKIP_SOME_TESTS} - if (( EUID == 0 )); then - print -u$ZTST_fd 'Warning: Not testing [[ ! -r file ]] (root reads anything)' - [[ -r zerolength && -r unmodish ]] -@@ -128,6 +137,7 @@ - [[ -u modish && ! -u zerolength ]] - 0:-u cond - -+ ZTST_skip=${SFDK_SKIP_SOME_TESTS} - [[ -x cmd.exe && ! -x zerolength ]] - 0:-x cond - -@@ -141,6 +151,7 @@ - [[ -O zerolength ]] - 0:-O cond - -+ ZTST_skip=${SFDK_SKIP_SOME_TESTS} - [[ -G zerolength ]] - 0:-G cond - ---- a/Test/D02glob.ztst -+++ b/Test/D02glob.ztst -@@ -19,6 +19,12 @@ - print glob.tmp/*/~(.)# - } - -+ if [[ "$RPM_ARCH" == "i386" ]]; then -+ SFDK_SKIP_SOME_TESTS= -+ else -+ SFDK_SKIP_SOME_TESTS="TODO: investigate failure (only on aarch64/armv7hl)" -+ fi -+ - %test - - globtest globtests -@@ -753,6 +759,7 @@ - else - print -raC 2 -- glob.tmp/secret-/ glob.tmp/secret-/file - fi -+ ZTST_skip=${SFDK_SKIP_SOME_TESTS} - 0:names inside unreadable directories can be globbed if searchable - >glob.tmp/secret-d444/dir glob.tmp/secret-d444/file - >glob.tmp/secret-s444/dir glob.tmp/secret-s444/file -@@ -763,6 +770,7 @@ - else - print -rC 2 -- glob.tmp/secret-/dir/* - fi -+ ZTST_skip=${SFDK_SKIP_SOME_TESTS} - 0:glob files in readable directories inside unreadable directories - >glob.tmp/secret-d111/dir/file glob.tmp/secret-s111/dir/file - ---- a/Test/D04parameter.ztst -+++ b/Test/D04parameter.ztst -@@ -1201,39 +1201,6 @@ - >0 - >/elsewhere /somewhere - -- local STRING=a:b -- typeset -T STRING string -- print $STRING $string -- unset STRING -- set -A string x y z -- print $STRING $string -- STRING=a:b -- typeset -T STRING string -- print $STRING $string -- unset STRING -- set -A string x y z -- print $STRING $string -- STRING=a:b -- typeset -T STRING string -- print $STRING $string -- unset string -- STRING=x:y:z -- print $STRING $string -- STRING=a:b -- typeset -T STRING string -- print $STRING $string -- unset string -- STRING=x:y:z -- print $STRING $string --0:Unsetting and recreation of tied normal parameters -->a:b a b -->x y z -->a:b a b -->x y z -->a:b a b -->x:y:z -->a:b a b -->x:y:z - - typeset -T tied1 tied2 + - typeset -T tied2 tied1 + ---- a/Test/V14system.ztst -+++ b/Test/V14system.ztst -@@ -9,6 +9,11 @@ - else - ZTST_unimplemented='the zsh/system and zsh/zselect modules are not available' - fi -+ if [[ "$USER" == "mersdk" ]]; then -+ SFDK_SKIP_SOME_TESTS="TODO: investigate failure (only in SDK)" -+ else -+ SFDK_SKIP_SOME_TESTS= -+ fi - - %test - -@@ -34,6 +39,7 @@ - ?(eval):zsystem:5: flock: invalid interval value: '0' - ?(eval):zsystem:6: flock: invalid interval value: '1e100' - -+ ZTST_skip=${SFDK_SKIP_SOME_TESTS} - ( - # Lock file for 1 second in the background. - lock_flag=$tst_dir/locked1 -@@ -55,6 +61,7 @@ - 2:zsystem flock unsuccessful wait test - F:This timing test might fail due to process scheduling issues unrelated to zsh. - -+ ZTST_skip=${SFDK_SKIP_SOME_TESTS} - ( - # Lock file for 0.5 second in the background. - lock_flag=$tst_dir/locked2 -@@ -113,6 +120,7 @@ F:This timing test might fail due to process scheduling issues unrelated to zsh. - fi - fi - ) -+ ZTST_skip=${SFDK_SKIP_SOME_TESTS} - 0:zsystem flock successful wait test, integral seconds - ?elapsed time seems OK - F:This timing test might fail due to process scheduling issues unrelated to zsh. -@@ -144,6 +152,7 @@ F:This timing test might fail due to process scheduling issues unrelated to zsh. - fi - fi - ) -+ ZTST_skip=${SFDK_SKIP_SOME_TESTS} - 0:zsystem flock successful wait test, fractional seconds - ?elapsed time seems OK - F:This timing test might fail due to process scheduling issues unrelated to zsh. ---- a/Test/W02jobs.ztst -+++ b/Test/W02jobs.ztst -@@ -183,6 +183,7 @@ - zpty_input 'kill -KILL %1' - zpty_line - zpty_stop -+ ZTST_skip="Test fails in 5% of all runs" - 0:various `kill` signals with multiple running jobs - >\[1] [0-9]## - >\[2] [0-9]## \ No newline at end of file
[-] [+]	Changed	_service ^
@@ -2,7 +2,7 @@ <service name="tar_git"> <param name="url">https://github.com/sailfishos-chum/zsh-packaging.git</param> <param name="branch">master</param> - <param name="revision">ca64199beb725588248b78a5fadf208deae0439a</param> + <param name="revision">v5.8-1</param> <param name="token"/> <param name="debian">N</param> <param name="dumb">N</param>
	Changed	_service:tar_git:zsh-5.8.tar.bz2 ^

Comments for request 1348 (2)

rinigus wrote over 2 years ago

I have no idea what happened with your original request, but now the package is made available at chum:testing and you set as maintainer.

As you could see, it fails on older SFOS releases. We can either disable the builds over there or maybe you wish to fix it.

When ready, please submit to sailfishos:chum from testing

takimata wrote over 2 years ago

Ah, I didn't see your comment here. Too bad OBS doesn't send notifications...

Cross-post from https://build.merproject.org/package/show/sailfishos:chum:testing/zsh :

Could be probably fixed, but since I don't really care about these older releases I've just disabled building.

There's nothing to be done right now

Request History

takimata	created request	1629462552 over 2 years ago

rinigus	Request got accepted	1629462939 over 2 years ago

Request 1348 (accepted)

Comments for request 1348 (2)

Request History

1 Package Maintainer