1 |
vapier 11/03/02 02:28:37 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: bash-4.2_p6.ebuild |
5 |
Log: |
6 |
Version bump. |
7 |
|
8 |
(Portage version: 2.2.0_alpha25/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.283 app-shells/bash/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/ChangeLog?rev=1.283&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/ChangeLog?rev=1.283&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/ChangeLog?r1=1.282&r2=1.283 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v |
20 |
retrieving revision 1.282 |
21 |
retrieving revision 1.283 |
22 |
diff -u -r1.282 -r1.283 |
23 |
--- ChangeLog 1 Mar 2011 18:53:05 -0000 1.282 |
24 |
+++ ChangeLog 2 Mar 2011 02:28:36 -0000 1.283 |
25 |
@@ -1,6 +1,11 @@ |
26 |
# ChangeLog for app-shells/bash |
27 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.282 2011/03/01 18:53:05 vapier Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.283 2011/03/02 02:28:36 vapier Exp $ |
30 |
+ |
31 |
+*bash-4.2_p6 (02 Mar 2011) |
32 |
+ |
33 |
+ 02 Mar 2011; Mike Frysinger <vapier@g.o> +bash-4.2_p6.ebuild: |
34 |
+ Version bump. |
35 |
|
36 |
01 Mar 2011; Mike Frysinger <vapier@g.o> bash-4.2_p5.ebuild, |
37 |
+files/bash-4.2-chkexport.patch: |
38 |
|
39 |
|
40 |
|
41 |
1.1 app-shells/bash/bash-4.2_p6.ebuild |
42 |
|
43 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/bash-4.2_p6.ebuild?rev=1.1&view=markup |
44 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/bash-4.2_p6.ebuild?rev=1.1&content-type=text/plain |
45 |
|
46 |
Index: bash-4.2_p6.ebuild |
47 |
=================================================================== |
48 |
# Copyright 1999-2011 Gentoo Foundation |
49 |
# Distributed under the terms of the GNU General Public License v2 |
50 |
# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.2_p6.ebuild,v 1.1 2011/03/02 02:28:36 vapier Exp $ |
51 |
|
52 |
EAPI="1" |
53 |
|
54 |
inherit eutils flag-o-matic toolchain-funcs multilib |
55 |
|
56 |
# Official patchlevel |
57 |
# See ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/ |
58 |
PLEVEL=${PV##*_p} |
59 |
MY_PV=${PV/_p*} |
60 |
MY_PV=${MY_PV/_/-} |
61 |
MY_P=${PN}-${MY_PV} |
62 |
[[ ${PV} != *_p* ]] && PLEVEL=0 |
63 |
READLINE_VER=6.1 |
64 |
READLINE_PLEVEL=0 # both readline patches are also released as bash patches |
65 |
patches() { |
66 |
local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}} |
67 |
[[ ${plevel} -eq 0 ]] && return 1 |
68 |
eval set -- {1..${plevel}} |
69 |
set -- $(printf "${pn}${pv/\.}-%03d " "$@") |
70 |
if [[ ${opt} == -s ]] ; then |
71 |
echo "${@/#/${DISTDIR}/}" |
72 |
else |
73 |
local u |
74 |
for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${pn} ; do |
75 |
printf "${u}/${pn}-${pv}-patches/%s " "$@" |
76 |
done |
77 |
fi |
78 |
} |
79 |
|
80 |
DESCRIPTION="The standard GNU Bourne again shell" |
81 |
HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html" |
82 |
SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches) |
83 |
$(patches ${READLINE_PLEVEL} readline ${READLINE_VER})" |
84 |
|
85 |
LICENSE="GPL-3" |
86 |
SLOT="0" |
87 |
#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" |
88 |
IUSE="afs bashlogger examples mem-scramble +net nls plugins vanilla" |
89 |
|
90 |
DEPEND=">=sys-libs/ncurses-5.2-r2 |
91 |
nls? ( virtual/libintl )" |
92 |
RDEPEND="${DEPEND} |
93 |
!<sys-apps/portage-2.1.7.16 |
94 |
!<sys-apps/paludis-0.26.0_alpha5" |
95 |
|
96 |
S=${WORKDIR}/${MY_P} |
97 |
|
98 |
pkg_setup() { |
99 |
if is-flag -malign-double ; then #7332 |
100 |
eerror "Detected bad CFLAGS '-malign-double'. Do not use this" |
101 |
eerror "as it breaks LFS (struct stat64) on x86." |
102 |
die "remove -malign-double from your CFLAGS mr ricer" |
103 |
fi |
104 |
if use bashlogger ; then |
105 |
ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs." |
106 |
ewarn "This will log ALL output you enter into the shell, you have been warned." |
107 |
fi |
108 |
} |
109 |
|
110 |
src_unpack() { |
111 |
unpack ${MY_P}.tar.gz |
112 |
cd "${S}" |
113 |
|
114 |
# Include official patches |
115 |
[[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s) |
116 |
cd lib/readline |
117 |
[[ ${READLINE_PLEVEL} -gt 0 ]] && epatch $(patches -s ${READLINE_PLEVEL} readline ${READLINE_VER}) |
118 |
cd ../.. |
119 |
} |
120 |
|
121 |
src_compile() { |
122 |
local myconf= |
123 |
|
124 |
# For descriptions of these, see config-top.h |
125 |
# bashrc/#26952 bash_logout/#90488 ssh/#24762 |
126 |
append-cppflags \ |
127 |
-DDEFAULT_PATH_VALUE=\'\"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\"\' \ |
128 |
-DSTANDARD_UTILS_PATH=\'\"/bin:/usr/bin:/sbin:/usr/sbin\"\' \ |
129 |
-DSYS_BASHRC=\'\"/etc/bash/bashrc\"\' \ |
130 |
-DSYS_BASH_LOGOUT=\'\"/etc/bash/bash_logout\"\' \ |
131 |
-DNON_INTERACTIVE_LOGIN_SHELLS \ |
132 |
-DSSH_SOURCE_BASHRC \ |
133 |
$(use bashlogger && echo -DSYSLOG_HISTORY) |
134 |
|
135 |
# Always use the buildin readline, else if we update readline |
136 |
# bash gets borked as readline is usually not binary compadible |
137 |
# between minor versions. |
138 |
#myconf="${myconf} $(use_with !readline installed-readline)" |
139 |
myconf="${myconf} --without-installed-readline" |
140 |
|
141 |
# Don't even think about building this statically without |
142 |
# reading Bug 7714 first. If you still build it statically, |
143 |
# don't come crying to us with bugs ;). |
144 |
#use static && export LDFLAGS="${LDFLAGS} -static" |
145 |
use nls || myconf="${myconf} --disable-nls" |
146 |
|
147 |
# Force linking with system curses ... the bundled termcap lib |
148 |
# sucks bad compared to ncurses |
149 |
myconf="${myconf} --with-curses" |
150 |
|
151 |
use plugins && append-ldflags -Wl,-rpath,/usr/$(get_libdir)/bash |
152 |
econf \ |
153 |
$(use_with afs) \ |
154 |
$(use_enable net net-redirections) \ |
155 |
--disable-profiling \ |
156 |
$(use_enable mem-scramble) \ |
157 |
$(use_with mem-scramble bash-malloc) \ |
158 |
${myconf} || die |
159 |
emake || die "make failed" |
160 |
|
161 |
if use plugins ; then |
162 |
emake -C examples/loadables all others || die |
163 |
fi |
164 |
} |
165 |
|
166 |
src_install() { |
167 |
emake install DESTDIR="${D}" || die |
168 |
|
169 |
dodir /bin |
170 |
mv "${D}"/usr/bin/bash "${D}"/bin/ || die |
171 |
dosym bash /bin/rbash |
172 |
|
173 |
insinto /etc/bash |
174 |
doins "${FILESDIR}"/{bashrc,bash_logout} |
175 |
insinto /etc/skel |
176 |
for f in bash{_logout,_profile,rc} ; do |
177 |
newins "${FILESDIR}"/dot-${f} .${f} |
178 |
done |
179 |
|
180 |
sed -i -e "s:#${USERLAND}#@::" "${D}"/etc/skel/.bashrc "${D}"/etc/bash/bashrc |
181 |
sed -i -e '/#@/d' "${D}"/etc/skel/.bashrc "${D}"/etc/bash/bashrc |
182 |
|
183 |
if use plugins ; then |
184 |
exeinto /usr/$(get_libdir)/bash |
185 |
doexe $(echo examples/loadables/*.o | sed 's:\.o::g') || die |
186 |
fi |
187 |
|
188 |
if use examples ; then |
189 |
for d in examples/{functions,misc,scripts,scripts.noah,scripts.v2} ; do |
190 |
exeinto /usr/share/doc/${PF}/${d} |
191 |
insinto /usr/share/doc/${PF}/${d} |
192 |
for f in ${d}/* ; do |
193 |
if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then |
194 |
doexe ${f} |
195 |
else |
196 |
doins ${f} |
197 |
fi |
198 |
done |
199 |
done |
200 |
fi |
201 |
|
202 |
doman doc/*.1 |
203 |
dodoc README NEWS AUTHORS CHANGES COMPAT Y2K doc/FAQ doc/INTRO |
204 |
dosym bash.info /usr/share/info/bashref.info |
205 |
} |
206 |
|
207 |
pkg_preinst() { |
208 |
if [[ -e ${ROOT}/etc/bashrc ]] && [[ ! -d ${ROOT}/etc/bash ]] ; then |
209 |
mkdir -p "${ROOT}"/etc/bash |
210 |
mv -f "${ROOT}"/etc/bashrc "${ROOT}"/etc/bash/ |
211 |
fi |
212 |
|
213 |
if [[ -L ${ROOT}/bin/sh ]]; then |
214 |
# rewrite the symlink to ensure that its mtime changes. having /bin/sh |
215 |
# missing even temporarily causes a fatal error with paludis. |
216 |
local target=$(readlink "${ROOT}"/bin/sh) |
217 |
ln -sf "${target}" "${ROOT}"/bin/sh |
218 |
fi |
219 |
} |
220 |
|
221 |
pkg_postinst() { |
222 |
# If /bin/sh does not exist, provide it |
223 |
if [[ ! -e ${ROOT}/bin/sh ]]; then |
224 |
ln -sf bash "${ROOT}"/bin/sh |
225 |
fi |
226 |
} |