1 |
commit: 5416c35c1af3a31f0dda147d368b55074beccdd3 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Sep 4 08:40:27 2018 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Sep 4 08:40:27 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5416c35c |
7 |
|
8 |
app-shells/zsh: Security bump to version 5.6 |
9 |
|
10 |
Package-Manager: Portage-2.3.49, Repoman-2.3.10 |
11 |
|
12 |
app-shells/zsh/Manifest | 2 + |
13 |
app-shells/zsh/zsh-5.6.ebuild | 211 ++++++++++++++++++++++++++++++++++++++++++ |
14 |
2 files changed, 213 insertions(+) |
15 |
|
16 |
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest |
17 |
index 194f7e89c16..2916d776b13 100644 |
18 |
--- a/app-shells/zsh/Manifest |
19 |
+++ b/app-shells/zsh/Manifest |
20 |
@@ -2,3 +2,5 @@ DIST zsh-5.5-doc.tar.xz 3216400 BLAKE2B 3d07b336222b08d7deff0ded6f603a47bcdcec97 |
21 |
DIST zsh-5.5.1-doc.tar.xz 3216632 BLAKE2B ef1274799604d74eb9cec3c29927703c98bb63bde3aa5ce4880eda45420fe1eb79c54a693fe529c9e79161f924a76bc2a650253216c7b1e565af65f1ac3c0d91 SHA512 e240f6c6aa2efb941c2baaaf749c66c9e304ba54ce2be90586671ba47e380aac89315516e5dce41fa0ae1d8fccfc36f61ed1400b6aab3382927e2715a77d62e6 |
22 |
DIST zsh-5.5.1.tar.gz 4578700 BLAKE2B b58fc763bc64e8ed6de0db2e0fd454aef995fcc86b18c2ffd4b39e037ce1cdeb04e6e2a44b2495ca89218af41ad1dd7d29e429d21fbab39377d95e62d249732e SHA512 c4f7327a3f5480bd9a169fb07e34812e0106fa9de3b5f7d38bb0db85a3e4d01b9a4a8f35553da03a15d7d819108305cfaa2811c945273e2cac84512219e69ebb |
23 |
DIST zsh-5.5.tar.gz 4576506 BLAKE2B 4f5923d519b0c96475f4832cf0e5cabc1432e765d201c992903ead45b175d5bc76410ebe248c2bd01ad75a5b5939bc5bc58e9263bb4501f9b2c1f5b4d7755896 SHA512 aafa29e1bc29d35fb5822ad4ca5f4c64b1e4a4e3f9bff70e9e5976918fa9e7906467bd11f69291e694dfa77efa1e5433d7839fc668aa572228623f1c131c381f |
24 |
+DIST zsh-5.6-doc.tar.xz 3198156 BLAKE2B 245cabac955727e519be453e000c7b74d9a8497a894ddc91d0b33f1d1b44ad89c29d76dee60844085dde1eb0197ca1b13811588e1da56cb9c904b8d8c7717b79 SHA512 f3ecd9afc02c5be71c804f5a44282c4d81acb5ced0d4c21f4f4ac6d04f2c2b5c1ccfe003cba64639943cd3b48ec45174c387b0a272ccf7759e325a499272f5f2 |
25 |
+DIST zsh-5.6.tar.xz 3080856 BLAKE2B 747a6bbcc46b78b5092cfa05659f14c86f981032c691faf5a5aed8a7dae87ab2acad9a903f64f6d45b3c5552b0fa0d48ba4bcad98dc44591f12fed04f9e6920f SHA512 791cbeff45a5ef86608341147724f8b301a50eae1500f94eaaef1074c14c516c32d3f5628b8b16dbe42b7ad812c1a221240c1d4c5cd240144a00976c196f0735 |
26 |
|
27 |
diff --git a/app-shells/zsh/zsh-5.6.ebuild b/app-shells/zsh/zsh-5.6.ebuild |
28 |
new file mode 100644 |
29 |
index 00000000000..f924a3a364f |
30 |
--- /dev/null |
31 |
+++ b/app-shells/zsh/zsh-5.6.ebuild |
32 |
@@ -0,0 +1,211 @@ |
33 |
+# Copyright 1999-2018 Gentoo Foundation |
34 |
+# Distributed under the terms of the GNU General Public License v2 |
35 |
+ |
36 |
+EAPI=7 |
37 |
+ |
38 |
+inherit flag-o-matic prefix |
39 |
+ |
40 |
+if [[ ${PV} == 9999* ]] ; then |
41 |
+ inherit git-r3 autotools |
42 |
+ EGIT_REPO_URI="https://git.code.sf.net/p/zsh/code" |
43 |
+else |
44 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
45 |
+ SRC_URI="https://www.zsh.org/pub/${P}.tar.xz |
46 |
+ doc? ( https://www.zsh.org/pub/${P}-doc.tar.xz )" |
47 |
+fi |
48 |
+ |
49 |
+DESCRIPTION="UNIX Shell similar to the Korn shell" |
50 |
+HOMEPAGE="https://www.zsh.org/" |
51 |
+ |
52 |
+LICENSE="ZSH gdbm? ( GPL-2 )" |
53 |
+SLOT="0" |
54 |
+IUSE="caps debug doc examples gdbm maildir pcre static unicode" |
55 |
+ |
56 |
+RDEPEND=" |
57 |
+ >=sys-libs/ncurses-5.1:0= |
58 |
+ static? ( >=sys-libs/ncurses-5.7-r4:0=[static-libs] ) |
59 |
+ caps? ( sys-libs/libcap ) |
60 |
+ pcre? ( |
61 |
+ >=dev-libs/libpcre-3.9 |
62 |
+ static? ( >=dev-libs/libpcre-3.9[static-libs] ) |
63 |
+ ) |
64 |
+ gdbm? ( sys-libs/gdbm:= ) |
65 |
+ !<sys-apps/baselayout-2.4.1 |
66 |
+" |
67 |
+DEPEND="sys-apps/groff |
68 |
+ ${RDEPEND}" |
69 |
+PDEPEND=" |
70 |
+ examples? ( app-doc/zsh-lovers ) |
71 |
+" |
72 |
+if [[ ${PV} == 9999* ]] ; then |
73 |
+ DEPEND+=" app-text/yodl |
74 |
+ doc? ( |
75 |
+ sys-apps/texinfo |
76 |
+ app-text/texi2html |
77 |
+ virtual/latex-base |
78 |
+ )" |
79 |
+fi |
80 |
+ |
81 |
+src_prepare() { |
82 |
+ if [[ ${PV} != 9999* ]]; then |
83 |
+ # fix zshall problem with soelim |
84 |
+ ln -s Doc man1 || die |
85 |
+ mv Doc/zshall.1 Doc/zshall.1.soelim || die |
86 |
+ soelim Doc/zshall.1.soelim > Doc/zshall.1 || die |
87 |
+ |
88 |
+ # add openrc specific options for init.d completion |
89 |
+ eapply "${FILESDIR}"/${PN}-5.3-init.d-gentoo.diff |
90 |
+ fi |
91 |
+ |
92 |
+ eapply_user |
93 |
+ |
94 |
+ if [[ ${PV} == 9999* ]] ; then |
95 |
+ sed -i "/^VERSION=/s/=.*/=${PV}/" Config/version.mk || die |
96 |
+ eautoreconf |
97 |
+ fi |
98 |
+} |
99 |
+ |
100 |
+src_configure() { |
101 |
+ local myconf=( |
102 |
+ --bindir="${EPREFIX}"/bin |
103 |
+ --libdir="${EPREFIX}"/usr/$(get_libdir) |
104 |
+ --enable-etcdir="${EPREFIX}"/etc/zsh |
105 |
+ --enable-runhelpdir="${EPREFIX}"/usr/share/zsh/${PV%_*}/help |
106 |
+ --enable-fndir="${EPREFIX}"/usr/share/zsh/${PV%_*}/functions |
107 |
+ --enable-site-fndir="${EPREFIX}"/usr/share/zsh/site-functions |
108 |
+ --enable-function-subdirs |
109 |
+ --with-tcsetpgrp |
110 |
+ $(use_enable maildir maildir-support) |
111 |
+ $(use_enable pcre) |
112 |
+ $(use_enable caps cap) |
113 |
+ $(use_enable unicode multibyte) |
114 |
+ $(use_enable gdbm) |
115 |
+ ) |
116 |
+ |
117 |
+ if use static ; then |
118 |
+ myconf+=( --disable-dynamic ) |
119 |
+ append-ldflags -static |
120 |
+ fi |
121 |
+ if use debug ; then |
122 |
+ myconf+=( |
123 |
+ --enable-zsh-debug |
124 |
+ --enable-zsh-mem-debug |
125 |
+ --enable-zsh-mem-warning |
126 |
+ --enable-zsh-secure-free |
127 |
+ --enable-zsh-hash-debug |
128 |
+ ) |
129 |
+ fi |
130 |
+ |
131 |
+ if [[ ${CHOST} == *-darwin* ]]; then |
132 |
+ myconf+=( --enable-libs=-liconv ) |
133 |
+ append-ldflags -Wl,-x |
134 |
+ fi |
135 |
+ |
136 |
+ econf "${myconf[@]}" |
137 |
+ |
138 |
+ if use static ; then |
139 |
+ # compile all modules statically, see Bug #27392 |
140 |
+ # removed cap and curses because linking failes |
141 |
+ sed -e "s,link=no,link=static,g" \ |
142 |
+ -e "/^name=zsh\/cap/s,link=static,link=no," \ |
143 |
+ -e "/^name=zsh\/curses/s,link=static,link=no," \ |
144 |
+ -i "${S}"/config.modules || die |
145 |
+ if ! use gdbm ; then |
146 |
+ sed -i '/^name=zsh\/db\/gdbm/s,link=static,link=no,' \ |
147 |
+ "${S}"/config.modules || die |
148 |
+ fi |
149 |
+ fi |
150 |
+} |
151 |
+ |
152 |
+src_compile() { |
153 |
+ default |
154 |
+ |
155 |
+ if [[ ${PV} == 9999* ]] && use doc ; then |
156 |
+ emake -C Doc everything |
157 |
+ fi |
158 |
+} |
159 |
+ |
160 |
+src_test() { |
161 |
+ addpredict /dev/ptmx |
162 |
+ local i |
163 |
+ for i in C02cond.ztst V08zpty.ztst X02zlevi.ztst Y01completion.ztst Y02compmatch.ztst Y03arguments.ztst ; do |
164 |
+ rm "${S}"/Test/${i} || die |
165 |
+ done |
166 |
+ emake check |
167 |
+} |
168 |
+ |
169 |
+src_install() { |
170 |
+ emake DESTDIR="${D}" install $(usex doc "install.info" "") |
171 |
+ |
172 |
+ insinto /etc/zsh |
173 |
+ export PREFIX_QUOTE_CHAR='"' PREFIX_EXTRA_REGEX="/EUID/s,0,${EUID}," |
174 |
+ newins "$(prefixify_ro "${FILESDIR}"/zprofile-4)" zprofile |
175 |
+ |
176 |
+ keepdir /usr/share/zsh/site-functions |
177 |
+ insinto /usr/share/zsh/${PV%_*}/functions/Prompts |
178 |
+ newins "${FILESDIR}"/prompt_gentoo_setup-1 prompt_gentoo_setup |
179 |
+ |
180 |
+ local i |
181 |
+ |
182 |
+ # install miscellaneous scripts (bug #54520) |
183 |
+ sed -e "s:/usr/local/bin/perl:${EPREFIX}/usr/bin/perl:g" \ |
184 |
+ -e "s:/usr/local/bin/zsh:${EPREFIX}/bin/zsh:g" \ |
185 |
+ -i {Util,Misc}/* || die |
186 |
+ for i in Util Misc ; do |
187 |
+ insinto /usr/share/zsh/${PV%_*}/${i} |
188 |
+ doins ${i}/* |
189 |
+ done |
190 |
+ |
191 |
+ # install header files (bug #538684) |
192 |
+ insinto /usr/include/zsh |
193 |
+ doins config.h Src/*.epro |
194 |
+ for i in Src/{zsh.mdh,*.h} ; do |
195 |
+ sed -e 's@\.\./config\.h@config.h@' \ |
196 |
+ -e 's@#\(\s*\)include "\([^"]\+\)"@#\1include <zsh/\2>@' \ |
197 |
+ -i "${i}" |
198 |
+ doins "${i}" |
199 |
+ done |
200 |
+ |
201 |
+ dodoc ChangeLog* META-FAQ NEWS README config.modules |
202 |
+ |
203 |
+ if use doc ; then |
204 |
+ pushd "${WORKDIR}/${PN}-${PV%_*}" >/dev/null |
205 |
+ docinto html |
206 |
+ dodoc Doc/*.html |
207 |
+ insinto /usr/share/doc/${PF} |
208 |
+ doins Doc/zsh.{dvi,pdf} |
209 |
+ popd >/dev/null |
210 |
+ fi |
211 |
+ |
212 |
+ docinto StartupFiles |
213 |
+ dodoc StartupFiles/z* |
214 |
+} |
215 |
+ |
216 |
+pkg_postinst() { |
217 |
+ if [[ -z ${REPLACING_VERSIONS} ]] ; then |
218 |
+ echo |
219 |
+ elog "If you want to enable Portage completions and Gentoo prompt," |
220 |
+ elog "emerge app-shells/gentoo-zsh-completions and add" |
221 |
+ elog " autoload -U compinit promptinit" |
222 |
+ elog " compinit" |
223 |
+ elog " promptinit; prompt gentoo" |
224 |
+ elog "to your ~/.zshrc" |
225 |
+ echo |
226 |
+ elog "Also, if you want to enable cache for the completions, add" |
227 |
+ elog " zstyle ':completion::complete:*' use-cache 1" |
228 |
+ elog "to your ~/.zshrc" |
229 |
+ echo |
230 |
+ elog "Note that a system zprofile startup file is installed. This will override" |
231 |
+ elog "PATH and possibly other variables that a user may set in ~/.zshenv." |
232 |
+ elog "Custom PATH settings and similar overridden variables can be moved to ~/.zprofile" |
233 |
+ elog "or other user startup files that are sourced after the system zprofile." |
234 |
+ echo |
235 |
+ elog "If PATH must be set in ~/.zshenv to affect things like non-login ssh shells," |
236 |
+ elog "one method is to use a separate path-setting file that is conditionally sourced" |
237 |
+ elog "in ~/.zshenv and also sourced from ~/.zprofile. For more information, see the" |
238 |
+ elog "zshenv example in ${EROOT}/usr/share/doc/${PF}/StartupFiles/." |
239 |
+ echo |
240 |
+ elog "See https://wiki.gentoo.org/wiki/Zsh/HOWTO for more introduction documentation." |
241 |
+ echo |
242 |
+ fi |
243 |
+} |