1 |
commit: 85b07da1b1029ffe0c64324235cc1e33974dbae6 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Feb 1 20:31:09 2018 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Feb 1 20:31:26 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85b07da1 |
7 |
|
8 |
app-shells/bash: Bump to version 4.4_p18 |
9 |
|
10 |
Package-Manager: Portage-2.3.22, Repoman-2.3.6 |
11 |
|
12 |
app-shells/bash/Manifest | 6 + |
13 |
app-shells/bash/bash-4.4_p18.ebuild | 260 ++++++++++++++++++++++++++++++++++++ |
14 |
2 files changed, 266 insertions(+) |
15 |
|
16 |
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest |
17 |
index baf939afd3d..98396f530e5 100644 |
18 |
--- a/app-shells/bash/Manifest |
19 |
+++ b/app-shells/bash/Manifest |
20 |
@@ -296,3 +296,9 @@ DIST bash44-009 3117 BLAKE2B 1921a30e1f7c6d37cac048772f89322e2cfe6e77f3ec48d4a6b |
21 |
DIST bash44-010 1670 BLAKE2B 6e0cab685ae2393a9ae7eeb91767f8ce3086e3921f2d69614e729e9bc26603b363a69083c57a43aa53669491deba663bd8c9de91571833312cc23efb05c43222 SHA512 54ff556b62fd88381e7a495db50957b016474973b3a566661c65b649a40960f2d3355221b3a71fb292128aad92a45d73d9816d63833bc416b4d15acdef391b98 |
22 |
DIST bash44-011 1603 BLAKE2B 6bd978408140620c2d63277757c15bfe55d6b0ff5706b7b884b234308efb6cfa771888306840ce5cfd4ece5912924dbb6a321d823fa106c99ba573f47dbbb9ae SHA512 6b5b068b74978fc691749ccff5e094c768047f702430e97114f5bf342f078696f7d7616d0642d4061b062e9112dfe00a1c2309c65de4147e0e98fb52c593d844 |
23 |
DIST bash44-012 5768 BLAKE2B 63c6f5ff2cf52a35e1bd7f0028d7cce5c2c87e65ca600d8d85bf9b197ac8dee16bed5dc1dba6b354ef560309022cfd427a08180b76effe4107b9dda2ed99b20e SHA512 4661c4c132f2ea7c9a70368301041c482d5820d8389334a7e3ae44c36fc16c171b20db2f194b7663c84d6c3dcef81aa90f050a48e205218fc7bd3395d09c6a51 |
24 |
+DIST bash44-013 1255 BLAKE2B f19be55c986bc60c395d24044c7edc67cd180d86047af59d173c1507de32534b2eed546f16164d799283d66c0d0460ff4771da6bc327bc87ebc4f01cb284f9eb SHA512 eac0a9abf59b65a59a0028d2f3c0a7dc8a0b3c04e2d2db642b69aa7c13a2dfa190f3c63f7d8a7c9400f01701e9ef84212ce668c4c44d0ccfd02cd1f8e723d831 |
25 |
+DIST bash44-014 2834 BLAKE2B 3a211d9916e16a996d709034523dc0f3775520736f481bdff8c737e1969da1719602bf0379befc685822e4931586482a30bbec69be4233da4f912c5b6333886e SHA512 11e16896aa66a1eafb12cdcea00515132789690e914c8894caefd8c80ed98c8e732428348ddbfb53495164ce4044596f5cdbc03e146dce364fc497f362a1859b |
26 |
+DIST bash44-015 1233 BLAKE2B 5504d4a64f938ccfbb12f43455c11c6dc6a38397e5692da874a1b5de1865d19677c6f683073dbf9843869df67f96a87a6a60d2381338294d6750f2aba1580c55 SHA512 94d6fed30d4a376c29f8986d15f1b3fd65a04ee0f3d1844d010f3e51a2f9f875cd294a68fb6f0e1ffa481fb09f02055b21f2f298ebd9d88eb2f76d6c1f15de34 |
27 |
+DIST bash44-016 2069 BLAKE2B 5ac613c450d018edff4f82740655ed0e460e49b57ce1a817f0b7b0a101b9f1ab095c48904fc17789203d6bdcc1beb01dde23b4a097f36441eda5e11ab638e9bd SHA512 5acc704df3fe63b5b8055ba7bc14ae70cc23d15aefee8db6991e6c11cc8b0e10fcc67d516bc2d2fde84be26ed5c88dbf266fa164756218b60eccc2bfb4eed7d9 |
28 |
+DIST bash44-017 1143 BLAKE2B 64da515637109cd87b95e5f55857f25c2758b4a5c2620cd21250287e00767d5ca7a14fe331603cdef1ba02f622d97ee120bc0bfba463bccb113f16ebee56159f SHA512 c1d50aee953427ba0b95e48c10d2324e7413f3354ff65b9c3c1dfd14eedec55e619fcd12353e7b99b6e280f510e04d1c971b309c1a4efb97d48ddb30d69f14ac |
29 |
+DIST bash44-018 1319 BLAKE2B abfd87f2cb5e9aeb0352bb0efbfd3ad95cbb26445e09edaa762cf1ea1fa01a00ab57c96d912ae5eaf653b66169bc54bba39fdf1d62ad45301c6599d21979ff14 SHA512 008ff44dbf916414d691c29cee29e7f636bbe79170463d76ef16ca63ecdc24a84ff4476078c28fb8788d9b1fb0572612a7e8cb30fceb55ad650f293db8361ad1 |
30 |
|
31 |
diff --git a/app-shells/bash/bash-4.4_p18.ebuild b/app-shells/bash/bash-4.4_p18.ebuild |
32 |
new file mode 100644 |
33 |
index 00000000000..c11c5b32237 |
34 |
--- /dev/null |
35 |
+++ b/app-shells/bash/bash-4.4_p18.ebuild |
36 |
@@ -0,0 +1,260 @@ |
37 |
+# Copyright 1999-2018 Gentoo Foundation |
38 |
+# Distributed under the terms of the GNU General Public License v2 |
39 |
+ |
40 |
+EAPI=6 |
41 |
+ |
42 |
+inherit flag-o-matic toolchain-funcs multilib prefix |
43 |
+ |
44 |
+# Official patchlevel |
45 |
+# See ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/ |
46 |
+PLEVEL=${PV##*_p} |
47 |
+MY_PV=${PV/_p*} |
48 |
+MY_PV=${MY_PV/_/-} |
49 |
+MY_P=${PN}-${MY_PV} |
50 |
+is_release() { |
51 |
+ case ${PV} in |
52 |
+ *_alpha*|*_beta*|*_rc*) return 1 ;; |
53 |
+ *) return 0 ;; |
54 |
+ esac |
55 |
+} |
56 |
+[[ ${PV} != *_p* ]] && PLEVEL=0 |
57 |
+patches() { |
58 |
+ local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}} |
59 |
+ [[ ${plevel} -eq 0 ]] && return 1 |
60 |
+ eval set -- {1..${plevel}} |
61 |
+ set -- $(printf "${pn}${pv/\.}-%03d " "$@") |
62 |
+ if [[ ${opt} == -s ]] ; then |
63 |
+ echo "${@/#/${DISTDIR}/}" |
64 |
+ else |
65 |
+ local u |
66 |
+ for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${pn} ; do |
67 |
+ printf "${u}/${pn}-${pv}-patches/%s " "$@" |
68 |
+ done |
69 |
+ fi |
70 |
+} |
71 |
+ |
72 |
+# The version of readline this bash normally ships with. |
73 |
+READLINE_VER="7.0" |
74 |
+ |
75 |
+DESCRIPTION="The standard GNU Bourne again shell" |
76 |
+HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html" |
77 |
+if is_release ; then |
78 |
+ SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)" |
79 |
+else |
80 |
+ SRC_URI="ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz" |
81 |
+fi |
82 |
+ |
83 |
+LICENSE="GPL-3" |
84 |
+SLOT="0" |
85 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" |
86 |
+IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline" |
87 |
+ |
88 |
+DEPEND=" |
89 |
+ >=sys-libs/ncurses-5.2-r2:0= |
90 |
+ readline? ( >=sys-libs/readline-${READLINE_VER}:0= ) |
91 |
+ nls? ( virtual/libintl ) |
92 |
+" |
93 |
+RDEPEND=" |
94 |
+ ${DEPEND} |
95 |
+ !<sys-apps/portage-2.1.6.7_p1 |
96 |
+ !<sys-apps/paludis-0.26.0_alpha5 |
97 |
+" |
98 |
+# we only need yacc when the .y files get patched (bash42-005) |
99 |
+#DEPEND+=" virtual/yacc" |
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 ]] && eapply -p0 $(patches -s) |
122 |
+ |
123 |
+ eapply "${FILESDIR}/${PN}-4.4-jobs_overflow.patch" #644720 |
124 |
+ |
125 |
+ # Clean out local libs so we know we use system ones w/releases. |
126 |
+ if is_release ; then |
127 |
+ rm -rf lib/{readline,termcap}/* |
128 |
+ touch lib/{readline,termcap}/Makefile.in # for config.status |
129 |
+ sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die |
130 |
+ fi |
131 |
+ |
132 |
+ # Prefixify hardcoded path names. No-op for non-prefix. |
133 |
+ hprefixify pathnames.h.in |
134 |
+ |
135 |
+ # Avoid regenerating docs after patches #407985 |
136 |
+ sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die |
137 |
+ touch -r . doc/* |
138 |
+ |
139 |
+ eapply_user |
140 |
+} |
141 |
+ |
142 |
+src_configure() { |
143 |
+ local myconf=( |
144 |
+ --disable-profiling |
145 |
+ --docdir='$(datarootdir)'/doc/${PF} |
146 |
+ --htmldir='$(docdir)/html' |
147 |
+ --with-curses |
148 |
+ $(use_enable mem-scramble) |
149 |
+ $(use_enable net net-redirections) |
150 |
+ $(use_enable readline) |
151 |
+ $(use_enable readline bang-history) |
152 |
+ $(use_enable readline history) |
153 |
+ $(use_with afs) |
154 |
+ $(use_with mem-scramble bash-malloc) |
155 |
+ ) |
156 |
+ |
157 |
+ # For descriptions of these, see config-top.h |
158 |
+ # bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426 |
159 |
+ append-cppflags \ |
160 |
+ -DDEFAULT_PATH_VALUE=\'\"${EPREFIX}/usr/local/sbin:${EPREFIX}/usr/local/bin:${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin\"\' \ |
161 |
+ -DSTANDARD_UTILS_PATH=\'\"${EPREFIX}/bin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/usr/sbin\"\' \ |
162 |
+ -DSYS_BASHRC=\'\"${EPREFIX}/etc/bash/bashrc\"\' \ |
163 |
+ -DSYS_BASH_LOGOUT=\'\"${EPREFIX}/etc/bash/bash_logout\"\' \ |
164 |
+ -DNON_INTERACTIVE_LOGIN_SHELLS \ |
165 |
+ -DSSH_SOURCE_BASHRC \ |
166 |
+ $(use bashlogger && echo -DSYSLOG_HISTORY) |
167 |
+ |
168 |
+ # Don't even think about building this statically without |
169 |
+ # reading Bug 7714 first. If you still build it statically, |
170 |
+ # don't come crying to us with bugs ;). |
171 |
+ #use static && export LDFLAGS="${LDFLAGS} -static" |
172 |
+ use nls || myconf+=( --disable-nls ) |
173 |
+ |
174 |
+ # Historically, we always used the builtin readline, but since |
175 |
+ # our handling of SONAME upgrades has gotten much more stable |
176 |
+ # in the PM (and the readline ebuild itself preserves the old |
177 |
+ # libs during upgrades), linking against the system copy should |
178 |
+ # be safe. |
179 |
+ # Exact cached version here doesn't really matter as long as it |
180 |
+ # is at least what's in the DEPEND up above. |
181 |
+ export ac_cv_rl_version=${READLINE_VER%%_*} |
182 |
+ |
183 |
+ # Force linking with system curses ... the bundled termcap lib |
184 |
+ # sucks bad compared to ncurses. For the most part, ncurses |
185 |
+ # is here because readline needs it. But bash itself calls |
186 |
+ # ncurses in one or two small places :(. |
187 |
+ |
188 |
+ if is_release ; then |
189 |
+ # Use system readline only with released versions. |
190 |
+ myconf+=( --with-installed-readline=. ) |
191 |
+ fi |
192 |
+ |
193 |
+ if use plugins; then |
194 |
+ append-ldflags -Wl,-rpath,/usr/$(get_libdir)/bash |
195 |
+ else |
196 |
+ # Disable the plugins logic by hand since bash doesn't |
197 |
+ # provide a way of doing it. |
198 |
+ export ac_cv_func_dl{close,open,sym}=no \ |
199 |
+ ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no |
200 |
+ sed -i \ |
201 |
+ -e '/LOCAL_LDFLAGS=/s:-rdynamic::' \ |
202 |
+ configure || die |
203 |
+ fi |
204 |
+ tc-export AR #444070 |
205 |
+ econf "${myconf[@]}" |
206 |
+} |
207 |
+ |
208 |
+src_compile() { |
209 |
+ emake |
210 |
+ |
211 |
+ if use plugins ; then |
212 |
+ emake -C examples/loadables all others |
213 |
+ fi |
214 |
+} |
215 |
+ |
216 |
+src_install() { |
217 |
+ local d f |
218 |
+ |
219 |
+ default |
220 |
+ |
221 |
+ dodir /bin |
222 |
+ mv "${ED%/}"/usr/bin/bash "${ED%/}"/bin/ || die |
223 |
+ dosym bash /bin/rbash |
224 |
+ |
225 |
+ insinto /etc/bash |
226 |
+ doins "${FILESDIR}"/bash_logout |
227 |
+ doins "$(prefixify_ro "${FILESDIR}"/bashrc)" |
228 |
+ keepdir /etc/bash/bashrc.d |
229 |
+ insinto /etc/skel |
230 |
+ for f in bash{_logout,_profile,rc} ; do |
231 |
+ newins "${FILESDIR}"/dot-${f} .${f} |
232 |
+ done |
233 |
+ |
234 |
+ local sed_args=( |
235 |
+ -e "s:#${USERLAND}#@::" |
236 |
+ -e '/#@/d' |
237 |
+ ) |
238 |
+ if ! use readline ; then |
239 |
+ sed_args+=( #432338 |
240 |
+ -e '/^shopt -s histappend/s:^:#:' |
241 |
+ -e 's:use_color=true:use_color=false:' |
242 |
+ ) |
243 |
+ fi |
244 |
+ sed -i \ |
245 |
+ "${sed_args[@]}" \ |
246 |
+ "${ED%/}"/etc/skel/.bashrc \ |
247 |
+ "${ED%/}"/etc/bash/bashrc || die |
248 |
+ |
249 |
+ if use plugins ; then |
250 |
+ exeinto /usr/$(get_libdir)/bash |
251 |
+ doexe $(echo examples/loadables/*.o | sed 's:\.o::g') |
252 |
+ insinto /usr/include/bash-plugins |
253 |
+ doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h} |
254 |
+ fi |
255 |
+ |
256 |
+ if use examples ; then |
257 |
+ for d in examples/{functions,misc,scripts,startup-files} ; do |
258 |
+ exeinto /usr/share/doc/${PF}/${d} |
259 |
+ insinto /usr/share/doc/${PF}/${d} |
260 |
+ for f in ${d}/* ; do |
261 |
+ if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then |
262 |
+ doexe ${f} |
263 |
+ else |
264 |
+ doins ${f} |
265 |
+ fi |
266 |
+ done |
267 |
+ done |
268 |
+ fi |
269 |
+ |
270 |
+ doman doc/*.1 |
271 |
+ newdoc CWRU/changelog ChangeLog |
272 |
+ dosym bash.info /usr/share/info/bashref.info |
273 |
+} |
274 |
+ |
275 |
+pkg_preinst() { |
276 |
+ if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then |
277 |
+ mkdir -p "${EROOT}"/etc/bash |
278 |
+ mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/ |
279 |
+ fi |
280 |
+ |
281 |
+ if [[ -L ${EROOT}/bin/sh ]] ; then |
282 |
+ # rewrite the symlink to ensure that its mtime changes. having /bin/sh |
283 |
+ # missing even temporarily causes a fatal error with paludis. |
284 |
+ local target=$(readlink "${EROOT}"/bin/sh) |
285 |
+ local tmp=$(emktemp "${EROOT}"/bin) |
286 |
+ ln -sf "${target}" "${tmp}" |
287 |
+ mv -f "${tmp}" "${EROOT}"/bin/sh |
288 |
+ fi |
289 |
+} |
290 |
+ |
291 |
+pkg_postinst() { |
292 |
+ # If /bin/sh does not exist, provide it |
293 |
+ if [[ ! -e ${EROOT}/bin/sh ]] ; then |
294 |
+ ln -sf bash "${EROOT}"/bin/sh |
295 |
+ fi |
296 |
+} |