Gentoo Archives: gentoo-commits

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