1 |
commit: 8369032bb93fc5b7977fce158eed2c5d8a964139 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Apr 21 09:07:50 2019 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Apr 21 09:16:25 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8369032b |
7 |
|
8 |
app-shells/bash: Bump to version 5.0_p7 |
9 |
|
10 |
Package-Manager: Portage-2.3.64, Repoman-2.3.12 |
11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
12 |
|
13 |
app-shells/bash/Manifest | 4 + |
14 |
app-shells/bash/bash-5.0_p7.ebuild | 266 +++++++++++++++++++++++++++++++++++++ |
15 |
2 files changed, 270 insertions(+) |
16 |
|
17 |
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest |
18 |
index bee3da75417..a2777b27c20 100644 |
19 |
--- a/app-shells/bash/Manifest |
20 |
+++ b/app-shells/bash/Manifest |
21 |
@@ -311,3 +311,7 @@ DIST bash44-023 1557 BLAKE2B 95a21ade7e4be68d66f3862f26b574c5897055822471c8d2801 |
22 |
DIST bash50-001 4133 BLAKE2B 3eedb63f943ba89f1147c907fcacb5e5af891a6728edb4ced972e19d586573db6fface4947490ffb9f42a2ed87c745a352e102fb727637eec8422d7323da9470 SHA512 e3bf036287d3be1f3e91755678c04c9a8e1b4a98e34e181871dfaeb13987dda18c31a44db3f3829d91a185ba4414b9c0229f2a15f6e8a951cbc6c1054252bfdd |
23 |
DIST bash50-002 4380 BLAKE2B 022340f0da0d5b7c571c2015beb87268452faf1484bedb75e2868b16904eed93749d5c0ed62b9da43badb3ee2efe3bdb4f55e212a40c3cfdc073d44623475b85 SHA512 59b1cfa1be1029ada53c63fe651d51451ead5523c50c115e0eada07e34e641c693ed728366986acb431f96fdc61818efd3f8cd168ce416001edc62602e5f28dd |
24 |
DIST bash50-003 6434 BLAKE2B ccf05f2f0da6dd0a1d25d22200326d405019acbce27a7fbcb3f16ff09027d5dec5cb9d5dc557638f72089a3444b25d5106abdb0916cac0797562b4d8b68a0ab2 SHA512 520b5cc0b7aeea6cd8b7471b553d8979996f3627a3e5c8889023562dadc82475be243aca2ec608217b78400a1dceb134b877d3ded926e581445234f1b69409e6 |
25 |
+DIST bash50-004 1664 BLAKE2B 88b44a5268c8ec970f0c18997cfe5211f6a2a8c07f813d48fd931e62e1b3b95fd76e5b66b7ebf1ffcd1d42e5c133675f954de0ca7dfc8c36aa69f11253480374 SHA512 cbf51bb242edf36289bd483b47c9451132c12f341f494212c0e5d969cd06a3c1c4d121295f3bacb1d7d5e56f789258ba9f54c4cfb5760ed3c70ec1f49f25c719 |
26 |
+DIST bash50-005 3732 BLAKE2B 3ded5d200102ad7cc547c6f7e9bf9bba468a10791fc096988c49f46ea8d6708efb0d4c383a9e2e2fccef8a49b217e6a22d9435c807233a1d0a971265bbe31761 SHA512 4d3e6f337a76b9ff1887c4c6e4e4352885779504f3c975b8d6fa587962f01e8adbd843b5341c1fc1d11152cf465f2982eebd9dc6e1384f319157d29740d510da |
27 |
+DIST bash50-006 1275 BLAKE2B ae3738874ada015202a6ff21a50ea9370c6147b4c74a23112e755396fc1db743afa42abdd4df635f0c0b9f3536796064b41d0667ef8ade1543b5c70b688ae9d1 SHA512 71df829a3a3927a363ad961de8af8db898ea8b0ccf604c5f1326fe4646d0d50b3c7038ee473c225fc10d26c2dc1f711d66b74d003bb0445d36a8a70c49e056e0 |
28 |
+DIST bash50-007 1640 BLAKE2B 1c25af8c098322ad16353dfb32cdba2613659f5042792c725dbde7b2bc276ff09a4af44bf223fd6114dcc9beee98ccbd8081d3010fa1cfeb33bc93fc9c81e4f7 SHA512 467d377836c53d188cda39de550ce1e00b58895a6646c4da3535e74e599978558a92d8e7bf7c59c988159468fbce04f3a0dbf62cbded28472272f1b9811786e8 |
29 |
|
30 |
diff --git a/app-shells/bash/bash-5.0_p7.ebuild b/app-shells/bash/bash-5.0_p7.ebuild |
31 |
new file mode 100644 |
32 |
index 00000000000..5b9a47a025e |
33 |
--- /dev/null |
34 |
+++ b/app-shells/bash/bash-5.0_p7.ebuild |
35 |
@@ -0,0 +1,266 @@ |
36 |
+# Copyright 1999-2019 Gentoo Authors |
37 |
+# Distributed under the terms of the GNU General Public License v2 |
38 |
+ |
39 |
+EAPI=6 |
40 |
+ |
41 |
+inherit flag-o-matic toolchain-funcs multilib prefix |
42 |
+ |
43 |
+# Official patchlevel |
44 |
+# See ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/ |
45 |
+PLEVEL=${PV##*_p} |
46 |
+MY_PV=${PV/_p*} |
47 |
+MY_PV=${MY_PV/_/-} |
48 |
+MY_P=${PN}-${MY_PV} |
49 |
+is_release() { |
50 |
+ case ${PV} in |
51 |
+ *_alpha*|*_beta*|*_rc*) return 1 ;; |
52 |
+ *) return 0 ;; |
53 |
+ esac |
54 |
+} |
55 |
+[[ ${PV} != *_p* ]] && PLEVEL=0 |
56 |
+patches() { |
57 |
+ local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}} |
58 |
+ [[ ${plevel} -eq 0 ]] && return 1 |
59 |
+ eval set -- {1..${plevel}} |
60 |
+ set -- $(printf "${pn}${pv/\.}-%03d " "$@") |
61 |
+ if [[ ${opt} == -s ]] ; then |
62 |
+ echo "${@/#/${DISTDIR}/}" |
63 |
+ else |
64 |
+ local u |
65 |
+ for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${pn} ; do |
66 |
+ printf "${u}/${pn}-${pv}-patches/%s " "$@" |
67 |
+ done |
68 |
+ fi |
69 |
+} |
70 |
+ |
71 |
+# The version of readline this bash normally ships with. |
72 |
+READLINE_VER="8.0" |
73 |
+ |
74 |
+DESCRIPTION="The standard GNU Bourne again shell" |
75 |
+HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html" |
76 |
+if is_release ; then |
77 |
+ SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)" |
78 |
+else |
79 |
+ SRC_URI="ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz" |
80 |
+fi |
81 |
+ |
82 |
+LICENSE="GPL-3" |
83 |
+SLOT="0" |
84 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
85 |
+IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline" |
86 |
+ |
87 |
+DEPEND=" |
88 |
+ >=sys-libs/ncurses-5.2-r2:0= |
89 |
+ readline? ( >=sys-libs/readline-${READLINE_VER}:0= ) |
90 |
+ nls? ( virtual/libintl ) |
91 |
+" |
92 |
+RDEPEND=" |
93 |
+ ${DEPEND} |
94 |
+ !<sys-apps/portage-2.1.6.7_p1 |
95 |
+" |
96 |
+# we only need yacc when the .y files get patched (bash42-005) |
97 |
+#DEPEND+=" virtual/yacc" |
98 |
+ |
99 |
+S="${WORKDIR}/${MY_P}" |
100 |
+ |
101 |
+PATCHES=( |
102 |
+ # Patches from Chet sent to bashbug ml |
103 |
+ "${FILESDIR}"/${PN}-5.0-history-zero-length.patch |
104 |
+ "${FILESDIR}"/${PN}-5.0-history-append.patch |
105 |
+ "${FILESDIR}"/${PN}-5.0-syslog-history-extern.patch |
106 |
+ "${FILESDIR}"/${PN}-5.0-assignment-preceding-builtin.patch |
107 |
+) |
108 |
+ |
109 |
+pkg_setup() { |
110 |
+ if is-flag -malign-double ; then #7332 |
111 |
+ eerror "Detected bad CFLAGS '-malign-double'. Do not use this" |
112 |
+ eerror "as it breaks LFS (struct stat64) on x86." |
113 |
+ die "remove -malign-double from your CFLAGS mr ricer" |
114 |
+ fi |
115 |
+ if use bashlogger ; then |
116 |
+ ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs." |
117 |
+ ewarn "This will log ALL output you enter into the shell, you have been warned." |
118 |
+ fi |
119 |
+} |
120 |
+ |
121 |
+src_unpack() { |
122 |
+ unpack ${MY_P}.tar.gz |
123 |
+} |
124 |
+ |
125 |
+src_prepare() { |
126 |
+ # Include official patches |
127 |
+ [[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s) |
128 |
+ |
129 |
+ # Clean out local libs so we know we use system ones w/releases. |
130 |
+ if is_release ; then |
131 |
+ rm -rf lib/{readline,termcap}/* |
132 |
+ touch lib/{readline,termcap}/Makefile.in # for config.status |
133 |
+ sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die |
134 |
+ fi |
135 |
+ |
136 |
+ # Prefixify hardcoded path names. No-op for non-prefix. |
137 |
+ hprefixify pathnames.h.in |
138 |
+ |
139 |
+ # Avoid regenerating docs after patches #407985 |
140 |
+ sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die |
141 |
+ touch -r . doc/* |
142 |
+ |
143 |
+ eapply -p0 "${PATCHES[@]}" |
144 |
+ eapply_user |
145 |
+} |
146 |
+ |
147 |
+src_configure() { |
148 |
+ local myconf=( |
149 |
+ --disable-profiling |
150 |
+ --docdir='$(datarootdir)'/doc/${PF} |
151 |
+ --htmldir='$(docdir)/html' |
152 |
+ --with-curses |
153 |
+ $(use_enable mem-scramble) |
154 |
+ $(use_enable net net-redirections) |
155 |
+ $(use_enable readline) |
156 |
+ $(use_enable readline bang-history) |
157 |
+ $(use_enable readline history) |
158 |
+ $(use_with afs) |
159 |
+ $(use_with mem-scramble bash-malloc) |
160 |
+ ) |
161 |
+ |
162 |
+ # For descriptions of these, see config-top.h |
163 |
+ # bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426 |
164 |
+ append-cppflags \ |
165 |
+ -DDEFAULT_PATH_VALUE=\'\"${EPREFIX}/usr/local/sbin:${EPREFIX}/usr/local/bin:${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin\"\' \ |
166 |
+ -DSTANDARD_UTILS_PATH=\'\"${EPREFIX}/bin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/usr/sbin\"\' \ |
167 |
+ -DSYS_BASHRC=\'\"${EPREFIX}/etc/bash/bashrc\"\' \ |
168 |
+ -DSYS_BASH_LOGOUT=\'\"${EPREFIX}/etc/bash/bash_logout\"\' \ |
169 |
+ -DNON_INTERACTIVE_LOGIN_SHELLS \ |
170 |
+ -DSSH_SOURCE_BASHRC \ |
171 |
+ $(use bashlogger && echo -DSYSLOG_HISTORY) |
172 |
+ |
173 |
+ # Don't even think about building this statically without |
174 |
+ # reading Bug 7714 first. If you still build it statically, |
175 |
+ # don't come crying to us with bugs ;). |
176 |
+ #use static && export LDFLAGS="${LDFLAGS} -static" |
177 |
+ use nls || myconf+=( --disable-nls ) |
178 |
+ |
179 |
+ # Historically, we always used the builtin readline, but since |
180 |
+ # our handling of SONAME upgrades has gotten much more stable |
181 |
+ # in the PM (and the readline ebuild itself preserves the old |
182 |
+ # libs during upgrades), linking against the system copy should |
183 |
+ # be safe. |
184 |
+ # Exact cached version here doesn't really matter as long as it |
185 |
+ # is at least what's in the DEPEND up above. |
186 |
+ export ac_cv_rl_version=${READLINE_VER%%_*} |
187 |
+ |
188 |
+ # Force linking with system curses ... the bundled termcap lib |
189 |
+ # sucks bad compared to ncurses. For the most part, ncurses |
190 |
+ # is here because readline needs it. But bash itself calls |
191 |
+ # ncurses in one or two small places :(. |
192 |
+ |
193 |
+ if is_release ; then |
194 |
+ # Use system readline only with released versions. |
195 |
+ myconf+=( --with-installed-readline=. ) |
196 |
+ fi |
197 |
+ |
198 |
+ if use plugins; then |
199 |
+ append-ldflags -Wl,-rpath,/usr/$(get_libdir)/bash |
200 |
+ else |
201 |
+ # Disable the plugins logic by hand since bash doesn't |
202 |
+ # provide a way of doing it. |
203 |
+ export ac_cv_func_dl{close,open,sym}=no \ |
204 |
+ ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no |
205 |
+ sed -i \ |
206 |
+ -e '/LOCAL_LDFLAGS=/s:-rdynamic::' \ |
207 |
+ configure || die |
208 |
+ fi |
209 |
+ tc-export AR #444070 |
210 |
+ econf "${myconf[@]}" |
211 |
+} |
212 |
+ |
213 |
+src_compile() { |
214 |
+ emake |
215 |
+ |
216 |
+ if use plugins ; then |
217 |
+ emake -C examples/loadables all others |
218 |
+ fi |
219 |
+} |
220 |
+ |
221 |
+src_install() { |
222 |
+ local d f |
223 |
+ |
224 |
+ default |
225 |
+ |
226 |
+ dodir /bin |
227 |
+ mv "${ED%/}"/usr/bin/bash "${ED%/}"/bin/ || die |
228 |
+ dosym bash /bin/rbash |
229 |
+ |
230 |
+ insinto /etc/bash |
231 |
+ doins "${FILESDIR}"/bash_logout |
232 |
+ doins "$(prefixify_ro "${FILESDIR}"/bashrc)" |
233 |
+ keepdir /etc/bash/bashrc.d |
234 |
+ insinto /etc/skel |
235 |
+ for f in bash{_logout,_profile,rc} ; do |
236 |
+ newins "${FILESDIR}"/dot-${f} .${f} |
237 |
+ done |
238 |
+ |
239 |
+ local sed_args=( |
240 |
+ -e "s:#${USERLAND}#@::" |
241 |
+ -e '/#@/d' |
242 |
+ ) |
243 |
+ if ! use readline ; then |
244 |
+ sed_args+=( #432338 |
245 |
+ -e '/^shopt -s histappend/s:^:#:' |
246 |
+ -e 's:use_color=true:use_color=false:' |
247 |
+ ) |
248 |
+ fi |
249 |
+ sed -i \ |
250 |
+ "${sed_args[@]}" \ |
251 |
+ "${ED%/}"/etc/skel/.bashrc \ |
252 |
+ "${ED%/}"/etc/bash/bashrc || die |
253 |
+ |
254 |
+ if use plugins ; then |
255 |
+ exeinto /usr/$(get_libdir)/bash |
256 |
+ doexe $(echo examples/loadables/*.o | sed 's:\.o::g') |
257 |
+ insinto /usr/include/bash-plugins |
258 |
+ doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h} |
259 |
+ fi |
260 |
+ |
261 |
+ if use examples ; then |
262 |
+ for d in examples/{functions,misc,scripts,startup-files} ; do |
263 |
+ exeinto /usr/share/doc/${PF}/${d} |
264 |
+ insinto /usr/share/doc/${PF}/${d} |
265 |
+ for f in ${d}/* ; do |
266 |
+ if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then |
267 |
+ doexe ${f} |
268 |
+ else |
269 |
+ doins ${f} |
270 |
+ fi |
271 |
+ done |
272 |
+ done |
273 |
+ fi |
274 |
+ |
275 |
+ doman doc/*.1 |
276 |
+ newdoc CWRU/changelog ChangeLog |
277 |
+ dosym bash.info /usr/share/info/bashref.info |
278 |
+} |
279 |
+ |
280 |
+pkg_preinst() { |
281 |
+ if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then |
282 |
+ mkdir -p "${EROOT}"/etc/bash |
283 |
+ mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/ |
284 |
+ fi |
285 |
+ |
286 |
+ if [[ -L ${EROOT}/bin/sh ]] ; then |
287 |
+ # rewrite the symlink to ensure that its mtime changes. having /bin/sh |
288 |
+ # missing even temporarily causes a fatal error with paludis. |
289 |
+ local target=$(readlink "${EROOT}"/bin/sh) |
290 |
+ local tmp=$(emktemp "${EROOT}"/bin) |
291 |
+ ln -sf "${target}" "${tmp}" |
292 |
+ mv -f "${tmp}" "${EROOT}"/bin/sh |
293 |
+ fi |
294 |
+} |
295 |
+ |
296 |
+pkg_postinst() { |
297 |
+ # If /bin/sh does not exist, provide it |
298 |
+ if [[ ! -e ${EROOT}/bin/sh ]] ; then |
299 |
+ ln -sf bash "${EROOT}"/bin/sh |
300 |
+ fi |
301 |
+} |