Gentoo Archives: gentoo-commits

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