1 |
commit: c743f0831a36aad375c8d603fe8dc0a1250231ad |
2 |
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Sep 26 00:57:13 2016 +0000 |
4 |
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Sep 26 00:57:13 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/android.git/commit/?id=c743f083 |
7 |
|
8 |
app-shells/bash: import 4.3_p46-r1. |
9 |
|
10 |
app-shells/bash/Manifest | 2 + |
11 |
app-shells/bash/bash-4.3_p46-r1.ebuild | 254 +++++++++++++++++++++ |
12 |
.../bash/files/bash-4.3-prompt-string-comsub.patch | 118 ++++++++++ |
13 |
3 files changed, 374 insertions(+) |
14 |
|
15 |
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest |
16 |
index 501f0aa..2fdd091 100644 |
17 |
--- a/app-shells/bash/Manifest |
18 |
+++ b/app-shells/bash/Manifest |
19 |
@@ -5,6 +5,7 @@ AUX bash-4.3-append-process-segfault.patch 675 SHA256 cadbc77924ce5e2ba3984263f1 |
20 |
AUX bash-4.3-arrayfunc.patch 439 SHA256 9407d53d357166464c7c4e3341a72027faba295f416e73f7b5919e10ea15577a SHA512 9db458ea34495e8632d68c072db0c30be103d31ad0535d5327e2ba8db62d9464b2e4427fb0a06c6272dbaa399a2ba939666f4574929d0f53940234a78ca67867 WHIRLPOOL 038eb157225aadf2c7d57aa63b1ca7871986ceea982ae91d319b55551377e79b6023a1844c752586083056ae377813366f032e8c51df0f42e35bef0c037ed803 |
21 |
AUX bash-4.3-compat-lvl.patch 628 SHA256 3303c12a499c5fb3f3c9ac7b11b020c83d4d4e3d672cc2df734709b22a6d92d7 SHA512 c552e1c7154d69201329f26e039c06a61e1bbaf5eaf16b7eea4f89d56aef0f710ebdfb115a1c00f07bd94893e51f9cbceee12bb57e51f6009c0e2327d53d7286 WHIRLPOOL 066fbb358f4fb9e32a58b4c4edd10d9c47c50f6aa202e0197c6b6d86a0836d48677561b834e5642b9052e64077efe240cb27144e5032c3e5f4bd9cb62201736e |
22 |
AUX bash-4.3-mapfile-improper-array-name-validation.patch 407 SHA256 0302e96630afc5106ea446defd6890fb0b4c96bb27b375e8fbfd96b09eb10335 SHA512 214935a751c3275593654c36b471cbb47ca4f5bb6f2a19e0a7ff73b646e5318a861538bf923ebb5f84abafa6d0d6eeece7b2f36ef77ab8c582223e098b4eb356 WHIRLPOOL 3bf136afd45fe614e3429079b6f41102dda55390d4a3d190f4584aa189f8e623439c13f9efe623644d3990e0f5d2d1b90a8b61eee322f22050b3d5e63d8f5eda |
23 |
+AUX bash-4.3-prompt-string-comsub.patch 3395 SHA256 33eeb827efffcac9362359b49c6552aeba56b53760c332ab038cd6c1fdd678d5 SHA512 1da0ca9fa9c9c9331c848342194f2c0b0ad590daa162d78d994f6ab79991c926c832ee71fad9550acf7099067b6b40e60169227ebca56cf450b95627b842929b WHIRLPOOL 3681415ea4c57b8a13fe25ce637b61a14ccaf2c1a8d5081b47baa29d2ae0f36a2d1b9dc58ff7ec5ba5b7c59dac38bace989e76f8dfa2d35d209df7e8916002ac |
24 |
AUX bash-4.3-protos.patch 174 SHA256 729aded4f907f4bad466785eed850b2b25a145e9ed75f0fc690190d5fccd387a SHA512 4af0540467bbcf7cf041de6fe6ed080b149a2ff309e5dbe5e7b76bb30459aaeead813be678384feb01a7b64d3a649372f8a8aaf686f69ac7958baa87b25340b0 WHIRLPOOL b1a5def9952b1f8ec4b9c3ff9df09672b2ad55a67a99890bc0796c87e23c1ec86c0eed50125d790120b6eea595f5aeabf981383323aac43b2f790587ec70685a |
25 |
AUX bash-4.x-deferred-heredocs.patch 1255 SHA256 845ffcd7035eef5dc029747f211a737e0260b53b16086a37fb3c8ab3609a7d36 SHA512 9016203189d0b601f0441daec19f902de7387b599a2196c475d76c596dcf9a9c22765a58e7fc5a3117522ec2722475bd166bea271ff3048f31674e8bed2901a0 WHIRLPOOL f3a2ef5245c446b7e90917e987d80efba5e6437dbe86fc27bbd7768bc5f1e5f6e7663b350ca8a81a3f21a29af6e1594c14061be0d818fce6a4a63aed7efcb6fe |
26 |
AUX bash_logout 205 SHA256 15aaded954389c05d7de5d36c4887db61975ad52c87ad78baf1062ec8997289d SHA512 7234250c03fc920996a381f9daef9e2d8ab1e1a29acdebed6669d8e0fe1c872a7fa343adf7d9ddc81225b0cd9eb223ba7ad1ff42448aff057fc6d6baa8f04a7d WHIRLPOOL 16242c8796af44f550f2935b37c770c022754c63db75b57fbe49d1a313b8651235619ead571cd70ae37f890c694d1c6b2e4871ec51345743eff8649782d0523b |
27 |
@@ -60,5 +61,6 @@ DIST bash43-044 1658 SHA256 9338820630bf67373b44d8ea68409f65162ea7a47b9b29ace06a |
28 |
DIST bash43-045 1312 SHA256 ba6ec3978e9eaa1eb3fabdaf3cc6fdf8c4606ac1c599faaeb4e2d69864150023 SHA512 7b79dacff44e5358da736334d2277a2879ca1389e22e9dac50e139f30dab623bc89a56930d89e74efc468a00d051f6747ccaffcd1a30d7c737d49780b9830e3d WHIRLPOOL f361e523879ff1898574ac5eca480661bd787dc278fff204e7f27da89e85439b4e9d36a5f556046b760f3beb115302e745b5196bfa081b402d3f76fb44463558 |
29 |
DIST bash43-046 1494 SHA256 b3b456a6b690cd293353f17e22d92a202b3c8bce587ae5f2667c20c9ab6f688f SHA512 c036b659fa681f8129110356bec33fad00fb8e469f3b4bcefd0b7ddf5e20030977716adf5c65f58f3ff68cd7af0bdd42392ee077100bc7f45ee123749d082f7d WHIRLPOOL d58384a2ca77f9a80a69a117221da51a701539cf5497d8e0fc634cd1cc0cb0024e02675bea810a0f42b873b557d479ba1b7aee6e6f73bd1422df2dbb29396477 |
30 |
EBUILD bash-4.3_p42-r2.ebuild 7355 SHA256 9e3e57dd0af1f66e27493a1e2f31d404084846ddc82dbbef6c67e25d6b4e2280 SHA512 58a5931cfcd89c2587ab336ad87b334127df65f5818cec1b6a3b7871e3b8173a7a46dd0c0956104b9d270351dd873e10c1e3666a37df168725f039edea1b32e0 WHIRLPOOL 72d9a680334722fd0a326c388495cbf77b9776d6ad3497117cffc075ad3acfca2d6677e1fe735ec70b96a6acf2318075be3a91f00ea9278db056cc5c215fd2e0 |
31 |
+EBUILD bash-4.3_p46-r1.ebuild 7307 SHA256 9e1f714e7d47e163ac10ea272bd5a0bb5842f0fc956d406c98f1839c5bcb09bb SHA512 2d213fb5837e2f28ffc89729e630b62d1d20b0d3aa5058a6098689dd6ab051286a866cbafff920929364d69e4442120159a77f51edf3369220504fa78248df9c WHIRLPOOL 36d46860f4203336252e451334745fa8b753e234d8e77cdceb1a5c29c4b72a08f06a7929de2c21858cfcbfc486971ad59ff8096222314c95ee96b21717f0ebd6 |
32 |
EBUILD bash-4.3_p46.ebuild 7302 SHA256 9d776281eaeb4faec790b751312417a01634d69e4906e068de214409749ce0f5 SHA512 3b50d6a0949d00ca4eb8bccc7c75a4e4b91e7379c56a8455b9c219cc7c1228186a86aaa6ed5d55fbc91f026a1faf7960d775ee47b741ab1d76f1a085a96dec92 WHIRLPOOL d7c7081a31b891aed5d6b1ebd0af74f82d67cb43a0551fb3218949a8ef7f7c52c6ecc92d200733965a0b256ed8db281fe1492c858a65835b01f55cdac2ffc2d9 |
33 |
MISC metadata.xml 734 SHA256 7850abd55e656b9360deafb278c98598922eb3b6f884d024d199110afdcf6ff0 SHA512 a9301e8d2347e0cf90a97325d9a705076150c00609d28338e5d7d72c135468e4f0531b2a4077b69679ae6ccf89eee691e0e5f0748caab60689f5f017afb544f1 WHIRLPOOL ce0e36bc0ae83b73aee7abee391d1b0a384f0277dfb7f7282043624a523699685d866ef3291a02e9ad1bde3abf196b47e1351f646e0149f942a40ed4dc940a37 |
34 |
|
35 |
diff --git a/app-shells/bash/bash-4.3_p46-r1.ebuild b/app-shells/bash/bash-4.3_p46-r1.ebuild |
36 |
new file mode 100644 |
37 |
index 0000000..23022cc |
38 |
--- /dev/null |
39 |
+++ b/app-shells/bash/bash-4.3_p46-r1.ebuild |
40 |
@@ -0,0 +1,254 @@ |
41 |
+# Copyright 1999-2016 Gentoo Foundation |
42 |
+# Distributed under the terms of the GNU General Public License v2 |
43 |
+# $Id$ |
44 |
+ |
45 |
+EAPI="5" |
46 |
+ |
47 |
+inherit eutils flag-o-matic toolchain-funcs multilib |
48 |
+ |
49 |
+# Official patchlevel |
50 |
+# See ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/ |
51 |
+PLEVEL=${PV##*_p} |
52 |
+MY_PV=${PV/_p*} |
53 |
+MY_PV=${MY_PV/_/-} |
54 |
+MY_P=${PN}-${MY_PV} |
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="6.3" |
73 |
+ |
74 |
+DESCRIPTION="The standard GNU Bourne again shell" |
75 |
+HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html" |
76 |
+SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)" |
77 |
+[[ ${PV} == *_rc* ]] && SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz" |
78 |
+ |
79 |
+LICENSE="GPL-3" |
80 |
+SLOT="0" |
81 |
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" |
82 |
+IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline vanilla" |
83 |
+ |
84 |
+DEPEND=">=sys-libs/ncurses-5.2-r2:0= |
85 |
+ readline? ( >=sys-libs/readline-${READLINE_VER}:0= ) |
86 |
+ nls? ( virtual/libintl )" |
87 |
+RDEPEND="${DEPEND} |
88 |
+ !<sys-apps/portage-2.1.6.7_p1 |
89 |
+ !<sys-apps/paludis-0.26.0_alpha5" |
90 |
+# we only need yacc when the .y files get patched (bash42-005) |
91 |
+DEPEND+=" virtual/yacc" |
92 |
+ |
93 |
+PATCHES=( |
94 |
+ "${FILESDIR}"/${PN}-4.3-mapfile-improper-array-name-validation.patch |
95 |
+ "${FILESDIR}"/${PN}-4.3-arrayfunc.patch |
96 |
+ "${FILESDIR}"/${PN}-4.3-protos.patch |
97 |
+ # CVE-2016-0634 / bug #594496 |
98 |
+ "${FILESDIR}"/${PN}-4.3-prompt-string-comsub.patch |
99 |
+) |
100 |
+ |
101 |
+S=${WORKDIR}/${MY_P} |
102 |
+ |
103 |
+pkg_setup() { |
104 |
+ if is-flag -malign-double ; then #7332 |
105 |
+ eerror "Detected bad CFLAGS '-malign-double'. Do not use this" |
106 |
+ eerror "as it breaks LFS (struct stat64) on x86." |
107 |
+ die "remove -malign-double from your CFLAGS mr ricer" |
108 |
+ fi |
109 |
+ if use bashlogger ; then |
110 |
+ ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs." |
111 |
+ ewarn "This will log ALL output you enter into the shell, you have been warned." |
112 |
+ fi |
113 |
+} |
114 |
+ |
115 |
+src_unpack() { |
116 |
+ unpack ${MY_P}.tar.gz |
117 |
+} |
118 |
+ |
119 |
+src_prepare() { |
120 |
+ # Include official patches |
121 |
+ [[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s) |
122 |
+ |
123 |
+ # Clean out local libs so we know we use system ones w/releases. |
124 |
+ if [[ ${PV} != *_rc* ]] ; then |
125 |
+ rm -rf lib/{readline,termcap}/* |
126 |
+ touch lib/{readline,termcap}/Makefile.in # for config.status |
127 |
+ sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die |
128 |
+ fi |
129 |
+ |
130 |
+ # Avoid regenerating docs after patches #407985 |
131 |
+ sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die |
132 |
+ touch -r . doc/* |
133 |
+ |
134 |
+ epatch "${PATCHES[@]}" |
135 |
+ |
136 |
+ epatch_user |
137 |
+} |
138 |
+ |
139 |
+src_configure() { |
140 |
+ local myconf=() |
141 |
+ |
142 |
+ # For descriptions of these, see config-top.h |
143 |
+ # bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426 |
144 |
+ append-cppflags \ |
145 |
+ -DDEFAULT_PATH_VALUE=\'\"${EPREFIX}/usr/local/sbin:${EPREFIX}/usr/local/bin:${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin\"\' \ |
146 |
+ -DSTANDARD_UTILS_PATH=\'\"${EPREFIX}/bin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/usr/sbin\"\' \ |
147 |
+ -DSYS_BASHRC=\'\"${EPREFIX}/etc/bash/bashrc\"\' \ |
148 |
+ -DSYS_BASH_LOGOUT=\'\"${EPREFIX}/etc/bash/bash_logout\"\' \ |
149 |
+ -DNON_INTERACTIVE_LOGIN_SHELLS \ |
150 |
+ -DSSH_SOURCE_BASHRC \ |
151 |
+ -DUSE_MKTEMP -DUSE_MKSTEMP \ |
152 |
+ $(use bashlogger && echo -DSYSLOG_HISTORY) |
153 |
+ |
154 |
+ # Don't even think about building this statically without |
155 |
+ # reading Bug 7714 first. If you still build it statically, |
156 |
+ # don't come crying to us with bugs ;). |
157 |
+ #use static && export LDFLAGS="${LDFLAGS} -static" |
158 |
+ use nls || myconf+=( --disable-nls ) |
159 |
+ |
160 |
+ # Historically, we always used the builtin readline, but since |
161 |
+ # our handling of SONAME upgrades has gotten much more stable |
162 |
+ # in the PM (and the readline ebuild itself preserves the old |
163 |
+ # libs during upgrades), linking against the system copy should |
164 |
+ # be safe. |
165 |
+ # Exact cached version here doesn't really matter as long as it |
166 |
+ # is at least what's in the DEPEND up above. |
167 |
+ export ac_cv_rl_version=${READLINE_VER} |
168 |
+ |
169 |
+ # Force linking with system curses ... the bundled termcap lib |
170 |
+ # sucks bad compared to ncurses. For the most part, ncurses |
171 |
+ # is here because readline needs it. But bash itself calls |
172 |
+ # ncurses in one or two small places :(. |
173 |
+ |
174 |
+ if [[ ${PV} != *_rc* ]] ; then |
175 |
+ # Use system readline only with released versions. |
176 |
+ myconf+=( --with-installed-readline=. ) |
177 |
+ fi |
178 |
+ |
179 |
+ if use plugins; then |
180 |
+ append-ldflags -Wl,-rpath,/usr/$(get_libdir)/bash |
181 |
+ else |
182 |
+ # Disable the plugins logic by hand since bash doesn't |
183 |
+ # provide a way of doing it. |
184 |
+ export ac_cv_func_dl{close,open,sym}=no \ |
185 |
+ ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no |
186 |
+ sed -i \ |
187 |
+ -e '/LOCAL_LDFLAGS=/s:-rdynamic::' \ |
188 |
+ configure || die |
189 |
+ fi |
190 |
+ tc-export AR #444070 |
191 |
+ econf \ |
192 |
+ --docdir='$(datarootdir)'/doc/${PF} \ |
193 |
+ --htmldir='$(docdir)/html' \ |
194 |
+ --with-curses \ |
195 |
+ $(use_with afs) \ |
196 |
+ $(use_enable net net-redirections) \ |
197 |
+ --disable-profiling \ |
198 |
+ $(use_enable mem-scramble) \ |
199 |
+ $(use_with mem-scramble bash-malloc) \ |
200 |
+ $(use_enable readline) \ |
201 |
+ $(use_enable readline history) \ |
202 |
+ $(use_enable readline bang-history) \ |
203 |
+ "${myconf[@]}" |
204 |
+} |
205 |
+ |
206 |
+src_compile() { |
207 |
+ emake |
208 |
+ |
209 |
+ if use plugins ; then |
210 |
+ emake -C examples/loadables all others |
211 |
+ fi |
212 |
+} |
213 |
+ |
214 |
+src_install() { |
215 |
+ local d f |
216 |
+ |
217 |
+ default |
218 |
+ |
219 |
+ dodir /bin |
220 |
+ mv "${ED}"/usr/bin/bash "${ED}"/bin/ || die |
221 |
+ dosym bash /bin/rbash |
222 |
+ |
223 |
+ insinto /etc/bash |
224 |
+ doins "${FILESDIR}"/bash_logout |
225 |
+ doins "${FILESDIR}"/bashrc |
226 |
+ keepdir /etc/bash/bashrc.d |
227 |
+ insinto /etc/skel |
228 |
+ for f in bash{_logout,_profile,rc} ; do |
229 |
+ newins "${FILESDIR}"/dot-${f} .${f} |
230 |
+ done |
231 |
+ |
232 |
+ local sed_args=( |
233 |
+ -e "s:#${USERLAND}#@::" |
234 |
+ -e '/#@/d' |
235 |
+ ) |
236 |
+ if ! use readline ; then |
237 |
+ sed_args+=( #432338 |
238 |
+ -e '/^shopt -s histappend/s:^:#:' |
239 |
+ -e 's:use_color=true:use_color=false:' |
240 |
+ ) |
241 |
+ fi |
242 |
+ sed -i \ |
243 |
+ "${sed_args[@]}" \ |
244 |
+ "${ED}"/etc/skel/.bashrc \ |
245 |
+ "${ED}"/etc/bash/bashrc || die |
246 |
+ |
247 |
+ if use plugins ; then |
248 |
+ exeinto /usr/$(get_libdir)/bash |
249 |
+ doexe $(echo examples/loadables/*.o | sed 's:\.o::g') |
250 |
+ insinto /usr/include/bash-plugins |
251 |
+ doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h} |
252 |
+ fi |
253 |
+ |
254 |
+ if use examples ; then |
255 |
+ for d in examples/{functions,misc,scripts,startup-files} ; do |
256 |
+ exeinto /usr/share/doc/${PF}/${d} |
257 |
+ insinto /usr/share/doc/${PF}/${d} |
258 |
+ for f in ${d}/* ; do |
259 |
+ if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then |
260 |
+ doexe ${f} |
261 |
+ else |
262 |
+ doins ${f} |
263 |
+ fi |
264 |
+ done |
265 |
+ done |
266 |
+ fi |
267 |
+ |
268 |
+ doman doc/*.1 |
269 |
+ newdoc CWRU/changelog ChangeLog |
270 |
+ dosym bash.info /usr/share/info/bashref.info |
271 |
+} |
272 |
+ |
273 |
+pkg_preinst() { |
274 |
+ if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then |
275 |
+ mkdir -p "${EROOT}"/etc/bash |
276 |
+ mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/ |
277 |
+ fi |
278 |
+ |
279 |
+ if [[ -L ${EROOT}/bin/sh ]] ; then |
280 |
+ # rewrite the symlink to ensure that its mtime changes. having /bin/sh |
281 |
+ # missing even temporarily causes a fatal error with paludis. |
282 |
+ local target=$(readlink "${EROOT}"/bin/sh) |
283 |
+ local tmp=$(emktemp "${EROOT}"/bin) |
284 |
+ ln -sf "${target}" "${tmp}" |
285 |
+ mv -f "${tmp}" "${EROOT}"/bin/sh |
286 |
+ fi |
287 |
+} |
288 |
+ |
289 |
+pkg_postinst() { |
290 |
+ # If /bin/sh does not exist, provide it |
291 |
+ if [[ ! -e ${EROOT}/bin/sh ]] ; then |
292 |
+ ln -sf bash "${EROOT}"/bin/sh |
293 |
+ fi |
294 |
+} |
295 |
|
296 |
diff --git a/app-shells/bash/files/bash-4.3-prompt-string-comsub.patch b/app-shells/bash/files/bash-4.3-prompt-string-comsub.patch |
297 |
new file mode 100644 |
298 |
index 0000000..175bc53 |
299 |
--- /dev/null |
300 |
+++ b/app-shells/bash/files/bash-4.3-prompt-string-comsub.patch |
301 |
@@ -0,0 +1,118 @@ |
302 |
+http://seclists.org/oss-sec/2016/q3/538 |
303 |
+https://bugs.gentoo.org/594496 |
304 |
+ |
305 |
+*** ../bash-4.3-patched/parse.y 2015-08-13 15:11:54.000000000 -0400 |
306 |
+--- parse.y 2016-03-07 15:44:14.000000000 -0500 |
307 |
+*************** |
308 |
+*** 5259,5263 **** |
309 |
+ int result_size, result_index; |
310 |
+ int c, n, i; |
311 |
+! char *temp, octal_string[4]; |
312 |
+ struct tm *tm; |
313 |
+ time_t the_time; |
314 |
+--- 5259,5263 ---- |
315 |
+ int result_size, result_index; |
316 |
+ int c, n, i; |
317 |
+! char *temp, *t_host, octal_string[4]; |
318 |
+ struct tm *tm; |
319 |
+ time_t the_time; |
320 |
+*************** |
321 |
+*** 5407,5411 **** |
322 |
+ case 's': |
323 |
+ temp = base_pathname (shell_name); |
324 |
+! temp = savestring (temp); |
325 |
+ goto add_string; |
326 |
+ |
327 |
+--- 5407,5415 ---- |
328 |
+ case 's': |
329 |
+ temp = base_pathname (shell_name); |
330 |
+! /* Try to quote anything the user can set in the file system */ |
331 |
+! if (promptvars || posixly_correct) |
332 |
+! temp = sh_backslash_quote_for_double_quotes (temp); |
333 |
+! else |
334 |
+! temp = savestring (temp); |
335 |
+ goto add_string; |
336 |
+ |
337 |
+*************** |
338 |
+*** 5497,5503 **** |
339 |
+ case 'h': |
340 |
+ case 'H': |
341 |
+! temp = savestring (current_host_name); |
342 |
+! if (c == 'h' && (t = (char *)strchr (temp, '.'))) |
343 |
+ *t = '\0'; |
344 |
+ goto add_string; |
345 |
+ |
346 |
+--- 5501,5515 ---- |
347 |
+ case 'h': |
348 |
+ case 'H': |
349 |
+! t_host = savestring (current_host_name); |
350 |
+! if (c == 'h' && (t = (char *)strchr (t_host, '.'))) |
351 |
+ *t = '\0'; |
352 |
++ if (promptvars || posixly_correct) |
353 |
++ /* Make sure that expand_prompt_string is called with a |
354 |
++ second argument of Q_DOUBLE_QUOTES if we use this |
355 |
++ function here. */ |
356 |
++ temp = sh_backslash_quote_for_double_quotes (t_host); |
357 |
++ else |
358 |
++ temp = savestring (t_host); |
359 |
++ free (t_host); |
360 |
+ goto add_string; |
361 |
+ |
362 |
+*** ../bash-4.3-patched/y.tab.c 2015-08-13 15:11:54.000000000 -0400 |
363 |
+--- y.tab.c 2016-03-07 15:44:14.000000000 -0500 |
364 |
+*************** |
365 |
+*** 7571,7575 **** |
366 |
+ int result_size, result_index; |
367 |
+ int c, n, i; |
368 |
+! char *temp, octal_string[4]; |
369 |
+ struct tm *tm; |
370 |
+ time_t the_time; |
371 |
+--- 7571,7575 ---- |
372 |
+ int result_size, result_index; |
373 |
+ int c, n, i; |
374 |
+! char *temp, *t_host, octal_string[4]; |
375 |
+ struct tm *tm; |
376 |
+ time_t the_time; |
377 |
+*************** |
378 |
+*** 7719,7723 **** |
379 |
+ case 's': |
380 |
+ temp = base_pathname (shell_name); |
381 |
+! temp = savestring (temp); |
382 |
+ goto add_string; |
383 |
+ |
384 |
+--- 7719,7727 ---- |
385 |
+ case 's': |
386 |
+ temp = base_pathname (shell_name); |
387 |
+! /* Try to quote anything the user can set in the file system */ |
388 |
+! if (promptvars || posixly_correct) |
389 |
+! temp = sh_backslash_quote_for_double_quotes (temp); |
390 |
+! else |
391 |
+! temp = savestring (temp); |
392 |
+ goto add_string; |
393 |
+ |
394 |
+*************** |
395 |
+*** 7809,7815 **** |
396 |
+ case 'h': |
397 |
+ case 'H': |
398 |
+! temp = savestring (current_host_name); |
399 |
+! if (c == 'h' && (t = (char *)strchr (temp, '.'))) |
400 |
+ *t = '\0'; |
401 |
+ goto add_string; |
402 |
+ |
403 |
+--- 7813,7827 ---- |
404 |
+ case 'h': |
405 |
+ case 'H': |
406 |
+! t_host = savestring (current_host_name); |
407 |
+! if (c == 'h' && (t = (char *)strchr (t_host, '.'))) |
408 |
+ *t = '\0'; |
409 |
++ if (promptvars || posixly_correct) |
410 |
++ /* Make sure that expand_prompt_string is called with a |
411 |
++ second argument of Q_DOUBLE_QUOTES if we use this |
412 |
++ function here. */ |
413 |
++ temp = sh_backslash_quote_for_double_quotes (t_host); |
414 |
++ else |
415 |
++ temp = savestring (t_host); |
416 |
++ free (t_host); |
417 |
+ goto add_string; |
418 |
+ |
419 |
+ |