Accepting request 595518 from home:kbabioch:branches:shells
- Update to 5.5
* The effect of the NO_INTERACTIVE_COMMENTS option extends into $(...)
and `...` command substitutions when used on the command line.
* Dropped patches, which are included upstream now:
- zsh-CVE-2018-1071.patch
- zsh-CVE-2018-1083.patch
* Fixes a buffer overflow in utils.c:checkmailpath() that can lead to
local arbitrary code execution (CVE-2018-1100 bnc#1089030)
- Added zsh-CVE-2018-1071.patch: Fixed a stack-based buffer overflow
in exec.c:hashcmd() (CVE-2018-1071 bnc#1084656)
- Added zsh-CVE-2018-1083.patch: Fixed a stack-based buffer overflow
in gen_matches_files() at compctl.c (CVE-2018-1083 bnc#1087026)
- Cleaned up spec file with spec-cleaner
OBS-URL: https://build.opensuse.org/request/show/595518
OBS-URL: https://build.opensuse.org/package/show/shells/zsh?expand=0&rev=186
This commit is contained in:
Ismail Dönmez
Git OBS Bridge
parent
947257e3ff
commit
05394b236c
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:957bcdb2c57f64c02f673693ea5a7518ef24b6557aeb3a4ce222cefa6d74acc9
|
||||
size 4482413
|
||||
@ -1,11 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v1
|
||||
|
||||
iQEcBAABCAAGBQJZoyoaAAoJEKcdmp1L2yezt7AIAJ9D+qiWPJZiXCzi7kBU7hoZ
|
||||
1+3Nr2QXcXBp2ENDktKFY9zygXQ8m65JqpRHUAYSyKeXsIjCaDLPWHG6HNGN+csg
|
||||
TxAflLapm/d+53ESNLMju5CeNHkV1pdbEE5LmgmPUpOzHwmV092IYVLsLC5d8CEC
|
||||
c6hMb2cl8/lWv9S/3WYAAa0gKnmcRLGkyyA4iPoH1BsDGuxQfBfU+Vdh+h1wrq/A
|
||||
+P81UqvutjM0limDyFGngkJoesuVabRettxR0wA24QBh9mIJxPZLL86QISiVD7a1
|
||||
SPkzH88E4vjVtTXEau9TxIHLpukJPIoUNPcfeg+hUdfJ6hkLZdsWxtPRvaXgIEw=
|
||||
=yDM8
|
||||
-----END PGP SIGNATURE-----
|
||||
3
zsh-5.5.tar.gz
Normal file
3
zsh-5.5.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d05606a545672ae8623828802dbcc4c83d9a4d3dbfb960e94a9fd9f62467c159
|
||||
size 4576506
|
||||
11
zsh-5.5.tar.gz.asc
Normal file
11
zsh-5.5.tar.gz.asc
Normal file
@ -0,0 +1,11 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v1
|
||||
|
||||
iQEcBAABCAAGBQJaykAgAAoJEKcdmp1L2yezARAIAKNKQMRNhOHA+Cbqp53mYdNx
|
||||
VaMl4dNpwB4W+Px2lfHEmdnXGB6MAVrKU5O39VTTdIzi31o2J/4fT1JNrsqtNCZK
|
||||
ivNYxsqHOfFdO+LfD2mU4xCEBkTVMu3TwZGlhY2dlhhoDf/CvI1gbmLBbpFv619T
|
||||
ZMzdeDH+iJn2mh+7LJqELEQPEdR1GOA4bLi1FD84vGySmRbHoyas0+8fJ3G6jduR
|
||||
gDCoBvjcj50QK1dNB06ejqL+79BE0gso2rjt7MDR2yrzDrl5/ifxPxseHj7xvUNN
|
||||
V9m2sM6JTgLZj2ymgt+LLctvWxBV2HfBmzaL9yg0LHce2hw5vVK18PN7MDjSsf4=
|
||||
=pDEY
|
||||
-----END PGP SIGNATURE-----
|
||||
21
zsh.changes
21
zsh.changes
@ -1,3 +1,24 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 11 07:45:35 UTC 2018 - kbabioch@suse.com
|
||||
|
||||
- Update to 5.5
|
||||
* The effect of the NO_INTERACTIVE_COMMENTS option extends into $(...)
|
||||
and `...` command substitutions when used on the command line.
|
||||
* Dropped patches, which are included upstream now:
|
||||
- zsh-CVE-2018-1071.patch
|
||||
- zsh-CVE-2018-1083.patch
|
||||
* Fixes a buffer overflow in utils.c:checkmailpath() that can lead to
|
||||
local arbitrary code execution (CVE-2018-1100 bnc#1089030)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 27 09:34:00 UTC 2018 - kbabioch@suse.com
|
||||
|
||||
- Added zsh-CVE-2018-1071.patch: Fixed a stack-based buffer overflow
|
||||
in exec.c:hashcmd() (CVE-2018-1071 bnc#1084656)
|
||||
- Added zsh-CVE-2018-1083.patch: Fixed a stack-based buffer overflow
|
||||
in gen_matches_files() at compctl.c (CVE-2018-1083 bnc#1087026)
|
||||
- Cleaned up spec file with spec-cleaner
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 27 12:21:43 UTC 2018 - kbabioch@suse.com
|
||||
|
||||
|
||||
57
zsh.spec
57
zsh.spec
@ -16,8 +16,16 @@
|
||||
#
|
||||
|
||||
|
||||
%if 0%{?rhel_version} || 0%{?centos_version} || 0%{?fedora_version}
|
||||
%if 0%{?rhel_version} >= 700 || 0%{?centos_version} >= 700
|
||||
%global __requires_exclude ^/bin/zsh$
|
||||
%endif
|
||||
BuildRequires: libtermcap-devel
|
||||
BuildRequires: texi2html
|
||||
BuildRequires: texinfo
|
||||
%endif
|
||||
Name: zsh
|
||||
Version: 5.4.2
|
||||
Version: 5.5
|
||||
Release: 0%{?dist}
|
||||
Summary: Shell with comprehensive completion
|
||||
License: MIT
|
||||
@ -29,6 +37,13 @@ Source2: %{name}.keyring
|
||||
Source3: zshrc
|
||||
Source4: zshenv
|
||||
Source5: zprofile
|
||||
Patch1: trim-unneeded-completions.patch
|
||||
# PATCH-FIX-OPENSUSE zsh-osc-completion.patch -- Fix openSUSE versions in osc completion
|
||||
Patch2: zsh-osc-completion.patch
|
||||
BuildRequires: groff
|
||||
BuildRequires: libcap-devel
|
||||
BuildRequires: ncurses-devel
|
||||
BuildRequires: pcre-devel
|
||||
%if 0%{?rhel_version} || 0%{?centos_version} || 0%{?fedora_version}
|
||||
Source11: zlogin.rhs
|
||||
Source12: zlogout.rhs
|
||||
@ -37,15 +52,10 @@ Source14: zshrc.rhs
|
||||
Source15: zshenv.rhs
|
||||
Source16: dotzshrc.rh
|
||||
%endif
|
||||
Patch1: trim-unneeded-completions.patch
|
||||
# PATCH-FIX-OPENSUSE zsh-osc-completion.patch -- Fix openSUSE versions in osc completion
|
||||
Patch2: zsh-osc-completion.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildRequires: groff
|
||||
%if 0%{?suse_version}
|
||||
Requires(pre): %{install_info_prereq}
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: yodl
|
||||
Requires(pre): %{install_info_prereq}
|
||||
%if 0%{?suse_version} >= 1210
|
||||
BuildRequires: makeinfo
|
||||
BuildRequires: texi2html
|
||||
@ -56,18 +66,6 @@ Requires(pre): fileutils
|
||||
Requires(pre): grep
|
||||
%endif
|
||||
|
||||
BuildRequires: libcap-devel
|
||||
BuildRequires: ncurses-devel
|
||||
BuildRequires: pcre-devel
|
||||
%if 0%{?rhel_version} || 0%{?centos_version} || 0%{?fedora_version}
|
||||
%if 0%{?rhel_version} >= 700 || 0%{?centos_version} >= 700
|
||||
%global __requires_exclude ^/bin/zsh$
|
||||
%endif
|
||||
BuildRequires: libtermcap-devel
|
||||
BuildRequires: texi2html
|
||||
BuildRequires: texinfo
|
||||
%endif
|
||||
|
||||
%description
|
||||
Zsh is a UNIX command interpreter (shell) that resembles the Korn shell
|
||||
(ksh). It is not completely compatible. It includes many enhancements,
|
||||
@ -77,7 +75,6 @@ at home, and extra features drawn from tcsh (another `custom' shell).
|
||||
Zsh is well known for its command line completion.
|
||||
|
||||
%package htmldoc
|
||||
|
||||
Summary: Zsh shell manual in html format
|
||||
Group: System/Shells
|
||||
Provides: %{name}-html = %{version}
|
||||
@ -94,7 +91,7 @@ mechanism, and more.
|
||||
This package contains the Zsh manual in html format.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{version}
|
||||
%setup -q
|
||||
%if 0%{?suse_version}
|
||||
%patch1 -p1
|
||||
%endif
|
||||
@ -104,7 +101,7 @@ This package contains the Zsh manual in html format.
|
||||
chmod 0644 Etc/changelog2html.pl
|
||||
|
||||
# Fix bindir path in some files
|
||||
perl -p -i -e 's|/usr/local/bin|%{_bindir}|' \
|
||||
perl -p -i -e 's|%{_prefix}/local/bin|%{_bindir}|' \
|
||||
Doc/intro.ms Misc/globtests.ksh Misc/globtests \
|
||||
Misc/lete2ctl Util/check_exports Util/helpfiles \
|
||||
Util/reporter
|
||||
@ -132,7 +129,7 @@ perl -p -i -e 's|/usr/local/bin|%{_bindir}|' \
|
||||
cp Completion/Redhat/Command/_rpm Completion/openSUSE/Command/_rpm
|
||||
%endif
|
||||
|
||||
make all info html
|
||||
make %{?_smp_mflags} all info html
|
||||
|
||||
# generate intro.ps
|
||||
groff -Tps -ms Doc/intro.ms > intro.ps
|
||||
@ -146,11 +143,10 @@ rm -f Etc/Makefile* Etc/*.yo
|
||||
|
||||
%install
|
||||
%if 0%{?rhel_version} || 0%{?centos_version} || 0%{?fedora_version}
|
||||
rm -rf %{buildroot}
|
||||
%endif
|
||||
|
||||
%if 0%{?suse_version}
|
||||
%makeinstall install.info
|
||||
%make_install install.info
|
||||
%else
|
||||
make DESTDIR=%{buildroot} install install.info
|
||||
%endif
|
||||
@ -185,7 +181,7 @@ ln -sf %{_bindir}/zsh %{buildroot}/bin/zsh
|
||||
# Remove versioned zsh binary
|
||||
rm -f %{buildroot}%{_bindir}/zsh-*
|
||||
%if 0%{?rhel_version} || 0%{?centos_version} || 0%{?fedora_version}
|
||||
rm -f %{buildroot}/%{_datadir}/info/dir
|
||||
rm -f %{buildroot}/%{_infodir}/dir
|
||||
%endif
|
||||
|
||||
%if 0%{?suse_version} >= 1110
|
||||
@ -195,7 +191,7 @@ rm -f %{buildroot}/%{_datadir}/info/dir
|
||||
%check
|
||||
%if ! 0%{?qemu_user_space_build}
|
||||
%if 0%{?suse_version}
|
||||
make check
|
||||
make %{?_smp_mflags} check
|
||||
%else
|
||||
# FixMe: sometimes failing Test
|
||||
#+ fn:echo:2: write error: broken pipe
|
||||
@ -209,6 +205,7 @@ mv Test/E01options.ztst Test/E01options.ztst.mvd
|
||||
ZTST_verbose=0 make test
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%preun
|
||||
%if 0%{?suse_version}
|
||||
:
|
||||
@ -249,7 +246,6 @@ fi
|
||||
%endif
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%doc ChangeLog FEATURES LICENCE MACHINES META-FAQ NEWS README
|
||||
%doc Etc/* intro.ps Misc/compctl-examples
|
||||
%config(noreplace) %{_sysconfdir}/zshrc
|
||||
@ -271,11 +267,10 @@ fi
|
||||
%endif
|
||||
%{_libdir}/zsh/
|
||||
%{_datadir}/zsh/
|
||||
%{_infodir}/zsh.info*.gz
|
||||
%{_mandir}/man1/zsh*.1.gz
|
||||
%{_infodir}/zsh.info*%{ext_info}
|
||||
%{_mandir}/man1/zsh*.1%{ext_man}
|
||||
|
||||
%files htmldoc
|
||||
%defattr(-,root,root)
|
||||
%doc Doc/htmldoc/*
|
||||
|
||||
%changelog
|
||||
|
||||
Loading…
Reference in New Issue
Block a user